1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00

wmaker: add workspace pager underlying configuration

This path is adding the functions and variables needed for workspace pager preferences.
An option to enable/disable the workspace pager, and one to set a default background image.
This commit is contained in:
David Maciejak
2014-12-04 13:34:56 +07:00
committed by Carlos R. Mafra
parent ea8f18aff1
commit 519302223c
4 changed files with 32 additions and 1 deletions

View File

@@ -3,6 +3,7 @@
PopupSwitchMenu = NO; PopupSwitchMenu = NO;
MenuStyle = normal; MenuStyle = normal;
DisableMiniwindows = NO; DisableMiniwindows = NO;
DisableWorkspacePager = NO;
OpenTransientOnOwnerWorkspace = NO; OpenTransientOnOwnerWorkspace = NO;
EdgeResistance = 30; EdgeResistance = 30;
WorkspaceBorderSize = 0; WorkspaceBorderSize = 0;

View File

@@ -393,6 +393,8 @@ extern struct WPreferences {
char sticky_icons; /* If miniwindows will be onmipresent */ char sticky_icons; /* If miniwindows will be onmipresent */
char dont_confirm_kill; /* do not confirm Kill application */ char dont_confirm_kill; /* do not confirm Kill application */
char disable_miniwindows; char disable_miniwindows;
char disable_workspace_pager;
char dont_blink; /* do not blink icon selection */ char dont_blink; /* do not blink icon selection */
/* Appearance options */ /* Appearance options */
@@ -455,6 +457,8 @@ extern struct WPreferences {
RImage *swtileImage; RImage *swtileImage;
RImage *swbackImage[9]; RImage *swbackImage[9];
union WTexture *wsmbackTexture;
int show_clip_title; int show_clip_title;
struct { struct {

View File

@@ -4,6 +4,8 @@
* *
* Copyright (c) 1997-2003 Alfredo K. Kojima * Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu * Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2014 Window Maker Team
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -144,6 +146,7 @@ static WDECallbackUpdate setHightlightText;
static WDECallbackUpdate setKeyGrab; static WDECallbackUpdate setKeyGrab;
static WDECallbackUpdate setDoubleClick; static WDECallbackUpdate setDoubleClick;
static WDECallbackUpdate setIconPosition; static WDECallbackUpdate setIconPosition;
static WDECallbackUpdate setWorkspaceMapBackground;
static WDECallbackUpdate setClipTitleFont; static WDECallbackUpdate setClipTitleFont;
static WDECallbackUpdate setClipTitleColor; static WDECallbackUpdate setClipTitleColor;
@@ -348,7 +351,9 @@ WDefaultEntry staticOptionList[] = {
{"ClipMergedInDock", "NO", NULL, {"ClipMergedInDock", "NO", NULL,
NULL, getBool, setClipMergedInDock, NULL, NULL}, NULL, getBool, setClipMergedInDock, NULL, NULL},
{"DisableMiniwindows", "NO", NULL, {"DisableMiniwindows", "NO", NULL,
&wPreferences.disable_miniwindows, getBool, NULL, NULL, NULL} &wPreferences.disable_miniwindows, getBool, NULL, NULL, NULL},
{"DisableWorkspacePager", "NO", NULL,
&wPreferences.disable_workspace_pager, getBool, NULL, NULL, NULL}
}; };
#define NUM2STRING_(x) #x #define NUM2STRING_(x) #x
@@ -598,6 +603,8 @@ WDefaultEntry optionList[] = {
NULL, getColor, setFrameFocusedBorderColor, NULL, NULL}, NULL, getColor, setFrameFocusedBorderColor, NULL, NULL},
{"FrameSelectedBorderColor", "white", NULL, {"FrameSelectedBorderColor", "white", NULL,
NULL, getColor, setFrameSelectedBorderColor, NULL, NULL}, NULL, getColor, setFrameSelectedBorderColor, NULL, NULL},
{"WorkspaceMapBack", "(solid, black)", NULL,
NULL, getTexture, setWorkspaceMapBackground, NULL, NULL},
/* keybindings */ /* keybindings */
@@ -659,6 +666,8 @@ WDefaultEntry optionList[] = {
NULL, getKeybind, setKeyGrab, NULL, NULL}, NULL, getKeybind, setKeyGrab, NULL, NULL},
{"SelectKey", "None", (void *)WKBD_SELECT, {"SelectKey", "None", (void *)WKBD_SELECT,
NULL, getKeybind, setKeyGrab, NULL, NULL}, NULL, getKeybind, setKeyGrab, NULL, NULL},
{"WorkspaceMapKey", "None", (void *)WKBD_WORKSPACEMAP,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"FocusNextKey", "None", (void *)WKBD_FOCUSNEXT, {"FocusNextKey", "None", (void *)WKBD_FOCUSNEXT,
NULL, getKeybind, setKeyGrab, NULL, NULL}, NULL, getKeybind, setKeyGrab, NULL, NULL},
{"FocusPrevKey", "None", (void *)WKBD_FOCUSPREV, {"FocusPrevKey", "None", (void *)WKBD_FOCUSPREV,
@@ -3242,6 +3251,22 @@ static int updateUsableArea(WScreen * scr, WDefaultEntry * entry, void *bar, voi
return 0; return 0;
} }
static int setWorkspaceMapBackground(WScreen *scr, WDefaultEntry *entry, void *tdata, void *foo)
{
WTexture **texture = tdata;
/* Parameter not used, but tell the compiler that it is ok */
(void) entry;
(void) foo;
if (wPreferences.wsmbackTexture)
wTextureDestroy(scr, wPreferences.wsmbackTexture);
wPreferences.wsmbackTexture = *texture;
return REFRESH_WINDOW_TEXTURES;
}
static int setMenuStyle(WScreen * scr, WDefaultEntry * entry, void *tdata, void *foo) static int setMenuStyle(WScreen * scr, WDefaultEntry * entry, void *tdata, void *foo)
{ {
/* Parameter not used, but tell the compiler that it is ok */ /* Parameter not used, but tell the compiler that it is ok */

View File

@@ -69,6 +69,7 @@ enum {
WKBD_RAISELOWER, WKBD_RAISELOWER,
WKBD_MOVERESIZE, WKBD_MOVERESIZE,
WKBD_SHADE, WKBD_SHADE,
WKBD_WORKSPACEMAP,
WKBD_FOCUSNEXT, WKBD_FOCUSNEXT,
WKBD_FOCUSPREV, WKBD_FOCUSPREV,
WKBD_GROUPNEXT, WKBD_GROUPNEXT,