2006-10-01 18:30:10 -04:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
|
2001-06-17 23:24:25 -04:00
|
|
|
/* Metacity common types shared by core.h and ui.h */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2001 Havoc Pennington
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 09:58:50 -05:00
|
|
|
* Copyright (C) 2005 Elijah Newren
|
2001-06-17 23:24:25 -04:00
|
|
|
*
|
|
|
|
|
* 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>
|
2001-06-23 01:49:35 -04:00
|
|
|
#include <glib.h>
|
2001-06-17 23:24:25 -04:00
|
|
|
|
2002-03-17 12:22:23 -05:00
|
|
|
typedef struct _MetaResizePopup MetaResizePopup;
|
|
|
|
|
|
2001-06-17 23:24:25 -04:00
|
|
|
typedef enum
|
|
|
|
|
{
|
2001-07-02 21:45:43 -04:00
|
|
|
META_FRAME_ALLOWS_DELETE = 1 << 0,
|
|
|
|
|
META_FRAME_ALLOWS_MENU = 1 << 1,
|
|
|
|
|
META_FRAME_ALLOWS_MINIMIZE = 1 << 2,
|
2001-09-10 23:54:54 -04:00
|
|
|
META_FRAME_ALLOWS_MAXIMIZE = 1 << 3,
|
2001-07-02 21:45:43 -04:00
|
|
|
META_FRAME_ALLOWS_VERTICAL_RESIZE = 1 << 4,
|
|
|
|
|
META_FRAME_ALLOWS_HORIZONTAL_RESIZE = 1 << 5,
|
2002-01-19 18:59:11 -05:00
|
|
|
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,
|
2002-06-08 02:07:21 -04:00
|
|
|
META_FRAME_ALLOWS_MOVE = 1 << 11,
|
2003-01-28 10:07:43 -05:00
|
|
|
META_FRAME_FULLSCREEN = 1 << 12,
|
Added "above" to the list of flags a frame can have, so that we know when
* 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)
2006-10-07 12:56:47 -04:00
|
|
|
META_FRAME_IS_FLASHING = 1 << 13,
|
|
|
|
|
META_FRAME_ABOVE = 1 << 14
|
2001-06-17 23:24:25 -04:00
|
|
|
} MetaFrameFlags;
|
|
|
|
|
|
2001-06-23 01:49:35 -04:00
|
|
|
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,
|
2001-07-11 02:22:00 -04:00
|
|
|
META_MENU_OP_WORKSPACES = 1 << 8,
|
|
|
|
|
META_MENU_OP_MOVE = 1 << 9,
|
2003-12-21 01:31:40 -05:00
|
|
|
META_MENU_OP_RESIZE = 1 << 10,
|
|
|
|
|
META_MENU_OP_ABOVE = 1 << 11,
|
2007-04-16 00:48:14 -04:00
|
|
|
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
|
2001-06-23 01:49:35 -04:00
|
|
|
} MetaMenuOp;
|
|
|
|
|
|
|
|
|
|
typedef struct _MetaWindowMenu MetaWindowMenu;
|
|
|
|
|
|
|
|
|
|
typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
|
|
|
|
|
Display *xdisplay,
|
|
|
|
|
Window client_xwindow,
|
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-13 12:32:33 -04:00
|
|
|
guint32 timestamp,
|
2001-06-23 01:49:35 -04:00
|
|
|
MetaMenuOp op,
|
|
|
|
|
int workspace,
|
|
|
|
|
gpointer data);
|
|
|
|
|
|
2001-08-19 14:09:10 -04:00
|
|
|
/* when changing this enum, there are various switch statements
|
|
|
|
|
* you have to update
|
|
|
|
|
*/
|
2001-07-11 02:22:00 -04:00
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
META_GRAB_OP_NONE,
|
2001-08-19 14:09:10 -04:00
|
|
|
|
2001-07-25 23:14:45 -04:00
|
|
|
/* Mouse ops */
|
2001-07-11 02:22:00 -04:00
|
|
|
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,
|
2001-08-19 14:09:10 -04:00
|
|
|
|
2001-07-25 23:14:45 -04:00
|
|
|
/* Keyboard ops */
|
2001-07-11 02:22:00 -04:00
|
|
|
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,
|
2001-07-25 23:14:45 -04:00
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_E,
|
2001-08-19 14:09:10 -04:00
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_SE,
|
|
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_NE,
|
|
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_SW,
|
|
|
|
|
META_GRAB_OP_KEYBOARD_RESIZING_NW,
|
|
|
|
|
|
2002-07-06 12:50:48 -04:00
|
|
|
/* Alt+Tab */
|
2002-04-05 10:52:49 -05:00
|
|
|
META_GRAB_OP_KEYBOARD_TABBING_NORMAL,
|
|
|
|
|
META_GRAB_OP_KEYBOARD_TABBING_DOCK,
|
2002-06-08 23:44:16 -04:00
|
|
|
|
2002-07-06 12:50:48 -04:00
|
|
|
/* Alt+Esc */
|
|
|
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL,
|
|
|
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_DOCK,
|
2006-04-14 22:05:44 -04:00
|
|
|
|
|
|
|
|
META_GRAB_OP_KEYBOARD_ESCAPING_GROUP,
|
|
|
|
|
|
|
|
|
|
/* Alt+F6 */
|
|
|
|
|
META_GRAB_OP_KEYBOARD_TABBING_GROUP,
|
2002-07-06 12:50:48 -04:00
|
|
|
|
2002-06-09 00:04:19 -04:00
|
|
|
META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING,
|
2001-08-19 14:09:10 -04:00
|
|
|
|
2001-07-25 23:14:45 -04:00
|
|
|
/* Frame button ops */
|
|
|
|
|
META_GRAB_OP_CLICKING_MINIMIZE,
|
|
|
|
|
META_GRAB_OP_CLICKING_MAXIMIZE,
|
2001-09-10 23:54:54 -04:00
|
|
|
META_GRAB_OP_CLICKING_UNMAXIMIZE,
|
2001-07-25 23:14:45 -04:00
|
|
|
META_GRAB_OP_CLICKING_DELETE,
|
Added "above" to the list of flags a frame can have, so that we know when
* 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)
2006-10-07 12:56:47 -04:00
|
|
|
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
|
2001-07-11 02:22:00 -04:00
|
|
|
} MetaGrabOp;
|
|
|
|
|
|
2001-07-25 23:14:45 -04:00
|
|
|
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,
|
Patch to provide extra cues to the user when using window menu move and
2002-08-08 Craig Black <blackc@speakeasy.net>
Patch to provide extra cues to the user when using
window menu move and resize, #85724.
* src/common.h: add new cursors
* src/display.c: (grab_op_is_mouse)
(meta_display_create_x_cursor), (xcursor_for_op),
(meta_display_set_grab_op_cursor),
(meta_display_begin_grab_op):
The keyboard move and resize grab ops now also use the mouse.
Allow the grab cursor to be changed during the grab op.
Hold onto the initial grab position in case of reset.
* src/display.h: save the initial grab position
* src/keybindings.c: (process_keyboard_move_grab),
(process_keyboard_resize_grab), (handle_begin_move),
(handle_begin_resize):
The keyboard move and resize grab ops now also use the mouse.
* src/window.c: (meta_window_client_message), (menu_callback),
(update_move), (update_resize),
(meta_window_handle_mouse_grab_op_event), (warp_pointer),
(meta_window_warp_pointer), (meta_window_begin_grab_op),
(meta_window_update_resize_grab_op):
When moving or resizing a window use the last grab position
in computing change increment.
Provide support for warping the mouse pointer.
* src/window.h: new warp pointer and grab op helper functions
2002-08-09 00:27:23 -04:00
|
|
|
META_CURSOR_NW_RESIZE,
|
2006-05-22 12:12:28 -04:00
|
|
|
META_CURSOR_MOVE_OR_RESIZE_WINDOW,
|
2002-10-25 19:35:50 -04:00
|
|
|
META_CURSOR_BUSY
|
2001-07-25 23:14:45 -04:00
|
|
|
|
|
|
|
|
} MetaCursor;
|
|
|
|
|
|
2001-12-09 17:41:12 -05:00
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
META_FOCUS_MODE_CLICK,
|
|
|
|
|
META_FOCUS_MODE_SLOPPY,
|
|
|
|
|
META_FOCUS_MODE_MOUSE
|
|
|
|
|
} MetaFocusMode;
|
|
|
|
|
|
2006-04-12 14:01:20 -04:00
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
META_FOCUS_NEW_WINDOWS_SMART,
|
|
|
|
|
META_FOCUS_NEW_WINDOWS_STRICT
|
|
|
|
|
} MetaFocusNewWindows;
|
|
|
|
|
|
2002-10-18 17:22:27 -04:00
|
|
|
typedef enum
|
|
|
|
|
{
|
2007-02-17 16:34:00 -05:00
|
|
|
META_ACTION_TITLEBAR_TOGGLE_SHADE,
|
|
|
|
|
META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE,
|
2008-03-02 20:58:54 -05:00
|
|
|
META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_HORIZONTALLY,
|
|
|
|
|
META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE_VERTICALLY,
|
2007-02-17 16:34:00 -05:00
|
|
|
META_ACTION_TITLEBAR_MINIMIZE,
|
|
|
|
|
META_ACTION_TITLEBAR_NONE,
|
|
|
|
|
META_ACTION_TITLEBAR_LOWER,
|
|
|
|
|
META_ACTION_TITLEBAR_MENU,
|
|
|
|
|
META_ACTION_TITLEBAR_LAST
|
|
|
|
|
} MetaActionTitlebar;
|
2002-10-18 17:22:27 -04:00
|
|
|
|
2002-01-19 18:59:11 -05:00
|
|
|
typedef enum
|
|
|
|
|
{
|
2002-01-27 03:21:53 -05:00
|
|
|
META_FRAME_TYPE_NORMAL,
|
|
|
|
|
META_FRAME_TYPE_DIALOG,
|
|
|
|
|
META_FRAME_TYPE_MODAL_DIALOG,
|
|
|
|
|
META_FRAME_TYPE_UTILITY,
|
|
|
|
|
META_FRAME_TYPE_MENU,
|
2002-06-21 23:23:02 -04:00
|
|
|
META_FRAME_TYPE_BORDER,
|
2002-01-27 03:21:53 -05:00
|
|
|
META_FRAME_TYPE_LAST
|
|
|
|
|
} MetaFrameType;
|
2002-01-19 18:59:11 -05:00
|
|
|
|
2002-07-13 23:16:41 -04:00
|
|
|
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;
|
|
|
|
|
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 09:58:50 -05:00
|
|
|
/* 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
|
|
|
|
|
{
|
Patch from Carlo Wood to fix handling of unidirectional maximization and
2007-04-02 Elijah Newren <newren gmail com>
Patch from Carlo Wood to fix handling of unidirectional
maximization and partial struts. #358311.
* src/constraints.c (constrain_maximization):
determine target size for unidirectionally maximized windows by
determining how far they can be maximized without hitting
orthogonal struts. Avoids weird "empty spaces".
* src/boxes.[ch] (meta_rectangle_expand_to_avoiding_struts):
new function
2007-04-02 Elijah Newren <newren gmail com>
Make the strut lists (stored in workspaces) record both the
rectangle and the side that the strut is on. Lots of code
cleanups relating to struts.
* src/boxes.h (struct MetaStrut):
new struct for struts
* src/window.[ch] (struct MetaStruts, struct MetaWindow,
meta_window_update_struts):
overhaul to make window's struts remember their side as well as
their rectangular location, and just use a list instead of several
copies of near-identical code for left/right/top/bottom (allowing
us to nuke MetaStruts struct as well)
* src/testboxes.c (new_meta_strut, get_strut_list):
* src/workspace.c (ensure_work_areas_validated):
* src/boxes.c (meta_rectangle_get_minimal_spanning_set_for_region,
meta_rectangle_expand_to_avoiding_struts,
get_disjoint_strut_rect_list_in_region, fix_up_edges,
meta_rectangle_find_onscreen_edges,
meta_rectangle_find_nonintersected_xinerama_edges):
modify to handle struts being rectangle + side instead of just rectangle
* src/workspace.c (ensure_work_areas_validated):
simplify strut list creation considerably given MetaWindow change,
modify work_area computations to take advantage of region
computations being done (makes the code shorter as well as more
robust against pathological cases).
* src/util.[ch] (meta_free_gslist_and_elements):
new convenience function
* src/common.h (enum MetaDirection):
* src/edge-resistance.c (movement_towards_edge):
* src/boxes.c (meta_rectangle_edge_aligns,
rectangle_and_edge_intersection, split_edge):
Add more MetaDirection fields for convenience
* src/boxes.h (enum FixedDirections):
* src/constraints.c (setup_constraint_info, place_window_if_needed):
add a FIXED_DIRECTION_NONE to the FixedDirections enum to make
code more clear
svn path=/trunk/; revision=3144
2007-04-02 23:41:10 -04:00
|
|
|
META_DIRECTION_LEFT = 1 << 0,
|
|
|
|
|
META_DIRECTION_RIGHT = 1 << 1,
|
|
|
|
|
META_DIRECTION_TOP = 1 << 2,
|
|
|
|
|
META_DIRECTION_BOTTOM = 1 << 3,
|
|
|
|
|
|
|
|
|
|
/* Some aliases for making code more readable for various circumstances. */
|
|
|
|
|
META_DIRECTION_UP = META_DIRECTION_TOP,
|
|
|
|
|
META_DIRECTION_DOWN = META_DIRECTION_BOTTOM,
|
|
|
|
|
|
|
|
|
|
/* A few more definitions using aliases */
|
|
|
|
|
META_DIRECTION_HORIZONTAL = META_DIRECTION_LEFT | META_DIRECTION_RIGHT,
|
|
|
|
|
META_DIRECTION_VERTICAL = META_DIRECTION_UP | META_DIRECTION_DOWN,
|
|
|
|
|
|
|
|
|
|
/* And a few more aliases */
|
|
|
|
|
META_SIDE_LEFT = META_DIRECTION_LEFT,
|
|
|
|
|
META_SIDE_RIGHT = META_DIRECTION_RIGHT,
|
|
|
|
|
META_SIDE_TOP = META_DIRECTION_TOP,
|
|
|
|
|
META_SIDE_BOTTOM = META_DIRECTION_BOTTOM
|
Merge of all the changes on the constraints_experiments branch. This is
2005-11-18 Elijah Newren <newren@gmail.com>
Merge of all the changes on the constraints_experiments branch.
This is just a summary, to get the full ChangeLog of those
changes (approx. 2000 lines):
cvs -q -z3 update -Pd -r constraints_experiments
cvs -q -z3 diff -pu -r CONSTRAINTS_EXPERIMENTS_BRANCHPOINT ChangeLog
Bugs fixed:
unfiled - constraints.c is overly complicated[1]
unfiled - constraints.c is not robust when all constraints
cannot simultaneously be met (constraints need to be
prioritized)
unfiled - keep-titlebar-onscreen constraint is decoration
unaware (since get_outermost_onscreen_positions()
forgets to include decorations)
unfiled - keyboard snap-moving and snap-resizing snap to hidden
edges
109553 - gravity w/ simultaneous move & resize doesn't work
113601 - maximize vertical and horizontal should toggle and be
constrained
122196 - windows show up under vertical panels
122670 - jerky/random resizing of window via keyboard[2]
124582 - keyboard and mouse snap-resizing and snap-moving
erroneously moves the window multidimensionally
136307 - don't allow apps to resize themselves off the screen
(*cough* filechooser *cough*)
142016, 143784 - windows should not span multiple xineramas
unless placed there by the user
143145 - clamp new windows to screensize and force them
onscreen, if they'll fit
144126 - Handle pathological strut lists sanely[3]
149867 - fixed aspect ratio windows are difficult to resize[4]
152898 - make screen edges consistent; allow easy slamming of
windows into the left, right, and bottom edges of the
screen too.
154706 - bouncing weirdness at screen edge with keyboard moving
or resizing
156699 - avoid struts when placing windows, if possible (nasty
a11y blocker)
302456 - dragging offscreen too restrictive
304857 - wireframe moving off the top of the screen is misleading
308521 - make uni-directional resizing easier with
alt-middle-drag and prevent the occasional super
annoying resize-the-wrong-side(s) behavior
312007 - snap-resize moves windows with a minimum size
constraint
312104 - resizing the top of a window can cause the bottom to
grow
319351 - don't instantly snap on mouse-move-snapping, remove
braindeadedness of having order of releasing shift and
releasing button press matter so much
[1] fixed in my opinion, anyway.
[2] Actually, it's not totally fixed--it's just annoying
instead of almost completely unusable. Matthias had a
suggestion that may fix the remainder of the problems (see
http://tinyurl.com/bwzuu).
[3] This bug was originally about not-quite-so-pathological
cases but was left open for the worse cases. The code from
the branch handles the remainder of the cases mentioned in
this bug.
[4] Actually, although it's far better there's still some minor
issues left: a slight drift that's only noticeable after
lots of resizing, and potential problems with partially
onscreen constraints due to not clearing any
fixed_directions flags (aspect ratio windows get resized in
both directions and thus aren't fixed in one of them)
New feature:
81704 - edge resistance for user move and resize operations;
in particular 3 different kinds of resistance are
implemented:
Pixel-Distance: window movement is resisted when it
aligns with an edge unless the movement is greater than
a threshold number of pixels
Timeout: window movement past an edge is prevented until
a certain amount of time has elapsed during the
operation since the first request to move it past that
edge
Keyboard-Buildup: when moving or resizing with the
keyboard, once a window is aligned with a certain edge
it cannot move past until the correct direction has
been pressed enough times (e.g. 2 or 3 times)
Major changes:
- constraints.c has been rewritten; very few lines of code from
the old version remain. There is a comment near the top of
the function explaining the basics of how the new framework
works. A more detailed explanation can be found in
doc/how-constraints-works.txt
- edge-resistance.[ch] are new files implementing edge-resistance.
- boxes.[ch] are new files containing low-level error-prone
functions used heavily in constraints.c and edge-resistance.c,
among various places throughout the code. testboxes.c
contains a thorough testsuite for the boxes.[ch] functions
compiled into a program, testboxes.
- meta_window_move_resize_internal() *must* be told the gravity
of the associated operation (if it's just a move operation,
the gravity will be ignored, but for resize and move+resize
the correct value is needed)
- the craziness of different values that
meta_window_move_resize_internal() accepts has been documented
in a large comment at the beginning of the function. It may
be possible to clean this up some, but until then things will
remain as they were before--caller beware.
- screen and xinerama usable areas (i.e. places not covered by
e.g. panels) are cached in the workspace now, as are the
screen and xinerama edges. These get updated with the
workarea in src/workspace.c:ensure_work_areas_validated()
2005-11-19 09:58:50 -05:00
|
|
|
} MetaDirection;
|
2002-10-03 22:28:57 -04:00
|
|
|
|
|
|
|
|
/* 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,
|
Added "above" to the list of flags a frame can have, so that we know when
* 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)
2006-10-07 12:56:47 -04:00
|
|
|
META_BUTTON_FUNCTION_SHADE,
|
|
|
|
|
META_BUTTON_FUNCTION_ABOVE,
|
|
|
|
|
META_BUTTON_FUNCTION_STICK,
|
|
|
|
|
META_BUTTON_FUNCTION_UNSHADE,
|
|
|
|
|
META_BUTTON_FUNCTION_UNABOVE,
|
|
|
|
|
META_BUTTON_FUNCTION_UNSTICK,
|
2002-10-03 22:28:57 -04:00
|
|
|
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];
|
2008-02-29 15:41:07 -05:00
|
|
|
gboolean left_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];
|
|
|
|
|
|
2002-10-03 22:28:57 -04:00
|
|
|
/* buttons in the group on the right side */
|
|
|
|
|
MetaButtonFunction right_buttons[MAX_BUTTONS_PER_CORNER];
|
2008-02-29 15:41:07 -05:00
|
|
|
gboolean right_buttons_has_spacer[MAX_BUTTONS_PER_CORNER];
|
2002-10-03 22:28:57 -04:00
|
|
|
};
|
|
|
|
|
|
2001-09-17 00:42:37 -04:00
|
|
|
/* 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
|
|
|
|
|
|
2008-08-14 10:01:51 -04:00
|
|
|
#define META_DEFAULT_ICON_NAME "window"
|
|
|
|
|
|
on unminimize, queue calc_showing on all transients
2002-05-05 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_unminimize): on unminimize, queue
calc_showing on all transients
(meta_window_activate): on activate, unminimize all a window's
ancestors, not just the window itself.
* src/workspace.c (set_work_area_hint): don't increment "tmp" by
16 unsigned long, increment by 4
* src/window.c (meta_window_free): if a window isn't minimized,
restore its WM_STATE to NormalState instead of IconicState,
since IconicState on initial window map means that the window
should be minimized.
* src/workspace.c (meta_workspace_invalidate_work_area): queue an
idle to recompute the work area hint.
(set_work_area_hint): we need 4*num_workspaces ints, not just
num_workspaces.
* src/screen.c (meta_screen_new): add work_area_idle field,
handle it on screen shutdown
* src/common.h (META_PRIORITY_PREFS_NOTIFY,
META_PRIORITY_WORK_AREA_HINT): define some idle priorities
* src/window.c (meta_window_calc_showing): hide windows if
their parent window is minimized
(meta_window_minimize): also queue_calc_showing on all
transients of the window being minimized
* src/place.c (constrain_placement): function to apply
placement-time-only constraints, such as "not off the left of the
screen"
(meta_window_place): put dialogs down a bit over their parent,
not right at the top.
(meta_window_place): when centering a dialog, center it
on the current xinerama screen, rather than the entire
screen.
* src/screen.c (meta_screen_get_current_xinerama): new function,
but not implemented
2002-05-05 01:41:13 -04:00
|
|
|
#define META_PRIORITY_PREFS_NOTIFY (G_PRIORITY_DEFAULT_IDLE + 10)
|
|
|
|
|
#define META_PRIORITY_WORK_AREA_HINT (G_PRIORITY_DEFAULT_IDLE + 15)
|
|
|
|
|
|
2002-05-28 23:11:24 -04:00
|
|
|
#define POINT_IN_RECT(xcoord, ycoord, rect) \
|
|
|
|
|
((xcoord) >= (rect).x && \
|
|
|
|
|
(xcoord) < ((rect).x + (rect).width) && \
|
|
|
|
|
(ycoord) >= (rect).y && \
|
|
|
|
|
(ycoord) < ((rect).y + (rect).height))
|
|
|
|
|
|
2001-06-17 23:24:25 -04:00
|
|
|
#endif
|