From a750fe03f424cf47e4f7aa462fd24e9b38c4d196 Mon Sep 17 00:00:00 2001 From: Ambrus Szabo Date: Wed, 30 Mar 2011 00:06:18 +0200 Subject: [PATCH] opaque resize WPrefs: WindowHandling page: Mouse opaque resize Expert page: Opaque move and resize with keyboard --- WPrefs.app/Expert.c | 5 +- WPrefs.app/WindowHandling.c | 58 ++- WPrefs.app/tiff/Makefile.am | 2 + WPrefs.app/tiff/noopaqueresize.tiff | Bin 0 -> 9522 bytes WPrefs.app/tiff/opaqueresize.tiff | Bin 0 -> 9519 bytes WPrefs.app/xpm/Makefile.am | 2 + WPrefs.app/xpm/noopaqueresize.xpm | 553 ++++++++++++++++++++++++++++ WPrefs.app/xpm/opaqueresize.xpm | 549 +++++++++++++++++++++++++++ src/WindowMaker.h | 2 + src/defaults.c | 4 + src/moveres.c | 138 ++++--- 11 files changed, 1253 insertions(+), 60 deletions(-) create mode 100644 WPrefs.app/tiff/noopaqueresize.tiff create mode 100644 WPrefs.app/tiff/opaqueresize.tiff create mode 100644 WPrefs.app/xpm/noopaqueresize.xpm create mode 100644 WPrefs.app/xpm/opaqueresize.xpm diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c index 5ef14a9f..e86480df 100644 --- a/WPrefs.app/Expert.c +++ b/WPrefs.app/Expert.c @@ -31,7 +31,7 @@ typedef struct _Panel { WMWidget *parent; - WMButton *swi[12]; + WMButton *swi[13]; } _Panel; @@ -53,6 +53,7 @@ static void showData(_Panel * panel) WMSetButtonSelected(panel->swi[9], GetBoolForKey("ShowClipTitle")); WMSetButtonSelected(panel->swi[10], GetBoolForKey("BounceAppIconsWhenUrgent")); WMSetButtonSelected(panel->swi[11], GetBoolForKey("RaiseAppIconsWhenBouncing")); + WMSetButtonSelected(panel->swi[12], GetBoolForKey("OpaqueMoveResizeKeyboard")); } static void createPanel(Panel * p) @@ -95,6 +96,7 @@ static void createPanel(Panel * p) WMSetButtonText(panel->swi[9], _("Show workspace title on Clip.")); WMSetButtonText(panel->swi[10], _("Bounce AppIcons when the application wants attention.")); WMSetButtonText(panel->swi[11], _("Raise AppIcons when bouncing.")); + WMSetButtonText(panel->swi[12], _("Opaque Move,Resize with keyboard.")); /* If the item is default true, enable the button here */ WMSetButtonEnabled(panel->swi[6], True); @@ -126,6 +128,7 @@ static void storeDefaults(_Panel * panel) SetBoolForKey(WMGetButtonSelected(panel->swi[9]), "ShowClipTitle"); SetBoolForKey(WMGetButtonSelected(panel->swi[10]), "BounceAppIconsWhenUrgent"); SetBoolForKey(WMGetButtonSelected(panel->swi[11]), "RaiseAppIconsWhenBouncing"); + SetBoolForKey(WMGetButtonSelected(panel->swi[12]), "OpaqueMoveResizeKeyboard"); } Panel *InitExpert(WMScreen * scr, WMWidget * parent) diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index 39d2b7de..88b5fef7 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -59,6 +59,8 @@ typedef struct _Panel { WMFrame *opaqF; WMButton *opaqB; + WMButton *opaqresizeB; + WMFrame *tranF; WMButton *tranB; } _Panel; @@ -69,6 +71,10 @@ typedef struct _Panel { #define NON_OPAQUE_MOVE_PIXMAP "nonopaque" +#define OPAQUE_RESIZE_PIXMAP "opaqueresize" + +#define NON_OPAQUE_RESIZE_PIXMAP "noopaqueresize" + #define THUMB_SIZE 16 static char *placements[] = { @@ -190,6 +196,8 @@ static void showData(_Panel * panel) WMSetButtonSelected(panel->opaqB, GetBoolForKey("OpaqueMove")); + WMSetButtonSelected(panel->opaqresizeB, GetBoolForKey("OpaqueResize")); + WMSetButtonSelected(panel->miconB, GetBoolForKey("NoWindowOverIcons")); WMSetButtonSelected(panel->mdockB, GetBoolForKey("NoWindowOverDock")); @@ -208,6 +216,7 @@ static void storeData(_Panel * panel) SetBoolForKey(WMGetButtonSelected(panel->miconB), "NoWindowOverIcons"); SetBoolForKey(WMGetButtonSelected(panel->mdockB), "NoWindowOverDock"); SetBoolForKey(WMGetButtonSelected(panel->opaqB), "OpaqueMove"); + SetBoolForKey(WMGetButtonSelected(panel->opaqresizeB), "OpaqueResize"); SetBoolForKey(WMGetButtonSelected(panel->tranB), "OpenTransientOnOwnerWorkspace"); SetStringForKey(placements[WMGetPopUpButtonSelectedItem(panel->placP)], "WindowPlacement"); sprintf(x, "%i", WMGetSliderValue(panel->hsli)); @@ -317,19 +326,19 @@ static void createPanel(Panel * p) WMMapSubwidgets(panel->placF); - /************** Opaque Move ***************/ + /************** Opaque Move, Resize ***************/ panel->opaqF = WMCreateFrame(hbox); WMMapWidget(panel->opaqF); - WMAddBoxSubview(hbox, WMWidgetView(panel->opaqF), False, True, 110, 0, 0); + WMAddBoxSubview(hbox, WMWidgetView(panel->opaqF), False, True, 122, 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" - "frame should be displayed.\n"), WMWidgetView(panel->opaqF)); + WMSetFrameTitle(panel->opaqF, _("Opaque Move/Resize")); + WMSetBalloonTextForView(_("Whether the window contents or only a frame should\n" + "be displayed during a move or resize.\n"), + WMWidgetView(panel->opaqF)); panel->opaqB = WMCreateButton(panel->opaqF, WBTToggle); - WMResizeWidget(panel->opaqB, 64, 64); - WMMoveWidget(panel->opaqB, 24, 25); + WMResizeWidget(panel->opaqB, 48,48); + WMMoveWidget(panel->opaqB, 7, 35); WMSetButtonImagePosition(panel->opaqB, WIPImageOnly); path = LocateImage(NON_OPAQUE_MOVE_PIXMAP); @@ -355,8 +364,41 @@ static void createPanel(Panel * p) } wfree(path); } + + + + panel->opaqresizeB = WMCreateButton(panel->opaqF, WBTToggle); + WMResizeWidget(panel->opaqresizeB, 48,48); + WMMoveWidget(panel->opaqresizeB, 65, 35); + WMSetButtonImagePosition(panel->opaqresizeB, WIPImageOnly); + + path = LocateImage(NON_OPAQUE_RESIZE_PIXMAP); + if (path) { + pixmap = WMCreatePixmapFromFile(scr, path); + if (pixmap) { + WMSetButtonImage(panel->opaqresizeB, pixmap); + WMReleasePixmap(pixmap); + } else { + wwarning(_("could not load icon %s"), path); + } + wfree(path); + } + + path = LocateImage(OPAQUE_RESIZE_PIXMAP); + if (path) { + pixmap = WMCreatePixmapFromFile(scr, path); + if (pixmap) { + WMSetButtonAltImage(panel->opaqresizeB, pixmap); + WMReleasePixmap(pixmap); + } else { + wwarning(_("could not load icon %s"), path); + } + wfree(path); + } + WMMapSubwidgets(panel->opaqF); + /**************** Account for Icon/Dock ***************/ panel->maxiF = WMCreateFrame(panel->box); WMResizeWidget(panel->maxiF, 205, 95); diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am index 8736e971..fe21243a 100644 --- a/WPrefs.app/tiff/Makefile.am +++ b/WPrefs.app/tiff/Makefile.am @@ -30,8 +30,10 @@ EXTRA_DIST = \ newstyle.tiff \ nextstyle.tiff \ nonopaque.tiff \ + noopaqueresize.tiff \ oldstyle.tiff \ opaque.tiff \ + opaqueresize.tiff \ paths.tiff \ smooth.tiff \ sound.tiff \ diff --git a/WPrefs.app/tiff/noopaqueresize.tiff b/WPrefs.app/tiff/noopaqueresize.tiff new file mode 100644 index 0000000000000000000000000000000000000000..e2146cb1a3291d81d167d547114cafe17379236e GIT binary patch literal 9522 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 literal 0 HcmV?d00001 diff --git a/WPrefs.app/tiff/opaqueresize.tiff b/WPrefs.app/tiff/opaqueresize.tiff new file mode 100644 index 0000000000000000000000000000000000000000..986cefe194825708678833a1107ac3ae96e95c74 GIT binary patch literal 9519 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 BiO~Q6 literal 0 HcmV?d00001 diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am index 96c44f55..0f08ef4f 100644 --- a/WPrefs.app/xpm/Makefile.am +++ b/WPrefs.app/xpm/Makefile.am @@ -30,8 +30,10 @@ EXTRA_DIST = \ newstyle.xpm \ nextstyle.xpm \ nonopaque.xpm \ + noopaqueresize.xpm \ oldstyle.xpm \ opaque.xpm \ + opaqueresize.xpm \ paths.xpm \ smooth.xpm \ sound.xpm \ diff --git a/WPrefs.app/xpm/noopaqueresize.xpm b/WPrefs.app/xpm/noopaqueresize.xpm new file mode 100644 index 00000000..1d03b7c0 --- /dev/null +++ b/WPrefs.app/xpm/noopaqueresize.xpm @@ -0,0 +1,553 @@ +/* XPM */ +static char * noopaqueresize_xpm[] = { +"48 48 502 2", +" c None", +". c #000000", +"+ c #9C9C9C", +"@ c #B5B5B5", +"# c #FFFFFF", +"$ c #5A5A5A", +"% c #0F0000", +"& c #380000", +"* c #FEFEFE", +"= c #FDFDFD", +"- c #FAFAFA", +"; c #EFEEEE", +"> c #EDEBEB", +", c #EEEDED", +"' c #F9F9F9", +") c #FCFCFC", +"! c #EDECEC", +"~ c #BEB3B3", +"{ c #C9AAAA", +"] c #C7A8A8", +"^ c #BDB2B2", +"/ c #EBE9E9", +"( c #FBFBFB", +"_ c #F7F7F7", +": c #DDDCDC", +"< c #C2A4A4", +"[ c #FEAEAE", +"} c #FEADAD", +"| c #C2A3A3", +"1 c #E4E2E2", +"2 c #F6F6F6", +"3 c #E8E7E7", +"4 c #B3A9A9", +"5 c #CF9696", +"6 c #FFAEAE", +"7 c #FFABAB", +"8 c #BE9A9A", +"9 c #DCDADA", +"0 c #F0F0F0", +"a c #F5F5F5", +"b c #F3F2F2", +"c c #D6D5D5", +"d c #B89999", +"e c #FEA1A1", +"f c #FFA6A6", +"g c #FF9999", +"h c #AC8D8D", +"i c #D3D1D1", +"j c #E8E8E8", +"k c #F8F8F8", +"l c #E4E3E3", +"m c #ACA1A1", +"n c #C38A8A", +"o c #FF9C9C", +"p c #FF9595", +"q c #AE7676", +"r c #8E8282", +"s c #BBB9B9", +"t c #CECDCD", +"u c #DBDADA", +"v c #EEEEEE", +"w c #D3D0D0", +"x c #B19292", +"y c #FF9494", +"z c #FF8080", +"A c #8C6C6C", +"B c #9A9696", +"C c #8A8080", +"D c #9B8484", +"E c #A29898", +"F c #AA9E9E", +"G c #BC8484", +"H c #FF9191", +"I c #FF8484", +"J c #975F5F", +"K c #716565", +"L c #8E8A8A", +"M c #886C6C", +"N c #E38181", +"O c #B08080", +"P c #A39797", +"Q c #D5D3D3", +"R c #F1F1F1", +"S c #F3F1F1", +"T c #B09393", +"U c #FF9090", +"V c #FF8C8C", +"W c #F97373", +"X c #795959", +"Y c #817D7D", +"Z c #6A6060", +"` c #935E5E", +" . c #FF8D8D", +".. c #B58383", +"+. c #A79C9C", +"@. c #E0DEDE", +"#. c #F3F3F3", +"$. c #F2F2F2", +"%. c #EFEDED", +"&. c #AE8D8D", +"*. c #FF8E8E", +"=. c #FF7F7F", +"-. c #8E5656", +";. c #635757", +">. c #7A7676", +",. c #6F5252", +"'. c #E46969", +"). c #FF8181", +"!. c #AA8B8B", +"~. c #D2D1D1", +"{. c #DEDDDD", +"]. c #E2E1E1", +"^. c #E9E8E8", +"/. c #A28686", +"(. c #F78080", +"_. c #EE7070", +":. c #745454", +"<. c #777373", +"[. c #5A5050", +"}. c #7C4747", +"|. c #FF6969", +"1. c #FF7878", +"2. c #9C7D7D", +"3. c #BDBABA", +"4. c #B49A9A", +"5. c #B2A8A8", +"6. c #DAD9D9", +"7. c #948B8B", +"8. c #8E7070", +"9. c #7D5F5F", +"0. c #645959", +"a. c #747070", +"b. c #644747", +"c. c #D25757", +"d. c #FF6868", +"e. c #FF6F6F", +"f. c #955D5D", +"g. c #7E7272", +"h. c #A4A0A0", +"i. c #A48484", +"j. c #FE9696", +"k. c #C89090", +"l. c #BB9A9A", +"m. c #B2A7A7", +"n. c #EBEAEA", +"o. c #EDEDED", +"p. c #E6E6E6", +"q. c #C2C1C1", +"r. c #AFADAD", +"s. c #9E9C9C", +"t. c #888686", +"u. c #5A4E4E", +"v. c #764141", +"w. c #F65C5C", +"x. c #FF6464", +"y. c #FF6565", +"z. c #E35D5D", +"A. c #755555", +"B. c #8B8787", +"C. c #7D7171", +"D. c #AA7272", +"E. c #FF9696", +"F. c #FF9F9F", +"G. c #FF9E9E", +"H. c #C78F8F", +"I. c #B4A9A9", +"J. c #E5E3E3", +"K. c #E8E6E6", +"L. c #B9B0B0", +"M. c #C1A6A6", +"N. c #BBB2B2", +"O. c #E5E5E5", +"P. c #D1D1D1", +"Q. c #C0C0C0", +"R. c #AEAEAE", +"S. c #8B8989", +"T. c #694D4D", +"U. c #D15656", +"V. c #FF6161", +"W. c #FF6060", +"X. c #F65959", +"Y. c #794141", +"Z. c #5C5050", +"`. c #7F7B7B", +" + c #7E5F5F", +".+ c #FE7878", +"++ c #FF9797", +"@+ c #FE9A9A", +"#+ c #B49595", +"$+ c #D7D6D6", +"%+ c #BC9E9E", +"&+ c #FEA5A5", +"*+ c #BFA1A1", +"=+ c #D9D7D7", +"-+ c #E7E7E7", +";+ c #D5D5D5", +">+ c #C5C5C5", +",+ c #AAA8A8", +"'+ c #6D6262", +")+ c #834B4B", +"!+ c #FB6060", +"~+ c #FF6262", +"{+ c #FF5D5D", +"]+ c #D44E4E", +"^+ c #5D3C3C", +"/+ c #656060", +"(+ c #874F4F", +"_+ c #FF7272", +":+ c #FF8686", +"<+ c #A58686", +"[+ c #C0BDBD", +"}+ c #A29696", +"|+ c #BC8686", +"1+ c #FFA1A1", +"2+ c #C99191", +"3+ c #ADA2A2", +"4+ c #E2E0E0", +"5+ c #EBEBEB", +"6+ c #DBDBDB", +"7+ c #CCCCCC", +"8+ c #B0AEAE", +"9+ c #836464", +"0+ c #EB6565", +"a+ c #F25555", +"b+ c #6E3737", +"c+ c #423535", +"d+ c #453838", +"e+ c #723F3F", +"f+ c #E65C5C", +"g+ c #FF6C6C", +"h+ c #FF7676", +"i+ c #FF7A7A", +"j+ c #FF7979", +"k+ c #857979", +"l+ c #A6A2A2", +"m+ c #977979", +"n+ c #F57373", +"o+ c #D7D5D5", +"p+ c #F4F4F4", +"q+ c #E1E1E1", +"r+ c #B9B7B7", +"s+ c #8A6B6B", +"t+ c #F16B6B", +"u+ c #DF5050", +"v+ c #5A3737", +"w+ c #585353", +"x+ c #5A3838", +"y+ c #D54F4F", +"z+ c #FF6666", +"A+ c #FF6B6B", +"B+ c #7C7171", +"C+ c #A26A6A", +"D+ c #FF8383", +"E+ c #FF9292", +"F+ c #FF8F8F", +"G+ c #C1BFBF", +"H+ c #E2E2E2", +"I+ c #EFEFEF", +"J+ c #DCDCDC", +"K+ c #C3C1C1", +"L+ c #837979", +"M+ c #8E5B5B", +"N+ c #EA6161", +"O+ c #F75656", +"P+ c #A14040", +"Q+ c #412B2B", +"R+ c #3D3030", +"S+ c #6C3535", +"T+ c #F05353", +"U+ c #FF5C5C", +"V+ c #FF5E5E", +"W+ c #DB5555", +"X+ c #6C4C4C", +"Y+ c #7D7979", +"Z+ c #7B5C5C", +"`+ c #F77171", +" @ c #9D6565", +".@ c #8F8484", +"+@ c #CFCDCD", +"@@ c #ECECEC", +"#@ c #E3E3E3", +"$@ c #D3D3D3", +"%@ c #756969", +"&@ c #784545", +"*@ c #9B2F2F", +"=@ c #562D2D", +"-@ c #3A3030", +";@ c #4D2C2C", +">@ c #CE4848", +",@ c #FF5656", +"'@ c #FF5858", +")@ c #FF5757", +"!@ c #FF5454", +"~@ c #D54B4B", +"{@ c #693737", +"]@ c #493C3C", +"^@ c #514545", +"/@ c #FF6A6A", +"(@ c #FF7373", +"_@ c #FF7575", +":@ c #FF7070", +"<@ c #D85353", +"[@ c #8C6D6D", +"}@ c #C4C2C2", +"|@ c #C8C8C8", +"1@ c #A2A0A0", +"2@ c #675D5D", +"3@ c #5B4141", +"4@ c #504646", +"5@ c #666262", +"6@ c #5E3939", +"7@ c #E64E4E", +"8@ c #FF5555", +"9@ c #FF5353", +"0@ c #FF5252", +"a@ c #E74A4A", +"b@ c #683030", +"c@ c #463B3B", +"d@ c #613F3F", +"e@ c #DC5656", +"f@ c #520000", +"g@ c #8B6767", +"h@ c #D8D8D8", +"i@ c #E9E9E9", +"j@ c #151515", +"k@ c #BCBCBC", +"l@ c #A1A0A0", +"m@ c #7F7D7D", +"n@ c #644040", +"o@ c #5A0000", +"p@ c #7F0000", +"q@ c #FF5151", +"r@ c #790000", +"s@ c #420000", +"t@ c #523232", +"u@ c #615D5D", +"v@ c #713939", +"w@ c #F45757", +"x@ c #600000", +"y@ c #905A5A", +"z@ c #847979", +"A@ c #C7C5C5", +"B@ c #E4E4E4", +"C@ c #D7D7D7", +"D@ c #C7C7C7", +"E@ c #B7B7B7", +"F@ c #A9A9A9", +"G@ c #9E9E9E", +"H@ c #898787", +"I@ c #624343", +"J@ c #CB4B4B", +"K@ c #EC4F4F", +"L@ c #FF5050", +"M@ c #E44747", +"N@ c #642C2C", +"O@ c #443838", +"P@ c #593939", +"Q@ c #D14B4B", +"R@ c #FF5A5A", +"S@ c #FF5959", +"T@ c #E46666", +"U@ c #866A6A", +"V@ c #B4B2B2", +"W@ c #DEDEDE", +"X@ c #C3C3C3", +"Y@ c #ABABAB", +"Z@ c #969494", +"`@ c #605555", +" # c #624242", +".# c #6F3838", +"+# c #CD4747", +"@# c #E14949", +"## c #C24141", +"$# c #605C5C", +"%# c #483D3D", +"&# c #6D3535", +"*# c #EE5151", +"=# c #935D5D", +"-# c #897E7E", +";# c #CCCBCB", +"># c #C6C6C6", +",# c #BBBBBB", +"'# c #AFAFAF", +")# c #999898", +"!# c #848282", +"~# c #574D4D", +"{# c #5E3F3F", +"]# c #5F3B3B", +"^# c #573838", +"/# c #493E3E", +"(# c #625E5E", +"_# c #5A3A3A", +":# c #D04A4A", +"<# c #7B0000", +"[# c #F66969", +"}# c #CC6565", +"|# c #887070", +"1# c #C4C3C3", +"2# c #CBCBCB", +"3# c #C1C1C1", +"4# c #A7A7A7", +"5# c #919090", +"6# c #878585", +"7# c #828080", +"8# c #7E7C7C", +"9# c #727070", +"0# c #4D4141", +"a# c #703838", +"b# c #FC5151", +"c# c #F25353", +"d# c #E44D4D", +"e# c #4D0000", +"f# c #A86B6B", +"g# c #745555", +"h# c #7B7171", +"i# c #DFDFDF", +"j# c #DADADA", +"k# c #D0D0D0", +"l# c #B9B9B9", +"m# c #ACACAC", +"n# c #A2A2A2", +"o# c #9B9B9B", +"p# c #949494", +"q# c #7B7979", +"r# c #D65050", +"s# c #FF5B5B", +"t# c #E84B4B", +"u# c #D34C4C", +"v# c #945757", +"w# c #5B3535", +"x# c #5D3D3D", +"y# c #5A4D4D", +"z# c #635C5C", +"A# c #B2B2B2", +"B# c #7D4646", +"C# c #F35B5B", +"D# c #5F0000", +"E# c #540000", +"F# c #C24848", +"G# c #663131", +"H# c #484040", +"I# c #888787", +"J# c #979696", +"K# c #D9D9D9", +"L# c #E0E0E0", +"M# c #D6D6D6", +"N# c #C2C2C2", +"O# c #785D5D", +"P# c #D56363", +"Q# c #DC5B5B", +"R# c #763F3F", +"S# c #623E3E", +"T# c #593C3C", +"U# c #4B4141", +"V# c #6F6D6D", +"W# c #7B7A7A", +"X# c #818080", +"Y# c #929292", +"Z# c #AAAAAA", +"`# c #BABABA", +" $ c #CACACA", +".$ c #D2D2D2", +"+$ c #B1AFAF", +"@$ c #7B6A6A", +"#$ c #A36D6D", +"$$ c #734D4D", +"%$ c #594E4E", +"&$ c #797676", +"*$ c #817F7F", +"=$ c #8D8D8D", +"-$ c #939393", +";$ c #999999", +">$ c #A0A0A0", +",$ c #B4B4B4", +"'$ c #EAEAEA", +")$ c #C0BFBF", +"!$ c #827B7B", +"~$ c #736767", +"{$ c #666060", +"]$ c #969696", +"^$ c #979797", +"/$ c #A1A1A1", +"($ c #CDCDCD", +"_$ c #BCBBBB", +":$ c #A3A3A3", +"<$ c #B1B1B1", +"[$ c #B6B6B6", +"}$ c #C4C4C4", +"|$ c #CECECE", +"1$ c #BFBFBF", +"2$ c #CFCFCF", +"3$ c #B3B3B3", +"4$ c #A4A4A4", +"5$ c #A8A8A8", +"6$ c #ADADAD", +"7$ c #B0B0B0", +"8$ c #303030", +"9$ c #313131", +"0$ c #2F2F2F", +"a$ c #2E2E2E", +"b$ c #2D2D2D", +"c$ c #2C2C2C", +" ", +" ", +" . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . ", +" . @ @ @ . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . # . # . ", +" . @ . @ . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . # . . ", +" . @ @ @ . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . # . # . ", +" . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . ", +" @ @ @ . . @ . . @ . . $ . . @ . . @ . @ . . @ @ . . @ . . @ . . @ . . @ . . . . ", +" . . . . . . . . . . % & . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" . # # # # # # * * * = = = = * * * # # # # # # # . # # # # # # . # # # # # # # . ", +" . # # # # * * = - ; > > , ' = = * * # # # # # # . # # # # # # . # # # . # # # . ", +" . # # * * = = ) ! ~ { ] ^ / - ) = * * # # # # # # # # # # # # # # # # . # # # . ", +" . # * * = = ( _ : < [ } | 1 2 ' ( = * # # # # # # # # # # # # # # # # # # # # . ", +" . # * = = ( ' 3 4 5 6 7 8 9 0 a ' ) = * # # # # . # # # # # # . # # # # # # # . ", +" . * * = ) - b c d e f g h i j 0 2 - ) = * # # # . # # # # # # . # # # . # # # . ", +" . * = ) - k l m n o p q r s t u v _ ( = * * # # # # # # # # # # # # # . # # # . ", +" . * = ( ' 2 w x y y z A B C D E i 0 k ( = * * # # # # # # # # # # # # # # # # . ", +" . * = ( _ a F G H I J K L M N O P Q R k ( = = * . # # # # # # . # # # # # # # . ", +" . = ) - a S T U V W X Y Z ` I ...+.@.#.k ( ) = . * # # # # # . # # # . # # # . ", +" . = ) k $.%.&.*.=.-.;.>.,.'.). .V !.~.{.].^._ ( ) = = * * * * # # # # . # # # . ", +" . = ( _ 0 / /.(._.:.<.[.}.|.1.).=.2.3.+.4.5.6.^._ ( ) = = = = = * * * # # # # . ", +" . = ( 2 v ^.7.8.9.0.a.b.c.d.e.e.f.g.h.i.j.k.l.m.. 3 2 _ ! n., . = = * * # # # . ", +" . = - a o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.. I.J.K.L.M.N.. ' ) = . * # # . ", +" . = - a o.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+*.++o o @+#+$+i %+&+*+=+$.' ( . = * # . ", +" . = ( 2 v -+;+>+,+'+)+!+~+{+]+^+/+u.(+_+z :+V H V <+[+}+|+1+2+3+4+#.k ( = * * . ", +" . = ( _ 0 5+6+7+8+9+0+|.~+a+b+c+d+e+f+g+_+h+i+j+. k+l+m+n+g g . o+o.p+' ( = * . ", +" . = ) k #.v q+;+r+s+t+g+V.u+v+w+x+y+W.x.z+d.A+d.. L B+C+D+E+F+. G+H+I+. - ) * . ", +" . = ) - 2 $.j J+K+L+M+N+O+P+Q+R+S+T+U+U+U+{+V+W+X+Y+Z+`+).I =. @.@+@j . k ) = . ", +" . * = ( k a @@#@$@r.%@&@*@=@-@;@>@,@'@)@,@!@~@{@]@^@)+/@(@_@:@<@[@}@q+v 2 - = . ", +" . * = ) ' _ 0 -+J+|@1@2@3@4@5@6@7@,@8@9@0@a@b@c@. d@e@z+d.|.g+f@g@8+h@i@#.' ) . ", +" . . = ) . j@$.5+. . k@l@. . m@n@o@p@9@q@r@s@t@u@. v@w@W.W.W.x.x@y@z@A@. 0 _ ( . ", +" . * = ) ( ' p+o.B@C@D@E@F@G@H@I@J@K@0@L@M@N@O@u@P@Q@R@R@S@R@{+y.T@U@V@. @@a - . ", +" . * = ) ( - 2 R i@W@P.X@E@Y@Z@`@ #.#+#@###t@$#%#&#*#'@)@8@8@'@W.z+=#-#;#j $.' . ", +" . * = ) ( - _ p+v p.J+P.>#,#'#)#!#~#{#]#^#/#(#_#:#)@)@!@0@0@!@<#[#}#|#1#B@I+_ . ", +" . * = = ( - k 2 #.o.p.W@;+2#3#@ 4#5#6#7#8#9#0#a#T+S@,@9@b#c#d#e#f#g#h#. i#@@a . ", +" . * = = ) - ' k 2 #.I+i@H+j#k#>+l#m#n#o#p#q#I@r#s#S@!@t#u#v#w#x#y#z#s.. 6+i@#.. ", +" . . = = . j@- - . . a $.. . W@$@. . A#F@. . B#C#D#E#F#G#. . H#. I#J#A#|@K#j $.. ", +" . * = = ) ( - - - - ' k p+0 i@L#M#7+N#l#1@O#P#Q#R#S#T#U#V#W#X#Y#G@Z#`# $j#j $.. ", +" . * = = ) ( - ( ( ) ) ( ' 2 R 5+#@6+.$ $+$@$#$$$%$&$*$X#=$-$;$>$F@,$3#. W@'$#.. ", +" . * = = ) ( ( ( ( ) = ) ) - _ #.v -+L#h@)$!$~${$6#]$]$^$+ /$4#'#E@3#($. O.v 2 . ", +" . * . . ) ( . . ) ) . . = ) . . a R . . ;+_$. . :$n#. . Y@<$. . |@P.. . @@#.k . ", +" . * = = ) ( ( ( ) = = * * = = ( ' 2 R '$i#P.>+l#A#'#<$[$k@}$2#.$K#i#p.@@$._ - . ", +" . * = = ) ( ( ( ) = = * * * = = ) ' a I+O.j#|$>+1$1$N#|@2$M#J+H+-+@@0 p+k - ) . ", +" . * = = ) ( ( ( ) = = * # # * * = ( k #.5+H+K#.$2$2$$@K#i#O.'$v R p+_ ' ( ) = . ", +" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" @ @ ,$3$3$A#A#A#3$3$,$,$@ @ @ @ ,$3$A#'#m#4#:$/$>$n#4$5$Y@6$'#7$<$A#8$3$,$,$@ 9$ ", +" @ 9$8$8$8$8$8$8$8$8$8$9$9$9$9$9$9$8$8$0$0$a$b$c$c$b$b$a$0$0$8$8$8$8$8$,$9$9$9$9$ ", +" "}; diff --git a/WPrefs.app/xpm/opaqueresize.xpm b/WPrefs.app/xpm/opaqueresize.xpm new file mode 100644 index 00000000..f60e2d79 --- /dev/null +++ b/WPrefs.app/xpm/opaqueresize.xpm @@ -0,0 +1,549 @@ +/* XPM */ +static char * opaqueresize_xpm[] = { +"48 48 498 2", +" c None", +". c #000000", +"+ c #9C9C9C", +"@ c #B5B5B5", +"# c #FFFFFF", +"$ c #B4B4B4", +"% c #B3B3B3", +"& c #595959", +"* c #0F0000", +"= c #370000", +"- c #FEFEFE", +"; c #FDFDFD", +"> c #FCFCFC", +", c #FBFBFB", +"' c #FAFAFA", +") c #F9F9F9", +"! c #F7F7F7", +"~ c #F6F6F6", +"{ c #F5F5F5", +"] c #F4F4F4", +"^ c #F8F8F8", +"/ c #F0F0F0", +"( c #EFEFEF", +"_ c #EBEBEB", +": c #E0DFDF", +"< c #DFDDDD", +"[ c #DEDCDC", +"} c #EEEEEE", +"| c #F1F1F1", +"1 c #F3F3F3", +"2 c #EAEAEA", +"3 c #E8E8E8", +"4 c #D9D8D8", +"5 c #AA9F9F", +"6 c #B69797", +"7 c #B49595", +"8 c #D8D6D6", +"9 c #E7E7E7", +"0 c #E9E9E9", +"a c #EDEDED", +"b c #E5E5E5", +"c c #DFDFDF", +"d c #C5C4C4", +"e c #AB8D8D", +"f c #FE9999", +"g c #FE9898", +"h c #AC8D8D", +"i c #CFCDCD", +"j c #E0E0E0", +"k c #E4E4E4", +"l c #E6E6E6", +"m c #E1E1E1", +"n c #D0CFCF", +"o c #9B9191", +"p c #B98080", +"q c #FF9999", +"r c #FF9797", +"s c #AA8686", +"t c #C8C6C6", +"u c #DCDCDC", +"v c #DBDADA", +"w c #BFBEBE", +"x c #A38484", +"y c #FE8E8E", +"z c #FF9595", +"A c #FF8888", +"B c #9B7C7C", +"C c #C3C1C1", +"D c #D8D8D8", +"E c #ECECEC", +"F c #CECDCD", +"G c #988D8D", +"H c #B27979", +"I c #FF8E8E", +"J c #A36B6B", +"K c #837777", +"L c #B0AEAE", +"M c #C4C3C3", +"N c #F2F2F2", +"O c #BFBCBC", +"P c #A08181", +"Q c #FF8787", +"R c #FF8A8A", +"S c #FE7878", +"T c #856565", +"U c #949090", +"V c #847A7A", +"W c #957E7E", +"X c #9C9292", +"Y c #CDCBCB", +"Z c #E5E4E4", +"` c #988C8C", +" . c #AD7575", +".. c #FF7D7D", +"+. c #925A5A", +"@. c #6E6262", +"#. c #8B8787", +"$. c #856969", +"%. c #E07E7E", +"&. c #AD7D7D", +"*. c #A09494", +"=. c #D2D0D0", +"-. c #E1DFDF", +";. c #9F8282", +">. c #FF8282", +",. c #F36D6D", +"'. c #765656", +"). c #7F7B7B", +"!. c #685E5E", +"~. c #925D5D", +"{. c #FF8383", +"]. c #FF8C8C", +"^. c #B38181", +"/. c #A69B9B", +"(. c #E2E2E2", +"_. c #DDDBDB", +":. c #9D7C7C", +"<. c #FF8181", +"[. c #FF7777", +"}. c #895151", +"|. c #605454", +"1. c #797575", +"2. c #6F5252", +"3. c #E46969", +"4. c #FF8D8D", +"5. c #AA8B8B", +"6. c #D2D1D1", +"7. c #DEDDDD", +"8. c #E2E1E1", +"9. c #E9E8E8", +"0. c #D9D7D7", +"a. c #927676", +"b. c #EB7474", +"c. c #E66868", +"d. c #6F4F4F", +"e. c #757171", +"f. c #594F4F", +"g. c #7C4747", +"h. c #FF6969", +"i. c #FF7878", +"j. c #FF7F7F", +"k. c #9C7D7D", +"l. c #BCB9B9", +"m. c #B39999", +"n. c #B1A7A7", +"o. c #DAD9D9", +"p. c #DEDEDE", +"q. c #D7D6D6", +"r. c #847B7B", +"s. c #816363", +"t. c #755757", +"u. c #5F5454", +"v. c #726E6E", +"w. c #634646", +"x. c #D25757", +"y. c #FF6868", +"z. c #FF6F6F", +"A. c #955D5D", +"B. c #7E7272", +"C. c #A4A0A0", +"D. c #A48484", +"E. c #FE9696", +"F. c #C89090", +"G. c #BB9A9A", +"H. c #B2A7A7", +"I. c #E8E7E7", +"J. c #EDECEC", +"K. c #EBEAEA", +"L. c #EEEDED", +"M. c #D7D7D7", +"N. c #B2B1B1", +"O. c #A2A0A0", +"P. c #969494", +"Q. c #838181", +"R. c #584C4C", +"S. c #764141", +"T. c #F65C5C", +"U. c #FF6464", +"V. c #FF6565", +"W. c #E35D5D", +"X. c #755555", +"Y. c #7D7171", +"Z. c #AA7272", +"`. c #FF9696", +" + c #FF9F9F", +".+ c #FF9E9E", +"++ c #C78F8F", +"@+ c #B4A9A9", +"#+ c #E5E3E3", +"$+ c #E8E6E6", +"%+ c #B9B0B0", +"&+ c #C1A6A6", +"*+ c #BAB1B1", +"=+ c #DDDDDD", +"-+ c #C1C1C1", +";+ c #A6A6A6", +">+ c #878585", +",+ c #674B4B", +"'+ c #D15656", +")+ c #FF6060", +"!+ c #F65959", +"~+ c #794141", +"{+ c #5C5050", +"]+ c #7E5F5F", +"^+ c #FF9C9C", +"/+ c #3B0000", +"(+ c #D3D1D1", +"_+ c #BC9E9E", +":+ c #FEA5A5", +"<+ c #BEA0A0", +"[+ c #C4C4C4", +"}+ c #B8B8B8", +"|+ c #695E5E", +"1+ c #814949", +"2+ c #FA5F5F", +"3+ c #FF6161", +"4+ c #FF5D5D", +"5+ c #D44E4E", +"6+ c #5D3C3C", +"7+ c #656060", +"8+ c #5A4E4E", +"9+ c #874F4F", +"0+ c #FF7272", +"a+ c #FF8080", +"b+ c #FF8686", +"c+ c #FF9191", +"d+ c #420000", +"e+ c #A58686", +"f+ c #C0BDBD", +"g+ c #A29696", +"h+ c #BC8686", +"i+ c #FFA1A1", +"j+ c #C99191", +"k+ c #CACACA", +"l+ c #C0C0C0", +"m+ c #A8A6A6", +"n+ c #E96363", +"o+ c #FF6262", +"p+ c #F25555", +"q+ c #6E3737", +"r+ c #423535", +"s+ c #453838", +"t+ c #723F3F", +"u+ c #E65C5C", +"v+ c #FF6C6C", +"w+ c #FF7676", +"x+ c #FF7A7A", +"y+ c #FF7979", +"z+ c #857979", +"A+ c #A6A2A2", +"B+ c #977979", +"C+ c #F57373", +"D+ c #D6D4D4", +"E+ c #E3E3E3", +"F+ c #D1D1D1", +"G+ c #C8C8C8", +"H+ c #B1AFAF", +"I+ c #856666", +"J+ c #EF6969", +"K+ c #FF6B6B", +"L+ c #DF5050", +"M+ c #5A3737", +"N+ c #585353", +"O+ c #5A3838", +"P+ c #D54F4F", +"Q+ c #FF6666", +"R+ c #8E8A8A", +"S+ c #7C7171", +"T+ c #A26A6A", +"U+ c #FF9292", +"V+ c #FF8F8F", +"W+ c #C0BEBE", +"X+ c #D0D0D0", +"Y+ c #BBB9B9", +"Z+ c #7E7474", +"`+ c #8C5959", +" @ c #E96060", +".@ c #F75656", +"+@ c #A14040", +"@@ c #412B2B", +"#@ c #3D3030", +"$@ c #6C3535", +"%@ c #F05353", +"&@ c #FF5C5C", +"*@ c #FF5E5E", +"=@ c #DB5555", +"-@ c #7D7979", +";@ c #7B5C5C", +">@ c #F77171", +",@ c #FF8484", +"'@ c #8E8383", +")@ c #CCCACA", +"!@ c #CBCBCB", +"~@ c #ABA9A9", +"{@ c #736767", +"]@ c #784545", +"^@ c #9B2F2F", +"/@ c #562D2D", +"(@ c #3A3030", +"_@ c #4D2C2C", +":@ c #CE4848", +"<@ c #FF5656", +"[@ c #FF5858", +"}@ c #FF5757", +"|@ c #FF5454", +"1@ c #D54B4B", +"2@ c #693737", +"3@ c #514545", +"4@ c #834B4B", +"5@ c #FF6A6A", +"6@ c #FF7373", +"7@ c #FF7575", +"8@ c #200000", +"9@ c #8B6C6C", +"0@ c #C1BFBF", +"a@ c #DBDBDB", +"b@ c #151515", +"c@ c #5A0000", +"d@ c #7F0000", +"e@ c #600000", +"f@ c #613F3F", +"g@ c #DC5656", +"h@ c #520000", +"i@ c #896565", +"j@ c #ADABAB", +"k@ c #D2D2D2", +"l@ c #CDCDCD", +"m@ c #BABABA", +"n@ c #A09F9F", +"o@ c #918F8F", +"p@ c #898888", +"q@ c #7F7D7D", +"r@ c #644040", +"s@ c #E74F4F", +"t@ c #FF5555", +"u@ c #FF5353", +"v@ c #FF5151", +"w@ c #FE4E4E", +"x@ c #C74141", +"y@ c #523232", +"z@ c #615D5D", +"A@ c #4B3F3F", +"B@ c #713939", +"C@ c #F45757", +"D@ c #8E5858", +"E@ c #817676", +"F@ c #C5C5C5", +"G@ c #B6B6B6", +"H@ c #A9A9A9", +"I@ c #9E9E9E", +"J@ c #898787", +"K@ c #624343", +"L@ c #CB4B4B", +"M@ c #EC4F4F", +"N@ c #FF5252", +"O@ c #FF5050", +"P@ c #E44747", +"Q@ c #642C2C", +"R@ c #443838", +"S@ c #593939", +"T@ c #D14B4B", +"U@ c #FF5A5A", +"V@ c #FF5959", +"W@ c #770000", +"X@ c #E36565", +"Y@ c #836767", +"Z@ c #AEACAC", +"`@ c #DADADA", +" # c #CFCFCF", +".# c #C2C2C2", +"+# c #ABABAB", +"@# c #605555", +"## c #624242", +"$# c #6F3838", +"%# c #CD4747", +"&# c #E14949", +"*# c #C24141", +"=# c #605C5C", +"-# c #483D3D", +";# c #6D3535", +"># c #EE5151", +",# c #905A5A", +"'# c #837878", +")# c #BBBBBB", +"!# c #AFAFAF", +"~# c #999898", +"{# c #848282", +"]# c #574D4D", +"^# c #5E3F3F", +"/# c #5F3B3B", +"(# c #573838", +"_# c #493E3E", +":# c #625E5E", +"<# c #5A3A3A", +"[# c #D04A4A", +"}# c #7B0000", +"|# c #F66868", +"1# c #C96262", +"2# c #826A6A", +"3# c #D4D4D4", +"4# c #D5D5D5", +"5# c #A7A7A7", +"6# c #919090", +"7# c #828080", +"8# c #7E7C7C", +"9# c #727070", +"0# c #4D4141", +"a# c #703838", +"b# c #FC5151", +"c# c #F25353", +"d# c #E44D4D", +"e# c #4D0000", +"f# c #A66969", +"g# c #715252", +"h# c #756B6B", +"i# c #790000", +"j# c #7E0000", +"k# c #0E0000", +"l# c #584B4B", +"m# c #605959", +"n# c #989696", +"o# c #D6D6D6", +"p# c #D3D3D3", +"q# c #BCBCBC", +"r# c #B2B2B2", +"s# c #615656", +"t# c #7D4646", +"u# c #F35B5B", +"v# c #F45858", +"w# c #E45252", +"x# c #C24848", +"y# c #663131", +"z# c #563636", +"A# c #493C3C", +"B# c #484040", +"C# c #757373", +"D# c #878686", +"E# c #949393", +"F# c #ACACAC", +"G# c #CCCCCC", +"H# c #B9B9B9", +"I# c #785D5D", +"J# c #D56363", +"K# c #DC5B5B", +"L# c #763F3F", +"M# c #623E3E", +"N# c #593C3C", +"O# c #4B4141", +"P# c #6F6D6D", +"Q# c #7B7A7A", +"R# c #818080", +"S# c #929292", +"T# c #9D9D9D", +"U# c #7B6A6A", +"V# c #A36D6D", +"W# c #734D4D", +"X# c #594E4E", +"Y# c #797676", +"Z# c #817F7F", +"`# c #8D8D8D", +" $ c #939393", +".$ c #989898", +"+$ c #A0A0A0", +"@$ c #A8A8A8", +"#$ c #B1B1B1", +"$$ c #CECECE", +"%$ c #BBBABA", +"&$ c #ACAAAA", +"*$ c #A1A0A0", +"=$ c #A3A3A3", +"-$ c #A2A2A2", +";$ c #A5A5A5", +">$ c #AAAAAA", +",$ c #BFBFBF", +"'$ c #C7C7C7", +")$ c #C3C3C3", +"!$ c #B0B0B0", +"~$ c #AEAEAE", +"{$ c #D9D9D9", +"]$ c #A1A1A1", +"^$ c #969696", +"/$ c #8F8F8F", +"($ c #8B8B8B", +"_$ c #898989", +":$ c #8E8E8E", +"<$ c #979797", +"[$ c #9B9B9B", +"}$ c #9F9F9F", +"|$ c #292929", +"1$ c #2F2F2F", +"2$ c #2D2D2D", +"3$ c #2B2B2B", +"4$ c #272727", +"5$ c #282828", +"6$ c #2A2A2A", +"7$ c #262626", +"8$ c #242424", +"9$ c #232323", +" ", +" ", +" . . . . . + . . . . . . . . . . . . . + . . . . . . + . . . + . . . + . . . . . ", +" . @ @ @ . + . . . . . . . . . . . . . + . # . # . . + . # . + . # . + . # . # . ", +" . @ . @ . + . . . . . . . . . . . . . + . . # . . . + . . # + . . # + . . # . . ", +" . @ @ @ . + . . . . . . . . . . . . . + . # . # . . + . # . + . # . + . # . # . ", +" . . . . . + . . . . . . . . . . . . . + . . . . . . + . . . + . . . + . . . . . ", +" @ @ @ . . $ . . % . . & . . % . . % . . % . . . . . . % . . . % . . . % . . . . ", +" . . . . . . . . . . * = . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" . - ; ; > , ' ' ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) . ) ) ) ) ) ) . ) ) ) . ' ' , . ", +" . ; > , ) ! ~ { { ] ] ] ] { { { { { { { { { { { . { { { { { { . { { { . { ~ ! . ", +" . ; , ^ { { / ( _ : < [ : _ } ( / / / / / / / / . / / / / / / . / / / . / | 1 . ", +" . > ) { | / 2 3 4 5 6 7 5 8 9 0 2 _ _ _ _ _ _ _ . _ _ _ _ _ _ . _ _ 2 . 2 _ } . ", +" . , ! 1 a _ b c d e f g h i j k l 3 0 0 0 0 0 0 . 0 0 0 0 0 0 . 0 3 9 . l l 0 . ", +" . ' ~ | 2 0 m n o p q r s t u m b 3 0 2 2 2 2 2 . 2 2 2 2 2 2 . 2 0 9 . k k l . ", +" . ' { ( 0 9 v w x y z A B C D j l 2 E a } } } } . } } } } } } . a E 2 . b k l . ", +" . ) { ( 3 l F G H I A J K L M n k E / N 1 1 ] ] . ] ] ] ] ] ] . 1 | ( . 3 l l . ", +" . ) { } 9 l O P Q R S T U V W X Y 2 N { ! ^ ^ ^ . ^ ^ ^ ^ ^ ^ . ! ~ 1 . _ 3 9 . ", +" . ) ] } l Z ` .Q ..+.@.#.$.%.&.*.=.} { ^ ' ' , . , , , , , , . ' ^ ~ . E 0 3 . ", +" . ) ] a k -.;.>.>.,.'.).!.~.{.].^./.< N ! ' , > . ; ; ; ; ; ; . > ' ! . } 2 0 . ", +" . ) ] E (._.:.<.[.}.|.1.2.3.<.4.].5.6.7.8.9.~ , . ; ; ; - - - . ; , ^ . } 2 0 . ", +" . ) 1 2 j 0.a.b.c.d.e.f.g.h.i.<.j.k.l./.m.n.o.9.. , > > ; ; ; . > , ^ . } 2 0 . ", +" . ^ N 0 p.q.r.s.t.u.v.w.x.y.z.z.A.B.C.D.E.F.G.H.. I.~ ! J.K.L.. > ' ^ . } 2 0 . ", +" . ^ N 0 u M.N.O.P.Q.R.S.T.U.V.W.X.#.Y.Z.`. +.+++. @+#+$+%+&+*+. ^ ) ! . } 2 0 . ", +" . ^ N 0 =+M.-+% ;+>+,+'+)+)+!+~+{+).]+S I r ^+^+/+7 q.(+_+:+<+. | ~ { . a 2 0 . ", +" . ^ N 0 p.D [+}+O.|+1+2+3+4+5+6+7+8+9+0+a+b+].c+d+e+f+g+h+i+j+. -./ N . a 2 0 . ", +" . ) 1 2 j u k+l+m+]+n+y.o+p+q+r+s+t+u+v+0+w+x+y+. z+A+B+C+q q . D+2 } . E 0 0 . ", +" . ) ] E E+j F+G+H+I+J+K+3+L+M+N+O+P+)+U.Q+y.K+y.. R+S+T+{.U+V+. W+c 0 . 2 0 3 . ", +" . ) ] a l E+M.X+Y+Z+`+ @.@+@@@#@$@%@&@&@&@4+*@=@. -@;@>@<.,@j.. '@)@(.. 3 3 3 . ", +" . ) { } 3 l u M.!@~@{@]@^@/@(@_@:@<@[@}@<@|@1@2@. 3@4@5@6@7@z.8@9@0@a@. l l 3 . ", +" . . . . . b@. . . . . . . . . . c@d@d@d@d@e@. . . f@g@Q+y.h.v+h@i@j@k@. E+b 9 . ", +" . ) { ( 2 0 (.p.D l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@)+)+)+U.e@D@E@0@. j E+l . ", +" . ) { / 2 2 k m u k@F@G@H@I@J@K@L@M@N@O@P@Q@R@z@S@T@U@U@V@U@4+W@X@Y@Z@. =+m b . ", +" . ) { / _ _ b k m `@ #.#G@+#P.@###$#%#&#*#y@=#-#;#>#[@}@t@t@[@d@V.,#'#. D p.k . ", +" . ) { / _ _ 9 9 l (.`@X+F@)#!#~#{#]#^#/#(#_#:#<#[#}@}@|@N@N@|@}#|#1#2#. 3#a@(.. ", +" . ) { / _ _ 3 2 _ 0 k =+4#!@-+@ 5#6#>+7#8#9#0#a#%@V@<@u@b#c#d#e#f#g#h#. #D j . ", +" . . . . . b@. . . . . . . . . . . . . . . . . d+i#j#W@e@e#k#. . l#m#n#. !@o#p.. ", +" . ) { / _ E 2 a | 1 1 | a 9 p.p#G+q#r#H@P.s#t#u#v#w#x#y#z#A#B#C#D#E#F#. k+3#=+. ", +" . ) { / _ E 2 } N ~ ! ! ] / 0 j o#G#.#H#O.I#J#K#L#M#N#O#P#Q#R#S#T#5#$ . !@3#=+. ", +" . ) { / _ E 2 } 1 ! ' ' ) ~ | _ E+a@k@k+H+U#V#W#X#Y#Z#R#`# $.$+$@$#$)#. $$M.p.. ", +" . . . . . b@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4#`@j . ", +" . ) { / _ E 2 } 1 ^ , > > > ' ^ { / 2 (.3#%$&$*$=$-$-$;$>$#$}+,$'$l@p#D u c E+. ", +" . ) { / _ E 2 } 1 ! ' > > > , ' ^ { / 0 p.X+)$}+!$~$!$@ )#)$k+X+o#a@c m (.E+b . ", +" . ) { / _ 3 0 E | { ^ ' , , , ' ) ! 1 E E+M.!@.#q#q#,$F@G#p#{$p.E+l 9 9 l b l . ", +" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" r#!#+#;$+$+ + I@]$;$5#H@H@>$>$H@H@@$;+-$+ ^$/$($_$($:$ $<$[$}$]$-$=$|$}$+ [$+ |$ ", +" r#1$2$3$|$4$4$4$5$|$6$6$6$3$3$3$6$6$|$5$4$7$8$9$9$9$8$7$4$5$5$|$|$|$5$T#4$7$4$|$ ", +" "}; diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 82939858..ccb207b2 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -324,6 +324,8 @@ typedef struct WPreferences { signed char focus_mode; /* window focusing mode */ char opaque_move; /* update window position during move */ + char opaque_resize; /* update window position during resize */ + char opaque_move_resize_keyboard; /* update window position during move,resize with keyboard */ char wrap_menus; /* wrap menus at edge of screen */ char scrollable_menus; /* let them be scrolled */ char align_menus; /* align menu with their parents */ diff --git a/src/defaults.c b/src/defaults.c index 70c8a8a5..300a0bbd 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -400,6 +400,10 @@ WDefaultEntry optionList[] = { &wPreferences.use_saveunders, getBool, NULL, NULL, NULL}, {"OpaqueMove", "NO", NULL, &wPreferences.opaque_move, getBool, NULL, NULL, NULL}, + {"OpaqueResize", "NO", NULL, + &wPreferences.opaque_resize, getBool, NULL, NULL, NULL}, + {"OpaqueMoveResizeKeyboard", "NO", NULL, + &wPreferences.opaque_move_resize_keyboard, getBool, NULL, NULL, NULL}, {"DisableAnimations", "NO", NULL, &wPreferences.no_animations, getBool, NULL, NULL, NULL}, {"DontLinkWorkspaces", "NO", NULL, diff --git a/src/moveres.c b/src/moveres.c index 2ac3fbea..c84deab6 100644 --- a/src/moveres.c +++ b/src/moveres.c @@ -1207,6 +1207,7 @@ int wKeyboardMoveResizeWindow(WWindow * wwin) int src_y = wwin->frame_y; int done, off_x, off_y, ww, wh; int kspeed = _KS; + int opaqueMoveResize = wPreferences.opaque_move_resize_keyboard; Time lastTime = 0; KeyCode shiftl, shiftr, ctrlmode; KeySym keysym = NoSymbol; @@ -1236,15 +1237,21 @@ int wKeyboardMoveResizeWindow(WWindow * wwin) | ButtonReleaseMask | ButtonPressMask, GrabModeAsync, GrabModeAsync, None, wCursor[WCUR_DEFAULT], CurrentTime); - if (wwin->flags.shaded || scr->selected_windows) { - if (scr->selected_windows) - drawFrames(wwin, scr->selected_windows, off_x, off_y); - else + + + if (!opaqueMoveResize) { + if (wwin->flags.shaded || scr->selected_windows) { + if (scr->selected_windows) + drawFrames(wwin, scr->selected_windows, off_x, off_y); + else + drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); + } else { drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); - if (!scr->selected_windows) - mapPositionDisplay(wwin, src_x, src_y, w, h); - } else { - drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); + } + } + if ((wwin->flags.shaded || scr->selected_windows) && (!scr->selected_windows)) { + mapPositionDisplay(wwin, src_x, src_y, w, h); + } ww = w; wh = h; @@ -1261,14 +1268,16 @@ int wKeyboardMoveResizeWindow(WWindow * wwin) } } while (event.type == Expose); - if (wwin->flags.shaded || scr->selected_windows) { - if (scr->selected_windows) - drawFrames(wwin, scr->selected_windows, off_x, off_y); - else - drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); - /*** I HATE EDGE RESISTANCE - ]d ***/ - } else { - drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, ww, wh); + if (!opaqueMoveResize) { + if (wwin->flags.shaded || scr->selected_windows) { + if (scr->selected_windows) + drawFrames(wwin, scr->selected_windows, off_x, off_y); + else + drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); + /*** I HATE EDGE RESISTANCE - ]d ***/ + } else { + drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, ww, wh); + } } if (ctrlmode) @@ -1437,26 +1446,7 @@ int wKeyboardMoveResizeWindow(WWindow * wwin) } } - if (wwin->flags.shaded || scr->selected_windows) { - if (scr->selected_windows) - drawFrames(wwin, scr->selected_windows, off_x, off_y); - else - drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); - } else { - drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, ww, wh); - } - - if (ctrlmode) { - showGeometry(wwin, src_x + off_x, src_y + off_y, src_x + off_x + ww, src_y + off_y + wh, - 0); - } else if (!scr->selected_windows) - showPosition(wwin, src_x + off_x, src_y + off_y); - - if (done) { - scr->keymove_tick = 0; - /* - WMDeleteTimerWithClientData(&looper); - */ + if (!opaqueMoveResize) { if (wwin->flags.shaded || scr->selected_windows) { if (scr->selected_windows) drawFrames(wwin, scr->selected_windows, off_x, off_y); @@ -1465,6 +1455,35 @@ int wKeyboardMoveResizeWindow(WWindow * wwin) } else { drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, ww, wh); } + } + + if (ctrlmode) { + showGeometry(wwin, src_x + off_x, src_y + off_y, src_x + off_x + ww, src_y + off_y + wh, + 0); + } else if (!scr->selected_windows) + showPosition(wwin, src_x + off_x, src_y + off_y); + + if (opaqueMoveResize) { + XUngrabServer(dpy); + wwin->flags.user_changed_width = 1; + wWindowConfigure(wwin, src_x + off_x, src_y + off_y, ww, wh - vert_border); + }; + + if (done) { + scr->keymove_tick = 0; + /* + WMDeleteTimerWithClientData(&looper); + */ + if (!opaqueMoveResize) {/*ctrlmode=> resize */ + if (wwin->flags.shaded || scr->selected_windows) { + if (scr->selected_windows) + drawFrames(wwin, scr->selected_windows, off_x, off_y); + else + drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, w, h); + } else { + drawTransparentFrame(wwin, src_x + off_x, src_y + off_y, ww, wh); + } + }; if (ctrlmode) { showGeometry(wwin, src_x + off_x, src_y + off_y, src_x + off_x + ww, @@ -1854,6 +1873,7 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) int head = ((wPreferences.auto_arrange_icons && wXineramaHeads(scr) > 1) ? wGetHeadForWindow(wwin) : scr->xine_info.primary_head); + int opaqueResize = wPreferences.opaque_resize; if (!IS_RESIZABLE(wwin)) return; @@ -1883,12 +1903,14 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) switch (event.type) { case KeyPress: showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); - if ((event.xkey.keycode == shiftl || event.xkey.keycode == shiftr) - && started) { - drawTransparentFrame(wwin, fx, fy, fw, fh); - cycleGeometryDisplay(wwin, fx, fy, fw, fh, res); - drawTransparentFrame(wwin, fx, fy, fw, fh); - } + if (!opaqueResize) { + if ((event.xkey.keycode == shiftl || event.xkey.keycode == shiftr) + && started) { + drawTransparentFrame(wwin, fx, fy, fw, fh); + cycleGeometryDisplay(wwin, fx, fy, fw, fh, res); + drawTransparentFrame(wwin, fx, fy, fw, fh); + } + }; showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); break; @@ -1988,21 +2010,27 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) /* Draw the resize frame for the first time. */ mapGeometryDisplay(wwin, fx, fy, fw, fh); - - drawTransparentFrame(wwin, fx, fy, fw, fh); - + if (!opaqueResize) { + drawTransparentFrame(wwin, fx, fy, fw, fh); + }; showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); started = 1; } if (started) { if (wPreferences.size_display == WDIS_FRAME_CENTER) { - drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh); + if (!opaqueResize) { + drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh); + }; moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2); - drawTransparentFrame(wwin, fx, fy, fw, fh); + if (!opaqueResize) { + drawTransparentFrame(wwin, fx, fy, fw, fh); + }; } else { - drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh); - drawTransparentFrame(wwin, fx, fy, fw, fh); + if (!opaqueResize) { + drawTransparentFrame(wwin, orig_fx, orig_fy, orig_fw, orig_fh); + drawTransparentFrame(wwin, fx, fy, fw, fh); + }; } if (fh != orig_fh || fw != orig_fw) { if (wPreferences.size_display == WDIS_NEW) { @@ -2011,6 +2039,13 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) } showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); } + if (opaqueResize) { + XUngrabServer(dpy); + wwin->flags.user_changed_width = 1; + moveGeometryDisplayCentered(scr, fx + fw / 2, fy + fh / 2); + wWindowConfigure(wwin, fx, fy, fw, fh - vert_border); + showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); + }; } break; @@ -2024,8 +2059,9 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) if (started) { showGeometry(wwin, fx, fy, fx + fw, fy + fh, res); - drawTransparentFrame(wwin, fx, fy, fw, fh); - + if (!opaqueResize) { + drawTransparentFrame(wwin, fx, fy, fw, fh); + } XUngrabKeyboard(dpy, CurrentTime); WMUnmapWidget(scr->gview); XUngrabServer(dpy);