From 884a3f1647552c3ea58e95e97d5185e8cb7043f7 Mon Sep 17 00:00:00 2001 From: kojima Date: Thu, 14 Oct 2004 21:24:21 +0000 Subject: [PATCH] fixed cycling --- src/cycling.c | 6 +- src/framewin.c | 2 +- src/monitor.c | 4 +- src/switchpanel.c | 252 ++++++++++++++++++++++++++++-------------------------- src/switchpanel.h | 2 +- 5 files changed, 140 insertions(+), 126 deletions(-) diff --git a/src/cycling.c b/src/cycling.c index ed4c1ae9..9fb899ef 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -216,14 +216,16 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next) scr->flags.doing_alt_tab = 1; #ifdef MOX_CYCLING - swpanel = wInitSwitchPanel(scr, scr->current_workspace); + swpanel = wInitSwitchPanel(scr, wwin, scr->current_workspace); oldFocused = wwin; if (swpanel) { - newFocused = wSwitchPanelSelectNext(swpanel, next); + newFocused = wSwitchPanelSelectNext(swpanel, !next); wWindowFocus(newFocused, oldFocused); oldFocused = newFocused; } + else + newFocused= wwin; #else /* !MOX_CYCLING */ if (next) { if (wPreferences.windows_cycling) diff --git a/src/framewin.c b/src/framewin.c index 16e5c979..f8664bed 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -1076,7 +1076,7 @@ wFrameWindowPaint(WFrameWindow *fwin) break; } - y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE - 1; + y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE; h = WMFontHeight(*fwin->font); /* We use a w+2 buffer to have an extra pixel on the left and diff --git a/src/monitor.c b/src/monitor.c index d502d984..c7a49266 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -94,7 +94,7 @@ int MonitorLoop(int argc, char **argv) char **child_argv= wmalloc(sizeof(char*)*(argc+2)); int i, status; time_t last_start; - + for (i= 0; i < argc; i++) child_argv[i]= argv[i]; child_argv[i++]= "--for-real"; @@ -128,7 +128,7 @@ int MonitorLoop(int argc, char **argv) continue; child_argv[argc]= "--for-real-"; - + /* Check if the wmaker process exited due to a crash */ if (WIFSIGNALED(status) && (WTERMSIG(status) == SIGSEGV || diff --git a/src/switchpanel.c b/src/switchpanel.c index 43303b5b..08efffed 100644 --- a/src/switchpanel.c +++ b/src/switchpanel.c @@ -208,135 +208,147 @@ static void addIconForWindow(WSwitchPanel *panel, WWindow *wwin, int iconWidth) } -WSwitchPanel *wInitSwitchPanel(WScreen *scr, int workspace) +WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace) { - WWindow *wwin; - WSwitchPanel *panel= wmalloc(sizeof(WSwitchPanel)); - int i; - int width; - int height; - int iconWidth = ICON_IDEAL_SIZE; - WMBox *vbox; - - panel->current= 0; - panel->defIcon= NULL; - - panel->normalColor = WMGrayColor(scr->wmscreen); - panel->selectColor = WMWhiteColor(scr->wmscreen); - - panel->scr= scr; - panel->windows= WMCreateArray(10); - - for (wwin= scr->focused_window; wwin; wwin= wwin->prev) { - if (wwin->frame->workspace == workspace && wWindowCanReceiveFocus(wwin) && - (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { - WMInsertInArray(panel->windows, 0, wwin); - } - } - - width= (iconWidth + ICON_EXTRASPACE)*WMGetArrayItemCount(panel->windows); - - if (width > WMScreenWidth(scr->wmscreen)) - { - width= WMScreenWidth(scr->wmscreen) - 100; - iconWidth = width / WMGetArrayItemCount(panel->windows) - ICON_EXTRASPACE; - } - - if (iconWidth < 16 || WMGetArrayItemCount(panel->windows) == 0) - { - /* if there are too many windows, don't bother trying to show the panel */ - WMFreeArray(panel->windows); - wfree(panel); - return NULL; - } - - height= iconWidth + 20 + 10 + ICON_EXTRASPACE; - - panel->icons= WMCreateArray(WMGetArrayItemCount(panel->windows)); - panel->images= WMCreateArray(WMGetArrayItemCount(panel->windows)); - - panel->win = WMCreateWindow(scr->wmscreen, ""); - WMResizeWidget(panel->win, width + 10, height); - - { - WMFrame *frame = WMCreateFrame(panel->win); - WMSetFrameRelief(frame, WRSimple); - WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0); + WWindow *wwin; + WSwitchPanel *panel= wmalloc(sizeof(WSwitchPanel)); + int i; + int width; + int height; + int iconWidth = ICON_IDEAL_SIZE; + WMBox *vbox; + + panel->defIcon= NULL; + + panel->normalColor = WMGrayColor(scr->wmscreen); + panel->selectColor = WMWhiteColor(scr->wmscreen); + + panel->scr= scr; + panel->windows= WMCreateArray(10); + + for (wwin= curwin; wwin; wwin= wwin->prev) { + if (wwin->frame->workspace == workspace && wWindowCanReceiveFocus(wwin) && + (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { + WMInsertInArray(panel->windows, 0, wwin); + } + } + wwin = curwin; + /* start over from the beginning of the list */ + while (wwin->next) + wwin = wwin->next; + + for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { + if (wwin->frame->workspace == workspace && wWindowCanReceiveFocus(wwin) && + (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { + WMInsertInArray(panel->windows, 0, wwin); + } + } - vbox = WMCreateBox(panel->win); - } - WMSetViewExpandsToParent(WMWidgetView(vbox), 5, 5, 5, 5); - WMSetBoxHorizontal(vbox, False); + width= (iconWidth + ICON_EXTRASPACE)*WMGetArrayItemCount(panel->windows); + + if (width > WMScreenWidth(scr->wmscreen)) + { + width= WMScreenWidth(scr->wmscreen) - 100; + iconWidth = width / WMGetArrayItemCount(panel->windows) - ICON_EXTRASPACE; + } + + if (iconWidth < 16 || WMGetArrayItemCount(panel->windows) == 0) + { + /* if there are too many windows, don't bother trying to show the panel */ + WMFreeArray(panel->windows); + wfree(panel); + return NULL; + } + + height= iconWidth + 20 + 10 + ICON_EXTRASPACE; + + panel->icons= WMCreateArray(WMGetArrayItemCount(panel->windows)); + panel->images= WMCreateArray(WMGetArrayItemCount(panel->windows)); + + panel->win = WMCreateWindow(scr->wmscreen, ""); + WMResizeWidget(panel->win, width + 10, height); + + { + WMFrame *frame = WMCreateFrame(panel->win); + WMSetFrameRelief(frame, WRSimple); + WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0); + + vbox = WMCreateBox(panel->win); + } + WMSetViewExpandsToParent(WMWidgetView(vbox), 5, 5, 5, 5); + WMSetBoxHorizontal(vbox, False); - panel->label = WMCreateLabel(vbox); - WMAddBoxSubviewAtEnd(vbox, WMWidgetView(panel->label), False, True, 20, 0, 0); - if (scr->focused_window && scr->focused_window->frame->title) + panel->label = WMCreateLabel(vbox); + WMAddBoxSubviewAtEnd(vbox, WMWidgetView(panel->label), False, True, 20, 0, 0); + if (scr->focused_window && scr->focused_window->frame->title) WMSetLabelText(panel->label, scr->focused_window->frame->title); - else + else WMSetLabelText(panel->label, ""); - { - WMColor *color; - WMFont *boldFont= WMBoldSystemFontOfSize(scr->wmscreen, 12); - - WMSetLabelRelief(panel->label, WRSimple); - WMSetLabelFont(panel->label, boldFont); - color = WMDarkGrayColor(scr->wmscreen); - WMSetWidgetBackgroundColor(panel->label, color); - WMReleaseColor(color); - color = WMWhiteColor(scr->wmscreen); - WMSetLabelTextColor(panel->label, color); - WMReleaseColor(color); - - WMReleaseFont(boldFont); - } + + { + WMColor *color; + WMFont *boldFont= WMBoldSystemFontOfSize(scr->wmscreen, 12); + + WMSetLabelRelief(panel->label, WRSimple); + WMSetLabelFont(panel->label, boldFont); + color = WMDarkGrayColor(scr->wmscreen); + WMSetWidgetBackgroundColor(panel->label, color); + WMReleaseColor(color); + color = WMWhiteColor(scr->wmscreen); + WMSetLabelTextColor(panel->label, color); + WMReleaseColor(color); + + WMReleaseFont(boldFont); + } - { - RImage *tmp= NULL; - RColor bgColor; - char *path = FindImage(wPreferences.pixmap_path, "swtile.png"); - if (path) { - tmp = RLoadImage(panel->scr->rcontext, path, 0); - wfree(path); + { + RImage *tmp= NULL; + RColor bgColor; + char *path = FindImage(wPreferences.pixmap_path, "swtile.png"); + if (path) { + tmp = RLoadImage(panel->scr->rcontext, path, 0); + wfree(path); + } + + if (!tmp) + tmp= RGetImageFromXPMData(scr->rcontext, tile_xpm); + + panel->tile = RScaleImage(tmp, iconWidth+ICON_EXTRASPACE, iconWidth+ICON_EXTRASPACE); + + bgColor.alpha = 255; + bgColor.red = WMRedComponentOfColor(WMGrayColor(scr->wmscreen))>>8; + bgColor.green = WMGreenComponentOfColor(WMGrayColor(scr->wmscreen))>>8; + bgColor.blue = WMBlueComponentOfColor(WMGrayColor(scr->wmscreen))>>8; + + RCombineImageWithColor(panel->tile, &bgColor); + + RReleaseImage(tmp); } - - if (!tmp) - tmp= RGetImageFromXPMData(scr->rcontext, tile_xpm); - - panel->tile = RScaleImage(tmp, iconWidth+ICON_EXTRASPACE, iconWidth+ICON_EXTRASPACE); - - bgColor.alpha = 255; - bgColor.red = WMRedComponentOfColor(WMGrayColor(scr->wmscreen))>>8; - bgColor.green = WMGreenComponentOfColor(WMGrayColor(scr->wmscreen))>>8; - bgColor.blue = WMBlueComponentOfColor(WMGrayColor(scr->wmscreen))>>8; - - RCombineImageWithColor(panel->tile, &bgColor); - - RReleaseImage(tmp); - } - panel->hbox = WMCreateBox(vbox); - WMSetBoxHorizontal(panel->hbox, True); - WMAddBoxSubviewAtEnd(vbox, WMWidgetView(panel->hbox), True, True, 20, 0, 2); - - WM_ITERATE_ARRAY(panel->windows, wwin, i) { - addIconForWindow(panel, wwin, iconWidth); - changeImage(panel, i, 0); - } - - WMMapSubwidgets(panel->win); - WMRealizeWidget(panel->win); - WMMapWidget(panel->win); - { - WMPoint center; - - center= wGetPointToCenterRectInHead(scr, wGetHeadForPointerLocation(scr), - width+10, height); - WMMoveWidget(panel->win, center.x, center.y); - } + panel->hbox = WMCreateBox(vbox); + WMSetBoxHorizontal(panel->hbox, True); + WMAddBoxSubviewAtEnd(vbox, WMWidgetView(panel->hbox), True, True, 20, 0, 4); + + WM_ITERATE_ARRAY(panel->windows, wwin, i) { + addIconForWindow(panel, wwin, iconWidth); + changeImage(panel, i, 0); + } + + WMMapSubwidgets(panel->win); + WMRealizeWidget(panel->win); + WMMapWidget(panel->win); + { + WMPoint center; + + center= wGetPointToCenterRectInHead(scr, wGetHeadForPointerLocation(scr), + width+10, height); + WMMoveWidget(panel->win, center.x, center.y); + } - changeImage(panel, 0, 1); - - return panel; + panel->current= WMGetFirstInArray(panel->windows, curwin); + changeImage(panel, panel->current, 1); + + return panel; } diff --git a/src/switchpanel.h b/src/switchpanel.h index 03b91f37..59007ba2 100644 --- a/src/switchpanel.h +++ b/src/switchpanel.h @@ -24,7 +24,7 @@ typedef struct SwitchPanel WSwitchPanel; -WSwitchPanel *wInitSwitchPanel(WScreen *scr, int workspace); +WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace); void wSwitchPanelDestroy(WSwitchPanel *panel); -- 2.11.4.GIT