From fc1c86a87e213a2fa5d7b61ea0c311cd3e71c9ce Mon Sep 17 00:00:00 2001 From: kojima Date: Sun, 19 Sep 1999 01:49:59 +0000 Subject: [PATCH] renamed dprintf to dbprintf --- src/event.c | 30 +++++++++++++++--------------- src/funcs.h | 4 ++-- src/menu.c | 12 ++++++------ src/misc.c | 4 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/event.c b/src/event.c index cd96936a..0bffa6cc 100644 --- a/src/event.c +++ b/src/event.c @@ -461,7 +461,7 @@ handleMapRequest(XEvent *ev) Window window = ev->xmaprequest.window; #ifdef DEBUG - dprintf("got map request for %x\n", (unsigned)window); + dbprintf("got map request for %x\n", (unsigned)window); #endif if ((wwin = wWindowFor(window))) { @@ -540,7 +540,7 @@ handleDestroyNotify(XEvent *event) Window window = event->xdestroywindow.window; #ifdef DEBUG - dputs("got destroy notify"); + dbputs("got destroy notify"); #endif wwin = wWindowFor(window); @@ -577,7 +577,7 @@ handleExpose(XEvent *event) XEvent ev; #ifdef DEBUG - dputs("got expose"); + dbputs("got expose"); #endif while (XCheckTypedWindowEvent(dpy, event->xexpose.window, Expose, &ev)); @@ -601,7 +601,7 @@ handleButtonPress(XEvent *event) WScreen *scr; #ifdef DEBUG - dputs("got button press"); + dbputs("got button press"); #endif scr = wScreenForRootWindow(event->xbutton.root); @@ -708,7 +708,7 @@ handleMapNotify(XEvent *event) WWindow *wwin; #ifdef DEBUG - dputs("got map"); + dbputs("got map"); #endif wwin = wWindowFor(event->xmap.event); @@ -733,7 +733,7 @@ handleUnmapNotify(XEvent *event) Bool withdraw = False; #ifdef DEBUG - dputs("got unmap"); + dbputs("got unmap"); #endif /* only process windows with StructureNotify selected @@ -787,7 +787,7 @@ handleConfigureRequest(XEvent *event) WWindow *wwin; #ifdef DEBUG - dputs("got configure request"); + dbputs("got configure request"); #endif if (!(wwin=wWindowFor(event->xconfigurerequest.window))) { /* @@ -811,7 +811,7 @@ handlePropertyNotify(XEvent *event) WScreen *scr; #ifdef DEBUG - dputs("got property notify"); + dbputs("got property notify"); #endif if ((wwin=wWindowFor(event->xproperty.window))) { if (!XGetGeometry(dpy, wwin->client_win, &jr, &ji, &ji, @@ -841,7 +841,7 @@ handleClientMessage(XEvent *event) WObjDescriptor *desc; #ifdef DEBUG - dputs("got client message"); + dbputs("got client message"); #endif /* handle transition from Normal to Iconic state */ if (event->xclient.message_type == _XA_WM_CHANGE_STATE @@ -978,7 +978,7 @@ handleEnterNotify(XEvent *event) #ifdef DEBUG - dputs("got enter notify"); + dbputs("got enter notify"); #endif if (XCheckTypedWindowEvent(dpy, event->xcrossing.window, LeaveNotify, @@ -1130,7 +1130,7 @@ handleShapeNotify(XEvent *event) XEvent ev; #ifdef DEBUG - dputs("got shape notify"); + dbputs("got shape notify"); #endif while (XCheckTypedWindowEvent(dpy, shev->window, event->type, &ev)) { @@ -1362,7 +1362,7 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) if (!wwin) return; -/* dputs("IN");*/ +/* dbputs("IN");*/ keymap = XGetModifierMapping(dpy); @@ -1398,7 +1398,7 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) WMHandleEvent(&ev); continue; } -/*dputs("EV");*/ +/*dbputs("EV");*/ /* ignore CapsLock */ modifiers = ev.xkey.state & ValidModMask; @@ -1439,7 +1439,7 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) } } } -/*dputs("OUT");*/ +/*dbputs("OUT");*/ XFree(keymap); XUngrabKeyboard(dpy, CurrentTime); @@ -1836,7 +1836,7 @@ handleMotionNotify(XEvent *event) event->xmotion.y_root >= (scr->scr_height - 2)) { #ifdef DEBUG - dputs("pointer at screen edge"); + dbputs("pointer at screen edge"); #endif menu = wMenuUnderPointer(scr); diff --git a/src/funcs.h b/src/funcs.h index d4312299..1aa29bbc 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -162,8 +162,8 @@ Bool wGetIconName(Display *dpy, Window win, char **iconname); /* debugging stuff */ -void dprintf(char *, ...); -void dputs(char *); +void dbprintf(char *, ...); +void dbputs(char *); #endif diff --git a/src/menu.c b/src/menu.c index 20bb572d..4b413ef8 100644 --- a/src/menu.c +++ b/src/menu.c @@ -286,7 +286,7 @@ wMenuInsertCallback(WMenu *menu, int index, char *text, #ifdef DEBUG if (!menu) { - dprintf("Passed NULL as menu parameter to wMenuAddCallback() \n"); + dbprintf("Passed NULL as menu parameter to wMenuAddCallback() \n"); return NULL; } #endif @@ -299,7 +299,7 @@ wMenuInsertCallback(WMenu *menu, int index, char *text, if (menu->entry_no >= menu->alloced_entries) { void *tmp; #ifdef DEBUG - dputs("doing wrealloc()"); + dbputs("doing wrealloc()"); #endif tmp = wrealloc(menu->entries, sizeof(WMenuEntry)*(menu->alloced_entries+5)); @@ -1779,7 +1779,7 @@ wMenuScroll(WMenu *menu, XEvent *event) XEvent ev; #ifdef DEBUG - dputs("Entering menu Scroll"); + dbputs("Entering menu Scroll"); #endif if (omenu->jump_back) @@ -1890,7 +1890,7 @@ wMenuScroll(WMenu *menu, XEvent *event) #ifdef DEBUG - dputs("Leaving menu Scroll"); + dbputs("Leaving menu Scroll"); #endif } @@ -2314,7 +2314,7 @@ menuTitleMouseDown(WCoreWindow *sender, void *data, XEvent *event) Bool started; #ifdef DEBUG - dprintf("Moving menu\n"); + dbprintf("Moving menu\n"); #endif /* can't touch the menu copy */ @@ -2401,7 +2401,7 @@ menuTitleMouseDown(WCoreWindow *sender, void *data, XEvent *event) if (ev.xbutton.button != event->xbutton.button) break; #ifdef DEBUG - dprintf("End menu move\n"); + dbprintf("End menu move\n"); #endif XUngrabPointer(dpy, CurrentTime); return; diff --git a/src/misc.c b/src/misc.c index f420f00c..fa0a2c19 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1462,7 +1462,7 @@ ExecuteShellCommand(WScreen *scr, char *command) -void dprintf(char *format, ...) +void dbprintf(char *format, ...) { va_list args; @@ -1474,7 +1474,7 @@ void dprintf(char *format, ...) -void dputs(char *text) +void dbputs(char *text) { puts(text); fflush(stdout);