archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Canonize all space functions to follow the drawXXXspace and winqreadXXXspace

Browse Source 
conventions.
This commit is contained in:
Daniel Dunbar
2003-03-24 00:06:40 +00:00
parent 510e2d5840
commit 93e8a05320
10 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/include/BIF_space.h
View File

@@ -77,14 +77,14 @@ extern void initipo(struct ScrArea *sa);
extern void initview3d(struct ScrArea *sa); extern void initview3d(struct ScrArea *sa);
extern void newspace(struct ScrArea *sa, int type); extern void newspace(struct ScrArea *sa, int type);
extern void set_rects_butspace(struct SpaceButs *buts); 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 winqreadbutspace(unsigned short event, short val, char ascii);
extern void winqreadimagespace(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 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 winqreadoopsspace(unsigned short event, short val, char ascii);
extern void winqreadnlaspace(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 test_butspace(void);
extern void start_game(void); extern void start_game(void);

2
source/blender/include/BSE_drawimasel.h
View File

@@ -45,7 +45,7 @@ void move_imadir_sli(struct SpaceImaSel *simasel);
void move_imafile_sli(struct SpaceImaSel *simasel); void move_imafile_sli(struct SpaceImaSel *simasel);
void ima_select_all(struct SpaceImaSel *simasel); void ima_select_all(struct SpaceImaSel *simasel);
void pibplay(struct SpaceImaSel *simasel); void pibplay(struct SpaceImaSel *simasel);
void drawimasel(void); void drawimaselspace(void);
/* void calc_hilite(SpaceImaSel *simasel); */ /* void calc_hilite(SpaceImaSel *simasel); */
/* void ima_select_all(SpaceImaSel *simasel); */ /* void ima_select_all(SpaceImaSel *simasel); */

2
source/blender/include/BSE_drawipo.h
View File

@@ -57,7 +57,7 @@ void calc_scrollrcts (struct View2D *v2d, int winx, int winy);
int in_ipo_buttons(void); int in_ipo_buttons(void);
void drawscroll(int disptype); void drawscroll(int disptype);
void drawipo(void); void drawipospace(void);
void center_currframe(void); void center_currframe(void);
void scroll_ipobuts(void); void scroll_ipobuts(void);

2
source/blender/include/BSE_drawview.h
View File

@@ -44,7 +44,7 @@ void two_sided(int val);
void circf(float x, float y, float rad); void circf(float x, float y, float rad);
void circ(float x, float y, float rad); void circ(float x, float y, float rad);
void backdrawview3d(int test); void backdrawview3d(int test);
void drawview3d(void); void drawview3dspace(void);
void drawview3d_render(struct View3D *v3d); void drawview3d_render(struct View3D *v3d);
int update_time(void); int update_time(void);
void calc_viewborder(struct View3D *v3d, struct rcti *viewborder_r); void calc_viewborder(struct View3D *v3d, struct rcti *viewborder_r);

2
source/blender/src/drawimasel.c
View File

@@ -853,7 +853,7 @@ void pibplay(SpaceImaSel *simasel)
/* ************** hoofdtekenfunktie ************** */ /* ************** hoofdtekenfunktie ************** */
void drawimasel() /* hoofdtekenfunktie */ void drawimaselspace() /* hoofdtekenfunktie */
{ {
SpaceImaSel *simasel; SpaceImaSel *simasel;
simasel= curarea->spacedata.first; simasel= curarea->spacedata.first;

2
source/blender/src/drawipo.c
View File

@@ -1316,7 +1316,7 @@ static void draw_key(SpaceIpo *sipo, int visible)
setlinestyle(0); setlinestyle(0);
} }
void drawipo(void) void drawipospace(void)
{ {
SpaceIpo *sipo= curarea->spacedata.first; SpaceIpo *sipo= curarea->spacedata.first;
View2D *v2d= &sipo->v2d; View2D *v2d= &sipo->v2d;

2
source/blender/src/drawview.c
View File

@@ -784,7 +784,7 @@ static void draw_view_icon(void)
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
void drawview3d(void) void drawview3dspace(void)
{ {
Base *base; Base *base;
Object *ob; Object *ob;

8
source/blender/src/editimasel.c
View File

@@ -71,10 +71,6 @@
#include "mydevice.h" #include "mydevice.h"
#include "interface.h" #include "interface.h"
/* locals */
void draw_icon_imasel(void);
void winqreadimasel(unsigned short event, short val, char ascii);
#define XIC 20 #define XIC 20
#define YIC 21 #define YIC 21
@@ -82,12 +78,12 @@ void winqreadimasel(unsigned short event, short val, char ascii);
extern char *fsmenu; extern char *fsmenu;
void draw_icon_imasel(void) static void draw_icon_imasel(void)
{ {
scrarea_queue_winredraw(curarea); scrarea_queue_winredraw(curarea);
} }
void winqreadimasel(unsigned short event, short val, char ascii) void winqreadimaselspace(unsigned short event, short val, char ascii)
{ {
SpaceImaSel *simasel; SpaceImaSel *simasel;

14
source/blender/src/headerbuttons.c
View File

@@ -2462,8 +2462,8 @@ static void do_info_editmenu(void *arg, int event)
case 2: case 2:
/* Circle Select */ /* Circle Select */
/*if(select_area(SPACE_VIEW3D)) { /*if(select_area(SPACE_VIEW3D)) {
winqread3d(BKEY, 1, 0); winqreadview3dspace(BKEY, 1, 0); // XXX - kill me
winqread3d(BKEY, 1, 0); winqreadview3dspace(BKEY, 1, 0); // XXX - kill me
}*/ }*/
break; break;
case 3: case 3:
@@ -2471,14 +2471,14 @@ static void do_info_editmenu(void *arg, int event)
if(select_area(SPACE_VIEW3D)) { if(select_area(SPACE_VIEW3D)) {
oldqual = G.qual; oldqual = G.qual;
G.qual = LR_SHIFTKEY; G.qual = LR_SHIFTKEY;
winqread3d(DKEY, 1, 0); winqreadview3dspace(DKEY, 1, 0); // XXX - kill me
G.qual = oldqual; G.qual = oldqual;
} }
break; break;
case 4: case 4:
/* Delete */ /* Delete */
if(select_area(SPACE_VIEW3D)) { if(select_area(SPACE_VIEW3D)) {
winqread3d(XKEY, 1, 0); winqreadview3dspace(XKEY, 1, 0); // XXX - kill me
} }
break; break;
case 5: case 5:
@@ -2534,7 +2534,7 @@ static void do_info_editmenu(void *arg, int event)
if(select_area(SPACE_VIEW3D)) { if(select_area(SPACE_VIEW3D)) {
oldqual = G.qual; oldqual = G.qual;
G.qual = LR_SHIFTKEY; G.qual = LR_SHIFTKEY;
winqread3d(WKEY, 1, 0); winqreadview3dspace(WKEY, 1, 0); // XXX - kill me
G.qual = oldqual; G.qual = oldqual;
} }
break; break;
@@ -2543,7 +2543,7 @@ static void do_info_editmenu(void *arg, int event)
if(select_area(SPACE_VIEW3D)) { if(select_area(SPACE_VIEW3D)) {
oldqual = G.qual; oldqual = G.qual;
G.qual = LR_SHIFTKEY; G.qual = LR_SHIFTKEY;
winqread3d(SKEY, 1, 0); winqreadview3dspace(SKEY, 1, 0); // XXX - kill me
G.qual = oldqual; G.qual = oldqual;
} }
break; break;
@@ -3930,7 +3930,7 @@ void do_ipo_buttons(short event)
case B_IPOSHOWKEY: case B_IPOSHOWKEY:
/* waarde omkeren vanwege winqread */ /* waarde omkeren vanwege winqread */
G.sipo->showkey= 1-G.sipo->showkey; G.sipo->showkey= 1-G.sipo->showkey;
winqreadipo(KKEY, 1, 0); winqreadipospace(KKEY, 1, 0); // XXX - kill me
break; break;
case B_VIEW2DZOOM: case B_VIEW2DZOOM:
viewmovetemp= 0; viewmovetemp= 0;

24
source/blender/src/space.c
View File

@@ -153,7 +153,7 @@ void free_soundspace(SpaceSound *ssound);
/* ************* SPACE: VIEW3D ************* */ /* ************* SPACE: VIEW3D ************* */
/* extern void drawview3d(); BSE_drawview.h */ /* extern void drawview3dspace(); BSE_drawview.h */
void copy_view3d_lock(short val) 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; View3D *v3d= curarea->spacedata.first;
Object *ob; 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); 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; SpaceIpo *sipo= curarea->spacedata.first;
View2D *v2d= &sipo->v2d; View2D *v2d= &sipo->v2d;
@@ -1506,7 +1506,7 @@ void winqreadbutspace(unsigned short event, short val, char ascii)
case PADPLUSKEY: case PADPLUSKEY:
case PADMINUS: case PADMINUS:
val= SPACE_BUTS; val= SPACE_BUTS;
winqreadipo(event, val, 0); winqreadipospace(event, val, 0); // XXX - kill me
break; break;
case RENDERPREVIEW: case RENDERPREVIEW:
BIF_previewrender(sbuts); BIF_previewrender(sbuts);
@@ -1535,7 +1535,7 @@ void winqreadbutspace(unsigned short event, short val, char ascii)
areawinset(sa3d->win); areawinset(sa3d->win);
if(event==PKEY) start_game(); 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); else persptoetsen(event);
scrarea_queue_winredraw(sa3d); scrarea_queue_winredraw(sa3d);
@@ -1635,7 +1635,7 @@ void extern_set_butspace(int fkey)
/* extern void drawseqspace(); BIF_drawseq.h */ /* 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; SpaceSeq *sseq= curarea->spacedata.first;
View2D *v2d= &sseq->v2d; View2D *v2d= &sseq->v2d;
@@ -2145,8 +2145,8 @@ void init_imagespace(ScrArea *sa)
/* ******************** SPACE: IMASEL ********************** */ /* ******************** SPACE: IMASEL ********************** */
extern void drawimasel(void); extern void drawimaselspace(void);
extern void winqreadimasel(unsigned short, short, char ascii); extern void winqreadimaselspace(unsigned short, short, char ascii);
/* alles naar imasel.c */ /* alles naar imasel.c */
@@ -2962,7 +2962,7 @@ SpaceType *spaceimasel_get_type(void)
if (!st) { if (!st) {
st= spacetype_new("Imasel"); st= spacetype_new("Imasel");
spacetype_set_winfuncs(st, drawimasel, NULL, winqreadimasel); spacetype_set_winfuncs(st, drawimaselspace, NULL, winqreadimaselspace);
} }
return st; return st;
@@ -2984,7 +2984,7 @@ SpaceType *spaceipo_get_type(void)
if (!st) { if (!st) {
st= spacetype_new("Ipo"); st= spacetype_new("Ipo");
spacetype_set_winfuncs(st, drawipo, changeview2d, winqreadipo); spacetype_set_winfuncs(st, drawipospace, changeview2d, winqreadipospace);
} }
return st; return st;
@@ -3017,7 +3017,7 @@ SpaceType *spaceseq_get_type(void)
if (!st) { if (!st) {
st= spacetype_new("Sequence"); st= spacetype_new("Sequence");
spacetype_set_winfuncs(st, drawseqspace, changeview2d, winqreadsequence); spacetype_set_winfuncs(st, drawseqspace, changeview2d, winqreadseqspace);
} }
return st; return st;
@@ -3050,7 +3050,7 @@ SpaceType *spaceview3d_get_type(void)
if (!st) { if (!st) {
st= spacetype_new("View3D"); st= spacetype_new("View3D");
spacetype_set_winfuncs(st, drawview3d, changeview3d, winqread3d); spacetype_set_winfuncs(st, drawview3dspace, changeview3d, winqreadview3dspace);
} }
return st; return st;