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

changed top widget of panels from frame to box

Browse Source
This commit is contained in:
kojima
2001-02-08 21:54:12 +00:00
parent 15b720046b
commit f91f2eb173
18 changed files with 343 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
WPrefs.app/Appearance.c
View File

@@ -38,14 +38,14 @@
#include "TexturePanel.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMLabel *prevL;
@@ -729,10 +729,10 @@ renderTexture(WMScreen *scr, proplist_t texture, int width, int height,
static Pixmap
renderMenu(_Panel *panel, proplist_t texture, int width, int iheight)
{
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
Display *dpy = WMScreenDisplay(scr);
Pixmap pix, tmp;
GC gc = XCreateGC(dpy, WMWidgetXID(panel->win), 0, NULL);
GC gc = XCreateGC(dpy, WMWidgetXID(panel->parent), 0, NULL);
int i;
switch (panel->menuStyle) {
@@ -764,7 +764,7 @@ renderPreview(_Panel *panel, GC gc, int part, int relief)
WMListItem *item;
TextureListItem *titem;
Pixmap pix;
WMScreen *scr = WMWidgetScreen(panel->frame);
WMScreen *scr = WMWidgetScreen(panel->box);
item = WMGetListItem(panel->texLs, panel->textureIndex[part]);
titem = (TextureListItem*)item->clientData;
@@ -787,7 +787,7 @@ renderPreview(_Panel *panel, GC gc, int part, int relief)
static void
updatePreviewBox(_Panel *panel, int elements)
{
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
Display *dpy = WMScreenDisplay(scr);
/* RContext *rc = WMScreenRContext(scr);*/
int refresh = 0;
@@ -796,13 +796,13 @@ updatePreviewBox(_Panel *panel, int elements)
int colorUpdate = 0;
WMColor *black = WMBlackColor(scr);
gc = XCreateGC(dpy, WMWidgetXID(panel->win), 0, NULL);
gc = XCreateGC(dpy, WMWidgetXID(panel->parent), 0, NULL);
if (panel->preview == None) {
WMColor *color;
panel->preview = XCreatePixmap(dpy, WMWidgetXID(panel->win),
panel->preview = XCreatePixmap(dpy, WMWidgetXID(panel->parent),
240-4, 215-4, WMScreenDepth(scr));
color = WMCreateRGBColor(scr, 0x5100, 0x5100, 0x7100, True);
@@ -951,7 +951,7 @@ okNewTexture(void *data)
char *str;
proplist_t prop;
TextureListItem *titem;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
titem = wmalloc(sizeof(TextureListItem));
memset(titem, 0, sizeof(TextureListItem));
@@ -1127,7 +1127,7 @@ extractTexture(WMWidget *w, void *data)
WMSetFilePanelCanChooseDirectories(opanel, False);
WMSetFilePanelCanChooseFiles(opanel, True);
if (WMRunModalFilePanelForDirectory(opanel, panel->win, wgethomedir(),
if (WMRunModalFilePanelForDirectory(opanel, panel->parent, wgethomedir(),
_("Select File"), NULL)) {
path = WMGetFilePanelFileName(opanel);
@@ -1145,7 +1145,7 @@ changePage(WMWidget *w, void *data)
int section;
WMListItem *item;
TextureListItem *titem;
WMScreen *scr = WMWidgetScreen(panel->frame);
WMScreen *scr = WMWidgetScreen(panel->box);
RContext *rc = WMScreenRContext(scr);
static WMPoint positions[] = {
{5, 10},
@@ -1415,7 +1415,7 @@ fillColorList(_Panel *panel)
WMColor *color;
proplist_t list;
WMUserDefaults *udb = WMGetStandardUserDefaults();
WMScreen *scr = WMWidgetScreen(panel->frame);
WMScreen *scr = WMWidgetScreen(panel->box);
int i;
list = WMGetUDObjectForKey(udb, "ColorList");
@@ -1452,7 +1452,7 @@ changeColorPage(WMWidget *w, void *data)
{
_Panel *panel = (_Panel*)data;
int section;
WMScreen *scr = WMWidgetScreen(panel->frame);
WMScreen *scr = WMWidgetScreen(panel->box);
RContext *rc = WMScreenRContext(scr);
static WMPoint positions[] = {
{5, 10},
@@ -1521,7 +1521,7 @@ paintText(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
static void
updateColorPreviewBox(_Panel *panel, int elements)
{
WMScreen *scr = WMWidgetScreen(panel->frame);
WMScreen *scr = WMWidgetScreen(panel->box);
WMPixmap *pixmap;
Pixmap d;
@@ -1689,7 +1689,7 @@ createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMFont *font;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMTabViewItem *item;
int i;
char *tmp;
@@ -1722,12 +1722,11 @@ createPanel(Panel *p)
panel->offLed = WMCreatePixmapFromXPMData(scr, blueled2_xpm);
panel->hand = WMCreatePixmapFromXPMData(scr, hand_xpm);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/* preview box */
panel->prevL = WMCreateLabel(panel->frame);
panel->prevL = WMCreateLabel(panel->box);
WMResizeWidget(panel->prevL, 240, FRAME_HEIGHT - 20);
WMMoveWidget(panel->prevL, 15, 10);
WMSetLabelRelief(panel->prevL, WRSunken);
@@ -1741,14 +1740,14 @@ createPanel(Panel *p)
tabviewDelegate.data = panel;
panel->tabv = WMCreateTabView(panel->frame);
panel->tabv = WMCreateTabView(panel->box);
WMResizeWidget(panel->tabv, 245, FRAME_HEIGHT - 20);
WMMoveWidget(panel->tabv, 265, 10);
WMSetTabViewDelegate(panel->tabv, &tabviewDelegate);
/*** texture list ***/
panel->texF = WMCreateFrame(panel->frame);
panel->texF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->texF, WRFlat);
item = WMCreateTabViewItemWithIdentifier(0);
@@ -1845,7 +1844,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->texF);
/*** colors ***/
panel->colF = WMCreateFrame(panel->frame);
panel->colF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->colF, WRFlat);
item = WMCreateTabViewItemWithIdentifier(1);
@@ -1898,7 +1897,7 @@ createPanel(Panel *p)
#ifdef unfinished
/*** root bg ***/
panel->bgF = WMCreateFrame(panel->frame);
panel->bgF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->bgF, WRFlat);
item = WMCreateTabViewItemWithIdentifier(2);
@@ -1923,7 +1922,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->bgF);
#endif /* unfinished */
/*** options ***/
panel->optF = WMCreateFrame(panel->frame);
panel->optF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->optF, WRFlat);
item = WMCreateTabViewItemWithIdentifier(3);
@@ -2005,8 +2004,8 @@ createPanel(Panel *p)
/**/
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
WMSetPopUpButtonSelectedItem(panel->secP, 0);
@@ -2018,7 +2017,7 @@ createPanel(Panel *p)
fillColorList(panel);
panel->texturePanel = CreateTexturePanel(panel->win);
panel->texturePanel = CreateTexturePanel(panel->parent);
}
@@ -2087,8 +2086,8 @@ showData(_Panel *panel)
if (!str)
str = colorOptions[i*2+1];
if (!(color = WMCreateNamedColor(WMWidgetScreen(panel->frame), str, False))) {
color = WMCreateNamedColor(WMWidgetScreen(panel->frame), "#000000", False);
if (!(color = WMCreateNamedColor(WMWidgetScreen(panel->box), str, False))) {
color = WMCreateNamedColor(WMWidgetScreen(panel->box), "#000000", False);
}
panel->colors[i] = color;
@@ -2219,7 +2218,7 @@ InitAppearance(WMScreen *scr, WMWindow *win)
panel->description = _("Background texture configuration for windows,\n"
"menus and icons.");
panel->win = win;
panel->parent = win;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;
@@ -2254,10 +2253,10 @@ OpenExtractPanelFor(_Panel *panel, char *path)
ExtractPanel *epanel;
WMColor *color;
WMFont *font;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
epanel = wmalloc(sizeof(ExtractPanel));
epanel->win = WMCreatePanelWithStyleForWindow(panel->win, "extract",
epanel->win = WMCreatePanelWithStyleForWindow(panel->parent, "extract",
WMTitledWindowMask
|WMClosableWindowMask);
WMResizeWidget(epanel->win, 245, 250);

32
WPrefs.app/Configurations.c
View File

@@ -24,14 +24,14 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *icoF;
WMButton *icoB[5];
@@ -173,7 +173,7 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
char *buf1, *buf2;
WMPixmap *icon, *altIcon;
RImage *xis = NULL;
@@ -191,19 +191,19 @@ createPanel(Panel *p)
wfree(path);
}
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/*********** Icon Slide Speed **********/
panel->icoF = WMCreateFrame(panel->frame);
panel->icoF = WMCreateFrame(panel->box);
WMResizeWidget(panel->icoF, 230, 45);
WMMoveWidget(panel->icoF, 15, 10);
WMSetFrameTitle(panel->icoF, _("Icon Slide Speed"));
/*********** Shade Animation Speed **********/
panel->shaF = WMCreateFrame(panel->frame);
panel->shaF = WMCreateFrame(panel->box);
WMResizeWidget(panel->shaF, 230, 45);
WMMoveWidget(panel->shaF, 15, 60);
WMSetFrameTitle(panel->shaF, _("Shade Animation Speed"));
@@ -265,7 +265,7 @@ createPanel(Panel *p)
/***************** Smoothed Scaling *****************/
panel->smoF = WMCreateFrame(panel->frame);
panel->smoF = WMCreateFrame(panel->box);
WMResizeWidget(panel->smoF, 115, 110);
WMMoveWidget(panel->smoF, 18, 115);
WMSetFrameTitle(panel->smoF, _("Smooth Scaling"));
@@ -307,7 +307,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->smoF);
/***************** Titlebar Style Size ****************/
panel->titlF = WMCreateFrame(panel->frame);
panel->titlF = WMCreateFrame(panel->box);
WMResizeWidget(panel->titlF, 105, 110);
WMMoveWidget(panel->titlF, 140, 115);
WMSetFrameTitle(panel->titlF, _("Titlebar Style"));
@@ -345,7 +345,7 @@ createPanel(Panel *p)
/**************** Features ******************/
panel->animF = WMCreateFrame(panel->frame);
panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 255, 115);
WMMoveWidget(panel->animF, 255, 10);
WMSetFrameTitle(panel->animF, _("Animations and Sound"));
@@ -423,7 +423,7 @@ createPanel(Panel *p)
/*********** Dithering **********/
panel->cmapSize = 4;
panel->dithF = WMCreateFrame(panel->frame);
panel->dithF = WMCreateFrame(panel->box);
WMResizeWidget(panel->dithF, 255, 95);
WMMoveWidget(panel->dithF, 255, 130);
WMSetFrameTitle(panel->dithF, _("Dithering colormap for 8bpp"));
@@ -467,8 +467,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->dithF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
if (xis)
RDestroyImage(xis);
@@ -511,7 +511,7 @@ storeData(_Panel *panel)
Panel*
InitConfigurations(WMScreen *scr, WMWindow *win)
InitConfigurations(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -524,7 +524,7 @@ InitConfigurations(WMScreen *scr, WMWindow *win)
"toggling and number of colors to reserve for\n"
"Window Maker on 8bit displays.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

19
WPrefs.app/Expert.c
View File

@@ -24,14 +24,14 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMButton *swi[8];
@@ -63,12 +63,11 @@ createPanel(Panel *p)
_Panel *panel = (_Panel*)p;
int i;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
for (i=0; i<7; i++) {
panel->swi[i] = WMCreateSwitchButton(panel->frame);
panel->swi[i] = WMCreateSwitchButton(panel->box);
WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
WMMoveWidget(panel->swi[i], 20, 20+i*25);
}
@@ -81,8 +80,8 @@ createPanel(Panel *p)
WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command"));
WMSetButtonText(panel->swi[6], _("Disable cycling color highlighting of icons"));
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -106,7 +105,7 @@ storeDefaults(_Panel *panel)
Panel*
InitExpert(WMScreen *scr, WMWindow *win)
InitExpert(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -118,7 +117,7 @@ InitExpert(WMScreen *scr, WMWindow *win)
panel->description = _("Options for people who know what they're doing...\n"
"Also have some other misc. options.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeDefaults;

25
WPrefs.app/Focus.c
View File

@@ -24,7 +24,7 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -32,7 +32,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *kfocF;
WMPopUpButton *kfocP;
@@ -231,19 +231,18 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
int i;
char *buf1, *buf2;
WMPixmap *icon;
WMColor *color;
WMFont *font;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/***************** Input Focus Mode *****************/
panel->kfocF = WMCreateFrame(panel->frame);
panel->kfocF = WMCreateFrame(panel->box);
WMResizeWidget(panel->kfocF, 240, 130);
WMMoveWidget(panel->kfocF, 15, 15);
WMSetFrameTitle(panel->kfocF, _("Input Focus Mode"));
@@ -265,7 +264,7 @@ createPanel(Panel *p)
/***************** Colormap Installation Mode ****************/
panel->cfocF = WMCreateFrame(panel->frame);
panel->cfocF = WMCreateFrame(panel->box);
WMResizeWidget(panel->cfocF, 240, 70);
WMMoveWidget(panel->cfocF, 15, 150);
WMSetFrameTitle(panel->cfocF, _("Install colormap in the window..."));
@@ -284,7 +283,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->cfocF);
/***************** Automatic window raise delay *****************/
panel->raisF = WMCreateFrame(panel->frame);
panel->raisF = WMCreateFrame(panel->box);
WMResizeWidget(panel->raisF, 245, 70);
WMMoveWidget(panel->raisF, 265, 15);
WMSetFrameTitle(panel->raisF, _("Automatic Window Raise Delay"));
@@ -354,7 +353,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->raisF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->frame);
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 245, 125);
WMMoveWidget(panel->optF, 265, 95);
@@ -372,8 +371,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->optF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -393,7 +392,7 @@ InitFocus(WMScreen *scr, WMWindow *win)
panel->description = _("Keyboard focus switching policy, colormap switching\n"
"policy for 8bpp displays and other related options.");
panel->win = win;
panel->parent = win;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

48
WPrefs.app/Font.c
View File

@@ -26,14 +26,14 @@
#include <proplist.h>
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMLabel *prevL;
@@ -113,7 +113,7 @@ drawMenuItem(WMScreen *scr, Display *dpy, Drawable d,
static void
paintPreviewBox(Panel *panel)
{
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
Display *dpy = WMScreenDisplay(scr);
GC black = WMColorGC(panel->black);
GC white = WMColorGC(panel->white);
@@ -124,7 +124,7 @@ paintPreviewBox(Panel *panel)
if (panel->preview == None) {
WMPixmap *pix;
panel->preview = XCreatePixmap(dpy, WMWidgetXID(panel->win),
panel->preview = XCreatePixmap(dpy, WMWidgetXID(panel->parent),
240-4, 215-4, WMScreenDepth(scr));
pix = WMCreatePixmapFromXPixmaps(scr, panel->preview, None,
@@ -212,7 +212,7 @@ paintPreviewBox(Panel *panel)
static void
showData(_Panel *panel)
{
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
char *str;
str = GetStringForKey("WindowTitleFont");
@@ -326,7 +326,7 @@ error:
if (pl)
PLRelease(pl);
WMRunAlertPanel(WMWidgetScreen(panel->win), panel->win,
WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
_("Error"), msg, _("OK"), NULL, NULL);
}
@@ -354,14 +354,14 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
WMScreen *scr = WMWidgetScreen(panel->parent);
panel->prevL = WMCreateLabel(panel->frame);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
panel->prevL = WMCreateLabel(panel->box);
WMResizeWidget(panel->prevL, 240, FRAME_HEIGHT-20);
WMMoveWidget(panel->prevL, 15, 10);
WMSetLabelRelief(panel->prevL, WRSunken);
@@ -370,7 +370,7 @@ createPanel(Panel *p)
/* language selection */
panel->langF = WMCreateFrame(panel->frame);
panel->langF = WMCreateFrame(panel->box);
WMResizeWidget(panel->langF, 245, 50);
WMMoveWidget(panel->langF, 265, 10);
WMSetFrameTitle(panel->langF, _("Default Font Sets"));
@@ -383,7 +383,7 @@ createPanel(Panel *p)
/* multibyte */
panel->fsetL = WMCreateLabel(panel->frame);
panel->fsetL = WMCreateLabel(panel->box);
WMResizeWidget(panel->fsetL, 205, 20);
WMMoveWidget(panel->fsetL, 215, 127);
WMSetLabelText(panel->fsetL, _("Font Set"));
@@ -407,32 +407,32 @@ createPanel(Panel *p)
WMReleaseColor(color);
}
panel->fsetLs = WMCreateList(panel->frame);
panel->fsetLs = WMCreateList(panel->box);
WMResizeWidget(panel->fsetLs, 205, 71);
WMMoveWidget(panel->fsetLs, 215, 149);
panel->addB = WMCreateCommandButton(panel->frame);
panel->addB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->addB, 80, 24);
WMMoveWidget(panel->addB, 430, 127);
WMSetButtonText(panel->addB, _("Add..."));
panel->editB = WMCreateCommandButton(panel->frame);
panel->editB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->editB, 80, 24);
WMMoveWidget(panel->editB, 430, 161);
WMSetButtonText(panel->editB, _("Change..."));
panel->remB = WMCreateCommandButton(panel->frame);
panel->remB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->remB, 80, 24);
WMMoveWidget(panel->remB, 430, 195);
WMSetButtonText(panel->remB, _("Remove"));
/* single byte */
panel->fontT = WMCreateTextField(panel->frame);
panel->fontT = WMCreateTextField(panel->box);
WMResizeWidget(panel->fontT, 240, 20);
WMMoveWidget(panel->fontT, 265, 130);
panel->changeB = WMCreateCommandButton(panel->frame);
panel->changeB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->changeB, 104, 24);
WMMoveWidget(panel->changeB, 335, 160);
WMSetButtonText(panel->changeB, _("Change..."));
@@ -453,8 +453,8 @@ createPanel(Panel *p)
WMAddListItem(panel->settingLs, Options[i].description);
}
#endif
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
setLanguageType(panel, False);
@@ -467,7 +467,7 @@ createPanel(Panel *p)
Panel*
InitFont(WMScreen *scr, WMWindow *win)
InitFont(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -477,7 +477,7 @@ InitFont(WMScreen *scr, WMWindow *win)
panel->sectionName = _("Font Preferences");
panel->description = _("Font Configurations for Windows, Menus etc");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;

28
WPrefs.app/Icons.c
View File

@@ -25,7 +25,7 @@
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -33,7 +33,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *posF;
WMFrame *posVF;
@@ -171,12 +171,12 @@ createPanel(Panel *p)
int i;
char buf[16];
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/***************** Positioning of Icons *****************/
panel->posF = WMCreateFrame(panel->frame);
panel->posF = WMCreateFrame(panel->box);
WMResizeWidget(panel->posF, 260, 135);
WMMoveWidget(panel->posF, 25, 10);
WMSetFrameTitle(panel->posF, _("Icon Positioning"));
@@ -208,7 +208,7 @@ createPanel(Panel *p)
WMMoveWidget(panel->posB[6], 70+95, 38+35);
WMResizeWidget(panel->posB[6], 15, 35);
color = WMCreateRGBColor(WMWidgetScreen(panel->win), 0x5100, 0x5100,
color = WMCreateRGBColor(WMWidgetScreen(panel->parent), 0x5100, 0x5100,
0x7100, True);
panel->posVF = WMCreateFrame(panel->posF);
WMResizeWidget(panel->posVF, 95, 70);
@@ -223,7 +223,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->posF);
/***************** Animation ****************/
panel->animF = WMCreateFrame(panel->frame);
panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 205, 135);
WMMoveWidget(panel->animF, 295, 10);
WMSetFrameTitle(panel->animF, _("Iconification Animation"));
@@ -245,7 +245,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->animF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->frame);
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 260, 70);
WMMoveWidget(panel->optF, 25, 150);
/* WMSetFrameTitle(panel->optF, _("Icon Display"));*/
@@ -269,7 +269,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->optF);
/***************** Icon Size ****************/
panel->sizeF = WMCreateFrame(panel->frame);
panel->sizeF = WMCreateFrame(panel->box);
WMResizeWidget(panel->sizeF, 205, 70);
WMMoveWidget(panel->sizeF, 295, 150);
WMSetFrameTitle(panel->sizeF, _("Icon Size"));
@@ -287,8 +287,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->sizeF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -337,7 +337,7 @@ storeData(_Panel *panel)
Panel*
InitIcons(WMScreen *scr, WMWindow *win)
InitIcons(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -349,7 +349,7 @@ InitIcons(WMScreen *scr, WMWindow *win)
panel->description = _("Icon/Miniwindow handling options. Icon positioning\n"
"area, sizes of icons, miniaturization animation style.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

25
WPrefs.app/KeyboardSettings.c
View File

@@ -24,7 +24,7 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -32,7 +32,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *delaF;
WMButton *delaB[4];
@@ -55,7 +55,7 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
int i;
WMColor *color;
WMFont *font;
@@ -63,12 +63,11 @@ createPanel(Panel *p)
color = WMDarkGrayColor(scr);
font = WMSystemFontOfSize(scr, 10);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/**************** Initial Key Repeat ***************/
panel->delaF = WMCreateFrame(panel->frame);
panel->delaF = WMCreateFrame(panel->box);
WMResizeWidget(panel->delaF, 495, 60);
WMMoveWidget(panel->delaF, 15, 10);
WMSetFrameTitle(panel->delaF, _("Initial Key Repeat"));
@@ -109,7 +108,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->delaF);
/**************** Key Repeat Rate ***************/
panel->rateF = WMCreateFrame(panel->frame);
panel->rateF = WMCreateFrame(panel->box);
WMResizeWidget(panel->rateF, 495, 60);
WMMoveWidget(panel->rateF, 15, 95);
WMSetFrameTitle(panel->rateF, _("Key Repeat Rate"));
@@ -149,7 +148,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->rateF);
panel->testT = WMCreateTextField(panel->frame);
panel->testT = WMCreateTextField(panel->box);
WMResizeWidget(panel->testT, 480, 20);
WMMoveWidget(panel->testT, 20, 180);
WMSetTextFieldText(panel->testT, _("Type here to test"));
@@ -157,14 +156,14 @@ createPanel(Panel *p)
WMReleaseColor(color);
WMReleaseFont(font);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
}
Panel*
InitKeyboardSettings(WMScreen *scr, WMWindow *win)
InitKeyboardSettings(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -175,7 +174,7 @@ InitKeyboardSettings(WMScreen *scr, WMWindow *win)
panel->description = _("Not done");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;

31
WPrefs.app/KeyboardShortcuts.c
View File

@@ -28,7 +28,7 @@
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -36,7 +36,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMLabel *actL;
WMList *actLs;
@@ -177,14 +177,14 @@ static void
captureClick(WMWidget *w, void *data)
{
_Panel *panel = (_Panel*)data;
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->parent));
char *shortcut;
if (!panel->capturing) {
panel->capturing = 1;
WMSetButtonText(w, _("Cancel"));
WMSetLabelText(panel->instructionsL, _("Press the desired shortcut key(s) or click Cancel to stop capturing."));
XGrabKeyboard(dpy, WMWidgetXID(panel->win), True, GrabModeAsync,
XGrabKeyboard(dpy, WMWidgetXID(panel->parent), True, GrabModeAsync,
GrabModeAsync, CurrentTime);
shortcut = captureShortcut(dpy, panel);
if (shortcut) {
@@ -341,20 +341,21 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMColor *color;
WMFont *boldFont;
panel->capturing = 0;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
boldFont = WMBoldSystemFontOfSize(scr, 12);
/* **************** Actions **************** */
panel->actL = WMCreateLabel(panel->frame);
panel->actL = WMCreateLabel(panel->box);
WMResizeWidget(panel->actL, 280, 20);
WMMoveWidget(panel->actL, 20, 10);
WMSetLabelFont(panel->actL, boldFont);
@@ -368,7 +369,7 @@ createPanel(Panel *p)
WMSetLabelTextColor(panel->actL, color);
WMReleaseColor(color);
panel->actLs = WMCreateList(panel->frame);
panel->actLs = WMCreateList(panel->box);
WMResizeWidget(panel->actLs, 280, 190);
WMMoveWidget(panel->actLs, 20, 32);
WMSetListUserDrawProc(panel->actLs, paintItem);
@@ -430,7 +431,7 @@ createPanel(Panel *p)
/***************** Shortcut ****************/
panel->shoF = WMCreateFrame(panel->frame);
panel->shoF = WMCreateFrame(panel->box);
WMResizeWidget(panel->shoF, 190, 210);
WMMoveWidget(panel->shoF, 315, 10);
WMSetFrameTitle(panel->shoF, _("Shortcut"));
@@ -464,8 +465,8 @@ createPanel(Panel *p)
WMReleaseFont(boldFont);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
@@ -499,7 +500,7 @@ storeData(_Panel *panel)
Panel*
InitKeyboardShortcuts(WMScreen *scr, WMWindow *win)
InitKeyboardShortcuts(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -511,7 +512,7 @@ InitKeyboardShortcuts(WMScreen *scr, WMWindow *win)
panel->description = _("Change the keyboard shortcuts for actions such\n"
"as changing workspaces and opening menus.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

62
WPrefs.app/Menu.c
View File

@@ -46,13 +46,13 @@ typedef enum {
#define MAX_SECTION_SIZE 4
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFont *boldFont;
@@ -311,7 +311,7 @@ static void
sgrabClicked(WMWidget *w, void *data)
{
_Panel *panel = (_Panel*)data;
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->parent));
char *shortcut;
@@ -324,7 +324,7 @@ sgrabClicked(WMWidget *w, void *data)
if (!panel->capturing) {
panel->capturing = 1;
WMSetButtonText(w, _("Cancel"));
XGrabKeyboard(dpy, WMWidgetXID(panel->win), True, GrabModeAsync,
XGrabKeyboard(dpy, WMWidgetXID(panel->parent), True, GrabModeAsync,
GrabModeAsync, CurrentTime);
shortcut = captureShortcut(dpy, panel);
if (shortcut) {
@@ -408,7 +408,7 @@ static void
createPanel(_Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMColor *black = WMBlackColor(scr);
WMColor *white = WMWhiteColor(scr);
WMColor *gray = WMGrayColor(scr);
@@ -465,12 +465,10 @@ createPanel(_Panel *p)
XFreeGC(dpy, gc);
}
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->typeP = WMCreatePopUpButton(panel->frame);
panel->typeP = WMCreatePopUpButton(panel->box);
WMResizeWidget(panel->typeP, 150, 20);
WMMoveWidget(panel->typeP, 10, 10);
@@ -487,16 +485,16 @@ createPanel(_Panel *p)
WEditMenu *smenu;
ItemData *data;
pad = makeFactoryMenu(panel->frame, 150);
pad = makeFactoryMenu(panel->box, 150);
WMMoveWidget(pad, 10, 40);
data = putNewItem(panel, pad, ExecInfo, "Run Program");
data = putNewItem(panel, pad, CommandInfo, "Internal Command");
smenu = putNewSubmenu(pad, "Submenu");
data = putNewItem(panel, pad, ExternalInfo, "External Submenu");
data = putNewItem(panel, pad, PipeInfo, "Generated Submenu");
data = putNewItem(panel, pad, DirectoryInfo, "Directory Contents");
data = putNewItem(panel, pad, WSMenuInfo, "Workspace Menu");
data = putNewItem(panel, pad, ExecInfo, _("Run Program"));
data = putNewItem(panel, pad, CommandInfo, _("Internal Command"));
smenu = putNewSubmenu(pad, _("Submenu"));
data = putNewItem(panel, pad, ExternalInfo, _("External Submenu"));
data = putNewItem(panel, pad, PipeInfo, _("Generated Submenu"));
data = putNewItem(panel, pad, DirectoryInfo, _("Directory Contents"));
data = putNewItem(panel, pad, WSMenuInfo, _("Workspace Menu"));
panel->itemPad[0] = pad;
}
@@ -506,12 +504,12 @@ createPanel(_Panel *p)
ItemData *data;
WMScrollView *sview;
sview = WMCreateScrollView(panel->frame);
sview = WMCreateScrollView(panel->box);
WMResizeWidget(sview, 150, 180);
WMMoveWidget(sview, 10, 40);
WMSetScrollViewHasVerticalScroller(sview, True);
pad = makeFactoryMenu(panel->frame, 130);
pad = makeFactoryMenu(panel->box, 130);
WMSetScrollViewContentView(sview, WMWidgetView(pad));
@@ -562,12 +560,12 @@ createPanel(_Panel *p)
ItemData *data;
WMScrollView *sview;
sview = WMCreateScrollView(panel->frame);
sview = WMCreateScrollView(panel->box);
WMResizeWidget(sview, 150, 180);
WMMoveWidget(sview, 10, 40);
WMSetScrollViewHasVerticalScroller(sview, True);
pad = makeFactoryMenu(panel->frame, 130);
pad = makeFactoryMenu(panel->box, 130);
WMSetScrollViewContentView(sview, WMWidgetView(pad));
@@ -629,7 +627,7 @@ createPanel(_Panel *p)
width = FRAME_WIDTH - 20 - 150 - 10;
panel->optionsF = WMCreateFrame(panel->frame);
panel->optionsF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optionsF, width, FRAME_HEIGHT - 15);
WMMoveWidget(panel->optionsF, 10 + 150 + 10, 5);
@@ -855,9 +853,9 @@ createPanel(_Panel *p)
" - click on a menu item to change related information"));
WMMapWidget(label);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMMapWidget(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
WMMapWidget(panel->box);
{
@@ -889,7 +887,7 @@ createPanel(_Panel *p)
{
WMPoint pos;
pos = WMGetViewScreenPosition(WMWidgetView(panel->frame));
pos = WMGetViewScreenPosition(WMWidgetView(panel->box));
if (pos.x < 200) {
pos.x += FRAME_WIDTH + 20;
@@ -1433,7 +1431,7 @@ menuItemSelected(WEditMenuDelegate *delegate, WEditMenu *menu,
static WEditMenu*
buildSubmenu(_Panel *panel, proplist_t pl)
{
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WEditMenu *menu;
WEditMenuItem *item;
char *title;
@@ -1522,7 +1520,7 @@ getDefaultMenu(_Panel *panel)
sprintf(buffer, _("Could not open default menu from '%s'"),
menuPath);
WMRunAlertPanel(WMWidgetScreen(panel->win), panel->win,
WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
_("Error"), buffer, _("OK"), NULL, NULL);
}
}
@@ -1557,7 +1555,7 @@ showData(_Panel *panel)
if (!pmenu || !PLIsArray(pmenu)) {
int res;
res = WMRunAlertPanel(WMWidgetScreen(panel->win), panel->win,
res = WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
_("Warning"),
_("The menu file format currently in use is not supported\n"
"by this tool. Do you want to discard the current menu\n"
@@ -1800,7 +1798,7 @@ hideMenus(_Panel *panel)
Panel*
InitMenu(WMScreen *scr, WMWindow *win)
InitMenu(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -1811,7 +1809,7 @@ InitMenu(WMScreen *scr, WMWindow *win)
panel->description = _("Edit the menu for launching applications.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

28
WPrefs.app/MenuPreferences.c
View File

@@ -24,7 +24,7 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -32,7 +32,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *scrF;
WMButton *scrB[5];
@@ -95,20 +95,18 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMBox *hbox, *vbox;
WMPixmap *icon;
int i;
char *buf1, *buf2;
char *path;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/***************** Menu Scroll Speed ****************/
panel->scrF = WMCreateFrame(panel->frame);
panel->scrF = WMCreateFrame(panel->box);
WMResizeWidget(panel->scrF, 235, 90);
WMMoveWidget(panel->scrF, 25, 20);
WMSetFrameTitle(panel->scrF, _("Menu Scrolling Speed"));
@@ -157,7 +155,7 @@ createPanel(Panel *p)
/***************** Submenu Alignment ****************/
panel->aliF = WMCreateFrame(panel->frame);
panel->aliF = WMCreateFrame(panel->box);
WMResizeWidget(panel->aliF, 220, 90);
WMMoveWidget(panel->aliF, 280, 20);
WMSetFrameTitle(panel->aliF, _("Submenu Alignment"));
@@ -197,7 +195,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->aliF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->frame);
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 475, 80);
WMMoveWidget(panel->optF, 25, 130);
@@ -213,8 +211,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->optF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -222,7 +220,7 @@ createPanel(Panel *p)
Panel*
InitMenuPreferences(WMScreen *scr, WMWindow *win)
InitMenuPreferences(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -234,7 +232,7 @@ InitMenuPreferences(WMScreen *scr, WMWindow *win)
panel->description = _("Menu usability related options. Scrolling speed,\n"
"alignment of submenus etc.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

33
WPrefs.app/MouseSettings.c
View File

@@ -38,7 +38,7 @@
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -46,7 +46,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *speedF;
WMLabel *speedL;
@@ -169,11 +169,11 @@ speedChange(WMWidget *w, void *data)
tmp = WMGetTextFieldText(panel->threT);
if (sscanf(tmp, "%i", &threshold)!=1 || threshold < 0
|| threshold > panel->maxThreshold) {
WMRunAlertPanel(WMWidgetScreen(panel->win), GetWindow(panel), _("Error"),
WMRunAlertPanel(WMWidgetScreen(panel->parent), GetWindow(panel), _("Error"),
_("Invalid mouse acceleration threshold value. Must be the number of pixels to travel before accelerating."),
_("OK"), NULL, NULL);
} else {
setMouseAccel(WMWidgetScreen(panel->win), panel->acceleration,
setMouseAccel(WMWidgetScreen(panel->parent), panel->acceleration,
threshold);
}
wfree(tmp);
@@ -259,7 +259,7 @@ showData(_Panel *panel)
int a=-1, b=-1, c=-1;
float accel;
char buffer[32];
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->parent));
str = GetStringForKey("SelectWindowsMouseButton");
if (str) {
@@ -457,7 +457,7 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMPixmap *icon;
char *buf1, *buf2;
int i;
@@ -468,12 +468,11 @@ createPanel(Panel *p)
color.green = 0xae;
color.blue = 0xaa;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/**************** Mouse Speed ****************/
panel->speedF = WMCreateFrame(panel->frame);
panel->speedF = WMCreateFrame(panel->box);
WMResizeWidget(panel->speedF, 245, 100);
WMMoveWidget(panel->speedF, 15, 15);
WMSetFrameTitle(panel->speedF, _("Mouse Speed"));
@@ -531,7 +530,7 @@ createPanel(Panel *p)
/***************** Doubleclick Delay ****************/
panel->ddelaF = WMCreateFrame(panel->frame);
panel->ddelaF = WMCreateFrame(panel->box);
WMResizeWidget(panel->ddelaF, 245, 95);
WMMoveWidget(panel->ddelaF, 15, 125);
WMSetFrameTitle(panel->ddelaF, _("Double-Click Delay"));
@@ -605,7 +604,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->ddelaF);
/* ************** Workspace Action Buttons **************** */
panel->menuF = WMCreateFrame(panel->frame);
panel->menuF = WMCreateFrame(panel->box);
WMResizeWidget(panel->menuF, 240, 145);
WMMoveWidget(panel->menuF, 270, 15);
WMSetFrameTitle(panel->menuF, _("Workspace Mouse Actions"));
@@ -656,7 +655,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->menuF);
/* ************** Grab Modifier **************** */
panel->grabF = WMCreateFrame(panel->frame);
panel->grabF = WMCreateFrame(panel->box);
WMResizeWidget(panel->grabF, 240, 55);
WMMoveWidget(panel->grabF, 270, 165);
WMSetFrameTitle(panel->grabF, _("Mouse Grab Modifier"));
@@ -674,8 +673,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->grabF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
@@ -808,7 +807,7 @@ storeData(_Panel *panel)
Panel*
InitMouseSettings(WMScreen *scr, WMWindow *win)
InitMouseSettings(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -820,7 +819,7 @@ InitMouseSettings(WMScreen *scr, WMWindow *win)
panel->description = _("Mouse speed/acceleration, double click delay,\n"
"mouse button bindings etc.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

28
WPrefs.app/Paths.c
View File

@@ -25,14 +25,14 @@
#include <unistd.h>
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
char *description;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMTabView *tabv;
@@ -145,7 +145,7 @@ browseForFile(WMWidget *w, void *data)
WMSetFilePanelCanChooseFiles(filePanel, False);
if (WMRunModalFilePanelForDirectory(filePanel, panel->win, "/",
if (WMRunModalFilePanelForDirectory(filePanel, panel->parent, "/",
_("Select directory"), NULL) == True) {
char *str = WMGetFilePanelFileName(filePanel);
@@ -241,7 +241,7 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMTabViewItem *tab;
panel->white = WMWhiteColor(scr);
@@ -249,18 +249,18 @@ createPanel(Panel *p)
panel->red = WMCreateRGBColor(scr, 0xffff, 0, 0, True);
panel->font = WMSystemFontOfSize(scr, 12);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
panel->tabv = WMCreateTabView(panel->frame);
panel->tabv = WMCreateTabView(panel->box);
WMMoveWidget(panel->tabv, 12, 10);
WMResizeWidget(panel->tabv, 500, 215);
/* icon path */
panel->icoF = WMCreateFrame(panel->frame);
panel->icoF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->icoF, WRFlat);
WMResizeWidget(panel->icoF, 230, 210);
@@ -291,7 +291,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->icoF);
/* pixmap path */
panel->pixF = WMCreateFrame(panel->frame);
panel->pixF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->pixF, WRFlat);
WMResizeWidget(panel->pixF, 230, 210);
@@ -322,8 +322,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->pixF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -331,7 +331,7 @@ createPanel(Panel *p)
Panel*
InitPaths(WMScreen *scr, WMWindow *win)
InitPaths(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -343,7 +343,7 @@ InitPaths(WMScreen *scr, WMWindow *win)
panel->description = _("Search paths to use when looking for pixmaps\n"
"and icons.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

27
WPrefs.app/Preferences.c
View File

@@ -24,7 +24,7 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -32,7 +32,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *sizeF;
WMPopUpButton *sizeP;
@@ -203,13 +203,12 @@ createPanel(Panel *p)
_Panel *panel = (_Panel*)p;
int i;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/***************** Size Display ****************/
panel->sizeF = WMCreateFrame(panel->frame);
panel->sizeF = WMCreateFrame(panel->box);
WMResizeWidget(panel->sizeF, 240, 60);
WMMoveWidget(panel->sizeF, 20, 10);
WMSetFrameTitle(panel->sizeF, _("Size Display"));
@@ -229,7 +228,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->sizeF);
/***************** Position Display ****************/
panel->posiF = WMCreateFrame(panel->frame);
panel->posiF = WMCreateFrame(panel->box);
WMResizeWidget(panel->posiF, 240, 60);
WMMoveWidget(panel->posiF, 20, 75);
WMSetFrameTitle(panel->posiF, _("Position Display"));
@@ -248,7 +247,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->posiF);
/***************** Balloon Text ****************/
panel->ballF = WMCreateFrame(panel->frame);
panel->ballF = WMCreateFrame(panel->box);
WMResizeWidget(panel->ballF, 235, 125);
WMMoveWidget(panel->ballF, 270, 10);
WMSetFrameTitle(panel->ballF, _("Show balloon text for..."));
@@ -266,7 +265,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->ballF);
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->frame);
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 235, 75);
WMMoveWidget(panel->optF, 270, 145);
@@ -285,7 +284,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->optF);
/***************** Workspace border ****************/
panel->borderF = WMCreateFrame(panel->frame);
panel->borderF = WMCreateFrame(panel->box);
WMResizeWidget(panel->borderF, 240, 75);
WMMoveWidget(panel->borderF, 20, 145);
WMSetFrameTitle(panel->borderF, _("Workspace border"));
@@ -314,8 +313,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->borderF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -323,7 +322,7 @@ createPanel(Panel *p)
Panel*
InitPreferences(WMScreen *scr, WMWindow *win)
InitPreferences(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -334,7 +333,7 @@ InitPreferences(WMScreen *scr, WMWindow *win)
panel->description = _("Various settings like balloon text, geometry\n"
"displays etc.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

31
WPrefs.app/Themes.c
View File

@@ -26,13 +26,13 @@
#include <unistd.h>
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMButton *saveB;
WMList *list;
@@ -93,7 +93,7 @@ downloadFile(WMScreen *scr, _Panel *panel, char *file)
if (pid < 0) {
wsyserror("could not fork() process");
WMRunAlertPanel(scr, panel->win, _("Error"),
WMRunAlertPanel(scr, GetWindow(panel), _("Error"),
"Could not start download. fork() failed",
_("OK"), NULL, NULL);
return -1;
@@ -162,25 +162,24 @@ createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
panel->saveB = WMCreateCommandButton(panel->frame);
panel->saveB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->saveB, 154, 24);
WMMoveWidget(panel->saveB, 15, 10);
WMSetButtonText(panel->saveB, _("Save Current Theme"));
panel->list = WMCreateList(panel->frame);
panel->list = WMCreateList(panel->box);
WMResizeWidget(panel->list, 154, 150);
WMMoveWidget(panel->list, 15, 40);
panel->loadB = WMCreateCommandButton(panel->frame);
panel->loadB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->loadB, 74, 24);
WMMoveWidget(panel->loadB, 15, 200);
WMSetButtonText(panel->loadB, _("Load"));
panel->instB = WMCreateCommandButton(panel->frame);
panel->instB = WMCreateCommandButton(panel->box);
WMResizeWidget(panel->instB, 74, 24);
WMMoveWidget(panel->instB, 95, 200);
WMSetButtonText(panel->instB, _("Install"));
@@ -188,7 +187,7 @@ createPanel(Panel *p)
/**************** Tile of the day ****************/
panel->totF = WMCreateFrame(panel->frame);
panel->totF = WMCreateFrame(panel->box);
WMResizeWidget(panel->totF, 210, 105);
WMMoveWidget(panel->totF, 240, 10);
WMSetFrameTitle(panel->totF, _("Tile of The Day"));
@@ -208,7 +207,7 @@ createPanel(Panel *p)
/**************** Bar of the day ****************/
panel->botF = WMCreateFrame(panel->frame);
panel->botF = WMCreateFrame(panel->box);
WMResizeWidget(panel->botF, 315, 95);
WMMoveWidget(panel->botF, 190, 125);
WMSetFrameTitle(panel->botF, _("Bar of The Day"));
@@ -226,8 +225,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->botF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -241,7 +240,7 @@ storeData(_Panel *panel)
Panel*
InitThemes(WMScreen *scr, WMWindow *win)
InitThemes(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -250,7 +249,7 @@ InitThemes(WMScreen *scr, WMWindow *win)
panel->sectionName = _("Themes");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

82
WPrefs.app/WPrefs.c
View File

@@ -25,37 +25,37 @@
#include <assert.h>
extern Panel *InitWindowHandling(WMScreen *scr, WMWindow *win);
extern Panel *InitWindowHandling(WMScreen *scr, WMWidget *parent);
extern Panel *InitKeyboardSettings(WMScreen *scr, WMWindow *win);
extern Panel *InitKeyboardSettings(WMScreen *scr, WMWidget *parent);
extern Panel *InitMouseSettings(WMScreen *scr, WMWindow *win);
extern Panel *InitMouseSettings(WMScreen *scr, WMWidget *parent);
extern Panel *InitKeyboardShortcuts(WMScreen *scr, WMWindow *win);
extern Panel *InitKeyboardShortcuts(WMScreen *scr, WMWidget *parent);
extern Panel *InitWorkspace(WMScreen *scr, WMWindow *win);
extern Panel *InitWorkspace(WMScreen *scr, WMWidget *parent);
extern Panel *InitFocus(WMScreen *scr, WMWindow *win);
extern Panel *InitFocus(WMScreen *scr, WMWidget *parent);
extern Panel *InitPreferences(WMScreen *scr, WMWindow *win);
extern Panel *InitPreferences(WMScreen *scr, WMWidget *parent);
extern Panel *InitFont(WMScreen *scr, WMWindow *win);
extern Panel *InitFont(WMScreen *scr, WMWidget *parent);
extern Panel *InitConfigurations(WMScreen *scr, WMWindow *win);
extern Panel *InitConfigurations(WMScreen *scr, WMWidget *parent);
extern Panel *InitPaths(WMScreen *scr, WMWindow *win);
extern Panel *InitPaths(WMScreen *scr, WMWidget *parent);
extern Panel *InitMenu(WMScreen *scr, WMWindow *win);
extern Panel *InitMenu(WMScreen *scr, WMWidget *parent);
extern Panel *InitExpert(WMScreen *scr, WMWindow *win);
extern Panel *InitExpert(WMScreen *scr, WMWidget *parent);
extern Panel *InitMenuPreferences(WMScreen *scr, WMWindow *win);
extern Panel *InitMenuPreferences(WMScreen *scr, WMWidget *parent);
extern Panel *InitIcons(WMScreen *scr, WMWindow *win);
extern Panel *InitIcons(WMScreen *scr, WMWidget *parent);
extern Panel *InitThemes(WMScreen *scr, WMWindow *win);
extern Panel *InitThemes(WMScreen *scr, WMWidget *parent);
extern Panel *InitAppearance(WMScreen *scr, WMWindow *win);
extern Panel *InitAppearance(WMScreen *scr, WMWidget *parent);
@@ -379,7 +379,7 @@ showPanel(Panel *panel)
if (rec->callbacks.showPanel)
(*rec->callbacks.showPanel)(panel);
WMMapWidget(rec->frame);
WMMapWidget(rec->box);
}
@@ -389,7 +389,7 @@ hidePanel(Panel *panel)
{
PanelRec *rec = (PanelRec*)panel;
WMUnmapWidget(rec->frame);
WMUnmapWidget(rec->box);
if (rec->callbacks.hidePanel)
(*rec->callbacks.hidePanel)(panel);
@@ -413,9 +413,14 @@ changeSection(WMWidget *self, void *data)
if (WPrefs.currentPanel == data)
return;
if (WPrefs.banner) {
WMDestroyWidget(WPrefs.banner);
WPrefs.banner = NULL;
if (WPrefs.currentPanel == NULL) {
WMDestroyWidget(WPrefs.nameL);
WMDestroyWidget(WPrefs.creditsL);
WMDestroyWidget(WPrefs.versionL);
WMDestroyWidget(WPrefs.statusL);
WMSetFrameRelief(WPrefs.banner, WRGroove);
/* WMMapWidget(WPrefs.undosBtn);
WMMapWidget(WPrefs.undoBtn);
*/
@@ -431,8 +436,6 @@ changeSection(WMWidget *self, void *data)
char*
LocateImage(char *name)
{
@@ -688,33 +691,34 @@ Initialize(WMScreen *scr)
WMSetLabelText(WPrefs.statusL, _("Initializing configuration panels..."));
InitWindowHandling(scr, WPrefs.win);
InitFocus(scr, WPrefs.win);
InitMenuPreferences(scr, WPrefs.win);
InitIcons(scr, WPrefs.win);
InitPreferences(scr, WPrefs.win);
InitFocus(scr, WPrefs.banner);
InitWindowHandling(scr, WPrefs.banner);
InitPaths(scr, WPrefs.win);
InitWorkspace(scr, WPrefs.win);
InitConfigurations(scr, WPrefs.win);
InitMenuPreferences(scr, WPrefs.banner);
InitIcons(scr, WPrefs.banner);
InitPreferences(scr, WPrefs.banner);
InitMenu(scr, WPrefs.win);
InitPaths(scr, WPrefs.banner);
InitWorkspace(scr, WPrefs.banner);
InitConfigurations(scr, WPrefs.banner);
InitMenu(scr, WPrefs.banner);
#ifdef not_yet_fully_implemented
InitKeyboardSettings(scr, WPrefs.win);
InitKeyboardSettings(scr, WPrefs.banner);
#endif
InitKeyboardShortcuts(scr, WPrefs.win);
InitMouseSettings(scr, WPrefs.win);
InitKeyboardShortcuts(scr, WPrefs.banner);
InitMouseSettings(scr, WPrefs.banner);
InitAppearance(scr, WPrefs.win);
InitAppearance(scr, WPrefs.banner);
#ifdef akk
InitFont(scr, WPrefs.win);
InitFont(scr, WPrefs.banner);
#endif
#ifdef not_yet_fully_implemented
InitThemes(scr, WPrefs.win);
InitThemes(scr, WPrefs.banner);
#endif
InitExpert(scr, WPrefs.win);
InitExpert(scr, WPrefs.banner);
WMRealizeWidget(WPrefs.scrollV);

10
WPrefs.app/WPrefs.h
View File

@@ -41,8 +41,8 @@
/****/
#define WVERSION "0.43"
#define WMVERSION "0.62.x"
#define WVERSION "0.44"
#define WMVERSION "0.64.x"
extern char *NOptionValueChanged;
@@ -63,7 +63,7 @@ typedef struct {
/* all Panels must start with the following layout */
typedef struct PanelRec {
WMFrame *frame;
WMBox *box;
char *sectionName; /* section name to display in titlebar */
@@ -113,8 +113,8 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data);
#define FRAME_TOP 105
#define FRAME_LEFT -2
#define FRAME_WIDTH 524
#define FRAME_LEFT -1
#define FRAME_WIDTH 522
#define FRAME_HEIGHT 235

78
WPrefs.app/WindowHandling.c
View File

@@ -24,7 +24,7 @@
#include "WPrefs.h"
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -32,7 +32,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *placF;
WMPopUpButton *placP;
@@ -218,21 +218,28 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMColor *color;
WMPixmap *pixmap;
int width, height;
int swidth, sheight;
char *path;
WMBox *hbox;
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 2, 2);
WMSetBoxHorizontal(panel->box, False);
WMSetBoxBorderWidth(panel->box, 8);
hbox = WMCreateBox(panel->box);
WMSetBoxHorizontal(hbox, True);
WMAddBoxSubview(panel->box, WMWidgetView(hbox), False, True, 110, 0, 10);
/************** Window Placement ***************/
panel->placF = WMCreateFrame(panel->frame);
WMResizeWidget(panel->placF, 270, 110);
WMMoveWidget(panel->placF, 20, 10);
panel->placF = WMCreateFrame(hbox);
WMMapWidget(panel->placF);
WMAddBoxSubview(hbox, WMWidgetView(panel->placF), True, True, 100, 0, 10);
WMSetFrameTitle(panel->placF, _("Window Placement"));
WMSetBalloonTextForView(_("How to place windows when they are first put\n"
"on screen."), WMWidgetView(panel->placF));
@@ -269,18 +276,18 @@ createPanel(Panel *p)
if (sheight > swidth) {
height = 70;
width = 70*swidth/sheight;
if (width > 115)
width = 115;
height = 115*sheight/swidth;
if (width > 240)
width = 240;
height = 240*sheight/swidth;
} else {
width = 115;
height = 115*sheight/swidth;
width = 240;
height = 240*sheight/swidth;
if (height > 70)
height = 70;
width = 70*swidth/sheight;
}
WMResizeWidget(panel->porigF, width, height);
WMMoveWidget(panel->porigF, 130+(115-width)/2, 20+(70-height)/2);
WMMoveWidget(panel->porigF, 130+(240-width)/2, 20+(70-height)/2);
panel->porigW = WMCreateLabel(panel->porigF);
WMResizeWidget(panel->porigW, THUMB_SIZE, THUMB_SIZE);
@@ -290,14 +297,14 @@ createPanel(Panel *p)
panel->hsli = WMCreateSlider(panel->placF);
WMResizeWidget(panel->hsli, width, 12);
WMMoveWidget(panel->hsli, 130+(115-width)/2, 20+(70-height)/2+height+2);
WMMoveWidget(panel->hsli, 130+(240-width)/2, 20+(70-height)/2+height+2);
WMSetSliderAction(panel->hsli, sliderCallback, panel);
WMSetSliderMinValue(panel->hsli, 0);
WMSetSliderMaxValue(panel->hsli, swidth);
panel->vsli = WMCreateSlider(panel->placF);
WMResizeWidget(panel->vsli, 12, height);
WMMoveWidget(panel->vsli, 130+(115-width)/2+width+2, 20+(70-height)/2);
WMMoveWidget(panel->vsli, 130+(240-width)/2+width+2, 20+(70-height)/2);
WMSetSliderAction(panel->vsli, sliderCallback, panel);
WMSetSliderMinValue(panel->vsli, 0);
WMSetSliderMaxValue(panel->vsli, sheight);
@@ -307,9 +314,10 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->placF);
/************** Opaque Move ***************/
panel->opaqF = WMCreateFrame(panel->frame);
WMResizeWidget(panel->opaqF, 205, 110);
WMMoveWidget(panel->opaqF, 300, 10);
panel->opaqF = WMCreateFrame(hbox);
WMMapWidget(panel->opaqF);
WMAddBoxSubview(hbox, WMWidgetView(panel->opaqF), False, True, 110, 0, 0);
WMSetFrameTitle(panel->opaqF, _("Opaque Move"));
WMSetBalloonTextForView(_("Whether the window contents should be moved\n"
"when dragging windows aroung or if only a\n"
@@ -318,7 +326,7 @@ createPanel(Panel *p)
panel->opaqB = WMCreateButton(panel->opaqF, WBTToggle);
WMResizeWidget(panel->opaqB, 64, 64);
WMMoveWidget(panel->opaqB, 70, 25);
WMMoveWidget(panel->opaqB, 24, 25);
WMSetButtonImagePosition(panel->opaqB, WIPImageOnly);
path = LocateImage(NON_OPAQUE_MOVE_PIXMAP);
@@ -347,18 +355,18 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->opaqF);
/**************** Account for Icon/Dock ***************/
panel->maxiF = WMCreateFrame(panel->frame);
panel->maxiF = WMCreateFrame(panel->box);
WMResizeWidget(panel->maxiF, 205, 95);
WMMoveWidget(panel->maxiF, 300, 125);
WMMoveWidget(panel->maxiF, 305, 125);
WMSetFrameTitle(panel->maxiF, _("When maximizing..."));
panel->miconB = WMCreateSwitchButton(panel->maxiF);
WMResizeWidget(panel->miconB, 185, 30);
WMResizeWidget(panel->miconB, 190, 30);
WMMoveWidget(panel->miconB, 10, 18);
WMSetButtonText(panel->miconB, _("...do not cover icons"));
panel->mdockB = WMCreateSwitchButton(panel->maxiF);
WMResizeWidget(panel->mdockB, 185, 30);
WMResizeWidget(panel->mdockB, 190, 30);
WMMoveWidget(panel->mdockB, 10, 53);
WMSetButtonText(panel->mdockB, _("...do not cover dock"));
@@ -367,9 +375,9 @@ createPanel(Panel *p)
/**************** Edge Resistance ****************/
panel->resF = WMCreateFrame(panel->frame);
WMResizeWidget(panel->resF, 270, 45);
WMMoveWidget(panel->resF, 20, 125);
panel->resF = WMCreateFrame(panel->box);
WMResizeWidget(panel->resF, 285, 45);
WMMoveWidget(panel->resF, 8, 125);
WMSetFrameTitle(panel->resF, _("Edge Resistance"));
WMSetBalloonTextForView(_("Edge resistance will make windows `resist'\n"
@@ -405,9 +413,9 @@ createPanel(Panel *p)
/**************** Transients on Parent Workspace ****************/
panel->tranF = WMCreateFrame(panel->frame);
WMResizeWidget(panel->tranF, 270, 40);
WMMoveWidget(panel->tranF, 20, 180);
panel->tranF = WMCreateFrame(panel->box);
WMResizeWidget(panel->tranF, 285, 40);
WMMoveWidget(panel->tranF, 8, 180);
panel->tranB = WMCreateSwitchButton(panel->tranF);
WMMoveWidget(panel->tranB, 10, 5);
@@ -416,8 +424,8 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->tranF);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
/* show the config data */
showData(panel);
@@ -432,7 +440,7 @@ undo(_Panel *panel)
Panel*
InitWindowHandling(WMScreen *scr, WMWindow *win)
InitWindowHandling(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -444,7 +452,7 @@ InitWindowHandling(WMScreen *scr, WMWindow *win)
panel->description = _("Window handling options. Initial placement style\n"
"edge resistance, opaque move etc.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;

23
WPrefs.app/Workspace.c
View File

@@ -25,7 +25,7 @@
typedef struct _Panel {
WMFrame *frame;
WMBox *box;
char *sectionName;
@@ -33,7 +33,7 @@ typedef struct _Panel {
CallbackRec callbacks;
WMWindow *win;
WMWidget *parent;
WMFrame *navF;
@@ -151,7 +151,7 @@ static void
createPanel(Panel *p)
{
_Panel *panel = (_Panel*)p;
WMScreen *scr = WMWidgetScreen(panel->win);
WMScreen *scr = WMWidgetScreen(panel->parent);
WMPixmap *icon1, *icon2;
RImage *xis = NULL;
RContext *rc = WMScreenRContext(scr);
@@ -166,12 +166,11 @@ createPanel(Panel *p)
wfree(path);
}
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
panel->box = WMCreateBox(panel->parent);
WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
/***************** Workspace Navigation *****************/
panel->navF = WMCreateFrame(panel->frame);
panel->navF = WMCreateFrame(panel->box);
WMResizeWidget(panel->navF, 365, 210);
WMMoveWidget(panel->navF, 15, 10);
WMSetFrameTitle(panel->navF, _("Workspace Navigation"));
@@ -279,7 +278,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->navF);
/***************** Dock/Clip *****************/
panel->dockF = WMCreateFrame(panel->frame);
panel->dockF = WMCreateFrame(panel->box);
WMResizeWidget(panel->dockF, 115, 210);
WMMoveWidget(panel->dockF, 390, 10);
WMSetFrameTitle(panel->dockF, _("Dock/Clip"));
@@ -331,8 +330,8 @@ createPanel(Panel *p)
if (xis)
RDestroyImage(xis);
WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);
showData(panel);
}
@@ -355,7 +354,7 @@ storeData(_Panel *panel)
Panel*
InitWorkspace(WMScreen *scr, WMWindow *win)
InitWorkspace(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
@@ -367,7 +366,7 @@ InitWorkspace(WMScreen *scr, WMWindow *win)
panel->description = _("Workspace navigation features.\n"
"You can also enable/disable the Dock and Clip here.");
panel->win = win;
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;
panel->callbacks.updateDomain = storeData;