mirror of
https://github.com/brl/mutter.git
synced 2025-02-16 13:24:09 +00:00
![Thomas James Alexander Thurman](/assets/img/avatar_default.png)
* common.h: Added "above" to the list of flags a frame can have, so that we know when to mark it as always on top. Added six grab ops, one to do and one to undo each of the three new titlebar buttons (shade, above, stick). Added six new button functions, similarly. (#96229) * frame.c (meta_frame_get_flags): If a frame has the WM_STATE_ABOVE X attribute, set META_FRAME_ABOVE in its flags. * frames.c (meta_frames_apply_shapes): Allow variable amounts of rounding. (#113162) * frames.c (show_tip_now, meta_frames_paint_to_drawable, control_rect, get_control): extend handling of existing buttons to the 3*2 new kinds of button. (#96229) * frames.c (meta_frames_button_press_event): translate clicks on the 3*2 new kinds of button to the new grab ops. (#96229) * frames.c (meta_frames_button_release_event): implement the various actions for the 3*2 new kinds of button. (#96229) * frames.c (meta_frames_update_prelit_control, meta_frames_motion_notify_event): extend existing motion notifications for buttons to the 3*2 new kinds of button. (#96229) * frames.c (meta_frames_set_window_background): handle specified background colours and alpha transparency. (#151261) * frames.h (MetaFrameControl): New control types for the 3*2 new kinds of button. (#96229) * iconcache.[ch] (meta_read_icons): use theme's fallback icons if a window has no icon; use metacity's fallback icons only if the theme does not provide any. (#11363) * iconcache.[ch] (meta_invalidate_default_icons (new function)): clear icon cache on windows using default icons, and update them. (#11363) * main.c (main): added \n to error message. * prefs.c (button_function_from_string): extend for 3 new button types. (#96229) * prefs.c (button_opposite_function (new function)): return a button function's inverse (shade -> unshade, etc) (#96229) * prefs.c (update_button_layout): allocate space for a button's inverse, if it has one. (#96229) * theme-parser.c (ParseState): add state for fallback icons (#11363) * theme-parser.c (ParseInfo): add format_version; remove menu_icon_* (#114305) * theme-parser.c (parse_positive_integer): add lookup for integer constants (#331356) * theme-parser.c (parse_rounding (new function)): parse window rounding amount (#113162) * theme-parser.c (parse_alpha): don't set error if the number can't be parsed since it'll already be set; change tolerance in comparison from 1e6 to 1e-6 * theme-parser.c (parse_color (new function)): parse colour, including possible constant lookup. * theme-parser.c (parse_toplevel_element): allow defining of various new kinds of constant; allow hide_buttons (#121639) and more detailed rounding attributes on <frame_geometry> (#113162); allow background and alpha attributes on <frame_style>; (#151261) remove support for <menu_icon> except as stub; (#114305) add support for loading stock images (#113465); add support for <fallback>. (#11363)) * theme-parser.c (parse_draw_op_element): add from and to attribute for arcs. (#121603) * theme-parser.c (parse_style_element): add check for theme version supporting a button function. (#96229) * theme-parser.c (parse_style_set_element): add ability for shaded windows to be resizable (#114304) * theme-parser.c (meta_theme_load): add theme versioning routine. * theme.c ( meta_frame_layout_get_borders): return rectangles for the new 3*2 kinds of button, except where they're inapplicable. (#96229) * theme.c (meta_frame_layout_calc_geometry): don't format buttons on windows with no buttons (#121639); strip the 3*2 new kinds of button correctly (#96229); allow variable amounts of rounding (#113162). * theme.c (meta_frame_style_new): set alpha to 255 by default. (#151261) * theme.c (meta_frame_style_unref): free colour spec if allocated. (#151261) * theme.c (meta_frame_style_validate): it's only an error not to include a button if that button is valid in the current theme. (#96229) * theme.c (button_rect): return rectangles for the new 3*2 kinds of button. (#96229) * theme.c (meta_frame_style_set_unref): free differently resizable shaded styles. (#114304) * theme.c (get_style): look up differently resizable styles for shaded windows. (#114304) * theme.c (free_menu_ops (removed function), get_menu_icon (removed function), meta_theme_draw_menu_icon (removed function), meta_menu_icon_type_from_string (removed function), meta_menu_icon_type_to_string (removed function), meta_theme_free, meta_theme_validate): removed menu icon code. (#114305) * theme.c (meta_theme_load_image): add size_of_theme_icons parameter. (#113465) * theme.c (meta_theme_define_color_constant (new function), meta_theme_lookup_color_constant (new function)): allow definition of colour constants. (#129747) * theme.c (meta_button_type_from_string, meta_button_type_to_string): add the 3*2 new kinds of button. (#96229) * theme.c (meta_theme_earliest_version_with_button (new function)): return the theme version each button was introduced in. (#96229) * theme.h ( MetaFrameLayout): add "hide_buttons" flag (#121639) and corner radiuses. (#113162) * theme.h (MetaFrameGeometry): add rectangles for the 3*2 new buttons. (#96229) * theme.h (MetaButtonType): the 3*2 new buttons. (#96229) * theme.h (MetaFrameStyle): add window_background_color and window_background_alpha so that we can specify background on a <frame_style>. (#151261) * theme.h (MetaFrameStyleSet): shaded_styles gets resize dimension. (#114304) * theme.h (MetaTheme): added format_version, color_constants hash, (#129747) fallback_icon and fallback_mini_icon, (#11363) and removed menu_icons. (#114305) * theme.h (META_THEME_ALLOWS (new macro)): return whether a theme supports a given feature. Also, several macros representing new features in v2. * ui.c (meta_ui_set_current_theme)): also invalidate default icons. (#11363) * window.[ch] (meta_window_update_icon_now)): became non-static. (#11363)
273 lines
7.9 KiB
C
273 lines
7.9 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
/* Metacity common types shared by core.h and ui.h */
|
|
|
|
/*
|
|
* Copyright (C) 2001 Havoc Pennington
|
|
* Copyright (C) 2005 Elijah Newren
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef META_COMMON_H
|
|
#define META_COMMON_H
|
|
|
|
/* Don't include GTK or core headers here */
|
|
#include <X11/Xlib.h>
|
|
#include <glib.h>
|
|
|
|
typedef struct _MetaResizePopup MetaResizePopup;
|
|
|
|
typedef enum
|
|
{
|
|
META_FRAME_ALLOWS_DELETE = 1 << 0,
|
|
META_FRAME_ALLOWS_MENU = 1 << 1,
|
|
META_FRAME_ALLOWS_MINIMIZE = 1 << 2,
|
|
META_FRAME_ALLOWS_MAXIMIZE = 1 << 3,
|
|
META_FRAME_ALLOWS_VERTICAL_RESIZE = 1 << 4,
|
|
META_FRAME_ALLOWS_HORIZONTAL_RESIZE = 1 << 5,
|
|
META_FRAME_HAS_FOCUS = 1 << 6,
|
|
META_FRAME_SHADED = 1 << 7,
|
|
META_FRAME_STUCK = 1 << 8,
|
|
META_FRAME_MAXIMIZED = 1 << 9,
|
|
META_FRAME_ALLOWS_SHADE = 1 << 10,
|
|
META_FRAME_ALLOWS_MOVE = 1 << 11,
|
|
META_FRAME_FULLSCREEN = 1 << 12,
|
|
META_FRAME_IS_FLASHING = 1 << 13,
|
|
META_FRAME_ABOVE = 1 << 14
|
|
} MetaFrameFlags;
|
|
|
|
typedef enum
|
|
{
|
|
META_MENU_OP_DELETE = 1 << 0,
|
|
META_MENU_OP_MINIMIZE = 1 << 1,
|
|
META_MENU_OP_UNMAXIMIZE = 1 << 2,
|
|
META_MENU_OP_MAXIMIZE = 1 << 3,
|
|
META_MENU_OP_UNSHADE = 1 << 4,
|
|
META_MENU_OP_SHADE = 1 << 5,
|
|
META_MENU_OP_UNSTICK = 1 << 6,
|
|
META_MENU_OP_STICK = 1 << 7,
|
|
META_MENU_OP_WORKSPACES = 1 << 8,
|
|
META_MENU_OP_MOVE = 1 << 9,
|
|
META_MENU_OP_RESIZE = 1 << 10,
|
|
META_MENU_OP_ABOVE = 1 << 11,
|
|
META_MENU_OP_UNABOVE = 1 << 12,
|
|
META_MENU_OP_MOVE_LEFT = 1 << 13,
|
|
META_MENU_OP_MOVE_RIGHT = 1 << 14,
|
|
META_MENU_OP_MOVE_UP = 1 << 15,
|
|
META_MENU_OP_MOVE_DOWN = 1 << 16,
|
|
META_MENU_OP_RECOVER = 1 << 17
|
|
} MetaMenuOp;
|
|
|
|
typedef struct _MetaWindowMenu MetaWindowMenu;
|
|
|
|
typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
|
|
Display *xdisplay,
|
|
Window client_xwindow,
|
|
guint32 timestamp,
|
|
MetaMenuOp op,
|
|
int workspace,
|
|
gpointer data);
|
|
|
|
/* when changing this enum, there are various switch statements
|
|
* you have to update
|
|
*/
|
|
typedef enum
|
|
{
|
|
META_GRAB_OP_NONE,
|
|
|
|
/* Mouse ops */
|
|
META_GRAB_OP_MOVING,
|
|
META_GRAB_OP_RESIZING_SE,
|
|
META_GRAB_OP_RESIZING_S,
|
|
META_GRAB_OP_RESIZING_SW,
|
|
META_GRAB_OP_RESIZING_N,
|
|
META_GRAB_OP_RESIZING_NE,
|
|
META_GRAB_OP_RESIZING_NW,
|
|
META_GRAB_OP_RESIZING_W,
|
|
META_GRAB_OP_RESIZING_E,
|
|
|
|
/* Keyboard ops */
|
|
META_GRAB_OP_KEYBOARD_MOVING,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_S,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_N,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_W,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_E,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_SE,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_NE,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_SW,
|
|
META_GRAB_OP_KEYBOARD_RESIZING_NW,
|
|
|
|
/* Alt+Tab */
|
|
META_GRAB_OP_KEYBOARD_TABBING_NORMAL,
|
|
META_GRAB_OP_KEYBOARD_TABBING_DOCK,
|
|
|
|
/* Alt+Esc */
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL,
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_DOCK,
|
|
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_GROUP,
|
|
|
|
/* Alt+F6 */
|
|
META_GRAB_OP_KEYBOARD_TABBING_GROUP,
|
|
|
|
META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING,
|
|
|
|
/* Frame button ops */
|
|
META_GRAB_OP_CLICKING_MINIMIZE,
|
|
META_GRAB_OP_CLICKING_MAXIMIZE,
|
|
META_GRAB_OP_CLICKING_UNMAXIMIZE,
|
|
META_GRAB_OP_CLICKING_DELETE,
|
|
META_GRAB_OP_CLICKING_MENU,
|
|
META_GRAB_OP_CLICKING_SHADE,
|
|
META_GRAB_OP_CLICKING_UNSHADE,
|
|
META_GRAB_OP_CLICKING_ABOVE,
|
|
META_GRAB_OP_CLICKING_UNABOVE,
|
|
META_GRAB_OP_CLICKING_STICK,
|
|
META_GRAB_OP_CLICKING_UNSTICK
|
|
} MetaGrabOp;
|
|
|
|
typedef enum
|
|
{
|
|
META_CURSOR_DEFAULT,
|
|
META_CURSOR_NORTH_RESIZE,
|
|
META_CURSOR_SOUTH_RESIZE,
|
|
META_CURSOR_WEST_RESIZE,
|
|
META_CURSOR_EAST_RESIZE,
|
|
META_CURSOR_SE_RESIZE,
|
|
META_CURSOR_SW_RESIZE,
|
|
META_CURSOR_NE_RESIZE,
|
|
META_CURSOR_NW_RESIZE,
|
|
META_CURSOR_MOVE_OR_RESIZE_WINDOW,
|
|
META_CURSOR_BUSY
|
|
|
|
} MetaCursor;
|
|
|
|
typedef enum
|
|
{
|
|
META_FOCUS_MODE_CLICK,
|
|
META_FOCUS_MODE_SLOPPY,
|
|
META_FOCUS_MODE_MOUSE
|
|
} MetaFocusMode;
|
|
|
|
typedef enum
|
|
{
|
|
META_FOCUS_NEW_WINDOWS_SMART,
|
|
META_FOCUS_NEW_WINDOWS_STRICT
|
|
} MetaFocusNewWindows;
|
|
|
|
typedef enum
|
|
{
|
|
META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_SHADE,
|
|
META_ACTION_DOUBLE_CLICK_TITLEBAR_TOGGLE_MAXIMIZE,
|
|
META_ACTION_DOUBLE_CLICK_TITLEBAR_MINIMIZE,
|
|
META_ACTION_DOUBLE_CLICK_TITLEBAR_NONE,
|
|
META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST
|
|
} MetaActionDoubleClickTitlebar;
|
|
|
|
typedef enum
|
|
{
|
|
META_FRAME_TYPE_NORMAL,
|
|
META_FRAME_TYPE_DIALOG,
|
|
META_FRAME_TYPE_MODAL_DIALOG,
|
|
META_FRAME_TYPE_UTILITY,
|
|
META_FRAME_TYPE_MENU,
|
|
META_FRAME_TYPE_BORDER,
|
|
META_FRAME_TYPE_LAST
|
|
} MetaFrameType;
|
|
|
|
typedef enum
|
|
{
|
|
/* Create gratuitous divergence from regular
|
|
* X mod bits, to be sure we find bugs
|
|
*/
|
|
META_VIRTUAL_SHIFT_MASK = 1 << 5,
|
|
META_VIRTUAL_CONTROL_MASK = 1 << 6,
|
|
META_VIRTUAL_ALT_MASK = 1 << 7,
|
|
META_VIRTUAL_META_MASK = 1 << 8,
|
|
META_VIRTUAL_SUPER_MASK = 1 << 9,
|
|
META_VIRTUAL_HYPER_MASK = 1 << 10,
|
|
META_VIRTUAL_MOD2_MASK = 1 << 11,
|
|
META_VIRTUAL_MOD3_MASK = 1 << 12,
|
|
META_VIRTUAL_MOD4_MASK = 1 << 13,
|
|
META_VIRTUAL_MOD5_MASK = 1 << 14
|
|
} MetaVirtualModifier;
|
|
|
|
/* Relative directions or sides seem to come up all over the place... */
|
|
/* FIXME: Replace
|
|
* screen.[ch]:MetaScreenDirection,
|
|
* workspace.[ch]:MetaMotionDirection,
|
|
* with the use of MetaDirection.
|
|
*/
|
|
typedef enum
|
|
{
|
|
META_DIRECTION_LEFT = 1 << 0,
|
|
META_DIRECTION_RIGHT = 1 << 1,
|
|
META_DIRECTION_TOP = 1 << 2,
|
|
META_DIRECTION_BOTTOM = 1 << 3,
|
|
META_DIRECTION_UP = 1 << 2, /* Alternate name for TOP */
|
|
META_DIRECTION_DOWN = 1 << 3 /* Alternate name for BOTTOM */
|
|
} MetaDirection;
|
|
|
|
/* Function a window button can have. Note, you can't add stuff here
|
|
* without extending the theme format to draw a new function and
|
|
* breaking all existing themes.
|
|
*/
|
|
typedef enum
|
|
{
|
|
META_BUTTON_FUNCTION_MENU,
|
|
META_BUTTON_FUNCTION_MINIMIZE,
|
|
META_BUTTON_FUNCTION_MAXIMIZE,
|
|
META_BUTTON_FUNCTION_CLOSE,
|
|
META_BUTTON_FUNCTION_SHADE,
|
|
META_BUTTON_FUNCTION_ABOVE,
|
|
META_BUTTON_FUNCTION_STICK,
|
|
META_BUTTON_FUNCTION_UNSHADE,
|
|
META_BUTTON_FUNCTION_UNABOVE,
|
|
META_BUTTON_FUNCTION_UNSTICK,
|
|
META_BUTTON_FUNCTION_LAST
|
|
} MetaButtonFunction;
|
|
|
|
#define MAX_BUTTONS_PER_CORNER META_BUTTON_FUNCTION_LAST
|
|
|
|
typedef struct _MetaButtonLayout MetaButtonLayout;
|
|
struct _MetaButtonLayout
|
|
{
|
|
/* buttons in the group on the left side */
|
|
MetaButtonFunction left_buttons[MAX_BUTTONS_PER_CORNER];
|
|
|
|
/* buttons in the group on the right side */
|
|
MetaButtonFunction right_buttons[MAX_BUTTONS_PER_CORNER];
|
|
};
|
|
|
|
/* should investigate changing these to whatever most apps use */
|
|
#define META_ICON_WIDTH 32
|
|
#define META_ICON_HEIGHT 32
|
|
#define META_MINI_ICON_WIDTH 16
|
|
#define META_MINI_ICON_HEIGHT 16
|
|
|
|
#define META_PRIORITY_PREFS_NOTIFY (G_PRIORITY_DEFAULT_IDLE + 10)
|
|
#define META_PRIORITY_WORK_AREA_HINT (G_PRIORITY_DEFAULT_IDLE + 15)
|
|
|
|
#define POINT_IN_RECT(xcoord, ycoord, rect) \
|
|
((xcoord) >= (rect).x && \
|
|
(xcoord) < ((rect).x + (rect).width) && \
|
|
(ycoord) >= (rect).y && \
|
|
(ycoord) < ((rect).y + (rect).height))
|
|
|
|
#endif
|