[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45198] trunk/blender/source/blender/ windowmanager/intern: style cleanup: wm, mosyly adding space around ops
Campbell Barton
ideasman42 at gmail.com
Tue Mar 27 03:24:25 CEST 2012
Revision: 45198
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45198
Author: campbellbarton
Date: 2012-03-27 01:24:16 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
style cleanup: wm, mosyly adding space around ops
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_apple.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_dragdrop.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm.c 2012-03-27 00:17:57 UTC (rev 45197)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c 2012-03-27 01:24:16 UTC (rev 45198)
@@ -69,7 +69,7 @@
/* ****************************************************** */
-#define MAX_OP_REGISTERED 32
+#define MAX_OP_REGISTERED 32
void WM_operator_free(wmOperator *op)
{
@@ -83,7 +83,7 @@
#endif
if (op->ptr) {
- op->properties= op->ptr->data;
+ op->properties = op->ptr->data;
MEM_freeN(op->ptr);
}
@@ -99,7 +99,7 @@
if (op->macro.first) {
wmOperator *opm, *opmnext;
- for (opm= op->macro.first; opm; opm= opmnext) {
+ for (opm = op->macro.first; opm; opm = opmnext) {
opmnext = opm->next;
WM_operator_free(opm);
}
@@ -118,22 +118,22 @@
/* called on event handling by event_system.c */
void wm_operator_register(bContext *C, wmOperator *op)
{
- wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindowManager *wm = CTX_wm_manager(C);
int tot;
BLI_addtail(&wm->operators, op);
- tot= BLI_countlist(&wm->operators);
+ tot = BLI_countlist(&wm->operators);
- while (tot>MAX_OP_REGISTERED) {
- wmOperator *opt= wm->operators.first;
+ while (tot > MAX_OP_REGISTERED) {
+ wmOperator *opt = wm->operators.first;
BLI_remlink(&wm->operators, opt);
WM_operator_free(opt);
tot--;
}
/* so the console is redrawn */
- WM_event_add_notifier(C, NC_SPACE|ND_SPACE_INFO_REPORT, NULL);
- WM_event_add_notifier(C, NC_WM|ND_HISTORY, NULL);
+ WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO_REPORT, NULL);
+ WM_event_add_notifier(C, NC_WM | ND_HISTORY, NULL);
}
@@ -141,24 +141,24 @@
{
wmOperator *op;
- while ((op= wm->operators.first)) {
+ while ((op = wm->operators.first)) {
BLI_remlink(&wm->operators, op);
WM_operator_free(op);
}
- WM_main_add_notifier(NC_WM|ND_HISTORY, NULL);
+ WM_main_add_notifier(NC_WM | ND_HISTORY, NULL);
}
/* ****************************************** */
-static GHash *menutypes_hash= NULL;
+static GHash *menutypes_hash = NULL;
MenuType *WM_menutype_find(const char *idname, int quiet)
{
- MenuType* mt;
+ MenuType *mt;
if (idname[0]) {
- mt= BLI_ghash_lookup(menutypes_hash, idname);
+ mt = BLI_ghash_lookup(menutypes_hash, idname);
if (mt)
return mt;
}
@@ -169,13 +169,13 @@
return NULL;
}
-int WM_menutype_add(MenuType* mt)
+int WM_menutype_add(MenuType *mt)
{
BLI_ghash_insert(menutypes_hash, (void *)mt->idname, mt);
return 1;
}
-void WM_menutype_freelink(MenuType* mt)
+void WM_menutype_freelink(MenuType *mt)
{
BLI_ghash_remove(menutypes_hash, mt->idname, NULL, (GHashValFreeFP)MEM_freeN);
}
@@ -183,15 +183,15 @@
/* called on initialize WM_init() */
void WM_menutype_init(void)
{
- menutypes_hash= BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp, "menutypes_hash gh");
+ menutypes_hash = BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp, "menutypes_hash gh");
}
void WM_menutype_free(void)
{
- GHashIterator *iter= BLI_ghashIterator_new(menutypes_hash);
+ GHashIterator *iter = BLI_ghashIterator_new(menutypes_hash);
- for ( ; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
- MenuType *mt= BLI_ghashIterator_getValue(iter);
+ for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
+ MenuType *mt = BLI_ghashIterator_getValue(iter);
if (mt->ext.free) {
mt->ext.free(mt->ext.data);
}
@@ -199,22 +199,22 @@
BLI_ghashIterator_free(iter);
BLI_ghash_free(menutypes_hash, NULL, (GHashValFreeFP)MEM_freeN);
- menutypes_hash= NULL;
+ menutypes_hash = NULL;
}
/* ****************************************** */
void WM_keymap_init(bContext *C)
{
- wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindowManager *wm = CTX_wm_manager(C);
/* create standard key configs */
if (!wm->defaultconf)
- wm->defaultconf= WM_keyconfig_new(wm, "Blender");
+ wm->defaultconf = WM_keyconfig_new(wm, "Blender");
if (!wm->addonconf)
- wm->addonconf= WM_keyconfig_new(wm, "Blender Addon");
+ wm->addonconf = WM_keyconfig_new(wm, "Blender Addon");
if (!wm->userconf)
- wm->userconf= WM_keyconfig_new(wm, "Blender User");
+ wm->userconf = WM_keyconfig_new(wm, "Blender User");
/* initialize only after python init is done, for keymaps that
* use python operators */
@@ -237,15 +237,15 @@
void WM_check(bContext *C)
{
- wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindowManager *wm = CTX_wm_manager(C);
/* wm context */
- if (wm==NULL) {
- wm= CTX_data_main(C)->wm.first;
+ if (wm == NULL) {
+ wm = CTX_data_main(C)->wm.first;
CTX_wm_manager_set(C, wm);
}
- if (wm==NULL) return;
- if (wm->windows.first==NULL) return;
+ if (wm == NULL) return;
+ if (wm->windows.first == NULL) return;
if (!G.background) {
/* case: fileread */
@@ -268,18 +268,18 @@
void wm_clear_default_size(bContext *C)
{
- wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win;
/* wm context */
- if (wm==NULL) {
- wm= CTX_data_main(C)->wm.first;
+ if (wm == NULL) {
+ wm = CTX_data_main(C)->wm.first;
CTX_wm_manager_set(C, wm);
}
- if (wm==NULL) return;
- if (wm->windows.first==NULL) return;
+ if (wm == NULL) return;
+ if (wm->windows.first == NULL) return;
- for (win= wm->windows.first; win; win= win->next) {
+ for (win = wm->windows.first; win; win = win->next) {
win->sizex = 0;
win->sizey = 0;
win->posx = 0;
@@ -291,18 +291,18 @@
/* on startup, it adds all data, for matching */
void wm_add_default(bContext *C)
{
- wmWindowManager *wm= alloc_libblock(&CTX_data_main(C)->wm, ID_WM, "WinMan");
+ wmWindowManager *wm = alloc_libblock(&CTX_data_main(C)->wm, ID_WM, "WinMan");
wmWindow *win;
- bScreen *screen= CTX_wm_screen(C); /* XXX from file read hrmf */
+ bScreen *screen = CTX_wm_screen(C); /* XXX from file read hrmf */
CTX_wm_manager_set(C, wm);
- win= wm_window_new(C);
- win->screen= screen;
- screen->winid= win->winid;
- BLI_strncpy(win->screenname, screen->id.name+2, sizeof(win->screenname));
+ win = wm_window_new(C);
+ win->screen = screen;
+ screen->winid = win->winid;
+ BLI_strncpy(win->screenname, screen->id.name + 2, sizeof(win->screenname));
- wm->winactive= win;
- wm->file_saved= 1;
+ wm->winactive = win;
+ wm->file_saved = 1;
wm_window_make_drawable(C, win);
}
@@ -317,19 +317,19 @@
if (wm->autosavetimer)
wm_autosave_timer_ended(wm);
- while ((win= wm->windows.first)) {
+ while ((win = wm->windows.first)) {
BLI_remlink(&wm->windows, win);
- win->screen= NULL; /* prevent draw clear to use screen */
+ win->screen = NULL; /* prevent draw clear to use screen */
wm_draw_window_clear(win);
wm_window_free(C, wm, win);
}
- while ((op= wm->operators.first)) {
+ while ((op = wm->operators.first)) {
BLI_remlink(&wm->operators, op);
WM_operator_free(op);
}
- while ((keyconf=wm->keyconfigs.first)) {
+ while ((keyconf = wm->keyconfigs.first)) {
BLI_remlink(&wm->keyconfigs, keyconf);
WM_keyconfig_free(keyconf);
}
@@ -341,14 +341,14 @@
wm_reports_free(wm);
- if (C && CTX_wm_manager(C)==wm) CTX_wm_manager_set(C, NULL);
+ if (C && CTX_wm_manager(C) == wm) CTX_wm_manager_set(C, NULL);
}
void wm_close_and_free_all(bContext *C, ListBase *wmlist)
{
wmWindowManager *wm;
- while ((wm=wmlist->first)) {
+ while ((wm = wmlist->first)) {
wm_close_and_free(C, wm);
BLI_remlink(wmlist, wm);
MEM_freeN(wm);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_apple.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_apple.c 2012-03-27 00:17:57 UTC (rev 45197)
+++ trunk/blender/source/blender/windowmanager/intern/wm_apple.c 2012-03-27 01:24:16 UTC (rev 45198)
@@ -62,23 +62,23 @@
long value;
long maxvram = 0; /* we get always more than 1 renderer, check one, at least, has 8 Mo */
- display_mask = CGDisplayIDToOpenGLDisplayMask (CGMainDisplayID() );
+ display_mask = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID() );
- theErr = CGLQueryRendererInfo( display_mask, &rend, &nrend);
+ theErr = CGLQueryRendererInfo(display_mask, &rend, &nrend);
if (theErr == 0) {
- theErr = CGLDescribeRenderer (rend, 0, kCGLRPRendererCount, &nrend);
+ theErr = CGLDescribeRenderer(rend, 0, kCGLRPRendererCount, &nrend);
if (theErr == 0) {
for (j = 0; j < nrend; j++) {
- theErr = CGLDescribeRenderer (rend, j, kCGLRPVideoMemory, &value);
+ theErr = CGLDescribeRenderer(rend, j, kCGLRPVideoMemory, &value);
if (value > maxvram)
maxvram = value;
if ((theErr == 0) && (value >= 20000000)) {
- theErr = CGLDescribeRenderer (rend, j, kCGLRPAccelerated, &value);
+ theErr = CGLDescribeRenderer(rend, j, kCGLRPAccelerated, &value);
if ((theErr == 0) && (value != 0)) {
- theErr = CGLDescribeRenderer (rend, j, kCGLRPCompliant, &value);
+ theErr = CGLDescribeRenderer(rend, j, kCGLRPCompliant, &value);
if ((theErr == 0) && (value != 0)) {
/*fprintf(stderr,"make it big\n");*/
- CGLDestroyRendererInfo (rend);
+ CGLDestroyRendererInfo(rend);
macPrefState = 8;
return 1;
}
@@ -87,18 +87,18 @@
}
}
}
- if (maxvram < 7500000 ) { /* put a standard alert and quit*/
+ if (maxvram < 7500000) { /* put a standard alert and quit*/
SInt16 junkHit;
- char inError[] = "* Not enough VRAM ";
- char inText[] = "* blender needs at least 8Mb ";
+ char inError[] = "* Not enough VRAM ";
+ char inText[] = "* blender needs at least 8Mb ";
inError[0] = 16;
inText[0] = 28;
fprintf(stderr, " vram is %li . not enough, aborting\n", maxvram);
- StandardAlert ( kAlertStopAlert, (ConstStr255Param) &inError, (ConstStr255Param)&inText,NULL,&junkHit);
+ StandardAlert(kAlertStopAlert, (ConstStr255Param) & inError, (ConstStr255Param) & inText, NULL, &junkHit);
abort();
}
- CGLDestroyRendererInfo (rend);
+ CGLDestroyRendererInfo(rend);
return 0;
}
@@ -106,7 +106,7 @@
{
Rect outAvailableRect;
- GetAvailableWindowPositioningBounds ( GetMainDevice(), &outAvailableRect);
+ GetAvailableWindowPositioningBounds(GetMainDevice(), &outAvailableRect);
*top = outAvailableRect.top;
*left = outAvailableRect.left;
@@ -124,14 +124,14 @@
short top, left, bottom, right;
getMacAvailableBounds(&top, &left, &bottom, &right);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list