From 93e8a05320c2c259be0ed260873b9ff75408d50b Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 24 Mar 2003 00:06:40 +0000 Subject: [PATCH] Canonize all space functions to follow the drawXXXspace and winqreadXXXspace conventions. --- source/blender/include/BIF_space.h | 6 +++--- source/blender/include/BSE_drawimasel.h | 2 +- source/blender/include/BSE_drawipo.h | 2 +- source/blender/include/BSE_drawview.h | 2 +- source/blender/src/drawimasel.c | 2 +- source/blender/src/drawipo.c | 2 +- source/blender/src/drawview.c | 2 +- source/blender/src/editimasel.c | 8 ++------ source/blender/src/headerbuttons.c | 14 +++++++------- source/blender/src/space.c | 24 ++++++++++++------------ 10 files changed, 30 insertions(+), 34 deletions(-) diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h index 6f102e11deb..33add3085a6 100644 --- a/source/blender/include/BIF_space.h +++ b/source/blender/include/BIF_space.h @@ -77,14 +77,14 @@ extern void initipo(struct ScrArea *sa); extern void initview3d(struct ScrArea *sa); extern void newspace(struct ScrArea *sa, int type); extern void set_rects_butspace(struct SpaceButs *buts); -extern void winqread3d(unsigned short event, short val, char ascii); +extern void winqreadview3dspace(unsigned short event, short val, char ascii); extern void winqreadbutspace(unsigned short event, short val, char ascii); extern void winqreadimagespace(unsigned short event, short val, char ascii); extern void winqreadinfospace(unsigned short event, short val, char ascii); -extern void winqreadipo(unsigned short event, short val, char ascii); +extern void winqreadipospace(unsigned short event, short val, char ascii); extern void winqreadoopsspace(unsigned short event, short val, char ascii); extern void winqreadnlaspace(unsigned short event, short val, char ascii); -extern void winqreadsequence(unsigned short event, short val, char ascii); +extern void winqreadseqspace(unsigned short event, short val, char ascii); extern void test_butspace(void); extern void start_game(void); diff --git a/source/blender/include/BSE_drawimasel.h b/source/blender/include/BSE_drawimasel.h index 3064c53b4d0..3eef9faec46 100644 --- a/source/blender/include/BSE_drawimasel.h +++ b/source/blender/include/BSE_drawimasel.h @@ -45,7 +45,7 @@ void move_imadir_sli(struct SpaceImaSel *simasel); void move_imafile_sli(struct SpaceImaSel *simasel); void ima_select_all(struct SpaceImaSel *simasel); void pibplay(struct SpaceImaSel *simasel); -void drawimasel(void); +void drawimaselspace(void); /* void calc_hilite(SpaceImaSel *simasel); */ /* void ima_select_all(SpaceImaSel *simasel); */ diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h index 17c53fc6e2d..b1f92668be5 100644 --- a/source/blender/include/BSE_drawipo.h +++ b/source/blender/include/BSE_drawipo.h @@ -57,7 +57,7 @@ void calc_scrollrcts (struct View2D *v2d, int winx, int winy); int in_ipo_buttons(void); void drawscroll(int disptype); -void drawipo(void); +void drawipospace(void); void center_currframe(void); void scroll_ipobuts(void); diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h index 69299255b1c..f0cba1eeb64 100644 --- a/source/blender/include/BSE_drawview.h +++ b/source/blender/include/BSE_drawview.h @@ -44,7 +44,7 @@ void two_sided(int val); void circf(float x, float y, float rad); void circ(float x, float y, float rad); void backdrawview3d(int test); -void drawview3d(void); +void drawview3dspace(void); void drawview3d_render(struct View3D *v3d); int update_time(void); void calc_viewborder(struct View3D *v3d, struct rcti *viewborder_r); diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index a0acd6c23b8..451eff81437 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -853,7 +853,7 @@ void pibplay(SpaceImaSel *simasel) /* ************** hoofdtekenfunktie ************** */ -void drawimasel() /* hoofdtekenfunktie */ +void drawimaselspace() /* hoofdtekenfunktie */ { SpaceImaSel *simasel; simasel= curarea->spacedata.first; diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c index 4b7dbcab05f..a8fdabe5069 100644 --- a/source/blender/src/drawipo.c +++ b/source/blender/src/drawipo.c @@ -1316,7 +1316,7 @@ static void draw_key(SpaceIpo *sipo, int visible) setlinestyle(0); } -void drawipo(void) +void drawipospace(void) { SpaceIpo *sipo= curarea->spacedata.first; View2D *v2d= &sipo->v2d; diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 60b8961abf5..0199f3865c9 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -784,7 +784,7 @@ static void draw_view_icon(void) glDisable(GL_BLEND); } -void drawview3d(void) +void drawview3dspace(void) { Base *base; Object *ob; diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index c7843789d6a..8052de6b64c 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -71,10 +71,6 @@ #include "mydevice.h" #include "interface.h" -/* locals */ -void draw_icon_imasel(void); -void winqreadimasel(unsigned short event, short val, char ascii); - #define XIC 20 #define YIC 21 @@ -82,12 +78,12 @@ void winqreadimasel(unsigned short event, short val, char ascii); extern char *fsmenu; -void draw_icon_imasel(void) +static void draw_icon_imasel(void) { scrarea_queue_winredraw(curarea); } -void winqreadimasel(unsigned short event, short val, char ascii) +void winqreadimaselspace(unsigned short event, short val, char ascii) { SpaceImaSel *simasel; diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index a6d2ce57a61..e4f02b92a19 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -2462,8 +2462,8 @@ static void do_info_editmenu(void *arg, int event) case 2: /* Circle Select */ /*if(select_area(SPACE_VIEW3D)) { - winqread3d(BKEY, 1, 0); - winqread3d(BKEY, 1, 0); + winqreadview3dspace(BKEY, 1, 0); // XXX - kill me + winqreadview3dspace(BKEY, 1, 0); // XXX - kill me }*/ break; case 3: @@ -2471,14 +2471,14 @@ static void do_info_editmenu(void *arg, int event) if(select_area(SPACE_VIEW3D)) { oldqual = G.qual; G.qual = LR_SHIFTKEY; - winqread3d(DKEY, 1, 0); + winqreadview3dspace(DKEY, 1, 0); // XXX - kill me G.qual = oldqual; } break; case 4: /* Delete */ if(select_area(SPACE_VIEW3D)) { - winqread3d(XKEY, 1, 0); + winqreadview3dspace(XKEY, 1, 0); // XXX - kill me } break; case 5: @@ -2534,7 +2534,7 @@ static void do_info_editmenu(void *arg, int event) if(select_area(SPACE_VIEW3D)) { oldqual = G.qual; G.qual = LR_SHIFTKEY; - winqread3d(WKEY, 1, 0); + winqreadview3dspace(WKEY, 1, 0); // XXX - kill me G.qual = oldqual; } break; @@ -2543,7 +2543,7 @@ static void do_info_editmenu(void *arg, int event) if(select_area(SPACE_VIEW3D)) { oldqual = G.qual; G.qual = LR_SHIFTKEY; - winqread3d(SKEY, 1, 0); + winqreadview3dspace(SKEY, 1, 0); // XXX - kill me G.qual = oldqual; } break; @@ -3930,7 +3930,7 @@ void do_ipo_buttons(short event) case B_IPOSHOWKEY: /* waarde omkeren vanwege winqread */ G.sipo->showkey= 1-G.sipo->showkey; - winqreadipo(KKEY, 1, 0); + winqreadipospace(KKEY, 1, 0); // XXX - kill me break; case B_VIEW2DZOOM: viewmovetemp= 0; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 6ce12f4ca8e..03e7416e179 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -153,7 +153,7 @@ void free_soundspace(SpaceSound *ssound); /* ************* SPACE: VIEW3D ************* */ -/* extern void drawview3d(); BSE_drawview.h */ +/* extern void drawview3dspace(); BSE_drawview.h */ void copy_view3d_lock(short val) @@ -419,7 +419,7 @@ static void align_view_to_selected(View3D *v3d) } } -void winqread3d(unsigned short event, short val, char ascii) +void winqreadview3dspace(unsigned short event, short val, char ascii) { View3D *v3d= curarea->spacedata.first; Object *ob; @@ -1102,7 +1102,7 @@ void changeview2d() myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax); } -void winqreadipo(unsigned short event, short val, char ascii) +void winqreadipospace(unsigned short event, short val, char ascii) { SpaceIpo *sipo= curarea->spacedata.first; View2D *v2d= &sipo->v2d; @@ -1506,7 +1506,7 @@ void winqreadbutspace(unsigned short event, short val, char ascii) case PADPLUSKEY: case PADMINUS: val= SPACE_BUTS; - winqreadipo(event, val, 0); + winqreadipospace(event, val, 0); // XXX - kill me break; case RENDERPREVIEW: BIF_previewrender(sbuts); @@ -1535,7 +1535,7 @@ void winqreadbutspace(unsigned short event, short val, char ascii) areawinset(sa3d->win); if(event==PKEY) start_game(); - else if(event==ZKEY) winqread3d(event, val, 0); + else if(event==ZKEY) winqreadview3dspace(event, val, 0); // XXX - kill me else persptoetsen(event); scrarea_queue_winredraw(sa3d); @@ -1635,7 +1635,7 @@ void extern_set_butspace(int fkey) /* extern void drawseqspace(); BIF_drawseq.h */ -void winqreadsequence(unsigned short event, short val, char ascii) +void winqreadseqspace(unsigned short event, short val, char ascii) { SpaceSeq *sseq= curarea->spacedata.first; View2D *v2d= &sseq->v2d; @@ -2145,8 +2145,8 @@ void init_imagespace(ScrArea *sa) /* ******************** SPACE: IMASEL ********************** */ -extern void drawimasel(void); -extern void winqreadimasel(unsigned short, short, char ascii); +extern void drawimaselspace(void); +extern void winqreadimaselspace(unsigned short, short, char ascii); /* alles naar imasel.c */ @@ -2962,7 +2962,7 @@ SpaceType *spaceimasel_get_type(void) if (!st) { st= spacetype_new("Imasel"); - spacetype_set_winfuncs(st, drawimasel, NULL, winqreadimasel); + spacetype_set_winfuncs(st, drawimaselspace, NULL, winqreadimaselspace); } return st; @@ -2984,7 +2984,7 @@ SpaceType *spaceipo_get_type(void) if (!st) { st= spacetype_new("Ipo"); - spacetype_set_winfuncs(st, drawipo, changeview2d, winqreadipo); + spacetype_set_winfuncs(st, drawipospace, changeview2d, winqreadipospace); } return st; @@ -3017,7 +3017,7 @@ SpaceType *spaceseq_get_type(void) if (!st) { st= spacetype_new("Sequence"); - spacetype_set_winfuncs(st, drawseqspace, changeview2d, winqreadsequence); + spacetype_set_winfuncs(st, drawseqspace, changeview2d, winqreadseqspace); } return st; @@ -3050,7 +3050,7 @@ SpaceType *spaceview3d_get_type(void) if (!st) { st= spacetype_new("View3D"); - spacetype_set_winfuncs(st, drawview3d, changeview3d, winqread3d); + spacetype_set_winfuncs(st, drawview3dspace, changeview3d, winqreadview3dspace); } return st;