gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-02 22:25:48 +01:00
Code Issues Projects Releases Wiki Activity

- Check whether libXft is at least version 2.1.2 else refuse to compile.

Browse Source 
- Fixed bug in icon chooser dialog that could cause a segmentation fault
  in some cases (Pascal Hofstee <caelian@gmail.com>)
- Fixed crash in asm code in wrlib, with new versions of gcc.
- Fixed bug in the x86_PseudoColor_32_to_8() function which incorrectly
  used the r, g, b fields in the conversion.
- Fixed x86 ASM code in wrlib to work on 64 bit architectures.
- Fixed the focus flicker seen with some apps (notably gtk2)
  (Alexey Spiridonov <snarkmaster@gmail.com>)
- Fixed all crashing bugs that were generated by wmaker starting with the
  WMState file missing.
- Added NetWM support (a modified version of the patch originaly written
  by Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied patch to enhance the Virtual Desktop behaviour, and to integrate
  it with the NetWM code (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied a few xinerama and placement fixes (Peter Zijlstra
    <a.p.zijlstra@chello.nl>)
- Fixed memory leak in dock code.
- Fixed and enhanced the text wrapping in WINGs.
- Fixed the layout of some elements in WPrefs.app
- Added workaround for aplications that don't set the required hints on the
  client leader window, but they set them on normal windows (observer with
  KDE 3.3.0 mainly). This will allow these apps to get an appicon again.
  (they should be fixed still)
- Added workaround for applications that do not set a command with
  XSetCommand(), but instead they set the _NET_WM_PID property. This works
  with operating systems that offer a /proc interface similar to what linux
  has. (This also is to fix problems with KDE 3.3.0 apps, but not only them).
- Fixed bug with autostart and exit scripts not being executed if user
  GNUstep path was different from ~/GNUstep (when setting GNUSTEP_USER_ROOT)
- Added utf8 support in WINGs (removed old X core font code)
- Added utility to convert old font names to new font names in style files
This commit is contained in:
dan
2004-10-12 01:34:32 +00:00
parent c7c68c6fe7
commit 9aca0d5f6e
88 changed files with 6638 additions and 3497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WPrefs.app/Appearance.c
View File

@@ -109,9 +109,9 @@ typedef struct _Panel {
char oldTabItem;
char menuStyle;
int menuStyle;
char titleAlignment;
int titleAlignment;
Pixmap preview;
Pixmap previewNoText;

2
WPrefs.app/Expert.c
View File

@@ -84,7 +84,7 @@ createPanel(Panel *p)
WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart)."));
//if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
WMSetButtonEnabled(panel->swi[7], False);
WMSetButtonEnabled(panel->swi[7], True);
WMRealizeWidget(panel->box);
WMMapSubwidgets(panel->box);

24
WPrefs.app/Focus.c
View File

@@ -219,7 +219,7 @@ createPanel(Panel *p)
WMSetBoxHorizontal(box, False);
panel->kfocB[0] = WMCreateRadioButton(box);
WMSetButtonText(panel->kfocB[0], _("Manual: Click on the window to set "\
WMSetButtonText(panel->kfocB[0], _("Manual: Click on the window to set "\
"keyboard input focus"));
WMAddBoxSubview(box, WMWidgetView(panel->kfocB[0]), True, True,
20, 0, 0);
@@ -243,13 +243,13 @@ createPanel(Panel *p)
WMSetFrameTitle(panel->cfocF, _("Install colormap in the window..."));
panel->manB = WMCreateRadioButton(panel->cfocF);
WMResizeWidget(panel->manB, 220, 20);
WMMoveWidget(panel->manB, 15, 18);
WMResizeWidget(panel->manB, 225, 20);
WMMoveWidget(panel->manB, 10, 18);
WMSetButtonText(panel->manB, _("...that has the input focus."));
panel->autB = WMCreateRadioButton(panel->cfocF);
WMResizeWidget(panel->autB, 220, 20);
WMMoveWidget(panel->autB, 15, 40);
WMResizeWidget(panel->autB, 225, 20);
WMMoveWidget(panel->autB, 10, 43);
WMSetButtonText(panel->autB, _("...that is under the mouse pointer."));
WMGroupButtons(panel->manB, panel->autB);
@@ -331,15 +331,15 @@ createPanel(Panel *p)
WMMoveWidget(panel->optF, 265, 95);
panel->ignB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->ignB, 210, 50);
WMMoveWidget(panel->ignB, 15, 10);
WMSetButtonText(panel->ignB, _("Do not let applications receive\n"
"the click used to focus windows."));
WMResizeWidget(panel->ignB, 225, 50);
WMMoveWidget(panel->ignB, 10, 10);
WMSetButtonText(panel->ignB, _("Do not let applications receive "
"the click used to focus windows."));
panel->newB = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->newB, 210, 35);
WMMoveWidget(panel->newB, 15, 70);
WMSetButtonText(panel->newB, _("Automatically focus new\nwindows."));
WMResizeWidget(panel->newB, 225, 35);
WMMoveWidget(panel->newB, 10, 70);
WMSetButtonText(panel->newB, _("Automatically focus new windows."));
WMMapSubwidgets(panel->optF);

66
WPrefs.app/Font.c
View File

@@ -23,7 +23,7 @@
#include "WPrefs.h"
#include <X11/Xlocale.h>
#include <ctype.h>
typedef struct _Panel {
WMBox *box;
@@ -358,7 +358,7 @@ paintItems(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
int l = strlen(text);
int x = previewPositions[part].pos.x;
int y = previewPositions[part].pos.y;
int w = previewPositions[part].size.width;
//int w = previewPositions[part].size.width;
int h = previewPositions[part].size.height/4;
int i;
for( i = 0; i < 4 ; i++) {
@@ -443,7 +443,7 @@ dumpRImage(char *path, RImage *image)
}
}
static int
/*static int
isPixmap(WMPropList *prop)
{
WMPropList *p;
@@ -455,7 +455,7 @@ isPixmap(WMPropList *prop)
return 1;
else
return 0;
}
}*/
static Pixmap
renderTexture(WMScreen *scr, WMPropList *texture, int width, int height,
@@ -669,7 +669,7 @@ renderMenu(_Panel *panel, WMPropList *texture, int width, int iheight)
WMScreen *scr = WMWidgetScreen(panel->parent);
Display *dpy = WMScreenDisplay(scr);
Pixmap pix, tmp;
RContext *rc = WMScreenRContext(scr);
//RContext *rc = WMScreenRContext(scr);
GC gc = XCreateGC(dpy, WMWidgetXID(panel->parent), 0, NULL);
int i;
@@ -835,7 +835,7 @@ paintPreviewBox(Panel *panel, int elements)
{
WMScreen *scr = WMWidgetScreen(panel->parent);
Display *dpy = WMScreenDisplay(scr);
int refresh = 0;
//int refresh = 0;
GC gc;
WMColor *black = WMBlackColor(scr);
Pixmap mitem;
@@ -926,7 +926,7 @@ static void
paintTextField(void *data, int section)
{
_Panel *panel = (_Panel*)data;
char *sample = NULL;
//char *sample = NULL;
int encoding;
encoding = WMGetPopUpButtonSelectedItem(panel->langP);
WMSetTextFieldFont(panel->fontT, getFontForPreview(panel, section));
@@ -1072,7 +1072,7 @@ refillFontSetList(void *data)
char *encoding = getFontEncoding(panel);
int section = WMGetPopUpButtonSelectedItem(panel->fontSel);
int i;
int pos;
//int pos;
WMClearList(panel->fsetLs);
if(!encoding) {
array = getCurrentFontProp(panel, section);
@@ -1259,7 +1259,7 @@ static void
changeLanguageAction(WMWidget *w, void *data)
{
Panel *panel = (Panel*)data;
WMScreen *scr = WMWidgetScreen(panel->box);
//WMScreen *scr = WMWidgetScreen(panel->box);
int section;
section = WMGetPopUpButtonSelectedItem(w);
@@ -1314,7 +1314,7 @@ static char*
getFontSampleString(void *data)
{
_Panel *panel = (_Panel*)data;
WMScreen *scr = WMWidgetScreen(panel->box);
//WMScreen *scr = WMWidgetScreen(panel->box);
WMMenuItem *mi;
WMPropList *pl;
int section;
@@ -1336,7 +1336,7 @@ static char*
getFontEncoding(void *data)
{
_Panel *panel = (_Panel*)data;
WMScreen *scr = WMWidgetScreen(panel->box);
//WMScreen *scr = WMWidgetScreen(panel->box);
WMMenuItem *mi;
WMPropList *pl;
int section;
@@ -1358,7 +1358,7 @@ static Bool
isEncodingMultiByte(void *data)
{
_Panel *panel = (_Panel*)data;
WMScreen *scr = WMWidgetScreen(panel->box);
//WMScreen *scr = WMWidgetScreen(panel->box);
WMMenuItem *mi;
WMPropList *pl;
int section;
@@ -1473,26 +1473,20 @@ getDefaultSystemFont(void *data, int element)
{
_Panel *panel = (_Panel*)data;
WMScreen *scr = WMWidgetScreen(panel->box);
switch(element) {
case 0:
return WMBoldSystemFontOfSize(scr, 12);
break;
case 1:
return WMBoldSystemFontOfSize(scr, 24);
break;
case 2:
return WMBoldSystemFontOfSize(scr, 12);
break;
case 3:
return WMSystemFontOfSize(scr, 12);
break;
case 4:
return WMSystemFontOfSize(scr, 8);
break;
case 5:
return WMSystemFontOfSize(scr, 8);
break;
}
switch(element) {
case 0:
case 2:
return WMBoldSystemFontOfSize(scr, 12);
case 1:
return WMBoldSystemFontOfSize(scr, 24);
case 4:
case 5:
return WMSystemFontOfSize(scr, 8);
case 3:
default:
return WMSystemFontOfSize(scr, 12);
}
}
static void
@@ -1515,7 +1509,7 @@ static void
toggleAA(WMWidget *w, void *data)
{
_Panel *panel = (_Panel*)data;
int section;
//int section;
if(panel->AntialiasedText)
panel->AntialiasedText = False;
else
@@ -1622,7 +1616,7 @@ addButtonAction(WMWidget *w, void *data)
array = getDefaultFontProp(panel, encoding, section);
WMHideFontPanel(panel->fontPanel);
chosenFont = WMGetFontPanelFontName(panel->fontPanel);
chosenFont = WMGetFontName(WMGetFontPanelFont(panel->fontPanel));
string = WMCreatePLString(chosenFont);
pos = WMGetListSelectedItemRow(panel->fsetLs);
WMInsertListItem(panel->fsetLs, pos+1, chosenFont);
@@ -1651,7 +1645,7 @@ changeButtonAction(WMWidget *w, void *data)
WMHideFontPanel(panel->fontPanel);
chosenFont = WMGetFontPanelFontName(panel->fontPanel);
chosenFont = WMGetFontName(WMGetFontPanelFont(panel->fontPanel));
string = WMCreatePLString(chosenFont);
pos = WMGetListSelectedItemRow(panel->fsetLs);
@@ -1720,7 +1714,7 @@ removeButtonClick(WMWidget *w, void *data)
static void
showData(_Panel *panel)
{
WMScreen *scr = WMWidgetScreen(panel->parent);
//WMScreen *scr = WMWidgetScreen(panel->parent);
char *str;
int i;

16
WPrefs.app/KeyboardShortcuts.c
View File

@@ -112,6 +112,12 @@ static char *keyOptions[] = {
"WindowShortcut9Key",
"WindowShortcut10Key",
"ScreenSwitchKey",
#ifdef VIRTUAL_DESKTOP
"VirtualEdgeLeftKey",
"VirtualEdgeRightKey",
"VirtualEdgeUpKey",
"VirtualEdgeDownKey",
#endif
"ClipRaiseKey",
"ClipLowerKey",
#ifndef XKB_MODELOCK
@@ -326,7 +332,7 @@ captureClick(WMWidget *w, void *data)
}
panel->capturing = 0;
WMSetButtonText(w, _("Capture"));
WMSetLabelText(panel->instructionsL, _("Click Capture to interactively define the shortcut key."));
WMSetLabelText(panel->instructionsL, _("Click on Capture to interactively define the shortcut key."));
XUngrabKeyboard(dpy, CurrentTime);
}
@@ -537,6 +543,12 @@ createPanel(Panel *p)
WMAddListItem(panel->actLs, _("Shortcut for window 9"));
WMAddListItem(panel->actLs, _("Shortcut for window 10"));
WMAddListItem(panel->actLs, _("Switch to Next Screen/Monitor"));
#ifdef VIRTUAL_DESKTOP
WMAddListItem(panel->actLs, _("Move VirtualDesktop to next left edge"));
WMAddListItem(panel->actLs, _("Move VirtualDesktop to next right edge"));
WMAddListItem(panel->actLs, _("Move VirtualDesktop to next top edge"));
WMAddListItem(panel->actLs, _("Move VirtualDesktop to next bottom edge"));
#endif
WMAddListItem(panel->actLs, _("Raise Clip"));
WMAddListItem(panel->actLs, _("Lower Clip"));
WMAddListItem(panel->actLs, _("Raise/Lower Clip"));
@@ -580,7 +592,7 @@ createPanel(Panel *p)
WMMoveWidget(panel->instructionsL, 15, 140);
WMSetLabelTextAlignment(panel->instructionsL, WACenter);
WMSetLabelWraps(panel->instructionsL, True);
WMSetLabelText(panel->instructionsL, _("Click Capture to interactively define the shortcut key."));
WMSetLabelText(panel->instructionsL, _("Click on Capture to interactively define the shortcut key."));
WMMapSubwidgets(panel->shoF);

4
WPrefs.app/Makefile.am
View File

@@ -42,7 +42,9 @@ WPrefs_SOURCES = \
imagebrowser.h \
xmodifier.c
AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
AM_CFLAGS = -fno-strict-aliasing
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@

4
WPrefs.app/WPrefs.c
View File

@@ -845,10 +845,10 @@ loadConfigurations(WMScreen *scr, WMWindow *mainw)
}
if (!db) {
db = WMCreatePLDictionary(NULL, NULL, NULL);
db = WMCreatePLDictionary(NULL, NULL);
}
if (!gdb) {
gdb = WMCreatePLDictionary(NULL, NULL, NULL);
gdb = WMCreatePLDictionary(NULL, NULL);
}
GlobalDB = gdb;

12
WPrefs.app/WindowHandling.c
View File

@@ -397,18 +397,16 @@ createPanel(Panel *p)
WMMoveWidget(panel->resL, 95, 20);
panel->resaB = WMCreateRadioButton(panel->resF);
WMMoveWidget(panel->resaB, 130, 14);
WMResizeWidget(panel->resaB, 70, 26);
WMMoveWidget(panel->resaB, 130, 15);
WMResizeWidget(panel->resaB, 70, 25);
WMSetButtonText(panel->resaB, _("Resist"));
panel->resrB = WMCreateRadioButton(panel->resF);
WMMoveWidget(panel->resrB, 200, 12);
WMResizeWidget(panel->resrB, 65, 30);
WMMoveWidget(panel->resrB, 200, 15);
WMResizeWidget(panel->resrB, 70, 25);
WMSetButtonText(panel->resrB, _("Attract"));
WMGroupButtons(panel->resrB, panel->resaB);
WMMapSubwidgets(panel->resF);
/**************** Transients on Parent Workspace ****************/
@@ -420,7 +418,7 @@ createPanel(Panel *p)
panel->tranB = WMCreateSwitchButton(panel->tranF);
WMMoveWidget(panel->tranB, 10, 5);
WMResizeWidget(panel->tranB, 250, 30);
WMSetButtonText(panel->tranB, _("Open dialogs in same workspace\nas their owners"));
WMSetButtonText(panel->tranB, _("Open dialogs in the same workspace\nas their owners"));
WMMapSubwidgets(panel->tranF);

6
WPrefs.app/Workspace.c
View File

@@ -180,7 +180,7 @@ createPanel(Panel *p)
WMResizeWidget(panel->cyclB, 280, 34);
WMMoveWidget(panel->cyclB, 75, 30);
WMSetButtonText(panel->cyclB,
_("wrap to the first workspace after the\nlast workspace."));
_("Wrap to the first workspace from the last workspace."));
panel->cyclL = WMCreateLabel(panel->navF);
WMResizeWidget(panel->cyclL, 60, 60);
@@ -202,7 +202,7 @@ createPanel(Panel *p)
WMResizeWidget(panel->linkB, 280, 34);
WMMoveWidget(panel->linkB, 75, 75);
WMSetButtonText(panel->linkB,
_("switch workspaces while dragging windows."));
_("Switch workspaces while dragging windows."));
panel->linkL = WMCreateLabel(panel->navF);
WMResizeWidget(panel->linkL, 60, 40);
@@ -224,7 +224,7 @@ createPanel(Panel *p)
WMResizeWidget(panel->newB, 280, 34);
WMMoveWidget(panel->newB, 75, 120);
WMSetButtonText(panel->newB,
_("automatically create new workspaces."));
_("Automatically create new workspaces."));
panel->newL = WMCreateLabel(panel->navF);
WMResizeWidget(panel->newL, 60, 20);