gryf/gryf-overlay
1
0
Fork 0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-04-17 23:13:33 +02:00
Code Issues Projects Releases Wiki Activity

Added windowmaker + experimental patch for fixing language icon on titlebar

Browse Source
This commit is contained in:
root
2010-07-18 13:16:44 +02:00
parent 7bc474d009
commit 29608b8072
14 changed files with 906 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-configure.patch Normal file
View File

@@ -0,0 +1,23 @@
--- configure.ac.orig 2007-08-27 00:51:31.000000000 +0200
+++ configure.ac 2007-08-27 00:52:14.000000000 +0200
@@ -197,7 +197,7 @@
AC_CACHE_CHECK(whether gcc supports x86 inline asm,
ac_cv_c_inline_asm,
- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
ac_cv_c_inline_asm=yes,
@@ -840,11 +840,6 @@
else
gnustepdir=$appspath
- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"`
- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
- fi
-
wprefs_base_dir=$gnustepdir/Applications
wprefs_datadir=$wprefs_base_dir/WPrefs.app
wprefs_bindir=$wprefs_base_dir/WPrefs.app

15
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch Normal file
View File

@@ -0,0 +1,15 @@
Index: src/event.c
===================================================================
--- src/event.c (revision 41)
+++ src/event.c (working copy)
@@ -559,6 +559,10 @@
wwin->flags.skip_next_animation = 1;
wIconifyWindow(wwin);
}
+ if (wwin->flags.fullscreen) {
+ wwin->flags.fullscreen = 0;
+ wFullscreenWindow(wwin);
+ }
if (wwin->flags.hidden) {
WApplication *wapp = wApplicationOf(wwin->main_window);

131
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gcc41.patch Normal file
View File

@@ -0,0 +1,131 @@
--- NEW FILE windowmaker-gcc4-x86_64.patch ---
--- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100
+++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-22 21:07:57.000000000 +0200
@@ -98,15 +98,23 @@
int height,
int line_offset)
{
- long long rrggbbaa;
- long long pixel;
+ union {
+ long long rrggbbaa;
+ struct {short int rr, gg, bb, aa;} words;
+ } rrggbbaa;
+
+ union {
+ long long pixel;
+ struct {short int rr, gg, bb, aa;} words;
+ } pixel;
+
short *tmp_err;
short *tmp_nerr;
int x;
asm volatile
(
- "pushal \n\t"
+ "pushl %%ebx \n\t"
// pack dr, dg and db into mm6
"movl %7, %%eax \n\t"
@@ -290,7 +298,7 @@
".Enda: \n\t" // THE END
"emms \n\t"
- "popal \n\t"
+ "popl %%ebx \n\t"
:
:
"m" (image), // %0
@@ -309,17 +317,18 @@
"m" (width), // %13
"m" (height), // %14
"m" (line_offset), // %15
- "m" (rrggbbaa), // %16 (access to rr)
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
- "m" (pixel), // %20 (access to pixel.r)
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
+ "m" (pixel.pixel), // %20 (access to pixel.r)
+ "m" (pixel.words.gg), // %21 (access to pixel.g)
+ "m" (pixel.words.bb), // %22 (access to pixel.b)
+ "m" (pixel.words.aa), // %23 (access to pixel.a)
"m" (tmp_err), // %24
"m" (tmp_nerr), // %25
"m" (x) // %26
+ : "eax", "ecx", "edx", "esi", "edi"
);
}
@@ -342,8 +351,15 @@
int height,
int line_offset)
{
- long long rrggbbaa;
- long long pixel;
+ union {
+ long long rrggbbaa;
+ struct {short int rr, gg, bb, aa;} words;
+ } rrggbbaa;
+
+ union {
+ long long pixel;
+ struct {short int rr, gg, bb, aa;} words;
+ } pixel;
short *tmp_err;
short *tmp_nerr;
@@ -354,7 +370,7 @@
asm volatile
(
- "pushal \n\t"
+ "pushl %%ebx \n\t"
"movl %13, %%eax \n\t" // eax = width
"movl %%eax, %%ebx \n\t"
@@ -424,7 +440,7 @@
".Endc: \n\t" // THE END
"emms \n\t"
- "popal \n\t"
+ "popl %%ebx \n\t"
:
:
"m" (image), // %0
@@ -443,19 +459,20 @@
"m" (width), // %13
"m" (height), // %14
"m" (line_offset), // %15
- "m" (rrggbbaa), // %16 (access to rr)
- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
- "m" (pixel), // %20 (access to pixel.r)
- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
+ "m" (pixel.pixel), // %20 (access to pixel.r)
+ "m" (pixel.words.gg), // %21 (access to pixel.g)
+ "m" (pixel.words.bb), // %22 (access to pixel.b)
+ "m" (pixel.words.aa), // %23 (access to pixel.a)
"m" (tmp_err), // %24
"m" (tmp_nerr), // %25
"m" (x), // %26
"m" (w1), // %27
"m" (w2) // %28
+ : "eax", "ecx", "edx", "esi", "edi"
);
}

26
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch Normal file
View File

@@ -0,0 +1,26 @@
--- configure.ac
+++ configure.ac
@@ -705,17 +705,17 @@
if test "$gif" = yes; then
my_libname=""
- WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS])
- if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then
- my_libname=-lungif
+ WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS])
+ if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then
+ my_libname=-lgif
fi
dnl
dnl libungif is the same thing as libgif for all practical purposes.
dnl
if test "x$my_libname" = x; then
- WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS])
- if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then
- my_libname=-lgif
+ WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS])
+ if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then
+ my_libname=-lungif
fi
fi

25
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch Normal file
View File

@@ -0,0 +1,25 @@
Add a missing #include <math.h>.
--- WindowMaker-0.92.0/configure.ac
+++ WindowMaker-0.92.0/configure.ac
@@ -78,7 +78,8 @@
[ --with-incs-from pass compiler flags to look for header files],
[inc_search_path="$withval $inc_search_path"])
-
+AC_CHECK_LIBM
+AC_SUBST([LIBM])
dnl Checks for library functions.
dnl ============================
--- WindowMaker-0.92.0/src/placement.c
+++ WindowMaker-0.92.0/src/placement.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <string.h>
#include <limits.h>
+#include <math.h>
#include "WindowMaker.h"
#include "wcore.h"

84
x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch Normal file
View File

@@ -0,0 +1,84 @@
--- src/wmspec.c.sav 2004-10-24 21:36:15.000000000 +0200
+++ src/wmspec.c 2005-01-26 17:13:54.266216856 +0100
@@ -314,15 +314,15 @@
void
wNETWMUpdateDesktop(WScreen *scr)
{
- CARD32 *views, sizes[2];
+ long *views, sizes[2];
int count, i;
if (scr->workspace_count==0)
return;
count = scr->workspace_count * 2;
- views = wmalloc(sizeof(CARD32) * count);
- /*memset(views, 0, sizeof(CARD32) * count);*/
+ views = wmalloc(sizeof(long) * count);
+ /*memset(views, 0, sizeof(long) * count);*/
#ifdef VIRTUAL_DESKTOP
sizes[0] = scr->workspaces[scr->current_workspace]->width;
@@ -362,7 +362,7 @@
0, 1, &count);
if (prop)
{
- int desktop= *(CARD32*)prop;
+ int desktop= *(long*)prop;
XFree(prop);
return desktop;
}
@@ -426,7 +426,7 @@
static void
updateShowDesktop(WScreen * scr, Bool show)
{
- CARD32 foo;
+ long foo;
foo = (show == True);
XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
@@ -599,7 +599,7 @@
void
wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
{
- CARD32 *area;
+ long *area;
int count, i;
/* XXX: not Xinerama compatible,
@@ -609,7 +609,7 @@
return;
count = scr->workspace_count * 4;
- area = wmalloc(sizeof(CARD32) * count);
+ area = wmalloc(sizeof(long) * count);
for (i=0; i<scr->workspace_count; i++) {
area[4*i + 0] = usableArea.x1;
area[4*i + 1] = usableArea.y1;
@@ -732,7 +732,7 @@
static void
updateWorkspaceCount(WScreen *scr) /* changeable */
{
- CARD32 count;
+ long count;
count = scr->workspace_count;
@@ -744,7 +744,7 @@
static void
updateCurrentWorkspace(WScreen *scr) /* changeable */
{
- CARD32 count;
+ long count;
count = scr->current_workspace;
@@ -791,7 +791,7 @@
static void
updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
{
- CARD32 l;
+ long l;
if (del) {
XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);