From 048b43aea4421f4aa7a78a1348b958d2decc5910 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 1 Jul 2002 23:52:22 +0000 Subject: [PATCH] - fixed a frame size in WPrefs menu editor - removed // comments - commented out printfs in unfinished selection code --- TODO | 2 ++ WINGs/WINGs/WINGs.h | 8 ++++---- WINGs/selection.c | 16 ++++++++-------- WINGs/wtextfield.c | 4 +++- WPrefs.app/Menu.c | 2 +- src/window.c | 8 ++++---- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/TODO b/TODO index 35d8539d..8a8f4f8c 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ Do ASAP: - finish session stuff - add multiline support for balloons - remove colors_per_channel stuff from wmaker after? ++ finish the ability to browse for files/dirs in the WPrefs menu editor ++ finish selections and DND stuff in WINGs Need to do: =========== diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h index c746e26d..fe2c2ac6 100644 --- a/WINGs/WINGs/WINGs.h +++ b/WINGs/WINGs/WINGs.h @@ -654,7 +654,7 @@ void WMDeleteEventHandler(WMView *view, unsigned long mask, int WMIsDoubleClick(XEvent *event); -//int WMIsTripleClick(XEvent *event); +/*int WMIsTripleClick(XEvent *event);*/ void WMNextEvent(Display *dpy, XEvent *event); @@ -1651,11 +1651,11 @@ void WMGetTextBlockProperties(WMText *tPtr, void *vtb, unsigned int *first, int WMGetTextInsertType(WMText *tPtr); -//int WMGetTextBlocks(WMText *tPtr); +/*int WMGetTextBlocks(WMText *tPtr); -//void WMSetCurrentTextBlock(WMText *tPtr, int current); +void WMSetCurrentTextBlock(WMText *tPtr, int current); -//int WMGetCurrentTextBlock(WMText *tPtr); +int WMGetCurrentTextBlock(WMText *tPtr);*/ void WMPrependTextBlock(WMText *tPtr, void *vtb); diff --git a/WINGs/selection.c b/WINGs/selection.c index a9908f3a..59da2821 100644 --- a/WINGs/selection.c +++ b/WINGs/selection.c @@ -62,7 +62,7 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp) if (!selHandlers) return; - printf("deleting selection handler for %d", win); + /*//printf("deleting selection handler for %d", win);*/ WM_ITERATE_ARRAY(selHandlers, handler, iter) { if (handler->view == view @@ -71,16 +71,16 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp) if (handler->flags.done_pending) { handler->flags.delete_pending = 1; - puts(": postponed because still pending"); + /*//puts(": postponed because still pending");*/ return; } - printf(": found & removed"); + /*//printf(": found & removed");*/ WMRemoveFromArray(selHandlers, handler); break; } } - printf("\n"); + /*//printf("\n");*/ XGrabServer(dpy); if (XGetSelectionOwner(dpy, selection) == win) { @@ -349,8 +349,8 @@ handleNotifyEvent(XEvent *event) void W_HandleSelectionEvent(XEvent *event) { - printf("%d received selection ", event->xany.window); - switch(event->type) { + /*//printf("%d received selection ", event->xany.window);*/ + /*//switch(event->type) { case SelectionNotify: puts("notify"); break; case SelectionRequest: @@ -359,7 +359,7 @@ W_HandleSelectionEvent(XEvent *event) puts("clear"); break; default: puts("unknown"); break; - } + }*/ if (event->type == SelectionNotify) { handleNotifyEvent(event); @@ -385,7 +385,7 @@ WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp, WMPostNotificationName(WMSelectionOwnerDidChangeNotification, (void*)selection, (void*)view); - printf("created selection handler for %d\n", W_VIEW_DRAWABLE(view)); + /*//printf("created selection handler for %d\n", W_VIEW_DRAWABLE(view));*/ handler = wmalloc(sizeof(SelectionHandler)); diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c index d576708f..1d2de3fe 100644 --- a/WINGs/wtextfield.c +++ b/WINGs/wtextfield.c @@ -303,8 +303,10 @@ selectionNotification(void *observerData, WMNotification *notification) WMView *newOwnerView = (WMView*)WMGetNotificationClientData(notification); if (observerView != newOwnerView) { + /* //if (tPtr->flags.ownsSelection) // WMDeleteSelectionHandler(observerView, XA_PRIMARY, CurrentTime); + */ lostSelection(observerView, XA_PRIMARY, NULL); } } @@ -1598,7 +1600,7 @@ destroyTextField(TextField *tPtr) #endif WMReleaseFont(tPtr->font); - // use lostSelection() instead of WMDeleteSelectionHandler aici? + /*// use lostSelection() instead of WMDeleteSelectionHandler here?*/ WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime); WMRemoveNotificationObserver(tPtr); diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c index b478a74a..d7027df8 100644 --- a/WPrefs.app/Menu.c +++ b/WPrefs.app/Menu.c @@ -731,7 +731,7 @@ createPanel(_Panel *p) /* pipe */ panel->pipeF = WMCreateFrame(panel->optionsF); - WMResizeWidget(panel->pipeF, width, 150); + WMResizeWidget(panel->pipeF, width, 155); WMMoveWidget(panel->pipeF, 10, 30); WMSetFrameTitle(panel->pipeF, _("Command")); diff --git a/src/window.c b/src/window.c index e5a7b889..bf4feefa 100644 --- a/src/window.c +++ b/src/window.c @@ -474,24 +474,24 @@ wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace) */ if (wwin->user_flags.no_appicon && wwin->defined_user_flags.no_appicon) wwin->user_flags.emulate_appicon = 0; - //WSETUFLAG(wwin, emulate_appicon, 0); + /*//WSETUFLAG(wwin, emulate_appicon, 0);*/ if (wwin->main_window!=None) { WApplication *wapp = wApplicationOf(wwin->main_window); if (wapp && !wapp->flags.emulated) wwin->user_flags.emulate_appicon = 0; - //WSETUFLAG(wwin, emulate_appicon, 0); + /*//WSETUFLAG(wwin, emulate_appicon, 0);*/ } if (wwin->transient_for!=None && wwin->transient_for!=wwin->screen_ptr->root_win) wwin->user_flags.emulate_appicon = 0; - //WSETUFLAG(wwin, emulate_appicon, 0); + /*//WSETUFLAG(wwin, emulate_appicon, 0);*/ if (wwin->user_flags.sunken && wwin->defined_user_flags.sunken && wwin->user_flags.floating && wwin->defined_user_flags.floating) wwin->user_flags.sunken = 0; - //WSETUFLAG(wwin, sunken, 0); + /*//WSETUFLAG(wwin, sunken, 0);*/ WSETUFLAG(wwin, no_shadeable, WFLAGP(wwin, no_titlebar)); -- 2.11.4.GIT