rpms/wmx/devel Xclients.wmx.sh, NONE, 1.1 background.xpm, NONE, 1.1 wmx-6pl1-cfg.patch, NONE, 1.1 wmx-6pl1-fix.patch, NONE, 1.1 wmx.desktop, NONE, 1.1 wmx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Tue Feb 14 21:20:05 UTC 2006
Author: ivazquez
Update of /cvs/extras/rpms/wmx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27045/devel
Modified Files:
.cvsignore sources
Added Files:
Xclients.wmx.sh background.xpm wmx-6pl1-cfg.patch
wmx-6pl1-fix.patch wmx.desktop wmx.spec
Log Message:
auto-import wmx-6pl1-7 on branch devel from wmx-6pl1-7.src.rpm
--- NEW FILE Xclients.wmx.sh ---
#!/bin/bash
# wmx startup script
if [ -f ${HOME}/.wmx/startup ]; then
# fire up user's startup apps:
. ${HOME}/.wmx/startup
else
# fire default startup apps:
. /usr/share/wmx/startup
fi
exec wmx
--- NEW FILE background.xpm ---
/* XPM */
static char *background[] = {
/* width height num_colors chars_per_pixel */
" 80 80 27 1",
/* colors */
". c #5f96d6",
"# c #5990ca",
"a c #5991d6",
"b c #5f96ca",
"c c #5f97d6",
"d c #5992ca",
"e c #5993d6",
"f c #5f99e0",
"g c #5f99d6",
"h c #5f9be0",
"i c #5e9bd6",
"j c #5d9be8",
"k c #5c9be0",
"l c #60a2e0",
"m c #61a2e8",
"n c #69abe8",
"o c #70b5e8",
"p c #67abe8",
"q c #77bfe8",
"r c #6cb5e8",
"s c #91d8ef",
"t c #7fcbe8",
"u c #9de5ef",
"v c #81cbef",
"w c #8bd8e8",
"x c #a9f2ef",
"y c #8bd8ef",
/* pixels */
"gggggiiiihhiffiffghfgfhhhhhhhhhkkkllmmppnpppprrrrrppppppnppnmmmllkkkkkkhhhhgffff",
"fhffiiieihhhhhfihhhhhehhfhhhhhhhkkkkklmlmlnppnrrorrnppnpppppnnnmmllkjjkkkhhhhhhh",
"hhhhhhhhhhhhhhhhhihhhihhhfhhihhhkhkkkkmlmlplpnnorrnpporrorppnnpnlplmmljjkkkkhhhh",
"kkkkkkkkkkkhhkkkkhhhhhhihhfhhhhhhkhhkkkkjmmlplpnnppnoroooooporrpppppplllljjkkkkk",
"kkkkkkkkkkkkkkkkhhkhhhhfeiffffhhihhhhkkkjkkmmmppppnnnooorrorrroonpnnpmmmljmjkkkk",
"klkkkkkkkkkkkkkkhhhhhihhiieiifhhheeiihhhhkkkklmmlpnnonoooororrorrrrronnplmmmmjmk",
"mjlmllkjkjkkkkjjjhhkhhhhhihfeeeefgeeeffihhhhhkjmllpponpooooroqqoooooorppnpnplmml",
"mmlmlllmmllklkkkkhhhhhhieihigeieggeeegiegehhhhhkkllllplnoooooqqqorqooooronnnnnpl",
"plpppplmlmlllkkkjjkkhhhieehgggeeceeeeceggeghhihhhkjkllnrpooroqqqqrooqrrrpponplpp",
"plpnlpplmllmlkjjkjkhhhieeefegecccbbbbdddeeegehefhhhkklllpnnrorqrqrqqqqqooonplrop",
"pponlnppmlllllllkkkkkhhihfieggcdebbbbbd..ddbeegfehhhkkmmmnnnnrorqrqqrqrooorrooro",
"ppnnpplplpmmlmllmmkkkkhhfiiegceedddab.dddadbddeeegeihhkkmmponoorqorroqqoqoorrrrp",
"oonooonpnpppllmmlkkkkkkhhheggcceeddd#a######.bdeeeegehhjmmmlnnporqqoqqorqqrrrrrr",
"rrrrrrprppnnnmpmlklkkkkhfhiieeeee..add########ddddegeihhkjmlppnrrorqoqooqqrrrorr",
"ooooooooooppnnpnmmmmjjkkhhiegeeeeaaad###########abbcgefhhklmplprroqqqqqqqqrorqro",
"oqqooooooonronnnmplmmlkkkhhfhfecc..d.d##########b.a.cehfhhkjmmnpproooqqqqqqqqqqq",
"qrrrrooooooonnnnppmmlmlkjkhhhhfgcccc.bd##########aadecgehhkkklmpnpooooooqqoooorr",
"rqooqorqqqorrorpppnnnmmllkkhhifffgcbc.bdb##########d.ccgfhhkjjlpppooroooqqqqqqqo",
"qoovovvrqvoqroorrrpppmnlmmjkkhhhiegeeeda#d########adaeeegihhkmlmpprroorqoqqooooo",
"qrrqvvvqovovqqqoorronppmpmljkkkhhheggcedddab#######addeegeihhjjmpnnooorqqorooooq",
"qqqvqqoqqqqqoovvqoroponnnpmmjjjkhhhhfeceedddd###bb#db.eccehhhkjmmmnnroooororooqo",
"qqqqqvvqqvooqvvvvvqqorrrppnnlmmjjhhhigggceead#b#b#babddccgiehhkkmnpppproorqqqqqq",
"qqqvqvvvqqqvvqqqqqovoqrooopppmmmjkkhhhffccedddbdb#.abb.ccgeihkjjmmlpprrororrqroq",
"qqoqqqqqqvqqqqvqqqqqvvvqoorrppppmlkkkhhiiggcbeeddaddd.cccgghihkjjlmmnnprrrqorqqq",
"qqqvqvvtqqtqttvqqqvqqqqoqqorooppmmlkkhhhhgggcccbadddddeeeeeeihkkkmllnnnooooqoroo",
"qqqqvvvqtvqqttvtqvttqvvqqqrqorooppplmkkkhhhgeeecdeeeaacccgffehhkkkmplppoooorqorq",
"qoqvqqqqqttqttvtvvttttvqqqvvqqooppnmmlkkkkhfgheeeeeeeeeecgffehhkkkmmpppprorooror",
"ooqqqqqqttvvttttvvvvtvvvttvvqqqooropmpmmkkkhhhffggcceeeeeeeifihhkklmpnpnnoorqrqo",
"qqovqqvqttvqtttttttttvvvvvvvqvqoooorrnpmmjjkhhfhffgeeeeeeeegehhhkklmmppproroorqo",
"rqqqqqqttqttvvttttttttttttttttvqqororopmplmjkhhhfheffgggeffhhhhhhkjmmpnprorroqoq",
"orovqqvqqtqvtvvssyvsvstttwttttttqqvroopnnpmlkkkkhhhihgfgfiiefhhhhkjmmpnpprroroqr",
"roqqqqqqqqqvtvtttttvyywwwwstvvvvvvqqqqoropmpmmjjkkhheeeehhhfhihkhkjmmlppprpooooo",
"qqqqqqqqtvvtvtttttwvvswwwvtyyvvtttttqqvqooonpmmjjkhhhhhihhhhihhhhkmmmnnppppooooq",
"rorooqqqqtvtvttttttvvvwwvwywssywwttvtqvvvroopnlmmmkkkhhhhhihhhkkkkjjmmlppprrooro",
"qqqqqqqqqtqqvtvvvsvvtstvwswyywywwwvtvvtvvvqronnmmmjjjkkkhhhhkhhkhklmmlmpnppprooq",
"rorrqqqqqqtqttttttttvtvtytswyyywwywstwtvtvqooonnnnmllmjjkhkkkkkkjmmmmlnnnppnoooo",
"qqqoroqoqqqqvqvvvvsswvwvwywssssssyswwwtsvvtqqqropppnmmlllkkkkkkjjjmmmlmnnpprrroq",
"orqqqrqqqqqqtttvvvvvttvtswssywwwusywswwwsvtvqqoqorrnnplmmmmmlllmmmmmmnlnpprrroro",
"oorqqorqqqqqqqvtttttttwtwvyyswysssuyyssssyvsvqqovoooopppnmmlmmmmmmmpnlpnooorrooo",
"orqqrqvoooqqqqtvvvtvvvvvstsvywwwyswywywuyysysvvtvooqooonnnmplmlmmlmlplnnrrooooro",
"qqqqorrooqqqqqqqvvtvvvsvvsytvwsssyuuuuuuysyysvstvqqqqororppnpnpnnnnnpnnoooooooqq",
"orrqrooqooqqorqqvqqtvvtttttwtvysywywwwwyyyuwsssysvvtvqvvooooonppppnpprppprrrooro",
"qqqrorooooqrrqqqqqvqqvqqtqttttvvyywywywwwuyyuwssssysvtvvvqqooooorrprorrrrroorrqq",
"orqoroqooqqqoqooooqvqqvqqqqvvvsvvvywssuuyyuyuuyywysyywvvtvqqqoqooorroorroooroooo",
"qqrqqqqrroooqoqorqrrovqqvqqqvttttvvtwssusuywuyyywussssvsvvtqqvvqrqqqqrrqoqqqqooq",
"qqoorrrooooooorooooqrrrrvovqqqqqvvvvvtwwysuywyxuyyuywwsyvvtvvvtqqqrqrvqorqoqqovq",
"qrroooooroorrrrorooorrooooooqqovqqvvvtvswwwyuuuuxuxyyyywsywwttttttqqqtqovvqvqqqq",
"rqvvvqroorroooorrppnprppnororroqvoqqvttvwwsssuuuyyuyuywyuuusyssvwvtttqqqqqqrqqvq",
"qqqorrooroorrroornnpnnnnppnnprroorqvvqqtvvsywysuuxuuyyyuxxuuuswswvwvvvvvqtqvqqqq",
"qqqvoqroorrooppopnnpppppnpppppnpnpoorovqvqttwwsyuuuxuyxxyxxxuuywwsyvwtwttttvvqqq",
"qqooororroorppnppnnmnlmlmnmmnnnppppprorqooqqqtsyssuuyuxxxxxxyxxuuusyytsvvttvvqqq",
"qqqrorqrrrrooonnppnlmlmlmlmlmlmmmmmmnnpporovqqvsvywwwyuxyxxxuyxxxuuuswysvvtvttvt",
"qqroqrorooorpnnnnnppmmmlmlkkkkkkkjlmmnpnnporoqqvvvswwuwuuyyuyxxwuwyyuuswwwttttvq",
"qqqqqrqorrrororrpnmllmlmkkkkkjkjkkjjmklmnppproqvvqvvvsuyuyuxxxuxxuyuuuswywttttqq",
"tqqqqrooororrooonppmlmlklkkkhhhhhkkkkkjmlmmpnnoroqvvvvssywwuxyyxwyuxuuuwwyvyvttv",
"tqqovroroooorpoprppmlmlljjkkjkkhhhhkhhkkkkknmppporovvtttywwyuuyywuwyywuwswyyvttv",
"qqqqqoqorroooororrnnnmmmmkkkkkkhhhhhhkhhkkkmmnmnnrorvqvtttywyywyyywuuuuywysttttv",
"vqqqqqqooqoorqqorrrnpppnmllmkjkhkhkhhhhhkkkkkjlmnpnpooqqqtttywwyyuuuuussywvvvvvv",
"vqqqqrqqqqrqqqvqqoooonnppnpmmmjkkkkkhhhhkhhhjklmmnpporoovqqvvttssywyssyswwttvvvq",
"qvqqqoqvvrqqqvvqqqvvqrorrnnpllmlmkkjjhhkhhhhkkkmmmnmnnnorvqvqttvvtvwtwtywtttvvtq",
"vqqqqqqqqqqqqqqqqqqqqorooorppnpmmmlkkkkkjjjkkkjjjlmmnpprroqqqqtvvttttvvtttttvtqv",
"qqqqqqvvvqqqtqvvttvqtqqqqrqoronnnplmmmmlkkjjjkjjjmlmlppppprqoqqqqqtttvvtttvvtttq",
"qqqqrqqovvqqvqttttttttttqqqvqqoroonnppmmmmmjjjjjjmmmmmpmpprroovqqqvqvvtttqqvtqqq",
"qqvoqqqoorqqqqtttttttwttvttvqqoqoooonppppnmmmlmmmmmmmmpppppppoorrroooqqqqqqqqqqq",
"qorroorrrrqrqqvvtttvtttvttvvvvqvqooropprppppmlmmmmmmmplmnpnpnpopprrorrroorqooqro",
"rrrrrrnnoroorqrqvvqtttvttvttvvtqvvqqoorrpnnlplmpnpmpmmlmppppnllpoopproorrrroroor",
"prpnnnpppnnpnprooroqovqqvvqqqvqvqqrqroponrplmpnmmmlllmmmpmmpplpplmppnrlpprnonnnp",
"pmlmlmpmlmmnlppppnoooooooqqvqqqqrqrrqroonlppllnnlmnlmmnmnmmnllmmlpmmpmpppnnpplpp",
"mmmlmlllkkkkkkjjjmlmppnppooorqoroorrornonnppppnmpmmmmmmmmmmmmllllmmmmmmllmnlmmlm",
"kkkkkkkkkkhhhhhkkkkkjlmmpppnnnnrroorrrrrolplpmnmmmlllmjlkmljmllkkkljjklkkllllkkk",
"kkkhkhhiiiiihhhhhhhkkjkjjmllpppnpppnnonnnnpnpmmmlkljjjjjlkkmkkkkkjjkkkkkkjkkkkjk",
"hhhhiiiiiiiigggegieeihhhkkkkmmmllpnnplolpnlnnmlklkklkkkkkkkkkkkkkhhhkkkkhhkhhhhh",
"hhhhiefgeeeeceeeeeeeeefhhhkkkjjlmmmmplllnmnmllkkkklkkkkkkkhkkkhkhhhkhhhhhhiihhhf",
"gieieegggdeecdeceeeeeeeeeihhhkkkkkmmmmmmmmmmljmjlkkkkhhhkkhhkkkhhhhhhhfffhfhhiih",
"geggeeeeedceebcccbcgeegeiehhhkkkjjmllmmmmmmmmmjjllkkjkkhkhkhhkhhhhihhieiiheieeif",
"igeeeeeeccceddbbbcbcceeefehhhhkkkjkklmmlmlmmmmmmjlllkkkkkkhhkhhhhhhhhfheeifgfege",
"gggegggggbcccbcccccccegfihhihkhkklllmlmlmlmlmpmmlmmmjkkkkkkhkhhhhhhefhihifggegeg",
"eggeggggggeeeeeeedecgeegehhhhhkkkklllmmnmlnlmnmpmlmmlkllkjjkkkkkkhhheeeieehfeege",
"ggeeggggggeeeeegggggeeefehhhhhhkklkllmpmpnnnppppnlmplmmmmmkllkkkhhhhhhhfhihfegee",
"ggifffhhiiiiggeegegfheeeeifihhkkkkklnmmppppppnnppnnnmpnplmlmmmmjkkkkhhihhhhiffif"
};
wmx-6pl1-cfg.patch:
--- NEW FILE wmx-6pl1-cfg.patch ---
diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
--- wmx-6pl1.orig/Config.h 2001-04-23 11:48:31.000000000 -0400
+++ wmx-6pl1/Config.h 2005-12-16 09:08:35.000000000 -0500
@@ -73,12 +73,12 @@
// Spawn a temporary new shell between the wm and each new process?
#define CONFIG_EXEC_USING_SHELL False
// What to run to get a new window (from the "New" menu option)
#define CONFIG_NEW_WINDOW_LABEL "New"
-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
// or, for example,
//#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
// alternatively,
#define CONFIG_DISABLE_NEW_WINDOW_COMMAND (dConfig.disableNew())
@@ -89,11 +89,11 @@
// Directory under $HOME in which to look for commands for the
// middle-button menu
#define CONFIG_COMMAND_MENU ".wmx"
// only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU "/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU "/usr/share/wmx"
// append screennumber to COMMAND_MENU directory;
// use non screen style as fallback
#define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
// Focus possibilities.
@@ -120,11 +120,11 @@
// Number of pixels off the screen you have to push a window
// before the manager notices the window is off-screen (the higher
// the value, the easier it is to place windows at the screen edges)
-#define CONFIG_BUMP_DISTANCE 16
+#define CONFIG_BUMP_DISTANCE 32
// If CONFIG_PROD_SHAPE is True, all frame element shapes will be
// recalculated afresh every time their focus changes. This will
// probably slow things down hideously, but has been reported as
// necessary on some systems (possibly SunOS 4.x with OpenWindows).
@@ -294,11 +294,11 @@
#define CONFIG_MENU_BORDERS "black"
// Pixel width for the bit of frame to the left of the window and the
// sum of the two bits at the top
-#define CONFIG_FRAME_THICKNESS 8
+#define CONFIG_FRAME_THICKNESS 6
// ========================
// Section IV. Flashy stuff
// ========================
@@ -307,11 +307,11 @@
// in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
// will be too. The latter screws up in palette-based visuals, but
// should be okay in true-colour.
#define CONFIG_USE_PIXMAPS True
-#define CONFIG_USE_PIXMAP_MENUS True
+#define CONFIG_USE_PIXMAP_MENUS False
// Set CHANNEL_SURF for multi-channel switching; CHANNEL_CLICK_SIZE is
// how close you have to middle-button-click to the top-right corner
// of the root window before the channel change happens. Set
// USE_CHANNEL_KEYS if you want Alt-F1, Alt-F2 etc for quick channel
diff -NarU5 wmx-6pl1.orig/Makefile.in wmx-6pl1/Makefile.in
--- wmx-6pl1.orig/Makefile.in 1999-08-31 19:53:08.000000000 -0400
+++ wmx-6pl1/Makefile.in 2005-12-16 09:07:16.000000000 -0500
@@ -39,13 +39,14 @@
distclean: clean
rm -f wmx wmx.old *~ *.bak *.org *.orig config.* Makefile
install:
-mv -f @bindir@/wmx @bindir@/wmx.old
+ strip wmx
cp wmx @bindir@/wmx
-chmod 0755 @bindir@/wmx
- -chown root:wheel @bindir@/wmx
+ -chown root:root @bindir@/wmx
-rm -f @bindir@/wmx.old
# DO NOT DELETE -- make depend depends on it
Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
Manager.h listmacro.h background.xpm
wmx-6pl1-fix.patch:
--- NEW FILE wmx-6pl1-fix.patch ---
diff -NarU5 wmx-6pl1.orig/Buttons.C.rej wmx-6pl1/Buttons.C.rej
--- wmx-6pl1.orig/Buttons.C.rej 2001-04-24 04:58:31.000000000 -0400
+++ wmx-6pl1/Buttons.C.rej 1969-12-31 19:00:00.000000000 -0500
@@ -1,75 +0,0 @@
-***************
-*** 173,179 ****
- m_altStateRetained = False;
- }
-
-! #ifdef CONFIG_WANT_SUNKEYS
- #ifdef CONFIG_QUICKRAISE_KEY
- if (key == CONFIG_QUICKRAISE_KEY && c) {
-
---- 173,179 ----
- m_altStateRetained = False;
- }
-
-! #if CONFIG_WANT_SUNKEYS
- #ifdef CONFIG_QUICKRAISE_KEY
- if (key == CONFIG_QUICKRAISE_KEY && c) {
-
-***************
-*** 184,202 ****
- }
-
- } else
-! #endif CONFIG_QUICKRAISE_KEY
- #ifdef CONFIG_QUICKHIDE_KEY
- if (key == CONFIG_QUICKHIDE_KEY && c) {
- c->hide();
-
- } else
-! #endif CONFIG_QUICKHIDE_KEY
- #ifdef CONFIG_QUICKCLOSE_KEY
- if (key == CONFIG_QUICKCLOSE_KEY && c) {
- c->kill();
-
- } else
-! #endif CONFIG_QUICKCLOSE_KEY
- #ifdef CONFIG_QUICKHEIGHT_KEY
- if (key == CONFIG_QUICKHEIGHT_KEY && c) {
-
---- 184,202 ----
- }
-
- } else
-! #endif // CONFIG_QUICKRAISE_KEY
- #ifdef CONFIG_QUICKHIDE_KEY
- if (key == CONFIG_QUICKHIDE_KEY && c) {
- c->hide();
-
- } else
-! #endif // CONFIG_QUICKHIDE_KEY
- #ifdef CONFIG_QUICKCLOSE_KEY
- if (key == CONFIG_QUICKCLOSE_KEY && c) {
- c->kill();
-
- } else
-! #endif // CONFIG_QUICKCLOSE_KEY
- #ifdef CONFIG_QUICKHEIGHT_KEY
- if (key == CONFIG_QUICKHEIGHT_KEY && c) {
-
-***************
-*** 207,213 ****
- }
-
- } else
-! #endif //CONFIG_QUICKHEIGHT_KEY
- #if CONFIG_WANT_SUNPOWERKEY
- if (key == SunXK_PowerSwitch) {
- pid_t pid = fork();
---- 207,213 ----
- }
-
- } else
-! #endif // CONFIG_QUICKHEIGHT_KEY
- #if CONFIG_WANT_SUNPOWERKEY
- if (key == SunXK_PowerSwitch) {
- pid_t pid = fork();
diff -NarU5 wmx-6pl1.orig/Channel.C.orig wmx-6pl1/Channel.C.orig
--- wmx-6pl1.orig/Channel.C.orig 2000-05-24 11:46:14.000000000 -0400
+++ wmx-6pl1/Channel.C.orig 1969-12-31 19:00:00.000000000 -0500
@@ -1,220 +0,0 @@
-
-#include "Manager.h"
-#include "Client.h"
-#include <sys/time.h>
-
-static char *numerals[10][7] = {
- { " ### ", "# #", "# ##", "# # #", "## #", "# #", " ### " },
- { " # ", " ## ", " # ", " # ", " # ", " # ", " ### " },
- { " ### ", "# #", " #", " ## ", " # ", "# ", "#####" },
- { "#####", " # ", " # ", " ### ", " #", " #", "#### " },
- { " # ", " ## ", " # # ", "# # ", "#####", " # ", " # " },
- { "#####", "# ", "#### ", " #", " #", " #", "#### " },
- { " ## ", " # ", "# ", "#### ", "# #", "# #", " ### " },
- { "#####", " #", " # ", " # ", " # ", " # ", " # " },
- { " ### ", "# #", "# #", " ### ", "# #", "# #", " ### " },
- { " ### ", "# #", "# #", " ####", " #", " # ", " ## " }
-};
-
-
-void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
- Boolean quickFlip, Client *push)
-{
- int x, y, i, sc;
- if (!CONFIG_CHANNEL_SURF) return;
-
- for(sc = 0; sc < screensTotal(); sc++)
- {
- if (!m_channelWindow[sc]) {
-
- XColor nearest, ideal;
-
- if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
- CONFIG_CHANNEL_NUMBER, &nearest, &ideal)) {
-
- if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
- "black", &nearest, &ideal)) {
-
- fatal("Couldn't allocate green or black");
- }
- }
-
- XSetWindowAttributes wa;
- wa.background_pixel = nearest.pixel;
- wa.override_redirect = True;
-
- m_channelWindow[sc] = XCreateWindow
- (display(), mroot(sc), 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
- CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
- }
- }
-
-
- int nextChannel;
-
- if (statusOnly) nextChannel = m_currentChannel;
- else {
- if (!flipDown) {
- nextChannel = m_currentChannel + 1;
- if (nextChannel > m_channels) nextChannel = 1;
- } else {
- nextChannel = m_currentChannel - 1;
- if (nextChannel < 1) nextChannel = m_channels;
- }
- }
-
- XRectangle r;
- Boolean first = True;
- char number[7];
- sprintf(number, "%d", nextChannel);
-
- for (i = 0; i < strlen(number); ++i) {
- for (y = 0; y < 7; ++y) {
- for (x = 0; x < 5; ++x) {
- if (numerals[number[i]-'0'][y][x] != ' ') {
-/*
- r.x = i * 110 + x * 20; r.y = y * 20;
- r.width = r.height = 20;
- */
- r.x = 10 + (i * 6 + x) * CONFIG_CHANNEL_NUMBER_SIZE;
- r.y = y * CONFIG_CHANNEL_NUMBER_SIZE;
- r.width = r.height = CONFIG_CHANNEL_NUMBER_SIZE;
- for(sc = 0; sc < screensTotal(); sc++)
- {
- XShapeCombineRectangles
- (display(), m_channelWindow[sc], ShapeBounding,
- 0, 0, &r, 1, first ? ShapeSet : ShapeUnion,
- YXBanded);
- }
- first = False;
- }
- }
- }
- }
-
- for(sc = 0; sc < screensTotal(); sc++)
- {
-/*
- XMoveResizeWindow(display(), m_channelWindow[sc],
- DisplayWidth(display(), sc) - 30 -
- 110 * strlen(number), 30, 500, 160);
- */
-
- XMoveResizeWindow(display(), m_channelWindow[sc],
- DisplayWidth(display(), sc) - 30 -
- (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) *
- strlen(number), 30, 500, 160);
- XMapRaised(display(), m_channelWindow[sc]);
- }
-
- if (!statusOnly) {
-
- ClientList considering;
-
- for (i = m_orderedClients.count()-1; i >= 0; --i) {
- considering.append(m_orderedClients.item(i));
- }
-
- for (i = 0; i < considering.count(); ++i) {
- if (considering.item(i) == push || considering.item(i)->isSticky()
-#ifdef CONFIG_USE_WINDOW_GROUPS
- || (push &&
- push->hasWindow(considering.item(i)->groupParent()))
-#endif
- ) {
- considering.item(i)->setChannel(nextChannel);
- } else {
- considering.item(i)->flipChannel(True, nextChannel);
- }
- }
-
- considering.remove_all();
- }
-
- m_currentChannel = nextChannel;
- m_channelChangeTime = timestamp(True) +
- (quickFlip ? CONFIG_QUICK_FLIP_DELAY : CONFIG_FLIP_DELAY);
-
-#if CONFIG_GNOME_COMPLIANCE != False
- gnomeUpdateChannelList();
-#endif
-}
-
-
-void WindowManager::instateChannel()
-{
- int i;
- m_channelChangeTime = 0;
- for(i = 0; i < screensTotal(); i++)
- {
- XUnmapWindow(display(), m_channelWindow[i]);
- }
-
- ClientList considering;
-
- for (i = m_orderedClients.count()-1; i >= 0; --i) {
- considering.append(m_orderedClients.item(i));
- }
-
- for (i = 0; i < considering.count(); ++i) {
- considering.item(i)->flipChannel(False, m_currentChannel);
- if (considering.item(i)->channel() == m_channels &&
- !considering.item(i)->isSticky()) createNewChannel();
- }
-
- if (m_activeClient && m_activeClient->channel() != channel()) {
- m_activeClient = 0;
- }
-
- checkChannel(m_channels-1);
-}
-
-
-void WindowManager::checkChannel(int ch)
-{
- if (m_channels <= 2 || ch < m_channels - 1) return;
-
- for (int i = m_orderedClients.count()-1; i >= 0; --i) {
- if (m_orderedClients.item(i)->channel() == ch) return;
- }
-
- --m_channels;
-
-#if CONFIG_GNOME_COMPLIANCE != False
- gnomeUpdateChannelList();
-#endif
-
- if (m_currentChannel > m_channels) m_currentChannel = m_channels;
-
- checkChannel(ch - 1);
-}
-
-
-void WindowManager::createNewChannel()
-{
- ++m_channels;
-#if CONFIG_GNOME_COMPLIANCE != False
- gnomeUpdateChannelList();
-#endif
-
-}
-
-void WindowManager::gotoChannel(int channel, Client *push)
-{
- if (channel == m_currentChannel) {
- flipChannel(True, False, False, 0);
- return;
- }
-
- if (channel > 0 && channel <= m_channels) {
-
- while (m_currentChannel != channel) {
- if (m_channels < channel) {
- flipChannel(False, False, True, push);
- } else {
- flipChannel(False, True, True, push);
- }
- XSync(display(), False);
- }
- }
-}
diff -NarU5 wmx-6pl1.orig/Menu.C wmx-6pl1/Menu.C
--- wmx-6pl1.orig/Menu.C 2001-10-05 09:01:21.000000000 -0400
+++ wmx-6pl1/Menu.C 2005-12-14 16:29:42.000000000 -0500
@@ -619,11 +619,11 @@
if (Client *c = checkFeedback(item)) c->raiseFeedbackLevel();
}
CommandMenu::CommandMenu(WindowManager *manager, XEvent *e,
- char* otherdir = NULL)
+ char* otherdir)
: Menu(manager, e)
{
const char *home = getenv("HOME");
const char *wmxdir = getenv("WMXDIR");
--- NEW FILE wmx.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=wmx
Comment=Start wmx
Exec=wmx
Type=Application
[Window Manager]
SessionManaged=true
--- NEW FILE wmx.spec ---
Name: wmx
Version: 6pl1
Release: 7%{?dist}
Summary: A really simple window manager for X
License: BSD
Group: User Interface/X
URL: http://www.all-day-breakfast.com/wmx/
Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
Source1: wmx-defaults.tar.gz
Source2: background.xpm
Source3: wmx.desktop
Source4: Xclients.wmx.sh
Patch0: wmx-6pl1-fix.patch
Patch1: wmx-6pl1-cfg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-devel
%description
A really simple window manager for X, based on wm2, with a minimal set of
configurable options.
%prep
%setup -q
%setup -a 1
%{__install} -p %{SOURCE2} .
%patch0 -p1
%patch1 -p1
%build
%configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx
%{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
%{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name}
%{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup
%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
%{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc README* UPDATES ANNOYING-BUGS
%{_bindir}/*
%{_datadir}/*
%{_sysconfdir}/X11/xinit/Xclients.d/*
%changelog
* Sat Dec 31 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-7
- added BuildRequires for X
* Thu Dec 29 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-6
- more spec file fixes as per I. Vazquez
- default startup script tweaks
* Mon Dec 19 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-5
- removed example .xsession file
- added /etc/X11/xinit/Xclients.d/Xclients.wmx.sh startup script
- fixed up some of the default menu entries
* Mon Dec 19 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-4
- spec file fixes as per J. Carlson
- desktop file for xdm login screen
* Fri Dec 16 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-3
- spec file fixes as per P. Lemenkov and I. Vazquez
- default menu entries now go in /usr/share/wmx/menu
- example wmx .xsession file added to %doc
- gave up on using /usr/X11R6/bin -- using %{_bindir} instead
* Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
- increased bump-distance parameter for easier placement at edge of screen
- 'fix' patch now cleans up dead files from source directory
* Wed Sep 07 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-1
- upgrade to 6pl1
- added better looking window-tab background.xpm
- fixed license (bsd, not gpl)
* Tue Aug 09 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-0
- rebuilt for Fedora Core 4
* Wed May 23 2004 Gabriel Somlo <somlo at acns.colostate.edu>
- initial spec and packages.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Feb 2006 21:18:55 -0000 1.1
+++ .cvsignore 14 Feb 2006 21:20:05 -0000 1.2
@@ -0,0 +1,2 @@
+wmx-6pl1.tar.gz
+wmx-defaults.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Feb 2006 21:18:55 -0000 1.1
+++ sources 14 Feb 2006 21:20:05 -0000 1.2
@@ -0,0 +1,2 @@
+212297d70acef90bbc9dac254de39cb8 wmx-6pl1.tar.gz
+2cf73db613197fcc27304f71e188eb19 wmx-defaults.tar.gz
More information about the scm-commits
mailing list