summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2015-08-20theme: Remove outdated assertionYaakov Selkowitz2-3/+0
The theme state used to use GtkStateType, but was ported over to GtkStateFlags, leaving behind a broken assertion that fails when using certain Metacity themes, for example Nodoka. https://bugzilla.gnome.org/show_bug.cgi?id=661286 https://git.gnome.org/browse/mutter/commit/?id=28deea4 https://git.gnome.org/browse/metacity/commit/?id=c9099b4 https://github.com/mate-desktop/marco/issues/205
2015-06-10Merge pull request #164 from dnk/tile_preview_glitchMartin Wimpress1-1/+2
tile preview: invalidate window before showing
2015-06-10Merge pull request #160 from micove/add-tile-keybindsMartin Wimpress6-23/+46
Add tile keybinds (Fix #104, #127)
2015-06-09Merge pull request #187 from monsta/patch-1Martin Wimpress1-1/+1
prefs: make workspace name actually change
2015-06-09Merge pull request #189 from monsta/keybindings-fixMartin Wimpress1-20/+25
prefs: make keybindings change notifications work with GLib >= 2.43
2015-06-09fix uninitialized data field for sending _NET_WM_SYNC_REQUEST eventSebastian Gerhardt1-0/+1
If this field is left uninitialized, a client may mistake Marco to support more than the single update request counter described in EWMH 1.5.
2015-04-09prefs: make keybindings change notifications work with GLib >= 2.43Monsta1-20/+25
this is achieved by using the same GSettings instance for listening and reading data. it's an additional fix for the issue with GLib >= 2.43, https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
2015-04-08prefs: make workspace name actually changemonsta1-1/+1
now workspace names actually change on-the-fly when you change them in dconf-editor. and this works with GLib 2.43 as well.
2015-04-05keybindings: pass screen name instead of number to error dialogMonsta1-7/+7
makes error dialogs on wrong command/terminal command actually work, and fixes https://github.com/mate-desktop/marco/issues/150 Closes https://github.com/mate-desktop/marco/pull/185 Closes https://github.com/mate-desktop/marco/issues/150
2015-03-15preview-widget: use correct name for missing iconmonsta1-2/+2
from https://git.gnome.org/browse/metacity/commit/?id=5f8df557b8dbe962f19e8b641c007073665ff878 Closes https://github.com/mate-desktop/marco/pull/178
2015-02-25prefs: first connect to settings, then read them.Monsta1-7/+7
fixes the issue with GLib >= 2.43, https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619 Closes https://github.com/mate-desktop/marco/pull/174
2015-01-14check compositor statusDenis Gorodnichev5-30/+34
2015-01-14show tile preview with external compositorDenis Gorodnichev3-10/+6
2015-01-14tile preview: invalidate window before showingDenis Gorodnichev1-1/+2
2015-01-01BugFix: Can't retile to a different corner with keybindings.Miguel A. Colón Vélez1-1/+1
has_maximize_func implies window->has_resize_func !window->fullscreen window->has_resize_func implies (window->size_hints.min_width < window->size_hints.max_width) || (window->size_hints.min_height < window->size_hints.max_height) A tiled window implies that it could be tiled. A maximized window implies that it could be tiled. . Therefore simplify the if and add window->shaded to make it equivalent to the macro but allowing to tile already maximized/tiled windows. . If this commit causes a regression it probably means that a call to meta_window_recalc_features is missing. . This bug already existed but can only be triggered by the new keybindings.
2015-01-01BugFix: Can't unmaximize a tiled window.Miguel A. Colón Vélez1-15/+1
The removed code did not allow tiled windows to be unmaximized. The code was trying to retile a tiled window when it was asked to unmaximize it. The only thing it did was turn a maximized window into a tiled window but that is not the normal expected behaviour of unmaximization. . I also reset window->tile_mode to ensure we always unmaximize correctly. Some duplicate code was also removed. . This bug affects tiling with: - tile-to-side-w - tile-to-side-e - Mouse dragging to the west corner - Mouse dragging to the east corner . Therefore it's an old bug unrelated to the new keybindings.
2015-01-01Update handle_toggle_tiled.Miguel A. Colón Vélez1-7/+19
These are the minimal changes needed to make the keybinds work. Anything else should be fixed outside handle_toggle_tiled.
2015-01-01Add the tile-to-side options to the appropiate files.Miguel A. Colón Vélez4-0/+25
This is just a copy/paste from move-to-side-{e,w} with: s/move/tile/g s/Move/Tile/g . It uses the existing handle_toggle_tiled as the backend.
2014-12-05ui: use correct name for missing iconAlberts Muktupāvels1-2/+2
2014-11-27removed unused function argumentMonsta1-3/+2
Closes https://github.com/mate-desktop/marco/pull/152
2014-11-26compositor: fix possible dereference of NULL pointermonsta1-5/+10
Closes https://github.com/mate-desktop/marco/pull/145
2014-11-26wm-tester: correct NULL pointer checkmonsta1-1/+1
Closes https://github.com/mate-desktop/marco/pull/144
2014-11-25merge metacity(gtk3) changesDenis Gorodnichev26-478/+1402
merge metacity(gtk3) changes fix warnings clean up unused variables replace UNUSED_VARIABLE by G_GNUC_UNUSED
2014-11-25Replace gtkstock icon usageinfirit2-4/+4
2014-11-25Gtk3: Silence the GtkVBox and GtkHBox deprecations warningsinfirit3-0/+13
2014-11-18Add missing ';'Stefano Karapetsas1-1/+1
Closes https://github.com/mate-desktop/marco/issues/149
2014-11-12Unconditionally reset minimize_after_placement on placementinfirit1-3/+2
GTK+ has now started using _NET_WM_STATE_HIDDEN for iconified windows. For windows iconified at creation time, this causes metacity to set minimize_after_placement, which then causes the window to become minimized immediately after the first time it has been activated by the user. This happens because: (1) minimize_after_placement is reset after placing the window (2) if a window is minimized, placement is deferred Reset minimize_after_placement unconditionally in place_window_if_needed() to solve the issue. Reported and tested by Daniel Drake <[email protected]> Based on metacity commit: b0700e20b79896de7d28d2ff2bb18be324d8e19f From: Florian Müllner <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=684741
2014-11-12Work around usage of XPointerinfirit1-1/+1
XLib has historically used "char*" for "generic pointer" but compliers rightly complain when casting this to a structure. Work around this by casting to void * and letting the implicit conversion to a structure type take effect. Based on metacity commit: 687376bb549b3d60ba848c9d4105fe41087f3a77 From: Colin Walters <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=611644
2014-11-12buttons: Fix background functions for non-default layoutsinfirit3-16/+108
While the configured layout is taken into account for positioning the buttons, the mapping from button function states to button position states just assumed the default button layout in LTR locales. Do a proper mapping depending on the actual layout instead. Based on metacity commit: 6a52883c2b670ad645257373515d1e704408b93d From: Florian Müllner <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=638700
2014-11-12Fix drawing of <arc> elementsinfirit1-1/+1
This patch fixes the drawing of <arc> theme elements to appear in the desired orientation Based on metacity commit: 120c7790d6c5a837372ef1e0105e89ac674facd8 From: Nickolas Lloyd <[email protected]>
2014-11-12Unify keymap-reloading code branchesinfirit1-14/+24
Simplify the keymap loading logic by unifying the different branches; in the reorganization this patch fixes a bug where when we got a MappingKeyboard event we wouldn't update virtual modifiers correctly. Based on a patch by Thomas Thurman <[email protected]> Based on metacity commit: ba2e5f7f541446931299814bafa642d09047f386 From: "Owen W. Taylor" <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=565540
2014-11-12Update keybindings when XKB keyboard layout changesinfirit2-1/+31
* Select for XKB keyboard notification events explicitly; since GTK+ has selected for XKB events, delivery of old-school MappingNotify events is disabled. * Fix a bug where once a keycode was loaded for a key binding, it would never be reassigned; we want to laod new keycodes for all bindings that have a key symbol rather than a fixed keycode. [ With fixes from Owen W. Taylor <[email protected]> ] Based on metacity commit: c262e3d65a37abedc507705cddfec72c901c321f From: Derek Poon <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=565540
2014-11-12Allow explicit raises from same client, not just same appinfirit1-1/+22
We currently allow XRaiseWindow when the same application (defined by the window group) is focused, but the kind of old applications that XRaiseWindow are frequently not setting the window group. Expand the check to allow the same X client (defined by the looking at client ID) to raise windows above the focus window. Based on metacity commit: 632d3983fbc402432c6ceae05bea8903ad2f11c0 From: "Owen W. Taylor" <[email protected]> Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=567528
2014-11-07Revert "Possible keybinding to switch to previous workspace."infirit7-31/+1
This reverts commit 69b7a0ad9277f21ad761c84ac1bae5455a2f879e. It has the unintended side-effect that it reverses the alt+tab behaviour.
2014-10-27Fixup Gtk3 Gdk device handlingDenis Gorodnichev3-8/+32
2014-10-27don't change use settings by command line argumentDenis Gorodnichev3-8/+10
2014-10-27Rework tiling code based off Consortiuminfirit17-152/+414
Taken from https://github.com/SolusOS-discontinued/consortium/commit/b463e03f5bdeab307ceee6b969c681f29537c76d
2014-10-25Revert the new atom changes as they also got reverted later by metacityinfirit1-56/+1
Revert "Rename new ATOM from bc8eb8bd2f943b69c87eb7c9e154928f1dd861bb" This reverts commit 1bd64c3b7eca544f0722cb4c3ee7aa0ca5dd5ec4. Revert "compositor-xrender: add new atom - METACITY_WINDOW_HAVE_SHADOW" This reverts commit bc8eb8bd2f943b69c87eb7c9e154928f1dd861bb.
2014-10-25Rename new ATOM from bc8eb8bd2f943b69c87eb7c9e154928f1dd861bbinfirit1-5/+5
2014-10-25Make sure to always call va_endinfirit2-3/+8
Based on metacity commit: b235d3e78670e30a55f3f746f13003577988bed6 From: Jasper St. Pierre <[email protected]>
2014-10-25Add in XDG_USER_DATA_DIR when looking for themesinfirit1-1/+15
Based off metacity commit: 52a524ee4a7e14d99451ea3f596b353ddf7957d4 From: Jasper St. Pierre <[email protected]>
2014-10-25Clean up code to find themesinfirit1-172/+118
Simplify code to find the right theme to load and loading it by moving all the loading code into a load_theme() helper function, and making meta_load_theme() use that as it searches through the directories. Look for old-version themes even when loading relative to the working in debug mode. Don't unnecessarily duplicate and then free info->theme_file and info->theme_dir. http://bugzilla.gnome.org/show_bug.cgi?id=592503 NOTE: Patch copied from mutter and adapted for metacity. Based on metacity commit: bc45c9b68849687d456ec339588d15a63c391046 From: Alberts Muktupāvels <[email protected]>
2014-10-25theme-viewer: stop using gtk_misc_set_alignment for Gtk+3infirit1-0/+5
Based on metacity commit: 99bfe2d27c6babeeea3539b990505895750d3541 From: Alberts Muktupāvels <[email protected]>
2014-10-25compositor-xrender: add new atom - METACITY_WINDOW_HAVE_SHADOWinfirit1-1/+56
Based on metacity commit: c52cd2e1d6ae50627bc9056ea6eae773e2aedfe5 From: Alberts Muktupāvels <[email protected]>
2014-10-25Drop support for Glib < 2.32infirit1-4/+0
2014-10-25Drop support for Gtk+ < 2.24infirit1-48/+0
2014-10-25Cleanup GTK_CHECK_VERSION and unify where possibleinfirit9-97/+9
gdk_x11_window_lookup_for_display since 2.24 GDK_WINDOW_XID since always gtk_widget_get_visible since 2.18 gtk_widget_set_mapped since 2.20 gdk_event_new since 2.2 gdk_x11_window_lookup_for_display since 2.24 gdk_text_property_to_utf8_list_for_display since 2.2 gtk_widget_get_realized since 2.20 gdk_visual_get_depth since 2.22 gtk_widget_get_window since 2.14 gtk_widget_set_allocation since 2.18
2014-10-24keybindings.c: fix deprecated warninginfirit1-1/+1
Based on metacity commit: 8f49828169efb43976e23dd15c6dc4d630346f50
2014-10-24Add error handling to glibtop_get_proc_uidinfirit1-2/+9
Author: Tomaž Šolc Based on commit: 4ecd6e49164ee027cee8dfdbb51fd8389694ff43 Gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=603240
2014-10-24Update meta_show_dialog for gtk's removal of --screeninfirit4-10/+8
gtk3 no longer has the --screen command-line argument, which metacity was passing to zenity. Use --display (with an explicitly-specified screen number) instead. Author: Dan Winship Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687938 Based on metacity commit: 8d19afdcccaec28a5512b0a707d8238b9dd4e2f3