gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

- fixed a frame size in WPrefs menu editor

Browse Source 
- removed // comments
- commented out printfs in unfinished selection code
This commit is contained in:
dan
2002-07-01 23:52:22 +00:00
parent 579eb01c6c
commit 048b43aea4
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -9,6 +9,8 @@ Do ASAP:
- finish session stuff - finish session stuff
- add multiline support for balloons - add multiline support for balloons
- remove colors_per_channel stuff from wmaker after? - 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: Need to do:
=========== ===========

8
WINGs/WINGs/WINGs.h
View File

@@ -654,7 +654,7 @@ void WMDeleteEventHandler(WMView *view, unsigned long mask,
int WMIsDoubleClick(XEvent *event); int WMIsDoubleClick(XEvent *event);
//int WMIsTripleClick(XEvent *event); /*int WMIsTripleClick(XEvent *event);*/
void WMNextEvent(Display *dpy, 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 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); void WMPrependTextBlock(WMText *tPtr, void *vtb);

16
WINGs/selection.c
View File

@@ -62,7 +62,7 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp)
if (!selHandlers) if (!selHandlers)
return; return;
printf("deleting selection handler for %d", win); /*//printf("deleting selection handler for %d", win);*/
WM_ITERATE_ARRAY(selHandlers, handler, iter) { WM_ITERATE_ARRAY(selHandlers, handler, iter) {
if (handler->view == view if (handler->view == view
@@ -71,16 +71,16 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp)
if (handler->flags.done_pending) { if (handler->flags.done_pending) {
handler->flags.delete_pending = 1; handler->flags.delete_pending = 1;
puts(": postponed because still pending"); /*//puts(": postponed because still pending");*/
return; return;
} }
printf(": found & removed"); /*//printf(": found & removed");*/
WMRemoveFromArray(selHandlers, handler); WMRemoveFromArray(selHandlers, handler);
break; break;
} }
} }
printf("\n"); /*//printf("\n");*/
XGrabServer(dpy); XGrabServer(dpy);
if (XGetSelectionOwner(dpy, selection) == win) { if (XGetSelectionOwner(dpy, selection) == win) {
@@ -349,8 +349,8 @@ handleNotifyEvent(XEvent *event)
void void
W_HandleSelectionEvent(XEvent *event) W_HandleSelectionEvent(XEvent *event)
{ {
printf("%d received selection ", event->xany.window); /*//printf("%d received selection ", event->xany.window);*/
switch(event->type) { /*//switch(event->type) {
case SelectionNotify: case SelectionNotify:
puts("notify"); break; puts("notify"); break;
case SelectionRequest: case SelectionRequest:
@@ -359,7 +359,7 @@ W_HandleSelectionEvent(XEvent *event)
puts("clear"); break; puts("clear"); break;
default: default:
puts("unknown"); break; puts("unknown"); break;
} }*/
if (event->type == SelectionNotify) { if (event->type == SelectionNotify) {
handleNotifyEvent(event); handleNotifyEvent(event);
@@ -385,7 +385,7 @@ WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
WMPostNotificationName(WMSelectionOwnerDidChangeNotification, WMPostNotificationName(WMSelectionOwnerDidChangeNotification,
(void*)selection, (void*)view); (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)); handler = wmalloc(sizeof(SelectionHandler));

4
WINGs/wtextfield.c
View File

@@ -303,8 +303,10 @@ selectionNotification(void *observerData, WMNotification *notification)
WMView *newOwnerView = (WMView*)WMGetNotificationClientData(notification); WMView *newOwnerView = (WMView*)WMGetNotificationClientData(notification);
if (observerView != newOwnerView) { if (observerView != newOwnerView) {
/*
//if (tPtr->flags.ownsSelection) //if (tPtr->flags.ownsSelection)
// WMDeleteSelectionHandler(observerView, XA_PRIMARY, CurrentTime); // WMDeleteSelectionHandler(observerView, XA_PRIMARY, CurrentTime);
*/
lostSelection(observerView, XA_PRIMARY, NULL); lostSelection(observerView, XA_PRIMARY, NULL);
} }
} }
@@ -1598,7 +1600,7 @@ destroyTextField(TextField *tPtr)
#endif #endif
WMReleaseFont(tPtr->font); WMReleaseFont(tPtr->font);
// use lostSelection() instead of WMDeleteSelectionHandler aici? /*// use lostSelection() instead of WMDeleteSelectionHandler here?*/
WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime); WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime);
WMRemoveNotificationObserver(tPtr); WMRemoveNotificationObserver(tPtr);

2
WPrefs.app/Menu.c
View File

@@ -731,7 +731,7 @@ createPanel(_Panel *p)
/* pipe */ /* pipe */
panel->pipeF = WMCreateFrame(panel->optionsF); panel->pipeF = WMCreateFrame(panel->optionsF);
WMResizeWidget(panel->pipeF, width, 150); WMResizeWidget(panel->pipeF, width, 155);
WMMoveWidget(panel->pipeF, 10, 30); WMMoveWidget(panel->pipeF, 10, 30);
WMSetFrameTitle(panel->pipeF, _("Command")); WMSetFrameTitle(panel->pipeF, _("Command"));

8
src/window.c
View File

@@ -474,24 +474,24 @@ wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
*/ */
if (wwin->user_flags.no_appicon && wwin->defined_user_flags.no_appicon) if (wwin->user_flags.no_appicon && wwin->defined_user_flags.no_appicon)
wwin->user_flags.emulate_appicon = 0; wwin->user_flags.emulate_appicon = 0;
//WSETUFLAG(wwin, emulate_appicon, 0); /*//WSETUFLAG(wwin, emulate_appicon, 0);*/
if (wwin->main_window!=None) { if (wwin->main_window!=None) {
WApplication *wapp = wApplicationOf(wwin->main_window); WApplication *wapp = wApplicationOf(wwin->main_window);
if (wapp && !wapp->flags.emulated) if (wapp && !wapp->flags.emulated)
wwin->user_flags.emulate_appicon = 0; wwin->user_flags.emulate_appicon = 0;
//WSETUFLAG(wwin, emulate_appicon, 0); /*//WSETUFLAG(wwin, emulate_appicon, 0);*/
} }
if (wwin->transient_for!=None if (wwin->transient_for!=None
&& wwin->transient_for!=wwin->screen_ptr->root_win) && wwin->transient_for!=wwin->screen_ptr->root_win)
wwin->user_flags.emulate_appicon = 0; 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 if (wwin->user_flags.sunken && wwin->defined_user_flags.sunken
&& wwin->user_flags.floating && wwin->defined_user_flags.floating) && wwin->user_flags.floating && wwin->defined_user_flags.floating)
wwin->user_flags.sunken = 0; wwin->user_flags.sunken = 0;
//WSETUFLAG(wwin, sunken, 0); /*//WSETUFLAG(wwin, sunken, 0);*/
WSETUFLAG(wwin, no_shadeable, WFLAGP(wwin, no_titlebar)); WSETUFLAG(wwin, no_shadeable, WFLAGP(wwin, no_titlebar));