diff options
| author | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2006-06-28 21:18:22 +0000 |
|---|---|---|
| committer | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2006-06-28 21:18:22 +0000 |
| commit | e3cb862b20321dcf027752ef4eba1169f48fb83e (patch) | |
| tree | 09b024ac86d822df74a6490a02c2aef35d796afc | |
| parent | 4a2d6455765124a743d846e5abb529756ab37dac (diff) | |
| download | xfwm4-e3cb862b20321dcf027752ef4eba1169f48fb83e.tar.gz | |
Add support for opacity lock (patch from Darren Salt <linux@youmustbejoking.demon.co.uk>, bug #1958), add support for changing opacity using mouse button 6 and 7 (patch from Darren Salt <linux@youmustbejoking.demon.co.uk>, bug #1959), add move/resize cancellation using a configurable keyboard shortcut (patch from Darren Salt <linux@youmustbejoking.demon.co.uk>, bug #1963), optimization for the compositor rebuilding screen when settings change (me :)
(Old svn revision: 22213)
49 files changed, 1408 insertions, 411 deletions
@@ -10,6 +10,7 @@ Aquila Deus <aquila_deus@yahoo.co.uk> Aurelien Foret <orelien@chez.com> Benedikt Meurer <Benedikt.Meurer@unix-ag.uni-siegen.de> Damon Harper <dl+xfce4-dev@usrbin.ca> +Darren Salt <linux@youmustbejoking.demon.co.uk> Ian Morgan <imorgan@webcon.ca> Jens Guballa <J.Guballa@t-online.de> Joshua Blanton <jblanton@irg.cs.ohiou.edu> @@ -1,3 +1,865 @@ +2006-06-25 21:08 olivier + + * src/compositor.c, src/compositor.h, src/settings.c: Revert some + removal that was needed, woops... + +2006-06-25 09:06 olivier + + * src/client.c, src/compositor.c, src/compositor.h, src/events.c, + src/main.c, src/misc.c, src/netwm.c, src/placement.c, + src/screen.c, src/screen.h, src/settings.c, src/workspaces.c: + Change to maintain and use our own copy of the screen size, code + cleanup. + +2006-06-23 16:54 olivier + + * src/compositor.c, src/compositor.h: More optimizations for the + compositor. + +2006-06-23 13:03 olivier + + * src/compositor.c: Fix count of overlays. + +2006-06-23 09:42 olivier + + * src/compositor.c: Change default root color to plain grey. + +2006-06-22 19:49 olivier + + * src/display.c: Woops, revert, gtk+ does that for us (I forgot + gtk in the equation). + +2006-06-22 19:41 olivier + + * src/display.c: Close display on exit. + +2006-06-22 12:58 olivier + + * src/compositor.c: Compositor optimization, save the painted + region for reuse as clipping when painting back to screen. + +2006-06-22 07:43 olivier + + * src/client.c: Don't clear the show desktop flag if cycling back + to the current focused window. + +2006-06-21 20:26 olivier + + * src/client.c: Simpler, safer. + +2006-06-21 19:52 olivier + + * src/compositor.c: Small compositor enhancement. + +2006-06-21 19:48 olivier + + * src/client.c: Fix fullscreen window being set back in Z-order + after cycling back to the current fullscreen window. (Fix bug + #1949) + +2006-06-20 20:00 olivier + + * src/compositor.c: Rework the mapping/unmapping when unredirecting + +2006-06-18 07:44 olivier + + * src/compositor.c: Optimizations. + +2006-06-18 07:32 olivier + + * src/compositor.c: A few more optimizations. + +2006-06-17 19:28 olivier + + * src/focus.c: Make sure the 'demand attention' flags gets cleared + on focus. + +2006-06-17 16:37 olivier + + * src/compositor.c: Sync after unredirect. + +2006-06-17 16:13 olivier + + * src/compositor.c: Be smarter with damage areas, and do not treat + unredirected windows specifically. (should fix #1930). + +2006-06-17 15:55 olivier + + * src/compositor.c: Small optimzations, remove useless tests + +2006-06-16 20:04 olivier + + * src/compositor.c: Yet another one + +2006-06-16 19:53 olivier + + * src/compositor.c: Optimizations for the compositor + +2006-06-15 21:54 olivier + + * src/compositor.c: Avoid compiler warnings. + +2006-06-14 21:33 olivier + + * src/compositor.c: Missing argument in debug trace + +2006-06-14 21:08 olivier + + * src/compositor.c, src/events.c: Small adjustments + +2006-06-14 09:35 olivier + + * po/ar.po, po/az.po, po/be.po, po/bg.po, po/bn_IN.po, po/ca.po, + po/cs.po, po/de.po, po/el.po, po/en_GB.po, po/eo.po, po/es.po, + po/es_MX.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po, + po/gu.po, po/he.po, po/hi.po, po/hu.po, po/it.po, po/ja.po, + po/ko.po, po/lt.po, po/mr.po, po/ms.po, po/nb_NO.po, po/nl.po, + po/pa.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/ro.po, + po/ru.po, po/sk.po, po/sv.po, po/ta.po, po/tr.po, po/uk.po, + po/vi.po, po/xfwm4.pot, po/zh_CN.po, po/zh_TW.po: Resync pot file + +2006-06-14 09:27 olivier + + * src/client.c, src/compositor.c, src/display.c, src/display.h, + src/events.c, src/hints.h, src/screen.h, + src/startup_notification.c: Finish rework of the compositor, + which should fix quite few bugs and improve performance (by + discarding damages of covered windows, for example), + unredirecting fullscreen overrides seems to work fine which + gives a huge performance boost on fullscreen games, fixes + translucent xscreensaver window, rework the NET_ACTIVE_WINDOW + message handling to improve focus passing (see this thread on + the ML + http://foo-projects.org/pipermail/xfce4-dev/2006-June/020471.html) + +2006-06-13 20:03 olivier + + * src/focus.c, src/transients.c: Don't adjust fullscreen window if + newly focused window is one if its transients or modal. + +2006-06-13 05:55 olivier + + * src/compositor.c: Still work on compositor, not there yet + though, need more work. + +2006-06-12 14:26 hydonsingore + + * libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/zh_TW.po, + mousepad/trunk/po/ChangeLog, mousepad/trunk/po/zh_TW.po, + terminal/trunk/po/ChangeLog, terminal/trunk/po/zh_TW.po, + thunar/trunk/po/ChangeLog, thunar/trunk/po/zh_TW.po, + xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/zh_TW.po, + xfce-mcs-manager/trunk/po/ChangeLog, + xfce-mcs-manager/trunk/po/zh_TW.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/zh_TW.po, + xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/zh_TW.po, + xfce4-appfinder/trunk/po/ChangeLog, + xfce4-appfinder/trunk/po/zh_TW.po, + xfce4-icon-theme/trunk/po/ChangeLog, + xfce4-icon-theme/trunk/po/zh_TW.po, + xfce4-mailwatch-plugin/trunk/po/ChangeLog, + xfce4-mailwatch-plugin/trunk/po/zh_TW.po, + xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/zh_TW.po, + xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/zh_TW.po, + xfce4-session/trunk/po/ChangeLog, + xfce4-session/trunk/po/zh_TW.po, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/zh_TW.po, + xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/zh_TW.po, + xfmedia/trunk/po/ChangeLog, xfmedia/trunk/po/zh_TW.po, + xfprint/trunk/po/ChangeLog, xfprint/trunk/po/zh_TW.po, + po/ChangeLog, po/zh_TW.po: Update traditional Chinese + translations; Modify personal e-mail address. + +2006-06-11 22:10 olivier + + * src/main.c: Fix fgetc() not returning EOF on architectures where + char isn't signed (Patch from Michel Danzer + <michel@tungstengraphics.com>) + +2006-06-11 22:07 olivier + + * src/client.c: Clamp pointer position when + maximizing/unmaximizing window on move (Patch from Ori Bernstein + <rand_chars@rogers.com>, fixes #1909) + +2006-06-11 22:05 olivier + + * src/compositor.c: Fixes, improvements and optimizations for the + compositor. + +2006-06-09 16:37 olivier + + * themes/default/menu-active.png, + themes/default/menu-inactive.png, + themes/default/menu-pressed.png, + themes/default/title-1-active.png, + themes/default/title-1-inactive.png, + themes/default/title-2-active.png, + themes/default/title-2-inactive.png, + themes/default/title-3-active.png, + themes/default/title-3-inactive.png, + themes/default/title-4-active.png, + themes/default/title-4-inactive.png, + themes/default/title-5-active.png, + themes/default/title-5-inactive.png, + themes/default/top-left-active.png, + themes/default/top-left-inactive.png, + themes/default/top-right-active.png, + themes/default/top-right-inactive.png: Smoother gradient with + dark colors + +2006-06-08 19:16 olivier + + * src/compositor.c: Compositor improvements. + +2006-06-07 21:22 olivier + + * src/compositor.c, src/main.c: Avoid needlessly re-compositing + opaque windows in front of other damaged windows. This also + helps with stuff that isn't properly redirected yet, such as Xv + and DRI with free drivers (patch originally contributed by + Michel Dänzer <michel@tungstengraphics.com>). + Fix compilation with --enable-debug=full. + +2006-06-05 23:11 adriano + + * libexo/trunk/po/ChangeLog, libexo/trunk/po/pt_BR.po, + terminal/trunk/po/ChangeLog, terminal/trunk/po/pt_BR.po, + thunar/trunk/po/ChangeLog, thunar/trunk/po/pt_BR.po, + xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/pt_BR.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/pt_BR.po, + xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/pt_BR.po, + xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/pt_BR.po, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/pt_BR.po, + xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/pt_BR.po, + po/ChangeLog, po/pt_BR.po: Updated brazilian portuguese + translations. + +2006-06-05 21:24 olivier + + * src/compositor.c, src/compositor.h, src/display.h, src/main.c, + src/screen.h: Small code reorg. + +2006-06-04 08:12 eulex + + * libexo/trunk/po/ChangeLog, libxfcegui4/trunk/po/ChangeLog, + terminal/trunk/po/ChangeLog, thunar/trunk/po/ChangeLog, + xfcalendar/trunk/po/ChangeLog, + xfce-mcs-manager/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-utils/trunk/po/ChangeLog, + xfce4-appfinder/trunk/po/ChangeLog, + xfce4-mixer/trunk/po/ChangeLog, xfce4-panel/trunk/po/ChangeLog, + xfce4-session/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfdesktop/trunk/po/ChangeLog, po/ChangeLog: Changelogs for + appfinder, exo, utils, mcs-plugins, mcs-manager, + xfce4-session, xfce4-mixer, thunar, libgui, xfwm4, the panel, + orage, trigger-launcher and terminal updated. + Also couldn't resist to fix a small error in the xfce4-mixer + Changelog. + Didn't updated the changelog of xfprint, because I discovered + that that translation wasn't updated, it had just slipped through + the commit by mistake. + +2006-06-04 00:10 eulex + + * libxfcegui4/trunk/po/sv.po, thunar/trunk/po/sv.po, + xfcalendar/trunk/po/sv.po, xfce-mcs-plugins/trunk/po/sv.po, + xfce-utils/trunk/po/sv.po, xfce4-panel/trunk/po/sv.po, + xfce4-session/trunk/po/sv.po, xfdesktop/trunk/po/sv.po, + xfprint/trunk/po/sv.po, po/sv.po: obsolete strings in the + swedish translations removed + +2006-06-03 23:44 eulex + + * libexo/trunk/po/LINGUAS, libexo/trunk/po/sv.po, + libxfcegui4/trunk/po/sv.po, terminal/trunk/po/LINGUAS, + terminal/trunk/po/sv.po, thunar/trunk/po/sv.po, + xfcalendar/trunk/po/sv.po, xfce-mcs-manager/trunk/po/sv.po, + xfce-mcs-plugins/trunk/po/sv.po, xfce-utils/trunk/po/sv.po, + xfce4-appfinder/trunk/po/sv.po, xfce4-mixer/trunk/po/sv.po, + xfce4-panel/trunk/po/sv.po, xfce4-session/trunk/po/sv.po, + xfce4-trigger-launcher/trunk/po/sv.po, xfdesktop/trunk/po/sv.po, + xfprint/trunk/po/sv.po, po/sv.po: Merged Swedish translations + (by me and Jens Hagerman) into the xfce svn. + This includes updated translations of appfinder, xfce-utils, + mcs-plugins, + xfprint, xfce4-session, xfce4-mixer, thunar, libxfcegui4, xfwm4, + xfce4-panel, xfdesktop, orage, xfce4-trigger-launcher and + mcs-manager, + and added translations for libexo and terminal. + The appropriate LINGUAS files were also updated. + +2006-06-03 12:42 olivier + + * themes/daloa/close-active.xpm, themes/daloa/close-pressed.xpm, + themes/daloa/hide-active.xpm, themes/daloa/hide-pressed.xpm, + themes/daloa/maximize-active.xpm, + themes/daloa/maximize-pressed.xpm, + themes/daloa/maximize-toggled-active.xpm, + themes/daloa/maximize-toggled-pressed.xpm, + themes/daloa/shade-active.xpm, themes/daloa/shade-pressed.xpm, + themes/daloa/shade-toggled-active.xpm, + themes/daloa/shade-toggled-pressed.xpm, + themes/daloa/stick-active.xpm, themes/daloa/stick-inactive.xpm, + themes/daloa/stick-pressed.xpm, + themes/daloa/stick-toggled-active.xpm, + themes/daloa/stick-toggled-pressed.xpm, + themes/daloa/title-3-active.xpm, + themes/daloa/title-3-inactive.xpm, + themes/daloa/title-4-active.xpm, + themes/daloa/title-4-inactive.xpm, + themes/daloa/title-5-active.xpm, + themes/daloa/title-5-inactive.xpm, + themes/daloa/top-left-active.xpm, + themes/daloa/top-left-inactive.xpm, + themes/daloa/top-right-active.xpm, + themes/daloa/top-right-inactive.xpm: Alignment in color table :) + +2006-06-03 12:35 olivier + + * configure.ac.in, themes/Makefile.am, themes/daloa, + themes/daloa/Makefile.am, themes/daloa/README, + themes/daloa/bottom-active.png, themes/daloa/bottom-active.xpm, + themes/daloa/bottom-inactive.png, + themes/daloa/bottom-inactive.xpm, + themes/daloa/bottom-left-active.png, + themes/daloa/bottom-left-active.xpm, + themes/daloa/bottom-left-inactive.png, + themes/daloa/bottom-left-inactive.xpm, + themes/daloa/bottom-right-active.png, + themes/daloa/bottom-right-active.xpm, + themes/daloa/bottom-right-inactive.png, + themes/daloa/bottom-right-inactive.xpm, + themes/daloa/close-active.png, themes/daloa/close-active.xpm, + themes/daloa/close-inactive.png, + themes/daloa/close-inactive.xpm, themes/daloa/close-pressed.png, + themes/daloa/close-pressed.xpm, themes/daloa/hide-active.png, + themes/daloa/hide-active.xpm, themes/daloa/hide-inactive.png, + themes/daloa/hide-inactive.xpm, themes/daloa/hide-pressed.png, + themes/daloa/hide-pressed.xpm, themes/daloa/left-active.png, + themes/daloa/left-active.xpm, themes/daloa/left-inactive.png, + themes/daloa/left-inactive.xpm, + themes/daloa/maximize-active.png, + themes/daloa/maximize-active.xpm, + themes/daloa/maximize-inactive.png, + themes/daloa/maximize-inactive.xpm, + themes/daloa/maximize-pressed.png, + themes/daloa/maximize-pressed.xpm, + themes/daloa/maximize-toggled-active.png, + themes/daloa/maximize-toggled-active.xpm, + themes/daloa/maximize-toggled-inactive.png, + themes/daloa/maximize-toggled-inactive.xpm, + themes/daloa/maximize-toggled-pressed.png, + themes/daloa/maximize-toggled-pressed.xpm, + themes/daloa/menu-active.png, themes/daloa/menu-active.xpm, + themes/daloa/menu-inactive.png, themes/daloa/menu-inactive.xpm, + themes/daloa/menu-pressed.png, themes/daloa/menu-pressed.xpm, + themes/daloa/right-active.png, themes/daloa/right-active.xpm, + themes/daloa/right-inactive.png, + themes/daloa/right-inactive.xpm, themes/daloa/shade-active.png, + themes/daloa/shade-active.xpm, themes/daloa/shade-inactive.png, + themes/daloa/shade-inactive.xpm, themes/daloa/shade-pressed.png, + themes/daloa/shade-pressed.xpm, + themes/daloa/shade-toggled-active.png, + themes/daloa/shade-toggled-active.xpm, + themes/daloa/shade-toggled-inactive.png, + themes/daloa/shade-toggled-inactive.xpm, + themes/daloa/shade-toggled-pressed.png, + themes/daloa/shade-toggled-pressed.xpm, + themes/daloa/stick-active.png, themes/daloa/stick-active.xpm, + themes/daloa/stick-inactive.png, + themes/daloa/stick-inactive.xpm, themes/daloa/stick-pressed.png, + themes/daloa/stick-pressed.xpm, + themes/daloa/stick-toggled-active.png, + themes/daloa/stick-toggled-active.xpm, + themes/daloa/stick-toggled-inactive.png, + themes/daloa/stick-toggled-inactive.xpm, + themes/daloa/stick-toggled-pressed.png, + themes/daloa/stick-toggled-pressed.xpm, themes/daloa/themerc, + themes/daloa/title-1-active.png, + themes/daloa/title-1-active.xpm, + themes/daloa/title-1-inactive.png, + themes/daloa/title-1-inactive.xpm, + themes/daloa/title-2-active.png, + themes/daloa/title-2-active.xpm, + themes/daloa/title-2-inactive.png, + themes/daloa/title-2-inactive.xpm, + themes/daloa/title-3-active.png, + themes/daloa/title-3-active.xpm, + themes/daloa/title-3-inactive.png, + themes/daloa/title-3-inactive.xpm, + themes/daloa/title-4-active.png, + themes/daloa/title-4-active.xpm, + themes/daloa/title-4-inactive.png, + themes/daloa/title-4-inactive.xpm, + themes/daloa/title-5-active.png, + themes/daloa/title-5-active.xpm, + themes/daloa/title-5-inactive.png, + themes/daloa/title-5-inactive.xpm, + themes/daloa/top-left-active.png, + themes/daloa/top-left-active.xpm, + themes/daloa/top-left-inactive.png, + themes/daloa/top-left-inactive.xpm, + themes/daloa/top-right-active.png, + themes/daloa/top-right-active.xpm, + themes/daloa/top-right-inactive.png, + themes/daloa/top-right-inactive.xpm: Missing a small theme in + the default set of themes, so add the theme contributed by Mike + Massonnet <mmassonnet@gmail.com> -now renamed Daloa- + +2006-06-03 12:31 olivier + + * src/focus.c: Do not set the demand attention flag if not needed, + like for windows that don't want focus. + +2006-06-03 09:21 olivier + + * src/client.c, src/compositor.c: Fix shape and shadow redraw + (again). + +2006-06-03 07:55 olivier + + * src/display.c, src/display.h: Create _MOTIF_WM_INFO from the WM + to make rxvt-unicode happy and not use override-redirect windows + but proper Motif decoration hints to get borderless windows (Fix + bug #1877). + +2006-05-31 19:53 olivier + + * themes/default/close-pressed.png, + themes/default/hide-pressed.png, + themes/default/maximize-pressed.png, + themes/default/maximize-toggled-pressed.png, + themes/default/shade-pressed.png, + themes/default/shade-toggled-pressed.png, + themes/default/stick-pressed.png, + themes/default/stick-toggled-pressed.png: Adjust hilighting of + pressed buttons. + +2006-05-30 23:21 yuvaltanny + + * terminal/trunk/po/he.po, xfce-mcs-plugins/trunk/po/he.po, + xfce4-mixer/trunk/po/he.po, xfce4-panel/trunk/po/he.po, + xfce4-trigger-launcher/trunk/po/he.po, xfdesktop/trunk/po/he.po, + po/he.po: Update Hebrew translation + +2006-05-30 22:17 olivier + + * src/focus.c: Do not pass focus to the desktop by default (Fix + bug #1853). The problem is that xfdesktop sets its InputHint + from WM Hints property to False to avoid focus, but GTK+ itself + sets the WM_TAKE_FOCUS property, so it's impossible for the WM + to tell whether or not the windows may or may not accept focus, + which leads to unpredictable results when the last available + focusable window vanishes (which is just what happens in bug + #1853. From what I saw, metacity and kwin have the same problem. + The workaround used here is to simply not use the desktop as a + fallback focusable window. If the user wants to focus the + desktop, (s)he just has to explicitely click on it. + +2006-05-30 21:39 olivier + + * src/events.c: Fix input flag not being updated on XA_WM_HINTS + property change + +2006-05-30 13:35 piarres + + * po/eu.po: [l10n:eu] Basque translation little fix + +2006-05-29 20:27 olivier + + * mcs-plugin/xfwm4_plugin.c: Set internals vars to static const + (patch from Nick Schermer <nick@xfce.org>, bug #1870) + +2006-05-29 20:23 olivier + + * themes/default/close-active.xpm, + themes/default/close-pressed.xpm, + themes/default/hide-active.xpm, themes/default/hide-pressed.xpm, + themes/default/maximize-active.xpm, + themes/default/maximize-pressed.xpm, + themes/default/maximize-toggled-active.xpm, + themes/default/maximize-toggled-pressed.xpm, + themes/default/shade-active.xpm, + themes/default/shade-pressed.xpm, + themes/default/shade-toggled-active.xpm, + themes/default/shade-toggled-pressed.xpm, + themes/default/stick-active.xpm, + themes/default/stick-pressed.xpm, + themes/default/stick-toggled-active.xpm, + themes/default/stick-toggled-pressed.xpm: Add a shadow to + symbols in frame buttons. + +2006-05-29 20:09 olivier + + * src/compositor.c: Reorg. shape notify to catch all cases + +2006-05-27 16:04 daichi + + * xfcalendar/trunk/po/LINGUAS, xfce-mcs-manager/trunk/po/LINGUAS, + xfce-utils/trunk/po/LINGUAS, xfce4-appfinder/trunk/po/LINGUAS, + xfce4-session/trunk/po/LINGUAS, + xfce4-trigger-launcher/trunk/po/LINGUAS, po/LINGUAS: * + xfcalendar/trunk/po/LINGUAS, xfce-utils/trunk/po/LINGUAS, + xfce4-appfinder/trunk/po/LINGUAS, + xfce4-session/trunk/po/LINGUAS: + Added a newline at the end of file. + * xfce-mcs-manager/trunk/po/LINGUAS: Removed an extra white + space. + * xfce4-trigger-launcher/trunk/po/LINGUAS, + xfwm4/trunk/po/LINGUAS: + Removed an extra white line. + +2006-05-27 15:25 daichi + + * terminal/trunk/po/ChangeLog, terminal/trunk/po/pl.po, + xarchiver/trunk/po/ChangeLog, xarchiver/trunk/po/pl.po, + xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/pl.po, + po/ChangeLog, po/pl.po: Updated Polish translations by Szymon + Kalasz <szymon_maestro@gazeta.pl>. + +2006-05-25 18:40 pollux + + * xfce4-session/trunk/autogen.sh, + xfce4-session/trunk/configure.in.in, xfce4-session/trunk/po, + xfce4-session/trunk/po/LINGUAS, + xfce4-trigger-launcher/trunk/autogen.sh, + xfce4-trigger-launcher/trunk/configure.ac, + xfce4-trigger-launcher/trunk/configure.in.in, + xfce4-trigger-launcher/trunk/po/LINGUAS, xfdesktop/trunk, + xfdesktop/trunk/autogen.sh, xfdesktop/trunk/configure.ac, + xfdesktop/trunk/configure.in.in, xfdesktop/trunk/panel-plugin, + xfdesktop/trunk/po, xfdesktop/trunk/po/LINGUAS, ., autogen.sh, + configure.ac.in, mcs-plugin, po, po/LINGUAS, src, + themes/katiola, themes/moheli, themes/stoneage: * add LINGUAS + support + * update svn:ignore + +2006-05-23 21:55 olivier + + * src/events.c: Set demand attention flag or actually activate a + window on NET_WM_ACTIVE notification based on user preference, + too. + +2006-05-23 17:32 hydonsingore + + * xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/zh_TW.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/zh_TW.po, + xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/zh_TW.po, + xfce4-session/trunk/po/ChangeLog, + xfce4-session/trunk/po/zh_TW.po, xfdesktop/trunk/po/ChangeLog, + xfdesktop/trunk/po/zh_TW.po, po/ChangeLog, po/zh_TW.po: Correct + strings containing Button Label in traditional Chinese + translations. + +2006-05-23 11:08 piarres + + * po/ChangeLog, po/eu.po: [l10n:eu] Basque translation update + +2006-05-23 02:45 daichi + + * libexo/trunk/po/ChangeLog, libexo/trunk/po/fi.po, + libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/fi.po, + libxfcegui4/branches/xfce_4_2/po/ChangeLog, + libxfcegui4/branches/xfce_4_2/po/fi.po, + libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/fi.po, + mousepad/trunk/po/ChangeLog, mousepad/trunk/po/fi.po, + terminal/trunk/po/ChangeLog, terminal/trunk/po/fi.po, + thunar/trunk/po/ChangeLog, thunar/trunk/po/fi.po, + xfcalendar/branches/xfce_4_2/po/ChangeLog, + xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/fi.po, + xfce-mcs-manager/branches/xfce_4_2/po/ChangeLog, + xfce-mcs-manager/branches/xfce_4_2/po/fi.po, + xfce-mcs-manager/trunk/po/ChangeLog, + xfce-mcs-manager/trunk/po/fi.po, + xfce-mcs-plugins/branches/xfce_4_2/po/ChangeLog, + xfce-mcs-plugins/branches/xfce_4_2/po/fi.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/fi.po, + xfce-utils/branches/xfce_4_2/po/ChangeLog, + xfce-utils/branches/xfce_4_2/po/fi.po, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.az, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ca, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.de, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.es, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.eu, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.fi, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.fr, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.he, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.az, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ca, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.de, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.es, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.eu, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.fi, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.fr, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.it, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ja, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.lt, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ro, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ru, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.sk, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.vi, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.zh_TW, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.it, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ja, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.lt, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ro, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ru, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.sk, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.uk, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.vi, + xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.zh_TW, + xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/fi.po, + xfce-utils/trunk/xfce4-about/AUTHORS, + xfce4-appfinder/branches/xfce_4_2/po/ChangeLog, + xfce4-appfinder/branches/xfce_4_2/po/fi.po, + xfce4-appfinder/trunk/po/ChangeLog, + xfce4-appfinder/trunk/po/fi.po, + xfce4-icon-theme/trunk/po/ChangeLog, + xfce4-icon-theme/trunk/po/fi.po, + xfce4-iconbox/branches/xfce_4_2/po/fi.po, + xfce4-mailwatch-plugin/trunk/po/fi.po, + xfce4-mixer/branches/xfce_4_2/po/ChangeLog, + xfce4-mixer/branches/xfce_4_2/po/fi.po, + xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/fi.po, + xfce4-panel/branches/xfce_4_2/po/ChangeLog, + xfce4-panel/branches/xfce_4_2/po/fi.po, + xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/fi.po, + xfce4-session/branches/xfce_4_2/po/ChangeLog, + xfce4-session/branches/xfce_4_2/po/fi.po, + xfce4-session/trunk/po/ChangeLog, xfce4-session/trunk/po/fi.po, + xfce4-toys/branches/xfce_4_2/po/ChangeLog, + xfce4-toys/branches/xfce_4_2/po/fi.po, + xfce4-trigger-launcher/branches/xfce_4_2/po/ChangeLog, + xfce4-trigger-launcher/branches/xfce_4_2/po/fi.po, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/fi.po, + xfdesktop/branches/xfce_4_2/po/ChangeLog, + xfdesktop/branches/xfce_4_2/po/fi.po, + xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/fi.po, + xffm/branches/xfce_4_2/po/ChangeLog, + xffm/branches/xfce_4_2/po/fi.po, xfmedia/trunk/po/fi.po, + xfprint/branches/xfce_4_2/po/ChangeLog, + xfprint/branches/xfce_4_2/po/fi.po, xfprint/trunk/po/ChangeLog, + xfprint/trunk/po/fi.po, xfwm4/branches/xfce_4_2/po/ChangeLog, + xfwm4/branches/xfce_4_2/po/fi.po, po/ChangeLog, po/fi.po: + Changed an address. + +2006-05-22 20:25 olivier + + * configure.ac.in, src/main.c, xfwm4.spec.in: Add an option to + enable proxy for deprecated KDE systray protocol (may help for + bug #1836 eventually). + +2006-05-21 16:40 olivier + + * po/fr.po: Update French translation. + +2006-05-21 15:18 stavrosg + + * terminal/trunk/po/ChangeLog, terminal/trunk/po/el.po, + thunar/trunk/po/ChangeLog, thunar/trunk/po/el.po, po/ChangeLog, + po/el.po: Greek translations update. + +2006-05-21 09:06 jari + + * terminal/trunk/po/fi.po, xfdesktop/trunk/po/fi.po, po/fi.po: + Updated Finnish translations. + +2006-05-21 07:39 olivier + + * src/client.c: Why do we need to grab the Xserver here? + +2006-05-21 05:09 daichi + + * po/ChangeLog: Fixed. + +2006-05-21 04:59 daichi + + * libexo/trunk/po/ChangeLog, libexo/trunk/po/ja.po, + terminal/trunk/po/ChangeLog, terminal/trunk/po/ja.po, + xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/ja.po, + po/ChangeLog, po/ja.po: Updated Japanese translations. + +2006-05-21 03:13 daichi + + * libexo/trunk/po/ChangeLog, libexo/trunk/po/pl.po, + thunar/trunk/po/ChangeLog, thunar/trunk/po/pl.po, + xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/pl.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/pl.po, xfce4-mixer/trunk/po/ChangeLog, + xfce4-mixer/trunk/po/pl.po, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/pl.po, po/ChangeLog, po/pl.po: + Updated Polish translations by Szymon Kalasz + <szymon_maestro@gazeta.pl>. + +2006-05-20 22:50 olivier + + * src/client.c, src/client.h, src/events.c, src/focus.c, + src/hints.h: Fix bug with WM hints for focus not being updated + properly, fix bug with gtk+ apps seen as focused even when + iconified (!) + +2006-05-20 21:16 sas + + * terminal/trunk/po/hu.po, po/hu.po: hu trunk: wm & terminal update + +2006-05-20 21:15 olivier + + * src/client.h, src/focus.c: Return focus to the desktop if no + other window is focused. + +2006-05-20 19:40 olivier + + * configure.ac.in: Fix the configure script that produced empty + Makefiles. + +2006-05-20 13:25 olivier + + * mcs-plugin/xfwm4_shortcuteditor.c, po/ar.po, po/az.po, po/be.po, + po/bg.po, po/bn_IN.po, po/ca.po, po/cs.po, po/de.po, po/el.po, + po/en_GB.po, po/eo.po, po/es.po, po/es_MX.po, po/et.po, + po/eu.po, po/fa.po, po/fi.po, po/fr.po, po/gu.po, po/he.po, + po/hi.po, po/hu.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, + po/mr.po, po/ms.po, po/nb_NO.po, po/nl.po, po/pa.po, po/pl.po, + po/pt_BR.po, po/pt_PT.po, po/ro.po, po/ru.po, po/sk.po, + po/sv.po, po/ta.po, po/tr.po, po/uk.po, po/vi.po, po/xfwm4.pot, + po/zh_CN.po, po/zh_TW.po, src/client.c, src/settings.c, + themes/default.keys/keythemerc: Put back configurable shortcut + for window cycling. + +2006-05-20 11:33 olivier + + * mcs-plugin/xfwm4_shortcuteditor.c, src/display.c, src/display.h, + src/events.c, src/main.c, src/session.c, src/session.h, + src/settings.c, themes/default.keys/keythemerc: Refactoring, + allowing to close session the close window shortcut (fixes bug + #1776). + Fix the shortcut manager to not show additional un-managed + shortcuts. + +2006-05-18 19:11 olivier + + * src/events.c, src/stacking.c: Fix an old bug with mouse button + grabs circulation. + +2006-05-18 13:13 daichi + + * thunar/trunk/po/ChangeLog, thunar/trunk/po/ja.po, + xfce-mcs-manager/trunk/po/ChangeLog, + xfce-mcs-manager/trunk/po/ja.po, + xfce-mcs-plugins/trunk/po/ChangeLog, + xfce-mcs-plugins/trunk/po/ja.po, xfce4-mixer/trunk/po/ChangeLog, + xfce4-mixer/trunk/po/ja.po, + xfce4-trigger-launcher/trunk/po/ChangeLog, + xfce4-trigger-launcher/trunk/po/ja.po, po/ChangeLog, po/ja.po: + Updated Japanese translations. + +2006-05-16 19:02 olivier + + * src/client.c, src/events.c: Don't consider windows that have the + below/ontop property as older legacy windows trying to achieve + fullscreen mode (should fix the issue reported on the ML). + +2006-05-15 22:00 olivier + + * ChangeLog: Update ChangeLog + +2006-05-15 21:58 olivier + + * po/ar.po, po/az.po, po/be.po, po/bg.po, po/bn_IN.po, po/ca.po, + po/cs.po, po/de.po, po/el.po, po/en_GB.po, po/eo.po, po/es.po, + po/es_MX.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po, + po/gu.po, po/he.po, po/hi.po, po/hu.po, po/it.po, po/ja.po, + po/ko.po, po/lt.po, po/mr.po, po/ms.po, po/nb_NO.po, po/nl.po, + po/pa.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/ro.po, + po/ru.po, po/sk.po, po/sv.po, po/ta.po, po/tr.po, po/uk.po, + po/vi.po, po/xfwm4.pot, po/zh_CN.po, po/zh_TW.po: Update potfiles + +2006-05-15 21:57 olivier + + * src/client.c, src/compositor.c, src/display.c, + src/event_filter.c, src/events.c, src/focus.c, src/frame.c, + src/hints.c, src/icons.c, src/keyboard.c, src/main.c, + src/menu.c, src/misc.c, src/mypixmap.c, src/mywindow.c, + src/netwm.c, src/parserc.c, src/placement.c, src/screen.c, + src/session.c, src/settings.c, src/spinning_cursor.c, + src/stacking.c, src/startup_notification.c, src/tabwin.c, + src/transients.c, src/ui_style.c, src/workspaces.c: Code cleanup. + +2006-05-15 21:53 olivier + + * themes/default/bottom-active.png, + themes/default/bottom-inactive.png, + themes/default/bottom-left-active.png, + themes/default/bottom-left-inactive.png, + themes/default/bottom-right-active.png, + themes/default/bottom-right-inactive.png, + themes/default/close-active.png, + themes/default/close-inactive.png, + themes/default/close-pressed.png, + themes/default/hide-active.png, + themes/default/hide-inactive.png, + themes/default/hide-pressed.png, themes/default/left-active.png, + themes/default/left-inactive.png, + themes/default/maximize-active.png, + themes/default/maximize-inactive.png, + themes/default/maximize-pressed.png, + themes/default/maximize-toggled-active.png, + themes/default/maximize-toggled-inactive.png, + themes/default/maximize-toggled-pressed.png, + themes/default/menu-active.png, + themes/default/menu-inactive.png, + themes/default/menu-pressed.png, + themes/default/right-active.png, + themes/default/right-inactive.png, + themes/default/shade-active.png, + themes/default/shade-inactive.png, + themes/default/shade-pressed.png, + themes/default/shade-toggled-active.png, + themes/default/shade-toggled-inactive.png, + themes/default/shade-toggled-pressed.png, + themes/default/stick-active.png, + themes/default/stick-inactive.png, + themes/default/stick-pressed.png, + themes/default/stick-toggled-active.png, + themes/default/stick-toggled-inactive.png, + themes/default/stick-toggled-pressed.png, + themes/default/title-1-active.png, + themes/default/title-1-inactive.png, + themes/default/title-2-active.png, + themes/default/title-2-inactive.png, + themes/default/title-3-active.png, + themes/default/title-3-inactive.png, + themes/default/title-4-active.png, + themes/default/title-4-inactive.png, + themes/default/title-5-active.png, + themes/default/title-5-inactive.png, + themes/default/top-left-active.png, + themes/default/top-left-inactive.png, + themes/default/top-right-active.png, + themes/default/top-right-inactive.png: Use greyscale composite, + the files are smaller. + +2006-05-15 09:57 piarres + + * po/ChangeLog, po/eu.po: [l10n:eu] Basque translation update + +2006-05-13 21:03 olivier + + * ChangeLog: Update ChangeLog. + 2006-05-13 20:54 olivier * themes/default/menu-active.png, themes/default/menu-active.xpm, diff --git a/defaults/defaults b/defaults/defaults index ddf330c8d..094814b83 100644 --- a/defaults/defaults +++ b/defaults/defaults @@ -14,6 +14,7 @@ focus_hint=true focus_new=true frame_opacity=100 full_width_title=true +inactive_opacity=100 keytheme=Default move_opacity=100 placement_ratio=25 diff --git a/mcs-plugin/xfwm4_shortcuteditor.c b/mcs-plugin/xfwm4_shortcuteditor.c index e3d74cffe..9da65f78b 100644 --- a/mcs-plugin/xfwm4_shortcuteditor.c +++ b/mcs-plugin/xfwm4_shortcuteditor.c @@ -328,6 +328,7 @@ loadtheme_in_treeview (ThemeInfo * ti, gpointer data) "resize_window_down_key", "resize_window_left_key", "resize_window_right_key", + "move_resize_cancel_key", "raise_window_key", "lower_window_key", "fullscreen_key", @@ -365,6 +366,7 @@ loadtheme_in_treeview (ThemeInfo * ti, gpointer data) N_("Resize window down"), N_("Resize window left"), N_("Resize window right"), + N_("Cancel move/resize window"), N_("Raise window"), N_("Lower window"), N_("Toggle fullscreen"), diff --git a/src/client.c b/src/client.c index 109d995cd..dda4004ab 100644 --- a/src/client.c +++ b/src/client.c @@ -98,6 +98,7 @@ struct _MoveResizeData gboolean grab; gboolean is_transient; gboolean move_resized; + int cancel_x, cancel_y; /* for cancellation (either position or size) */ int mx, my; int ox, oy; int oldw, oldh; @@ -1629,6 +1630,8 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture) c->opacity = NET_WM_OPAQUE; getOpacity (display_info, c->window, &c->opacity); + c->opacity_locked = getOpacityLock (display_info, c->window); + /* Timeout for blinking on urgency */ c->blink_timeout_id = 0; @@ -2865,7 +2868,7 @@ clientDecOpacity (Client * c) screen_info = c->screen_info; display_info = screen_info->display_info; - if ( c->opacity > OPACITY_SET_MIN ) + if ((c->opacity > OPACITY_SET_MIN) && !(c->opacity_locked )) { c->opacity -= OPACITY_SET_STEP; compositorWindowSetOpacity (display_info, c->frame, c->opacity); @@ -2881,7 +2884,7 @@ clientIncOpacity (Client * c) screen_info = c->screen_info; display_info = screen_info->display_info; - if ( c->opacity < NET_WM_OPAQUE ) + if ((c->opacity < NET_WM_OPAQUE) && !(c->opacity_locked )) { c->opacity += OPACITY_SET_STEP; @@ -3210,7 +3213,30 @@ clientMove_event_filter (XEvent * xevent, gpointer data) } else if (xevent->type == KeyRelease) { - if (passdata->use_keys) + if (xevent->xkey.keycode == screen_info->params->keys[KEY_MOVE_CANCEL].keycode) + { + moving = FALSE; + + if (screen_info->params->box_move) + { + clientDrawOutline (c); + } + + c->x = passdata->cancel_x; + c->y = passdata->cancel_y; + + if (screen_info->params->box_move) + { + clientDrawOutline (c); + } + else + { + wc.x = c->x; + wc.y = c->y; + clientConfigure (c, &wc, CWX | CWY, NO_CFG_FLAG); + } + } + else if (passdata->use_keys) { if (IsModifierKey (XLookupKeysym (&xevent->xkey, 0))) { @@ -3488,8 +3514,8 @@ clientMove (Client * c, XEvent * ev) changes = CWX | CWY; passdata.c = c; - passdata.ox = c->x; - passdata.oy = c->y; + passdata.cancel_x = passdata.ox = c->x; + passdata.cancel_y = passdata.oy = c->y; passdata.use_keys = FALSE; passdata.grab = FALSE; passdata.is_transient = clientIsValidTransientOrModal (c); @@ -3534,7 +3560,7 @@ clientMove (Client * c, XEvent * ev) #endif /* SHOW_POSITION */ /* Set window translucent while moving, looks nice */ - if ((screen_info->params->move_opacity < 100) && !(screen_info->params->box_move)) + if ((screen_info->params->move_opacity < 100) && !(screen_info->params->box_move) && !(c->opacity_locked)) { compositorWindowSetOpacity (display_info, c->frame, (guint) (c->opacity * (double) (screen_info->params->move_opacity / 100.0))); @@ -3764,7 +3790,41 @@ clientResize_event_filter (XEvent * xevent, gpointer data) } else if (xevent->type == KeyRelease) { - if (passdata->use_keys) + if (xevent->xkey.keycode == screen_info->params->keys[KEY_MOVE_CANCEL].keycode) + { + resizing = FALSE; + + if (screen_info->params->box_resize) + { + clientDrawOutline (c); + } + + /* restore the pre-resize position & size */ + if (move_left) + { + c->x += c->width - passdata->cancel_x; + } + if (move_top) + { + c->y += c->height - passdata->cancel_y; + } + c->width = passdata->cancel_x; + c->height = passdata->cancel_y; + + if (screen_info->params->box_resize) + { + clientDrawOutline (c); + } + else + { + wc.x = c->x; + wc.y = c->y; + wc.width = c->width; + wc.height = c->height; + clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, NO_CFG_FLAG); + } + } + else if (passdata->use_keys) { if (IsModifierKey (XLookupKeysym (&xevent->xkey, 0))) { @@ -3958,8 +4018,8 @@ clientResize (Client * c, int corner, XEvent * ev) restore_opacity = FALSE; passdata.c = c; - passdata.ox = c->width; - passdata.oy = c->height; + passdata.cancel_x = passdata.ox = c->width; + passdata.cancel_y = passdata.oy = c->height; passdata.use_keys = FALSE; passdata.grab = FALSE; passdata.corner = corner; @@ -4014,7 +4074,7 @@ clientResize (Client * c, int corner, XEvent * ev) #endif /* SHOW_POSITION */ /* Set window translucent while resizing, doesn't looks too nice :( */ - if ((screen_info->params->resize_opacity < 100) && !(screen_info->params->box_resize)) + if ((screen_info->params->resize_opacity < 100) && !(screen_info->params->box_resize) && !(c->opacity_locked)) { compositorWindowSetOpacity (display_info, c->frame, (guint) (c->opacity * (double) (screen_info->params->resize_opacity / 100.0))); diff --git a/src/client.h b/src/client.h index 56f18dd59..7777d16ad 100644 --- a/src/client.h +++ b/src/client.h @@ -269,6 +269,7 @@ struct _Client ClientPixmapCache pm_cache; /* Opacity for the compositor */ guint opacity; + gboolean opacity_locked; #ifdef HAVE_LIBSTARTUP_NOTIFICATION /* Startup notification */ diff --git a/src/compositor.c b/src/compositor.c index e7bc31ee3..0ce039ec5 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -99,6 +99,7 @@ struct _CWindow gboolean argb; gboolean skipped; gboolean native_opacity; + gboolean opacity_locked; Damage damage; #if HAVE_NAME_WINDOW_PIXMAP @@ -1447,7 +1448,7 @@ free_win_data (CWindow *cw, gboolean delete) } static void -add_damage (ScreenInfo *screen_info, XserverRegion damage) +add_damage (ScreenInfo *screen_info, XserverRegion damage, gboolean repair) { DisplayInfo *display_info; @@ -1472,7 +1473,10 @@ add_damage (ScreenInfo *screen_info, XserverRegion damage) screen_info->allDamage = damage; } - add_repair (screen_info->display_info); + if (repair) + { + add_repair (screen_info->display_info); + } } static void @@ -1557,7 +1561,7 @@ repair_win (CWindow *cw) if (parts) { fix_region (cw, parts); - add_damage (cw->screen_info, parts); + add_damage (cw->screen_info, parts, TRUE); cw->damaged = TRUE; } } @@ -1577,12 +1581,12 @@ damage_screen (ScreenInfo *screen_info) r.height = screen_info->height; region = XFixesCreateRegion (display_info->dpy, &r, 1); /* Region will be freed by add_damage () */ - add_damage (screen_info, region); + add_damage (screen_info, region, TRUE); #endif /* HAVE_COMPOSITOR */ } static void -damage_win (CWindow *cw) +damage_win (CWindow *cw, gboolean repair) { #ifdef HAVE_COMPOSITOR XserverRegion extents; @@ -1592,7 +1596,7 @@ damage_win (CWindow *cw) extents = win_extents (cw); fix_region (cw, extents); - add_damage (cw->screen_info, extents); + add_damage (cw->screen_info, extents, repair); #endif /* HAVE_COMPOSITOR */ } @@ -1636,7 +1640,7 @@ determine_mode(CWindow *cw) XFixesCopyRegion (display_info->dpy, damage, cw->extents); fix_region (cw, damage); /* damage region will be destroyed by add_damage () */ - add_damage (screen_info, damage); + add_damage (screen_info, damage, TRUE); } } @@ -1653,7 +1657,7 @@ expose_area (ScreenInfo *screen_info, XRectangle *rects, gint nrects) display_info = screen_info->display_info; region = XFixesCreateRegion (display_info->dpy, rects, nrects); /* damage region will be destroyed by add_damage () */ - add_damage (screen_info, region); + add_damage (screen_info, region, TRUE); } static void @@ -1748,7 +1752,7 @@ unmap_win (CWindow *cw) cw->viewable = FALSE; cw->damaged = FALSE; - damage_win (cw); + damage_win (cw, TRUE); free_win_data (cw, FALSE); } @@ -1769,17 +1773,20 @@ init_opacity (CWindow *cw) cw->native_opacity = FALSE; if (c) { + cw->opacity_locked = c->opacity_locked; cw->opacity = c->opacity; cw->native_opacity = WIN_IS_OPAQUE(cw); } else if (getOpacity (display_info, cw->id, &cw->opacity)) { cw->native_opacity = WIN_IS_OPAQUE(cw); + cw->opacity_locked = getOpacityLock (display_info, cw->id); } else { cw->opacity = (double) (screen_info->params->popup_opacity / 100.0) * NET_WM_OPAQUE; cw->native_opacity = TRUE; + cw->opacity_locked = getOpacityLock (display_info, cw->id); } } @@ -2032,7 +2039,7 @@ resize_win (CWindow *cw, gint x, gint y, gint width, gint height, gint bw, gbool } fix_region (cw, damage); /* damage region will be destroyed by add_damage () */ - add_damage (screen_info, damage); + add_damage (screen_info, damage, TRUE); } static void @@ -2146,6 +2153,20 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev) } } } + else if (ev->atom == display_info->atoms[NET_WM_WINDOW_OPACITY_LOCKED]) + { + CWindow *cw = find_cwindow_in_display (display_info, ev->window); + TRACE ("Opacity locking property changed for id 0x%lx", ev->window); + + if (cw) + { + cw->opacity_locked = getOpacityLock (display_info, cw->id); + if (cw->c) + { + cw->c->opacity_locked = cw->opacity_locked; + } + } + } else { TRACE ("No compositor property changed for id 0x%lx", ev->window); @@ -2791,8 +2812,9 @@ compositorRebuildScreen (ScreenInfo *screen_info) CWindow *cw2 = (CWindow *) index->data; free_win_data (cw2, FALSE); init_opacity (cw2); + damage_win (cw2, FALSE); } - repair_screen (screen_info); + add_repair (screen_info->display_info); #endif /* HAVE_COMPOSITOR */ } diff --git a/src/display.c b/src/display.c index 8be85fda4..53de71254 100644 --- a/src/display.c +++ b/src/display.c @@ -106,6 +106,7 @@ myDisplayInitAtoms (DisplayInfo *display_info) "_NET_WM_MOVERESIZE", "_NET_WM_NAME", "_NET_WM_WINDOW_OPACITY", + "_NET_WM_WINDOW_OPACITY_LOCKED", "_NET_WM_STATE", "_NET_WM_STATE_ABOVE", "_NET_WM_STATE_BELOW", diff --git a/src/display.h b/src/display.h index 93845a28d..3fe144c39 100644 --- a/src/display.h +++ b/src/display.h @@ -117,6 +117,7 @@ enum NET_WM_MOVERESIZE, NET_WM_NAME, NET_WM_WINDOW_OPACITY, + NET_WM_WINDOW_OPACITY_LOCKED, NET_WM_STATE, NET_WM_STATE_ABOVE, NET_WM_STATE_BELOW, diff --git a/src/events.c b/src/events.c index bf3719691..1c5c1b99b 100644 --- a/src/events.c +++ b/src/events.c @@ -722,6 +722,16 @@ titleButton (Client * c, int state, XButtonEvent * ev) clientUnshade (c); } } + else if (ev->button == Button6) + { + /* Mouse wheel scroll left, or left side button */ + clientDecOpacity(c); + } + else if (ev->button == Button7) + { + /* Mouse wheel scroll right, or right side button */ + clientIncOpacity(c); + } } static void @@ -1823,6 +1833,11 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev) } compositorWindowSetOpacity (display_info, c->frame, c->opacity); } + else if (ev->atom == display_info->atoms[NET_WM_WINDOW_OPACITY_LOCKED]) + { + TRACE ("client \"%s\" (0x%lx) has received a net_wm_opacity_locked notify", c->name, c->window); + c->opacity_locked = getOpacityLock (display_info, c->window); + } else if ((screen_info->params->show_app_icon) && ((ev->atom == display_info->atoms[NET_WM_ICON]) || (ev->atom == display_info->atoms[KWM_WIN_ICON]))) diff --git a/src/hints.c b/src/hints.c index 96a7bdfd9..715493f3f 100644 --- a/src/hints.c +++ b/src/hints.c @@ -1103,6 +1103,18 @@ getOpacity (DisplayInfo *display_info, Window window, guint *opacity) } gboolean +getOpacityLock (DisplayInfo *display_info, Window window) +{ + long val; + + g_return_val_if_fail (window != None, FALSE); + TRACE ("entering getOpacityLock"); + + /* only presence/absence matters */ + return !!getHint (display_info, window, NET_WM_WINDOW_OPACITY_LOCKED, &val); +} + +gboolean setCompositingManagerOwner (DisplayInfo *display_info, Window root, Window w) { XClientMessageEvent ev; diff --git a/src/hints.h b/src/hints.h index f4c4ad881..fee487bd5 100644 --- a/src/hints.h +++ b/src/hints.h @@ -176,6 +176,7 @@ gboolean getWindowCommand (DisplayInfo *, Window, char ***, int *); gboolean getKDEIcon (DisplayInfo *, Window, Pixmap *, Pixmap *); gboolean getRGBIconData (DisplayInfo *, Window, unsigned long **, unsigned long *); gboolean getOpacity (DisplayInfo *, Window, guint *); +gboolean getOpacityLock (DisplayInfo *, Window); gboolean setCompositingManagerOwner (DisplayInfo *, Window , Window); #ifdef ENABLE_KDE_SYSTRAY_PROXY diff --git a/src/misc.h b/src/misc.h index b1e9a0e03..4586abac5 100644 --- a/src/misc.h +++ b/src/misc.h @@ -31,6 +31,18 @@ #ifndef INC_MISC_H #define INC_MISC_H +/* + Just for completion, being a bit pedantic, X seems to be missing + those so far, so create them for now. + */ +#ifndef Button6 +#define Button6 6 +#endif + +#ifndef Button7 +#define Button7 7 +#endif + void getMouseXY (ScreenInfo *, Window, int *, int *); Window getMouseWindow (ScreenInfo *, Window); GC createGC (ScreenInfo *, char *, int, XFontStruct *, int, gboolean); diff --git a/src/settings.c b/src/settings.c index c58a9ab12..17ca3d140 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1146,6 +1146,7 @@ loadKeyBindings (ScreenInfo *screen_info, Settings *rc) parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_HORIZ], getValue ("maximize_horiz_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_VERT], getValue ("maximize_vert_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_WINDOW], getValue ("maximize_window_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_CANCEL], getValue ("move_resize_cancel_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_DOWN], getValue ("move_window_down_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_DOWN_WORKSPACE], getValue ("move_window_down_workspace_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_LEFT], getValue ("move_window_left_key", rc)); @@ -1298,6 +1299,7 @@ loadSettings (ScreenInfo *screen_info) {"maximize_horiz_key", NULL, TRUE}, {"maximize_vert_key", NULL, TRUE}, {"maximize_window_key", NULL, TRUE}, + {"move_resize_cancel_key", NULL, TRUE}, {"move_window_down_key", NULL, TRUE}, {"move_window_down_workspace_key", NULL, TRUE}, {"move_window_left_key", NULL, TRUE}, diff --git a/src/settings.h b/src/settings.h index 5fd9862ff..f49de7725 100644 --- a/src/settings.h +++ b/src/settings.h @@ -113,7 +113,8 @@ #define KEY_MOVE_DOWN_WORKSPACE 67 #define KEY_MOVE_LEFT_WORKSPACE 68 #define KEY_MOVE_RIGHT_WORKSPACE 69 -#define KEY_COUNT 70 +#define KEY_MOVE_CANCEL 70 +#define KEY_COUNT 71 #define ALIGN_LEFT 0 #define ALIGN_RIGHT 1 diff --git a/themes/daloa/README b/themes/daloa/README index 5ee07b4a1..1095c5024 100644 --- a/themes/daloa/README +++ b/themes/daloa/README @@ -3,7 +3,7 @@ Daloa An original theme for xfwm4. Created May 2006 by Mike Massonnet <mmassonnet@gmail.com> -Modified by Olivier Fourdan <fourdan@xfce.org> +Modified June 2006 by Olivier Fourdan <fourdan@xfce.org> Based on xfwm4 4.4 Default theme. Theme released under GNU GPL license. diff --git a/themes/daloa/bottom-active.png b/themes/daloa/bottom-active.png Binary files differindex d1f97ee48..9c4dbf8af 100644 --- a/themes/daloa/bottom-active.png +++ b/themes/daloa/bottom-active.png diff --git a/themes/daloa/bottom-active.xpm b/themes/daloa/bottom-active.xpm index 90f19c43b..db2d56bcc 100644 --- a/themes/daloa/bottom-active.xpm +++ b/themes/daloa/bottom-active.xpm @@ -1,12 +1,13 @@ /* XPM */ static char * bottom_active_xpm[] = { -"32 4 5 1", +"32 5 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", "################################", "################################", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"################################", +"++++++++++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/daloa/bottom-inactive.png b/themes/daloa/bottom-inactive.png Binary files differindex d1f97ee48..9c4dbf8af 100644 --- a/themes/daloa/bottom-inactive.png +++ b/themes/daloa/bottom-inactive.png diff --git a/themes/daloa/bottom-inactive.xpm b/themes/daloa/bottom-inactive.xpm index eea46d86c..cf6b47e62 100644 --- a/themes/daloa/bottom-inactive.xpm +++ b/themes/daloa/bottom-inactive.xpm @@ -1,12 +1,13 @@ /* XPM */ static char * bottom_inactive_xpm[] = { -"32 4 5 1", +"32 5 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", "################################", "################################", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"################################", +"++++++++++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/daloa/bottom-left-active.xpm b/themes/daloa/bottom-left-active.xpm index dd7c44aba..33db4f0da 100644 --- a/themes/daloa/bottom-left-active.xpm +++ b/themes/daloa/bottom-left-active.xpm @@ -2,23 +2,23 @@ static char * bottom_left_active_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", "@+##############", "@+##############", -"@+$$$$$$$$$$$$$$", +"@+##############", +"@+++++++++++++++", " @@@@@@@@@@@@@@@"}; diff --git a/themes/daloa/bottom-left-inactive.xpm b/themes/daloa/bottom-left-inactive.xpm index 3b271698c..97465e391 100644 --- a/themes/daloa/bottom-left-inactive.xpm +++ b/themes/daloa/bottom-left-inactive.xpm @@ -2,23 +2,23 @@ static char * bottom_left_inactive_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", -"@+## ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", +"@+### ", "@+##############", "@+##############", -"@+$$$$$$$$$$$$$$", +"@+##############", +"@+++++++++++++++", " @@@@@@@@@@@@@@@"}; diff --git a/themes/daloa/bottom-right-active.xpm b/themes/daloa/bottom-right-active.xpm index 514c6a949..1a16e8c5d 100644 --- a/themes/daloa/bottom-right-active.xpm +++ b/themes/daloa/bottom-right-active.xpm @@ -2,23 +2,23 @@ static char * bottom_right_active_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -"##############$@", -"##############$@", -"$$$$$$$$$$$$$$$@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +"##############+@", +"##############+@", +"##############+@", +"+++++++++++++++@", "@@@@@@@@@@@@@@@ "}; diff --git a/themes/daloa/bottom-right-inactive.xpm b/themes/daloa/bottom-right-inactive.xpm index cc5632752..9047eb6dc 100644 --- a/themes/daloa/bottom-right-inactive.xpm +++ b/themes/daloa/bottom-right-inactive.xpm @@ -2,23 +2,23 @@ static char * bottom_right_inactive_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -" ##$@", -"##############$@", -"##############$@", -"$$$$$$$$$$$$$$$@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +"##############+@", +"##############+@", +"##############+@", +"+++++++++++++++@", "@@@@@@@@@@@@@@@ "}; diff --git a/themes/daloa/left-active.png b/themes/daloa/left-active.png Binary files differindex 18256bc44..1b0938ff2 100644 --- a/themes/daloa/left-active.png +++ b/themes/daloa/left-active.png diff --git a/themes/daloa/left-active.xpm b/themes/daloa/left-active.xpm index 9a283b0ac..a83433c3d 100644 --- a/themes/daloa/left-active.xpm +++ b/themes/daloa/left-active.xpm @@ -1,40 +1,40 @@ /* XPM */ static char * left_active_xpm[] = { -"4 32 5 1", +"5 32 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##"}; +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###"}; diff --git a/themes/daloa/left-inactive.png b/themes/daloa/left-inactive.png Binary files differindex 18256bc44..1b0938ff2 100644 --- a/themes/daloa/left-inactive.png +++ b/themes/daloa/left-inactive.png diff --git a/themes/daloa/left-inactive.xpm b/themes/daloa/left-inactive.xpm index 0d5b2440c..3394c37e5 100644 --- a/themes/daloa/left-inactive.xpm +++ b/themes/daloa/left-inactive.xpm @@ -1,40 +1,40 @@ /* XPM */ static char * left_inactive_xpm[] = { -"4 32 5 1", +"5 32 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##", -"@+##"}; +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###", +"@+###"}; diff --git a/themes/daloa/right-active.png b/themes/daloa/right-active.png Binary files differindex f7b770118..5de47d584 100644 --- a/themes/daloa/right-active.png +++ b/themes/daloa/right-active.png diff --git a/themes/daloa/right-active.xpm b/themes/daloa/right-active.xpm index 1166c6b1b..e9f872b6c 100644 --- a/themes/daloa/right-active.xpm +++ b/themes/daloa/right-active.xpm @@ -1,40 +1,40 @@ /* XPM */ static char * right_active_xpm[] = { -"4 32 5 1", +"5 32 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@"}; +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@"}; diff --git a/themes/daloa/right-inactive.png b/themes/daloa/right-inactive.png Binary files differindex f7b770118..5de47d584 100644 --- a/themes/daloa/right-inactive.png +++ b/themes/daloa/right-inactive.png diff --git a/themes/daloa/right-inactive.xpm b/themes/daloa/right-inactive.xpm index 583913c03..edb575491 100644 --- a/themes/daloa/right-inactive.xpm +++ b/themes/daloa/right-inactive.xpm @@ -1,40 +1,40 @@ /* XPM */ static char * right_inactive_xpm[] = { -"4 32 5 1", +"5 32 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@", -"##$@"}; +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@"}; diff --git a/themes/daloa/themerc b/themes/daloa/themerc index 65e785575..62e18fc37 100644 --- a/themes/daloa/themerc +++ b/themes/daloa/themerc @@ -1,5 +1,5 @@ active_text_color=#ffffff -button_offset=1 +button_offset=0 button_spacing=-1 title_horizontal_offset=0 title_vertical_offset_active=1 diff --git a/themes/daloa/top-right-active.xpm b/themes/daloa/top-right-active.xpm index cb539306e..97706133f 100644 --- a/themes/daloa/top-right-active.xpm +++ b/themes/daloa/top-right-active.xpm @@ -9,19 +9,19 @@ static char * top_right_active_xpm[] = { "..... ", "+++++. ", "@@@@@+.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#."}; +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+."}; diff --git a/themes/daloa/top-right-inactive.xpm b/themes/daloa/top-right-inactive.xpm index c5658957b..3fd9019f9 100644 --- a/themes/daloa/top-right-inactive.xpm +++ b/themes/daloa/top-right-inactive.xpm @@ -9,19 +9,19 @@ static char * top_right_inactive_xpm[] = { "..... ", "+++++. ", "@@@@@+.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#.", -"@@@@@#."}; +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+.", +"@@@@@+."}; diff --git a/themes/default.keys/keythemerc b/themes/default.keys/keythemerc index 4e1da6c1e..891418e15 100644 --- a/themes/default.keys/keythemerc +++ b/themes/default.keys/keythemerc @@ -10,6 +10,7 @@ lower_window_key=Shift+Alt+Page_Down maximize_horiz_key=Alt+F7 maximize_vert_key=Alt+F6 maximize_window_key=Alt+F5 +move_resize_cancel_key=Escape move_window_down_key=Control+Shift+Alt+Down move_window_down_workspace_key=None move_window_left_key=Control+Shift+Alt+Left diff --git a/themes/default/README b/themes/default/README index 5cdec5720..7f6aa3bad 100644 --- a/themes/default/README +++ b/themes/default/README @@ -5,5 +5,6 @@ An original theme for xfwm4. Created Feb. 2005 by Olivier Fourdan <fourdan@xfce.org> Modified sept./oct. 2005 by Olivier Fourdan <fourdan@xfce.org> Modified apr. 2006 by Olivier Fourdan <fourdan@xfce.org> +Modified jun. 2006 by Olivier Fourdan <fourdan@xfce.org> Theme released under GNU GPL license. diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm index 472bfda26..db2d56bcc 100644 --- a/themes/default/bottom-active.xpm +++ b/themes/default/bottom-active.xpm @@ -2,12 +2,12 @@ static char * bottom_active_xpm[] = { "32 5 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", "################################", "################################", "################################", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"++++++++++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm index aae5b63d2..cf6b47e62 100644 --- a/themes/default/bottom-inactive.xpm +++ b/themes/default/bottom-inactive.xpm @@ -2,12 +2,12 @@ static char * bottom_inactive_xpm[] = { "32 5 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", "################################", "################################", "################################", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"++++++++++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm index 23b01a332..33db4f0da 100644 --- a/themes/default/bottom-left-active.xpm +++ b/themes/default/bottom-left-active.xpm @@ -2,7 +2,7 @@ static char * bottom_left_active_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", @@ -20,5 +20,5 @@ static char * bottom_left_active_xpm[] = { "@+##############", "@+##############", "@+##############", -"@+$$$$$$$$$$$$$$", +"@+++++++++++++++", " @@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm index de3f0c2fd..97465e391 100644 --- a/themes/default/bottom-left-inactive.xpm +++ b/themes/default/bottom-left-inactive.xpm @@ -2,7 +2,7 @@ static char * bottom_left_inactive_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", @@ -20,5 +20,5 @@ static char * bottom_left_inactive_xpm[] = { "@+##############", "@+##############", "@+##############", -"@+$$$$$$$$$$$$$$", +"@+++++++++++++++", " @@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm index a33d2abd2..1a16e8c5d 100644 --- a/themes/default/bottom-right-active.xpm +++ b/themes/default/bottom-right-active.xpm @@ -2,24 +2,23 @@ static char * bottom_right_active_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -"##############$@", -"##############$@", -"##############$@", -"$$$$$$$$$$$$$$$@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +"##############+@", +"##############+@", +"##############+@", +"+++++++++++++++@", "@@@@@@@@@@@@@@@ "}; - diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm index 0fee86ed7..9047eb6dc 100644 --- a/themes/default/bottom-right-inactive.xpm +++ b/themes/default/bottom-right-inactive.xpm @@ -2,23 +2,23 @@ static char * bottom_right_inactive_xpm[] = { "16 16 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -" ###$@", -"##############$@", -"##############$@", -"##############$@", -"$$$$$$$$$$$$$$$@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +" ###+@", +"##############+@", +"##############+@", +"##############+@", +"+++++++++++++++@", "@@@@@@@@@@@@@@@ "}; diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm index 2b38962a4..a83433c3d 100644 --- a/themes/default/left-active.xpm +++ b/themes/default/left-active.xpm @@ -2,7 +2,7 @@ static char * left_active_xpm[] = { "5 32 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm index 1ca1584ae..3394c37e5 100644 --- a/themes/default/left-inactive.xpm +++ b/themes/default/left-inactive.xpm @@ -2,7 +2,7 @@ static char * left_inactive_xpm[] = { "5 32 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm index f296133d3..e9f872b6c 100644 --- a/themes/default/right-active.xpm +++ b/themes/default/right-active.xpm @@ -2,39 +2,39 @@ static char * right_active_xpm[] = { "5 32 5 1", " c None", -"+ c #E0E0E0 s active_hilight_2", +"+ c #E0E0FF s active_hilight_1", "@ c #A0A0FF s active_shadow_1", "$ c #B0B0B0 s active_mid_2", "# c #C0C0C0 s active_color_2", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@"}; +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@"}; diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm index 478203d15..edb575491 100644 --- a/themes/default/right-inactive.xpm +++ b/themes/default/right-inactive.xpm @@ -2,39 +2,39 @@ static char * right_inactive_xpm[] = { "5 32 5 1", " c None", -"+ c #E0E0E0 s inactive_hilight_2", +"+ c #E0E0FF s inactive_hilight_1", "@ c #A0A0FF s inactive_shadow_1", "$ c #B0B0B0 s inactive_mid_2", "# c #C0C0C0 s inactive_color_2", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@", -"###$@"}; +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@", +"###+@"}; diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm index 5cf031128..63cc7386c 100644 --- a/themes/default/top-right-active.xpm +++ b/themes/default/top-right-active.xpm @@ -10,25 +10,25 @@ static char * top_right_active_xpm[] = { "..... ", "+++++. ", "#####+.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@."}; +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+."}; diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm index 48fbcc7be..716f6e925 100644 --- a/themes/default/top-right-inactive.xpm +++ b/themes/default/top-right-inactive.xpm @@ -10,25 +10,25 @@ static char * top_right_inactive_xpm[] = { "..... ", "+++++. ", "#####+.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@.", -"#####@."}; +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+.", +"#####+."}; |
