From: Mikael Magnusson Date: Thu, 28 Feb 2008 04:19:35 +0000 (+0100) Subject: dummy child of all mikabox branches at 3.4.7 X-Git-Tag: mikabox-3.4.7 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e431d0c3add479182a6a83180bd088a8a873a7d7;p=mikachu%2Fopenbox.git dummy child of all mikabox branches at 3.4.7 --- 75c80627df6946cc13c803447f2891624a90a5bc diff --cc .gitignore index 3f68a411,3f68a411,3f68a411,3f68a411..00000000 deleted file mode 100644,100644,100644,100644 --- a/.gitignore +++ /dev/null @@@@@ -1,93 -1,93 -1,93 -1,93 +1,0 @@@@@ ----TAGS ----ABOUT-NLS ----Makefile ----Makefile.in ----aclocal.m4 ----autom4te.cache ----compile ----config.guess ----config.log ----config.rpath ----config.status ----config.sub ----configure ----data/xsession/openbox-gnome-session ----data/xsession/openbox-gnome.desktop ----data/xsession/openbox-kde-session ----data/xsession/openbox-kde.desktop ----data/xsession/openbox-session ----data/xsession/openbox.desktop ----depcomp ----doc/openbox-gnome-session.1 ----doc/openbox-kde-session.1 ----doc/openbox-session.1 ----doc/openbox.1 ----libtool ----ltmain.sh ----m4/*.m4 ----*.o ----*.orig ----*.lo ----*.la ----missing ----.dirstamp ----openbox/openbox ----parser/obparser-4.0.pc ----po/Makefile.in.in ----po/Makevars.template ----po/POTFILES ----po/Rules-quot ----po/boldquot.sed ----po/en@boldquot.header ----po/en@quot.header ----po/insert-header.sin ----po/quot.sed ----po/remove-potcdate.sin ----po/stamp-po ----po/en@boldquot.insert-header ----po/en@quot.insert-header ----po/remove-potcdate.sed ----*.gmo ----render/obrender-4.0.pc ----obt/obt-4.0.pc ----tools/gnome-panel-control/gnome-panel-control ----version.h ----.libs ----.deps ----tests/aspect ----tests/big ----tests/borderchange ----tests/confignotify ----tests/confignotifymax ----tests/duplicatesession ----tests/extentsrequest ----tests/fakeunmap ----tests/fallback ----tests/focusout ----tests/fullscreen ----tests/grav ----tests/groupmodal ----tests/grouptran ----tests/grouptran2 ----tests/grouptrancircular ----tests/grouptrancircular2 ----tests/icons ----tests/mapiconic ----tests/modal ----tests/modal2 ----tests/modal3 ----tests/noresize ----tests/override ----tests/positioned ----tests/resize ----tests/restack ----tests/shape ----tests/showhide ----tests/skiptaskbar ----tests/skiptaskbar2 ----tests/stacking ----tests/strut ----tests/title ----tests/urgent ----tests/usertimewin ----data/autostart.sh diff --cc AUTHORS index b00cb387,b00cb387,b00cb387,b00cb387..00000000 deleted file mode 100644,100644,100644,100644 --- a/AUTHORS +++ /dev/null @@@@@ -1,24 -1,24 -1,24 -1,24 +1,0 @@@@@ ----Openbox authors/contributors: ---- ----Mikael Magnusson (mikachu@comhem.se) ---- - Developer ----Dana Jansens (danakj@orodu.net) ---- - Lead developer ----Derek Foreman (manmower@openbox.org) ---- - Rendering code ----Tore Anderson (tore@linpro.no) ---- - Directional focus, edge moving/growing actions ----Audun Hove (audun@nlc.no) ---- - Actions code, move window to edge actions ----Marius Nita (marius@cs.pdx.edu) ---- - Otk prototype code, design ideas. ----John McKnight (jmcknight@gmail.com) ---- - Clearlooks themes ----David Barr (david@chalkskeletons.com) ---- - Bear2 theme ---- - Clearlooks theme ---- - Icon ----Brandon Cash ---- - SplitVertical gradient style ----Dan Rise ---- - Natura theme diff --cc CHANGELOG index fd68f09b,fd68f09b,fd68f09b,fd68f09b..00000000 deleted file mode 100644,100644,100644,100644 --- a/CHANGELOG +++ /dev/null @@@@@ -1,874 -1,874 -1,874 -1,874 +1,0 @@@@@ ----3.4.4: ---- * Updated Traditional Chinese translation ---- * Updated Norwegian translation ---- * Fix for MoveToEdge skipping edges sometimes ---- * Let you specify the vertical and horizontal padding independently in themes ---- * Fix so that if you select an omnipresent window on another desktop in the ---- client list menus, it will go to that desktop ---- * Make the GrowToEdge action shrink once there is no more room to grow, ---- similar to in 3.4.2, but shrinking to edges as well ---- * Move the Send To and Layers submenus to the top of the client menu ---- * Fix race causing omnipresent windows to lose focus when switching desktops ---- very quickly ---- * Don't focus new windows on other desktops if they aren't related to the ---- currently focused window ---- * Add corner resizing areas in the inner client border (Fixes themes such ---- as Onyx) ---- * New focus stealing prevention that is smart and not intrusive and not ---- annoying ---- * Revert a small change in 3.4.3 that caused windows to be placed funny in ---- Smart placement when there was a dock or something on the side of the ---- screen ---- * Show a notification when switching desktops ---- * Fix for delayed focus-follows-mouse interrupting move/resize or menus ---- * Make screen edge warp keep warping without having the move the mouse 1 ---- pixel ---- * Fix for resizing terminals in the top/left sides getting a little confused ---- * Fix to keep oldschool (Non-EWMH) fullscreen windows from being moved and ---- resized inside of the struts (Fixes Acroread) ---- * Accept the option for the Restart command, similar to the Execute ---- action ---- * Don't make clicking on dock apps sometimes act like clicking on the root ---- window (Don't propogate button events up) ---- * Fix a bug introduced in 3.4.3 which caused the Windows key as a modifier ---- for bindings to not work properly ---- * Let windows skip across monitors in a Xinerama setup when using MoveToEdge ---- or Shift-arrow in an interactive move ---- * Make move and resize take the dock into account for resistance ---- * Raise new windows when it makes sense, when they aren't being focused ---- * Change default config to use click events for mouse wheel bindings instead ---- of presses ---- ----3.4.3: ---- * Add Ukrainian translation ---- * Updated translations: ---- - Japanese, Dutch, Polish, Italian, Estonian, German, Portuguese, ---- Vietnamese, Finnish, Czech, Arabic, Spanish, Swedish, French ---- * Improve focus fallback - don't fallback to windows you can't focus cycle ---- (Alt-Tab) to ---- * Don't show the client border for undecorated windows when keepBorder is on, ---- just the outer border ---- * Some improvements in the smart placement to help it find a place more ---- often. This needs more work still. ---- * Don't focus windows that appear under the mouse in mouse-focus mode unless ---- underMouse is enabled ---- * Don't move focus when the window under the pointer iconifies unless ---- underMouse is enabled ---- * Respect min/max window sizes when a window is fullscreened or maximized. ---- This fixes problems experienced with maximizing vnc windows ---- * Don't XUngrabKeyboard unless we need to ---- * Correct calculations for the menu header width, so that they are not ---- ellisized unnecessarily ---- * Advanced support for partial struts. When you maximize a window it will ---- now only use the struts it needs to. This can greatly improve ---- xinerama functionality. ---- * Fixes for how the dock is placed in certain positions on screen (off by 1 ---- errors) ---- * New default bindings: ---- - don't unshade when clicking on the titlebar ---- - raise when unshading with the scrollwheel ---- - lower when shading with the scrollwheel ---- * Don't show the top resize area in the titlebar when a window is shaded ---- * Optimize rendering of window decorations ---- * Optimize splitvertical gradients - no more malloc/free during render ---- * Let the theme specify all colors for a splitvertical gradient with the new ---- .splitTo theme elements ---- * Improve decorations for maximized windows. Don't draw the side borders in ---- the titlebar. ---- * Don't resist against desklet windows (below layer + skip taskbar) ---- * New actions for dynamically adjusting your desktop workspaces: ---- - AddDesktopLast, RemoveDesktopLast ---- - AddDesktopCurrent, RemoveDestopCurrent ---- * New
option for smart placement (default is on) ---- * Fix MoveToCenter in Xinerama (TwinView) setups ---- * Let you lower a window without lowering its children or siblings ---- * Don't set the default Openbox icon on child windows, let them inherit the ---- icon from their parents ---- * Fix Onyx themes - fade out disabled buttons ---- * Don't auto-resize windows to fit on screen if they are UserSpecified ---- Size or Position ---- * Don't activate windows which raise themselves anymore. It was a nice ---- thought, but it caused too much problems ---- * Rewrite of the actions subsystem ---- * Removed deprecated actions: ---- - ShowDesktop, UnshowDesktop (Use ToggleShowDesktop) ---- - ResizeRelativeVert, ResizeRelativeHorz (Use ResizeRelative) ---- * Combined the MoveFromEdge* actions with MoveToEdge* actions, and removed ---- the MoveFromEdge* action names. ---- * Switch desktops when moving a window and you drag it to the edge of the ---- screen (added the option for this) ---- * Add actions to add/remove the last desktop in the client list menus ---- * Use startup notification when launching ObConf in the default root menu ---- * Remove the desktop switching dialog, as it confuses people and they don't ---- know how to turn it off to switch desktops instantly. Some other ---- incarnation may return in the future. ---- * Add optional option for NextWindow, PreviousWindow, ---- DirectionalFocus*, and DirectionalTarget* actions ---- * Don't focus new helper windows unless they are alone in their group. This ---- fixes gucharmap ---- * Fancy keyboard window moving: ---- - Shift-arrow will move the window to the next edge ---- - Control-arrow will move the window by only 1 pixel ---- - Arrow will move the window by a larger number of pixels ---- * Fancy keyboard window resizing: ---- - The first arrow will choose an edge to resize (then you can grow or ---- shrink the window on that edge) ---- - Hitting an arrow perpendicular to your selected edge will choose a ---- different edge to resize ---- - Shift-arrow will grow/shrink the window to the next edge ---- - Control arrow will grow/shrink the window by only 1 pixel ---- - Arrow will grow/shrink the window by a larger number of pixel ---- * Timeout when synchronously resizing a window so you can still resize busy ---- or dead application windows ---- * Let you specify keyboard shortcuts in your root menus with _. Such as ---- label="XTe_rm" would make 'r' the shortcut key. ---- * Fixes for placing windows with per-app settings: ---- - you can now place windows relative to any edge of the screen instead of ---- only the top left. (-0 uses the far edge, +0 uses the near edge. You can ---- use --0 and +-0 to specify negative numbers.) ---- - fix bug with windows being placed far off-screen occasionally ---- - allow you to place windows partially outside of the screen ---- - let per-app settings override program-specified positions (but not if it ---- is user-specified) ---- * Add user-specified margins to the configuration file ---- * Fix for transient windows in groups with transient windows of the group ---- transients. That wasn't supposed to be legible. i.e. 2 group transients ---- and 1 direct transient for one of the group transients. ---- * Don't include child/parent windows in tests for being occluded or occluding ---- other windows, since you can't raise/lower above/below them. This fixes ---- the raiselower action for windows which have children. ---- * Reduce the size of the middle gradient in splitvertical gradients. This ---- makes the split harder than it was in 3.4.2 ---- * Don't include debian/ dir in releases ---- * Add resize bindings for the edges to the default hardcoded bindings ---- * Fix focus cycle indicator positioning for some windows (i.e. OpenOffice) ---- * Add the MoveResizeTo action. This is very xinerama aware! It also lets ---- you move a window to any edge of any screen. ---- * Make actions that look for edges include the dock's edges (e.g. MoveToEdge) ---- * New preferred option for the Execute action is instead of ---- but the old one will still work. ---- * Fix for moving windows partially offsceen causing them to jump far away ---- * Fix for windows which are not on any monitor, to keep them on screen ---- partically too ---- * Require libstartupnotification 0.8 in configure (we use stuff that was not ---- around in some earlier versions) ---- * Grab the server when mapping windows to avoid race conditions in other ---- programs (getting MapNotify before you are visible) ---- * Handle case gracefully when ConfigureRequent for restacking specifies ---- a siblig which we aren't managing ---- * Use KeyRelease to run things from Openbox menus, so that the release ---- does not go to the focused window (causing the new window to not get ---- focus) ---- * Add new actions for controlling window decorations: ---- - Decorate, Undecorate ---- * Fix so that the values for per-app settings are not case sensitive ---- * Fix crash with very small windows ---- * Fix resize resistance for windows with aspect ratio limits ---- * Let you resize windows with aspect ratio limits in the vertical directions ---- ----3.4.2: ---- * Add ability to set the bevel strength in themes ---- * Fix for focusLast with omnipresent windows ---- * Cache pipe menus while the menus are open ---- * Allow non-interactive directional focus key bindings ---- * Change how nested interactive key bindings work (it stays in the key chain, ---- like chroot, until you end the interactive action) ---- * Fix for gtk apps trying to get focus - mostly nullify focus stealing ---- prevention (Fixes Tilda) ---- * Send ConfigureNotify always on ConfigureRequest (Previous emacs fix ---- makes this possible now) ---- * Fix RelativeResize action for right/bottom edges ---- * Remove SCIM from the default autostart.sh - it has caused problems with ---- some (buggy) panels, such as pypanel ---- * Fix the titlebar changing to non-focused when iconifying a window with ---- animation ---- * Use the new osd theme hints for the dock, rather than the titlebar hints ---- * Fix rare crash when menu is hidden while browsing it ---- * End move/resize more cleanly when focus moves during a move/resize ---- * Don't focus new windows when browsing a menu or moving/resizing a window, ---- just flash the window instead, so that the menu/move/resize doesn't have to ---- cancel. ---- ----3.4.1: ---- * Add Vietnamese translation ---- * Add Japanese translation ---- * Keep new transient windows from not getting focus when any related window ---- has focus already ---- * Change behavior of underMouse option - make focus go under the mouse when ---- no window has focus anymore, rather than to the last used window ---- * Make on-screen display dialogs (such as the Alt-Tab dialog) appear on the ---- active monitor when using Xinerama (a.k.a. TwinView) ---- * Fix for window stacking - let you lower sibling transient windows behind ---- eachother ---- * Fix directional focus actions when used without a dialog ---- * Fix race that could prevent ObConf from setting the desktop names correctly ---- * Add new theme options: ---- - window.active.button.toggled.image.color has been split into: ---- - window.active.button.toggled.unpressed.image.color ---- - window.active.button.toggled.pressed.image.color ---- - window.active.button.toggled.hover.image.color ---- - window.inactive.button.toggled.image.color has been split into: ---- - window.inactive.button.toggled.unpressed.image.color ---- - window.inactive.button.toggled.pressed.image.color ---- - window.inactive.button.toggled.hover.image.color ---- - window.active.button.toggled.bg has been split into: ---- - window.active.button.toggled.unpressed.bg ---- - window.active.button.toggled.pressed.bg ---- - window.active.button.toggled.hover.bg ---- - window.inactive.button.toggled.bg has been split into: ---- - window.inactive.button.toggled.unpressed.bg ---- - window.inactive.button.toggled.pressed.bg ---- - window.inactive.button.toggled.hover.bg ---- * Add new Onyx and Onyx-Citrus themes ---- * Updated Mikachu theme using new theme options ---- * Improvements to splitvertical gradients - Add a small gradient in the ---- middle between the upper and lower gradients ---- * Fix another emacs event storm, don't configure the window when it sets its ---- WM_NORMAL_HINTS unless we have to ---- * Fix for focus cycling to helper windows - Don't count dialogs as a sibling, ---- so they don't stop you ---- * Allow the use of negative numbers in per-app settings position to place a ---- window relative to the right/bottom edges of your monitor (taking the ---- struts (panels) into account) ---- * Fix focus moving irrationally when focusLast was off ---- ----3.4: ---- * Add Indian Bengali translation ---- * Updated Italian translation ---- * Small updates to Czech, Estonian, Norwegian, and German translations ---- * Removed out-of-date Japanese translation (ja.po) ---- * Removed out-of-date Croatian translation (hr.po) ---- * Allow parentrelative theme textures to have borders, bevels and interlacing ---- * Add new theme elements: window.active.title.separator.color and ---- window.inactive.title.separator.color (note that globbing might set these ---- properties when you didnt mean to) ---- * Add new theme elements: osd.border.width, osd.border.color, osd.bg, ---- osd.label.bg, osd.label.text.color, osd.label.text.font, osd.hilight.bg, ---- osd.unhilight.bg ---- * Add new underMouse focus option ---- * Rename new theme element menu.items.activedisabled to ---- menu.items.active.disabled for consistency with other elements ---- * Improvements to smart placement - especially with xinerama (Twinview) ---- * Fixes for focus with omnipresent windows - Allow focus to fallback to them ---- except during desktop switches (other mechanisms exist for that) ---- * Fix for putting child windows (transients) on all desktops ---- * Changes to how Shift/Control/CapsLock are used ---- * Fix focus fallback when windows are not visible (showing the desktop, or ---- iconic windows) ---- * Fix bug #3196 - Unable to alt-tab away from full-screen windows ---- * Fix crash in parsing empty xml fields ---- * Fix left and right contexts resizing the wrong way in the example mouse ---- focus config file ---- * Fix so dock doesn't auto-hide when the mouse is inside it (over top of a ---- dock app) ---- * Allow new utility windows to gain focus like normal windows ---- * Add workarounds for Java Swing applications (Extra ConfigureNotify events) ---- * More fixes for modal window usability (Deiconify the modal window when you ---- try to focus its parent) ---- * Fixes to focus tracking, especially with iconify animation ---- * Changes to libobrender's API for ObConf 2.0 (RrThemeNew) ---- * Check for libxml >= 2.6.0 when compiling ---- * Fix for Openoffice windows (Static window gravity) ---- * Fix for hovering over window buttons while a menu is open ---- * Make the Escape key close all levels of a menu, not just one ---- * Change default drag threshold to 8px (Same as in XSettings) ---- * Fixes for windows restacking with TopIf, BottomIf, or Opposite modes. ---- Only compare with valid windows ---- * Fix for actions which find other window edges. Find all windows, and only ---- windows which are on the right desktop ---- * Improve RaiseLower action (Not lower when it doesn't need to move the ---- window) ---- * Fix for the menu hideDelay (Don't hide immediately when you click to open ---- the menu), make it work reliably ---- * Make focusLast default to true when not present in the config file ---- ----3.3.995: ---- * Fix bug introduced in 3.3.993 that prevented you from raising focused ---- windows above fullscreen windows ---- * Fix bug introduced in 3.3.993 that made the desktop window keep focus ---- when changing desktops ---- * Add Arabic translations ---- * Added Control-Alt-Up/Down bindings to the mouse focus example rc.xml ---- * Don't raise on clients in the client context in the mouse focus example ---- rc.xml ---- * Fixes for when to focus new windows - improve keeping transient windows ---- from stealing focus, and allow new windows to get focus when any relative ---- window is focused ---- * Fixes for frame decorations layout ---- * Fixes for forcing window sizes to fit on the screen. Don't resize windows ---- if they are a user-specified size (USSize) or if they are non-normal ---- windows. (Fix Rox pinboard mapping across multiple monitors) ---- * Centre window icons when they are not square ---- * Fixes for Java windows behaving badly - Java makes all kinds of ---- non-standard-compliant assumptions which we are forced to meet ---- * Changed startup notification timeout from 30 to 20 seconds ---- * Fix possible crashes and misbehaviors with new focus cycling dialogs ---- * Recreate enter events when Press mouse actions move windows (e.g. Lower ---- action) for focus-follows-mouse ---- * Update Slovak translation ---- * Highlight the first menu entry when there is a separator/header at the top ---- * Only highlight the first menu entry when the menu is opened with a key ---- binding ---- * Fix crash when you press enter with nothing selected in the menu ---- * Fix for ignoring an unmap event after restart ---- * Fixes for setting the clients' colormaps ---- * Change focusLast option behavior to what it was in 3.3.1. It only affects ---- changing desktops. ---- * Add comments to the default rc.xml files about the various focus options ---- * Fix focus bug where a window had the keyboard grabbed when it unmapped ---- (Firefox gmarks extension) ---- * Update Catalan translation ---- * Fix alignment of the titlebar elements when the window icon is placed to ---- the right of the label ---- * Improve placement of child (transient) windows. When their parent is ---- omnipresent, open the child on the current desktop only. ---- * When a window has modal children on another desktop and you try to focus ---- it, bring the modal child to the current desktop to focus it instead ---- * Let you focus cycle to windows with a modal child on another desktop ---- * Fix for not seeing windows change their partial strut ---- * Give iconified windows a faded icon in the focus cycling (Alt-Tab) dialog, ---- and in the client list menus ---- * Make it more difficult to select items by accident in parent menus when it ---- changes direction. Moving the mouse only selects menu entries for a few ---- levels of open menus. Mouse clicks will select menu entries further down. ---- * Add Simplified Chinese translation ---- * Set the current theme in the OB_THEME root property for other applications ---- * Notify ksplash when we have started up if dcop is installed ---- * Allow you to resize the window on the client padding as well as the outer ---- border ---- * Fix to show the focus cycle indicator when focus cycling and there is only ---- 1 valid target ---- * Centre splash screens on one monitor ---- * Don't centre parent-less utility/menu/toolbar windows on the screen ---- * Remove the bottom decorations for fully maximized windows ---- * Fix crash when reconfiguring and no themes can be found ---- ----3.3.994: ---- * Fix a bug introduced in .993 that prevented you from switching desktops ---- and caused general mayhem ---- ----3.3.993: ---- * Update for Russian translation ---- * Added Dutch translation ---- * Fix for choosing badly sized icons from the window for the window cycling ---- dialog (and other things). (Fixes Pidgin icon) ---- * Open child (transient) windows on the current desktop if they don't have ---- a direct parent, or if the parents are not all on some other desktop. ---- (Fixes Pidgin and Gimp dialogs appearing on the wrong desktop) ---- * Make windows fit within the available space when they are first created, ---- if they are not user-positioned. (Fix xpdf making itself bigger than the ---- space inside the struts, and hiding behind them). ---- * Don't let child (transient) windows steal focus when the situation is ---- ambiguous ---- * Fix bevels and borders display in the titlebar ---- * Set the _NET_ACTIVE_WINDOW hint properly, when nothing is focused (This ---- is the proper fix for libwnck pagers.) ---- * Fallback focus immediately during iconify animation in all cases (was ---- missing RevertToParent case) ---- * Fix new frame elements being given 0 sizes for very small windows ---- * Send iconified windows to the bottom of the focus order so you can ---- Alt-Shift-Tab to get back what you just iconified. This makes things more ---- predictable. ---- * Show the hostname for remotely run programs in iconified titles ---- * Stop focus flicker when sending windows to a desktop and following them, ---- and when changing desktops with an omnipresent window focused ---- * Empty desktop names in the configuration file are not used, so you can set ---- a name on the second desktop without having to set one on the first ---- * Make control key work for menu accelerators like it does for mouse ---- clicking and hitting enter ---- * Add C-A-Up/Down mouse bindings to switch desktops, similar to the ---- C-A-Left/Right/Up/Down keyboard bindings ---- ----3.3.992: ---- * Don't move mouse focus when the mouse is over the focus cycling dialog ---- * Fixes for positioning of frame decoration elements ---- * Update for Brazilian Portuguese translation ---- * Improvements in how decorations respond for maximized windows. (If they ---- can't be resized don't "hide" the resizing contexts) ---- * Updated Italian translation ---- * Added Czech translation ---- * Fix for applications that do weird things with modal windows (Make sure ---- you can focus cycle to them) ---- * Updated Spanish translation ---- * Fix for programs using the old WM-spec, and not setting unused fields to ---- 0 in _NET_ACTIVE_WINDOW messages (Rox pinboard) ---- * Fixes for default rc.xml configuration file. Updated comments and comment ---- out the applications section in an xml compatible way. ---- * Update for Portuguese translation ---- * Fix support for window gravity (eg xterm -geometry -0+0) ---- * Fix for libwnck with iconify animation (Unmap the parent of the client's ---- window) ---- * Force the top left corner of new windows onto the screen area, if the ---- position wasn't requested by the user (Fix xpdf and others hiding their ---- titlebar under a panel) ---- * Fix for determining text geometry from Pango ---- * Save the desktop layout and names in the session, and restore them on next ---- log in. ---- * The <desktop> section from the configuration file is only used for ---- defaults, and so is only applied at the start of a new log-in. (Use ObConf ---- 1.6.2 to change the config file for these options, and have them set ---- immediately, if you don't use a session manager to save them.) ---- * Fix updating and crashing in the old split client list menu ---- * Translate the default desktop names ---- * Update Taiwanese Chinese translation ---- * Less restrictions of behavior based on window type (Let you maximize ---- dialogs and utility windows) ---- * Fix for focus tracking when Press mouse actions are used ---- * Fix bug which let the openbox-*-session scripts take command-line arguments ---- * Better detection of legacy fullscreen windows vs. undercorated windows ---- that the user has maximized ---- ----3.3.991: ---- * Added Brazilian Portuguese translation ---- * Added a rough Italian translation ---- * Added Estonian translation ---- * Update Polish translation ---- * Make focus stealing prevention a little less intrusive, especially with ---- default config ---- * Updates for Swedish translation ---- * Fixes for decorations of maximized windows ---- * Fix so that clicking in the corner of a maximized window presses the button ---- * Don't reload the session and reapply it when restarting ---- * Fix for losing the original size of a window that mapped with maximized ---- state (or on restart) ---- * Let you move splash type windows ---- * Fix for window placement using wrong dimensions ---- * Stop xemacs ConfigureNotify storm ---- * Fix bug stopping panels from moving themselves off-screen to hide ---- themselves ---- * Fix for GNOME/Openbox and openbox-gnome-session to use a new session name, ---- because GNOME won't let you replace the window manager in the saved session ---- * Don't restore session state when multiple windows have the same ---- identifiers, because we can't tell them apart then (Firefox/Thunderbird) ---- * Small fixes to build system to make it more reliable ---- * Fix for what manpage files are distributed in the source code, so they ---- will not be pre-built with the wrong info ---- * Fix pkg-config files for compiling things against Openbox libraries ---- ----3.3.990: ---- * Wildcard matching for per-application (per-window) settings. Let you match ---- multiple rules for a window. (Props to Mark Pustjens for code to do this.) ---- * Added startup notification support to the menus and key/mouse bindings ---- with . It's an option for execute actions. ---- * New combined client menu, accessed with ---- client-list-combined-menu ---- * No menu titles - instead added separators with labels to be used as menu ---- headers anywhere in menus ---- * Improved client menu - placement, the options in it, and added an icon for ---- "All Desktops" ---- * Keyboard shortcuts in menus, by highlighted letter or by the first letter ---- * Menus dont jump around, are always placed on screen ---- * Menus larger than can fit on the screen are broken into a submenu at the ---- bottom titled "More..." ---- * Disabled menu items can be selected now (not used though, of course) ---- * Using ()'s instead of a line separator to signify iconified windows in the ---- client list menus ---- * New Root context for mouse bindings ---- * New "alt-tab" focus switching dialog ---- * openbox-session command and log-in option which provides the autostart ---- capability. ---- * SCIM support in the default Openbox session launched by the ---- openbox-session command ---- * Many code paths made significantly faster ---- * Sections of code rewritten to be more reliable, such as session ---- save/restore and input focus handling ---- * Handle the X server's clock going backwards, without locking up. Sometimes ---- the server can still lock up though, it is not recommended to do this! ---- * Better handling of window types such as docks, utility windows, tool bar ---- windows. Clicking to focus these windows is done more intelligently. Dock ---- windows no longer get focus when you click them, so that you don't have ---- focus flickering when you use a dock window with a taskbar. ---- * Better language support through Pango, which is now mandatory, and the ---- code for Pango has been greatly improved and optimized. ---- * Support for windows that use true 32-bit transparency ---- * Resize grips (with mouse binding contexts) for the top, left, and right of ---- the window frame ---- * Smarter about keeping windows on the screen without invading user's ---- capabilities ---- * Add MoveFromEdge* actions corresponding to MoveToEdge* but aligns far ---- edges instead of near edges, so if you have two overlapping windows you ---- can easily put them side by side. ---- * Better choice of mouse cursors for startup notification ---- * Focus stealing prevention ---- * Improve window placement across multiple Xinerama monitors ---- * Support 8-bit truecolor visuals (such as in vncserver) ---- * Better, more friendly support for omnipresent windows ---- * Full support for EWMH 1.4-draft2 ---- * Iconify/restore animation ! ---- * Improved support for running openbox with multiple screens (non-xinerama) ---- - won't steal focus from other screens, and let you focus a screen by ---- clicking on the desktop (root window). ---- * Support for more cursors through XCursor, means that startup notification ---- can use a pointer+watch cursor if you are using an XCursor theme ---- * Fully maximize terminal windows (and any resized-by-increment window) ---- * Show the hostname of clients running on remote computers in the titlebar ---- * Add and options to NextWindow, PreviousWindow, ---- DirectionalFocusNorth etc.. ---- * Synchronize resizing with the application when possible ---- * Smarter subdivision of windows into 9 sections for resizing ---- * Set default icon on windows so applications can agree on an icon ---- * Better support for programs that are on more than one desktop ---- (multiple firefox windows for example) - move to the desktop when you're ---- using the application and it opens a window on another desktop. ---- * Chrooted key chains, and key quoting through chroots ---- * New BreakChroot action to break out of the current chroot ---- * New keychains popup, to show where you are in a keychain ---- * Improved show-desktop mode. When you open a new window, the old windows ---- are not all restored ---- * Add option to NextWindow and PreviousWindow. The desktop ---- name will be shown in the focus cycling popup ---- * Dynamically size the window and desktop dialogs. Desktop layouts that ---- aren't horizontal look better in the desktop cycling dialog. ---- * Support for legacy fullscreen applications (that don't use EWMH) such as ---- VLC ---- * Session support for old clients that do not use the session management ---- protocol ---- * Desktop setup is only changed on startup, so as to not overwrite settings ---- from other apps like pagers ---- * Take advantage of ksmserver (KDE Session Manager) features ---- * KDE/Openbox and GNOME/Openbox options for display manager GDM/KDM. Use ---- openbox-gnome-session and openbox-kde-session to run a GNOME or KDE ---- session with Openbox as the window manager. ---- * Titlebar buttons autohide when hiding won't move other buttons (removed ---- the hideDisabled option from config file) ---- * Support user time window hint, which is good for laptops power usage ---- * When legacy windows raise themselves, interpreate as wanting to be ---- activated. Makes Firefox more pleasant. ---- * Don't show handles on windows that cant resize for more extreme visual ---- minimalism ---- * Let you move maximized windows between Xinerama monitors ---- * Improve application awareness of focus, e.g. Kopete and Firefox, so they ---- know when they are or aren't focused, and which window in their ---- application is focused ---- * Improvements in the distributed themes ---- * Add new Clearlooks and Clearlooks-Olive themes by John McKnight ---- * Fonts are no longer loaded from theme. They are loaded from the rc.xml ---- config file. Font shadow settings are still loaded from the theme though. ---- 5 fonts to be set: ActiveWindow InactiveWindow, MenuHeader, MenuItem and ---- OnScreenDisplay ---- * Distributed theme names have been renamed with Capitalization ---- * menu.items.activedisabled.text.color ---- * menu.border.color (note that globbing might set these properties when ---- you didnt mean to) ---- * window.active.border.color (note that globbing might set these ---- properties when you didnt mean to) ---- * window.inactive.border.color (note that globbing might set these ---- properties when you didnt mean to) ---- * menu.border.width ---- * Guarantee that titlebar buttons are even sized, so even sized icons ---- (button masks) will be centered ---- * Default titlebar button icons (as xbms) installed to /usr/share/doc/openbox ---- * New mouse binding contexts Left, Right, TLCorner, TRCorner and Top. These ---- need bindings in config file to be useful. Also new context Bottom which ---- is synonym for Handle. ---- * W is no longer hard coded to Mod4. It is now a shortcut for Super, which ---- is usually bound to Mod4. xmodmap will show your mapping. ---- * The per-app setting has been renamed to ---- * Can use "default" for anything in per-app settings ---- * Removed option from config file ---- * --reconfigure command line option ---- * --restart command line option ---- * Closed bug #886 - Reference point for client-menu ---- * Closed bug #898 - Add option for OB2 style menu behaviour ---- * Closed bug #952 - Focus sometimes gets lost when closing windows ---- * Closed bug #1006 - duplicate window title numbering is so-so ---- * Closed bug #1080 - menus dont update when using ctrl to keep them open ---- * Closed bug #1082 - doing window stuff while changing focus is mad slow ---- * Closed bug #1106 - Openbox resize problems with Beep Media Player and some ---- websites using Mozilla ---- * Closed bug #1146 - minimized windows dont unminimize from fspanel if ob ---- restarted ---- * Closed bug #1409 - Window stacking is messed up when dealing with multiple ---- nested dialog boxes ---- * Closed bug #1526 - Incorrect handling of utility windows ---- * Closed bug #1846 - Patch for theme overrides ---- * Closed bug #1974 - Limit the number of resizes per second to make window ---- resizing smoother ---- * Closed bug #2060 - Apps disappear when using composite extension ---- * Closed bug #2221 - _NET_WM_STATE_(ABOVE|BELOW) is being inherited ---- * Closed bug #2250 - openbox ignores size request ? ---- * Closed bug #2251 - support for legacy ""fullscreen"" ---- * Closed bug #2254 - segfault in render/render.c on sendtodesktop [endian?] ---- * Closed bug #2255 - segmentation fault on 8-bit truecolor visual ---- * Closed bug #2258 - long menus truncated ---- * Closed bug #2311 - Does not display the pressed state while a button in the ---- frame is toggled ---- * Closed bug #2321 - ResizeRelative -up and -left makes window move when at ---- min_size ---- * Closed bug #2483 - Pinned windows raise to top on all desktops when they ---- become focused on just one desktop ---- * Closed bug #2491 - Client List by App instead of by Desktop ---- * Closed bug #2551 - Request to be able to cycle docks (e.g. ---- * Closed bug #2659 - Menu header display should be configurable ---- * Closed bug #2769 - temporarily chroot the keychain tree ---- * Closed bug #2841 - Changes to the keepborder option aren't applied when ---- reconfiguring ---- * Closed bug #2850 - Openbox gives black backgrounds to windows using the ---- new 'rgba' or 'argb' visual ---- * Closed bug #2865 - openbox 3.3 is not C89 compatible ---- * Closed bug #2872 - Focus issues with Eclipse and Firefox ---- * Closed bug #2878 - Openbox crash when used with vncserver ---- * Closed bug #2897 - Openbox shouldn't redraw the whole screen everytime ---- when minimizing windows. ---- * Closed bug #2898 - Patch adding advanced keyboard support in popup menus. ---- * Closed bug #2982 - tilda doesn't work propertly ---- * Closed bug #3034 - themeupdate.py seems to bee broken ---- * Closed bug #3045 - RrPaint in obrender should be split for easier use by ---- external apps ---- * Closed bug #3050 - 'syscrash' theme update ---- * Closed bug #3051 - When closing windows ---- * Closed bug #3053 - Updates de.po for German Localisation ---- * Closed bug #3059 - Feature Request: NextWindowForAllWorkspaces ---- * Closed bug #3063 - extensions_xinerama_screens() leaks memory if Xinerama ---- is enabled ---- * Closed bug #3064 - slist_path_add() might leak memory ---- * Closed bug #3068 - Multimonitor focus problems ---- * Closed bug #3081 - window doesn't appear ---- * Closed bug #3092 - Config parser expects wrong values of "layer" in ---- per-application settings ---- * Closed bug #3094 - smart placement should Ignore maximized windows ---- * Closed bug #3100 - Netwmpager is configured with layer = "below" but OB ---- is ignoring it ---- * Closed bug #3101 - Openbox won't compile on CentOS 4.4 ---- * Closed bug #3102 - svn-6175 windows come not back in the foregroud ---- * Closed bug #3106 - Fullscreened mplayer loses focus when switching to ---- another desktop and back ---- * Closed bug #3108 - After revision 6437 the desktop dialog window stays on ---- screen ---- ----3.3.1: ---- * Fix panels getting a border with keepBorder turned on. ---- * Fix a crash in mirrorhorizontal when drawing a surface with width 1. ---- ----3.3: ---- * Add a showDelay option for the dock. ---- * Fixed onscreen-keeping code which broke a bit in -rc2. ---- * Fix incorrect handling of window properties on 64 bit arches. ---- * Fix pixelsize being the same as size for pango, now it is correct. ---- * Fix drawing of icons taller than wide, eg gimp. ---- * Add a 'mirrorhorizontal' gradient, like horizontal but mirrored in the ---- center and 'splitvertical' which is like vertical but nonlinear in a fancy ---- way. ---- * Translations for de, hr and zh_TW added. ---- * Add initial per-app settings support. ---- * Fix some outstanding issues with 64-bit support. ---- * Add an optional delay for displaying submenus so you can move the mouse ---- over some entries without flashing each submenu. ---- * Plug some minor memleaks and fix minor bugs. ---- * Changed algorithm for downscaling window icons. ---- * New themes! ---- * Disable support for libstartup-notification by default, it doesn't seem ---- to work well. ---- * Allow disabling of duplicate window numbering by option titleNumber in ---- theme section. ---- * Add moverelative and resizerelative actions. ---- * Option middle for menus that make submenus be centered instead of aligned ---- by the top edge to the parent entry. ---- * Fix transient (ie dialog) windows being placed offscreen if the parent ---- is close to the edge of the screen. ---- ----3.3-rc2: ---- * Fixed some typos and errors in rc.xsd ---- * Add the noStrut option to the dock (to allow maximizing windows over it), ---- useful when it is not in the above layer. ---- * Fix transparent terminals not updating when using ToggleDecor. ---- * Yet more poking at the onscreen-keeping code, should now do the right ---- thing always. ---- * Add an option to hide disabled buttons instead of showing them as disabled. ---- * Hopefully fixed all the remaining pango issues. The new 1.10 release also ---- fixes shadows again. ---- * I think the lib linking in Makefile.am is right now, please tell me if it ---- isn't. ---- * Added a finnish translation and some minor updates to others. ---- * Fixed configure.ac so --enable-pango doesn't disable pango support or the ---- other way around, make enabled be default to get some extra testing. ---- ----3.3-rc1: ---- * Poked around a bit in the code that keeps windows onscreen, if you ---- are using xinerama, please let me know if things are better/worse/same. ---- * Add support for pango, disabled by default due to a bug in pango 1.8 that ---- breaks shadows, it works fine with 1.6.x though. Poke the pango developers ---- here http://bugzilla.gnome.org/show_bug.cgi?id=169622 if you want this ---- to be fixed. ---- * Made edge resist and Send/MoveToEdge not hit windows at layers below ---- the current one, add option to disable this behaviour. ---- * Fixed directional focus not getting trapped in omnipresent windows ---- * Fixed focus actions when bound to the mouse, normal focus cycle is always ---- linear and directional focus is totally disabled, it makes no sense ---- anyway, just move the mouse. ---- * Added an option for the raise/lower/raiselower/unshaderaise/shadelower ---- options called group that lets you bind stuff to raise/lower the whole ---- window group. yes ---- * Add various new actions. I haven't updated the web docs yet, but I think ---- I managed to get all of them listed in rc.xsd. ---- * Bugs 1783, 1812, 1863, 1905, 2005, 1957 fixed. ---- * Some translations added. (ca, no, pl, ru, fr) ---- ----3.2: ---- * Added spanish and swedish translations ---- * Changed "Unnamed Desktop" to "Desktop n" where n is the actual ---- number of the desktop ---- * Hopefully no more of the hanging X totally bug ---- * the fullscreen property now overrides aspect hints, all programs i've ---- tried that use it (mplayer and tvtime) handle the aspect internally ---- anyway, this just makes sure you have black borders all the way to the ---- edge. If this breaks anything for you, let me know. ---- * Added M as an alias for Mod3 in the same manner that W is an alias for Mod4 ---- * Added probably too many options and actions ---- * ToggleDockAutohide to toggle the autohide option at runtime, ---- doesn't save it to the config ---- * keepBorder option to set if you want the 1-pixel border when you ---- toggleDecorations ---- * added popupShow and popupPosition to control where and when the ---- move/resize-popup is shown, these go in the resize section of the config ---- popupPosition can be Top or Center, popupShow can be Always, Never or ---- Nonpixel (this is the default). ---- * Added the xorStyle option to change the behaviour of menus along the bottom ---- edge, note that the default is true ---- * warpPointer option in the menu section to control if the mouse cursor is ---- to be warped by openbox when the menu moves to keep on screen to keep the ---- cursor in the same place relative to the menu. (I think i got that right) ---- * Added back the focusLast option (this controls what happens when you ---- change desktops and have followMouse on) ---- * Added an option to set which desktop to start on when you start openbox, ---- firstdesk, for example you might like to set it to 5 if you have a 3x3 ---- grid to start in the middle. ---- * I think that was everything, have fun ---- ----3.1: ---- * Added japanese translation (bug #1029) ---- * Closed bug #1060 (modal unfocused window should be placed above ---- focused parent) ---- * Closed bug #1012 (Openbox stalls gnome session startup after ---- --replace) ---- * Closed bug #1073 (The Desktop action doesn't work) ---- * Closed bug #1023 (config_focus_raise declared as guint) ---- * Closed bug #1019 (Strange behavior with focus:followMouse and ---- RaiseLower action) ---- * Closed bug #1007 (use g_snprintf in openbox/session.c instead of ---- sprintf) ---- * Closed bug #1001 (gimp crashes openbox) ---- * Closed bug #1005 (import -frame leaves windows in a temporary ---- "on top" state) ---- * Closed bug #881 (Programs started with X become zombies upon ---- shutdown.) ---- * Closed bug #1025 (desktopnext/previous and desktopleft/right dont ---- quite get along) ---- ----3.0: ---- * Closed bug #908 (sometimes some weird grab is left) ---- * Closed bug #945 (xawtv overlay visible on every desktop) ---- * Closed bug #944 (remove restarting/reconfiguring messages from ---- openbox.c) ---- * Closed bug #946 (use g_strsplit in parse.c:split_paths()) ---- * Closed bug #943 (consistent glib type (gint, gchar, etc.) usage) ---- * Closed bug #951 (stale openbox session files) ---- * Closed bug #947 (Sloppyfocus can yield two windows at the same time ---- with focus (!)) ---- * Closed bug #948 (Gets stuck in 'move' mode if mouse is let up while ---- dragged away from title bar) ---- * Closed bug #949 (dock above gnome panel behaviour) ---- * Closed bug #902 (Openbox raises gDesklets when clicked) ---- * Closed bug #904 (ToggleMaximizeHorz & Vert dont always toggle) ---- * Closed bug #907 (window focus is not properly indicated) ---- * Closed bug #919 (Temporary raise window when alt tabbing) ---- * Closed bug #921 (focus rectangle stays on the screen after modifier ---- release) ---- * Closed bug #925 (Invalid option: '--sm-save' & '--sm-disable') ---- * Closed bug #926 (problem with client-list-menu, destkop switching, ---- and sticky client) ---- * Closed bug #927 (disappearing windows, crash with I-merry theme) ---- * Closed bug #929 (crash (signal 11) when activating Reconfigure) ---- * Closed bug #940 (actions dont work on desktops with no client ---- windows) ---- * Closed bug #943 (consistent glib type (gint, gchar, etc.) usage) ---- * Closed bug #957 (openbox crashes when exiting out of OpenOffice ---- Impress) ---- * Closed bug #960 (look for dupes in xdg paths when setting up slists?) ---- * Closed bug #961 (Menu causes core dump) ---- * Closed bug #963 (wrapper for mkdir() in parse.c) ---- * Closed bug #964 (free GErrors in action.c, openbox.c) ---- * Closed bug #965 (add message for chdir() failure in openbox.c) ---- * Closed bug #966 (list->next/prev to g_[s]list_next/previous, list != ---- NULL to list ---- * Closed bug #971 (typo in code) ---- * Closed bug #974 (use g_getenv() in parser/parse.c) ---- * Closed bug #975 (void * -> gpointer) ---- * Closed bug #976 (use g_strerror() in openbox/session.c) ---- * Closed bug #978 (disable entry to go to desktop if it is the current) ---- * Closed bug #979 (request for version check in ob libraries) ---- * Closed bug #944 (remove restarting/reconfiguring messages from ---- openbox.c) ---- * Closed bug #968 (rc.xml refers to a non-existant "debian" menu file) ---- ----3.0-rc4: ---- * Closed bug #921 (focus rectangle stays on the screen after modifier ---- release) ---- * Closed bug #927 (disappearing windows, crash with I-merry theme) ---- * Fix crash when restoring a session with a maximized window ---- * Fix leak of RrColors in menus ---- * Closed bug #929 (crash (signal 11) when activating Reconfigure) ---- * Allow focus to be moved around by clients (for WM_TAKE_FOCUS to ---- work as it is meant to). This means fullscreen apps like wine and ---- bzflag work now ---- * Reversed the default directions for the mouse wheel desktop ---- switching actions ---- * Don't wrap around in the default keyboard desktop switching bindings ---- * Place parentless dialogs so they avoid always-on-top windows ---- * Ignore fullscreen windows in placing new ones ---- * Closed bug #940 (actions dont work on desktops with no client ---- windows) ---- ----3.0-rc3: ---- * Closed bug #904 (ToggleMaximizeHorz & Vert dont always toggle) ---- * Allow resizing of windows in only vertical/horizontal directions ---- (via Alt-MiddleClick-Drag with the default bindings) ---- * Added intelligence to window cycling and raise/lowering based on ---- window types ---- * Closed bug #902 (Openbox raises gDesklets when clicked). This has the ---- side effect that panels which do not set the ABOVE state (most panels ---- curerntly around) will no longer be kept always on top. You can set the ---- ABOVE state yourself by using the client menu (Alt-RightClick in the ---- default bindings) and selecting the Always on top Layer ---- * Closed bug #907 (window focus is not properly indicated) ---- * Added a focus indicator during focus cycling that is always visible ---- instead of just moving the focus hilight around. ---- ----3.0-rc2: ---- * Closed bug #885 (raiseOnFocus is flawed) ---- * Closed bug #887 (Mouse-wheel scrolling only changes 1 desktop when ---- using "dialog" option) ---- * Closed bug #888 (some random coredump) ---- * Closed bug #889 (focus follow mouse not following) ---- * Closed bug #892 (client_under_pointer() doesn't check DESKTOP_ALL) ---- * Avoid the focus flicker when switching desktops ---- * Free the XML DOM trees properly, fixes mem leak ---- ----3.0-rc1: ---- * Closed bug #875 (RaiseLower fails to funtion on windows with dialogs) ---- * Added the option for moving dock apps around inside the ---- dock. (Closes bug #798) ---- * Made the "Desktop" action show the pager/desktop dialog ---- * Add the option to the Desktop and Focus switching actions ---- * No longer iconify fullscreen windows when they lose focus (Closes ---- bug #876) ---- * When not using focusLast, when a focused transient is closed, focus ---- will still fallback to its parent or transient siblings ---- * Improved intelligence for focus cycling with modal transients ---- * Removed the focusLast option ---- * Added the placement-policy option to select if windows are placed ---- under the mouse pointer ---- * Children inherit their window icon from their parent ---- * Closed bug #878 (minimal resizing of mplayer makes openbox crash) ---- * Fix case where opening a menu would leave Openbox in a locked state ---- * Upstream updates for TheBear theme ---- ----3.0-beta6: ---- * Added _OB_WM_STATE_UNDECORATED hint, which can be read and controlled ---- by external applications ---- * Closed bug #874 (libtool won't install libobrender.la) ---- * Launch ObConf when selecting GNOME's Desktop Preferences for Windows ---- * Focus new children always if their direct parent is focused ---- ----3.0-beta5: ---- * Initial release. diff --cc COMPLIANCE index 3873a8fd,3873a8fd,3873a8fd,3873a8fd..00000000 deleted file mode 100644,100644,100644,100644 --- a/COMPLIANCE +++ /dev/null @@@@@ -1,78 -1,78 -1,78 -1,78 +1,0 @@@@@ ----EWMH Compliance Document: ----========================== ---- ----Listed below are all the NetWM (or EWM) hints decided upon on freedesktop.org ----and Openbox's current level of compliance with the spec. Beside each hint is ----the version of the spec which Openbox is compliant up to for the hint. ---- ----( ---- compliance : ---- - = none, ---- / = partial, ---- + = complete, ---- * = Openbox is compliant, but something else needs checking ---- ? = unknown ----) ---- ----+ _NET_SUPPORTED (1.3) ----+ _NET_CLIENT_LIST (1.3) ----+ _NET_NUMBER_OF_DESKTOPS (1.3) ----+ _NET_DESKTOP_GEOMETRY (1.3) ---- Openbox doesn't support large desktops so these just match the ---- screen size. ----+ _NET_DESKTOP_VIEWPORT (1.3) ---- Openbox doesn't support large desktops so these are just (0, 0). ----+ _NET_CURRENT_DESKTOP (1.3) ----+ _NET_DESKTOP_NAMES (1.3) ----+ _NET_ACTIVE_WINDOW (1.3) ----+ _NET_WORKAREA (1.3) ----+ _NET_SUPPORTING_WM_CHECK (1.3) ----+ _NET_VIRTUAL_ROOTS (1.3) ---- Openbox does not use virtual roots, so this is not needed. ----+ _NET_DESKTOP_LAYOUT (1.3) ----+ _NET_SHOWING_DESKTOP (1.3) ----+ _NET_CLOSE_WINDOW (1.3) ----+ _NET_MOVERESIZE_WINDOW (1.3) ----+ _NET_WM_MOVERESIZE (1.3) ----+ _NET_WM_NAME (1.3) ----+ _NET_WM_VISIBLE_NAME (1.3) ----+ _NET_WM_ICON_NAME (1.3) ----+ _NET_WM_VISIBLE_ICON_NAME (1.3) ----+ _NET_WM_DESKTOP (1.3) ----+ _NET_WM_WINDOW_TYPE (1.3) ---- Openbox does not let windows change this hint after mapping. ----+ _NET_WM_STATE (1.3) ----+ _NET_WM_ALLOWED_ACTIONS (1.3) ----+ _NET_WM_STRUT (1.3) ----+ _NET_WM_STRUT_PARTIAL (1.3) ---- Openbox uses these to create per-monitor struts in Xinerama setups. ----+ _NET_WM_ICON_GEOMETRY (1.3) ----+ _NET_WM_ICON (1.3) ----- _NET_WM_PID (1.3) ---- Openbox does not currently kill processes. ----- _NET_WM_HANDLED_ICONS (1.3) ---- Openbox does not display icons for iconic windows. ----+ _NET_WM_USER_TIME (1.3) ----+ _NET_WM_USER_TIME_WINDOW (1.4) ----- _NET_WM_PING (1.3) ---- Openbox doesn't look for hung processes at this time. ----+ _NET_FRAME_EXTENTS (1.3) ----+ _NET_WM_STATE_DEMANDS_ATTENTION (1.3) ----+ _NET_RESTACK_WINDOW (1.3) ----+ _NET_WM_SYNC_REQUEST (1.3) ----+ _NET_WM_FULL_PLACEMENT (1.4) ----+ _NET_WM_MOVERESIZE_CANCEL (1.4) ----+ _NET_REQUEST_FRAME_EXTENTS (1.3) ----+ _NET_WM_ACTION_MOVE (1.3) ----+ _NET_WM_ACTION_RESIZE (1.3) ----+ _NET_WM_ACTION_MINIMIZE (1.3) ----+ _NET_WM_ACTION_SHADE (1.3) ----- _NET_WM_ACTION_STICK (1.3) ---- Openbox does not do large desktops, so no sticky state is needed. ----+ _NET_WM_ACTION_MAXIMIZE_HORZ (1.3) ----+ _NET_WM_ACTION_MAXIMIZE_VERT (1.3) ----+ _NET_WM_ACTION_FULLSCREEN (1.3) ----+ _NET_WM_ACTION_CHANGE_DESKTOP (1.3) ----+ _NET_WM_ACTION_CLOSE (1.3) ----+ _NET_WM_ACTION_ABOVE (1.4?) ----+ _NET_WM_ACTION_BELOW (1.4?) diff --cc COPYING index d60c31a9,d60c31a9,d60c31a9,d60c31a9..00000000 deleted file mode 100644,100644,100644,100644 --- a/COPYING +++ /dev/null @@@@@ -1,340 -1,340 -1,340 -1,340 +1,0 @@@@@ ---- GNU GENERAL PUBLIC LICENSE ---- Version 2, June 1991 ---- ---- Copyright (C) 1989, 1991 Free Software Foundation, Inc. ---- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ---- Everyone is permitted to copy and distribute verbatim copies ---- of this license document, but changing it is not allowed. ---- ---- Preamble ---- ---- The licenses for most software are designed to take away your ----freedom to share and change it. By contrast, the GNU General Public ----License is intended to guarantee your freedom to share and change free ----software--to make sure the software is free for all its users. This ----General Public License applies to most of the Free Software ----Foundation's software and to any other program whose authors commit to ----using it. (Some other Free Software Foundation software is covered by ----the GNU Library General Public License instead.) You can apply it to ----your programs, too. ---- ---- When we speak of free software, we are referring to freedom, not ----price. Our General Public Licenses are designed to make sure that you ----have the freedom to distribute copies of free software (and charge for ----this service if you wish), that you receive source code or can get it ----if you want it, that you can change the software or use pieces of it ----in new free programs; and that you know you can do these things. ---- ---- To protect your rights, we need to make restrictions that forbid ----anyone to deny you these rights or to ask you to surrender the rights. ----These restrictions translate to certain responsibilities for you if you ----distribute copies of the software, or if you modify it. ---- ---- For example, if you distribute copies of such a program, whether ----gratis or for a fee, you must give the recipients all the rights that ----you have. You must make sure that they, too, receive or can get the ----source code. And you must show them these terms so they know their ----rights. ---- ---- We protect your rights with two steps: (1) copyright the software, and ----(2) offer you this license which gives you legal permission to copy, ----distribute and/or modify the software. ---- ---- Also, for each author's protection and ours, we want to make certain ----that everyone understands that there is no warranty for this free ----software. If the software is modified by someone else and passed on, we ----want its recipients to know that what they have is not the original, so ----that any problems introduced by others will not reflect on the original ----authors' reputations. ---- ---- Finally, any free program is threatened constantly by software ----patents. We wish to avoid the danger that redistributors of a free ----program will individually obtain patent licenses, in effect making the ----program proprietary. To prevent this, we have made it clear that any ----patent must be licensed for everyone's free use or not licensed at all. ---- ---- The precise terms and conditions for copying, distribution and ----modification follow. ---- ---- GNU GENERAL PUBLIC LICENSE ---- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ---- ---- 0. This License applies to any program or other work which contains ----a notice placed by the copyright holder saying it may be distributed ----under the terms of this General Public License. The "Program", below, ----refers to any such program or work, and a "work based on the Program" ----means either the Program or any derivative work under copyright law: ----that is to say, a work containing the Program or a portion of it, ----either verbatim or with modifications and/or translated into another ----language. (Hereinafter, translation is included without limitation in ----the term "modification".) Each licensee is addressed as "you". ---- ----Activities other than copying, distribution and modification are not ----covered by this License; they are outside its scope. The act of ----running the Program is not restricted, and the output from the Program ----is covered only if its contents constitute a work based on the ----Program (independent of having been made by running the Program). ----Whether that is true depends on what the Program does. ---- ---- 1. You may copy and distribute verbatim copies of the Program's ----source code as you receive it, in any medium, provided that you ----conspicuously and appropriately publish on each copy an appropriate ----copyright notice and disclaimer of warranty; keep intact all the ----notices that refer to this License and to the absence of any warranty; ----and give any other recipients of the Program a copy of this License ----along with the Program. ---- ----You may charge a fee for the physical act of transferring a copy, and ----you may at your option offer warranty protection in exchange for a fee. ---- ---- 2. You may modify your copy or copies of the Program or any portion ----of it, thus forming a work based on the Program, and copy and ----distribute such modifications or work under the terms of Section 1 ----above, provided that you also meet all of these conditions: ---- ---- a) You must cause the modified files to carry prominent notices ---- stating that you changed the files and the date of any change. ---- ---- b) You must cause any work that you distribute or publish, that in ---- whole or in part contains or is derived from the Program or any ---- part thereof, to be licensed as a whole at no charge to all third ---- parties under the terms of this License. ---- ---- c) If the modified program normally reads commands interactively ---- when run, you must cause it, when started running for such ---- interactive use in the most ordinary way, to print or display an ---- announcement including an appropriate copyright notice and a ---- notice that there is no warranty (or else, saying that you provide ---- a warranty) and that users may redistribute the program under ---- these conditions, and telling the user how to view a copy of this ---- License. (Exception: if the Program itself is interactive but ---- does not normally print such an announcement, your work based on ---- the Program is not required to print an announcement.) ---- ----These requirements apply to the modified work as a whole. If ----identifiable sections of that work are not derived from the Program, ----and can be reasonably considered independent and separate works in ----themselves, then this License, and its terms, do not apply to those ----sections when you distribute them as separate works. But when you ----distribute the same sections as part of a whole which is a work based ----on the Program, the distribution of the whole must be on the terms of ----this License, whose permissions for other licensees extend to the ----entire whole, and thus to each and every part regardless of who wrote it. ---- ----Thus, it is not the intent of this section to claim rights or contest ----your rights to work written entirely by you; rather, the intent is to ----exercise the right to control the distribution of derivative or ----collective works based on the Program. ---- ----In addition, mere aggregation of another work not based on the Program ----with the Program (or with a work based on the Program) on a volume of ----a storage or distribution medium does not bring the other work under ----the scope of this License. ---- ---- 3. You may copy and distribute the Program (or a work based on it, ----under Section 2) in object code or executable form under the terms of ----Sections 1 and 2 above provided that you also do one of the following: ---- ---- a) Accompany it with the complete corresponding machine-readable ---- source code, which must be distributed under the terms of Sections ---- 1 and 2 above on a medium customarily used for software interchange; or, ---- ---- b) Accompany it with a written offer, valid for at least three ---- years, to give any third party, for a charge no more than your ---- cost of physically performing source distribution, a complete ---- machine-readable copy of the corresponding source code, to be ---- distributed under the terms of Sections 1 and 2 above on a medium ---- customarily used for software interchange; or, ---- ---- c) Accompany it with the information you received as to the offer ---- to distribute corresponding source code. (This alternative is ---- allowed only for noncommercial distribution and only if you ---- received the program in object code or executable form with such ---- an offer, in accord with Subsection b above.) ---- ----The source code for a work means the preferred form of the work for ----making modifications to it. For an executable work, complete source ----code means all the source code for all modules it contains, plus any ----associated interface definition files, plus the scripts used to ----control compilation and installation of the executable. However, as a ----special exception, the source code distributed need not include ----anything that is normally distributed (in either source or binary ----form) with the major components (compiler, kernel, and so on) of the ----operating system on which the executable runs, unless that component ----itself accompanies the executable. ---- ----If distribution of executable or object code is made by offering ----access to copy from a designated place, then offering equivalent ----access to copy the source code from the same place counts as ----distribution of the source code, even though third parties are not ----compelled to copy the source along with the object code. ---- ---- 4. You may not copy, modify, sublicense, or distribute the Program ----except as expressly provided under this License. Any attempt ----otherwise to copy, modify, sublicense or distribute the Program is ----void, and will automatically terminate your rights under this License. ----However, parties who have received copies, or rights, from you under ----this License will not have their licenses terminated so long as such ----parties remain in full compliance. ---- ---- 5. You are not required to accept this License, since you have not ----signed it. However, nothing else grants you permission to modify or ----distribute the Program or its derivative works. These actions are ----prohibited by law if you do not accept this License. Therefore, by ----modifying or distributing the Program (or any work based on the ----Program), you indicate your acceptance of this License to do so, and ----all its terms and conditions for copying, distributing or modifying ----the Program or works based on it. ---- ---- 6. Each time you redistribute the Program (or any work based on the ----Program), the recipient automatically receives a license from the ----original licensor to copy, distribute or modify the Program subject to ----these terms and conditions. You may not impose any further ----restrictions on the recipients' exercise of the rights granted herein. ----You are not responsible for enforcing compliance by third parties to ----this License. ---- ---- 7. If, as a consequence of a court judgment or allegation of patent ----infringement or for any other reason (not limited to patent issues), ----conditions are imposed on you (whether by court order, agreement or ----otherwise) that contradict the conditions of this License, they do not ----excuse you from the conditions of this License. If you cannot ----distribute so as to satisfy simultaneously your obligations under this ----License and any other pertinent obligations, then as a consequence you ----may not distribute the Program at all. For example, if a patent ----license would not permit royalty-free redistribution of the Program by ----all those who receive copies directly or indirectly through you, then ----the only way you could satisfy both it and this License would be to ----refrain entirely from distribution of the Program. ---- ----If any portion of this section is held invalid or unenforceable under ----any particular circumstance, the balance of the section is intended to ----apply and the section as a whole is intended to apply in other ----circumstances. ---- ----It is not the purpose of this section to induce you to infringe any ----patents or other property right claims or to contest validity of any ----such claims; this section has the sole purpose of protecting the ----integrity of the free software distribution system, which is ----implemented by public license practices. Many people have made ----generous contributions to the wide range of software distributed ----through that system in reliance on consistent application of that ----system; it is up to the author/donor to decide if he or she is willing ----to distribute software through any other system and a licensee cannot ----impose that choice. ---- ----This section is intended to make thoroughly clear what is believed to ----be a consequence of the rest of this License. ---- ---- 8. If the distribution and/or use of the Program is restricted in ----certain countries either by patents or by copyrighted interfaces, the ----original copyright holder who places the Program under this License ----may add an explicit geographical distribution limitation excluding ----those countries, so that distribution is permitted only in or among ----countries not thus excluded. In such case, this License incorporates ----the limitation as if written in the body of this License. ---- ---- 9. The Free Software Foundation may publish revised and/or new versions ----of the General Public License from time to time. Such new versions will ----be similar in spirit to the present version, but may differ in detail to ----address new problems or concerns. ---- ----Each version is given a distinguishing version number. If the Program ----specifies a version number of this License which applies to it and "any ----later version", you have the option of following the terms and conditions ----either of that version or of any later version published by the Free ----Software Foundation. If the Program does not specify a version number of ----this License, you may choose any version ever published by the Free Software ----Foundation. ---- ---- 10. If you wish to incorporate parts of the Program into other free ----programs whose distribution conditions are different, write to the author ----to ask for permission. For software which is copyrighted by the Free ----Software Foundation, write to the Free Software Foundation; we sometimes ----make exceptions for this. Our decision will be guided by the two goals ----of preserving the free status of all derivatives of our free software and ----of promoting the sharing and reuse of software generally. ---- ---- NO WARRANTY ---- ---- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ----FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ----OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ----PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ----OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ----MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ----TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ----PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ----REPAIR OR CORRECTION. ---- ---- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ----WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ----REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ----INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ----OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ----TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ----YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ----PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ----POSSIBILITY OF SUCH DAMAGES. ---- ---- END OF TERMS AND CONDITIONS ---- ---- How to Apply These Terms to Your New Programs ---- ---- If you develop a new program, and you want it to be of the greatest ----possible use to the public, the best way to achieve this is to make it ----free software which everyone can redistribute and change under these terms. ---- ---- To do so, attach the following notices to the program. It is safest ----to attach them to the start of each source file to most effectively ----convey the exclusion of warranty; and each file should have at least ----the "copyright" line and a pointer to where the full notice is found. ---- ---- ---- Copyright (C) ---- ---- 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 ---- ---- ----Also add information on how to contact you by electronic and paper mail. ---- ----If the program is interactive, make it output a short notice like this ----when it starts in an interactive mode: ---- ---- Gnomovision version 69, Copyright (C) year name of author ---- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ---- This is free software, and you are welcome to redistribute it ---- under certain conditions; type `show c' for details. ---- ----The hypothetical commands `show w' and `show c' should show the appropriate ----parts of the General Public License. Of course, the commands you use may ----be called something other than `show w' and `show c'; they could even be ----mouse-clicks or menu items--whatever suits your program. ---- ----You should also get your employer (if you work as a programmer) or your ----school, if any, to sign a "copyright disclaimer" for the program, if ----necessary. Here is a sample; alter the names: ---- ---- Yoyodyne, Inc., hereby disclaims all copyright interest in the program ---- `Gnomovision' (which makes passes at compilers) written by James Hacker. ---- ---- , 1 April 1989 ---- Ty Coon, President of Vice ---- ----This General Public License does not permit incorporating your program into ----proprietary programs. If your program is a subroutine library, you may ----consider it more useful to permit linking proprietary applications with the ----library. If this is what you want to do, use the GNU Library General ----Public License instead of this License. diff --cc HACKING index e450bba3,e450bba3,e450bba3,e450bba3..00000000 deleted file mode 100644,100644,100644,100644 --- a/HACKING +++ /dev/null @@@@@ -1,33 -1,33 -1,33 -1,33 +1,0 @@@@@ ----dirs: ---- openbox - core of the WM ---- render - librender, rendering routines for the WM and for apps ---- parser - libparser, for parsing config files ---- ----Beware the Client.transient_for. It can be set to a !NULL value of TRAN_GROUP, ----which is not a valid pointer. You must ALWAYS check for TRAN_GROUP before ----following transient_for. However if it is transient for the group, this ----excludes other windows whom are transient for the group, and windows which ----are children of the window (infinite loops would result)! ---- ----When using coordinates/sizes of windows, make sure you use the right area. The ----Client.area rect is the reference point and size of the *CLIENT* window. This ----value is not what you see in any shape or form, and gravity is applied to it to ----translate it into what you see. The Client.frame.area is the actual position ----and size of the entire frame. This is usually the value you want to use, unless ----you are in client.c (probably) and adjusting/using the position or size from ----the client's perspective. ---- ----Indentation --------------- ----For openbox, we aim to have consistent coding style. Some, but surely ----not all, guidelines: ---- * use 4 space indents ---- * tabs should not appear in source files ---- * functions should have the opening and closing braces on their own ---- lines ---- * most other constructs should have braces on the same line as the ---- statement ---- * else appears on a new line, just like an if ---- * when in doubt look at the rest of the source ---- * vim users can use "set expandtab tabstop=4 shiftwidth=4 ---- softtabstop=4" for some of this diff --cc Makefile.am index e14fd8fb,ec6157b2,ec6157b2,ec6157b2..00000000 deleted file mode 100644,100644,100644,100644 --- a/Makefile.am +++ /dev/null @@@@@ -1,544 -1,541 -1,541 -1,541 +1,0 @@@@@ ----SUBDIRS = m4 po ---- ----docxbmdir = $(docdir)/xbm ----themedir = $(datadir)/themes ----localedir = $(datadir)/locale ----configdir = $(sysconfdir)/xdg ----rcdir = $(configdir)/openbox ----xsessionsdir = $(datadir)/xsessions ----gnomewmfilesdir = $(datadir)/gnome/wm-properties ----pkgconfigdir = $(libdir)/pkgconfig ----obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt ----rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render ----pixmapdir = $(datadir)/pixmaps ----xsddir = $(datadir)/openbox ----secretbindir = $(libdir)/openbox ---- ----theme = Clearlooks ---- ----AUTOMAKE_OPTIONS = subdir-objects foreign ---- ----ACLOCAL_AMFLAGS = -I m4 ---- ----INCLUDES = -I. ---- ----check_PROGRAMS = \ ---- render/rendertest ---- ----lib_LTLIBRARIES = \ ---- render/libobrender.la \ ---- obt/libobt.la ---- ----bin_PROGRAMS = \ ---- openbox/openbox \ ---- tools/gnome-panel-control/gnome-panel-control ---- ----secretbin_SCRIPTS = \ ---- tools/xdg-autostart/xdg-autostart ---- ----nodist_bin_SCRIPTS = \ ---- data/xsession/openbox-session \ ---- data/xsession/openbox-gnome-session \ ---- data/xsession/openbox-kde-session ---- ----## render ## ---- ----render_rendertest_CPPFLAGS = \ ---- $(PANGO_CFLAGS) \ ---- $(XFT_CFLAGS) \ ---- $(GLIB_CFLAGS) \ ---- -DG_LOG_DOMAIN=\"RenderTest\" ----render_rendertest_LDADD = \ ---- obt/libobt.la \ ---- render/libobrender.la \ ---- $(GLIB_LIBS) \ ---- $(PANGO_LIBS) \ ---- $(XFT_LIBS) \ ---- $(XML_LIBS) \ ---- $(X_LIBS) ----render_rendertest_SOURCES = render/test.c ---- ----render_libobrender_la_CPPFLAGS = \ ---- $(X_CFLAGS) \ ---- $(GLIB_CFLAGS) \ ---- $(XML_CFLAGS) \ ---- $(PANGO_CFLAGS) \ ---- $(XFT_CFLAGS) \ ---- -DG_LOG_DOMAIN=\"ObRender\" \ ---- -DDEFAULT_THEME=\"$(theme)\" ----render_libobrender_la_LDFLAGS = \ ---- -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) ----render_libobrender_la_LIBADD = \ ---- obt/libobt.la \ ---- $(X_LIBS) \ ---- $(PANGO_LIBS) \ ---- $(XFT_LIBS) \ ---- $(GLIB_LIBS) \ ---- $(XML_LIBS) ----render_libobrender_la_SOURCES = \ ---- gettext.h \ ---- render/color.h \ ---- render/color.c \ ---- render/font.h \ ---- render/font.c \ ---- render/geom.h \ ---- render/gradient.h \ ---- render/gradient.c \ ---- render/icon.h \ ---- render/image.h \ ---- render/image.c \ ---- render/imagecache.h \ ---- render/imagecache.c \ ---- render/instance.h \ ---- render/instance.c \ ---- render/mask.h \ ---- render/mask.c \ ---- render/render.h \ ---- render/render.c \ ---- render/theme.h \ ---- render/theme.c ---- ----## obt ## ---- ----obt_libobt_la_CPPFLAGS = \ ---- $(XINERAMA_CFLAGS) \ ---- $(XKB_CFLAGS) \ ---- $(XRANDR_CFLAGS) \ ---- $(XSHAPE_CFLAGS) \ ---- $(XSYNC_CFLAGS) \ ---- $(GLIB_CFLAGS) \ ---- $(XML_CFLAGS) \ ---- -DG_LOG_DOMAIN=\"Obt\" \ ---- -DLOCALEDIR=\"$(localedir)\" \ ---- -DDATADIR=\"$(datadir)\" \ ---- -DCONFIGDIR=\"$(configdir)\" ----obt_libobt_la_LDFLAGS = \ ---- -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE) ----obt_libobt_la_LIBADD = \ ---- $(XINERAMA_LIBS) \ ---- $(XKB_LIBS) \ ---- $(XRANDR_LIBS) \ ---- $(XSHAPE_LIBS) \ ---- $(XSYNC_LIBS) \ ---- $(GLIB_LIBS) \ ---- $(XML_LIBS) ----obt_libobt_la_SOURCES = \ ---- obt/display.h \ ---- obt/display.c \ ---- obt/internal.h \ ---- obt/keyboard.h \ ---- obt/keyboard.c \ ---- obt/mainloop.h \ ---- obt/mainloop.c \ ---- obt/parse.h \ ---- obt/parse.c \ ---- obt/paths.h \ ---- obt/paths.c \ ---- obt/prop.h \ ---- obt/prop.c \ ---- obt/util.h \ ---- obt/xevent.h \ ---- obt/xevent.c ---- ----## openbox ## ---- ----openbox_openbox_CPPFLAGS = \ ---- $(SM_CFLAGS) \ ---- $(X_CFLAGS) \ ---- $(XCURSOR_CFLAGS) \ ---- $(SM_CFLAGS) \ ---- $(PANGO_CFLAGS) \ ---- $(GLIB_CFLAGS) \ ---- $(LIBSN_CFLAGS) \ ---- $(XML_CFLAGS) \ ---- -DLOCALEDIR=\"$(localedir)\" \ ---- -DDATADIR=\"$(datadir)\" \ ---- -DCONFIGDIR=\"$(configdir)\" \ ---- -DG_LOG_DOMAIN=\"Openbox\" ----openbox_openbox_LDADD = \ ---- $(SM_LIBS) \ ---- $(GLIB_LIBS) \ ---- $(X_LIBS) \ ---- $(XCURSOR_LIBS) \ ---- $(LIBSN_LIBS) \ ---- $(XML_LIBS) \ ---- $(EFENCE_LIBS) \ ---- $(LIBINTL) \ ---- render/libobrender.la \ ---- obt/libobt.la ----openbox_openbox_LDFLAGS = -export-dynamic ----openbox_openbox_SOURCES = \ ---- gettext.h \ ---- openbox/actions/all.c \ ---- openbox/actions/all.h \ ---- openbox/actions/addremovedesktop.c \ ---- openbox/actions/breakchroot.c \ ---- openbox/actions/close.c \ ---- openbox/actions/cyclewindows.c \ ---- openbox/actions/debug.c \ ---- openbox/actions/decorations.c \ ---- openbox/actions/desktop.c \ ---- openbox/actions/dockautohide.c \ ---- openbox/actions/directionalwindows.c \ ---- openbox/actions/execute.c \ ---- openbox/actions/exit.c \ ---- openbox/actions/focus.c \ ---- openbox/actions/focustobottom.c \ ---- openbox/actions/fullscreen.c \ ---- openbox/actions/growtoedge.c \ ---- openbox/actions/iconify.c \ ---- openbox/actions/if.c \ ---- openbox/actions/kill.c \ ---- openbox/actions/layer.c \ - openbox/actions/lock.c \ ---- openbox/actions/lower.c \ ---- openbox/actions/maximize.c \ ---- openbox/actions/move.c \ ---- openbox/actions/moverelative.c \ ---- openbox/actions/moveresizeto.c \ ---- openbox/actions/movetoedge.c \ ---- openbox/actions/omnipresent.c \ ---- openbox/actions/raise.c \ ---- openbox/actions/raiselower.c \ - openbox/actions/raisetemp.c \ ---- openbox/actions/reconfigure.c \ ---- openbox/actions/resize.c \ ---- openbox/actions/resizerelative.c \ ---- openbox/actions/restart.c \ - openbox/actions/sendkeyevent.c \ ---- openbox/actions/shade.c \ ---- openbox/actions/showdesktop.c \ ---- openbox/actions/showmenu.c \ ---- openbox/actions/unfocus.c \ ---- openbox/actions.c \ ---- openbox/actions.h \ ---- openbox/client.c \ ---- openbox/client.h \ ---- openbox/client_list_menu.c \ ---- openbox/client_list_menu.h \ ---- openbox/client_list_combined_menu.c \ ---- openbox/client_list_combined_menu.h \ ---- openbox/client_menu.c \ ---- openbox/client_menu.h \ ---- openbox/config.c \ ---- openbox/config.h \ ---- openbox/debug.c \ ---- openbox/debug.h \ ---- openbox/dock.c \ ---- openbox/dock.h \ ---- openbox/event.c \ ---- openbox/event.h \ ---- openbox/focus.c \ ---- openbox/focus.h \ ---- openbox/focus_cycle.c \ ---- openbox/focus_cycle.h \ ---- openbox/focus_cycle_indicator.c \ ---- openbox/focus_cycle_indicator.h \ ---- openbox/focus_cycle_popup.c \ ---- openbox/focus_cycle_popup.h \ ---- openbox/frame.c \ ---- openbox/frame.h \ ---- openbox/framerender.c \ ---- openbox/framerender.h \ ---- openbox/geom.h \ ---- openbox/grab.c \ ---- openbox/grab.h \ ---- openbox/group.c \ ---- openbox/group.h \ ---- openbox/keyboard.c \ ---- openbox/keyboard.h \ ---- openbox/keytree.c \ ---- openbox/keytree.h \ ---- openbox/menuframe.c \ ---- openbox/menuframe.h \ ---- openbox/menu.c \ ---- openbox/menu.h \ ---- openbox/misc.h \ ---- openbox/mouse.c \ ---- openbox/mouse.h \ ---- openbox/moveresize.c \ ---- openbox/moveresize.h \ ---- openbox/mwm.h \ ---- openbox/openbox.c \ ---- openbox/openbox.h \ ---- openbox/ping.c \ ---- openbox/ping.h \ ---- openbox/place.c \ ---- openbox/place.h \ ---- openbox/prompt.c \ ---- openbox/prompt.h \ ---- openbox/popup.c \ ---- openbox/popup.h \ ---- openbox/resist.c \ ---- openbox/resist.h \ ---- openbox/screen.c \ ---- openbox/screen.h \ ---- openbox/session.c \ ---- openbox/session.h \ ---- openbox/stacking.c \ ---- openbox/stacking.h \ ---- openbox/startupnotify.c \ ---- openbox/startupnotify.h \ ---- openbox/translate.c \ ---- openbox/translate.h \ ---- openbox/window.c \ ---- openbox/window.h ---- ----## gnome-panel-control ## ---- ----tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ ---- $(X_CFLAGS) ----tools_gnome_panel_control_gnome_panel_control_LDADD = \ ---- $(X_LIBS) ----tools_gnome_panel_control_gnome_panel_control_SOURCES = \ ---- tools/gnome-panel-control/gnome-panel-control.c ---- ---- ----## default button masks ## ----dist_docxbm_DATA = \ ---- data/xbm/bullet.xbm \ ---- data/xbm/close.xbm \ ---- data/xbm/desk_toggled.xbm \ ---- data/xbm/desk.xbm \ ---- data/xbm/iconify.xbm \ ---- data/xbm/max_toggled.xbm \ ---- data/xbm/max.xbm \ ---- data/xbm/shade_toggled.xbm \ ---- data/xbm/shade.xbm ---- ---- ----## themes ## ---- ----clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 ----dist_clearlooks_theme_DATA= \ ---- themes/Clearlooks/openbox-3/themerc ---- ----clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 ----dist_clearlooks34_theme_DATA= \ ---- themes/Clearlooks-3.4/openbox-3/themerc ---- ----clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 ----dist_clearlooksolive_theme_DATA= \ ---- themes/Clearlooks-Olive/openbox-3/themerc ---- ----mikachu_themedir = $(themedir)/Mikachu/openbox-3 ----dist_mikachu_theme_DATA= \ ---- themes/Mikachu/openbox-3/bullet.xbm \ ---- themes/Mikachu/openbox-3/close.xbm \ ---- themes/Mikachu/openbox-3/desk.xbm \ ---- themes/Mikachu/openbox-3/iconify.xbm \ ---- themes/Mikachu/openbox-3/max.xbm \ ---- themes/Mikachu/openbox-3/themerc ---- ---- ----natura_themedir = $(themedir)/Natura/openbox-3 ----dist_natura_theme_DATA= \ ---- themes/Natura/openbox-3/close_hover.xbm \ ---- themes/Natura/openbox-3/close.xbm \ ---- themes/Natura/openbox-3/desk_toggled.xbm \ ---- themes/Natura/openbox-3/desk_hover.xbm \ ---- themes/Natura/openbox-3/desk.xbm \ ---- themes/Natura/openbox-3/iconify_hover.xbm \ ---- themes/Natura/openbox-3/iconify.xbm \ ---- themes/Natura/openbox-3/max_hover.xbm \ ---- themes/Natura/openbox-3/max_toggled.xbm \ ---- themes/Natura/openbox-3/max.xbm \ ---- themes/Natura/openbox-3/shade.xbm \ ---- themes/Natura/openbox-3/shade_hover.xbm \ ---- themes/Natura/openbox-3/themerc ---- ----artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 ----dist_artwizboxed_theme_DATA= \ ---- themes/Artwiz-boxed/openbox-3/themerc ---- ----bear2_themedir = $(themedir)/Bear2/openbox-3 ----dist_bear2_theme_DATA= \ ---- themes/Bear2/openbox-3/close_pressed.xbm \ ---- themes/Bear2/openbox-3/close.xbm \ ---- themes/Bear2/openbox-3/desk_toggled.xbm \ ---- themes/Bear2/openbox-3/desk.xbm \ ---- themes/Bear2/openbox-3/iconify_pressed.xbm \ ---- themes/Bear2/openbox-3/iconify.xbm \ ---- themes/Bear2/openbox-3/max_pressed.xbm \ ---- themes/Bear2/openbox-3/max_toggled.xbm \ ---- themes/Bear2/openbox-3/max.xbm \ ---- themes/Bear2/openbox-3/shade_pressed.xbm \ ---- themes/Bear2/openbox-3/shade.xbm \ ---- themes/Bear2/openbox-3/themerc ---- ----orang_themedir = $(themedir)/Orang/openbox-3 ----dist_orang_theme_DATA= \ ---- themes/Orang/openbox-3/themerc ---- ----onyx_themedir = $(themedir)/Onyx/openbox-3 ----dist_onyx_theme_DATA= \ ---- themes/Onyx/openbox-3/themerc ---- ----onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3 ----dist_onyxcitrus_theme_DATA= \ ---- themes/Onyx-Citrus/openbox-3/themerc ---- ----syscrash_themedir = $(themedir)/Syscrash/openbox-3 ----dist_syscrash_theme_DATA= \ ---- themes/Syscrash/openbox-3/max_disabled.xbm \ ---- themes/Syscrash/openbox-3/max_pressed.xbm \ ---- themes/Syscrash/openbox-3/max_toggled.xbm \ ---- themes/Syscrash/openbox-3/max.xbm \ ---- themes/Syscrash/openbox-3/themerc ---- ----## public headers ## ---- ----rrpubinclude_HEADERS = \ ---- render/color.h \ ---- render/font.h \ ---- render/geom.h \ ---- render/gradient.h \ ---- render/image.h \ ---- render/instance.h \ ---- render/mask.h \ ---- render/render.h \ ---- render/theme.h \ ---- render/version.h ---- ----obtpubinclude_HEADERS = \ ---- obt/display.h \ ---- obt/keyboard.h \ ---- obt/mainloop.h \ ---- obt/parse.h \ ---- obt/paths.h \ ---- obt/prop.h \ ---- obt/util.h \ ---- obt/version.h \ ---- obt/xevent.h ---- ----nodist_pkgconfig_DATA = \ ---- render/obrender-4.0.pc \ ---- obt/obt-4.0.pc ---- ----## data ## ---- ----dist_pixmap_DATA = \ ---- data/openbox.png ---- ----dist_rc_DATA = \ ---- data/autostart.sh \ ---- data/rc.xml \ ---- data/menu.xml ---- ----edit = $(SED) \ ---- -e 's!@version\@!$(VERSION)!' \ ---- -e 's!@configdir\@!$(configdir)!' \ ---- -e 's!@secretbindir\@!$(secretbindir)!' \ ---- -e 's!@bindir\@!$(bindir)!' ---- ----data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile ---- @echo make: creating $@ ---- @$(edit) $< >$@ ---- ----%.desktop: %.desktop.in Makefile ---- @echo make: creating $@ ---- @$(edit) $< >$@ ---- ----%-session: %-session.in Makefile ---- @echo make: creating $@ ---- @$(edit) $< >$@ ---- ----%.1.in: %.1.sgml ---- @echo make: creating $@ ---- @docbook-to-man $< >$@ ---- ----%.1: %.1.in Makefile ---- @echo make: creating $@ ---- @$(edit) $< >$@ ---- ----dist_gnomewmfiles_DATA = \ ---- data/gnome-wm-properties/openbox.desktop ---- ----nodist_xsessions_DATA = \ ---- data/xsession/openbox.desktop \ ---- data/xsession/openbox-gnome.desktop \ ---- data/xsession/openbox-kde.desktop ---- ----dist_noinst_DATA = \ ---- data/rc.xsd \ ---- data/menu.xsd \ ---- data/xsession/openbox.desktop.in \ ---- data/xsession/openbox-gnome.desktop.in \ ---- data/xsession/openbox-kde.desktop.in \ ---- data/xsession/openbox-session.in \ ---- data/xsession/openbox-gnome-session.in \ ---- data/xsession/openbox-kde-session.in \ ---- doc/openbox.1.sgml \ ---- doc/openbox.1.in \ ---- doc/openbox-session.1.sgml \ ---- doc/openbox-session.1.in \ ---- doc/openbox-gnome-session.1.sgml \ ---- doc/openbox-gnome-session.1.in \ ---- doc/openbox-kde-session.1.sgml \ ---- doc/openbox-kde-session.1.in \ ---- render/version.h.in \ ---- render/obrender-4.0.pc.in \ ---- obt/obt-4.0.pc.in \ ---- obt/version.h.in \ ---- tools/themeupdate/themeupdate.py \ ---- tests/hideshow.py \ ---- tests/Makefile \ ---- tests/aspect.c \ ---- tests/fullscreen.c \ ---- tests/grav.c \ ---- tests/grouptran.c \ ---- tests/icons.c \ ---- tests/modal2.c \ ---- tests/modal3.c \ ---- tests/modal.c \ ---- tests/noresize.c \ ---- tests/override.c \ ---- tests/positioned.c \ ---- tests/strut.c \ ---- tests/title.c \ ---- tests/urgent.c ---- ----dist_doc_DATA = \ ---- COMPLIANCE \ ---- README \ ---- AUTHORS \ ---- CHANGELOG \ ---- COPYING \ ---- data/rc.xsd \ ---- data/menu.xsd \ ---- doc/rc-mouse-focus.xml ---- ----nodist_man_MANS = \ ---- doc/openbox.1 \ ---- doc/openbox-session.1 \ ---- doc/openbox-gnome-session.1 \ ---- doc/openbox-kde-session.1 ---- ----EXTRA_DIST = \ ---- config.rpath ---- ----# make clean doesn't delete these for some reason, even though they are ----# built by make ----CLEANFILES = \ ---- doc/openbox.1 \ ---- doc/openbox-session.1 \ ---- doc/openbox-gnome-session.1 \ ---- doc/openbox-kde-session.1 \ ---- data/xsession/openbox-session \ ---- data/xsession/openbox-gnome-session \ ---- data/xsession/openbox-kde-session \ ---- data/xsession/openbox.desktop \ ---- data/xsession/openbox-gnome.desktop \ ---- data/xsession/openbox-kde.desktop ---- ----#doc: ----# $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc ---- ----distclean-local: ---- for d in . m4 po render parser obt openbox; do \ ---- for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \ ---- rm -f "$$d/$$p"; \ ---- done \ ---- done ---- ----.PHONY: doc diff --cc README index 9c668640,9c668640,9c668640,9c668640..00000000 deleted file mode 100644,100644,100644,100644 --- a/README +++ /dev/null @@@@@ -1,23 -1,23 -1,23 -1,23 +1,0 @@@@@ ----Openbox ----Copyright (C) 2004-2007 Mikael Magnusson ----Copyright (C) 2002-2007 Dana Jansens ---- -------- ---- ---- This software is OSI Certified Open Source Software. ---- OSI Certified is a certification mark of the Open Source Initiative. ---- -------- ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ---- diff --cc README.GIT index b4b05576,b4b05576,b4b05576,b4b05576..00000000 deleted file mode 100644,100644,100644,100644 --- a/README.GIT +++ /dev/null @@@@@ -1,60 -1,60 -1,60 -1,60 +1,0 @@@@@ ----To build Openbox from git you need: ---- ----A C Compiler (GNU GCC 3.2+ suggested) ----GNU Gettext 0.14.4 ----GNU Autoconf 2.50+ ----GNU Automake 1.9 (no more, no less) ----GNU Libtool ----Xlib library/headers (devel package) ----Pkg-Config ----Glib 2.0+ library/headers (devel package) (http://www.gtk.org) ----libxml2 2.0+ library/headers (devel package) ----Pango 1.10+ library/headers (devel package) ----cvs ---- ----Optionally you may want: ----X Cursor library/headers (devel package) ----Startup Notification library/headers 0.8+ (devel package) ---- ----We recommend the latest versions of all these packages. ---- ----Do the following to build and install Openbox in git: ---- ----% ./bootstrap ----% ./configure ----% make ----su to root and ----% make install ----or ----% sudo make install ---- ----Don't try running it from the openbox/ directory without installing, it won't work. ----It needs to be installed before it is run. ---- ----The following commands will be available: openbox-session, ---- openbox-gnome-session, openbox-kde-session, and openbox. ---- ----See the man pages for details about them. If you want to run Openbox on its ---- own, you probably want to run "openbox-session". ---- ---- ---- -------- ----In debian unstable, you want these packages: ----gcc ----gettext ----automake1.9 ----autoconf ----libtool ----libpango1.0-dev ----pkg-config ----libglib2.0-dev ----libxml2-dev ----libxcursor-dev ----libstartup-notification0-dev ----xlibs-dev ---- ----tip: run "update-alternatives --config automake" and select automake1.9 before ---- running ./configure ---- -------- diff --cc README.NLS index 7495afda,7495afda,7495afda,7495afda..00000000 deleted file mode 100644,100644,100644,100644 --- a/README.NLS +++ /dev/null @@@@@ -1,3 -1,3 -1,3 -1,3 +1,0 @@@@@ ----Use this command to create a new .po ---- ----msginit --locale xx_YY file.pot diff --cc bootstrap index 6a5b10fb,6a5b10fb,6a5b10fb,6a5b10fb..00000000 deleted file mode 100755,100755,100755,100755 --- a/bootstrap +++ /dev/null @@@@@ -1,18 -1,18 -1,18 -1,18 +1,0 @@@@@ ----#! /bin/sh ---- ----sh() { ---- /bin/sh -c "set -x; $*" ----} ---- ----export WANT_AUTOMAKE=1.9 ---- ----sh autopoint --force || exit 1 # for GNU gettext ----sh libtoolize --copy --force --automake || exit 1 ----sh aclocal -I m4 $ACLOCAL_FLAGS || exit 1 ----#sh autoheader || exit 1 ----sh autoconf || exit 1 ----sh automake --include-deps --add-missing --copy || exit 1 ---- ----echo ----echo You are now ready to run ./configure ----echo enjoy! diff --cc configure.ac index 463e7fb3,463e7fb3,463e7fb3,463e7fb3..00000000 deleted file mode 100644,100644,100644,100644 --- a/configure.ac +++ /dev/null @@@@@ -1,200 -1,200 -1,200 -1,200 +1,0 @@@@@ ----AC_PREREQ([2.54]) ----AC_INIT([openbox], [3.999.0], [http://bugzilla.icculus.org]) ----AM_INIT_AUTOMAKE ----AC_CONFIG_SRCDIR([openbox/openbox.c]) ---- ----dnl Making releases: ----dnl RR_MICRO_VERSION += 1; ----dnl RR_INTERFACE_AGE += 1; ----dnl R_BINARY_AGE += 1; ----dnl if any functions have been added, set RR_INTERFACE_AGE to 0. ----dnl if backwards compatibility has been broken, ----dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0. ----dnl ----dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match ----dnl ----RR_MAJOR_VERSION=4 ----RR_MINOR_VERSION=0 ----RR_MICRO_VERSION=17 ----RR_INTERFACE_AGE=0 ----RR_BINARY_AGE=0 ----RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION ---- ----OBT_MAJOR_VERSION=4 ----OBT_MINOR_VERSION=0 ----OBT_MICRO_VERSION=0 ----OBT_INTERFACE_AGE=0 ----OBT_BINARY_AGE=0 ----OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION ---- ----AC_SUBST(RR_MAJOR_VERSION) ----AC_SUBST(RR_MINOR_VERSION) ----AC_SUBST(RR_MICRO_VERSION) ----AC_SUBST(RR_INTERFACE_AGE) ----AC_SUBST(RR_BINARY_AGE) ----AC_SUBST(RR_VERSION) ----AC_SUBST(OBT_MAJOR_VERSION) ----AC_SUBST(OBT_MINOR_VERSION) ----AC_SUBST(OBT_MICRO_VERSION) ----AC_SUBST(OBT_INTERFACE_AGE) ----AC_SUBST(OBT_BINARY_AGE) ----AC_SUBST(OBT_VERSION) ---- ----dnl Libtool versioning ----RR_RELEASE=$RR_MAJOR_VERSION.$RR_MINOR_VERSION ----RR_CURRENT=`expr $RR_MICRO_VERSION - $RR_INTERFACE_AGE` ----RR_REVISION=$RR_INTERFACE_AGE ----RR_AGE=`expr $RR_BINARY_AGE - $RR_INTERFACE_AGE` ----RR_CURRENT_MINUS_AGE=`expr $RR_CURRENT - $RR_AGE` ---- ----OBT_RELEASE=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION ----OBT_CURRENT=`expr $OBT_MICRO_VERSION - $OBT_INTERFACE_AGE` ----OBT_REVISION=$OBT_INTERFACE_AGE ----OBT_AGE=`expr $OBT_BINARY_AGE - $OBT_INTERFACE_AGE` ----OBT_CURRENT_MINUS_AGE=`expr $OBT_CURRENT - $OBT_AGE` ---- ----AC_SUBST(RR_RELEASE) ----AC_SUBST(RR_CURRENT) ----AC_SUBST(RR_REVISION) ----AC_SUBST(RR_AGE) ----AC_SUBST(RR_CURRENT_MINUS_AGE) ----AC_SUBST(OBT_RELEASE) ----AC_SUBST(OBT_CURRENT) ----AC_SUBST(OBT_REVISION) ----AC_SUBST(OBT_AGE) ----AC_SUBST(OBT_CURRENT_MINUS_AGE) ---- ----AC_PREFIX_DEFAULT([/usr/local]) ----test "$prefix" = "NONE" && prefix=$ac_default_prefix ---- ----dnl Determine build target ----OB_DEBUG ----dnl Pick compiler specific/build target flags, and set $CVS ----AM_PROG_CC_C_O ----OB_COMPILER_FLAGS ----AC_C_CONST ----AC_C_INLINE ---- ----AC_PROG_LIBTOOL ----AC_SUBST(LIBTOOL_DEPS) ----LIBTOOL="$LIBTOOL --silent" ---- ----AC_PROG_INSTALL ---- ----AM_GNU_GETTEXT_VERSION(0.15) ----AM_GNU_GETTEXT([external]) ---- ----AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h) ----AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/time.h sys/wait.h) ----# AC_HEADER_TIME ----# AC_TYPE_SIGNAL ---- ----AC_PATH_PROG([SED], [sed], [no]) ----if test "$SED" = "no"; then ---- AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) ----fi ---- ----PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) ----AC_SUBST(GLIB_CFLAGS) ----AC_SUBST(GLIB_LIBS) ---- ----PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0]) ----AC_SUBST(PANGO_CFLAGS) ----AC_SUBST(PANGO_LIBS) ---- ----PKG_CHECK_MODULES(XFT, [xft]) ----AC_SUBST(XFT_CFLAGS) ----AC_SUBST(XFT_LIBS) ---- ----PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0]) ----AC_SUBST(XML_CFLAGS) ----AC_SUBST(XML_LIBS) ---- ----AC_ARG_ENABLE(startup-notification, ---- AC_HELP_STRING( ---- [--disable-startup-notification], ---- [disable the startup notification library. [[default=enabled]]] ---- ), ---- [enable_sn=$enableval], ---- [enable_sn=yes] ----) ---- ----if test "$enable_sn" = yes; then ----PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8], ---- [ ---- AC_DEFINE(USE_LIBSN, [1], [Use startup-notification]) ---- AC_SUBST(LIBSN_CFLAGS) ---- AC_SUBST(LIBSN_LIBS) ---- sn_found=yes ---- ], ---- [ ---- sn_found=no ---- ] ----) ----else ---- sn_found=no ----fi ---- ----AC_ARG_ENABLE(xcursor, ---- AC_HELP_STRING( ---- [--disable-xcursor], ---- [disable use of the X Cursor library. [[default=enabled]]] ---- ), ---- [enable_xcursor=$enableval], ---- [enable_xcursor=yes] ----) ---- ----if test "$enable_xcursor" = yes; then ----PKG_CHECK_MODULES(XCURSOR, [xcursor], ---- [ ---- AC_DEFINE(USE_XCURSOR, [1], [Use X Cursor library]) ---- AC_SUBST(XCURSOR_CFLAGS) ---- AC_SUBST(XCURSOR_LIBS) ---- xcursor_found=yes ---- ], ---- [ ---- xcursor_found=no ---- ] ----) ----else ---- xcursor_found=no ----fi ---- ----dnl Check for session management ----X11_SM ---- ----#EFENCE_LIBS=-lefence ----EFENCE_LIBS="" ----AC_SUBST(EFENCE_LIBS) ---- ----dnl Check for X11 extensions ----X11_EXT_XKB ----X11_EXT_XRANDR ----X11_EXT_SHAPE ----X11_EXT_XINERAMA ----X11_EXT_SYNC ---- ----AC_CONFIG_FILES([ ---- Makefile ---- m4/Makefile ---- po/Makefile.in ---- render/obrender-4.0.pc ---- obt/obt-4.0.pc ---- render/version.h ---- obt/version.h ----]) ----AC_CONFIG_COMMANDS([doc], ---- [test -d doc || mkdir doc]) ----AC_CONFIG_COMMANDS([data], ---- [test -d data || mkdir data]) ----AC_CONFIG_COMMANDS([data/xsession], ---- [test -d data/xsession || mkdir data/xsession]) ----AC_OUTPUT ---- ----AC_MSG_RESULT ----AC_MSG_RESULT([Compiling with these options: ---- Startup Notification... $sn_found ---- X Cursor Library... $xcursor_found ---- Session Management... $SM ---- ]) ----AC_MSG_RESULT([configure complete, now type "make"]) diff --cc data/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc data/autostart.sh.in index 62a30e1c,62a30e1c,62a30e1c,62a30e1c..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/autostart.sh.in +++ /dev/null @@@@@ -1,44 -1,44 -1,44 -1,44 +1,0 @@@@@ ----# This shell script is run before Openbox launches. ----# Environment variables set here are passed to the Openbox session. ---- ----# Set a background color ----BG="" ----if which hsetroot >/dev/null; then ---- BG=hsetroot ----else ---- if which esetroot >/dev/null; then ---- BG=esetroot ---- else ---- if which xsetroot >/dev/null; then ---- BG=xsetroot ---- fi ---- fi ----fi ----test -z $BG || $BG -solid "#303030" ---- ----# D-bus ----if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then ---- eval `dbus-launch --sh-syntax --exit-with-session` ----fi ---- ----# Make GTK apps look and behave how they were set up in the gnome config tools ----if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then ---- /usr/libexec/gnome-settings-daemon & ----elif which gnome-settings-daemon >/dev/null; then ---- gnome-settings-daemon & ----# Make GTK apps look and behave how they were set up in the XFCE config tools ----elif which xfce-mcs-manager >/dev/null; then ---- xfce-mcs-manager n & ----fi ---- ----# Preload stuff for KDE apps ----if which start_kdeinit >/dev/null; then ---- LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup & ----fi ---- ----# Run XDG autostart things. By default don't run anything desktop-specific ----# See xdg-autostart --help more info ----DESKTOP_ENV="" ----if which @secretbindir@/xdg-autostart >/dev/null; then ---- @secretbindir@/xdg-autostart $DESKTOP_ENV ----fi diff --cc data/gnome-wm-properties/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/gnome-wm-properties/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc data/gnome-wm-properties/openbox.desktop index 23e690e3,23e690e3,23e690e3,23e690e3..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/gnome-wm-properties/openbox.desktop +++ /dev/null @@@@@ -1,12 -1,12 -1,12 -1,12 +1,0 @@@@@ ----[Desktop Entry] ----Name=Openbox ----Exec=openbox ---- ----# name we put on the WM spec check window ----X-GNOME-WMName=Openbox ---- ----# our config tool ----ConfigExec=obconf ---- ----[Window Manager] ----SessionManaged=true diff --cc data/menu.xml index 557721af,557721af,557721af,557721af..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/menu.xml +++ /dev/null @@@@@ -1,54 -1,54 -1,54 -1,54 +1,0 @@@@@ ---- ---- ---- ---- ---- ---- ---- crack-attack ---- ---- ---- xfrisk ---- ---- ---- quake3 ---- ---- ---- ---- ---- ---- xterm ---- ---- ---- mozilla ---- ---- ---- gaim ---- ---- ---- strange-quark ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- yesopenbox ---- obconf ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- diff --cc data/menu.xsd index e3e1e17b,e3e1e17b,e3e1e17b,e3e1e17b..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/menu.xsd +++ /dev/null @@@@@ -1,61 -1,61 -1,61 -1,61 +1,0 @@@@@ ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- diff --cc data/openbox.png index 70d1f074,70d1f074,70d1f074,70d1f074..00000000 deleted file mode 100644,100644,100644,100644 Binary files differ diff --cc data/rc.xml index f223f678,f223f678,f223f678,f223f678..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/rc.xml +++ /dev/null @@@@@ -1,730 -1,730 -1,730 -1,730 +1,0 @@@@@ ---- ---- ---- ---- ---- ---- ---- ---- 10 ---- 20 ---- ---- ---- ---- yes ---- ---- no ---- ---- yes ---- ---- no ---- ---- 200 ---- ---- no ---- ---- ---- ---- ---- Smart ---- ----
yes
---- ---- Any ---- ---- ---- ---- ---- Clearlooks ---- NLIMC ---- ---- yes ---- yes ---- ---- sans ---- 8 ---- ---- bold ---- ---- normal ---- ---- ---- ---- sans ---- 8 ---- ---- bold ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- normal ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- normal ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- bold ---- ---- normal ---- ---- ---- ---- ---- ---- ---- 4 ---- 1 ---- ---- ---- ---- 875 ---- ---- ---- ---- ---- yes ---- Nonpixel ---- ---- Center ---- ---- ---- ---- ---- 10 ---- ---- 10 ---- ---- ---- ---- ---- ---- ---- 0 ---- 0 ---- 0 ---- 0 ---- ---- ---- ---- TopLeft ---- ---- 0 ---- 0 ---- no ---- Above ---- ---- Vertical ---- ---- no ---- 300 ---- ---- 300 ---- ---- Middle ---- ---- ---- ---- ---- C-g ---- ---- ---- ---- leftno ---- ---- ---- rightno ---- ---- ---- upno ---- ---- ---- downno ---- ---- ---- leftno ---- ---- ---- rightno ---- ---- ---- upno ---- ---- ---- downno ---- ---- ---- 1 ---- ---- ---- 2 ---- ---- ---- 3 ---- ---- ---- 4 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- yesyes ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- true ---- Konqueror ---- ---- kfmclient openProfile filemanagement ---- ---- ---- ---- ---- ---- 8 ---- ---- 200 ---- ---- 400 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- no ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- yes ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- top ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- left ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- right ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- bottom ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- bottomleft ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- bottomright ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- topleft ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- topright ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- vertical ---- ---- ---- horizontal ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-list-combined-menu ---- ---- ---- root-menu ---- ---- ---- ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- previous ---- ---- ---- next ---- ---- ---- ---- ---- ---- ---- ---- ---- menu.xml ---- 200 ---- ---- no ---- ---- 100 ---- ---- yes ---- ---- yes ---- ---- ---- ---- ---- ---- ---- ---- diff --cc data/rc.xsd index de227ea1,de227ea1,de227ea1,de227ea1..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/rc.xsd +++ /dev/null @@@@@ -1,440 -1,440 -1,440 -1,440 +1,0 @@@@@ ---- ---- ---- ---- ---- ---- ---- ---- ---- all these elements are expected in a openbox config file ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- defines behaviour of windows when close to each other or the screen edge ---- ---- ---- ---- ---- ---- ---- defines aspects of window focus ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- defines how new windows are placed ---- ---- ---- ---- ---- ---- ---- ---- defines desktop margins ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- defines the number and names of desktops ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- diff --cc data/xbm/bullet.xbm index 88481ec8,88481ec8,88481ec8,88481ec8..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/bullet.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define bullet_width 4 ----#define bullet_height 7 ----static unsigned char bullet_bits[] = { ---- 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; diff --cc data/xbm/close.xbm index 4a88cff6,4a88cff6,4a88cff6,4a88cff6..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/close.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define close_width 6 ----#define close_height 6 ----static unsigned char close_bits[] = { ---- 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; diff --cc data/xbm/desk.xbm index 3e327e36,3e327e36,3e327e36,3e327e36..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/desk.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_width 6 ----#define desk_height 6 ----static unsigned char desk_bits[] = { ---- 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; diff --cc data/xbm/desk_toggled.xbm index d7e045ee,d7e045ee,d7e045ee,d7e045ee..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/desk_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_toggle_width 6 ----#define desk_toggle_height 6 ----static unsigned char desk_toggle_bits[] = { ---- 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; diff --cc data/xbm/iconify.xbm index 23048669,23048669,23048669,23048669..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/iconify.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_width 6 ----#define iconify_height 6 ----static unsigned char iconify_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; diff --cc data/xbm/max.xbm index 6d030af4,6d030af4,6d030af4,6d030af4..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/max.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 6 ----#define max_height 6 ----static unsigned char max_bits[] = { ---- 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --cc data/xbm/max_toggled.xbm index 44c7cefc,44c7cefc,44c7cefc,44c7cefc..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/max_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 6 ----#define max_height 6 ----static unsigned char max_bits[] = { ---- 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; diff --cc data/xbm/shade.xbm index edb3b171,edb3b171,edb3b171,edb3b171..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/shade.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_width 6 ----#define iconify_height 6 ----static unsigned char iconify_bits[] = { ---- 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; diff --cc data/xbm/shade_toggled.xbm index edb3b171,edb3b171,edb3b171,edb3b171..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xbm/shade_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_width 6 ----#define iconify_height 6 ----static unsigned char iconify_bits[] = { ---- 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; diff --cc data/xsession/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc data/xsession/openbox-gnome-session.in index 278ac6a8,278ac6a8,278ac6a8,278ac6a8..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox-gnome-session.in +++ /dev/null @@@@@ -1,12 -1,12 -1,12 -1,12 +1,0 @@@@@ ----#!/bin/sh ---- ----if test -n "$1"; then ---- echo "Syntax: openbox-gnome-session" ---- echo ---- echo "See the openbox-gnome-session(1) manpage for help." ---- exit ----fi ---- ----# Run GNOME with Openbox as its window manager ----export WINDOW_MANAGER="@bindir@/openbox" ----exec gnome-session --choose-session=openbox-session "$@" diff --cc data/xsession/openbox-gnome.desktop.in index 19ae82e0,19ae82e0,19ae82e0,19ae82e0..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox-gnome.desktop.in +++ /dev/null @@@@@ -1,8 -1,8 -1,8 -1,8 +1,0 @@@@@ ----[Desktop Entry] ----Encoding=UTF-8 ----Name=GNOME/Openbox ----Comment=Use the Openbox window manager inside of the GNOME desktop environment ----Exec=@bindir@/openbox-gnome-session ----TryExec=gnome-session ----Icon=openbox.png ----Type=XSession diff --cc data/xsession/openbox-kde-session.in index 16017260,16017260,16017260,16017260..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox-kde-session.in +++ /dev/null @@@@@ -1,12 -1,12 -1,12 -1,12 +1,0 @@@@@ ----#!/bin/sh ---- ----if test -n "$1"; then ---- echo "Syntax: openbox-kde-session" ---- echo ---- echo "See the openbox-kde-session(1) manpage for help." ---- exit ----fi ---- ----# Run KDE with Openbox as its window manager ----export KDEWM="@bindir@/openbox" ----exec startkde "$@" diff --cc data/xsession/openbox-kde.desktop.in index ddfc72d7,ddfc72d7,ddfc72d7,ddfc72d7..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox-kde.desktop.in +++ /dev/null @@@@@ -1,8 -1,8 -1,8 -1,8 +1,0 @@@@@ ----[Desktop Entry] ----Encoding=UTF-8 ----Name=KDE/Openbox ----Comment=Use the Openbox window manager inside of the K Desktop Environment ----Exec=@bindir@/openbox-kde-session ----TryExec=startkde ----Icon=openbox.png ----Type=XSession diff --cc data/xsession/openbox-session.in index cc2169f4,cc2169f4,cc2169f4,cc2169f4..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox-session.in +++ /dev/null @@@@@ -1,21 -1,21 -1,21 -1,21 +1,0 @@@@@ ----#!/bin/sh ---- ----if test -n "$1"; then ---- echo "Syntax: openbox-session" ---- echo ---- echo "See the openbox-session(1) manpage for help." ---- exit ----fi ---- ----AUTOSTART="$HOME/.config/openbox/autostart.sh" ----GLOBALAUTOSTART="@configdir@/openbox/autostart.sh" ---- ----if test -e $AUTOSTART; then ---- . $AUTOSTART ----else ---- if test -e $GLOBALAUTOSTART; then ---- . $GLOBALAUTOSTART ---- fi ----fi ---- ----exec @bindir@/openbox "$@" diff --cc data/xsession/openbox.desktop.in index 0914e5b4,0914e5b4,0914e5b4,0914e5b4..00000000 deleted file mode 100644,100644,100644,100644 --- a/data/xsession/openbox.desktop.in +++ /dev/null @@@@@ -1,8 -1,8 -1,8 -1,8 +1,0 @@@@@ ----[Desktop Entry] ----Encoding=UTF-8 ----Name=Openbox ----Comment=Log in using the Openbox window manager (without a session manager) ----Exec=@bindir@/openbox-session ----TryExec=@bindir@/openbox-session ----Icon=openbox.png ----Type=XSession diff --cc debian/changelog.in index a2172800,a2172800,a2172800,a2172800..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/changelog.in +++ /dev/null @@@@@ -1,6 -1,6 -1,6 -1,6 +1,0 @@@@@ ----openbox (@version@) unstable; urgency=low ---- ---- * Upstream release. ---- ---- -- Dana Jansens @time@ ---- diff --cc debian/compat index 7ed6ff82,7ed6ff82,7ed6ff82,7ed6ff82..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/compat +++ /dev/null @@@@@ -1,1 -1,1 -1,1 -1,1 +1,0 @@@@@ ----5 diff --cc debian/conffiles index 6319a21a,6319a21a,6319a21a,6319a21a..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/conffiles +++ /dev/null @@@@@ -1,2 -1,2 -1,2 -1,2 +1,0 @@@@@ ----/etc/xdg/openbox/rc.xml ----/etc/xdg/openbox/menu.xml diff --cc debian/control index 0a15a771,0a15a771,0a15a771,0a15a771..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/control +++ /dev/null @@@@@ -1,16 -1,16 -1,16 -1,16 +1,0 @@@@@ ----Source: openbox ----Section: x11 ----Priority: optional ----Maintainer: Dana Jansens ----Build-Depends: debhelper (>= 5), coreutils, sed, autotools-dev, gcc, automake1.9, autoconf, libtool, pkg-config, libpango1.0-dev, libglib2.0-dev, libxml2-dev, libxcursor-dev, libstartup-notification0-dev, xlibs-dev, libxinerama-dev, libxft2-dev ----Standards-Version: 3.7.2 ---- ----Package: openbox ----Architecture: i386 ----Depends: libc6, libglib2.0-0, libxcursor1, libx11-6, libpango1.0-0, libice6, libsm6, libxext6, libxinerama1, libxml2, libstartup-notification0, libxft2 ----Recommends: obconf, ttf-bitstream-vera ----Suggests: menu, x-display-manager, ksmserver | gnome-session, kdm | gdm ----Conflicts: menu (<< 2.1.12) ----Provides: x-window-manager ----Description: A minimalistic, highly configurable, next generation window manager with extensive standards support. ---- http://icculus.org/openbox/ diff --cc debian/copyright index 6c934000,6c934000,6c934000,6c934000..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/copyright +++ /dev/null @@@@@ -1,21 -1,21 -1,21 -1,21 +1,0 @@@@@ ----Homepage: http://openbox.org/ ---- ----The main upstream author is Dana Jansens . To see ----a more complete listing of contributors, look at the AUTHORS file. ---- ----Copyright: ---- ---- 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, or (at your option) any ---- later version. ---- ---- On Debian GNU/Linux systems, the complete text of the GNU General ---- Public License can be found in `/usr/share/common-licenses/GPL'. ---- ----Copyright for the Debian-related build-scripts: ---- ---- Copyright (C) 2007 Dana Jansens ---- ---- These scripts are placed under the BSD license, which may be found in ---- the file `/usr/share/common-licenses/BSD' on most Debian systems. diff --cc debian/menu index 97d2d14c,97d2d14c,97d2d14c,97d2d14c..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/menu +++ /dev/null @@@@@ -1,6 -1,6 -1,6 -1,6 +1,0 @@@@@ ----?package(openbox):\ ---- needs="wm"\ ---- section="WindowManagers"\ ---- title="Openbox"\ ---- command="/usr/bin/openbox"\ ---- icon="/usr/share/pixmaps/openbox.png" diff --cc debian/postinst index aa690370,aa690370,aa690370,aa690370..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/postinst +++ /dev/null @@@@@ -1,42 -1,42 -1,42 -1,42 +1,0 @@@@@ ----#!/bin/sh ----# postinst script for openbox ----# ----# see: dh_installdeb(1) ---- ----set -e ---- ----# summary of how this script can be called: ----# * `configure' ----# * `abort-upgrade' ----# * `abort-remove' `in-favour' ----# ----# * `abort-remove' ----# * `abort-deconfigure' `in-favour' ----# `removing' ----# ----# for details, see http://www.debian.org/doc/debian-policy/ or ----# the debian-policy package ---- ---- ----case "$1" in ---- configure) ---- if [ -x /usr/bin/update-menus ]; then update-menus; fi ---- ;; ---- ---- abort-upgrade|abort-remove|abort-deconfigure) ---- ;; ---- ---- *) ---- echo "postinst called with unknown argument \`$1'" >&2 ---- exit 1 ---- ;; ----esac ---- ----# dh_installdeb will replace this with shell code automatically ----# generated by other debhelper scripts. ---- ----#DEBHELPER# ---- ----exit 0 ---- ---- diff --cc debian/postrm index 641c6b92,641c6b92,641c6b92,641c6b92..00000000 deleted file mode 100644,100644,100644,100644 --- a/debian/postrm +++ /dev/null @@@@@ -1,43 -1,43 -1,43 -1,43 +1,0 @@@@@ ----#!/bin/sh ----# postrm script for openbox ----# ----# see: dh_installdeb(1) ---- ----set -e ---- ----# summary of how this script can be called: ----# * `remove' ----# * `purge' ----# * `upgrade' ----# * `failed-upgrade' ----# * `abort-install' ----# * `abort-install' ----# * `abort-upgrade' ----# * `disappear' ----# ----# for details, see http://www.debian.org/doc/debian-policy/ or ----# the debian-policy package ---- ----case "$1" in ---- purge) ---- ;; ---- remove) ---- if [ -x /usr/bin/update-menus ]; then update-menus ; fi ---- ;; ---- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ---- ;; ---- ---- *) ---- echo "postrm called with unknown argument \`$1'" >&2 ---- exit 1 ---- ;; ----esac ---- ----# dh_installdeb will replace this with shell code automatically ----# generated by other debhelper scripts. ---- ----#DEBHELPER# ---- ----exit 0 ---- ---- diff --cc debian/rules index dea855b2,dea855b2,dea855b2,dea855b2..00000000 deleted file mode 100755,100755,100755,100755 --- a/debian/rules +++ /dev/null @@@@@ -1,107 -1,107 -1,107 -1,107 +1,0 @@@@@ ----#!/usr/bin/make -f ----# -*- makefile -*- ----# Sample debian/rules that uses debhelper. ----# This file was originally written by Joey Hess and Craig Small. ----# As a special exception, when this file is copied by dh-make into a ----# dh-make output file, you may use that output file without restriction. ----# This special exception was added by Craig Small in version 0.37 of dh-make. ---- ----# Uncomment this to turn on verbose mode. ----#export DH_VERBOSE=1 ---- ---- ----# These are used for cross-compiling and for saving the configure script ----# from having to guess our platform (since we know it already) ----DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ----DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ---- ---- ----CFLAGS = -g ---- ----ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ---- CFLAGS += -O0 ----else ---- CFLAGS += -O2 ----endif ---- ----config.status: configure ---- dh_testdir ---- # Add here commands to configure the package. ---- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ---- ---- ----build: build-stamp ---- ----build-stamp: config.status ---- dh_testdir ---- ---- # Add here commands to compile the package. ---- $(MAKE) ---- #docbook-to-man debian/openbox.sgml > openbox.1 ---- ---- touch $@ ---- ----clean: ---- dh_testdir ---- dh_testroot ---- rm -f build-stamp ---- ---- # Add here commands to clean up after the build process. ---- -$(MAKE) distclean ----ifneq "$(wildcard /usr/share/misc/config.sub)" "" ---- cp -f /usr/share/misc/config.sub config.sub ----endif ----ifneq "$(wildcard /usr/share/misc/config.guess)" "" ---- cp -f /usr/share/misc/config.guess config.guess ----endif ---- ---- ---- dh_clean ---- ----install: build ---- dh_testdir ---- dh_testroot ---- dh_clean -k ---- dh_installdirs ---- ---- # Add here commands to install the package into debian/openbox. ---- $(MAKE) DESTDIR=$(CURDIR)/debian/openbox install ---- ---- ----# Build architecture-independent files here. ----binary-indep: build install ----# We have nothing to do by default. ---- ----# Build architecture-dependent files here. ----binary-arch: build install ---- dh_testdir ---- dh_testroot ---- dh_installchangelogs CHANGELOG ----# dh_installdocs ----# dh_installexamples ----# dh_install ---- dh_installmenu ----# dh_installdebconf ----# dh_installlogrotate ----# dh_installemacsen ----# dh_installpam ----# dh_installmime ----# dh_python ----# dh_installinit ----# dh_installcron ----# dh_installinfo ----# dh_installman ---- dh_link ---- dh_strip ---- dh_compress ---- dh_fixperms ----# dh_perl ----# dh_makeshlibs ---- dh_installdeb ---- dh_shlibdeps ---- dh_gencontrol ---- dh_md5sums ---- dh_builddeb ---- ----binary: binary-indep binary-arch ----.PHONY: build clean binary-indep binary-arch binary install diff --cc doc/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc doc/doxygen/comments index 7930f36a,7930f36a,7930f36a,7930f36a..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/doxygen/comments +++ /dev/null @@@@@ -1,11 -1,11 -1,11 -1,11 +1,0 @@@@@ ----// Further comments for doxygen on the src/ directory ---- ----/*! @namespace ob ---- The namespace containing the %Openbox window manager application ----*/ ---- ----/*! @namespace otk ---- The namespace containing a toolkit used by the Openbox window manager, ---- and also for use by external applications that wish to present a similar ---- visual appearance to Openbox. ----*/ diff --cc doc/doxygen/doxygen.conf.in index 768dc192,768dc192,768dc192,768dc192..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/doxygen/doxygen.conf.in +++ /dev/null @@@@@ -1,192 -1,192 -1,192 -1,192 +1,0 @@@@@ ----# Doxyfile 1.2.18 ---- ----#--------------------------------------------------------------------------- ----# General configuration options ----#--------------------------------------------------------------------------- ----PROJECT_NAME = Openbox ----PROJECT_NUMBER = @version@ ----OUTPUT_DIRECTORY = ----OUTPUT_LANGUAGE = English ----EXTRACT_ALL = YES ----EXTRACT_PRIVATE = YES ----EXTRACT_STATIC = YES ----EXTRACT_LOCAL_CLASSES = YES ----HIDE_UNDOC_MEMBERS = NO ----HIDE_UNDOC_CLASSES = NO ----HIDE_FRIEND_COMPOUNDS = NO ----BRIEF_MEMBER_DESC = YES ----REPEAT_BRIEF = YES ----ALWAYS_DETAILED_SEC = NO ----INLINE_INHERITED_MEMB = NO ----FULL_PATH_NAMES = YES ----STRIP_FROM_PATH = @basedir@ ----INTERNAL_DOCS = NO ----STRIP_CODE_COMMENTS = NO ----CASE_SENSE_NAMES = NO ----SHORT_NAMES = NO ----HIDE_SCOPE_NAMES = NO ----VERBATIM_HEADERS = YES ----SHOW_INCLUDE_FILES = YES ----JAVADOC_AUTOBRIEF = NO ----MULTILINE_CPP_IS_BRIEF = YES ----DETAILS_AT_TOP = YES ----INHERIT_DOCS = YES ----INLINE_INFO = YES ----SORT_MEMBER_DOCS = YES ----DISTRIBUTE_GROUP_DOC = NO ----TAB_SIZE = 2 ----GENERATE_TODOLIST = YES ----GENERATE_TESTLIST = YES ----GENERATE_BUGLIST = YES ----GENERATE_DEPRECATEDLIST= YES ----ALIASES = ----ENABLED_SECTIONS = ----MAX_INITIALIZER_LINES = 30 ----OPTIMIZE_OUTPUT_FOR_C = NO ----OPTIMIZE_OUTPUT_JAVA = NO ----SHOW_USED_FILES = YES ----#--------------------------------------------------------------------------- ----# configuration options related to warning and progress messages ----#--------------------------------------------------------------------------- ----QUIET = YES ----WARNINGS = YES ----WARN_IF_UNDOCUMENTED = YES ----WARN_FORMAT = "$file:$line: $text" ----WARN_LOGFILE = ----#--------------------------------------------------------------------------- ----# configuration options related to the input files ----#--------------------------------------------------------------------------- ----INPUT = ../../src ../../otk comments ----FILE_PATTERNS = *.hh *.cc ----RECURSIVE = NO ----EXCLUDE = ----EXCLUDE_SYMLINKS = NO ----EXCLUDE_PATTERNS = *_wrap.cc ----EXAMPLE_PATH = ----EXAMPLE_PATTERNS = ----EXAMPLE_RECURSIVE = NO ----IMAGE_PATH = ----INPUT_FILTER = ----FILTER_SOURCE_FILES = NO ----#--------------------------------------------------------------------------- ----# configuration options related to source browsing ----#--------------------------------------------------------------------------- ----SOURCE_BROWSER = YES ----INLINE_SOURCES = YES ----REFERENCED_BY_RELATION = YES ----REFERENCES_RELATION = YES ----#--------------------------------------------------------------------------- ----# configuration options related to the alphabetical class index ----#--------------------------------------------------------------------------- ----ALPHABETICAL_INDEX = NO ----COLS_IN_ALPHA_INDEX = 5 ----IGNORE_PREFIX = OB OTK _ ----#--------------------------------------------------------------------------- ----# configuration options related to the HTML output ----#--------------------------------------------------------------------------- ----GENERATE_HTML = YES ----HTML_OUTPUT = html ----HTML_FILE_EXTENSION = .html ----HTML_HEADER = ----HTML_FOOTER = ----HTML_STYLESHEET = ----HTML_ALIGN_MEMBERS = YES ----GENERATE_HTMLHELP = NO ----CHM_FILE = ----HHC_LOCATION = ----GENERATE_CHI = NO ----BINARY_TOC = NO ----TOC_EXPAND = NO ----DISABLE_INDEX = NO ----ENUM_VALUES_PER_LINE = 4 ----GENERATE_TREEVIEW = NO ----TREEVIEW_WIDTH = 200 ----#--------------------------------------------------------------------------- ----# configuration options related to the LaTeX output ----#--------------------------------------------------------------------------- ----GENERATE_LATEX = YES ----LATEX_OUTPUT = latex ----LATEX_CMD_NAME = latex ----MAKEINDEX_CMD_NAME = makeindex ----COMPACT_LATEX = NO ----PAPER_TYPE = letter ----EXTRA_PACKAGES = ----LATEX_HEADER = ----PDF_HYPERLINKS = YES ----USE_PDFLATEX = NO ----LATEX_BATCHMODE = NO ----#--------------------------------------------------------------------------- ----# configuration options related to the RTF output ----#--------------------------------------------------------------------------- ----GENERATE_RTF = NO ----RTF_OUTPUT = rtf ----COMPACT_RTF = NO ----RTF_HYPERLINKS = NO ----RTF_STYLESHEET_FILE = ----RTF_EXTENSIONS_FILE = ----#--------------------------------------------------------------------------- ----# configuration options related to the man page output ----#--------------------------------------------------------------------------- ----GENERATE_MAN = NO ----MAN_OUTPUT = man ----MAN_EXTENSION = .3 ----MAN_LINKS = NO ----#--------------------------------------------------------------------------- ----# configuration options related to the XML output ----#--------------------------------------------------------------------------- ----GENERATE_XML = NO ----XML_SCHEMA = ----XML_DTD = ----#--------------------------------------------------------------------------- ----# configuration options for the AutoGen Definitions output ----#--------------------------------------------------------------------------- ----GENERATE_AUTOGEN_DEF = NO ----#--------------------------------------------------------------------------- ----# Configuration options related to the preprocessor ----#--------------------------------------------------------------------------- ----ENABLE_PREPROCESSING = YES ----MACRO_EXPANSION = NO ----EXPAND_ONLY_PREDEF = NO ----SEARCH_INCLUDES = YES ----INCLUDE_PATH = ----INCLUDE_FILE_PATTERNS = ----PREDEFINED = DOXYGEN_IGNORE ----EXPAND_AS_DEFINED = ----SKIP_FUNCTION_MACROS = YES ----#--------------------------------------------------------------------------- ----# Configuration::addtions related to external references ----#--------------------------------------------------------------------------- ----TAGFILES = ----GENERATE_TAGFILE = ----ALLEXTERNALS = NO ----EXTERNAL_GROUPS = YES ----PERL_PATH = /usr/bin/perl ----#--------------------------------------------------------------------------- ----# Configuration options related to the dot tool ----#--------------------------------------------------------------------------- ----CLASS_DIAGRAMS = YES ----HIDE_UNDOC_RELATIONS = YES ----HAVE_DOT = YES ----CLASS_GRAPH = YES ----COLLABORATION_GRAPH = YES ----TEMPLATE_RELATIONS = YES ----INCLUDE_GRAPH = YES ----INCLUDED_BY_GRAPH = YES ----GRAPHICAL_HIERARCHY = NO ----DOT_IMAGE_FORMAT = png ----DOT_PATH = ----DOTFILE_DIRS = ----MAX_DOT_GRAPH_WIDTH = 1024 ----MAX_DOT_GRAPH_HEIGHT = 1024 ----GENERATE_LEGEND = YES ----DOT_CLEANUP = YES ----#--------------------------------------------------------------------------- ----# Configuration::addtions related to the search engine ----#--------------------------------------------------------------------------- ----SEARCHENGINE = NO ----CGI_NAME = search.cgi ----CGI_URL = ----DOC_URL = ----DOC_ABSPATH = ----BIN_ABSPATH = /usr/local/bin/ ----EXT_DOC_PATHS = diff --cc doc/openbox-gnome-session.1.in index f38c9bf6,f38c9bf6,f38c9bf6,f38c9bf6..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-gnome-session.1.in +++ /dev/null @@@@@ -1,22 -1,22 -1,22 -1,22 +1,0 @@@@@ ----.TH "OPENBOX" "1" ----.SH "NAME" ----openbox-gnome-session \(em Run a GNOME session with Openbox as the window manager ---- ----.SH "DESCRIPTION" ----.PP ----\fBopenbox-gnome-session\fR runs a GNOME session with ----Openbox as the window manager. ----.PP ----\fBopenbox-gnome-session\fR does not take any command line ----arguments. ----.SH "SEE ALSO" ----.PP ----openbox(1), openbox-kde-session(1), openbox-session(1). ---- ----.PP ----The program's full documentation is available on the website: ----\fBhttp://icculus.org/openbox/\fP ----.PP ----Please report bugs to: \fBhttp://bugzilla.icculus.org/ ----\fP ----.\" created by instant / docbook-to-man, Wed 23 May 2007, 14:03 diff --cc doc/openbox-gnome-session.1.sgml index c72865a7,c72865a7,c72865a7,c72865a7..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-gnome-session.1.sgml +++ /dev/null @@@@@ -1,76 -1,76 -1,76 -1,76 +1,0 @@@@@ ---- manpage.1'. You may view ---- the manual page with: `docbook-to-man manpage.sgml | nroff -man | ---- less'. A typical entry in a Makefile or Makefile.am is: ---- ----manpage.1: manpage.sgml ---- docbook-to-man $< > $@ ---- ---- ---- The docbook-to-man binary is found in the docbook-to-man package. ---- Please remember that if you create the nroff version in one of the ---- debian/rules file targets (such as build), you will need to include ---- docbook-to-man in your Build-Depends control field. ---- ---- --> ---- ---- 1"> ---- OPENBOX"> ---- ----]> ---- ---- ---- ---- &dhucpackage; ---- ---- &dhsection; ---- ---- ---- &dhpackage; ---- ---- Run a GNOME session with Openbox as the window manager ---- ---- ---- ---- DESCRIPTION ---- ---- &dhpackage; runs a GNOME session with ---- Openbox as the window manager. ---- ---- &dhpackage; does not take any command line ---- arguments. ---- ---- ---- SEE ALSO ---- ---- openbox(1), openbox-kde-session(1), openbox-session(1). ---- ---- ---- The program's full documentation is available on the website: ---- http://icculus.org/openbox/ ---- ---- Please report bugs to: http://bugzilla.icculus.org/ ---- ---- ---- ---- ---- ---- ---- diff --cc doc/openbox-kde-session.1.in index d46d14b4,d46d14b4,d46d14b4,d46d14b4..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-kde-session.1.in +++ /dev/null @@@@@ -1,22 -1,22 -1,22 -1,22 +1,0 @@@@@ ----.TH "OPENBOX" "1" ----.SH "NAME" ----openbox-kde-session \(em Run a KDE session with Openbox as the window manager ---- ----.SH "DESCRIPTION" ----.PP ----\fBopenbox-kde-session\fR runs a KDE session with ----Openbox as the window manager. ----.PP ----\fBopenbox-kde-session\fR does not take any command line ----arguments. ----.SH "SEE ALSO" ----.PP ----openbox(1), openbox-gnome-session(1), openbox-session(1). ---- ----.PP ----The program's full documentation is available on the website: ----\fBhttp://icculus.org/openbox/\fP ----.PP ----Please report bugs to: \fBhttp://bugzilla.icculus.org/ ----\fP ----.\" created by instant / docbook-to-man, Wed 23 May 2007, 14:03 diff --cc doc/openbox-kde-session.1.sgml index e4f049db,e4f049db,e4f049db,e4f049db..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-kde-session.1.sgml +++ /dev/null @@@@@ -1,76 -1,76 -1,76 -1,76 +1,0 @@@@@ ---- manpage.1'. You may view ---- the manual page with: `docbook-to-man manpage.sgml | nroff -man | ---- less'. A typical entry in a Makefile or Makefile.am is: ---- ----manpage.1: manpage.sgml ---- docbook-to-man $< > $@ ---- ---- ---- The docbook-to-man binary is found in the docbook-to-man package. ---- Please remember that if you create the nroff version in one of the ---- debian/rules file targets (such as build), you will need to include ---- docbook-to-man in your Build-Depends control field. ---- ---- --> ---- ---- 1"> ---- OPENBOX"> ---- ----]> ---- ---- ---- ---- &dhucpackage; ---- ---- &dhsection; ---- ---- ---- &dhpackage; ---- ---- Run a KDE session with Openbox as the window manager ---- ---- ---- ---- DESCRIPTION ---- ---- &dhpackage; runs a KDE session with ---- Openbox as the window manager. ---- ---- &dhpackage; does not take any command line ---- arguments. ---- ---- ---- SEE ALSO ---- ---- openbox(1), openbox-gnome-session(1), openbox-session(1). ---- ---- ---- The program's full documentation is available on the website: ---- http://icculus.org/openbox/ ---- ---- Please report bugs to: http://bugzilla.icculus.org/ ---- ---- ---- ---- ---- ---- ---- diff --cc doc/openbox-session.1.in index 26232474,26232474,26232474,26232474..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-session.1.in +++ /dev/null @@@@@ -1,42 -1,42 -1,42 -1,42 +1,0 @@@@@ ----.TH "OPENBOX" "1" ----.SH "NAME" ----openbox-session \(em Runs an Openbox session without any session manager. ---- ----.SH "DESCRIPTION" ----.PP ----\fBopenbox-session\fR runs an openbox session without ----any session manager. Without a session manager, you will not be able ----to save your state from one log in to the next. ----.PP ----\fBopenbox-session\fR does not take any command line ----arguments. ----.PP ----On log in, \fBopenbox-session\fR will run the ----~/.config/openbox/autostart.sh script if it exists, and will run the ----system-wide script @configdir@/openbox/autostart.sh otherwise. You may ----place anything you want to run automatically in those files, for example: ---- ----.PP ----.RS ----.PP ----.nf ----xsetroot \-solid grey & ----gnome-settings-daemon & ----.fi ----.RE ----.PP ----Make sure that each line is followed by a "&" or else the script will ----stop there and further commands will not be executed. You can use the ----@configdir@/openbox/autostart.sh file as an example for creating your ----own. ----.SH "SEE ALSO" ----.PP ----openbox(1), openbox-session(1), openbox-gnome-session(1). ---- ----.PP ----The program's full documentation is available on the website: ----\fBhttp://icculus.org/openbox/\fP ----.PP ----Please report bugs to: \fBhttp://bugzilla.icculus.org/ ----\fP ----.\" created by instant / docbook-to-man, Wed 23 May 2007, 14:03 diff --cc doc/openbox-session.1.sgml index 3c31755e,3c31755e,3c31755e,3c31755e..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox-session.1.sgml +++ /dev/null @@@@@ -1,93 -1,93 -1,93 -1,93 +1,0 @@@@@ ---- manpage.1'. You may view ---- the manual page with: `docbook-to-man manpage.sgml | nroff -man | ---- less'. A typical entry in a Makefile or Makefile.am is: ---- ----manpage.1: manpage.sgml ---- docbook-to-man $< > $@ ---- ---- ---- The docbook-to-man binary is found in the docbook-to-man package. ---- Please remember that if you create the nroff version in one of the ---- debian/rules file targets (such as build), you will need to include ---- docbook-to-man in your Build-Depends control field. ---- ---- --> ---- ---- 1"> ---- OPENBOX"> ---- ----]> ---- ---- ---- ---- &dhucpackage; ---- ---- &dhsection; ---- ---- ---- &dhpackage; ---- ---- Runs an Openbox session without any session manager. ---- ---- ---- ---- DESCRIPTION ---- ---- &dhpackage; runs an openbox session without ---- any session manager. Without a session manager, you will not be able ---- to save your state from one log in to the next. ---- ---- &dhpackage; does not take any command line ---- arguments. ---- ---- On log in, &dhpackage; will run the ---- ~/.config/openbox/autostart.sh script if it exists, and will run the ---- system-wide script @configdir@/openbox/autostart.sh otherwise. You may ---- place anything you want to run automatically in those files, for example: ---- ---- ----
---- xsetroot -solid grey & ---- gnome-settings-daemon &
---- ---- Make sure that each line is followed by a "&" or else the script will ---- stop there and further commands will not be executed. You can use the ---- @configdir@/openbox/autostart.sh file as an example for creating your ---- own. ---- ---- ---- ---- SEE ALSO ---- ---- openbox(1), openbox-session(1), openbox-gnome-session(1). ---- ---- ---- The program's full documentation is available on the website: ---- http://icculus.org/openbox/ ---- ---- Please report bugs to: http://bugzilla.icculus.org/ ---- ---- ---- ---- ---- ---- ---- diff --cc doc/openbox.1.in index 2a5446f3,2a5446f3,2a5446f3,2a5446f3..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox.1.in +++ /dev/null @@@@@ -1,95 -1,95 -1,95 -1,95 +1,0 @@@@@ ----.TH "OPENBOX" "1" ----.SH "NAME" ----openbox \(em A minimalistic, highly configurable, next generation window ----manager with extensive standards support. ----.SH "SYNOPSIS" ----.PP ----\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-restart\fP] [\fB\-\-sm-disable\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] [\fB\-\-debug-xinerama\fP] ----.SH "DESCRIPTION" ----.PP ----Openbox is minimalistic, highly configurable, next generation window ----manager with extensive standards support. ----.PP ----You can start Openbox in three ways: ----.PP ----If you run a display manager such as GDM, you will find 3 entries ----in the login session type menu for Openbox: ----\fBGNOME/Openbox\fR, \fBKDE/Openbox\fR and \fBOpenbox\fR. If you want to use Openbox ----within GNOME or KDE, you can choose the appropriate entry, and it will ----launch GNOME or KDE with Openbox as the window manager. ----.PP ----The third option at log in, which is \fBOpenbox\fR without a session manager, uses the \fBopenbox-session\fR command to start Openbox. On log in, \fBopenbox\fR will ----run the ~/.config/openbox/autostart.sh script if it exists, and will run ----the system-wide script @configdir@/openbox/autostart.sh otherwise. You ----may place anything you want to run automatically in those files, for ----example: ---- ----.PP ----.RS ----.PP ----.nf ----xsetroot \-solid grey & ----gnome-settings-daemon & ----.fi ----.RE ----.PP ----Make sure that each line is followed by a "&" or else the script will ----stop there and further commands will not be executed. You can use the ----@configdir@/openbox/autostart.sh file as an example for creating your ----own. ----.PP ----The default @configdir@/openbox/autostart.sh runs a number of things ----with Openbox. ----.PP ----Lastly, if you use \fBstartx\fR to launch your X ----session, you can set up a ~/.xinitrc file to run ----\fBopenbox-session\fR and follow the same directions as ----above regarding the autostart.sh file. ----.PP ----You can use the \fBobconf\fR tool to configure Openbox ----easily with a graphical interface, however more in-depth configuration ----is possible by editing the configuration files by hand. ----.PP ----The default configuration and menu files are installed in ----@configdir@/openbox/, and the user configuration is placed in ----~/.config/openbox/. You can copy the default configuration and menus ----to ~/.config/openbox and edit it to your liking. ----.SH "OPTIONS" ----.PP ----These are the possible options that \fBopenbox\fR accepts: ----.IP "\fB\-\-help\fP" 10 ----Show a summary of the options available. ----.IP "\fB\-\-version\fP" 10 ----Show the version of the program. ----.IP "\fB\-\-replace\fP" 10 ----Replace the currently running window manager. ----.IP "\fB\-\-reconfigure\fP" 10 ----If Openbox is already running on the display, tell it to ----reload its configuration. ----.IP "\fB\-\-restart\fP" 10 ----If Openbox is already running on the display, tell it to ----restart. This is useful if you have upgraded Openbox and don't ----want to restart X. ----.IP "\fB\-\-sm-disable\fP" 10 ----Do not connect to the session manager. ----.IP "\fB\-\-sync\fP" 10 ----Run in synchronous mode (for debugging). ----.IP "\fB\-\-debug\fP" 10 ----Display debugging output. ----.IP "\fB\-\-debug-focus\fP" 10 ----Display debugging output for focus handling. ----.IP "\fB\-\-debug-xinerama\fP" 10 ----Split the display into two fake xinerama regions, if ----xinerama is not already enabled. This is for debugging ----xinerama support. ----.SH "SEE ALSO" ----.PP ----obconf (1), openbox-session(1), openbox-gnome-session(1), ----openbox-kde-session(1). ----.PP ----The program's full documentation is available on the website: ----\fBhttp://icculus.org/openbox/\fP ----.PP ----Please report bugs to: \fBhttp://bugzilla.icculus.org/ ----\fP ----.\" created by instant / docbook-to-man, Tue 22 May 2007, 00:06 diff --cc doc/openbox.1.sgml index 6921a666,6921a666,6921a666,6921a666..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/openbox.1.sgml +++ /dev/null @@@@@ -1,204 -1,204 -1,204 -1,204 +1,0 @@@@@ ---- manpage.1'. You may view ---- the manual page with: `docbook-to-man manpage.sgml | nroff -man | ---- less'. A typical entry in a Makefile or Makefile.am is: ---- ----manpage.1: manpage.sgml ---- docbook-to-man $< > $@ ---- ---- ---- The docbook-to-man binary is found in the docbook-to-man package. ---- Please remember that if you create the nroff version in one of the ---- debian/rules file targets (such as build), you will need to include ---- docbook-to-man in your Build-Depends control field. ---- ---- --> ---- ---- 1"> ---- OPENBOX"> ---- ----]> ---- ---- ---- ---- &dhucpackage; ---- ---- &dhsection; ---- ---- ---- &dhpackage; ---- ---- A minimalistic, highly configurable, next generation window ---- manager with extensive standards support. ---- ---- ---- ---- &dhpackage; ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- DESCRIPTION ---- ---- Openbox is minimalistic, highly configurable, next generation window ---- manager with extensive standards support. ---- ---- You can start Openbox in three ways: ---- ---- If you run a display manager such as GDM, you will find 3 entries ---- in the login session type menu for Openbox: ---- GNOME/Openbox, KDE/Openbox ---- and Openbox. If you want to use Openbox ---- within GNOME or KDE, you can choose the appropriate entry, and it will ---- launch GNOME or KDE with Openbox as the window manager. ---- ---- The third option at log in, which is Openbox ---- without a session manager, uses the openbox-session ---- command to start Openbox. On log in, &dhpackage; will ---- run the ~/.config/openbox/autostart.sh script if it exists, and will run ---- the system-wide script @configdir@/openbox/autostart.sh otherwise. You ---- may place anything you want to run automatically in those files, for ---- example: ---- ---- ----
---- xsetroot -solid grey & ---- gnome-settings-daemon &
---- ---- Make sure that each line is followed by a "&" or else the script will ---- stop there and further commands will not be executed. You can use the ---- @configdir@/openbox/autostart.sh file as an example for creating your ---- own. ---- ---- The default @configdir@/openbox/autostart.sh runs a number of things ---- with Openbox. ---- ---- Lastly, if you use startx to launch your X ---- session, you can set up a ~/.xinitrc file to run ---- openbox-session and follow the same directions as ---- above regarding the autostart.sh file. ---- ---- You can use the obconf tool to configure Openbox ---- easily with a graphical interface, however more in-depth configuration ---- is possible by editing the configuration files by hand. ---- ---- The default configuration and menu files are installed in ---- @configdir@/openbox/, and the user configuration is placed in ---- ~/.config/openbox/. You can copy the default configuration and menus ---- to ~/.config/openbox and edit it to your liking. ---- ---- ---- OPTIONS ---- ---- These are the possible options that &dhpackage; accepts: ---- ---- ---- ---- ---- Show a summary of the options available. ---- ---- ---- ---- ---- ---- Show the version of the program. ---- ---- ---- ---- ---- ---- Replace the currently running window manager. ---- ---- ---- ---- ---- ---- If Openbox is already running on the display, tell it to ---- reload its configuration. ---- ---- ---- ---- ---- ---- If Openbox is already running on the display, tell it to ---- restart. This is useful if you have upgraded Openbox and don't ---- want to restart X. ---- ---- ---- ---- ---- ---- Do not connect to the session manager. ---- ---- ---- ---- ---- ---- Run in synchronous mode (for debugging). ---- ---- ---- ---- ---- ---- Display debugging output. ---- ---- ---- ---- ---- ---- Display debugging output for focus handling. ---- ---- ---- ---- ---- ---- Split the display into two fake xinerama regions, if ---- xinerama is not already enabled. This is for debugging ---- xinerama support. ---- ---- ---- ---- ---- ---- SEE ALSO ---- ---- obconf (1), openbox-session(1), openbox-gnome-session(1), ---- openbox-kde-session(1). ---- ---- The program's full documentation is available on the website: ---- http://icculus.org/openbox/ ---- ---- Please report bugs to: http://bugzilla.icculus.org/ ---- ---- ---- ---- ---- ---- ---- diff --cc doc/rc-mouse-focus.xml index 0e71c03c,0e71c03c,0e71c03c,0e71c03c..00000000 deleted file mode 100644,100644,100644,100644 --- a/doc/rc-mouse-focus.xml +++ /dev/null @@@@@ -1,635 -1,635 -1,635 -1,635 +1,0 @@@@@ ---- ---- ---- ---- ---- ---- ---- ---- 10 ---- 20 ---- ---- ---- ---- yes ---- ---- yes ---- ---- yes ---- ---- no ---- ---- 200 ---- ---- no ---- ---- ---- ---- ---- Smart ---- ---- ---- ---- ---- Clearlooks ---- NLIMC ---- ---- yes ---- yes ---- ---- sans ---- 8 ---- ---- bold ---- ---- normal ---- ---- ---- ---- sans ---- 8 ---- ---- bold ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- normal ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- normal ---- ---- normal ---- ---- ---- ---- sans ---- 9 ---- ---- bold ---- ---- normal ---- ---- ---- ---- ---- ---- ---- 4 ---- 1 ---- ---- ---- ---- ---- ---- ---- yes ---- Nonpixel ---- ---- Center ---- ---- ---- ---- ---- TopLeft ---- ---- 0 ---- 0 ---- no ---- Above ---- ---- Vertical ---- ---- no ---- 300 ---- ---- 300 ---- ---- Middle ---- ---- ---- ---- ---- C-g ---- ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- no ---- ---- ---- 1 ---- ---- ---- 2 ---- ---- ---- 3 ---- ---- ---- 4 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- yesyes ---- ---- ---- ---- ---- ---- ---- ---- true ---- Konqueror ---- ---- kfmclient openProfile filemanagement ---- ---- ---- ---- ---- ---- 8 ---- ---- 200 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- top ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- left ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- right ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- bottom ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-menu ---- ---- ---- ---- client-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- client-list-combined-menu ---- ---- ---- root-menu ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- menu.xml ---- 200 ---- no ---- 100 ---- yes ---- ---- ---- ---- ---- ---- ---- diff --cc gettext.h index d71caf0b,d71caf0b,d71caf0b,d71caf0b..00000000 deleted file mode 100644,100644,100644,100644 --- a/gettext.h +++ /dev/null @@@@@ -1,91 -1,91 -1,91 -1,91 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- gettext.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----/* Convenience header for conditional use of GNU . ---- Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. ---- ---- This program is free software; you can redistribute it and/or modify it ---- under the terms of the GNU Library General Public License as published ---- by the Free Software Foundation; either version 2, 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 ---- Library General Public License for more details. ---- ---- You should have received a copy of the GNU Library 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 _LIBGETTEXT_H ----#define _LIBGETTEXT_H 1 ---- ---- ----/* NLS can be disabled through the configure --disable-nls option. */ ----#if ENABLE_NLS ---- ----/* Get declarations of GNU message catalog functions. */ ----# include ---- ----#else ---- ----/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which ---- chokes if dcgettext is defined as a macro. So include it now, to make ---- later inclusions of a NOP. We don't include ---- as well because people using "gettext.h" will not include , ---- and also including would fail on SunOS 4, whereas ---- is OK. */ ----#if defined(__sun) ----# include ----#endif ---- ----/* Disabled NLS. ---- The casts to 'const char *' serve the purpose of producing warnings ---- for invalid uses of the value returned from these functions. ---- On pre-ANSI systems without 'const', the config.h file is supposed to ---- contain "#define const". */ ----# define gettext(Msgid) ((const char *) (Msgid)) ----# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) ----# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) ----# define ngettext(Msgid1, Msgid2, N) \ ---- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ----# define dngettext(Domainname, Msgid1, Msgid2, N) \ ---- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ----# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ---- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ----# define textdomain(Domainname) ((const char *) (Domainname)) ----# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) ----# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) ---- ----#endif ---- ----/* A pseudo function call that serves as a marker for the automated ---- extraction of messages, but does not call gettext(). The run-time ---- translation is done at a different place in the code. ---- The argument, String, should be a literal string. Concatenated strings ---- and other string expressions won't work. ---- The macro's expansion is not parenthesized, so that it is suitable as ---- initializer for static 'char[]' or 'const char[]' variables. */ ----#define gettext_noop(String) String ---- ----/* Custom macro to make life easier */ ----#define _(str) gettext(str) ---- ----#endif /* _LIBGETTEXT_H */ diff --cc install-sh index 36f96f3e,36f96f3e,36f96f3e,36f96f3e..00000000 deleted file mode 100644,100644,100644,100644 --- a/install-sh +++ /dev/null @@@@@ -1,276 -1,276 -1,276 -1,276 +1,0 @@@@@ ----#!/bin/sh ----# ----# install - install a program, script, or datafile ----# This comes from X11R5 (mit/util/scripts/install.sh). ----# ----# Copyright 1991 by the Massachusetts Institute of Technology ----# ----# Permission to use, copy, modify, distribute, and sell this software and its ----# documentation for any purpose is hereby granted without fee, provided that ----# the above copyright notice appear in all copies and that both that ----# copyright notice and this permission notice appear in supporting ----# documentation, and that the name of M.I.T. not be used in advertising or ----# publicity pertaining to distribution of the software without specific, ----# written prior permission. M.I.T. makes no representations about the ----# suitability of this software for any purpose. It is provided "as is" ----# without express or implied warranty. ----# ----# Calling this script install-sh is preferred over install.sh, to prevent ----# `make' implicit rules from creating a file called install from it ----# when there is no Makefile. ----# ----# This script is compatible with the BSD install script, but was written ----# from scratch. It can only install one file at a time, a restriction ----# shared with many OS's install programs. ---- ---- ----# set DOITPROG to echo to test this script ---- ----# Don't use :- since 4.3BSD and earlier shells don't like it. ----doit="${DOITPROG-}" ---- ---- ----# put in absolute paths if you don't have them in your path; or use env. vars. ---- ----mvprog="${MVPROG-mv}" ----cpprog="${CPPROG-cp}" ----chmodprog="${CHMODPROG-chmod}" ----chownprog="${CHOWNPROG-chown}" ----chgrpprog="${CHGRPPROG-chgrp}" ----stripprog="${STRIPPROG-strip}" ----rmprog="${RMPROG-rm}" ----mkdirprog="${MKDIRPROG-mkdir}" ---- ----transformbasename="" ----transform_arg="" ----instcmd="$mvprog" ----chmodcmd="$chmodprog 0755" ----chowncmd="" ----chgrpcmd="" ----stripcmd="" ----rmcmd="$rmprog -f" ----mvcmd="$mvprog" ----src="" ----dst="" ----dir_arg="" ---- ----while [ x"$1" != x ]; do ---- case $1 in ---- -c) instcmd=$cpprog ---- shift ---- continue;; ---- ---- -d) dir_arg=true ---- shift ---- continue;; ---- ---- -m) chmodcmd="$chmodprog $2" ---- shift ---- shift ---- continue;; ---- ---- -o) chowncmd="$chownprog $2" ---- shift ---- shift ---- continue;; ---- ---- -g) chgrpcmd="$chgrpprog $2" ---- shift ---- shift ---- continue;; ---- ---- -s) stripcmd=$stripprog ---- shift ---- continue;; ---- ---- -t=*) transformarg=`echo $1 | sed 's/-t=//'` ---- shift ---- continue;; ---- ---- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ---- shift ---- continue;; ---- ---- *) if [ x"$src" = x ] ---- then ---- src=$1 ---- else ---- # this colon is to work around a 386BSD /bin/sh bug ---- : ---- dst=$1 ---- fi ---- shift ---- continue;; ---- esac ----done ---- ----if [ x"$src" = x ] ----then ---- echo "$0: no input file specified" >&2 ---- exit 1 ----else ---- : ----fi ---- ----if [ x"$dir_arg" != x ]; then ---- dst=$src ---- src="" ---- ---- if [ -d "$dst" ]; then ---- instcmd=: ---- chmodcmd="" ---- else ---- instcmd=$mkdirprog ---- fi ----else ---- ----# Waiting for this to be detected by the "$instcmd $src $dsttmp" command ----# might cause directories to be created, which would be especially bad ----# if $src (and thus $dsttmp) contains '*'. ---- ---- if [ -f "$src" ] || [ -d "$src" ] ---- then ---- : ---- else ---- echo "$0: $src does not exist" >&2 ---- exit 1 ---- fi ---- ---- if [ x"$dst" = x ] ---- then ---- echo "$0: no destination specified" >&2 ---- exit 1 ---- else ---- : ---- fi ---- ----# If destination is a directory, append the input filename; if your system ----# does not like double slashes in filenames, you may need to add some logic ---- ---- if [ -d "$dst" ] ---- then ---- dst=$dst/`basename "$src"` ---- else ---- : ---- fi ----fi ---- ----## this sed command emulates the dirname command ----dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ---- ----# Make sure that the destination directory exists. ----# this part is taken from Noah Friedman's mkinstalldirs script ---- ----# Skip lots of stat calls in the usual case. ----if [ ! -d "$dstdir" ]; then ----defaultIFS=' ---- ' ----IFS="${IFS-$defaultIFS}" ---- ----oIFS=$IFS ----# Some sh's can't handle IFS=/ for some reason. ----IFS='%' ----set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ----IFS=$oIFS ---- ----pathcomp='' ---- ----while [ $# -ne 0 ] ; do ---- pathcomp=$pathcomp$1 ---- shift ---- ---- if [ ! -d "$pathcomp" ] ; ---- then ---- $mkdirprog "$pathcomp" ---- else ---- : ---- fi ---- ---- pathcomp=$pathcomp/ ----done ----fi ---- ----if [ x"$dir_arg" != x ] ----then ---- $doit $instcmd "$dst" && ---- ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && ---- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && ---- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && ---- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi ----else ---- ----# If we're going to rename the final executable, determine the name now. ---- ---- if [ x"$transformarg" = x ] ---- then ---- dstfile=`basename "$dst"` ---- else ---- dstfile=`basename "$dst" $transformbasename | ---- sed $transformarg`$transformbasename ---- fi ---- ----# don't allow the sed command to completely eliminate the filename ---- ---- if [ x"$dstfile" = x ] ---- then ---- dstfile=`basename "$dst"` ---- else ---- : ---- fi ---- ----# Make a couple of temp file names in the proper directory. ---- ---- dsttmp=$dstdir/#inst.$$# ---- rmtmp=$dstdir/#rm.$$# ---- ----# Trap to clean up temp files at exit. ---- ---- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 ---- trap '(exit $?); exit' 1 2 13 15 ---- ----# Move or copy the file name to the temp name ---- ---- $doit $instcmd "$src" "$dsttmp" && ---- ----# and set any options; do chmod last to preserve setuid bits ---- ----# If any of these fail, we abort the whole thing. If we want to ----# ignore errors from any of these, just make sure not to ignore ----# errors from the above "$doit $instcmd $src $dsttmp" command. ---- ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && ---- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && ---- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && ---- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ---- ----# Now remove or move aside any old file at destination location. We try this ----# two ways since rm can't unlink itself on some systems and the destination ----# file might be busy for other reasons. In this case, the final cleanup ----# might fail but the new file should still install successfully. ---- ----{ ---- if [ -f "$dstdir/$dstfile" ] ---- then ---- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || ---- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || ---- { ---- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ---- (exit 1); exit ---- } ---- else ---- : ---- fi ----} && ---- ----# Now rename the file to the real destination. ---- ---- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ---- ----fi && ---- ----# The final little trick to "correctly" pass the exit status to the exit trap. ---- ----{ ---- (exit 0); exit ----} diff --cc m4/Makefile.am index da7255eb,da7255eb,da7255eb,da7255eb..00000000 deleted file mode 100644,100644,100644,100644 --- a/m4/Makefile.am +++ /dev/null @@@@@ -1,33 -1,33 -1,33 -1,33 +1,0 @@@@@ ----EXTRA_DIST=\ ---- codeset.m4 \ ---- gettext.m4 \ ---- glibc21.m4 \ ---- glibc2.m4 \ ---- iconv.m4 \ ---- intdiv0.m4 \ ---- intmax.m4 \ ---- inttypes_h.m4 \ ---- inttypes-h.m4 \ ---- inttypes-pri.m4 \ ---- lcmessage.m4 \ ---- lib-ld.m4 \ ---- lib-link.m4 \ ---- lib-prefix.m4 \ ---- lock.m4 \ ---- longdouble.m4 \ ---- longlong.m4 \ ---- nls.m4 \ ---- openbox.m4 \ ---- po.m4 \ ---- printf-posix.m4 \ ---- progtest.m4 \ ---- signed.m4 \ ---- size_max.m4 \ ---- stdint_h.m4 \ ---- uintmax_t.m4 \ ---- ulonglong.m4 \ ---- visibility.m4 \ ---- wchar_t.m4 \ ---- wint_t.m4 \ ---- x11.m4 \ ---- xsize.m4 diff --cc m4/openbox.m4 index 5a95e846,5a95e846,5a95e846,5a95e846..00000000 deleted file mode 100644,100644,100644,100644 --- a/m4/openbox.m4 +++ /dev/null @@@@@ -1,110 -1,110 -1,110 -1,110 +1,0 @@@@@ ----# OB_DEBUG() ----# ----# Check if the user has requested a debug build. ----# Sets the DEBUG or NDEBUG variables as appropriate ----# Sets the CVS environment variable when building CVS sources. ----AC_DEFUN([OB_DEBUG], ----[ ---- AC_MSG_CHECKING([build type]) ---- ---- AC_ARG_ENABLE([strict-ansi], ---- AC_HELP_STRING([--enable-strict-ansi],[Enable strict ANSI compliance build [[default=no]]]), ---- [STRICT=$enableval], [STRICT="no"]) ---- ---- AC_ARG_ENABLE([debug], ---- AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]), ---- [DEBUG=$enableval], [DEBUG="no"]) ---- ---- AC_ARG_ENABLE([gprof], ---- AC_HELP_STRING([--enable-gprof],[Enable gprof profiling output [[default=no]]]), ---- [PROF=$enableval], [PROF="no"]) ---- ---- AC_ARG_ENABLE([gprof-libc], ---- AC_HELP_STRING([--enable-gprof-libc],[Link against libc with profiling support [[default=no]]]), ---- [PROFLC=$enableval], [PROFLC="no"]) ---- ---- if test "$PROFLC" = "yes"; then ---- PROF="yes" # always enable profiling then ---- fi ---- ---- TEST="" ---- test "${PACKAGE_VERSION%*alpha*}" != "$PACKAGE_VERSION" && TEST="yes" ---- test "${PACKAGE_VERSION%*beta*}" != "$PACKAGE_VERSION" && TEST="yes" ---- test "$TEST" = "yes" && DEBUG="yes" ---- ---- if test "$DEBUG" = "yes"; then ---- MSG="DEBUG" ---- else ---- MSG="RELEASE" ---- fi ---- if test "$TEST" = "yes"; then ---- MSG="$MSG (test release)" ---- fi ---- if test "$STRICT" = "yes"; then ---- MSG="$MSG with strict ANSI compliance" ---- fi ---- AC_MSG_RESULT([$MSG]) ---- ---- test "$DEBUG" = "yes" && \ ---- AC_DEFINE([DEBUG], [1], [Creating a debug build]) ----]) ---- ---- ----# OB_COMPILER_FLAGS() ----# ----# Check what compiler is being used for compilation. ----# It sets the CFLAGS variable appropriately for the compiler, including flags ----# for debug builds. ----AC_DEFUN([OB_COMPILER_FLAGS], ----[ ---- AC_REQUIRE([AC_PROG_CPP]) ---- AC_REQUIRE([AC_PROG_CC]) ---- ---- FLAGS="" ---- L="" ---- ---- if test "$DEBUG" = "yes"; then ---- FLAGS="-DDEBUG" ---- else ---- FLAGS="-DNDEBUG -DG_DISABLE_ASSERT" ---- fi ---- ---- # Check what compiler we are using ---- AC_MSG_CHECKING([for GNU CC]) ---- if test "$GCC" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- if test "$DEBUG" = "yes"; then ---- FLAGS="$FLAGS -O0 -ggdb -fno-inline -Wwrite-strings" ---- FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return" ---- FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith" ---- # for Python.h ---- #FLAGS="$FLAGS -Wno-long-long" ---- fi ---- if test "$STRICT" = "yes"; then ---- FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE" ---- fi ---- if test "$PROF" = "yes"; then ---- FLAGS="$FLAGS -pg -fno-inline" ---- fi ---- if test "$PROFLC" = "yes"; then ---- L="$L -lc_p -lm_p" ---- fi ---- FLAGS="$FLAGS -fno-strict-aliasing" ---- fi ---- AC_MSG_CHECKING([for compiler specific flags]) ---- AC_MSG_RESULT([$FLAGS]) ---- CFLAGS="$CFLAGS $FLAGS" ---- LIBS="$LIBS $L" ----]) ---- ----AC_DEFUN([OB_NLS], ----[ ---- AC_ARG_ENABLE([nls], ---- AC_HELP_STRING([--enable-nls],[Enable NLS translations [[default=yes]]]), ---- [NLS=$enableval], [NLS="yes"]) ---- ---- if test "$NLS" = yes; then ---- DEFS="$DEFS -DENABLE_NLS" ---- fi ----]) ---- diff --cc m4/x11.m4 index fc7b36e1,fc7b36e1,fc7b36e1,fc7b36e1..00000000 deleted file mode 100644,100644,100644,100644 --- a/m4/x11.m4 +++ /dev/null @@@@@ -1,498 -1,498 -1,498 -1,498 +1,0 @@@@@ ----# X11_DEVEL() ----# ----# Check for the presence of the X Window System headers and libraries. ----# Sets the CPPFLAGS and LIBS variables as appropriate. ----AC_DEFUN([X11_DEVEL], ----[ ---- AC_PATH_XTRA ---- test "$no_x" = "yes" && \ ---- AC_MSG_ERROR([The X Window System could not be found.]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- X_LIBS="$X_PRE_LIBS $X_LIBS -lX11" ---- LIBS="$LIBS $X_LIBS" ---- ---- # Check for required functions in -lX11 ---- AC_CHECK_LIB( ---- [X11], [XOpenDisplay], ---- , ---- AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]) ---- ) ---- ---- # Restore the old values. Use X_CFLAGS and X_LIBS in ---- # the Makefiles ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ----]) ---- ---- ----AC_DEFUN([XFT_ERROR], ----[ ---- if test "$XFT_MIN"; then ---- AC_MSG_ERROR([$PACKAGE requires the Xft font library >= $XFT_MIN. ---- See http://www.fontconfig.org/ ----]) ---- else ---- AC_MSG_ERROR([$PACKAGE requires the Xft font library. ---- See http://www.fontconfig.org/ ----]) ---- fi ----]) ---- ----# XFT_DEVEL([required-version]) ----# ----# Check for the XFT development package. ----# You can use the optional argument to check for a library of at least the ----# given version. ----# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) output variables. ----AC_DEFUN([XFT_DEVEL], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- if test "$1"; then ---- XFT_MIN="$1" ---- XFT_MIN_MAJOR=${XFT_MIN%.*.*} ---- XFT_MIN_MINOR=${XFT_MIN%.*} ---- XFT_MIN_MINOR=${XFT_MIN_MINOR#*.} ---- XFT_MIN_REVISION=${XFT_MIN#*.*.} ---- XFT_MIN="$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION" ---- else ---- XFT_MIN="" ---- fi ---- ---- if test -z "$XFT_MIN"; then ---- AC_MSG_CHECKING([for Xft]) ---- if ! pkg-config xft; then ---- AC_MSG_RESULT([no]) ---- XFT_ERROR ---- fi ---- else ---- AC_MSG_CHECKING([for Xft version >= $XFT_MIN]) ---- if ! pkg-config --atleast-version $XFT_MIN xft; then ---- AC_MSG_RESULT([no]) ---- XFT_ERROR ---- fi ---- fi ---- AC_MSG_RESULT([yes]) ---- ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- XFT_CFLAGS="`pkg-config --cflags xft`" ---- XFT_LIBS="`pkg-config --libs xft`" ---- ---- # Set these for checking with the tests below. They'll be restored after ---- LIBS="$LIBS $XFT_LIBS" ---- CPPFLAGS="$XFT_CFLAGS $CPPFLAGS" ---- ---- AC_CHECK_LIB([Xft], [XftGetVersion], # this was not defined in < 2.0 ---- if test "$XFT_MIN"; then ---- AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN]) ---- AC_TRY_COMPILE( ---- [ ---- #include ---- #include ---- ], ---- [ ---- #if !defined(XFT_MAJOR) ---- # error Xft.h is too old ---- #endif ---- #if XFT_MAJOR < $XFT_MIN_MAJOR ---- # error Xft.h is too old ---- #endif ---- #if XFT_MAJOR == $XFT_MIN_MAJOR ---- # if XFT_MINOR < $XFT_MIN_MINOR ---- # error Xft.h is too old ---- # endif ---- #endif ---- #if XFT_MAJOR == $XFT_MIN_MAJOR ---- # if XFT_MAJOR == $XFT_MIN_MINOR ---- # if XFT_REVISION < $XFT_MIN_REVISION ---- # error Xft.h is too old ---- # endif ---- # endif ---- #endif ---- ---- int i = XFT_MAJOR; ---- XftFont foo; ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- XFT_ERROR ---- ]) ---- else ---- AC_MSG_CHECKING([for X11/Xft/Xft.h]) ---- AC_TRY_COMPILE( ---- [ ---- #include ---- #include ---- ], ---- [ ---- int i = XFT_MAJOR; /* make sure were using Xft 2, not 1 */ ---- XftFont foo; ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- XFT_ERROR ---- ]) ---- fi ---- ---- AC_MSG_CHECKING([if we can compile with Xft]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- ], ---- [ ---- int i = XFT_MAJOR; ---- XftFont foo ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- AC_MSG_ERROR([Unable to compile with the Xft font library. ----]) ---- ]) ---- ) ---- ---- # Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefiles ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_SUBST([XFT_CFLAGS]) ---- AC_SUBST([XFT_LIBS]) ----]) ---- ---- ----# X11_EXT_XKB() ----# ----# Check for the presence of the "Xkb" X Window System extension. ----# Defines "XKB" and sets the $(XKB) variable to "yes" if the extension is ----# present. ----AC_DEFUN([X11_EXT_XKB], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS" ---- ---- AC_CHECK_LIB([X11], [XkbBell], ---- AC_MSG_CHECKING([for X11/XKBlib.h]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- #include ---- ], ---- [ ---- Display *d; ---- Window w; ---- XkbBell(d, w, 0, 0); ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- XKB="yes" ---- AC_DEFINE([XKB], [1], [Found the XKB extension]) ---- ---- XKB_CFLAGS="" ---- XKB_LIBS="" ---- AC_SUBST(XKB_CFLAGS) ---- AC_SUBST(XKB_LIBS) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- XKB="no" ---- ]) ---- ) ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for the Xkb extension]) ---- if test "$XKB" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) ---- ----# X11_EXT_XRANDR() ----# ----# Check for the presence of the "XRandR" X Window System extension. ----# Defines "XRANDR" and sets the $(XRANDR) variable to "yes" if the extension is ----# present. ----AC_DEFUN([X11_EXT_XRANDR], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS -lXext -lXrender -lXrandr" ---- ---- AC_CHECK_LIB([Xrandr], [XRRSelectInput], ---- AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- ], ---- [ ---- Display *d; ---- Drawable r; ---- int i; ---- XRRQueryExtension(d, &i, &i); ---- XRRGetScreenInfo(d, r); ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- XRANDR="yes" ---- AC_DEFINE([XRANDR], [1], [Found the XRandR extension]) ---- ---- XRANDR_CFLAGS="" ---- XRANDR_LIBS="-lXext -lXrender -lXrandr" ---- AC_SUBST(XRANDR_CFLAGS) ---- AC_SUBST(XRANDR_LIBS) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- XRANDR="no" ---- ]) ---- ) ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for the XRandR extension]) ---- if test "$XRANDR" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) ---- ----# X11_EXT_SHAPE() ----# ----# Check for the presence of the "Shape" X Window System extension. ----# Defines "SHAPE", sets the $(SHAPE) variable to "yes", and sets the $(LIBS) ----# appropriately if the extension is present. ----AC_DEFUN([X11_EXT_SHAPE], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS" ---- ---- AC_CHECK_LIB([Xext], [XShapeCombineShape], ---- AC_MSG_CHECKING([for X11/extensions/shape.h]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- #include ---- ], ---- [ ---- long foo = ShapeSet; ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- SHAPE="yes" ---- AC_DEFINE([SHAPE], [1], [Found the XShape extension]) ---- ---- XSHAPE_CFLAGS="" ---- XSHAPE_LIBS="-lXext" ---- AC_SUBST(XSHAPE_CFLAGS) ---- AC_SUBST(XSHAPE_LIBS) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- SHAPE="no" ---- ]) ---- ) ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for the Shape extension]) ---- if test "$SHAPE" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) ---- ---- ----# X11_EXT_XINERAMA() ----# ----# Check for the presence of the "Xinerama" X Window System extension. ----# Defines "XINERAMA", sets the $(XINERAMA) variable to "yes", and sets the ----# $(LIBS) appropriately if the extension is present. ----AC_DEFUN([X11_EXT_XINERAMA], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS -lXext" ---- ---- AC_CHECK_LIB([Xinerama], [XineramaQueryExtension], ---- [ ---- AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- ], ---- [ ---- XineramaScreenInfo foo; ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- XINERAMA="yes" ---- AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension]) ---- XINERAMA_LIBS="-lXext -lXinerama" ---- AC_SUBST(XINERAMA_LIBS) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- XINERAMA="no" ---- ]) ---- ]) ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for the Xinerama extension]) ---- if test "$XINERAMA" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) ---- ----# X11_EXT_SYNC() ----# ----# Check for the presence of the "Sync" X Window System extension. ----# Defines "SYNC", sets the $(SYNC) variable to "yes", and sets the $(LIBS) ----# appropriately if the extension is present. ----AC_DEFUN([X11_EXT_SYNC], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS" ---- ---- AC_CHECK_LIB([Xext], [XSyncInitialize], ---- AC_MSG_CHECKING([for X11/extensions/sync.h]) ---- AC_TRY_LINK( ---- [ ---- #include ---- #include ---- #include ---- ], ---- [ ---- XSyncValueType foo; ---- ], ---- [ ---- AC_MSG_RESULT([yes]) ---- SYNC="yes" ---- AC_DEFINE([SYNC], [1], [Found the XSync extension]) ---- ---- XSYNC_CFLAGS="" ---- XSYNC_LIBS="-lXext" ---- AC_SUBST(XSYNC_CFLAGS) ---- AC_SUBST(XSYNC_LIBS) ---- ], ---- [ ---- AC_MSG_RESULT([no]) ---- SYNC="no" ---- ]) ---- ) ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for the Sync extension]) ---- if test "$SYNC" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) ---- ----# X11_SM() ----# ----# Check for the presence of SMlib for session management. ----# Defines "USE_SM" if SMlib is present. ----AC_DEFUN([X11_SM], ----[ ---- AC_REQUIRE([X11_DEVEL]) ---- ---- AC_ARG_ENABLE([session-management], ---- AC_HELP_STRING( ---- [--disable-session-management], [build without support for session managers [[default=enabled]]]), ---- [SM=$enableval], [SM="yes"]) ---- ---- if test "$SM" = "yes"; then ---- # Store these ---- OLDLIBS=$LIBS ---- OLDCPPFLAGS=$CPPFLAGS ---- ---- CPPFLAGS="$CPPFLAGS $X_CFLAGS" ---- LIBS="$LIBS $X_LIBS" ---- ---- SM="no" ---- ---- AC_CHECK_LIB([SM], [SmcSaveYourselfDone], [ ---- AC_CHECK_HEADERS([X11/SM/SMlib.h], [ ---- SM_CFLAGS="$X_CFLAGS" ---- SM_LIBS="-lSM -lICE" ---- AC_DEFINE(USE_SM, 1, [Use session management]) ---- AC_SUBST(SM_CFLAGS) ---- AC_SUBST(SM_LIBS) ---- SM="yes" ---- ]) ---- ]) ---- fi ---- ---- LIBS=$OLDLIBS ---- CPPFLAGS=$OLDCPPFLAGS ---- ---- AC_MSG_CHECKING([for session management support]) ---- if test "$SM" = "yes"; then ---- AC_MSG_RESULT([yes]) ---- else ---- AC_MSG_RESULT([no]) ---- fi ----]) diff --cc makedeb index ec0d6206,ec0d6206,ec0d6206,ec0d6206..00000000 deleted file mode 100755,100755,100755,100755 --- a/makedeb +++ /dev/null @@@@@ -1,33 -1,33 -1,33 -1,33 +1,0 @@@@@ ----#!/bin/sh ---- ----if test "$1" = "ubuntu"; then ---- APPEND="ubuntu1"; ----else ---- if test "$1" = "debian"; then ---- APPEND=""; ---- else ---- echo "Usage: makedeb [ubuntu|debian]"; ---- exit 1; ---- fi ----fi ---- ----# get the version from configure.ac ----VERSION=$(grep AC_INIT\(\\\[openbox\\] configure.ac|cut -d [ -f 3-|cut -d ] -f 1) ---- ----echo ----echo "Building deb for openbox-$VERSION-0$APPEND" ----echo ---- ----TIME="$(date '+%a, %d %B %Y %T %z')" ---- ----IN=debian/changelog.in ----OUT=debian/changelog ---- ----# make sure configure gets run with the right parameters ----make distclean > /dev/null || rm -f config.status ---- ----rm -f $OUT ---- ----sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION-0$APPEND!" $IN >$OUT && \ ----fakeroot debian/rules binary && \ ----make distclean > /dev/null diff --cc obt/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc obt/display.c index 72c1b4d6,72c1b4d6,72c1b4d6,72c1b4d6..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/display.c +++ /dev/null @@@@@ -1,152 -1,152 -1,152 -1,152 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/display.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/display.h" ----#include "obt/prop.h" ----#include "obt/internal.h" ----#include "obt/keyboard.h" ---- ----#ifdef HAVE_STRING_H ----# include ----#endif ----#ifdef HAVE_FCNTL_H ----# include ----#endif ----#ifdef HAVE_UNISTD_H ----# include ----#endif ---- ----Display* obt_display = NULL; ---- ----gboolean obt_display_error_occured = FALSE; ---- ----gboolean obt_display_extension_xkb = FALSE; ----gint obt_display_extension_xkb_basep; ----gboolean obt_display_extension_shape = FALSE; ----gint obt_display_extension_shape_basep; ----gboolean obt_display_extension_xinerama = FALSE; ----gint obt_display_extension_xinerama_basep; ----gboolean obt_display_extension_randr = FALSE; ----gint obt_display_extension_randr_basep; ----gboolean obt_display_extension_sync = FALSE; ----gint obt_display_extension_sync_basep; ---- ----static gint xerror_handler(Display *d, XErrorEvent *e); ---- ----static gboolean xerror_ignore = FALSE; ---- ----gboolean obt_display_open(const char *display_name) ----{ ---- gchar *n; ---- Display *d = NULL; ---- ---- n = display_name ? g_strdup(display_name) : NULL; ---- obt_display = d = XOpenDisplay(n); ---- if (d) { ---- gint junk; ---- (void)junk; ---- ---- if (fcntl(ConnectionNumber(d), F_SETFD, 1) == -1) ---- g_message("Failed to set display as close-on-exec"); ---- XSetErrorHandler(xerror_handler); ---- ---- /* read what extensions are present */ ----#ifdef XKB ---- obt_display_extension_xkb = ---- XkbQueryExtension(d, &junk, ---- &obt_display_extension_xkb_basep, &junk, ---- NULL, NULL); ---- if (!obt_display_extension_xkb) ---- g_message("XKB extension is not present on the server"); ----#endif ---- ----#ifdef SHAPE ---- obt_display_extension_shape = ---- XShapeQueryExtension(d, &obt_display_extension_shape_basep, ---- &junk); ---- if (!obt_display_extension_shape) ---- g_message("X Shape extension is not present on the server"); ----#endif ---- ----#ifdef XINERAMA ---- obt_display_extension_xinerama = ---- XineramaQueryExtension(d, ---- &obt_display_extension_xinerama_basep, ---- &junk) && XineramaIsActive(d); ---- if (!obt_display_extension_xinerama) ---- g_message("Xinerama extension is not present on the server"); ----#endif ---- ----#ifdef XRANDR ---- obt_display_extension_randr = ---- XRRQueryExtension(d, &obt_display_extension_randr_basep, ---- &junk); ---- if (!obt_display_extension_randr) ---- g_message("XRandR extension is not present on the server"); ----#endif ---- ----#ifdef SYNC ---- obt_display_extension_sync = ---- XSyncQueryExtension(d, &obt_display_extension_sync_basep, ---- &junk) && XSyncInitialize(d, &junk, &junk); ---- if (!obt_display_extension_sync) ---- g_message("X Sync extension is not present on the server or is an " ---- "incompatible version"); ----#endif ---- ---- obt_prop_startup(); ---- obt_keyboard_reload(); ---- } ---- g_free(n); ---- ---- return obt_display != NULL; ----} ---- ----void obt_display_close(void) ----{ ---- obt_keyboard_shutdown(); ---- if (obt_display) XCloseDisplay(obt_display); ----} ---- ----static gint xerror_handler(Display *d, XErrorEvent *e) ----{ ----#ifdef DEBUG ---- gchar errtxt[128]; ---- ---- XGetErrorText(d, e->error_code, errtxt, 127); ---- if (!xerror_ignore) { ---- if (e->error_code == BadWindow) ---- /*g_message(_("X Error: %s\n"), errtxt)*/; ---- else ---- g_error("X Error: %s", errtxt); ---- } else ---- g_message("Ignoring XError code %d '%s'", e->error_code, errtxt); ----#else ---- (void)d; (void)e; ----#endif ---- ---- obt_display_error_occured = TRUE; ---- return 0; ----} ---- ----void obt_display_ignore_errors(gboolean ignore) ----{ ---- XSync(obt_display, FALSE); ---- xerror_ignore = ignore; ---- if (ignore) obt_display_error_occured = FALSE; ----} diff --cc obt/display.h index ff20f9c9,ff20f9c9,ff20f9c9,ff20f9c9..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/display.h +++ /dev/null @@@@@ -1,68 -1,68 -1,68 -1,68 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/display.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_display_h ----#define __obt_display_h ---- ----#include ----#include ---- ----#include /* shape.h uses Region which is in here */ ----#ifdef XKB ----#include ----#endif ----#ifdef SHAPE ----#include ----#endif ----#ifdef XINERAMA ----#include ----#endif ----#ifdef XRANDR ----#include ----#endif ----#ifdef SYNC ----#include ----#endif ---- ----G_BEGIN_DECLS ---- ----extern gboolean obt_display_error_occured; ---- ----extern gboolean obt_display_extension_xkb; ----extern gint obt_display_extension_xkb_basep; ----extern gboolean obt_display_extension_shape; ----extern gint obt_display_extension_shape_basep; ----extern gboolean obt_display_extension_xinerama; ----extern gint obt_display_extension_xinerama_basep; ----extern gboolean obt_display_extension_randr; ----extern gint obt_display_extension_randr_basep; ----extern gboolean obt_display_extension_sync; ----extern gint obt_display_extension_sync_basep; ---- ----extern Display* obt_display; ---- ----gboolean obt_display_open(const char *display_name); ----void obt_display_close(void); ---- ----void obt_display_ignore_errors(gboolean ignore); ---- ----#define obt_root(screen) (RootWindow(obt_display, screen)) ---- ----G_END_DECLS ---- ----#endif /*__obt_display_h*/ diff --cc obt/internal.h index 818107dd,818107dd,818107dd,818107dd..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/internal.h +++ /dev/null @@@@@ -1,27 -1,27 -1,27 -1,27 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/internal.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_internal_h ----#define __obt_internal_h ---- ----void obt_prop_startup(void); ---- ----void obt_keyboard_shutdown(void); ---- ----#endif /* __obt_internal_h */ diff --cc obt/keyboard.c index 699fa8ba,699fa8ba,699fa8ba,699fa8ba..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/keyboard.c +++ /dev/null @@@@@ -1,224 -1,224 -1,224 -1,224 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/keyboard.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/display.h" ----#include "obt/keyboard.h" ---- ----#include ----#include ---- ----/* These masks are constants and the modifier keys are bound to them as ---- anyone sees fit: ---- ShiftMask (1<<0), LockMask (1<<1), ControlMask (1<<2), Mod1Mask (1<<3), ---- Mod2Mask (1<<4), Mod3Mask (1<<5), Mod4Mask (1<<6), Mod5Mask (1<<7) ----*/ ----#define NUM_MASKS 8 ----#define ALL_MASKS 0xff /* an or'ing of all 8 keyboard masks */ ---- ----/* Get the bitflag for the n'th modifier mask */ ----#define nth_mask(n) (1 << n) ---- ----static void set_modkey_mask(guchar mask, KeySym sym); ----void obt_keyboard_shutdown(); ---- ----static XModifierKeymap *modmap; ----static KeySym *keymap; ----static gint min_keycode, max_keycode, keysyms_per_keycode; ----/* This is a bitmask of the different masks for each modifier key */ ----static guchar modkeys_keys[OBT_KEYBOARD_NUM_MODKEYS]; ---- ----static gboolean alt_l = FALSE; ----static gboolean meta_l = FALSE; ----static gboolean super_l = FALSE; ----static gboolean hyper_l = FALSE; ---- ----static gboolean started = FALSE; ---- ----void obt_keyboard_reload(void) ----{ ---- gint i, j, k; ---- ---- if (started) obt_keyboard_shutdown(); /* free stuff */ ---- started = TRUE; ---- ---- /* reset the keys to not be bound to any masks */ ---- for (i = 0; i < OBT_KEYBOARD_NUM_MODKEYS; ++i) ---- modkeys_keys[i] = 0; ---- ---- modmap = XGetModifierMapping(obt_display); ---- g_assert(modmap->max_keypermod > 0); ---- ---- XDisplayKeycodes(obt_display, &min_keycode, &max_keycode); ---- keymap = XGetKeyboardMapping(obt_display, min_keycode, ---- max_keycode - min_keycode + 1, ---- &keysyms_per_keycode); ---- ---- alt_l = meta_l = super_l = hyper_l = FALSE; ---- ---- /* go through each of the modifier masks (eg ShiftMask, CapsMask...) */ ---- for (i = 0; i < NUM_MASKS; ++i) { ---- /* go through each keycode that is bound to the mask */ ---- for (j = 0; j < modmap->max_keypermod; ++j) { ---- KeySym sym; ---- /* get a keycode that is bound to the mask (i) */ ---- KeyCode keycode = modmap->modifiermap[i*modmap->max_keypermod + j]; ---- if (keycode) { ---- /* go through each keysym bound to the given keycode */ ---- for (k = 0; k < keysyms_per_keycode; ++k) { ---- sym = keymap[(keycode-min_keycode) * keysyms_per_keycode + ---- k]; ---- if (sym != NoSymbol) { ---- /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */ ---- set_modkey_mask(nth_mask(i), sym); ---- } ---- } ---- } ---- } ---- } ---- ---- /* CapsLock, Shift, and Control are special and hard-coded */ ---- modkeys_keys[OBT_KEYBOARD_MODKEY_CAPSLOCK] = LockMask; ---- modkeys_keys[OBT_KEYBOARD_MODKEY_SHIFT] = ShiftMask; ---- modkeys_keys[OBT_KEYBOARD_MODKEY_CONTROL] = ControlMask; ----} ---- ----void obt_keyboard_shutdown(void) ----{ ---- XFreeModifiermap(modmap); ---- modmap = NULL; ---- XFree(keymap); ---- keymap = NULL; ---- started = FALSE; ----} ---- ----guint obt_keyboard_keycode_to_modmask(guint keycode) ----{ ---- gint i, j; ---- guint mask = 0; ---- ---- if (keycode == NoSymbol) return 0; ---- ---- /* go through each of the modifier masks (eg ShiftMask, CapsMask...) */ ---- for (i = 0; i < NUM_MASKS; ++i) { ---- /* go through each keycode that is bound to the mask */ ---- for (j = 0; j < modmap->max_keypermod; ++j) { ---- /* compare with a keycode that is bound to the mask (i) */ ---- if (modmap->modifiermap[i*modmap->max_keypermod + j] == keycode) ---- mask |= nth_mask(i); ---- } ---- } ---- return mask; ----} ---- ----guint obt_keyboard_only_modmasks(guint mask) ----{ ---- mask &= ALL_MASKS; ---- /* strip off these lock keys. they shouldn't affect key bindings */ ---- mask &= ~LockMask; /* use the LockMask, not what capslock is bound to, ---- because you could bind it to something else and it ---- should work as that modifier then. i think capslock ---- is weird in xkb. */ ---- mask &= ~obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_NUMLOCK); ---- mask &= ~obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SCROLLLOCK); ---- return mask; ----} ---- ----guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key) ----{ ---- return modkeys_keys[key]; ----} ---- ----static void set_modkey_mask(guchar mask, KeySym sym) ----{ ---- /* find what key this is, and bind it to the mask */ ---- ---- if (sym == XK_Num_Lock) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_NUMLOCK] |= mask; ---- else if (sym == XK_Scroll_Lock) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_SCROLLLOCK] |= mask; ---- ---- else if (sym == XK_Super_L && super_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_SUPER] |= mask; ---- else if (sym == XK_Super_L && !super_l) ---- /* left takes precident over right, so erase any masks the right ---- key may have set */ ---- modkeys_keys[OBT_KEYBOARD_MODKEY_SUPER] = mask, super_l = TRUE; ---- else if (sym == XK_Super_R && !super_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_SUPER] |= mask; ---- ---- else if (sym == XK_Hyper_L && hyper_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_HYPER] |= mask; ---- else if (sym == XK_Hyper_L && !hyper_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_HYPER] = mask, hyper_l = TRUE; ---- else if (sym == XK_Hyper_R && !hyper_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_HYPER] |= mask; ---- ---- else if (sym == XK_Alt_L && alt_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_ALT] |= mask; ---- else if (sym == XK_Alt_L && !alt_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_ALT] = mask, alt_l = TRUE; ---- else if (sym == XK_Alt_R && !alt_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_ALT] |= mask; ---- ---- else if (sym == XK_Meta_L && meta_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_META] |= mask; ---- else if (sym == XK_Meta_L && !meta_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_META] = mask, meta_l = TRUE; ---- else if (sym == XK_Meta_R && !meta_l) ---- modkeys_keys[OBT_KEYBOARD_MODKEY_META] |= mask; ---- ---- /* CapsLock, Shift, and Control are special and hard-coded */ ----} ---- ----KeyCode obt_keyboard_keysym_to_keycode(KeySym sym) ----{ ---- gint i, j; ---- ---- /* go through each keycode and look for the keysym */ ---- for (i = min_keycode; i <= max_keycode; ++i) ---- for (j = 0; j < keysyms_per_keycode; ++j) ---- if (sym == keymap[(i-min_keycode) * keysyms_per_keycode + j]) ---- return i; ---- return 0; ----} ---- ----gchar *obt_keyboard_keycode_to_string(guint keycode) ----{ ---- KeySym sym; ---- ---- if ((sym = XKeycodeToKeysym(obt_display, keycode, 0)) != NoSymbol) ---- return g_locale_to_utf8(XKeysymToString(sym), -1, NULL, NULL, NULL); ---- return NULL; ----} ---- ----gunichar obt_keyboard_keycode_to_unichar(guint keycode) ----{ ---- gunichar unikey = 0; ---- char *key; ---- ---- if ((key = obt_keyboard_keycode_to_string(keycode)) != NULL && ---- /* don't accept keys that aren't a single letter, like "space" */ ---- key[1] == '\0') ---- { ---- unikey = g_utf8_get_char_validated(key, -1); ---- if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0) ---- unikey = 0; ---- } ---- g_free(key); ---- return unikey; ----} diff --cc obt/keyboard.h index dd28cb86,dd28cb86,dd28cb86,dd28cb86..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/keyboard.h +++ /dev/null @@@@@ -1,70 -1,70 -1,70 -1,70 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/keyboard.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_keyboard_h ----#define __obt_keyboard_h ---- ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----/*! These keys are bound to the modifier masks in any fashion, ---- except for CapsLock, Shift, and Control. */ ----typedef enum { ---- OBT_KEYBOARD_MODKEY_CAPSLOCK, ---- OBT_KEYBOARD_MODKEY_NUMLOCK, ---- OBT_KEYBOARD_MODKEY_SCROLLLOCK, ---- OBT_KEYBOARD_MODKEY_SHIFT, ---- OBT_KEYBOARD_MODKEY_CONTROL, ---- OBT_KEYBOARD_MODKEY_SUPER, ---- OBT_KEYBOARD_MODKEY_HYPER, ---- OBT_KEYBOARD_MODKEY_META, ---- OBT_KEYBOARD_MODKEY_ALT, ---- ---- OBT_KEYBOARD_NUM_MODKEYS ----} ObtModkeysKey; ---- ----void obt_keyboard_reload(void); ---- ----/*! Get the modifier mask(s) for a KeyCode. (eg. a keycode bound to Alt_L could ---- return a mask of (Mod1Mask | Mask3Mask)) */ ----guint obt_keyboard_keycode_to_modmask(guint keycode); ---- ----/*! Strip off all modifiers except for the modifier keys. This strips stuff ---- like Button1Mask, and also LockMask, NumlockMask, and ScrolllockMask */ ----guint obt_keyboard_only_modmasks(guint mask); ---- ----/*! Get the modifier masks for a modifier key. This includes both the left and ---- right keys when there are both. */ ----guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key); ---- ----/*! Convert a KeySym to a KeyCode, because the X function is terrible - says ---- valgrind. */ ----KeyCode obt_keyboard_keysym_to_keycode(KeySym sym); ---- ----/*! Give the string form of a KeyCode */ ----gchar *obt_keyboard_keycode_to_string(guint keycode); ---- ----/*! Translate a KeyCode to the unicode character it represents */ ----gunichar obt_keyboard_keycode_to_unichar(guint keycode); ---- ---- ----G_END_DECLS ---- ----#endif /* __obt_keyboard_h */ diff --cc obt/mainloop.c index 691c6875,691c6875,691c6875,691c6875..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/mainloop.c +++ /dev/null @@@@@ -1,685 -1,685 -1,685 -1,685 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/mainloop.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/mainloop.h" ----#include "obt/display.h" ----#include "obt/util.h" ---- ----#include ----#include ----#include ----#include ---- ----typedef struct _ObtMainLoopTimer ObtMainLoopTimer; ----typedef struct _ObtMainLoopSignal ObtMainLoopSignal; ----typedef struct _ObtMainLoopSignalHandlerType ObtMainLoopSignalHandlerType; ----typedef struct _ObtMainLoopXHandlerType ObtMainLoopXHandlerType; ----typedef struct _ObtMainLoopFdHandlerType ObtMainLoopFdHandlerType; ---- ----/* this should be more than the number of possible signals on any ---- architecture... */ ----#define NUM_SIGNALS 99 ---- ----/* all created ObtMainLoops. Used by the signal handler to pass along ---- signals */ ----static GSList *all_loops; ---- ----/* signals are global to all loops */ ----static struct { ---- guint installed; /* a ref count */ ---- struct sigaction oldact; ----} all_signals[NUM_SIGNALS]; ---- ----/* a set of all possible signals */ ----static sigset_t all_signals_set; ---- ----/* signals which cause a core dump, these can't be used for callbacks */ ----static gint core_signals[] = ----{ ---- SIGABRT, ---- SIGSEGV, ---- SIGFPE, ---- SIGILL, ---- SIGQUIT, ---- SIGTRAP, ---- SIGSYS, ---- SIGBUS, ---- SIGXCPU, ---- SIGXFSZ ----}; ----#define NUM_CORE_SIGNALS (sizeof(core_signals) / sizeof(core_signals[0])) ---- ----static void sighandler(gint sig); ----static void timer_dispatch(ObtMainLoop *loop, GTimeVal **wait); ----static void fd_handler_destroy(gpointer data); ----static void calc_max_fd(ObtMainLoop *loop); ---- ----struct _ObtMainLoop ----{ ---- gint ref; ---- Display *display; ---- ---- gboolean run; /* do keep running */ ---- gboolean running; /* is still running */ ---- ---- GSList *x_handlers; ---- ---- gint fd_x; /* The X fd is a special case! */ ---- gint fd_max; ---- GHashTable *fd_handlers; ---- fd_set fd_set; ---- ---- GSList *timers; ---- GTimeVal now; ---- GTimeVal ret_wait; ---- ---- gboolean signal_fired; ---- guint signals_fired[NUM_SIGNALS]; ---- GSList *signal_handlers[NUM_SIGNALS]; ----}; ---- ----struct _ObtMainLoopTimer ----{ ---- gulong delay; ---- GSourceFunc func; ---- gpointer data; ---- GEqualFunc equal; ---- GDestroyNotify destroy; ---- ---- /* The timer needs to be freed */ ---- gboolean del_me; ---- /* The time the last fire should've been at */ ---- GTimeVal last; ---- /* When this timer will next trigger */ ---- GTimeVal timeout; ---- ---- /* Only allow a timer's function to fire once per run through the list, ---- so that it doesn't get locked in there forever */ ---- gboolean fired; ----}; ---- ----struct _ObtMainLoopSignalHandlerType ----{ ---- ObtMainLoop *loop; ---- gint signal; ---- gpointer data; ---- ObtMainLoopSignalHandler func; ---- GDestroyNotify destroy; ----}; ---- ----struct _ObtMainLoopXHandlerType ----{ ---- ObtMainLoop *loop; ---- gpointer data; ---- ObtMainLoopXHandler func; ---- GDestroyNotify destroy; ----}; ---- ----struct _ObtMainLoopFdHandlerType ----{ ---- ObtMainLoop *loop; ---- gint fd; ---- gpointer data; ---- ObtMainLoopFdHandler func; ---- GDestroyNotify destroy; ----}; ---- ----ObtMainLoop *obt_main_loop_new(void) ----{ ---- ObtMainLoop *loop; ---- ---- loop = g_new0(ObtMainLoop, 1); ---- loop->ref = 1; ---- FD_ZERO(&loop->fd_set); ---- loop->fd_x = -1; ---- loop->fd_max = -1; ---- ---- loop->fd_handlers = g_hash_table_new_full(g_int_hash, g_int_equal, ---- NULL, fd_handler_destroy); ---- ---- g_get_current_time(&loop->now); ---- ---- /* only do this if we're the first loop created */ ---- if (!all_loops) { ---- guint i; ---- struct sigaction action; ---- sigset_t sigset; ---- ---- /* initialize the all_signals_set */ ---- sigfillset(&all_signals_set); ---- ---- sigemptyset(&sigset); ---- action.sa_handler = sighandler; ---- action.sa_mask = sigset; ---- action.sa_flags = SA_NOCLDSTOP; ---- ---- /* grab all the signals that cause core dumps */ ---- for (i = 0; i < NUM_CORE_SIGNALS; ++i) { ---- /* SIGABRT is curiously not grabbed here!! that's because when we ---- get one of the core_signals, we use abort() to dump the core. ---- And having the abort() only go back to our signal handler again ---- is less than optimal */ ---- if (core_signals[i] != SIGABRT) { ---- sigaction(core_signals[i], &action, ---- &all_signals[core_signals[i]].oldact); ---- all_signals[core_signals[i]].installed++; ---- } ---- } ---- } ---- ---- all_loops = g_slist_prepend(all_loops, loop); ---- ---- return loop; ----} ---- ----void obt_main_loop_ref(ObtMainLoop *loop) ----{ ---- ++loop->ref; ----} ---- ----void obt_main_loop_unref(ObtMainLoop *loop) ----{ ---- guint i; ---- GSList *it, *next; ---- ---- if (loop && --loop->ref == 0) { ---- g_assert(loop->running == FALSE); ---- ---- for (it = loop->x_handlers; it; it = next) { ---- ObtMainLoopXHandlerType *h = it->data; ---- next = g_slist_next(it); ---- obt_main_loop_x_remove(loop, h->func); ---- } ---- ---- g_hash_table_destroy(loop->fd_handlers); ---- ---- for (it = loop->timers; it; it = g_slist_next(it)) { ---- ObtMainLoopTimer *t = it->data; ---- if (t->destroy) t->destroy(t->data); ---- g_free(t); ---- } ---- g_slist_free(loop->timers); ---- loop->timers = NULL; ---- ---- for (i = 0; i < NUM_SIGNALS; ++i) ---- for (it = loop->signal_handlers[i]; it; it = next) { ---- ObtMainLoopSignalHandlerType *h = it->data; ---- next = g_slist_next(it); ---- obt_main_loop_signal_remove(loop, h->func); ---- } ---- ---- all_loops = g_slist_remove(all_loops, loop); ---- ---- /* only do this if we're the last loop destroyed */ ---- if (!all_loops) { ---- /* grab all the signals that cause core dumps */ ---- for (i = 0; i < NUM_CORE_SIGNALS; ++i) { ---- if (all_signals[core_signals[i]].installed) { ---- sigaction(core_signals[i], ---- &all_signals[core_signals[i]].oldact, NULL); ---- all_signals[core_signals[i]].installed--; ---- } ---- } ---- } ---- ---- obt_free0(loop, ObtMainLoop, 1); ---- } ----} ---- ----static void fd_handle_foreach(gpointer key, ---- gpointer value, ---- gpointer data) ----{ ---- ObtMainLoopFdHandlerType *h = value; ---- fd_set *set = data; ---- ---- if (FD_ISSET(h->fd, set)) ---- h->func(h->fd, h->data); ----} ---- ----void obt_main_loop_run(ObtMainLoop *loop) ----{ ---- XEvent e; ---- struct timeval *wait; ---- fd_set selset; ---- GSList *it; ---- ---- loop->run = TRUE; ---- loop->running = TRUE; ---- ---- while (loop->run) { ---- if (loop->signal_fired) { ---- guint i; ---- sigset_t oldset; ---- ---- /* block signals so that we can do this without the data changing ---- on us */ ---- sigprocmask(SIG_SETMASK, &all_signals_set, &oldset); ---- ---- for (i = 0; i < NUM_SIGNALS; ++i) { ---- while (loop->signals_fired[i]) { ---- for (it = loop->signal_handlers[i]; ---- it; it = g_slist_next(it)) { ---- ObtMainLoopSignalHandlerType *h = it->data; ---- h->func(i, h->data); ---- } ---- loop->signals_fired[i]--; ---- } ---- } ---- loop->signal_fired = FALSE; ---- ---- sigprocmask(SIG_SETMASK, &oldset, NULL); ---- } else if (loop->display && XPending(loop->display)) { ---- do { ---- XNextEvent(loop->display, &e); ---- ---- for (it = loop->x_handlers; it; it = g_slist_next(it)) { ---- ObtMainLoopXHandlerType *h = it->data; ---- h->func(&e, h->data); ---- } ---- } while (XPending(loop->display) && loop->run); ---- } else { ---- /* this only runs if there were no x events received */ ---- ---- timer_dispatch(loop, (GTimeVal**)&wait); ---- ---- selset = loop->fd_set; ---- /* there is a small race condition here. if a signal occurs ---- between this if() and the select() then we will not process ---- the signal until 'wait' expires. possible solutions include ---- using GStaticMutex, and having the signal handler set 'wait' ---- to 0 */ ---- if (!loop->signal_fired) ---- select(loop->fd_max + 1, &selset, NULL, NULL, wait); ---- ---- /* handle the X events with highest prioirity */ ---- if (FD_ISSET(loop->fd_x, &selset)) ---- continue; ---- ---- g_hash_table_foreach(loop->fd_handlers, ---- fd_handle_foreach, &selset); ---- } ---- } ---- ---- loop->running = FALSE; ----} ---- ----void obt_main_loop_exit(ObtMainLoop *loop) ----{ ---- loop->run = FALSE; ----} ---- ----/*** XEVENT WATCHERS ***/ ---- ----void obt_main_loop_x_add(ObtMainLoop *loop, ---- ObtMainLoopXHandler handler, ---- gpointer data, ---- GDestroyNotify notify) ----{ ---- ObtMainLoopXHandlerType *h; ---- ---- h = g_new(ObtMainLoopXHandlerType, 1); ---- h->loop = loop; ---- h->func = handler; ---- h->data = data; ---- h->destroy = notify; ---- ---- if (!loop->x_handlers) { ---- g_assert(obt_display); /* is the display open? */ ---- ---- loop->display = obt_display; ---- loop->fd_x = ConnectionNumber(loop->display); ---- FD_SET(loop->fd_x, &loop->fd_set); ---- calc_max_fd(loop); ---- } ---- ---- loop->x_handlers = g_slist_prepend(loop->x_handlers, h); ----} ---- ----void obt_main_loop_x_remove(ObtMainLoop *loop, ---- ObtMainLoopXHandler handler) ----{ ---- GSList *it, *next; ---- ---- for (it = loop->x_handlers; it; it = next) { ---- ObtMainLoopXHandlerType *h = it->data; ---- next = g_slist_next(it); ---- if (h->func == handler) { ---- loop->x_handlers = g_slist_delete_link(loop->x_handlers, it); ---- if (h->destroy) h->destroy(h->data); ---- g_free(h); ---- } ---- } ---- ---- if (!loop->x_handlers) { ---- FD_CLR(loop->fd_x, &loop->fd_set); ---- calc_max_fd(loop); ---- } ----} ---- ----/*** SIGNAL WATCHERS ***/ ---- ----static void sighandler(gint sig) ----{ ---- GSList *it; ---- guint i; ---- ---- g_return_if_fail(sig < NUM_SIGNALS); ---- ---- for (i = 0; i < NUM_CORE_SIGNALS; ++i) ---- if (sig == core_signals[i]) { ---- /* XXX special case for signals that default to core dump. ---- but throw some helpful output here... */ ---- ---- fprintf(stderr, "How are you gentlemen? All your base are" ---- " belong to us. (Openbox received signal %d)\n", sig); ---- ---- /* die with a core dump */ ---- abort(); ---- } ---- ---- for (it = all_loops; it; it = g_slist_next(it)) { ---- ObtMainLoop *loop = it->data; ---- loop->signal_fired = TRUE; ---- loop->signals_fired[sig]++; ---- } ----} ---- ----void obt_main_loop_signal_add(ObtMainLoop *loop, ---- gint signal, ---- ObtMainLoopSignalHandler handler, ---- gpointer data, ---- GDestroyNotify notify) ----{ ---- ObtMainLoopSignalHandlerType *h; ---- ---- g_return_if_fail(signal < NUM_SIGNALS); ---- ---- h = g_new(ObtMainLoopSignalHandlerType, 1); ---- h->loop = loop; ---- h->signal = signal; ---- h->func = handler; ---- h->data = data; ---- h->destroy = notify; ---- loop->signal_handlers[h->signal] = ---- g_slist_prepend(loop->signal_handlers[h->signal], h); ---- ---- if (!all_signals[signal].installed) { ---- struct sigaction action; ---- sigset_t sigset; ---- ---- sigemptyset(&sigset); ---- action.sa_handler = sighandler; ---- action.sa_mask = sigset; ---- action.sa_flags = SA_NOCLDSTOP; ---- ---- sigaction(signal, &action, &all_signals[signal].oldact); ---- } ---- ---- all_signals[signal].installed++; ----} ---- ----void obt_main_loop_signal_remove(ObtMainLoop *loop, ---- ObtMainLoopSignalHandler handler) ----{ ---- guint i; ---- GSList *it, *next; ---- ---- for (i = 0; i < NUM_SIGNALS; ++i) { ---- for (it = loop->signal_handlers[i]; it; it = next) { ---- ObtMainLoopSignalHandlerType *h = it->data; ---- ---- next = g_slist_next(it); ---- ---- if (h->func == handler) { ---- g_assert(all_signals[h->signal].installed > 0); ---- ---- all_signals[h->signal].installed--; ---- if (!all_signals[h->signal].installed) { ---- sigaction(h->signal, &all_signals[h->signal].oldact, NULL); ---- } ---- ---- loop->signal_handlers[i] = ---- g_slist_delete_link(loop->signal_handlers[i], it); ---- if (h->destroy) h->destroy(h->data); ---- ---- g_free(h); ---- } ---- } ---- } ---- ----} ---- ----/*** FILE DESCRIPTOR WATCHERS ***/ ---- ----static void max_fd_func(gpointer key, gpointer value, gpointer data) ----{ ---- ObtMainLoop *loop = data; ---- ---- /* key is the fd */ ---- loop->fd_max = MAX(loop->fd_max, *(gint*)key); ----} ---- ----static void calc_max_fd(ObtMainLoop *loop) ----{ ---- loop->fd_max = loop->fd_x; ---- ---- g_hash_table_foreach(loop->fd_handlers, max_fd_func, loop); ----} ---- ----void obt_main_loop_fd_add(ObtMainLoop *loop, ---- gint fd, ---- ObtMainLoopFdHandler handler, ---- gpointer data, ---- GDestroyNotify notify) ----{ ---- ObtMainLoopFdHandlerType *h; ---- ---- h = g_new(ObtMainLoopFdHandlerType, 1); ---- h->loop = loop; ---- h->fd = fd; ---- h->func = handler; ---- h->data = data; ---- h->destroy = notify; ---- ---- g_hash_table_replace(loop->fd_handlers, &h->fd, h); ---- FD_SET(h->fd, &loop->fd_set); ---- calc_max_fd(loop); ----} ---- ----static void fd_handler_destroy(gpointer data) ----{ ---- ObtMainLoopFdHandlerType *h = data; ---- ---- FD_CLR(h->fd, &h->loop->fd_set); ---- ---- if (h->destroy) ---- h->destroy(h->data); ----} ---- ----void obt_main_loop_fd_remove(ObtMainLoop *loop, ---- gint fd) ----{ ---- g_hash_table_remove(loop->fd_handlers, &fd); ---- calc_max_fd(loop); ----} ---- ----/*** TIMEOUTS ***/ ---- ----#define NEAREST_TIMEOUT(loop) \ ---- (((ObtMainLoopTimer*)(loop)->timers->data)->timeout) ---- ----static glong timecompare(GTimeVal *a, GTimeVal *b) ----{ ---- glong r; ---- if ((r = a->tv_sec - b->tv_sec)) return r; ---- return a->tv_usec - b->tv_usec; ----} ---- ----static void insert_timer(ObtMainLoop *loop, ObtMainLoopTimer *ins) ----{ ---- GSList *it; ---- for (it = loop->timers; it; it = g_slist_next(it)) { ---- ObtMainLoopTimer *t = it->data; ---- if (timecompare(&ins->timeout, &t->timeout) <= 0) { ---- loop->timers = g_slist_insert_before(loop->timers, it, ins); ---- break; ---- } ---- } ---- if (it == NULL) /* didnt fit anywhere in the list */ ---- loop->timers = g_slist_append(loop->timers, ins); ----} ---- ----void obt_main_loop_timeout_add(ObtMainLoop *loop, ---- gulong microseconds, ---- GSourceFunc handler, ---- gpointer data, ---- GEqualFunc cmp, ---- GDestroyNotify notify) ----{ ---- ObtMainLoopTimer *t = g_new(ObtMainLoopTimer, 1); ---- ---- g_assert(microseconds > 0); /* if it's 0 it'll cause an infinite loop */ ---- ---- t->delay = microseconds; ---- t->func = handler; ---- t->data = data; ---- t->equal = cmp; ---- t->destroy = notify; ---- t->del_me = FALSE; ---- g_get_current_time(&loop->now); ---- t->last = t->timeout = loop->now; ---- g_time_val_add(&t->timeout, t->delay); ---- ---- insert_timer(loop, t); ----} ---- ----void obt_main_loop_timeout_remove(ObtMainLoop *loop, ---- GSourceFunc handler) ----{ ---- GSList *it; ---- ---- for (it = loop->timers; it; it = g_slist_next(it)) { ---- ObtMainLoopTimer *t = it->data; ---- if (t->func == handler) ---- t->del_me = TRUE; ---- } ----} ---- ----void obt_main_loop_timeout_remove_data(ObtMainLoop *loop, GSourceFunc handler, ---- gpointer data, gboolean cancel_dest) ----{ ---- GSList *it; ---- ---- for (it = loop->timers; it; it = g_slist_next(it)) { ---- ObtMainLoopTimer *t = it->data; ---- if (t->func == handler && t->equal(t->data, data)) { ---- t->del_me = TRUE; ---- if (cancel_dest) ---- t->destroy = NULL; ---- } ---- } ----} ---- ----/* find the time to wait for the nearest timeout */ ----static gboolean nearest_timeout_wait(ObtMainLoop *loop, GTimeVal *tm) ----{ ---- if (loop->timers == NULL) ---- return FALSE; ---- ---- tm->tv_sec = NEAREST_TIMEOUT(loop).tv_sec - loop->now.tv_sec; ---- tm->tv_usec = NEAREST_TIMEOUT(loop).tv_usec - loop->now.tv_usec; ---- ---- while (tm->tv_usec < 0) { ---- tm->tv_usec += G_USEC_PER_SEC; ---- tm->tv_sec--; ---- } ---- tm->tv_sec += tm->tv_usec / G_USEC_PER_SEC; ---- tm->tv_usec %= G_USEC_PER_SEC; ---- if (tm->tv_sec < 0) ---- tm->tv_sec = 0; ---- ---- return TRUE; ----} ---- ----static void timer_dispatch(ObtMainLoop *loop, GTimeVal **wait) ----{ ---- GSList *it, *next; ---- ---- gboolean fired = FALSE; ---- ---- g_get_current_time(&loop->now); ---- ---- for (it = loop->timers; it; it = next) { ---- ObtMainLoopTimer *curr; ---- ---- next = g_slist_next(it); ---- ---- curr = it->data; ---- ---- /* since timer_stop doesn't actually free the timer, we have to do our ---- real freeing in here. ---- */ ---- if (curr->del_me) { ---- /* delete the top */ ---- loop->timers = g_slist_delete_link(loop->timers, it); ---- if (curr->destroy) ---- curr->destroy(curr->data); ---- g_free(curr); ---- continue; ---- } ---- ---- /* the queue is sorted, so if this timer shouldn't fire, none are ---- ready */ ---- if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) > 0) ---- break; ---- ---- /* we set the last fired time to delay msec after the previous firing, ---- then re-insert. timers maintain their order and may trigger more ---- than once if they've waited more than one delay's worth of time. ---- */ ---- loop->timers = g_slist_delete_link(loop->timers, it); ---- g_time_val_add(&curr->last, curr->delay); ---- if (curr->func(curr->data)) { ---- g_time_val_add(&curr->timeout, curr->delay); ---- insert_timer(loop, curr); ---- } else { ---- if (curr->destroy) ---- curr->destroy(curr->data); ---- g_free(curr); ---- } ---- ---- /* the timer queue has been shuffled, start from the beginning ---- (which is the next one to fire) */ ---- next = loop->timers; ---- ---- fired = TRUE; ---- } ---- ---- if (fired) { ---- /* if at least one timer fires, then don't wait on X events, as there ---- may already be some in the queue from the timer callbacks. ---- */ ---- loop->ret_wait.tv_sec = loop->ret_wait.tv_usec = 0; ---- *wait = &loop->ret_wait; ---- } else if (nearest_timeout_wait(loop, &loop->ret_wait)) ---- *wait = &loop->ret_wait; ---- else ---- *wait = NULL; ----} diff --cc obt/mainloop.h index f455d629,f455d629,f455d629,f455d629..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/mainloop.h +++ /dev/null @@@@@ -1,81 -1,81 -1,81 -1,81 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/mainloop.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_mainloop_h ----#define __obt_mainloop_h ---- ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----typedef struct _ObtMainLoop ObtMainLoop; ---- ----ObtMainLoop *obt_main_loop_new(void); ----void obt_main_loop_ref(ObtMainLoop *loop); ----void obt_main_loop_unref(ObtMainLoop *loop); ---- ----typedef void (*ObtMainLoopXHandler) (const XEvent *e, gpointer data); ---- ----void obt_main_loop_x_add(ObtMainLoop *loop, ---- ObtMainLoopXHandler handler, ---- gpointer data, ---- GDestroyNotify notify); ----void obt_main_loop_x_remove(ObtMainLoop *loop, ---- ObtMainLoopXHandler handler); ---- ----typedef void (*ObtMainLoopFdHandler) (gint fd, gpointer data); ---- ----void obt_main_loop_fd_add(ObtMainLoop *loop, ---- gint fd, ---- ObtMainLoopFdHandler handler, ---- gpointer data, ---- GDestroyNotify notify); ----void obt_main_loop_fd_remove(ObtMainLoop *loop, ---- gint fd); ---- ----typedef void (*ObtMainLoopSignalHandler) (gint signal, gpointer data); ---- ----void obt_main_loop_signal_add(ObtMainLoop *loop, ---- gint signal, ---- ObtMainLoopSignalHandler handler, ---- gpointer data, ---- GDestroyNotify notify); ----void obt_main_loop_signal_remove(ObtMainLoop *loop, ---- ObtMainLoopSignalHandler handler); ---- ----void obt_main_loop_timeout_add(ObtMainLoop *loop, ---- gulong microseconds, ---- GSourceFunc handler, ---- gpointer data, ---- GEqualFunc cmp, ---- GDestroyNotify notify); ----void obt_main_loop_timeout_remove(ObtMainLoop *loop, ---- GSourceFunc handler); ----void obt_main_loop_timeout_remove_data(ObtMainLoop *loop, ---- GSourceFunc handler, ---- gpointer data, ---- gboolean cancel_dest); ---- ----void obt_main_loop_run(ObtMainLoop *loop); ----void obt_main_loop_exit(ObtMainLoop *loop); ---- ----G_END_DECLS ---- ----#endif diff --cc obt/obt-4.0.pc.in index ee2a3f0a,ee2a3f0a,ee2a3f0a,ee2a3f0a..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/obt-4.0.pc.in +++ /dev/null @@@@@ -1,14 -1,14 -1,14 -1,14 +1,0 @@@@@ ----prefix=@prefix@ ----exec_prefix=@exec_prefix@ ----libdir=@libdir@ ----includedir=@includedir@ ---- ----xcflags=@X_CFLAGS@ ----xlibs=@X_LIBS@ ---- ----Name: Obt ----Description: Openbox Toolkit Library ----Version: @VERSION@ ----Requires: glib-2.0 ----Libs: -L${libdir} -lobrender ${xlibs} ----Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} diff --cc obt/parse.c index d181b679,d181b679,d181b679,d181b679..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/parse.c +++ /dev/null @@@@@ -1,413 -1,413 -1,413 -1,413 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/parse.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/parse.h" ----#include "obt/paths.h" ---- ----#include ---- ----#ifdef HAVE_STDLIB_H ----# include ----#endif ----#ifdef HAVE_SYS_STAT_H ----# include ----#endif ----#ifdef HAVE_SYS_TYPES_H ----# include ----#endif ----#ifdef HAVE_UNISTD_H ----# include ----#endif ---- ----struct Callback { ---- gchar *tag; ---- ObtParseCallback func; ---- gpointer data; ----}; ---- ----struct _ObtParseInst { ---- gint ref; ---- ObtPaths *xdg_paths; ---- GHashTable *callbacks; ---- xmlDocPtr doc; ---- xmlNodePtr root; ---- gchar *path; ----}; ---- ----static void destfunc(struct Callback *c) ----{ ---- g_free(c->tag); ---- g_free(c); ----} ---- ----ObtParseInst* obt_parse_instance_new(void) ----{ ---- ObtParseInst *i = g_new(ObtParseInst, 1); ---- i->ref = 1; ---- i->xdg_paths = obt_paths_new(); ---- i->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, ---- (GDestroyNotify)destfunc); ---- i->doc = NULL; ---- i->root = NULL; ---- i->path = NULL; ---- return i; ----} ---- ----void obt_parse_instance_ref(ObtParseInst *i) ----{ ---- ++i->ref; ----} ---- ----void obt_parse_instance_unref(ObtParseInst *i) ----{ ---- if (i && --i->ref == 0) { ---- obt_paths_unref(i->xdg_paths); ---- g_hash_table_destroy(i->callbacks); ---- g_free(i); ---- } ----} ---- ----xmlDocPtr obt_parse_doc(ObtParseInst *i) ----{ ---- g_assert(i->doc); /* a doc is open? */ ---- return i->doc; ----} ---- ----xmlNodePtr obt_parse_root(ObtParseInst *i) ----{ ---- g_assert(i->doc); /* a doc is open? */ ---- return i->root; ----} ---- ----void obt_parse_register(ObtParseInst *i, const gchar *tag, ---- ObtParseCallback func, gpointer data) ----{ ---- struct Callback *c; ---- ---- if ((c = g_hash_table_lookup(i->callbacks, tag))) { ---- g_error("Tag '%s' already registered", tag); ---- return; ---- } ---- ---- c = g_new(struct Callback, 1); ---- c->tag = g_strdup(tag); ---- c->func = func; ---- c->data = data; ---- g_hash_table_insert(i->callbacks, c->tag, c); ----} ---- ----static gboolean load_file(ObtParseInst *i, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node, ---- GSList *paths) ----{ ---- GSList *it; ---- gboolean r = FALSE; ---- ---- g_assert(i->doc == NULL); /* another doc isn't open already? */ ---- ---- for (it = paths; !r && it; it = g_slist_next(it)) { ---- gchar *path; ---- struct stat s; ---- ---- if (!domain && !filename) /* given a full path to the file */ ---- path = g_strdup(it->data); ---- else ---- path = g_build_filename(it->data, domain, filename, NULL); ---- ---- if (stat(path, &s) >= 0) { ---- /* XML_PARSE_BLANKS is needed apparently, or the tree can end up ---- with extra nodes in it. */ ---- i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS | ---- XML_PARSE_RECOVER)); ---- if (i->doc) { ---- i->root = xmlDocGetRootElement(i->doc); ---- if (!i->root) { ---- xmlFreeDoc(i->doc); ---- i->doc = NULL; ---- g_message("%s is an empty XML document", path); ---- } ---- else if (xmlStrcmp(i->root->name, ---- (const xmlChar*)root_node)) { ---- xmlFreeDoc(i->doc); ---- i->doc = NULL; ---- i->root = NULL; ---- g_message("XML document %s is of wrong type. Root " ---- "node is not '%s'", path, root_node); ---- } ---- else { ---- i->path = g_strdup(path); ---- r = TRUE; /* ok! */ ---- } ---- } ---- } ---- ---- g_free(path); ---- } ---- ---- return r; ----} ---- ----gboolean obt_parse_load_file(ObtParseInst *i, ---- const gchar *path, ---- const gchar *root_node) ----{ ---- GSList *paths; ---- gboolean r; ---- ---- paths = g_slist_append(NULL, g_strdup(path)); ---- ---- r = load_file(i, NULL, NULL, root_node, paths); ---- ---- while (paths) { ---- g_free(paths->data); ---- paths = g_slist_delete_link(paths, paths); ---- } ---- return r; ----} ---- ----gboolean obt_parse_load_config_file(ObtParseInst *i, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node) ----{ ---- GSList *it, *paths = NULL; ---- gboolean r; ---- ---- for (it = obt_paths_config_dirs(i->xdg_paths); it; it = g_slist_next(it)) ---- paths = g_slist_append(paths, g_strdup(it->data)); ---- ---- r = load_file(i, domain, filename, root_node, paths); ---- ---- while (paths) { ---- g_free(paths->data); ---- paths = g_slist_delete_link(paths, paths); ---- } ---- return r; ----} ---- ----gboolean obt_parse_load_data_file(ObtParseInst *i, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node) ----{ ---- GSList *it, *paths = NULL; ---- gboolean r; ---- ---- for (it = obt_paths_data_dirs(i->xdg_paths); it; it = g_slist_next(it)) ---- paths = g_slist_append(paths, g_strdup(it->data)); ---- ---- r = load_file(i, domain, filename, root_node, paths); ---- ---- while (paths) { ---- g_free(paths->data); ---- paths = g_slist_delete_link(paths, paths); ---- } ---- return r; ----} ---- ----gboolean obt_parse_load_theme_file(ObtParseInst *i, ---- const gchar *theme, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node) ----{ ---- GSList *it, *paths = NULL; ---- gboolean r; ---- ---- /* use ~/.themes for backwards compatibility */ ---- paths = g_slist_append ---- (paths, g_build_filename(g_get_home_dir(), ".themes", theme, NULL)); ---- ---- for (it = obt_paths_data_dirs(i->xdg_paths); it; it = g_slist_next(it)) ---- paths = g_slist_append ---- (paths, g_build_filename(it->data, "themes", theme, NULL)); ---- ---- r = load_file(i, domain, filename, root_node, paths); ---- ---- while (paths) { ---- g_free(paths->data); ---- paths = g_slist_delete_link(paths, paths); ---- } ---- return r; ----} ---- ---- ----gboolean obt_parse_load_mem(ObtParseInst *i, ---- gpointer data, guint len, const gchar *root_node) ----{ ---- gboolean r = FALSE; ---- ---- g_assert(i->doc == NULL); /* another doc isn't open already? */ ---- ---- i->doc = xmlParseMemory(data, len); ---- if (i) { ---- i->root = xmlDocGetRootElement(i->doc); ---- if (!i->root) { ---- xmlFreeDoc(i->doc); ---- i->doc = NULL; ---- g_message("Given memory is an empty document"); ---- } ---- else if (xmlStrcmp(i->root->name, (const xmlChar*)root_node)) { ---- xmlFreeDoc(i->doc); ---- i->doc = NULL; ---- i->root = NULL; ---- g_message("XML Document in given memory is of wrong " ---- "type. Root node is not '%s'\n", root_node); ---- } ---- else ---- r = TRUE; /* ok ! */ ---- } ---- return r; ----} ---- ----void obt_parse_close(ObtParseInst *i) ----{ ---- if (i && i->doc) { ---- xmlFreeDoc(i->doc); ---- g_free(i->path); ---- i->doc = NULL; ---- i->root = NULL; ---- i->path = NULL; ---- } ----} ---- ----void obt_parse_tree(ObtParseInst *i, xmlNodePtr node) ----{ ---- g_assert(i->doc); /* a doc is open? */ ---- ---- while (node) { ---- struct Callback *c = g_hash_table_lookup(i->callbacks, node->name); ---- if (c) c->func(node, c->data); ---- node = node->next; ---- } ----} ---- ----void obt_parse_tree_from_root(ObtParseInst *i) ----{ ---- obt_parse_tree(i, i->root->children); ----} ---- ----gchar *obt_parse_node_string(xmlNodePtr node) ----{ ---- xmlChar *c = xmlNodeGetContent(node); ---- gchar *s = g_strdup(c ? (gchar*)c : ""); ---- xmlFree(c); ---- return s; ----} ---- ----gint obt_parse_node_int(xmlNodePtr node) ----{ ---- xmlChar *c = xmlNodeGetContent(node); ---- gint i = c ? atoi((gchar*)c) : 0; ---- xmlFree(c); ---- return i; ----} ---- ----gboolean obt_parse_node_bool(xmlNodePtr node) ----{ ---- xmlChar *c = xmlNodeGetContent(node); ---- gboolean b = FALSE; ---- if (c && !xmlStrcasecmp(c, (const xmlChar*) "true")) ---- b = TRUE; ---- else if (c && !xmlStrcasecmp(c, (const xmlChar*) "yes")) ---- b = TRUE; ---- else if (c && !xmlStrcasecmp(c, (const xmlChar*) "on")) ---- b = TRUE; ---- xmlFree(c); ---- return b; ----} ---- ----gboolean obt_parse_node_contains(xmlNodePtr node, const gchar *val) ----{ ---- xmlChar *c = xmlNodeGetContent(node); ---- gboolean r; ---- r = !xmlStrcasecmp(c, (const xmlChar*) val); ---- xmlFree(c); ---- return r; ----} ---- ----xmlNodePtr obt_parse_find_node(xmlNodePtr node, const gchar *tag) ----{ ---- while (node) { ---- if (!xmlStrcmp(node->name, (const xmlChar*) tag)) ---- return node; ---- node = node->next; ---- } ---- return NULL; ----} ---- ----gboolean obt_parse_attr_bool(xmlNodePtr node, const gchar *name, ---- gboolean *value) ----{ ---- xmlChar *c = xmlGetProp(node, (const xmlChar*) name); ---- gboolean r = FALSE; ---- if (c) { ---- if (!xmlStrcasecmp(c, (const xmlChar*) "true")) ---- *value = TRUE, r = TRUE; ---- else if (!xmlStrcasecmp(c, (const xmlChar*) "yes")) ---- *value = TRUE, r = TRUE; ---- else if (!xmlStrcasecmp(c, (const xmlChar*) "on")) ---- *value = TRUE, r = TRUE; ---- else if (!xmlStrcasecmp(c, (const xmlChar*) "false")) ---- *value = FALSE, r = TRUE; ---- else if (!xmlStrcasecmp(c, (const xmlChar*) "no")) ---- *value = FALSE, r = TRUE; ---- else if (!xmlStrcasecmp(c, (const xmlChar*) "off")) ---- *value = FALSE, r = TRUE; ---- } ---- xmlFree(c); ---- return r; ----} ---- ----gboolean obt_parse_attr_int(xmlNodePtr node, const gchar *name, gint *value) ----{ ---- xmlChar *c = xmlGetProp(node, (const xmlChar*) name); ---- gboolean r = FALSE; ---- if (c) { ---- *value = atoi((gchar*)c); ---- r = TRUE; ---- } ---- xmlFree(c); ---- return r; ----} ---- ----gboolean obt_parse_attr_string(xmlNodePtr node, const gchar *name, ---- gchar **value) ----{ ---- xmlChar *c = xmlGetProp(node, (const xmlChar*) name); ---- gboolean r = FALSE; ---- if (c) { ---- *value = g_strdup((gchar*)c); ---- r = TRUE; ---- } ---- xmlFree(c); ---- return r; ----} ---- ----gboolean obt_parse_attr_contains(xmlNodePtr node, const gchar *name, ---- const gchar *val) ----{ ---- xmlChar *c = xmlGetProp(node, (const xmlChar*) name); ---- gboolean r = FALSE; ---- if (c) ---- r = !xmlStrcasecmp(c, (const xmlChar*) val); ---- xmlFree(c); ---- return r; ----} diff --cc obt/parse.h index acc3f5c6,acc3f5c6,acc3f5c6,acc3f5c6..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/parse.h +++ /dev/null @@@@@ -1,85 -1,85 -1,85 -1,85 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/parse.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_parse_h ----#define __obt_parse_h ---- ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----typedef struct _ObtParseInst ObtParseInst; ---- ----typedef void (*ObtParseCallback)(xmlNodePtr node, gpointer data); ---- ----ObtParseInst* obt_parse_instance_new(void); ----void obt_parse_instance_ref(ObtParseInst *inst); ----void obt_parse_instance_unref(ObtParseInst *inst); ---- ----gboolean obt_parse_load_file(ObtParseInst *inst, ---- const gchar *path, ---- const gchar *root_node); ----gboolean obt_parse_load_config_file(ObtParseInst *inst, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node); ----gboolean obt_parse_load_data_file(ObtParseInst *inst, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node); ----gboolean obt_parse_load_theme_file(ObtParseInst *inst, ---- const gchar *theme, ---- const gchar *domain, ---- const gchar *filename, ---- const gchar *root_node); ----gboolean obt_parse_load_mem(ObtParseInst *inst, ---- gpointer data, guint len, const gchar *root_node); ---- ----xmlDocPtr obt_parse_doc(ObtParseInst *inst); ----xmlNodePtr obt_parse_root(ObtParseInst *inst); ---- ----void obt_parse_close(ObtParseInst *inst); ---- ----void obt_parse_register(ObtParseInst *inst, const gchar *tag, ---- ObtParseCallback func, gpointer data); ----void obt_parse_tree(ObtParseInst *i, xmlNodePtr node); ----void obt_parse_tree_from_root(ObtParseInst *i); ---- ---- ----/* helpers */ ---- ----xmlNodePtr obt_parse_find_node(xmlNodePtr node, const gchar *name); ---- ----gboolean obt_parse_node_contains (xmlNodePtr node, const gchar *val); ----gchar *obt_parse_node_string (xmlNodePtr node); ----gint obt_parse_node_int (xmlNodePtr node); ----gboolean obt_parse_node_bool (xmlNodePtr node); ---- ----gboolean obt_parse_attr_contains (xmlNodePtr node, const gchar *name, ---- const gchar *val); ----gboolean obt_parse_attr_string (xmlNodePtr node, const gchar *name, ---- gchar **value); ----gboolean obt_parse_attr_int (xmlNodePtr node, const gchar *name, ---- gint *value); ----gboolean obt_parse_attr_bool (xmlNodePtr node, const gchar *name, ---- gboolean *value); ---- ----G_END_DECLS ---- ----#endif diff --cc obt/paths.c index 61004998,61004998,61004998,61004998..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/paths.c +++ /dev/null @@@@@ -1,247 -1,247 -1,247 -1,247 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/paths.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/paths.h" ----#include "obt/util.h" ---- ----#ifdef HAVE_SYS_STAT_H ----# include ----#endif ----#ifdef HAVE_SYS_TYPES_H ----# include ----#endif ----#ifdef HAVE_STRING_H ----# include ----#endif ---- ----struct _ObtPaths ----{ ---- gint ref; ---- gchar *config_home; ---- gchar *data_home; ---- gchar *cache_home; ---- GSList *config_dirs; ---- GSList *data_dirs; ----}; ---- ----static gint slist_path_cmp(const gchar *a, const gchar *b) ----{ ---- return strcmp(a, b); ----} ---- ----typedef GSList* (*GSListFunc) (gpointer list, gconstpointer data); ---- ----static GSList* slist_path_add(GSList *list, gpointer data, GSListFunc func) ----{ ---- g_assert(func); ---- ---- if (!data) ---- return list; ---- ---- if (!g_slist_find_custom(list, data, (GCompareFunc) slist_path_cmp)) ---- list = func(list, data); ---- else ---- g_free(data); ---- ---- return list; ----} ---- ----static GSList* split_paths(const gchar *paths) ----{ ---- GSList *list = NULL; ---- gchar **spl, **it; ---- ---- if (!paths) ---- return NULL; ---- spl = g_strsplit(paths, ":", -1); ---- for (it = spl; *it; ++it) ---- list = slist_path_add(list, *it, (GSListFunc) g_slist_append); ---- g_free(spl); ---- return list; ----} ---- ----ObtPaths* obt_paths_new(void) ----{ ---- ObtPaths *p; ---- const gchar *path; ---- ---- p = g_new0(ObtPaths, 1); ---- p->ref = 1; ---- ---- path = g_getenv("XDG_CONFIG_HOME"); ---- if (path && path[0] != '\0') /* not unset or empty */ ---- p->config_home = g_build_filename(path, NULL); ---- else ---- p->config_home = g_build_filename(g_get_home_dir(), ".config", NULL); ---- ---- path = g_getenv("XDG_DATA_HOME"); ---- if (path && path[0] != '\0') /* not unset or empty */ ---- p->data_home = g_build_filename(path, NULL); ---- else ---- p->data_home = g_build_filename(g_get_home_dir(), ".local", ---- "share", NULL); ---- ---- path = g_getenv("XDG_CACHE_HOME"); ---- if (path && path[0] != '\0') /* not unset or empty */ ---- p->cache_home = g_build_filename(path, NULL); ---- else ---- p->cache_home = g_build_filename(g_get_home_dir(), ".cache", NULL); ---- ---- path = g_getenv("XDG_CONFIG_DIRS"); ---- if (path && path[0] != '\0') /* not unset or empty */ ---- p->config_dirs = split_paths(path); ---- else { ---- p->config_dirs = slist_path_add(p->config_dirs, ---- g_strdup(CONFIGDIR), ---- (GSListFunc) g_slist_append); ---- p->config_dirs = slist_path_add(p->config_dirs, ---- g_build_filename ---- (G_DIR_SEPARATOR_S, ---- "etc", "xdg", NULL), ---- (GSListFunc) g_slist_append); ---- } ---- p->config_dirs = slist_path_add(p->config_dirs, ---- g_strdup(p->config_home), ---- (GSListFunc) g_slist_prepend); ---- ---- path = g_getenv("XDG_DATA_DIRS"); ---- if (path && path[0] != '\0') /* not unset or empty */ ---- p->data_dirs = split_paths(path); ---- else { ---- p->data_dirs = slist_path_add(p->data_dirs, ---- g_strdup(DATADIR), ---- (GSListFunc) g_slist_append); ---- p->data_dirs = slist_path_add(p->data_dirs, ---- g_build_filename ---- (G_DIR_SEPARATOR_S, ---- "usr", "local", "share", NULL), ---- (GSListFunc) g_slist_append); ---- p->data_dirs = slist_path_add(p->data_dirs, ---- g_build_filename ---- (G_DIR_SEPARATOR_S, ---- "usr", "share", NULL), ---- (GSListFunc) g_slist_append); ---- } ---- p->data_dirs = slist_path_add(p->data_dirs, ---- g_strdup(p->data_home), ---- (GSListFunc) g_slist_prepend); ---- return p; ----} ---- ----void obt_paths_ref(ObtPaths *p) ----{ ---- ++p->ref; ----} ---- ----void obt_paths_unref(ObtPaths *p) ----{ ---- if (p && --p->ref == 0) { ---- GSList *it; ---- ---- for (it = p->config_dirs; it; it = g_slist_next(it)) ---- g_free(it->data); ---- g_slist_free(p->config_dirs); ---- for (it = p->data_dirs; it; it = g_slist_next(it)) ---- g_free(it->data); ---- g_slist_free(p->data_dirs); ---- g_free(p->config_home); ---- g_free(p->data_home); ---- g_free(p->cache_home); ---- ---- obt_free0(p, ObtPaths, 1); ---- } ----} ---- ----gchar *obt_paths_expand_tilde(const gchar *f) ----{ ---- gchar **spl; ---- gchar *ret; ---- ---- if (!f) ---- return NULL; ---- spl = g_strsplit(f, "~", 0); ---- ret = g_strjoinv(g_get_home_dir(), spl); ---- g_strfreev(spl); ---- return ret; ----} ---- ----gboolean obt_paths_mkdir(const gchar *path, gint mode) ----{ ---- gboolean ret = TRUE; ---- ---- g_return_val_if_fail(path != NULL, FALSE); ---- g_return_val_if_fail(path[0] != '\0', FALSE); ---- ---- if (!g_file_test(path, G_FILE_TEST_IS_DIR)) ---- if (mkdir(path, mode) == -1) ---- ret = FALSE; ---- ---- return ret; ----} ---- ----gboolean obt_paths_mkdir_path(const gchar *path, gint mode) ----{ ---- gboolean ret = TRUE; ---- ---- g_return_val_if_fail(path != NULL, FALSE); ---- g_return_val_if_fail(path[0] == '/', FALSE); ---- ---- if (!g_file_test(path, G_FILE_TEST_IS_DIR)) { ---- gchar *c, *e; ---- ---- c = g_strdup(path); ---- e = c; ---- while ((e = strchr(e + 1, '/'))) { ---- *e = '\0'; ---- if (!(ret = obt_paths_mkdir(c, mode))) ---- goto parse_mkdir_path_end; ---- *e = '/'; ---- } ---- ret = obt_paths_mkdir(c, mode); ---- ---- parse_mkdir_path_end: ---- g_free(c); ---- } ---- ---- return ret; ----} ---- ----const gchar* obt_paths_config_home(ObtPaths *p) ----{ ---- return p->config_home; ----} ---- ----const gchar* obt_paths_data_home(ObtPaths *p) ----{ ---- return p->data_home; ----} ---- ----const gchar* obt_paths_cache_home(ObtPaths *p) ----{ ---- return p->cache_home; ----} ---- ----GSList* obt_paths_config_dirs(ObtPaths *p) ----{ ---- return p->config_dirs; ----} ---- ----GSList* obt_paths_data_dirs(ObtPaths *p) ----{ ---- return p->data_dirs; ----} diff --cc obt/paths.h index 8753d4f6,8753d4f6,8753d4f6,8753d4f6..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/paths.h +++ /dev/null @@@@@ -1,44 -1,44 -1,44 -1,44 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/paths.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_paths_h ----#define __obt_paths_h ---- ----#include ---- ----G_BEGIN_DECLS ---- ----typedef struct _ObtPaths ObtPaths; ---- ----ObtPaths* obt_paths_new(void); ----void obt_paths_ref(ObtPaths *p); ----void obt_paths_unref(ObtPaths *p); ---- ----const gchar* obt_paths_config_home(ObtPaths *p); ----const gchar* obt_paths_data_home(ObtPaths *p); ----const gchar* obt_paths_cache_home(ObtPaths *p); ----GSList* obt_paths_config_dirs(ObtPaths *p); ----GSList* obt_paths_data_dirs(ObtPaths *p); ---- ----gchar *obt_paths_expand_tilde(const gchar *f); ----gboolean obt_paths_mkdir(const gchar *path, gint mode); ----gboolean obt_paths_mkdir_path(const gchar *path, gint mode); ---- ----G_END_DECLS ---- ----#endif diff --cc obt/prop.c index 205ce6cd,1e324b92,1e324b92,ca5c19d4..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/prop.c +++ /dev/null @@@@@ -1,499 -1,497 -1,497 -1,499 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/prop.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/prop.h" ----#include "obt/display.h" ---- ----#include ----#ifdef HAVE_STRING_H ----# include ----#endif ---- ----Atom prop_atoms[OBT_PROP_NUM_ATOMS]; ----gboolean prop_started = FALSE; ---- ----#define CREATE_NAME(var, name) (prop_atoms[OBT_PROP_##var] = \ ---- XInternAtom((obt_display), (name), FALSE)) ----#define CREATE(var) CREATE_NAME(var, #var) ----#define CREATE_(var) CREATE_NAME(var, "_" #var) ---- ----void obt_prop_startup(void) ----{ ---- if (prop_started) return; ---- prop_started = TRUE; ---- ---- g_assert(obt_display); ---- ---- CREATE(CARDINAL); ---- CREATE(WINDOW); ---- CREATE(PIXMAP); ---- CREATE(ATOM); ---- CREATE(STRING); ---- CREATE_NAME(UTF8, "UTF8_STRING"); ---- ---- CREATE(MANAGER); ---- ---- CREATE(WM_COLORMAP_WINDOWS); ---- CREATE(WM_PROTOCOLS); ---- CREATE(WM_STATE); ---- CREATE(WM_CHANGE_STATE); ---- CREATE(WM_DELETE_WINDOW); ---- CREATE(WM_TAKE_FOCUS); ---- CREATE(WM_NAME); ---- CREATE(WM_ICON_NAME); ---- CREATE(WM_CLASS); ---- CREATE(WM_WINDOW_ROLE); ---- CREATE(WM_CLIENT_MACHINE); ---- CREATE(WM_COMMAND); ---- CREATE(WM_CLIENT_LEADER); ---- CREATE(WM_TRANSIENT_FOR); ---- CREATE_(MOTIF_WM_HINTS); ---- ---- CREATE(SM_CLIENT_ID); ---- ---- CREATE_(NET_WM_FULL_PLACEMENT); ---- ---- CREATE_(NET_SUPPORTED); ---- CREATE_(NET_CLIENT_LIST); ---- CREATE_(NET_CLIENT_LIST_STACKING); ---- CREATE_(NET_NUMBER_OF_DESKTOPS); ---- CREATE_(NET_DESKTOP_GEOMETRY); ---- CREATE_(NET_DESKTOP_VIEWPORT); ---- CREATE_(NET_CURRENT_DESKTOP); ---- CREATE_(NET_DESKTOP_NAMES); ---- CREATE_(NET_ACTIVE_WINDOW); ----/* CREATE_(NET_RESTACK_WINDOW);*/ ---- CREATE_(NET_WORKAREA); ---- CREATE_(NET_SUPPORTING_WM_CHECK); ---- CREATE_(NET_DESKTOP_LAYOUT); ---- CREATE_(NET_SHOWING_DESKTOP); ---- ---- CREATE_(NET_CLOSE_WINDOW); ---- CREATE_(NET_WM_MOVERESIZE); ---- CREATE_(NET_MOVERESIZE_WINDOW); ---- CREATE_(NET_REQUEST_FRAME_EXTENTS); ---- CREATE_(NET_RESTACK_WINDOW); ---- ---- CREATE_(NET_STARTUP_ID); ---- ---- CREATE_(NET_WM_NAME); ---- CREATE_(NET_WM_VISIBLE_NAME); ---- CREATE_(NET_WM_ICON_NAME); ---- CREATE_(NET_WM_VISIBLE_ICON_NAME); ---- CREATE_(NET_WM_DESKTOP); ---- CREATE_(NET_WM_WINDOW_TYPE); ---- CREATE_(NET_WM_STATE); ---- CREATE_(NET_WM_STRUT); ---- CREATE_(NET_WM_STRUT_PARTIAL); ---- CREATE_(NET_WM_ICON); ---- CREATE_(NET_WM_ICON_GEOMETRY); ---- CREATE_(NET_WM_PID); ---- CREATE_(NET_WM_ALLOWED_ACTIONS); ---- CREATE_(NET_WM_USER_TIME); ----/* CREATE_(NET_WM_USER_TIME_WINDOW); */ ---- CREATE_(KDE_NET_WM_FRAME_STRUT); ---- CREATE_(NET_FRAME_EXTENTS); ---- ---- CREATE_(NET_WM_PING); ----#ifdef SYNC ---- CREATE_(NET_WM_SYNC_REQUEST); ---- CREATE_(NET_WM_SYNC_REQUEST_COUNTER); ----#endif ---- ---- CREATE_(NET_WM_WINDOW_TYPE_DESKTOP); ---- CREATE_(NET_WM_WINDOW_TYPE_DOCK); ---- CREATE_(NET_WM_WINDOW_TYPE_TOOLBAR); ---- CREATE_(NET_WM_WINDOW_TYPE_MENU); ---- CREATE_(NET_WM_WINDOW_TYPE_UTILITY); ---- CREATE_(NET_WM_WINDOW_TYPE_SPLASH); ---- CREATE_(NET_WM_WINDOW_TYPE_DIALOG); ---- CREATE_(NET_WM_WINDOW_TYPE_NORMAL); ---- CREATE_(NET_WM_WINDOW_TYPE_POPUP_MENU); ---- ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPLEFT] = 0; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOP] = 1; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPRIGHT] = 2; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_RIGHT] = 3; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT] = 4; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOM] = 5; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT] = 6; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_LEFT] = 7; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_MOVE] = 8; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_KEYBOARD] = 9; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_MOVE_KEYBOARD] = 10; ---- prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_CANCEL] = 11; ---- ---- CREATE_(NET_WM_ACTION_MOVE); ---- CREATE_(NET_WM_ACTION_RESIZE); ---- CREATE_(NET_WM_ACTION_MINIMIZE); ---- CREATE_(NET_WM_ACTION_SHADE); ---- CREATE_(NET_WM_ACTION_MAXIMIZE_HORZ); ---- CREATE_(NET_WM_ACTION_MAXIMIZE_VERT); ---- CREATE_(NET_WM_ACTION_FULLSCREEN); ---- CREATE_(NET_WM_ACTION_CHANGE_DESKTOP); ---- CREATE_(NET_WM_ACTION_CLOSE); ---- CREATE_(NET_WM_ACTION_ABOVE); ---- CREATE_(NET_WM_ACTION_BELOW); ---- ---- CREATE_(NET_WM_STATE_MODAL); ----/* CREATE_(NET_WM_STATE_STICKY);*/ ---- CREATE_(NET_WM_STATE_MAXIMIZED_VERT); ---- CREATE_(NET_WM_STATE_MAXIMIZED_HORZ); ---- CREATE_(NET_WM_STATE_SHADED); ---- CREATE_(NET_WM_STATE_SKIP_TASKBAR); ---- CREATE_(NET_WM_STATE_SKIP_PAGER); ---- CREATE_(NET_WM_STATE_HIDDEN); ---- CREATE_(NET_WM_STATE_FULLSCREEN); ---- CREATE_(NET_WM_STATE_ABOVE); ---- CREATE_(NET_WM_STATE_BELOW); ---- CREATE_(NET_WM_STATE_DEMANDS_ATTENTION); ---- ---- prop_atoms[OBT_PROP_NET_WM_STATE_ADD] = 1; ---- prop_atoms[OBT_PROP_NET_WM_STATE_REMOVE] = 0; ---- prop_atoms[OBT_PROP_NET_WM_STATE_TOGGLE] = 2; ---- ---- prop_atoms[OBT_PROP_NET_WM_ORIENTATION_HORZ] = 0; ---- prop_atoms[OBT_PROP_NET_WM_ORIENTATION_VERT] = 1; ---- prop_atoms[OBT_PROP_NET_WM_TOPLEFT] = 0; ---- prop_atoms[OBT_PROP_NET_WM_TOPRIGHT] = 1; ---- prop_atoms[OBT_PROP_NET_WM_BOTTOMRIGHT] = 2; ---- prop_atoms[OBT_PROP_NET_WM_BOTTOMLEFT] = 3; ---- ---- CREATE_(KDE_WM_CHANGE_STATE); ---- CREATE_(KDE_NET_WM_WINDOW_TYPE_OVERRIDE); ---- ----/* ---- CREATE_NAME(ROOTPMAPId, "_XROOTPMAP_ID"); ---- CREATE_NAME(ESETROOTId, "ESETROOT_PMAP_ID"); ----*/ ---- ---- CREATE_(OPENBOX_PID); - CREATE_(OB_FOCUS); ---- CREATE_(OB_THEME); ---- CREATE_(OB_CONFIG_FILE); ---- CREATE_(OB_WM_ACTION_UNDECORATE); ---- CREATE_(OB_WM_STATE_UNDECORATED); - CREATE_(OB_WM_STATE_LOCKED); - CREATE_(OB_LAST_DESKTOP); ---- CREATE_(OB_CONTROL); - CREATE_(OB_TARGET_WINDOW); ----} ---- ----Atom obt_prop_atom(ObtPropAtom a) ----{ ---- g_assert(prop_started); ---- g_assert(a < OBT_PROP_NUM_ATOMS); ---- return prop_atoms[a]; ----} ---- ----static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size, ---- guchar *data, gulong num) ----{ ---- gboolean ret = FALSE; ---- gint res; ---- guchar *xdata = NULL; ---- Atom ret_type; ---- gint ret_size; ---- gulong ret_items, bytes_left; ---- glong num32 = 32 / size * num; /* num in 32-bit elements */ ---- ---- res = XGetWindowProperty(obt_display, win, prop, 0l, num32, ---- FALSE, type, &ret_type, &ret_size, ---- &ret_items, &bytes_left, &xdata); ---- if (res == Success && ret_items && xdata) { ---- if (ret_size == size && ret_items >= num) { ---- guint i; ---- for (i = 0; i < num; ++i) ---- switch (size) { ---- case 8: ---- data[i] = xdata[i]; ---- break; ---- case 16: ---- ((guint16*)data)[i] = ((gushort*)xdata)[i]; ---- break; ---- case 32: ---- ((guint32*)data)[i] = ((gulong*)xdata)[i]; ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled size */ ---- } ---- ret = TRUE; ---- } ---- XFree(xdata); ---- } ---- return ret; ----} ---- ----static gboolean get_all(Window win, Atom prop, Atom type, gint size, ---- guchar **data, guint *num) ----{ ---- gboolean ret = FALSE; ---- gint res; ---- guchar *xdata = NULL; ---- Atom ret_type; ---- gint ret_size; ---- gulong ret_items, bytes_left; ---- ---- res = XGetWindowProperty(obt_display, win, prop, 0l, G_MAXLONG, ---- FALSE, type, &ret_type, &ret_size, ---- &ret_items, &bytes_left, &xdata); ---- if (res == Success) { ---- if (ret_size == size && ret_items > 0) { ---- guint i; ---- ---- *data = g_malloc(ret_items * (size / 8)); ---- for (i = 0; i < ret_items; ++i) ---- switch (size) { ---- case 8: ---- (*data)[i] = xdata[i]; ---- break; ---- case 16: ---- ((guint16*)*data)[i] = ((gushort*)xdata)[i]; ---- break; ---- case 32: ---- ((guint32*)*data)[i] = ((gulong*)xdata)[i]; ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled size */ ---- } ---- *num = ret_items; ---- ret = TRUE; ---- } ---- XFree(xdata); ---- } ---- return ret; ----} ---- ----static gboolean get_stringlist(Window win, Atom prop, gchar ***list, gint *nstr) ----{ ---- XTextProperty tprop; ---- gboolean ret = FALSE; ---- ---- if (XGetTextProperty(obt_display, win, &tprop, prop) && tprop.nitems) { ---- if (XTextPropertyToStringList(&tprop, list, nstr)) ---- ret = TRUE; ---- XFree(tprop.value); ---- } ---- return ret; ----} ---- ----gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret) ----{ ---- return get_prealloc(win, prop, type, 32, (guchar*)ret, 1); ----} ---- ----gboolean obt_prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, ---- guint *nret) ----{ ---- return get_all(win, prop, type, 32, (guchar**)ret, nret); ----} ---- ----gboolean obt_prop_get_string_locale(Window win, Atom prop, gchar **ret) ----{ ---- gchar **list; ---- gint nstr; ---- gchar *s; ---- ---- if (get_stringlist(win, prop, &list, &nstr) && nstr) { ---- s = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL); ---- XFreeStringList(list); ---- if (s) { ---- *ret = s; ---- return TRUE; ---- } ---- } ---- return FALSE; ----} ---- ----gboolean obt_prop_get_strings_locale(Window win, Atom prop, gchar ***ret) ----{ ---- GSList *strs = NULL, *it; ---- gchar *raw, *p; ---- guint num, i, count = 0; ---- ---- if (get_all(win, prop, OBT_PROP_ATOM(STRING), 8, ---- (guchar**)&raw, &num)) ---- { ---- p = raw; ---- while (p < raw + num) { ---- ++count; ---- strs = g_slist_append(strs, p); ---- p += strlen(p) + 1; /* next string */ ---- } ---- ---- *ret = g_new0(gchar*, count + 1); ---- (*ret)[count] = NULL; /* null terminated list */ ---- ---- for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) { ---- (*ret)[i] = g_locale_to_utf8(it->data, -1, NULL, NULL, NULL); ---- /* make sure translation did not fail */ ---- if (!(*ret)[i]) ---- (*ret)[i] = g_strdup(""); ---- } ---- g_free(raw); ---- g_slist_free(strs); ---- return TRUE; ---- } ---- return FALSE; ----} ---- ----gboolean obt_prop_get_string_utf8(Window win, Atom prop, gchar **ret) ----{ ---- gchar *raw; ---- gchar *str; ---- guint num; ---- ---- if (get_all(win, prop, OBT_PROP_ATOM(UTF8), 8, ---- (guchar**)&raw, &num)) ---- { ---- str = g_strndup(raw, num); /* grab the first string from the list */ ---- g_free(raw); ---- if (g_utf8_validate(str, -1, NULL)) { ---- *ret = str; ---- return TRUE; ---- } ---- g_free(str); ---- } ---- return FALSE; ----} ---- ----gboolean obt_prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) ----{ ---- GSList *strs = NULL, *it; ---- gchar *raw, *p; ---- guint num, i, count = 0; ---- ---- if (get_all(win, prop, OBT_PROP_ATOM(UTF8), 8, ---- (guchar**)&raw, &num)) ---- { ---- p = raw; ---- while (p < raw + num) { ---- ++count; ---- strs = g_slist_append(strs, p); ---- p += strlen(p) + 1; /* next string */ ---- } ---- ---- *ret = g_new0(gchar*, count + 1); ---- ---- for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) { ---- if (g_utf8_validate(it->data, -1, NULL)) ---- (*ret)[i] = g_strdup(it->data); ---- else ---- (*ret)[i] = g_strdup(""); ---- } ---- g_free(raw); ---- g_slist_free(strs); ---- return TRUE; ---- } ---- return FALSE; ----} ---- ----void obt_prop_set32(Window win, Atom prop, Atom type, gulong val) ----{ ---- XChangeProperty(obt_display, win, prop, type, 32, PropModeReplace, ---- (guchar*)&val, 1); ----} ---- ----void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val, ---- guint num) ----{ ---- XChangeProperty(obt_display, win, prop, type, 32, PropModeReplace, ---- (guchar*)val, num); ----} ---- ----void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val) ----{ ---- gchar const *s[2] = { val, NULL }; ---- obt_prop_set_strings_locale(win, prop, s); ----} ---- ----void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs) ----{ ---- gint i, count; ---- gchar **lstrs; ---- XTextProperty tprop; ---- ---- /* count the strings in strs, and convert them to the locale format */ ---- for (count = 0; strs[count]; ++count); ---- lstrs = g_new0(char*, count); ---- for (i = 0; i < count; ++i) { ---- lstrs[i] = g_locale_from_utf8(strs[i], -1, NULL, NULL, NULL); ---- if (!lstrs[i]) { ---- lstrs[i] = g_strdup(""); /* make it an empty string */ ---- g_warning("Unable to translate string '%s' from UTF8 to locale " ---- "format", strs[i]); ---- } ---- } ---- ---- ---- XStringListToTextProperty(lstrs, count, &tprop); ---- XSetTextProperty(obt_display, win, &tprop, prop); ---- XFree(tprop.value); ----} ---- ----void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val) ----{ ---- XChangeProperty(obt_display, win, prop, OBT_PROP_ATOM(UTF8), 8, ---- PropModeReplace, (const guchar*)val, strlen(val)); ----} ---- ----void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs) ----{ ---- GString *str; ---- gchar const **s; ---- ---- str = g_string_sized_new(0); ---- for (s = strs; *s; ++s) { ---- str = g_string_append(str, *s); ---- str = g_string_append_c(str, '\0'); ---- } ---- XChangeProperty(obt_display, win, prop, obt_prop_atom(OBT_PROP_UTF8), 8, ---- PropModeReplace, (guchar*)str->str, str->len); ---- g_string_free(str, TRUE); ----} ---- ----void obt_prop_erase(Window win, Atom prop) ----{ ---- XDeleteProperty(obt_display, win, prop); ----} ---- ----void obt_prop_message(gint screen, Window about, Atom messagetype, ---- glong data0, glong data1, glong data2, glong data3, ---- glong data4, glong mask) ----{ ---- obt_prop_message_to(obt_root(screen), about, messagetype, ---- data0, data1, data2, data3, data4, mask); ----} ---- ----void obt_prop_message_to(Window to, Window about, ---- Atom messagetype, ---- glong data0, glong data1, glong data2, glong data3, ---- glong data4, glong mask) ----{ ---- XEvent ce; ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = messagetype; ---- ce.xclient.display = obt_display; ---- ce.xclient.window = about; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = data0; ---- ce.xclient.data.l[1] = data1; ---- ce.xclient.data.l[2] = data2; ---- ce.xclient.data.l[3] = data3; ---- ce.xclient.data.l[4] = data4; ---- XSendEvent(obt_display, to, FALSE, mask, &ce); ----} diff --cc obt/prop.h index 72226ec3,22a1ab42,22a1ab42,1107ac8b..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/prop.h +++ /dev/null @@@@@ -1,283 -1,281 -1,281 -1,283 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/prop.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_prop_h ----#define __obt_prop_h ---- ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----typedef enum { ---- /* types */ ---- OBT_PROP_CARDINAL, /*!< The atom which represents the Cardinal data type */ ---- OBT_PROP_WINDOW, /*!< The atom which represents window ids */ ---- OBT_PROP_PIXMAP, /*!< The atom which represents pixmap ids */ ---- OBT_PROP_ATOM, /*!< The atom which represents atom values */ ---- OBT_PROP_STRING, /*!< The atom which represents ascii strings */ ---- OBT_PROP_UTF8, /*!< The atom which represents utf8-encoded strings */ ---- ---- /* selection stuff */ ---- OBT_PROP_MANAGER, ---- ---- /* window hints */ ---- OBT_PROP_WM_COLORMAP_WINDOWS, ---- OBT_PROP_WM_PROTOCOLS, ---- OBT_PROP_WM_STATE, ---- OBT_PROP_WM_DELETE_WINDOW, ---- OBT_PROP_WM_TAKE_FOCUS, ---- OBT_PROP_WM_CHANGE_STATE, ---- OBT_PROP_WM_NAME, ---- OBT_PROP_WM_ICON_NAME, ---- OBT_PROP_WM_CLASS, ---- OBT_PROP_WM_WINDOW_ROLE, ---- OBT_PROP_WM_CLIENT_MACHINE, ---- OBT_PROP_WM_COMMAND, ---- OBT_PROP_WM_CLIENT_LEADER, ---- OBT_PROP_WM_TRANSIENT_FOR, ---- OBT_PROP_MOTIF_WM_HINTS, ---- ---- /* SM atoms */ ---- OBT_PROP_SM_CLIENT_ID, ---- ---- /* NETWM atoms */ ---- ---- /* Atoms that are used inside messages - these don't go in net_supported */ ---- ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPLEFT, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOP, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPRIGHT, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_RIGHT, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOM, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_LEFT, ---- OBT_PROP_NET_WM_MOVERESIZE_MOVE, ---- OBT_PROP_NET_WM_MOVERESIZE_SIZE_KEYBOARD, ---- OBT_PROP_NET_WM_MOVERESIZE_MOVE_KEYBOARD, ---- OBT_PROP_NET_WM_MOVERESIZE_CANCEL, ---- ---- OBT_PROP_NET_WM_STATE_ADD, ---- OBT_PROP_NET_WM_STATE_REMOVE, ---- OBT_PROP_NET_WM_STATE_TOGGLE, ---- ---- OBT_PROP_NET_WM_ORIENTATION_HORZ, ---- OBT_PROP_NET_WM_ORIENTATION_VERT, ---- OBT_PROP_NET_WM_TOPLEFT, ---- OBT_PROP_NET_WM_TOPRIGHT, ---- OBT_PROP_NET_WM_BOTTOMRIGHT, ---- OBT_PROP_NET_WM_BOTTOMLEFT, ---- ---- OBT_PROP_NET_WM_WINDOW_TYPE_POPUP_MENU, ---- ---- OBT_PROP_PRIVATE_PADDING1, ---- OBT_PROP_PRIVATE_PADDING2, ---- OBT_PROP_PRIVATE_PADDING3, ---- OBT_PROP_PRIVATE_PADDING4, ---- OBT_PROP_PRIVATE_PADDING5, ---- OBT_PROP_PRIVATE_PADDING6, ---- OBT_PROP_PRIVATE_PADDING7, ---- OBT_PROP_PRIVATE_PADDING8, ---- OBT_PROP_PRIVATE_PADDING9, ---- OBT_PROP_PRIVATE_PADDING10, ---- OBT_PROP_PRIVATE_PADDING11, ---- OBT_PROP_PRIVATE_PADDING12, ---- ---- /* Everything below here must go in net_supported on the root window */ ---- ---- /* root window properties */ ---- OBT_PROP_NET_SUPPORTED, ---- OBT_PROP_NET_CLIENT_LIST, ---- OBT_PROP_NET_CLIENT_LIST_STACKING, ---- OBT_PROP_NET_NUMBER_OF_DESKTOPS, ---- OBT_PROP_NET_DESKTOP_GEOMETRY, ---- OBT_PROP_NET_DESKTOP_VIEWPORT, ---- OBT_PROP_NET_CURRENT_DESKTOP, ---- OBT_PROP_NET_DESKTOP_NAMES, ---- OBT_PROP_NET_ACTIVE_WINDOW, ----/* Atom net_restack_window;*/ ---- OBT_PROP_NET_WORKAREA, ---- OBT_PROP_NET_SUPPORTING_WM_CHECK, ---- OBT_PROP_NET_DESKTOP_LAYOUT, ---- OBT_PROP_NET_SHOWING_DESKTOP, ---- ---- /* root window messages */ ---- OBT_PROP_NET_CLOSE_WINDOW, ---- OBT_PROP_NET_WM_MOVERESIZE, ---- OBT_PROP_NET_MOVERESIZE_WINDOW, ---- OBT_PROP_NET_REQUEST_FRAME_EXTENTS, ---- OBT_PROP_NET_RESTACK_WINDOW, ---- ---- /* helpful hints to apps that aren't used for anything */ ---- OBT_PROP_NET_WM_FULL_PLACEMENT, ---- ---- /* startup-notification extension */ ---- OBT_PROP_NET_STARTUP_ID, ---- ---- /* application window properties */ ---- OBT_PROP_NET_WM_NAME, ---- OBT_PROP_NET_WM_VISIBLE_NAME, ---- OBT_PROP_NET_WM_ICON_NAME, ---- OBT_PROP_NET_WM_VISIBLE_ICON_NAME, ---- OBT_PROP_NET_WM_DESKTOP, ---- OBT_PROP_NET_WM_WINDOW_TYPE, ---- OBT_PROP_NET_WM_STATE, ---- OBT_PROP_NET_WM_STRUT, ---- OBT_PROP_NET_WM_STRUT_PARTIAL, ---- OBT_PROP_NET_WM_ICON, ---- OBT_PROP_NET_WM_ICON_GEOMETRY, ---- OBT_PROP_NET_WM_PID, ---- OBT_PROP_NET_WM_ALLOWED_ACTIONS, ---- OBT_PROP_NET_WM_USER_TIME, ----/* OBT_PROP_NET_WM_USER_TIME_WINDOW, */ ---- OBT_PROP_NET_FRAME_EXTENTS, ---- ---- /* application protocols */ ---- OBT_PROP_NET_WM_PING, ----#ifdef SYNC ---- OBT_PROP_NET_WM_SYNC_REQUEST, ---- OBT_PROP_NET_WM_SYNC_REQUEST_COUNTER, ----#endif ---- ---- OBT_PROP_NET_WM_WINDOW_TYPE_DESKTOP, ---- OBT_PROP_NET_WM_WINDOW_TYPE_DOCK, ---- OBT_PROP_NET_WM_WINDOW_TYPE_TOOLBAR, ---- OBT_PROP_NET_WM_WINDOW_TYPE_MENU, ---- OBT_PROP_NET_WM_WINDOW_TYPE_UTILITY, ---- OBT_PROP_NET_WM_WINDOW_TYPE_SPLASH, ---- OBT_PROP_NET_WM_WINDOW_TYPE_DIALOG, ---- OBT_PROP_NET_WM_WINDOW_TYPE_NORMAL, ---- ---- OBT_PROP_NET_WM_ACTION_MOVE, ---- OBT_PROP_NET_WM_ACTION_RESIZE, ---- OBT_PROP_NET_WM_ACTION_MINIMIZE, ---- OBT_PROP_NET_WM_ACTION_SHADE, ----/* OBT_PROP_NET_WM_ACTION_STICK,*/ ---- OBT_PROP_NET_WM_ACTION_MAXIMIZE_HORZ, ---- OBT_PROP_NET_WM_ACTION_MAXIMIZE_VERT, ---- OBT_PROP_NET_WM_ACTION_FULLSCREEN, ---- OBT_PROP_NET_WM_ACTION_CHANGE_DESKTOP, ---- OBT_PROP_NET_WM_ACTION_CLOSE, ---- OBT_PROP_NET_WM_ACTION_ABOVE, ---- OBT_PROP_NET_WM_ACTION_BELOW, ---- ---- OBT_PROP_NET_WM_STATE_MODAL, ----/* OBT_PROP_NET_WM_STATE_STICKY,*/ ---- OBT_PROP_NET_WM_STATE_MAXIMIZED_VERT, ---- OBT_PROP_NET_WM_STATE_MAXIMIZED_HORZ, ---- OBT_PROP_NET_WM_STATE_SHADED, ---- OBT_PROP_NET_WM_STATE_SKIP_TASKBAR, ---- OBT_PROP_NET_WM_STATE_SKIP_PAGER, ---- OBT_PROP_NET_WM_STATE_HIDDEN, ---- OBT_PROP_NET_WM_STATE_FULLSCREEN, ---- OBT_PROP_NET_WM_STATE_ABOVE, ---- OBT_PROP_NET_WM_STATE_BELOW, ---- OBT_PROP_NET_WM_STATE_DEMANDS_ATTENTION, ---- ---- /* KDE atoms */ ---- ---- OBT_PROP_KDE_WM_CHANGE_STATE, ---- OBT_PROP_KDE_NET_WM_FRAME_STRUT, ---- OBT_PROP_KDE_NET_WM_WINDOW_TYPE_OVERRIDE, ---- ----/* ---- OBT_PROP_ROOTPMAPID, ---- OBT_PROP_ESETROOTID, ----*/ ---- ---- /* Openbox specific atoms */ ---- - OBT_PROP_OB_FOCUS, ---- OBT_PROP_OB_WM_ACTION_UNDECORATE, ---- OBT_PROP_OB_WM_STATE_UNDECORATED, - OBT_PROP_OB_WM_STATE_LOCKED, ---- OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */ ---- OBT_PROP_OB_THEME, ---- OBT_PROP_OB_CONFIG_FILE, - OBT_PROP_OB_LAST_DESKTOP, ---- OBT_PROP_OB_CONTROL, - OBT_PROP_OB_TARGET_WINDOW, ---- ---- OBT_PROP_NUM_ATOMS ----} ObtPropAtom; ---- ----Atom obt_prop_atom(ObtPropAtom a); ---- ----gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret); ----gboolean obt_prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, ---- guint *nret); ----gboolean obt_prop_get_string_locale(Window win, Atom prop, gchar **ret); ----gboolean obt_prop_get_string_utf8(Window win, Atom prop, gchar **ret); ----gboolean obt_prop_get_strings_locale(Window win, Atom prop, gchar ***ret); ----gboolean obt_prop_get_strings_utf8(Window win, Atom prop, gchar ***ret); ---- ----void obt_prop_set32(Window win, Atom prop, Atom type, gulong val); ----void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val, ---- guint num); ----void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val); ----void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val); ----void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs); ----void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs); ---- ----void obt_prop_erase(Window win, Atom prop); ---- ----void obt_prop_message(gint screen, Window about, Atom messagetype, ---- glong data0, glong data1, glong data2, glong data3, ---- glong data4, glong mask); ----void obt_prop_message_to(Window to, Window about, Atom messagetype, ---- glong data0, glong data1, glong data2, glong data3, ---- glong data4, glong mask); ---- ----#define OBT_PROP_ATOM(prop) obt_prop_atom(OBT_PROP_##prop) ---- ----#define OBT_PROP_GET32(win, prop, type, ret) \ ---- (obt_prop_get32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), ret)) ----#define OBT_PROP_GETA32(win, prop, type, ret, nret) \ ---- (obt_prop_get_array32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), \ ---- ret, nret)) ----#define OBT_PROP_GETS(win, prop, type, ret) \ ---- (obt_prop_get_string_##type(win, OBT_PROP_ATOM(prop), ret)) ----#define OBT_PROP_GETSS(win, prop, type, ret) \ ---- (obt_prop_get_strings_##type(win, OBT_PROP_ATOM(prop), ret)) ---- ----#define OBT_PROP_SET32(win, prop, type, val) \ ---- (obt_prop_set32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), val)) ----#define OBT_PROP_SETA32(win, prop, type, val, num) \ ---- (obt_prop_set_array32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), \ ---- val, num)) ----#define OBT_PROP_SETS(win, prop, type, val) \ ---- (obt_prop_set_string_##type(win, OBT_PROP_ATOM(prop), val)) ----#define OBT_PROP_SETSS(win, prop, type, strs) \ ---- (obt_prop_set_strings_##type(win, OBT_PROP_ATOM(prop), strs)) ---- ----#define OBT_PROP_ERASE(win, prop) (obt_prop_erase(win, OBT_PROP_ATOM(prop))) ---- ----#define OBT_PROP_MSG(screen, about, msgtype, data0, data1, data2, data3, \ ---- data4) \ ---- (obt_prop_message(screen, about, OBT_PROP_ATOM(msgtype), \ ---- data0, data1, data2, data3, data4, \ ---- SubstructureNotifyMask | SubstructureRedirectMask)) ---- ----#define OBT_PROP_MSG_TO(to, about, msgtype, data0, data1, data2, data3, \ ---- data4, mask) \ ---- (obt_prop_message_to(to, about, OBT_PROP_ATOM(msgtype), \ ---- data0, data1, data2, data3, data4, mask)) ---- ----G_END_DECLS ---- ----#endif /* __obt_prop_h */ diff --cc obt/util.h index ff44d364,ff44d364,ff44d364,ff44d364..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/util.h +++ /dev/null @@@@@ -1,37 -1,37 -1,37 -1,37 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/util.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_util_h ----#define __obt_util_h ---- ----#include ---- ----#ifdef HAVE_STRING_H ----# include /* for memset() */ ----#endif ---- ----G_BEGIN_DECLS ---- ----/* Util funcs */ ----#define obt_free g_free ----#define obt_free0(p, type, num) memset((p), 0, sizeof(type) * (num)), g_free(p) ---- ----G_END_DECLS ---- ---- ----#endif /*__obt_util_h*/ diff --cc obt/version.h.in index 8adfcf8d,8adfcf8d,8adfcf8d,8adfcf8d..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/version.h.in +++ /dev/null @@@@@ -1,15 -1,15 -1,15 -1,15 +1,0 @@@@@ ----#ifndef obt__version_h ----#define obt__version_h ---- ----#define OBT_MAJOR_VERSION @OBT_MAJOR_VERSION@ ----#define OBT_MINOR_VERSION @OBT_MINOR_VERSION@ ----#define OBT_MICRO_VERSION @OBT_MICRO_VERSION@ ----#define OBT_VERSION OBT_MAJOR_VERSION.OBT_MINOR_VERSION.OBT_MICRO_VERSION ---- ----#define OBT_CHECK_VERSION(major,minor,micro) \ ---- (OBT_MAJOR_VERSION > (major) || \ ---- (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION > (minor)) || \ ---- (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION == (minor) && \ ---- OBT_MICRO_VERSION >= (micro))) ---- ----#endif diff --cc obt/xevent.c index 1cc32a94,1cc32a94,1cc32a94,1cc32a94..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/xevent.c +++ /dev/null @@@@@ -1,134 -1,134 -1,134 -1,134 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/xevent.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "obt/xevent.h" ----#include "obt/mainloop.h" ----#include "obt/util.h" ---- ----typedef struct _ObtXEventBinding ObtXEventBinding; ---- ----struct _ObtXEventHandler ----{ ---- gint ref; ---- ObtMainLoop *loop; ---- ---- /* An array of hash tables where the key is the window, and the value is ---- the ObtXEventBinding */ ---- GHashTable **bindings; ---- gint num_event_types; /* the length of the bindings array */ ----}; ---- ----struct _ObtXEventBinding ----{ ---- Window win; ---- ObtXEventCallback func; ---- gpointer data; ----}; ---- ----static void xevent_handler(const XEvent *e, gpointer data); ----static guint window_hash(Window *w) { return *w; } ----static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } ---- ----ObtXEventHandler* xevent_new(void) ----{ ---- ObtXEventHandler *h; ---- ---- h = g_new0(ObtXEventHandler, 1); ---- h->ref = 1; ---- ---- return h; ----} ---- ----void xevent_ref(ObtXEventHandler *h) ----{ ---- ++h->ref; ----} ---- ----void xevent_unref(ObtXEventHandler *h) ----{ ---- if (h && --h->ref == 0) { ---- gint i; ---- ---- if (h->loop) ---- obt_main_loop_x_remove(h->loop, xevent_handler); ---- for (i = 0; i < h->num_event_types; ++i) ---- g_hash_table_destroy(h->bindings[i]); ---- g_free(h->bindings); ---- ---- obt_free0(h, ObtXEventHandler, 1); ---- } ----} ---- ----void xevent_register(ObtXEventHandler *h, ObtMainLoop *loop) ----{ ---- h->loop = loop; ---- obt_main_loop_x_add(loop, xevent_handler, h, NULL); ----} ---- ----void xevent_set_handler(ObtXEventHandler *h, gint type, Window win, ---- ObtXEventCallback func, gpointer data) ----{ ---- ObtXEventBinding *b; ---- ---- g_assert(func); ---- ---- /* make sure we have a spot for the event */ ---- if (type + 1 < h->num_event_types) { ---- gint i; ---- h->bindings = g_renew(GHashTable*, h->bindings, type + 1); ---- for (i = h->num_event_types; i < type + 1; ++i) ---- h->bindings[i] = g_hash_table_new_full((GHashFunc)window_hash, ---- (GEqualFunc)window_comp, ---- NULL, g_free); ---- h->num_event_types = type + 1; ---- } ---- ---- b = g_new(ObtXEventBinding, 1); ---- b->win = win; ---- b->func = func; ---- b->data = data; ---- g_hash_table_replace(h->bindings[type], &b->win, b); ----} ---- ----void xevent_remove_handler(ObtXEventHandler *h, gint type, Window win) ----{ ---- g_assert(type < h->num_event_types); ---- g_assert(win); ---- ---- g_hash_table_remove(h->bindings[type], &win); ----} ---- ----static void xevent_handler(const XEvent *e, gpointer data) ----{ ---- ObtXEventHandler *h; ---- ObtXEventBinding *b; ---- ---- h = data; ---- ---- if (e->type < h->num_event_types) { ---- const gint all = OBT_XEVENT_ALL_WINDOWS; ---- /* run the all_windows handler first */ ---- b = g_hash_table_lookup(h->bindings[e->xany.type], &all); ---- if (b) b->func(e, b->data); ---- /* then run the per-window handler */ ---- b = g_hash_table_lookup(h->bindings[e->xany.type], &e->xany.window); ---- if (b) b->func(e, b->data); ---- } ---- else ---- g_message("Unhandled X Event type %d", e->xany.type); ----} diff --cc obt/xevent.h index ec0b66e5,ec0b66e5,ec0b66e5,ec0b66e5..00000000 deleted file mode 100644,100644,100644,100644 --- a/obt/xevent.h +++ /dev/null @@@@@ -1,48 -1,48 -1,48 -1,48 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- obt/xevent.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __obt_xevent_h ----#define __obt_xevent_h ---- ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----struct _ObtMainLoop; ---- ----typedef struct _ObtXEventHandler ObtXEventHandler; ---- ----typedef void (*ObtXEventCallback) (const XEvent *e, gpointer data); ---- ----ObtXEventHandler* xevent_new(void); ----void xevent_ref(ObtXEventHandler *h); ----void xevent_unref(ObtXEventHandler *h); ---- ----void xevent_register(ObtXEventHandler *h, ---- struct _ObtMainLoop *loop); ---- ----#define OBT_XEVENT_ALL_WINDOWS None ---- ----void xevent_set_handler(ObtXEventHandler *h, gint type, Window win, ---- ObtXEventCallback func, gpointer data); ----void xevent_remove_handler(ObtXEventHandler *h, gint type, Window win); ---- ----G_END_DECLS ---- ----#endif /*__obt_xevent_h*/ diff --cc openbox/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc openbox/actions.c index 8e84a82f,8f72714e,8f72714e,8f72714e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions.c +++ /dev/null @@@@@ -1,372 -1,365 -1,365 -1,365 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- actions.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "actions.h" ----#include "gettext.h" ----#include "grab.h" ----#include "screen.h" ----#include "event.h" ----#include "config.h" ----#include "client.h" ----#include "openbox.h" ----#include "debug.h" ---- ----#include "actions/all.h" ---- ----static void actions_definition_ref(ObActionsDefinition *def); ----static void actions_definition_unref(ObActionsDefinition *def); ----static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state); ----static void actions_interactive_end_act(); ----static ObActionsAct* actions_build_act_from_string(const gchar *name); ---- ----static ObActionsAct *interactive_act = NULL; ----static guint interactive_initial_state = 0; ---- ----struct _ObActionsDefinition { ---- guint ref; ---- ---- gchar *name; ---- ---- ObActionsDataSetupFunc setup; ---- ObActionsDataFreeFunc free; ---- ObActionsRunFunc run; ---- ObActionsInteractiveInputFunc i_input; ---- ObActionsInteractiveCancelFunc i_cancel; ----}; ---- ----struct _ObActionsAct { ---- guint ref; ---- ---- ObActionsDefinition *def; ---- gpointer options; ----}; ---- ----static GSList *registered = NULL; ---- ---- ----void actions_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- action_all_startup(); ----} ---- ----void actions_shutdown(gboolean reconfig) ----{ ---- actions_interactive_cancel_act(); ---- ---- if (reconfig) return; ---- ---- /* free all the registered actions */ ---- while (registered) { ---- actions_definition_unref(registered->data); ---- registered = g_slist_delete_link(registered, registered); ---- } ----} ---- ----gboolean actions_register(const gchar *name, ---- ObActionsDataSetupFunc setup, ---- ObActionsDataFreeFunc free, ---- ObActionsRunFunc run, ---- ObActionsInteractiveInputFunc i_input, ---- ObActionsInteractiveCancelFunc i_cancel) ----{ ---- GSList *it; ---- ObActionsDefinition *def; ---- ---- g_assert(run != NULL); ---- g_assert((i_input == NULL) == (i_cancel == NULL)); ---- ---- for (it = registered; it; it = g_slist_next(it)) { ---- def = it->data; ---- if (!g_ascii_strcasecmp(name, def->name)) /* already registered */ ---- return FALSE; ---- } ---- ---- def = g_new(ObActionsDefinition, 1); ---- def->ref = 1; ---- def->name = g_strdup(name); ---- def->setup = setup; ---- def->free = free; ---- def->run = run; ---- def->i_input = i_input; ---- def->i_cancel = i_cancel; ---- ---- registered = g_slist_prepend(registered, def); ---- ---- return TRUE; ----} ---- ----static void actions_definition_ref(ObActionsDefinition *def) ----{ ---- ++def->ref; ----} ---- ----static void actions_definition_unref(ObActionsDefinition *def) ----{ ---- if (def && --def->ref == 0) { ---- g_free(def->name); ---- g_free(def); ---- } ----} ---- ----static ObActionsAct* actions_build_act_from_string(const gchar *name) ----{ ---- GSList *it; ---- ObActionsDefinition *def = NULL; ---- ObActionsAct *act = NULL; ---- ---- /* find the requested action */ ---- for (it = registered; it; it = g_slist_next(it)) { ---- def = it->data; ---- if (!g_ascii_strcasecmp(name, def->name)) ---- break; ---- def = NULL; ---- } ---- ---- /* if we found the action */ ---- if (def) { ---- act = g_new(ObActionsAct, 1); ---- act->ref = 1; ---- act->def = def; ---- actions_definition_ref(act->def); ---- act->options = NULL; ---- } else ---- g_message(_("Invalid action \"%s\" requested. No such action exists."), ---- name); ---- ---- return act; ----} ---- ----ObActionsAct* actions_parse_string(const gchar *name) ----{ ---- ObActionsAct *act = NULL; ---- ---- if ((act = actions_build_act_from_string(name))) ---- if (act->def->setup) ---- act->options = act->def->setup(NULL); ---- ---- return act; ----} ---- ----ObActionsAct* actions_parse(xmlNodePtr node) ----{ ---- gchar *name; ---- ObActionsAct *act = NULL; ---- ---- if (obt_parse_attr_string(node, "name", &name)) { ---- if ((act = actions_build_act_from_string(name))) ---- /* there is more stuff to parse here */ ---- if (act->def->setup) ---- act->options = act->def->setup(node->children); ---- ---- g_free(name); ---- } ---- ---- return act; ----} ---- ----gboolean actions_act_is_interactive(ObActionsAct *act) ----{ ---- return act->def->i_cancel != NULL; ----} ---- ----void actions_act_ref(ObActionsAct *act) ----{ ---- ++act->ref; ----} ---- ----void actions_act_unref(ObActionsAct *act) ----{ ---- if (act && --act->ref == 0) { ---- /* free the action specific options */ ---- if (act->def->free) ---- act->def->free(act->options); ---- /* unref the definition */ ---- actions_definition_unref(act->def); ---- g_free(act); ---- } ----} ---- ----static void actions_setup_data(ObActionsData *data, ---- ObUserAction uact, ---- guint state, ---- gint x, ---- gint y, ---- gint button, ---- ObFrameContext con, ---- struct _ObClient *client) ----{ ---- data->uact = uact; ---- data->state = state; ---- data->x = x; ---- data->y = y; ---- data->button = button; ---- data->context = con; ---- data->client = client; ----} ---- ----void actions_run_acts(GSList *acts, ---- ObUserAction uact, ---- guint state, ---- gint x, ---- gint y, ---- gint button, ---- ObFrameContext con, ---- struct _ObClient *client) ----{ ---- GSList *it; ---- ---- /* Don't allow saving the initial state when running things from the ---- menu */ ---- if (uact == OB_USER_ACTION_MENU_SELECTION) ---- state = 0; ---- /* If x and y are < 0 then use the current pointer position */ ---- if (x < 0 && y < 0) ---- screen_pointer_pos(&x, &y); ---- ---- for (it = acts; it; it = g_slist_next(it)) { ---- ObActionsData data; ---- ObActionsAct *act = it->data; ---- gboolean ok = TRUE; ---- ---- actions_setup_data(&data, uact, state, x, y, button, con, client); ---- ---- /* if they have the same run function, then we'll assume they are ---- cooperating and not cancel eachother out */ ---- if (!interactive_act || interactive_act->def->run != act->def->run) { ---- if (actions_act_is_interactive(act)) { ---- /* cancel the old one */ ---- if (interactive_act) ---- actions_interactive_cancel_act(); ---- ok = actions_interactive_begin_act(act, state); ---- } ---- } ---- ---- /* fire the action's run function with this data */ ---- if (ok) { ---- if (!act->def->run(&data, act->options)) { ---- if (actions_act_is_interactive(act)) ---- actions_interactive_end_act(); ---- } else { ---- /* make sure its interactive if it returned TRUE */ ---- g_assert(act->def->i_cancel && act->def->i_input); ---- ---- /* no actions are run after the interactive one */ ---- break; ---- } ---- } ---- } ----} ---- ----gboolean actions_interactive_act_running(void) ----{ ---- return interactive_act != NULL; ----} ---- ----void actions_interactive_cancel_act(void) ----{ ---- if (interactive_act) { ---- interactive_act->def->i_cancel(interactive_act->options); ---- actions_interactive_end_act(); ---- } ----} ---- ----static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state) ----{ ---- if (grab_keyboard()) { ---- interactive_act = act; ---- actions_act_ref(interactive_act); ---- ---- interactive_initial_state = state; ---- ---- /* if using focus_delay, stop the timer now so that focus doesn't go ---- moving on us, which would kill the action */ ---- event_halt_focus_delay(); ---- ---- return TRUE; ---- } ---- else ---- return FALSE; ----} ---- ----static void actions_interactive_end_act(void) ----{ ---- if (interactive_act) { ---- ungrab_keyboard(); ---- ---- actions_act_unref(interactive_act); ---- interactive_act = NULL; ---- } ----} ---- ----gboolean actions_interactive_input_event(XEvent *e) ----{ ---- gboolean used = FALSE; ---- if (interactive_act) { ---- if (!interactive_act->def->i_input(interactive_initial_state, e, ---- interactive_act->options, &used)) ---- { ---- used = TRUE; /* if it cancelled the action then it has to of ---- been used */ ---- actions_interactive_end_act(); ---- } ---- } ---- return used; ----} ---- ----void actions_client_move(ObActionsData *data, gboolean start) ----{ ---- static gulong ignore_start = 0; ---- if (start) ---- ignore_start = event_start_ignore_all_enters(); ---- else if (config_focus_follow && ---- data->context != OB_FRAME_CONTEXT_CLIENT) ---- { ---- if (data->uact == OB_USER_ACTION_MOUSE_PRESS) { ---- struct _ObClient *c; ---- ---- /* usually this is sorta redundant, but with a press action ---- that moves windows our from under the cursor, the enter ---- event will come as a GrabNotify which is ignored, so this ---- makes a fake enter event ---- ---- don't do this if there is a grab on the pointer. enter events ---- are ignored during a grab, so don't force fake ones when they ---- should be ignored ---- */ ---- if ((c = client_under_pointer()) && c != data->client && ---- !grab_on_pointer()) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Generating fake enter because we did a " ---- "mouse-event action"); ---- event_enter_client(c); ---- } ---- } ---- else if (!data->button && !config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- } - } - - gboolean actions_client_locked(ObActionsData *data) - { - ObClient *c = data->client; - - return c && c->locked; ----} diff --cc openbox/actions.h index 0b2dd996,7a09a665,7a09a665,7a09a665..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions.h +++ /dev/null @@@@@ -1,102 -1,100 -1,100 -1,100 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- actions.h for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "misc.h" ----#include "frame.h" ----#include "obt/parse.h" ---- ----#include ----#include ---- ----typedef struct _ObActionsDefinition ObActionsDefinition; ----typedef struct _ObActionsAct ObActionsAct; ----typedef struct _ObActionsData ObActionsData; ----typedef struct _ObActionsAnyData ObActionsAnyData; ----typedef struct _ObActionsGlobalData ObActionsGlobalData; ----typedef struct _ObActionsClientData ObActionsClientData; ----typedef struct _ObActionsSelectorData ObActionsSelectorData; ---- ----typedef gpointer (*ObActionsDataSetupFunc)(xmlNodePtr node); ----typedef void (*ObActionsDataFreeFunc)(gpointer options); ----typedef gboolean (*ObActionsRunFunc)(ObActionsData *data, ---- gpointer options); ----typedef gboolean (*ObActionsInteractiveInputFunc)(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used); ----typedef void (*ObActionsInteractiveCancelFunc)(gpointer options); ---- ----struct _ObActionsData { ---- ObUserAction uact; ---- guint state; ---- gint x; ---- gint y; ---- gint button; ---- ---- struct _ObClient *client; ---- ObFrameContext context; ----}; ---- ----void actions_startup(gboolean reconfigure); ----void actions_shutdown(gboolean reconfigure); ---- ----/*! If the action is interactive, then i_input and i_cancel are not NULL. ---- Otherwise, they should both be NULL. */ ----gboolean actions_register(const gchar *name, ---- ObActionsDataSetupFunc setup, ---- ObActionsDataFreeFunc free, ---- ObActionsRunFunc run, ---- ObActionsInteractiveInputFunc i_input, ---- ObActionsInteractiveCancelFunc i_cancel); ---- ----ObActionsAct* actions_parse(xmlNodePtr node); ----ObActionsAct* actions_parse_string(const gchar *name); ---- ----gboolean actions_act_is_interactive(ObActionsAct *act); ---- ----void actions_act_ref(ObActionsAct *act); ----void actions_act_unref(ObActionsAct *act); ---- ----/*! When this is true, an XAllowEvents with ReplayPointer will be called ---- if an action is going to maybe try moving windows around on screen (or ---- map/unmap windows) ----*/ ----void actions_set_need_pointer_replay_before_move(gboolean replay); ----/*! Returns if a ReplayPointer is still needed. If it was called while running ---- actions then this will be false */ ----gboolean actions_get_need_pointer_replay_before_move(void); ---- ----/*! Pass in a GSList of ObActionsAct's to be run. */ ----void actions_run_acts(GSList *acts, ---- ObUserAction uact, ---- guint state, ---- gint x, ---- gint y, ---- gint button, ---- ObFrameContext con, ---- struct _ObClient *client); ---- ----gboolean actions_interactive_act_running(void); ----void actions_interactive_cancel_act(void); ---- ----gboolean actions_interactive_input_event(XEvent *e); ---- ----/*! Function for actions to call when they are moving a client around */ ----void actions_client_move(ObActionsData *data, gboolean start); - /*! May we do something to this client? */ - gboolean actions_client_locked(ObActionsData *data); diff --cc openbox/actions/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc openbox/actions/addremovedesktop.c index b6e621ab,b6e621ab,b6e621ab,b6e621ab..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/addremovedesktop.c +++ /dev/null @@@@@ -1,71 -1,71 -1,71 -1,71 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/screen.h" ----#include ---- ----typedef struct { ---- gboolean current; ---- gboolean add; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gpointer setup_add_func(xmlNodePtr node); ----static gpointer setup_remove_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_addremovedesktop_startup(void) ----{ ---- actions_register("AddDesktop", setup_add_func, g_free, run_func, ---- NULL, NULL); ---- actions_register("RemoveDesktop", setup_remove_func, g_free, run_func, ---- NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "where"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "last")) ---- o->current = FALSE; ---- else if (!g_ascii_strcasecmp(s, "current")) ---- o->current = TRUE; ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----static gpointer setup_add_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->add = TRUE; ---- return o; ----} ---- ----static gpointer setup_remove_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->add = FALSE; ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- actions_client_move(data, TRUE); ---- ---- if (o->add) ---- screen_add_desktop(o->current); ---- else ---- screen_remove_desktop(o->current); ---- ---- actions_client_move(data, FALSE); ---- ---- return FALSE; ----} diff --cc openbox/actions/all.c index 9b4284e3,47141ac6,47141ac6,47141ac6..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/all.c +++ /dev/null @@@@@ -1,44 -1,41 -1,41 -1,41 +1,0 @@@@@ ----#include "all.h" ---- ----void action_all_startup(void) ----{ ---- action_execute_startup(); ---- action_debug_startup(); ---- action_showmenu_startup(); ---- action_showdesktop_startup(); ---- action_reconfigure_startup(); ---- action_exit_startup(); ---- action_restart_startup(); ---- action_cyclewindows_startup(); ---- action_breakchroot_startup(); ---- action_close_startup(); ---- action_move_startup(); ---- action_focus_startup(); ---- action_raise_startup(); - action_raisetemp_startup(); ---- action_lower_startup(); ---- action_raiselower_startup(); ---- action_unfocus_startup(); ---- action_iconify_startup(); ---- action_fullscreen_startup(); ---- action_maximize_startup(); ---- action_moveresizeto_startup(); ---- action_moverelative_startup(); ---- action_shade_startup(); ---- action_kill_startup(); ---- action_omnipresent_startup(); ---- action_directionalwindows_startup(); ---- action_resize_startup(); ---- action_decorations_startup(); ---- action_desktop_startup(); ---- action_resizerelative_startup(); ---- action_addremovedesktop_startup(); ---- action_dockautohide_startup(); ---- action_layer_startup(); ---- action_movetoedge_startup(); ---- action_growtoedge_startup(); ---- action_if_startup(); ---- action_focustobottom_startup(); - action_sendkeyevent_startup(); - action_lock_startup(); ----} diff --cc openbox/actions/all.h index f444aae1,35e1537c,35e1537c,35e1537c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/all.h +++ /dev/null @@@@@ -1,46 -1,43 -1,43 -1,43 +1,0 @@@@@ ----#ifndef __actions_all_h ----#define __actions_all_h ---- ----void action_all_startup(void); ---- ----void action_execute_startup(void); ----void action_debug_startup(void); ----void action_showmenu_startup(void); ----void action_showdesktop_startup(void); ----void action_reconfigure_startup(void); ----void action_exit_startup(void); ----void action_restart_startup(void); ----void action_cyclewindows_startup(void); ----void action_breakchroot_startup(void); ----void action_close_startup(void); ----void action_move_startup(void); ----void action_focus_startup(void); ----void action_raise_startup(void); - void action_raisetemp_startup(void); ----void action_lower_startup(void); ----void action_raiselower_startup(void); ----void action_unfocus_startup(void); ----void action_iconify_startup(void); ----void action_fullscreen_startup(void); ----void action_maximize_startup(void); ----void action_moveresizeto_startup(void); ----void action_moverelative_startup(void); ----void action_shade_startup(void); ----void action_kill_startup(void); ----void action_omnipresent_startup(void); ----void action_directionalwindows_startup(void); ----void action_resize_startup(void); ----void action_decorations_startup(void); ----void action_desktop_startup(void); ----void action_resizerelative_startup(void); ----void action_addremovedesktop_startup(void); ----void action_dockautohide_startup(void); ----void action_layer_startup(void); ----void action_movetoedge_startup(void); ----void action_growtoedge_startup(void); ----void action_if_startup(void); ----void action_focustobottom_startup(void); - void action_sendkeyevent_startup(void); - void action_lock_startup(void); ---- ----#endif diff --cc openbox/actions/breakchroot.c index 9804091b,9804091b,9804091b,9804091b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/breakchroot.c +++ /dev/null @@@@@ -1,21 -1,21 -1,21 -1,21 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/keyboard.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_breakchroot_startup(void) ----{ ---- actions_register("BreakChroot", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- /* break out of one chroot */ ---- keyboard_reset_chains(1); ---- ---- return FALSE; ----} diff --cc openbox/actions/close.c index 5996cc64,ab75e05d,ab75e05d,ab75e05d..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/close.c +++ /dev/null @@@@@ -1,21 -1,20 -1,20 -1,20 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_close_startup(void) ----{ ---- actions_register("Close", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) - client_close(data->client); --- if (data->client) client_close(data->client); ---- ---- return FALSE; ----} diff --cc openbox/actions/cyclewindows.c index 44d87cf6,44d87cf6,44d87cf6,44d87cf6..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/cyclewindows.c +++ /dev/null @@@@@ -1,201 -1,201 -1,201 -1,201 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/stacking.h" ----#include "openbox/window.h" ----#include "openbox/event.h" ----#include "openbox/focus_cycle.h" ----#include "openbox/openbox.h" ----#include "gettext.h" ---- ----typedef struct { ---- gboolean linear; ---- gboolean dock_windows; ---- gboolean desktop_windows; ---- gboolean all_desktops; ---- gboolean forward; ---- gboolean bar; ---- gboolean raise; ---- ObFocusCyclePopupMode dialog_mode; ---- GSList *actions; ----} Options; ---- ----static gboolean cycling = FALSE; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gpointer setup_forward_func(xmlNodePtr node); ----static gpointer setup_backward_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ----static gboolean i_input_func(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used); ----static void i_cancel_func(gpointer options); ---- ----static void end_cycle(gboolean cancel, guint state, Options *o); ---- ----void action_cyclewindows_startup(void) ----{ ---- actions_register("NextWindow", setup_forward_func, free_func, ---- run_func, i_input_func, i_cancel_func); ---- actions_register("PreviousWindow", setup_backward_func, free_func, ---- run_func, i_input_func, i_cancel_func); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->bar = TRUE; ---- o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST; ---- ---- if ((n = obt_parse_find_node(node, "linear"))) ---- o->linear = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "dialog"))) { ---- if (obt_parse_node_contains(n, "none")) ---- o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE; ---- else if (obt_parse_node_contains(n, "icons")) ---- o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_ICONS; ---- } ---- if ((n = obt_parse_find_node(node, "bar"))) ---- o->bar = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "raise"))) ---- o->raise = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "panels"))) ---- o->dock_windows = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "desktop"))) ---- o->desktop_windows = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "allDesktops"))) ---- o->all_desktops = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(node, "finalactions"))) { ---- xmlNodePtr m; ---- ---- m = obt_parse_find_node(n->children, "action"); ---- while (m) { ---- ObActionsAct *action = actions_parse(m); ---- if (action) o->actions = g_slist_prepend(o->actions, action); ---- m = obt_parse_find_node(m->next, "action"); ---- } ---- } ---- else { ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Focus")); ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Raise")); ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Unshade")); ---- } ---- ---- return o; ----} ---- ----static gpointer setup_forward_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->forward = TRUE; ---- return o; ----} ---- ----static gpointer setup_backward_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->forward = FALSE; ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- ---- while (o->actions) { ---- actions_act_unref(o->actions->data); ---- o->actions = g_slist_delete_link(o->actions, o->actions); ---- } ---- ---- g_free(o); ----} ---- ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- struct _ObClient *ft; ---- ---- ft = focus_cycle(o->forward, ---- o->all_desktops, ---- o->dock_windows, ---- o->desktop_windows, ---- o->linear, ---- TRUE, ---- o->bar, ---- o->dialog_mode, ---- FALSE, FALSE); ---- cycling = TRUE; ---- ---- stacking_restore(); ---- if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft)); ---- ---- return TRUE; ----} ---- ----static gboolean i_input_func(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used) ----{ ---- if (e->type == KeyPress) { ---- /* Escape cancels no matter what */ ---- if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { ---- end_cycle(TRUE, e->xkey.state, options); ---- return FALSE; ---- } ---- ---- /* There were no modifiers and they pressed enter */ ---- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) && ---- !initial_state) ---- { ---- end_cycle(FALSE, e->xkey.state, options); ---- return FALSE; ---- } ---- } ---- /* They released the modifiers */ ---- else if (e->type == KeyRelease && initial_state && ---- (e->xkey.state & initial_state) == 0) ---- { ---- end_cycle(FALSE, e->xkey.state, options); ---- return FALSE; ---- } ---- ---- return TRUE; ----} ---- ----static void i_cancel_func(gpointer options) ----{ ---- /* we get cancelled when we move focus, but we're not cycling anymore, so ---- just ignore that */ ---- if (cycling) ---- end_cycle(TRUE, 0, options); ----} ---- ----static void end_cycle(gboolean cancel, guint state, Options *o) ----{ ---- struct _ObClient *ft; ---- ---- ft = focus_cycle(o->forward, ---- o->all_desktops, ---- o->dock_windows, ---- o->desktop_windows, ---- o->linear, ---- TRUE, ---- o->bar, ---- o->dialog_mode, ---- TRUE, cancel); ---- cycling = FALSE; ---- ---- if (ft) ---- actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY, ---- state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft); ---- ---- stacking_restore(); ----} diff --cc openbox/actions/debug.c index 99e838a6,99e838a6,99e838a6,99e838a6..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/debug.c +++ /dev/null @@@@@ -1,44 -1,44 -1,44 -1,44 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include ---- ----typedef struct { ---- gchar *str; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_debug_startup(void) ----{ ---- actions_register("Debug", setup_func, free_func, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "string"))) ---- o->str = obt_parse_node_string(n); ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- g_free(o->str); ---- g_free(o); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- if (o->str) g_print("%s\n", o->str); ---- ---- return FALSE; ----} diff --cc openbox/actions/decorations.c index 9834d26d,e85fb8ef,e85fb8ef,e85fb8ef..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/decorations.c +++ /dev/null @@@@@ -1,47 -1,47 -1,47 -1,47 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func_on(ObActionsData *data, gpointer options); ----static gboolean run_func_off(ObActionsData *data, gpointer options); ----static gboolean run_func_toggle(ObActionsData *data, gpointer options); ---- ----void action_decorations_startup(void) ----{ ---- actions_register("Decorate", NULL, NULL, run_func_on, NULL, NULL); ---- actions_register("Undecorate", NULL, NULL, run_func_off, NULL, NULL); ---- actions_register("ToggleDecorations", NULL, NULL, run_func_toggle, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_on(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_set_undecorated(data->client, FALSE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_off(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_set_undecorated(data->client, TRUE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_toggle(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_set_undecorated(data->client, !data->client->undecorated); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/desktop.c index 37268bba,37268bba,37268bba,37268bba..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/desktop.c +++ /dev/null @@@@@ -1,149 -1,149 -1,149 -1,149 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/screen.h" ----#include "openbox/client.h" ----#include ---- ----typedef enum { ---- LAST, ---- RELATIVE, ---- ABSOLUTE ----} SwitchType; ---- ----typedef struct { ---- SwitchType type; ---- union { ---- struct { ---- guint desktop; ---- } abs; ---- ---- struct { ---- gboolean linear; ---- gboolean wrap; ---- ObDirection dir; ---- } rel; ---- }; ---- gboolean send; ---- gboolean follow; ----} Options; ---- ----static gpointer setup_go_func(xmlNodePtr node); ----static gpointer setup_send_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_desktop_startup(void) ----{ ---- actions_register("GoToDesktop", setup_go_func, g_free, run_func, ---- NULL, NULL); ---- actions_register("SendToDesktop", setup_send_func, g_free, run_func, ---- NULL, NULL); ----} ---- ----static gpointer setup_go_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- /* don't go anywhere if theres no options given */ ---- o->type = ABSOLUTE; ---- o->abs.desktop = screen_desktop; ---- /* wrap by default - it's handy! */ ---- o->rel.wrap = TRUE; ---- ---- if ((n = obt_parse_find_node(node, "to"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "last")) ---- o->type = LAST; ---- else if (!g_ascii_strcasecmp(s, "next")) { ---- o->type = RELATIVE; ---- o->rel.linear = TRUE; ---- o->rel.dir = OB_DIRECTION_EAST; ---- } ---- else if (!g_ascii_strcasecmp(s, "previous")) { ---- o->type = RELATIVE; ---- o->rel.linear = TRUE; ---- o->rel.dir = OB_DIRECTION_WEST; ---- } ---- else if (!g_ascii_strcasecmp(s, "north") || ---- !g_ascii_strcasecmp(s, "up")) { ---- o->type = RELATIVE; ---- o->rel.dir = OB_DIRECTION_NORTH; ---- } ---- else if (!g_ascii_strcasecmp(s, "south") || ---- !g_ascii_strcasecmp(s, "down")) { ---- o->type = RELATIVE; ---- o->rel.dir = OB_DIRECTION_SOUTH; ---- } ---- else if (!g_ascii_strcasecmp(s, "west") || ---- !g_ascii_strcasecmp(s, "left")) { ---- o->type = RELATIVE; ---- o->rel.dir = OB_DIRECTION_WEST; ---- } ---- else if (!g_ascii_strcasecmp(s, "east") || ---- !g_ascii_strcasecmp(s, "right")) { ---- o->type = RELATIVE; ---- o->rel.dir = OB_DIRECTION_EAST; ---- } ---- else { ---- o->type = ABSOLUTE; ---- o->abs.desktop = obt_parse_node_int(n) - 1; ---- } ---- g_free(s); ---- } ---- ---- if ((n = obt_parse_find_node(node, "wrap"))) ---- o->rel.wrap = obt_parse_node_bool(n); ---- ---- return o; ----} ---- ----static gpointer setup_send_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = setup_go_func(node); ---- o->send = TRUE; ---- o->follow = TRUE; ---- ---- if ((n = obt_parse_find_node(node, "follow"))) ---- o->follow = obt_parse_node_bool(n); ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- guint d; ---- ---- ---- ---- switch (o->type) { ---- case LAST: ---- d = screen_last_desktop; ---- break; ---- case ABSOLUTE: ---- d = o->abs.desktop; ---- break; ---- case RELATIVE: ---- d = screen_find_desktop(screen_desktop, ---- o->rel.dir, o->rel.wrap, o->rel.linear); ---- break; ---- } ---- ---- if (d < screen_num_desktops && d != screen_desktop) { ---- gboolean go = TRUE; ---- ---- actions_client_move(data, TRUE); ---- if (o->send && data->client && client_normal(data->client)) { ---- client_set_desktop(data->client, d, o->follow, FALSE); ---- go = o->follow; ---- } ---- ---- if (go) screen_set_desktop(d, TRUE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/directionalwindows.c index c5c25c11,c5c25c11,c5c25c11,c5c25c11..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/directionalwindows.c +++ /dev/null @@@@@ -1,218 -1,218 -1,218 -1,218 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/event.h" ----#include "openbox/stacking.h" ----#include "openbox/window.h" ----#include "openbox/focus_cycle.h" ----#include "openbox/openbox.h" ----#include "openbox/misc.h" ----#include "gettext.h" ---- ----typedef struct { ---- gboolean interactive; ---- gboolean dialog; ---- gboolean dock_windows; ---- gboolean desktop_windows; ---- ObDirection direction; ---- gboolean bar; ---- gboolean raise; ---- GSList *actions; ----} Options; ---- ----static gboolean cycling = FALSE; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gpointer setup_cycle_func(xmlNodePtr node); ----static gpointer setup_target_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ----static gboolean i_input_func(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used); ----static void i_cancel_func(gpointer options); ---- ----static void end_cycle(gboolean cancel, guint state, Options *o); ---- ----void action_directionalwindows_startup(void) ----{ ---- actions_register("DirectionalCycleWindows", setup_cycle_func, free_func, ---- run_func, i_input_func, i_cancel_func); ---- actions_register("DirectionalTargetWindow", setup_target_func, free_func, ---- run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->dialog = TRUE; ---- o->bar = TRUE; ---- ---- if ((n = obt_parse_find_node(node, "dialog"))) ---- o->dialog = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "bar"))) ---- o->bar = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "raise"))) ---- o->raise = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "panels"))) ---- o->dock_windows = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "desktop"))) ---- o->desktop_windows = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "direction"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "north") || ---- !g_ascii_strcasecmp(s, "up")) ---- o->direction = OB_DIRECTION_NORTH; ---- else if (!g_ascii_strcasecmp(s, "northwest")) ---- o->direction = OB_DIRECTION_NORTHWEST; ---- else if (!g_ascii_strcasecmp(s, "northeast")) ---- o->direction = OB_DIRECTION_NORTHEAST; ---- else if (!g_ascii_strcasecmp(s, "west") || ---- !g_ascii_strcasecmp(s, "left")) ---- o->direction = OB_DIRECTION_WEST; ---- else if (!g_ascii_strcasecmp(s, "east") || ---- !g_ascii_strcasecmp(s, "right")) ---- o->direction = OB_DIRECTION_EAST; ---- else if (!g_ascii_strcasecmp(s, "south") || ---- !g_ascii_strcasecmp(s, "down")) ---- o->direction = OB_DIRECTION_SOUTH; ---- else if (!g_ascii_strcasecmp(s, "southwest")) ---- o->direction = OB_DIRECTION_SOUTHWEST; ---- else if (!g_ascii_strcasecmp(s, "southeast")) ---- o->direction = OB_DIRECTION_SOUTHEAST; ---- g_free(s); ---- } ---- ---- if ((n = obt_parse_find_node(node, "finalactions"))) { ---- xmlNodePtr m; ---- ---- m = obt_parse_find_node(n->children, "action"); ---- while (m) { ---- ObActionsAct *action = actions_parse(m); ---- if (action) o->actions = g_slist_prepend(o->actions, action); ---- m = obt_parse_find_node(m->next, "action"); ---- } ---- } ---- else { ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Focus")); ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Raise")); ---- o->actions = g_slist_prepend(o->actions, ---- actions_parse_string("Unshade")); ---- } ---- ---- return o; ----} ---- ----static gpointer setup_cycle_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->interactive = TRUE; ---- return o; ----} ---- ----static gpointer setup_target_func(xmlNodePtr node) ----{ ---- Options *o = setup_func(node); ---- o->interactive = FALSE; ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- ---- while (o->actions) { ---- actions_act_unref(o->actions->data); ---- o->actions = g_slist_delete_link(o->actions, o->actions); ---- } ---- ---- g_free(o); ----} ---- ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- if (!o->interactive) ---- end_cycle(FALSE, data->state, o); ---- else { ---- struct _ObClient *ft; ---- ---- ft = focus_directional_cycle(o->direction, ---- o->dock_windows, ---- o->desktop_windows, ---- TRUE, ---- o->bar, ---- o->dialog, ---- FALSE, FALSE); ---- cycling = TRUE; ---- ---- stacking_restore(); ---- if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft)); ---- } ---- ---- return o->interactive; ----} ---- ----static gboolean i_input_func(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used) ----{ ---- if (e->type == KeyPress) { ---- /* Escape cancels no matter what */ ---- if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { ---- end_cycle(TRUE, e->xkey.state, options); ---- return FALSE; ---- } ---- ---- /* There were no modifiers and they pressed enter */ ---- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) && ---- !initial_state) ---- { ---- end_cycle(FALSE, e->xkey.state, options); ---- return FALSE; ---- } ---- } ---- /* They released the modifiers */ ---- else if (e->type == KeyRelease && initial_state && ---- (e->xkey.state & initial_state) == 0) ---- { ---- end_cycle(FALSE, e->xkey.state, options); ---- return FALSE; ---- } ---- ---- return TRUE; ----} ---- ----static void i_cancel_func(gpointer options) ----{ ---- /* we get cancelled when we move focus, but we're not cycling anymore, so ---- just ignore that */ ---- if (cycling) ---- end_cycle(TRUE, 0, options); ----} ---- ----static void end_cycle(gboolean cancel, guint state, Options *o) ----{ ---- struct _ObClient *ft; ---- ---- ft = focus_directional_cycle(o->direction, ---- o->dock_windows, ---- o->desktop_windows, ---- o->interactive, ---- o->bar, ---- o->dialog, ---- TRUE, cancel); ---- cycling = FALSE; ---- ---- if (ft) ---- actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY, ---- state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft); ---- ---- stacking_restore(); ----} diff --cc openbox/actions/dockautohide.c index 5e5382d4,5e5382d4,5e5382d4,5e5382d4..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/dockautohide.c +++ /dev/null @@@@@ -1,22 -1,22 -1,22 -1,22 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/dock.h" ----#include "openbox/config.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_dockautohide_startup(void) ----{ ---- actions_register("ToggleDockAutoHide", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- config_dock_hide = !config_dock_hide; ---- dock_configure(); ---- ---- return FALSE; ----} diff --cc openbox/actions/execute.c index fa66a484,fa66a484,fa66a484,fa66a484..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/execute.c +++ /dev/null @@@@@ -1,184 -1,184 -1,184 -1,184 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/event.h" ----#include "openbox/startupnotify.h" ----#include "openbox/prompt.h" ----#include "openbox/screen.h" ----#include "obt/paths.h" ----#include "gettext.h" ---- ----#ifdef HAVE_STDLIB_H ----# include ----#endif ---- ----typedef struct { ---- gchar *cmd; ---- gboolean sn; ---- gchar *sn_name; ---- gchar *sn_icon; ---- gchar *sn_wmclass; ---- gchar *prompt; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ----/* ----static gboolean i_input_func(guint initial_state, ---- XEvent *e, ---- gpointer options, ---- gboolean *used); ----static void i_cancel_func(gpointer options); ----*/ ---- ----void action_execute_startup(void) ----{ ---- actions_register("Execute", setup_func, free_func, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "command")) || ---- (n = obt_parse_find_node(node, "execute"))) ---- { ---- gchar *s = obt_parse_node_string(n); ---- o->cmd = obt_paths_expand_tilde(s); ---- g_free(s); ---- } ---- ---- if ((n = obt_parse_find_node(node, "prompt"))) ---- o->prompt = obt_parse_node_string(n); ---- ---- if ((n = obt_parse_find_node(node, "startupnotify"))) { ---- xmlNodePtr m; ---- if ((m = obt_parse_find_node(n->children, "enabled"))) ---- o->sn = obt_parse_node_bool(m); ---- if ((m = obt_parse_find_node(n->children, "name"))) ---- o->sn_name = obt_parse_node_string(m); ---- if ((m = obt_parse_find_node(n->children, "icon"))) ---- o->sn_icon = obt_parse_node_string(m); ---- if ((m = obt_parse_find_node(n->children, "wmclass"))) ---- o->sn_wmclass = obt_parse_node_string(m); ---- } ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- ---- if (o) { ---- g_free(o->cmd); ---- g_free(o->sn_name); ---- g_free(o->sn_icon); ---- g_free(o->sn_wmclass); ---- g_free(o); ---- } ----} ---- ----static Options* dup_options(Options *in) ----{ ---- Options *o = g_new(Options, 1); ---- o->cmd = g_strdup(in->cmd); ---- o->sn = in->sn; ---- o->sn_name = g_strdup(in->sn_name); ---- o->sn_icon = g_strdup(in->sn_icon); ---- o->sn_wmclass = g_strdup(in->sn_wmclass); ---- o->prompt = NULL; ---- return o; ----} ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----static void prompt_cb(ObPrompt *p, gint result, gpointer data) ----{ ---- Options *options = data; ---- ---- if (result) ---- run_func(NULL, options); ---- ---- prompt_unref(p); ---- ---- g_free(options->cmd); ---- g_free(options->sn_name); ---- g_free(options->sn_icon); ---- g_free(options->sn_wmclass); ---- g_free(options); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- GError *e = NULL; ---- gchar **argv = NULL; ---- gchar *cmd; ---- Options *o = options; ---- ---- if (!o->cmd) return FALSE; ---- ---- if (o->prompt) { ---- ObPrompt *p; ---- Options *ocp; ---- ObPromptAnswer answers[] = { ---- { _("No"), 0 }, ---- { _("Yes"), 1 } ---- }; ---- ---- ocp = dup_options(options); ---- p = prompt_new(o->prompt, answers, 2, 0, 0, prompt_cb, ocp); ---- prompt_show(p, NULL, FALSE); ---- ---- return FALSE; ---- } ---- ---- cmd = g_filename_from_utf8(o->cmd, -1, NULL, NULL, NULL); ---- if (!cmd) { ---- g_message(_("Failed to convert the path \"%s\" from utf8"), o->cmd); ---- return FALSE; ---- } ---- ---- /* If there is a keyboard grab going on then we need to cancel ---- it so the application can grab things */ ---- event_cancel_all_key_grabs(); ---- ---- if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) { ---- g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message); ---- g_error_free(e); ---- } ---- else { ---- gchar *program = NULL; ---- ---- if (o->sn) { ---- program = g_path_get_basename(argv[0]); ---- /* sets up the environment */ ---- sn_setup_spawn_environment(program, o->sn_name, o->sn_icon, ---- o->sn_wmclass, ---- /* launch it on the current desktop */ ---- screen_desktop); ---- } ---- ---- if (!g_spawn_async(NULL, argv, NULL, ---- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ---- NULL, NULL, NULL, &e)) ---- { ---- g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message); ---- g_error_free(e); ---- ---- if (o->sn) ---- sn_spawn_cancel(); ---- } ---- if (o->sn) ---- unsetenv("DESKTOP_STARTUP_ID"); ---- ---- g_free(program); ---- g_strfreev(argv); ---- } ---- ---- g_free(cmd); ---- ---- return FALSE; ----} diff --cc openbox/actions/exit.c index f5af8a12,f5af8a12,f5af8a12,f5af8a12..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/exit.c +++ /dev/null @@@@@ -1,58 -1,58 -1,58 -1,58 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/openbox.h" ----#include "openbox/prompt.h" ----#include "gettext.h" ---- ----typedef struct { ---- gboolean prompt; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_exit_startup(void) ----{ ---- actions_register("Exit", setup_func, NULL, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "prompt"))) ---- o->prompt = obt_parse_node_bool(n); ---- ---- return o; ----} ---- ----static void prompt_cb(ObPrompt *p, gint result, gpointer data) ----{ ---- if (result) ---- ob_exit(0); ---- prompt_unref(p); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- if (o->prompt) { ---- ObPrompt *p; ---- ObPromptAnswer answers[] = { ---- { _("No"), 0 }, ---- { _("Yes"), 1 } ---- }; ---- ---- p = prompt_new(_("Are you sure you want to exit Openbox?"), ---- answers, 2, 0, 0, prompt_cb, NULL); ---- prompt_show(p, NULL, FALSE); ---- } ---- else ---- ob_exit(0); ---- ---- return FALSE; ----} diff --cc openbox/actions/focus.c index 4d0f220d,4d0f220d,4d0f220d,4d0f220d..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/focus.c +++ /dev/null @@@@@ -1,57 -1,57 -1,57 -1,57 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/event.h" ----#include "openbox/client.h" ----#include "openbox/focus.h" ---- ----typedef struct { ---- gboolean here; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_focus_startup(void) ----{ ---- actions_register("Focus", setup_func, g_free, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "here"))) ---- o->here = obt_parse_node_bool(n); ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- if (data->client) { ----/* ---- ob_debug("button %d focusable %d context %d %d %d\n", ---- data->button, client_mouse_focusable(data->client), ---- data->context, ---- OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_FRAME); ----*/ ---- if (data->button == 0 || client_mouse_focusable(data->client) || ---- (data->context != OB_FRAME_CONTEXT_CLIENT && ---- data->context != OB_FRAME_CONTEXT_FRAME)) ---- { ---- actions_client_move(data, TRUE); ---- client_activate(data->client, o->here, FALSE, FALSE, TRUE); ---- actions_client_move(data, FALSE); ---- } ---- } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) { ---- /* focus action on the root window. make keybindings work for this ---- openbox instance, but don't focus any specific client */ ---- focus_nothing(); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/focustobottom.c index 49c945b9,49c945b9,49c945b9,49c945b9..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/focustobottom.c +++ /dev/null @@@@@ -1,17 -1,17 -1,17 -1,17 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/focus.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_focustobottom_startup(void) ----{ ---- actions_register("FocusToBottom", NULL, NULL, run_func, NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- if (data->client) ---- focus_order_to_bottom(data->client); ---- return FALSE; ----} diff --cc openbox/actions/fullscreen.c index 7579b95d,7579b95d,7579b95d,7579b95d..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/fullscreen.c +++ /dev/null @@@@@ -1,21 -1,21 -1,21 -1,21 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func_toggle(ObActionsData *data, gpointer options); ---- ----void action_fullscreen_startup(void) ----{ ---- actions_register("ToggleFullscreen", NULL, NULL, run_func_toggle, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_toggle(ObActionsData *data, gpointer options) ----{ ---- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_fullscreen(data->client, !data->client->fullscreen); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/growtoedge.c index fda04778,a37e3a26,a37e3a26,a37e3a26..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/growtoedge.c +++ /dev/null @@@@@ -1,152 -1,151 -1,151 -1,151 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/misc.h" ----#include "openbox/client.h" ----#include "openbox/frame.h" ----#include "openbox/screen.h" ----#include ---- ----typedef struct { ---- ObDirection dir; ---- gboolean shrink; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gpointer setup_shrink_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_growtoedge_startup(void) ----{ ---- actions_register("GrowToEdge", setup_func, ---- g_free, run_func, NULL, NULL); ---- actions_register("ShrinkToEdge", setup_shrink_func, ---- g_free, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->dir = OB_DIRECTION_NORTH; ---- o->shrink = FALSE; ---- ---- if ((n = obt_parse_find_node(node, "direction"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "north") || ---- !g_ascii_strcasecmp(s, "up")) ---- o->dir = OB_DIRECTION_NORTH; ---- else if (!g_ascii_strcasecmp(s, "south") || ---- !g_ascii_strcasecmp(s, "down")) ---- o->dir = OB_DIRECTION_SOUTH; ---- else if (!g_ascii_strcasecmp(s, "west") || ---- !g_ascii_strcasecmp(s, "left")) ---- o->dir = OB_DIRECTION_WEST; ---- else if (!g_ascii_strcasecmp(s, "east") || ---- !g_ascii_strcasecmp(s, "right")) ---- o->dir = OB_DIRECTION_EAST; ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----static gpointer setup_shrink_func(xmlNodePtr node) ----{ ---- Options *o; ---- ---- o = setup_func(node); ---- o->shrink = TRUE; ---- ---- return o; ----} ---- ----static gboolean do_grow(ObActionsData *data, gint x, gint y, gint w, gint h) ----{ ---- gint realw, realh, lw, lh; ---- ---- realw = w; ---- realh = h; ---- client_try_configure(data->client, &x, &y, &realw, &realh, ---- &lw, &lh, TRUE); ---- /* if it's going to be resized smaller than it intended, don't ---- move the window over */ ---- if (x != data->client->area.x) x += w - realw; ---- if (y != data->client->area.y) y += h - realh; ---- ---- if (x != data->client->area.x || y != data->client->area.y || ---- realw != data->client->area.width || ---- realh != data->client->area.height) ---- { ---- actions_client_move(data, TRUE); ---- client_move_resize(data->client, x, y, realw, realh); ---- actions_client_move(data, FALSE); ---- return TRUE; ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- gint x, y, w, h; ---- ObDirection opp; ---- gint half; ---- ---- if (!data->client || - actions_client_locked(data) || ---- /* don't allow vertical resize if shaded */ ---- ((o->dir == OB_DIRECTION_NORTH || o->dir == OB_DIRECTION_SOUTH) && ---- data->client->shaded)) ---- { ---- return FALSE; ---- } ---- ---- if (!o->shrink) { ---- /* try grow */ ---- client_find_resize_directional(data->client, o->dir, TRUE, ---- &x, &y, &w, &h); ---- if (do_grow(data, x, y, w, h)) ---- return FALSE; ---- } ---- ---- /* we couldn't grow, so try shrink! */ ---- opp = (o->dir == OB_DIRECTION_NORTH ? OB_DIRECTION_SOUTH : ---- (o->dir == OB_DIRECTION_SOUTH ? OB_DIRECTION_NORTH : ---- (o->dir == OB_DIRECTION_EAST ? OB_DIRECTION_WEST : ---- OB_DIRECTION_EAST))); ---- client_find_resize_directional(data->client, opp, FALSE, ---- &x, &y, &w, &h); ---- switch (opp) { ---- case OB_DIRECTION_NORTH: ---- half = data->client->area.y + data->client->area.height / 2; ---- if (y > half) { ---- h += y - half; ---- y = half; ---- } ---- break; ---- case OB_DIRECTION_SOUTH: ---- half = data->client->area.height / 2; ---- if (h < half) ---- h = half; ---- break; ---- case OB_DIRECTION_WEST: ---- half = data->client->area.x + data->client->area.width / 2; ---- if (x > half) { ---- w += x - half; ---- x = half; ---- } ---- break; ---- case OB_DIRECTION_EAST: ---- half = data->client->area.width / 2; ---- if (w < half) ---- w = half; ---- break; ---- default: g_assert_not_reached(); ---- } ---- if (do_grow(data, x, y, w, h)) ---- return FALSE; ---- ---- return FALSE; ----} diff --cc openbox/actions/iconify.c index 3168cace,6f14a2e0,6f14a2e0,6f14a2e0..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/iconify.c +++ /dev/null @@@@@ -1,34 -1,24 -1,24 -1,24 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); - static gpointer setup_func(xmlNodePtr node); ---- ----void action_iconify_startup(void) ----{ ---- actions_register("Iconify", - setup_func, - NULL, --- NULL, NULL, ---- run_func, ---- NULL, NULL); - } - - static gpointer setup_func(xmlNodePtr node) - { - xmlNodePtr n; - - if ((n = obt_parse_find_node(node, "de"))) - return GINT_TO_POINTER(obt_parse_node_bool(n)); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); - client_iconify(data->client, !options, TRUE, FALSE); --- client_iconify(data->client, TRUE, TRUE, FALSE); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/if.c index 63a7fbcd,63a7fbcd,63a7fbcd,63a7fbcd..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/if.c +++ /dev/null @@@@@ -1,149 -1,149 -1,149 -1,149 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/misc.h" ----#include "openbox/client.h" ----#include "openbox/frame.h" ----#include "openbox/screen.h" ----#include "openbox/focus.h" ----#include ---- ----typedef struct { ---- gboolean shaded_on; ---- gboolean shaded_off; ---- gboolean maxvert_on; ---- gboolean maxvert_off; ---- gboolean maxhorz_on; ---- gboolean maxhorz_off; ---- gboolean maxfull_on; ---- gboolean maxfull_off; ---- gboolean iconic_on; ---- gboolean iconic_off; ---- gboolean focused; ---- gboolean unfocused; ---- GSList *thenacts; ---- GSList *elseacts; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_if_startup(void) ----{ ---- actions_register("If", setup_func, free_func, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "shaded"))) { ---- if (obt_parse_node_bool(n)) ---- o->shaded_on = TRUE; ---- else ---- o->shaded_off = TRUE; ---- } ---- if ((n = obt_parse_find_node(node, "maximized"))) { ---- if (obt_parse_node_bool(n)) ---- o->maxfull_on = TRUE; ---- else ---- o->maxfull_off = TRUE; ---- } ---- if ((n = obt_parse_find_node(node, "maximizedhorizontal"))) { ---- if (obt_parse_node_bool(n)) ---- o->maxhorz_on = TRUE; ---- else ---- o->maxhorz_off = TRUE; ---- } ---- if ((n = obt_parse_find_node(node, "maximizedvertical"))) { ---- if (obt_parse_node_bool(n)) ---- o->maxvert_on = TRUE; ---- else ---- o->maxvert_off = TRUE; ---- } ---- if ((n = obt_parse_find_node(node, "iconified"))) { ---- if (obt_parse_node_bool(n)) ---- o->iconic_on = TRUE; ---- else ---- o->iconic_off = TRUE; ---- } ---- if ((n = obt_parse_find_node(node, "focused"))) { ---- if (obt_parse_node_bool(n)) ---- o->focused = TRUE; ---- else ---- o->unfocused = TRUE; ---- } ---- ---- if ((n = obt_parse_find_node(node, "then"))) { ---- xmlNodePtr m; ---- ---- m = obt_parse_find_node(n->children, "action"); ---- while (m) { ---- ObActionsAct *action = actions_parse(m); ---- if (action) o->thenacts = g_slist_prepend(o->thenacts, action); ---- m = obt_parse_find_node(m->next, "action"); ---- } ---- } ---- if ((n = obt_parse_find_node(node, "else"))) { ---- xmlNodePtr m; ---- ---- m = obt_parse_find_node(n->children, "action"); ---- while (m) { ---- ObActionsAct *action = actions_parse(m); ---- if (action) o->elseacts = g_slist_prepend(o->elseacts, action); ---- m = obt_parse_find_node(m->next, "action"); ---- } ---- } ---- ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- ---- while (o->thenacts) { ---- actions_act_unref(o->thenacts->data); ---- o->thenacts = g_slist_delete_link(o->thenacts, o->thenacts); ---- } ---- while (o->elseacts) { ---- actions_act_unref(o->elseacts->data); ---- o->elseacts = g_slist_delete_link(o->elseacts, o->elseacts); ---- } ---- ---- g_free(o); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- GSList *acts; ---- ObClient *c = data->client; ---- ---- if ((!o->shaded_on || (c && c->shaded)) && ---- (!o->shaded_off || (c && !c->shaded)) && ---- (!o->iconic_on || (c && c->iconic)) && ---- (!o->iconic_off || (c && !c->iconic)) && ---- (!o->maxhorz_on || (c && c->max_horz)) && ---- (!o->maxhorz_off || (c && !c->max_horz)) && ---- (!o->maxvert_on || (c && c->max_vert)) && ---- (!o->maxvert_off || (c && !c->max_vert)) && ---- (!o->maxfull_on || (c && c->max_vert && c->max_horz)) && ---- (!o->maxfull_off || (c && !(c->max_vert && c->max_horz))) && ---- (!o->focused || (c && (c == focus_client))) && ---- (!o->unfocused || (c && !(c == focus_client)))) ---- { ---- acts = o->thenacts; ---- } ---- else ---- acts = o->elseacts; ---- ---- actions_run_acts(acts, data->uact, data->state, ---- data->x, data->y, data->button, ---- data->context, data->client); ---- ---- return FALSE; ----} diff --cc openbox/actions/kill.c index ac0293bf,68244407,68244407,68244407..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/kill.c +++ /dev/null @@@@@ -1,21 -1,21 -1,21 -1,21 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_kill_startup(void) ----{ ---- actions_register("Kill", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) --- if (data->client) ---- client_kill(data->client); ---- ---- return FALSE; ----} diff --cc openbox/actions/layer.c index bbfda572,bbfda572,bbfda572,bbfda572..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/layer.c +++ /dev/null @@@@@ -1,89 -1,89 -1,89 -1,89 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----typedef struct { ---- gint layer; /*!< -1 for below, 0 for normal, and 1 for above */ ---- gboolean toggle; ----} Options; ---- ----static gpointer setup_func_top(xmlNodePtr node); ----static gpointer setup_func_bottom(xmlNodePtr node); ----static gpointer setup_func_send(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_layer_startup(void) ----{ ---- actions_register("ToggleAlwaysOnTop", setup_func_top, g_free, ---- run_func, NULL, NULL); ---- actions_register("ToggleAlwaysOnBottom", setup_func_bottom, g_free, ---- run_func, NULL, NULL); ---- actions_register("SendToLayer", setup_func_send, g_free, ---- run_func, NULL, NULL); ----} ---- ----static gpointer setup_func_top(xmlNodePtr node) ----{ ---- Options *o = g_new0(Options, 1); ---- o->layer = 1; ---- o->toggle = TRUE; ---- return o; ----} ---- ----static gpointer setup_func_bottom(xmlNodePtr node) ----{ ---- Options *o = g_new0(Options, 1); ---- o->layer = -1; ---- o->toggle = TRUE; ---- return o; ----} ---- ----static gpointer setup_func_send(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "layer"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "above") || ---- !g_ascii_strcasecmp(s, "top")) ---- o->layer = 1; ---- else if (!g_ascii_strcasecmp(s, "below") || ---- !g_ascii_strcasecmp(s, "bottom")) ---- o->layer = -1; ---- else if (!g_ascii_strcasecmp(s, "normal") || ---- !g_ascii_strcasecmp(s, "middle")) ---- o->layer = 0; ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- if (data->client) { ---- ObClient *c = data->client; ---- ---- actions_client_move(data, TRUE); ---- ---- if (o->layer < 0) { ---- if (o->toggle || !c->below) ---- client_set_layer(c, c->below ? 0 : -1); ---- } ---- else if (o->layer > 0) { ---- if (o->toggle || !c->above) ---- client_set_layer(c, c->above ? 0 : 1); ---- } ---- else if (c->above || c->below) ---- client_set_layer(c, 0); ---- ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/lower.c index d34e933b,d34e933b,d34e933b,d34e933b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/lower.c +++ /dev/null @@@@@ -1,25 -1,25 -1,25 -1,25 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/stacking.h" ----#include "openbox/window.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_lower_startup(void) ----{ ---- actions_register("Lower", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- if (data->client) { ---- actions_client_move(data, TRUE); ---- stacking_lower(CLIENT_AS_WINDOW(data->client)); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/maximize.c index fa419901,45e8b38e,45e8b38e,45e8b38e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/maximize.c +++ /dev/null @@@@@ -1,91 -1,91 -1,91 -1,91 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----/* These match the values for client_maximize */ ----typedef enum { ---- BOTH = 0, ---- HORZ = 1, ---- VERT = 2 ----} MaxDirection; ---- ----typedef struct { ---- MaxDirection dir; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func_on(ObActionsData *data, gpointer options); ----static gboolean run_func_off(ObActionsData *data, gpointer options); ----static gboolean run_func_toggle(ObActionsData *data, gpointer options); ---- ----void action_maximize_startup(void) ----{ ---- actions_register("Maximize", setup_func, g_free, run_func_on, ---- NULL, NULL); ---- actions_register("Unmaximize", setup_func, g_free, run_func_off, ---- NULL, NULL); ---- actions_register("ToggleMaximize", setup_func, g_free, run_func_toggle, ---- NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->dir = BOTH; ---- ---- if ((n = obt_parse_find_node(node, "direction"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "vertical") || ---- !g_ascii_strcasecmp(s, "vert")) ---- o->dir = VERT; ---- else if (!g_ascii_strcasecmp(s, "horizontal") || ---- !g_ascii_strcasecmp(s, "horz")) ---- o->dir = HORZ; ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_on(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_maximize(data->client, TRUE, o->dir); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_off(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_maximize(data->client, FALSE, o->dir); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_toggle(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; - if (!actions_client_locked(data)) { --- if (data->client) { ---- gboolean toggle; ---- actions_client_move(data, TRUE); ---- toggle = ((o->dir == HORZ && !data->client->max_horz) || ---- (o->dir == VERT && !data->client->max_vert) || ---- (o->dir == BOTH && ---- !(data->client->max_horz && data->client->max_vert))); ---- client_maximize(data->client, toggle, o->dir); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/move.c index 70ecf66d,ddd3f59a,ddd3f59a,ddd3f59a..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/move.c +++ /dev/null @@@@@ -1,30 -1,29 -1,29 -1,29 +1,0 @@@@@ ----#include "openbox/actions.h" - #include "openbox/client.h" ----#include "openbox/moveresize.h" ----#include "obt/prop.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_move_startup(void) ----{ ---- actions_register("Move", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ - if (data->client && !(ObClient *)(data->client)->locked) { --- if (data->client) { ---- guint32 corner; ---- ---- corner = data->button != 0 ? ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE) : ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD); ---- ---- moveresize_start(data->client, data->x, data->y, data->button, corner); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/moverelative.c index e9238583,ccdff545,ccdff545,ccdff545..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/moverelative.c +++ /dev/null @@@@@ -1,58 -1,58 -1,58 -1,58 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ----#include "openbox/screen.h" ----#include "openbox/frame.h" ----#include /* for atoi */ ---- ----typedef struct { ---- gint x; ---- gint y; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_moverelative_startup(void) ----{ ---- actions_register("MoveRelative", setup_func, g_free, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "x"))) ---- o->x = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "y"))) ---- o->y = obt_parse_node_int(n); ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- - if (!actions_client_locked(data)) { --- if (data->client) { ---- ObClient *c; ---- gint x, y, lw, lh, w, h; ---- ---- c = data->client; ---- x = data->client->area.x + o->x; ---- y = data->client->area.y + o->y; ---- w = data->client->area.width; ---- h = data->client->area.height; ---- client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE); ---- client_find_onscreen(data->client, &x, &y, w, h, FALSE); ---- ---- actions_client_move(data, TRUE); ---- client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/moveresizeto.c index 6ea70682,357c7315,357c7315,357c7315..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/moveresizeto.c +++ /dev/null @@@@@ -1,161 -1,161 -1,161 -1,161 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ----#include "openbox/screen.h" ----#include "openbox/frame.h" ----#include /* for atoi */ ---- ----enum { ---- CURRENT_MONITOR = -1, ---- ALL_MONITORS = -2 ----}; ---- ----typedef struct { ---- gboolean xcenter; ---- gboolean ycenter; ---- gboolean xopposite; ---- gboolean yopposite; ---- gint x; ---- gint y; ---- gint w; ---- gint h; ---- gint monitor; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_moveresizeto_startup(void) ----{ ---- actions_register("MoveResizeTo", setup_func, g_free, run_func, NULL, NULL); ----} ---- ----static void parse_coord(xmlNodePtr n, gint *pos, ---- gboolean *opposite, gboolean *center) ----{ ---- gchar *s = obt_parse_node_string(n); ---- if (g_ascii_strcasecmp(s, "current") != 0) { ---- if (!g_ascii_strcasecmp(s, "center")) ---- *center = TRUE; ---- else { ---- if (s[0] == '-') ---- *opposite = TRUE; ---- if (s[0] == '-' || s[0] == '+') ---- *pos = atoi(s+1); ---- else ---- *pos = atoi(s); ---- } ---- } ---- g_free(s); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->x = G_MININT; ---- o->y = G_MININT; ---- o->w = G_MININT; ---- o->h = G_MININT; ---- o->monitor = CURRENT_MONITOR; ---- ---- if ((n = obt_parse_find_node(node, "x"))) ---- parse_coord(n, &o->x, &o->xopposite, &o->xcenter); ---- ---- if ((n = obt_parse_find_node(node, "y"))) ---- parse_coord(n, &o->y, &o->yopposite, &o->ycenter); ---- ---- if ((n = obt_parse_find_node(node, "width"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (g_ascii_strcasecmp(s, "current") != 0) ---- o->w = obt_parse_node_int(n); ---- g_free(s); ---- } ---- if ((n = obt_parse_find_node(node, "height"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (g_ascii_strcasecmp(s, "current") != 0) ---- o->h = obt_parse_node_int(n); ---- g_free(s); ---- } ---- ---- if ((n = obt_parse_find_node(node, "monitor"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (g_ascii_strcasecmp(s, "current") != 0) { ---- if (!g_ascii_strcasecmp(s, "all")) ---- o->monitor = ALL_MONITORS; ---- else ---- o->monitor = obt_parse_node_int(n) - 1; ---- } ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- - if (!actions_client_locked(data)) { --- if (data->client) { ---- Rect *area, *carea; ---- ObClient *c; ---- gint mon, cmon; ---- gint x, y, lw, lh, w, h; ---- ---- c = data->client; ---- mon = o->monitor; ---- cmon = client_monitor(c); ---- if (mon == CURRENT_MONITOR) mon = cmon; ---- else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS; ---- area = screen_area(c->desktop, mon, NULL); ---- carea = screen_area(c->desktop, cmon, NULL); ---- ---- w = o->w; ---- if (w == G_MININT) w = c->area.width; ---- ---- h = o->h; ---- if (h == G_MININT) h = c->area.height; ---- ---- /* it might not be able to resize how they requested, so find out what ---- it will actually be resized to */ ---- x = c->area.x; ---- y = c->area.y; ---- client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE); ---- ---- /* get the frame's size */ ---- w += c->frame->size.left + c->frame->size.right; ---- h += c->frame->size.top + c->frame->size.bottom; ---- ---- x = o->x; ---- if (o->xcenter) x = (area->width - w) / 2; ---- else if (x == G_MININT) x = c->frame->area.x - carea->x; ---- else if (o->xopposite) x = area->width - w - x; ---- x += area->x; ---- ---- y = o->y; ---- if (o->ycenter) y = (area->height - h) / 2; ---- else if (y == G_MININT) y = c->frame->area.y - carea->y; ---- else if (o->yopposite) y = area->height - h - y; ---- y += area->y; ---- ---- /* get the client's size back */ ---- w -= c->frame->size.left + c->frame->size.right; ---- h -= c->frame->size.top + c->frame->size.bottom; ---- ---- frame_frame_gravity(c->frame, &x, &y); /* get the client coords */ ---- client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE); ---- /* force it on screen if its moving to another monitor */ ---- client_find_onscreen(c, &x, &y, w, h, mon != cmon); ---- ---- actions_client_move(data, TRUE); ---- client_configure(c, x, y, w, h, TRUE, TRUE, FALSE); ---- actions_client_move(data, FALSE); ---- ---- g_free(area); ---- g_free(carea); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/movetoedge.c index ce975645,f360ddd0,f360ddd0,f360ddd0..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/movetoedge.c +++ /dev/null @@@@@ -1,65 -1,65 -1,65 -1,65 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/misc.h" ----#include "openbox/client.h" ----#include "openbox/frame.h" ----#include "openbox/geom.h" ----#include ---- ----typedef struct { ---- ObDirection dir; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_movetoedge_startup(void) ----{ ---- actions_register("MoveToEdge", setup_func, g_free, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- o->dir = OB_DIRECTION_NORTH; ---- ---- if ((n = obt_parse_find_node(node, "direction"))) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "north") || ---- !g_ascii_strcasecmp(s, "up")) ---- o->dir = OB_DIRECTION_NORTH; ---- else if (!g_ascii_strcasecmp(s, "south") || ---- !g_ascii_strcasecmp(s, "down")) ---- o->dir = OB_DIRECTION_SOUTH; ---- else if (!g_ascii_strcasecmp(s, "west") || ---- !g_ascii_strcasecmp(s, "left")) ---- o->dir = OB_DIRECTION_WEST; ---- else if (!g_ascii_strcasecmp(s, "east") || ---- !g_ascii_strcasecmp(s, "right")) ---- o->dir = OB_DIRECTION_EAST; ---- g_free(s); ---- } ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- - if (!actions_client_locked(data)) { --- if (data->client) { ---- gint x, y; ---- ---- client_find_move_directional(data->client, o->dir, &x, &y); ---- if (x != data->client->area.x || y != data->client->area.y) { ---- actions_client_move(data, TRUE); ---- client_move(data->client, x, y); ---- actions_client_move(data, FALSE); ---- } ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/omnipresent.c index 030a0159,030a0159,030a0159,030a0159..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/omnipresent.c +++ /dev/null @@@@@ -1,24 -1,24 -1,24 -1,24 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ----#include "openbox/screen.h" ---- ----static gboolean run_func_toggle(ObActionsData *data, gpointer options); ---- ----void action_omnipresent_startup(void) ----{ ---- actions_register("ToggleOmnipresent", NULL, NULL, run_func_toggle, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_toggle(ObActionsData *data, gpointer options) ----{ ---- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_set_desktop(data->client, ---- data->client->desktop == DESKTOP_ALL ? ---- screen_desktop : DESKTOP_ALL, FALSE, TRUE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/raise.c index 6837bce2,6837bce2,6837bce2,6837bce2..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/raise.c +++ /dev/null @@@@@ -1,25 -1,25 -1,25 -1,25 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/stacking.h" ----#include "openbox/window.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_raise_startup(void) ----{ ---- actions_register("Raise", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- if (data->client) { ---- actions_client_move(data, TRUE); ---- stacking_raise(CLIENT_AS_WINDOW(data->client)); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/raiselower.c index 80fc917f,80fc917f,80fc917f,80fc917f..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/raiselower.c +++ /dev/null @@@@@ -1,24 -1,24 -1,24 -1,24 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/stacking.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_raiselower_startup(void) ----{ ---- actions_register("RaiseLower", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- if (data->client) { ---- actions_client_move(data, TRUE); ---- stacking_restack_request(data->client, NULL, Opposite); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/reconfigure.c index cef81414,cef81414,cef81414,cef81414..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/reconfigure.c +++ /dev/null @@@@@ -1,20 -1,20 -1,20 -1,20 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/openbox.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_reconfigure_startup(void) ----{ ---- actions_register("Reconfigure", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- ob_reconfigure(); ---- ---- return FALSE; ----} diff --cc openbox/actions/resize.c index 0c224929,47f45f5b,47f45f5b,47f45f5b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/resize.c +++ /dev/null @@@@@ -1,192 -1,192 -1,192 -1,192 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/moveresize.h" ----#include "openbox/client.h" ----#include "openbox/frame.h" ----#include "obt/prop.h" ---- ----typedef struct { ---- gboolean corner_specified; ---- guint32 corner; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch, ---- gboolean shaded); ---- ----void action_resize_startup(void) ----{ ---- actions_register("Resize", setup_func, g_free, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "edge"))) { ---- gchar *s = obt_parse_node_string(n); ---- ---- o->corner_specified = TRUE; ---- if (!g_ascii_strcasecmp(s, "top")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP); ---- else if (!g_ascii_strcasecmp(s, "bottom")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM); ---- else if (!g_ascii_strcasecmp(s, "left")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT); ---- else if (!g_ascii_strcasecmp(s, "right")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT); ---- else if (!g_ascii_strcasecmp(s, "topleft")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT); ---- else if (!g_ascii_strcasecmp(s, "topright")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT); ---- else if (!g_ascii_strcasecmp(s, "bottomleft")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT); ---- else if (!g_ascii_strcasecmp(s, "bottomright")) ---- o->corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT); ---- else ---- o->corner_specified = FALSE; ---- ---- g_free(s); ---- } ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- - if (!actions_client_locked(data)) { --- if (data->client) { ---- ObClient *c = data->client; ---- guint32 corner; ---- ---- if (!data->button) ---- corner = OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD); ---- else if (o->corner_specified) ---- corner = o->corner; /* it was specified in the binding */ ---- else ---- corner = pick_corner(data->x, data->y, ---- c->frame->area.x, c->frame->area.y, ---- /* use the client size because the frame ---- can be differently sized (shaded ---- windows) and we want this based on the ---- clients size */ ---- c->area.width + c->frame->size.left + ---- c->frame->size.right, ---- c->area.height + c->frame->size.top + ---- c->frame->size.bottom, c->shaded); ---- ---- moveresize_start(c, data->x, data->y, data->button, corner); ---- } ---- ---- return FALSE; ----} ---- ----static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch, ---- gboolean shaded) ----{ ---- /* let's make x and y client relative instead of screen relative */ ---- x = x - cx; ---- y = ch - (y - cy); /* y is inverted, 0 is at the bottom of the window */ ---- ----#define X x*ch/cw ----#define A -4*X + 7*ch/3 ----#define B 4*X -15*ch/9 ----#define C -X/4 + 2*ch/3 ----#define D X/4 + 5*ch/12 ----#define E X/4 + ch/3 ----#define F -X/4 + 7*ch/12 ----#define G 4*X - 4*ch/3 ----#define H -4*X + 8*ch/3 ----#define a (y > 5*ch/9) ----#define b (x < 4*cw/9) ----#define c (x > 5*cw/9) ----#define d (y < 4*ch/9) ---- ---- /* ---- Each of these defines (except X which is just there for fun), represents ---- the equation of a line. The lines they represent are shown in the diagram ---- below. Checking y against these lines, we are able to choose a region ---- of the window as shown. ---- ---- +---------------------A-------|-------|-------B---------------------+ ---- | |A B| | ---- | |A | | B| | ---- | | A B | | ---- | | A | | B | | ---- | | A B | | ---- | | A | | B | | ---- | northwest | A north B | northeast | ---- | | A | | B | | ---- | | A B | | ---- C---------------------+----A--+-------+--B----+---------------------D ---- |CCCCCCC | A B | DDDDDDD| ---- | CCCCCCCC | A | | B | DDDDDDDD | ---- | CCCCCCC A B DDDDDDD | ---- - - - - - - - - - - - +CCCCCCC+aaaaaaa+DDDDDDD+ - - - - - - - - - - - - ---- | | b c | | sh ---- | west | b move c | east | ad ---- | | b c | | ed ---- - - - - - - - - - - - +EEEEEEE+ddddddd+FFFFFFF+- - - - - - - - - - - - ---- | EEEEEEE G H FFFFFFF | ---- | EEEEEEEE | G | | H | FFFFFFFF | ---- |EEEEEEE | G H | FFFFFFF| ---- E---------------------+----G--+-------+--H----+---------------------F ---- | | G H | | ---- | | G | | H | | ---- | southwest | G south H | southeast | ---- | | G | | H | | ---- | | G H | | ---- | | G | | H | | ---- | | G H | | ---- | |G | | H| | ---- | |G H| | ---- +---------------------G-------|-------|-------H---------------------+ ---- */ ---- ---- if (shaded) { ---- /* for shaded windows, you can only resize west/east and move */ ---- if (b) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT); ---- if (c) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT); ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE); ---- } ---- ---- if (y < A && y >= C) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT); ---- else if (y >= A && y >= B && a) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP); ---- else if (y < B && y >= D) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT); ---- else if (y < C && y >= E && b) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT); ---- else if (y < D && y >= F && c) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT); ---- else if (y < E && y >= G) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT); ---- else if (y < G && y < H && d) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM); ---- else if (y >= H && y < F) ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT); ---- else ---- return OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE); ---- ----#undef X ----#undef A ----#undef B ----#undef C ----#undef D ----#undef E ----#undef F ----#undef G ----#undef H ----#undef a ----#undef b ----#undef c ----#undef d ----} diff --cc openbox/actions/resizerelative.c index ca0a5daa,5742e1fc,5742e1fc,5742e1fc..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/resizerelative.c +++ /dev/null @@@@@ -1,76 -1,76 -1,76 -1,76 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ----#include "openbox/screen.h" ----#include "openbox/frame.h" ----#include /* for atoi */ ---- ----typedef struct { ---- gint left; ---- gint right; ---- gint top; ---- gint bottom; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_resizerelative_startup(void) ----{ ---- actions_register("ResizeRelative", setup_func, g_free, run_func, ---- NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "left"))) ---- o->left = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "right"))) ---- o->right = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "top")) || ---- (n = obt_parse_find_node(node, "up"))) ---- o->top = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "bottom")) || ---- (n = obt_parse_find_node(node, "down"))) ---- o->bottom = obt_parse_node_int(n); ---- ---- return o; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- - if (!actions_client_locked(data)) { --- if (data->client) { ---- ObClient *c = data->client; ---- gint x, y, ow, xoff, nw, oh, yoff, nh, lw, lh; ---- ---- x = c->area.x; ---- y = c->area.y; ---- ow = c->area.width; ---- xoff = -o->left * c->size_inc.width; ---- nw = ow + o->right * c->size_inc.width ---- + o->left * c->size_inc.width; ---- oh = c->area.height; ---- yoff = -o->top * c->size_inc.height; ---- nh = oh + o->bottom * c->size_inc.height ---- + o->top * c->size_inc.height; ---- ---- client_try_configure(c, &x, &y, &nw, &nh, &lw, &lh, TRUE); ---- xoff = xoff == 0 ? 0 : ---- (xoff < 0 ? MAX(xoff, ow-nw) : MIN(xoff, ow-nw)); ---- yoff = yoff == 0 ? 0 : ---- (yoff < 0 ? MAX(yoff, oh-nh) : MIN(yoff, oh-nh)); ---- ---- actions_client_move(data, TRUE); ---- client_move_resize(c, x + xoff, y + yoff, nw, nh); ---- actions_client_move(data, FALSE); ---- } ---- ---- return FALSE; ----} diff --cc openbox/actions/restart.c index 47f332b1,47f332b1,47f332b1,47f332b1..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/restart.c +++ /dev/null @@@@@ -1,50 -1,50 -1,50 -1,50 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/openbox.h" ----#include "obt/paths.h" ---- ----typedef struct { ---- gchar *cmd; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_restart_startup(void) ----{ ---- actions_register("Restart", setup_func, free_func, run_func, NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "command")) || ---- (n = obt_parse_find_node(node, "execute"))) ---- { ---- gchar *s = obt_parse_node_string(n); ---- o->cmd = obt_paths_expand_tilde(s); ---- g_free(s); ---- } ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- g_free(o->cmd); ---- g_free(o); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- ob_restart_other(o->cmd); ---- ---- return FALSE; ----} diff --cc openbox/actions/shade.c index c394f4f6,2342067f,2342067f,2342067f..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/shade.c +++ /dev/null @@@@@ -1,46 -1,46 -1,46 -1,46 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/client.h" ---- ----static gboolean run_func_on(ObActionsData *data, gpointer options); ----static gboolean run_func_off(ObActionsData *data, gpointer options); ----static gboolean run_func_toggle(ObActionsData *data, gpointer options); ---- ----void action_shade_startup(void) ----{ ---- actions_register("Shade", NULL, NULL, run_func_on, NULL, NULL); ---- actions_register("Unshade", NULL, NULL, run_func_off, NULL, NULL); ---- actions_register("ToggleShade", NULL, NULL, run_func_toggle, NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_on(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_shade(data->client, TRUE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_off(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_shade(data->client, FALSE); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func_toggle(ObActionsData *data, gpointer options) ----{ - if (!actions_client_locked(data)) { --- if (data->client) { ---- actions_client_move(data, TRUE); ---- client_shade(data->client, !data->client->shaded); ---- actions_client_move(data, FALSE); ---- } ---- return FALSE; ----} diff --cc openbox/actions/showdesktop.c index c9ba86c4,c9ba86c4,c9ba86c4,c9ba86c4..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/showdesktop.c +++ /dev/null @@@@@ -1,20 -1,20 -1,20 -1,20 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/screen.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_showdesktop_startup(void) ----{ ---- actions_register("ToggleShowDesktop", ---- NULL, NULL, ---- run_func, ---- NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- screen_show_desktop(!screen_showing_desktop, NULL); ---- ---- return FALSE; ----} diff --cc openbox/actions/showmenu.c index 9590bd15,9590bd15,9590bd15,9590bd15..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/showmenu.c +++ /dev/null @@@@@ -1,48 -1,48 -1,48 -1,48 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/menu.h" ----#include ---- ----typedef struct { ---- gchar *name; ----} Options; ---- ----static gpointer setup_func(xmlNodePtr node); ----static void free_func(gpointer options); ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_showmenu_startup(void) ----{ ---- actions_register("ShowMenu", setup_func, free_func, run_func, ---- NULL, NULL); ----} ---- ----static gpointer setup_func(xmlNodePtr node) ----{ ---- xmlNodePtr n; ---- Options *o; ---- ---- o = g_new0(Options, 1); ---- ---- if ((n = obt_parse_find_node(node, "menu"))) ---- o->name = obt_parse_node_string(n); ---- return o; ----} ---- ----static void free_func(gpointer options) ----{ ---- Options *o = options; ---- g_free(o->name); ---- g_free(o); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- Options *o = options; ---- ---- /* you cannot call ShowMenu from inside a menu */ ---- if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name) ---- menu_show(o->name, data->x, data->y, data->button != 0, data->client); ---- ---- return FALSE; ----} diff --cc openbox/actions/unfocus.c index 22a9378c,22a9378c,22a9378c,22a9378c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/actions/unfocus.c +++ /dev/null @@@@@ -1,17 -1,17 -1,17 -1,17 +1,0 @@@@@ ----#include "openbox/actions.h" ----#include "openbox/focus.h" ---- ----static gboolean run_func(ObActionsData *data, gpointer options); ---- ----void action_unfocus_startup(void) ----{ ---- actions_register("Unfocus", NULL, NULL, run_func, NULL, NULL); ----} ---- ----/* Always return FALSE because its not interactive */ ----static gboolean run_func(ObActionsData *data, gpointer options) ----{ ---- if (data->client && data->client == focus_client) ---- focus_fallback(FALSE, FALSE, TRUE, FALSE); ---- return FALSE; ----} diff --cc openbox/client.c index ec702952,bfc2c5b3,66006a48,723a4a61..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client.c +++ /dev/null @@@@@ -1,4355 -1,4339 -1,4333 -1,4344 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "client.h" ----#include "debug.h" ----#include "startupnotify.h" ----#include "dock.h" ----#include "screen.h" ----#include "moveresize.h" ----#include "ping.h" ----#include "place.h" ----#include "frame.h" ----#include "session.h" ----#include "event.h" ----#include "grab.h" ----#include "prompt.h" ----#include "focus.h" ----#include "stacking.h" ----#include "openbox.h" ----#include "group.h" ----#include "config.h" ----#include "menuframe.h" ----#include "keyboard.h" ----#include "mouse.h" ----#include "render/render.h" ----#include "gettext.h" ----#include "obt/display.h" ----#include "obt/prop.h" ---- ----#ifdef HAVE_UNISTD_H ----# include ----#endif ---- ----#ifdef HAVE_SIGNAL_H ----# include /* for kill() */ ----#endif ---- ----#include ----#include ---- ----/*! The event mask to grab on client windows */ ----#define CLIENT_EVENTMASK (PropertyChangeMask | StructureNotifyMask | \ ---- ColormapChangeMask) ---- ----#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ ---- ButtonMotionMask) ---- ----typedef struct ----{ ---- ObClientCallback func; ---- gpointer data; ----} ClientCallback; ---- ----GList *client_list = NULL; ---- ----static GSList *client_destroy_notifies = NULL; ----static RrImage *client_default_icon = NULL; ---- ----static void client_get_all(ObClient *self, gboolean real); ----static void client_get_startup_id(ObClient *self); ----static void client_get_session_ids(ObClient *self); ----static void client_get_area(ObClient *self); ----static void client_get_desktop(ObClient *self); ----static void client_get_state(ObClient *self); ----static void client_get_shaped(ObClient *self); ----static void client_get_mwm_hints(ObClient *self); ----static void client_get_colormap(ObClient *self); ----static void client_set_desktop_recursive(ObClient *self, ---- guint target, ---- gboolean donthide, ---- gboolean dontraise); ----static void client_change_allowed_actions(ObClient *self); ----static void client_change_state(ObClient *self); ----static void client_change_wm_state(ObClient *self); ----static void client_apply_startup_state(ObClient *self, ---- gint x, gint y, gint w, gint h); ----static void client_restore_session_state(ObClient *self); ----static gboolean client_restore_session_stacking(ObClient *self); ----static ObAppSettings *client_get_settings_state(ObClient *self); ----static void client_update_transient_tree(ObClient *self, ---- ObGroup *oldgroup, ObGroup *newgroup, ---- gboolean oldgtran, gboolean newgtran, ---- ObClient* oldparent, ---- ObClient *newparent); ----static void client_present(ObClient *self, gboolean here, gboolean raise, ---- gboolean unshade); ----static GSList *client_search_all_top_parents_internal(ObClient *self, ---- gboolean bylayer, ---- ObStackingLayer layer); ----static void client_call_notifies(ObClient *self, GSList *list); ----static void client_ping_event(ObClient *self, gboolean dead); ----static void client_prompt_kill(ObClient *self); ---- ---- ----void client_startup(gboolean reconfig) ----{ ---- if ((client_default_icon = RrImageCacheFind(ob_rr_icons, ---- ob_rr_theme->def_win_icon, ---- ob_rr_theme->def_win_icon_w, ---- ob_rr_theme->def_win_icon_h))) ---- RrImageRef(client_default_icon); ---- else { ---- client_default_icon = RrImageNew(ob_rr_icons); ---- RrImageAddPicture(client_default_icon, ---- ob_rr_theme->def_win_icon, ---- ob_rr_theme->def_win_icon_w, ---- ob_rr_theme->def_win_icon_h); ---- } ---- ---- if (reconfig) return; ---- ---- client_set_list(); ----} ---- ----void client_shutdown(gboolean reconfig) ----{ ---- RrImageUnref(client_default_icon); ---- client_default_icon = NULL; ---- ---- if (reconfig) return; ----} ---- ----static void client_call_notifies(ObClient *self, GSList *list) ----{ ---- GSList *it; ---- ---- for (it = list; it; it = g_slist_next(it)) { ---- ClientCallback *d = it->data; ---- d->func(self, d->data); ---- } ----} ---- ----void client_add_destroy_notify(ObClientCallback func, gpointer data) ----{ ---- ClientCallback *d = g_new(ClientCallback, 1); ---- d->func = func; ---- d->data = data; ---- client_destroy_notifies = g_slist_prepend(client_destroy_notifies, d); ----} ---- ----void client_remove_destroy_notify(ObClientCallback func) ----{ ---- GSList *it; ---- ---- for (it = client_destroy_notifies; it; it = g_slist_next(it)) { ---- ClientCallback *d = it->data; ---- if (d->func == func) { ---- g_free(d); ---- client_destroy_notifies = ---- g_slist_delete_link(client_destroy_notifies, it); ---- break; ---- } ---- } ----} ---- ----void client_set_list(void) ----{ ---- Window *windows, *win_it; ---- GList *it; ---- guint size = g_list_length(client_list); ---- ---- /* create an array of the window ids */ ---- if (size > 0) { ---- windows = g_new(Window, size); ---- win_it = windows; ---- for (it = client_list; it; it = g_list_next(it), ++win_it) ---- *win_it = ((ObClient*)it->data)->window; ---- } else ---- windows = NULL; ---- ---- OBT_PROP_SETA32(obt_root(ob_screen), NET_CLIENT_LIST, WINDOW, ---- (gulong*)windows, size); ---- ---- if (windows) ---- g_free(windows); ---- ---- stacking_set_list(); ----} ---- ----void client_manage(Window window, ObPrompt *prompt) ----{ ---- ObClient *self; ---- XSetWindowAttributes attrib_set; ---- gboolean activate = FALSE; ---- ObAppSettings *settings; ---- gboolean transient = FALSE; ---- Rect place, *monitor; ---- Time launch_time, map_time; ---- ---- ob_debug("Managing window: 0x%lx", window); ---- ---- map_time = event_get_server_time(); ---- ---- /* choose the events we want to receive on the CLIENT window ---- (ObPrompt windows can request events too) */ ---- attrib_set.event_mask = CLIENT_EVENTMASK | ---- (prompt ? prompt->event_mask : 0); ---- attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK; ---- XChangeWindowAttributes(obt_display, window, ---- CWEventMask|CWDontPropagate, &attrib_set); ---- ---- /* create the ObClient struct, and populate it from the hints on the ---- window */ ---- self = g_new0(ObClient, 1); ---- self->obwin.type = OB_WINDOW_CLASS_CLIENT; ---- self->window = window; ---- self->prompt = prompt; ---- ---- /* non-zero defaults */ ---- self->wmstate = WithdrawnState; /* make sure it gets updated first time */ ---- self->gravity = NorthWestGravity; ---- self->desktop = screen_num_desktops; /* always an invalid value */ ---- ---- /* get all the stuff off the window */ ---- client_get_all(self, TRUE); ---- ---- ob_debug("Window type: %d", self->type); ---- ob_debug("Window group: 0x%x", self->group?self->group->leader:0); ---- ---- /* now we have all of the window's information so we can set this up. ---- do this before creating the frame, so it can tell that we are still ---- mapping and doesn't go applying things right away */ ---- client_setup_decor_and_functions(self, FALSE); ---- ---- /* specify that if we exit, the window should not be destroyed and ---- should be reparented back to root automatically, unless we are managing ---- an internal ObPrompt window */ ---- if (!self->prompt) ---- XChangeSaveSet(obt_display, window, SetModeInsert); ---- ---- /* create the decoration frame for the client window */ ---- self->frame = frame_new(self); ---- ---- frame_grab_client(self->frame); ---- ---- /* we've grabbed everything and set everything that we need to at mapping ---- time now */ ---- grab_server(FALSE); ---- ---- /* per-app settings override stuff from client_get_all, and return the ---- settings for other uses too. the returned settings is a shallow copy, ---- that needs to be freed with g_free(). */ ---- settings = client_get_settings_state(self); ---- /* the session should get the last say though */ ---- client_restore_session_state(self); ---- ---- /* tell startup notification that this app started */ ---- launch_time = sn_app_started(self->startup_id, self->class, self->name); ---- ---- /* do this after we have a frame.. it uses the frame to help determine the ---- WM_STATE to apply. */ ---- client_change_state(self); ---- ---- /* add ourselves to the focus order */ ---- focus_order_add_new(self); ---- ---- /* do this to add ourselves to the stacking list in a non-intrusive way */ ---- client_calc_layer(self); ---- ---- /* focus the new window? */ ---- if (ob_state() != OB_STATE_STARTING && ---- (!self->session || self->session->focused) && ---- /* this means focus=true for window is same as config_focus_new=true */ ---- ((config_focus_new || (settings && settings->focus == 1)) || ---- client_search_focus_tree_full(self)) && ---- /* this checks for focus=false for the window */ ---- (!settings || settings->focus != 0) && ---- focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE)) ---- { ---- activate = TRUE; ---- } ---- ---- /* remove the client's border */ ---- XSetWindowBorderWidth(obt_display, self->window, 0); ---- ---- /* adjust the frame to the client's size before showing or placing ---- the window */ ---- frame_adjust_area(self->frame, FALSE, TRUE, FALSE); ---- frame_adjust_client_area(self->frame); ---- ---- /* where the frame was placed is where the window was originally */ ---- place = self->area; ---- monitor = screen_physical_area_monitor(screen_find_monitor(&place)); ---- ---- /* figure out placement for the window if the window is new */ ---- if (ob_state() == OB_STATE_RUNNING) { ---- ob_debug("Positioned: %s @ %d %d", ---- (!self->positioned ? "no" : ---- (self->positioned == PPosition ? "program specified" : ---- (self->positioned == USPosition ? "user specified" : ---- (self->positioned == (PPosition | USPosition) ? ---- "program + user specified" : ---- "BADNESS !?")))), place.x, place.y); ---- ---- ob_debug("Sized: %s @ %d %d", ---- (!self->sized ? "no" : ---- (self->sized == PSize ? "program specified" : ---- (self->sized == USSize ? "user specified" : ---- (self->sized == (PSize | USSize) ? ---- "program + user specified" : ---- "BADNESS !?")))), place.width, place.height); ---- ---- /* splash screens are also returned as TRUE for transient, ---- and so will be forced on screen below */ ---- transient = place_client(self, &place.x, &place.y, settings); ---- ---- /* make sure the window is visible. */ ---- client_find_onscreen(self, &place.x, &place.y, ---- place.width, place.height, ---- /* non-normal clients has less rules, and ---- windows that are being restored from a ---- session do also. we can assume you want ---- it back where you saved it. Clients saying ---- they placed themselves are subjected to ---- harder rules, ones that are placed by ---- place.c or by the user are allowed partially ---- off-screen and on xinerama divides (ie, ---- it is up to the placement routines to avoid ---- the xinerama divides) ---- ---- splash screens get "transient" set to TRUE by ---- the place_client call ---- */ ---- ob_state() == OB_STATE_RUNNING && ---- (transient || ---- (!((self->positioned & USPosition) || ---- (settings && settings->pos_given)) && ---- client_normal(self) && ---- !self->session && ---- /* don't move oldschool fullscreen windows to ---- fit inside the struts (fixes Acroread, which ---- makes its fullscreen window fit the screen ---- but it is not USSize'd or USPosition'd) */ ---- !(self->decorations == 0 && ---- RECT_EQUAL(place, *monitor))))); ---- } ---- ---- /* if the window isn't user-sized, then make it fit inside ---- the visible screen area on its monitor. Use basically the same rules ---- for forcing the window on screen in the client_find_onscreen call. ---- ---- do this after place_client, it chooses the monitor! ---- ---- splash screens get "transient" set to TRUE by ---- the place_client call ---- */ ---- if (ob_state() == OB_STATE_RUNNING && ---- (transient || ---- (!(self->sized & USSize || self->positioned & USPosition) && ---- client_normal(self) && ---- !self->session && ---- /* don't shrink oldschool fullscreen windows to fit inside the ---- struts (fixes Acroread, which makes its fullscreen window ---- fit the screen but it is not USSize'd or USPosition'd) */ ---- !(self->decorations == 0 && RECT_EQUAL(place, *monitor))))) ---- { ---- Rect *a = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, &place); ---- ---- /* get the size of the frame */ ---- place.width += self->frame->size.left + self->frame->size.right; ---- place.height += self->frame->size.top + self->frame->size.bottom; ---- ---- /* fit the window inside the area */ ---- place.width = MIN(place.width, a->width); ---- place.height = MIN(place.height, a->height); ---- ---- ob_debug("setting window size to %dx%d", place.width, place.height); ---- ---- /* get the size of the client back */ ---- place.width -= self->frame->size.left + self->frame->size.right; ---- place.height -= self->frame->size.top + self->frame->size.bottom; ---- ---- g_free(a); ---- } ---- ---- ob_debug("placing window 0x%x at %d, %d with size %d x %d. " ---- "some restrictions may apply", ---- self->window, place.x, place.y, place.width, place.height); ---- if (self->session) ---- ob_debug(" but session requested %d, %d %d x %d instead, " ---- "overriding", ---- self->session->x, self->session->y, ---- self->session->w, self->session->h); ---- ---- /* do this after the window is placed, so the premax/prefullscreen numbers ---- won't be all wacko!! ---- ---- this also places the window ---- */ ---- client_apply_startup_state(self, place.x, place.y, ---- place.width, place.height); ---- ---- g_free(monitor); ---- monitor = NULL; ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s", ---- activate ? "yes" : "no"); ---- if (activate) { ---- gboolean raise = FALSE; ---- ---- /* This is focus stealing prevention */ ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Want to focus new window 0x%x at time %u " ---- "launched at %u (last user interaction time %u)", ---- self->window, map_time, launch_time, ---- event_last_user_time); ---- ---- if (menu_frame_visible || moveresize_in_progress) { ---- activate = FALSE; ---- raise = TRUE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because the user is inside " ---- "an Openbox menu or is move/resizing a window and " ---- "we don't want to interrupt them"); ---- } ---- ---- /* if it's on another desktop */ ---- else if (!(self->desktop == screen_desktop || ---- self->desktop == DESKTOP_ALL) && ---- /* the timestamp is from before you changed desktops */ ---- launch_time && screen_desktop_user_time && ---- !event_time_after(launch_time, screen_desktop_user_time)) ---- { ---- activate = FALSE; ---- raise = TRUE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because its on another " ---- "desktop"); ---- } ---- /* If something is focused, and it's not our relative... */ ---- else if (focus_client && client_search_focus_tree_full(self) == NULL && ---- client_search_focus_group_full(self) == NULL) ---- { ---- /* If the user is working in another window right now, then don't ---- steal focus */ ---- if (event_last_user_time && launch_time && ---- event_time_after(event_last_user_time, launch_time) && ---- event_last_user_time != launch_time && ---- event_time_after(event_last_user_time, ---- map_time - OB_EVENT_USER_TIME_DELAY)) ---- { ---- activate = FALSE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because the user is " ---- "working in another window"); ---- } ---- /* If it's a transient (and its parents aren't focused) */ ---- else if (client_has_parent(self)) { ---- activate = FALSE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because it is a " ---- "transient, and its relatives aren't focused"); ---- } ---- /* Don't steal focus from globally active clients. ---- I stole this idea from KWin. It seems nice. ---- */ ---- else if (!(focus_client->can_focus || ---- focus_client->focus_notify)) ---- { ---- activate = FALSE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because a globally " ---- "active client has focus"); ---- } ---- /* Don't move focus if it's not going to go to this window ---- anyway */ ---- else if (client_focus_target(self) != self) { ---- activate = FALSE; ---- raise = TRUE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because another window " ---- "would get the focus anyway"); ---- } ---- else if (!(self->desktop == screen_desktop || ---- self->desktop == DESKTOP_ALL)) ---- { ---- activate = FALSE; ---- raise = TRUE; ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Not focusing the window because it is on " ---- "another desktop and no relatives are focused "); ---- } ---- } ---- ---- if (!activate) { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus stealing prevention activated for %s at " ---- "time %u (last user interaction time %u)", ---- self->title, map_time, event_last_user_time); ---- /* if the client isn't focused, then hilite it so the user ---- knows it is there */ ---- client_hilite(self, TRUE); ---- /* we may want to raise it even tho we're not activating it */ ---- if (raise && !client_restore_session_stacking(self)) ---- stacking_raise(CLIENT_AS_WINDOW(self)); ---- } ---- } ---- else { ---- /* This may look rather odd. Well it's because new windows are added ---- to the stacking order non-intrusively. If we're not going to focus ---- the new window or hilite it, then we raise it to the top. This will ---- take affect for things that don't get focused like splash screens. ---- Also if you don't have focus_new enabled, then it's going to get ---- raised to the top. Legacy begets legacy I guess? ---- */ ---- if (!client_restore_session_stacking(self)) ---- stacking_raise(CLIENT_AS_WINDOW(self)); ---- } ---- ---- mouse_grab_for_client(self, TRUE); ---- ---- /* this has to happen before we try focus the window, but we want it to ---- happen after the client's stacking has been determined or it looks bad ---- */ ---- { ---- gulong ignore_start; ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- ---- client_show(self); ---- ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- } ---- ---- if (activate) { ---- gboolean stacked = client_restore_session_stacking(self); ---- client_present(self, FALSE, !stacked, TRUE); ---- } ---- ---- /* add to client list/map */ ---- client_list = g_list_append(client_list, self); ---- window_add(&self->window, CLIENT_AS_WINDOW(self)); ---- ---- /* this has to happen after we're in the client_list */ ---- if (STRUT_EXISTS(self->strut)) ---- screen_update_areas(); ---- ---- /* update the list hints */ ---- client_set_list(); ---- ---- /* free the ObAppSettings shallow copy */ ---- g_free(settings); ---- ---- ob_debug("Managed window 0x%lx plate 0x%x (%s)", ---- window, self->frame->window, self->class); ----} ---- ---- ----ObClient *client_fake_manage(Window window) ----{ ---- ObClient *self; ---- ObAppSettings *settings; ---- ---- ob_debug("Pretend-managing window: %lx", window); ---- ---- /* do this minimal stuff to figure out the client's decorations */ ---- ---- self = g_new0(ObClient, 1); ---- self->window = window; ---- ---- client_get_all(self, FALSE); ---- /* per-app settings override stuff, and return the settings for other ---- uses too. this returns a shallow copy that needs to be freed */ ---- settings = client_get_settings_state(self); ---- ---- client_setup_decor_and_functions(self, FALSE); ---- ---- /* create the decoration frame for the client window and adjust its size */ ---- self->frame = frame_new(self); ---- frame_adjust_area(self->frame, FALSE, TRUE, TRUE); ---- ---- ob_debug("gave extents left %d right %d top %d bottom %d", ---- self->frame->size.left, self->frame->size.right, ---- self->frame->size.top, self->frame->size.bottom); ---- ---- /* free the ObAppSettings shallow copy */ ---- g_free(settings); ---- ---- return self; ----} ---- ----void client_unmanage_all(void) ----{ ---- while (client_list) ---- client_unmanage(client_list->data); ----} ---- ----void client_unmanage(ObClient *self) ----{ ---- GSList *it; ---- gulong ignore_start; ---- ---- ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)", ---- self->window, self->frame->window, ---- self->class, self->title ? self->title : ""); ---- ---- g_assert(self != NULL); ---- ---- /* we dont want events no more. do this before hiding the frame so we ---- don't generate more events */ ---- XSelectInput(obt_display, self->window, NoEventMask); ---- ---- /* ignore enter events from the unmap so it doesnt mess with the focus */ ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- ---- frame_hide(self->frame); ---- /* flush to send the hide to the server quickly */ ---- XFlush(obt_display); ---- ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- ---- mouse_grab_for_client(self, FALSE); ---- ---- /* remove the window from our save set, unless we are managing an internal ---- ObPrompt window */ ---- if (!self->prompt) ---- XChangeSaveSet(obt_display, self->window, SetModeDelete); ---- ---- /* update the focus lists */ ---- focus_order_remove(self); ---- if (client_focused(self)) { ---- /* don't leave an invalid focus_client */ ---- focus_client = NULL; ---- } ---- ---- /* if we're prompting to kill the client, close that */ ---- prompt_unref(self->kill_prompt); ---- self->kill_prompt = NULL; ---- ---- client_list = g_list_remove(client_list, self); ---- stacking_remove(self); ---- window_remove(self->window); ---- ---- /* once the client is out of the list, update the struts to remove its ---- influence */ ---- if (STRUT_EXISTS(self->strut)) ---- screen_update_areas(); ---- ---- client_call_notifies(self, client_destroy_notifies); ---- ---- /* tell our parent(s) that we're gone */ ---- for (it = self->parents; it; it = g_slist_next(it)) ---- ((ObClient*)it->data)->transients = ---- g_slist_remove(((ObClient*)it->data)->transients,self); ---- ---- /* tell our transients that we're gone */ ---- for (it = self->transients; it; it = g_slist_next(it)) { ---- ((ObClient*)it->data)->parents = ---- g_slist_remove(((ObClient*)it->data)->parents, self); ---- /* we could be keeping our children in a higher layer */ ---- client_calc_layer(it->data); ---- } ---- ---- /* remove from its group */ ---- if (self->group) { ---- group_remove(self->group, self); ---- self->group = NULL; ---- } ---- ---- /* restore the window's original geometry so it is not lost */ ---- { ---- Rect a; ---- ---- a = self->area; ---- ---- if (self->fullscreen) ---- a = self->pre_fullscreen_area; ---- else if (self->max_horz || self->max_vert) { ---- if (self->max_horz) { ---- a.x = self->pre_max_area.x; ---- a.width = self->pre_max_area.width; ---- } ---- if (self->max_vert) { ---- a.y = self->pre_max_area.y; ---- a.height = self->pre_max_area.height; ---- } ---- } ---- ---- self->fullscreen = self->max_horz = self->max_vert = FALSE; ---- /* let it be moved and resized no matter what */ ---- self->functions = OB_CLIENT_FUNC_MOVE | OB_CLIENT_FUNC_RESIZE; ---- self->decorations = 0; /* unmanaged windows have no decor */ ---- ---- /* give the client its border back */ ---- XSetWindowBorderWidth(obt_display, self->window, self->border_width); ---- ---- client_move_resize(self, a.x, a.y, a.width, a.height); ---- } ---- ---- /* reparent the window out of the frame, and free the frame */ ---- frame_release_client(self->frame); ---- frame_free(self->frame); ---- self->frame = NULL; ---- ---- if (ob_state() != OB_STATE_EXITING) { ---- /* these values should not be persisted across a window ---- unmapping/mapping */ ---- OBT_PROP_ERASE(self->window, NET_WM_DESKTOP); ---- OBT_PROP_ERASE(self->window, NET_WM_STATE); ---- OBT_PROP_ERASE(self->window, WM_STATE); ---- } else { ---- /* if we're left in an unmapped state, the client wont be mapped. ---- this is bad, since we will no longer be managing the window on ---- restart */ ---- XMapWindow(obt_display, self->window); ---- } ---- ---- /* these should not be left on the window ever. other window managers ---- don't necessarily use them and it will mess them up (like compiz) */ ---- OBT_PROP_ERASE(self->window, NET_WM_VISIBLE_NAME); ---- OBT_PROP_ERASE(self->window, NET_WM_VISIBLE_ICON_NAME); ---- ---- /* update the list hints */ ---- client_set_list(); ---- ---- ob_debug("Unmanaged window 0x%lx", self->window); ---- ---- /* free all data allocated in the client struct */ ---- RrImageUnref(self->icon_set); ---- g_slist_free(self->transients); ---- g_free(self->startup_id); ---- g_free(self->wm_command); ---- g_free(self->title); ---- g_free(self->icon_title); ---- g_free(self->original_title); ---- g_free(self->name); ---- g_free(self->class); ---- g_free(self->role); ---- g_free(self->client_machine); ---- g_free(self->sm_client_id); ---- g_free(self); ----} ---- ----void client_fake_unmanage(ObClient *self) ----{ ---- /* this is all that got allocated to get the decorations */ ---- ---- frame_free(self->frame); ---- g_free(self); ----} ---- ----/*! Returns a new structure containing the per-app settings for this client. ---- The returned structure needs to be freed with g_free. */ ----static ObAppSettings *client_get_settings_state(ObClient *self) ----{ ---- ObAppSettings *settings; ---- GSList *it; ---- ---- settings = config_create_app_settings(); ---- ---- for (it = config_per_app_settings; it; it = g_slist_next(it)) { ---- ObAppSettings *app = it->data; ---- gboolean match = TRUE; ---- ---- g_assert(app->name != NULL || app->class != NULL); ---- ---- /* we know that either name or class is not NULL so it will have to ---- match to use the rule */ ---- if (app->name && ---- !g_pattern_match(app->name, strlen(self->name), self->name, NULL)) ---- match = FALSE; ---- else if (app->class && ---- !g_pattern_match(app->class, ---- strlen(self->class), self->class, NULL)) ---- match = FALSE; ---- else if (app->role && ---- !g_pattern_match(app->role, ---- strlen(self->role), self->role, NULL)) ---- match = FALSE; ---- else if ((signed)app->type >= 0 && app->type != self->type) ---- match = FALSE; ---- ---- if (match) { ---- ob_debug("Window matching: %s", app->name); ---- ---- /* copy the settings to our struct, overriding the existing ---- settings if they are not defaults */ ---- config_app_settings_copy_non_defaults(app, settings); ---- } ---- } ---- ---- if (settings->shade != -1) ---- self->shaded = !!settings->shade; ---- if (settings->decor != -1) ---- self->undecorated = !settings->decor; ---- if (settings->iconic != -1) ---- self->iconic = !!settings->iconic; ---- if (settings->skip_pager != -1) ---- self->skip_pager = !!settings->skip_pager; ---- if (settings->skip_taskbar != -1) ---- self->skip_taskbar = !!settings->skip_taskbar; ---- ---- if (settings->max_vert != -1) ---- self->max_vert = !!settings->max_vert; ---- if (settings->max_horz != -1) ---- self->max_horz = !!settings->max_horz; ---- ---- if (settings->fullscreen != -1) ---- self->fullscreen = !!settings->fullscreen; ---- ---- if (settings->desktop) { ---- if (settings->desktop == DESKTOP_ALL) ---- self->desktop = settings->desktop; ---- else if (settings->desktop > 0 && ---- settings->desktop <= screen_num_desktops) ---- self->desktop = settings->desktop - 1; ---- } ---- ---- if (settings->layer == -1) { ---- self->below = TRUE; ---- self->above = FALSE; ---- } ---- else if (settings->layer == 0) { ---- self->below = FALSE; ---- self->above = FALSE; ---- } ---- else if (settings->layer == 1) { ---- self->below = FALSE; ---- self->above = TRUE; ---- } ---- return settings; ----} ---- ----static void client_restore_session_state(ObClient *self) ----{ ---- GList *it; ---- ---- ob_debug_type(OB_DEBUG_SM, ---- "Restore session for client %s", self->title); ---- ---- if (!(it = session_state_find(self))) { ---- ob_debug_type(OB_DEBUG_SM, ---- "Session data not found for client %s", self->title); ---- return; ---- } ---- ---- self->session = it->data; ---- ---- ob_debug_type(OB_DEBUG_SM, "Session data loaded for client %s", ---- self->title); ---- ---- RECT_SET_POINT(self->area, self->session->x, self->session->y); ---- self->positioned = USPosition; ---- self->sized = USSize; ---- if (self->session->w > 0) ---- self->area.width = self->session->w; ---- if (self->session->h > 0) ---- self->area.height = self->session->h; ---- XResizeWindow(obt_display, self->window, ---- self->area.width, self->area.height); ---- ---- self->desktop = (self->session->desktop == DESKTOP_ALL ? ---- self->session->desktop : ---- MIN(screen_num_desktops - 1, self->session->desktop)); ---- OBT_PROP_SET32(self->window, NET_WM_DESKTOP, CARDINAL, self->desktop); ---- ---- self->shaded = self->session->shaded; ---- self->iconic = self->session->iconic; ---- self->skip_pager = self->session->skip_pager; ---- self->skip_taskbar = self->session->skip_taskbar; ---- self->fullscreen = self->session->fullscreen; ---- self->above = self->session->above; ---- self->below = self->session->below; ---- self->max_horz = self->session->max_horz; ---- self->max_vert = self->session->max_vert; ---- self->undecorated = self->session->undecorated; ----} ---- ----static gboolean client_restore_session_stacking(ObClient *self) ----{ ---- GList *it, *mypos; ---- ---- if (!self->session) return FALSE; ---- ---- mypos = g_list_find(session_saved_state, self->session); ---- if (!mypos) return FALSE; ---- ---- /* start above me and look for the first client */ ---- for (it = g_list_previous(mypos); it; it = g_list_previous(it)) { ---- GList *cit; ---- ---- for (cit = client_list; cit; cit = g_list_next(cit)) { ---- ObClient *c = cit->data; ---- /* found a client that was in the session, so go below it */ ---- if (c->session == it->data) { ---- stacking_below(CLIENT_AS_WINDOW(self), ---- CLIENT_AS_WINDOW(cit->data)); ---- return TRUE; ---- } ---- } ---- } ---- return FALSE; ----} ---- ----void client_move_onscreen(ObClient *self, gboolean rude) ----{ ---- gint x = self->area.x; ---- gint y = self->area.y; ---- if (client_find_onscreen(self, &x, &y, ---- self->area.width, ---- self->area.height, rude)) { ---- client_move(self, x, y); ---- } ----} ---- ----gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, ---- gboolean rude) ----{ ---- gint ox = *x, oy = *y; ---- gboolean rudel = rude, ruder = rude, rudet = rude, rudeb = rude; ---- gint fw, fh; ---- Rect desired; ---- guint i; ---- gboolean found_mon; ---- ---- RECT_SET(desired, *x, *y, w, h); ---- frame_rect_to_frame(self->frame, &desired); ---- ---- /* get where the frame would be */ ---- frame_client_gravity(self->frame, x, y); ---- ---- /* get the requested size of the window with decorations */ ---- fw = self->frame->size.left + w + self->frame->size.right; ---- fh = self->frame->size.top + h + self->frame->size.bottom; ---- ---- /* If rudeness wasn't requested, then still be rude in a given direction ---- if the client is not moving, only resizing in that direction */ ---- if (!rude) { ---- Point oldtl, oldtr, oldbl, oldbr; ---- Point newtl, newtr, newbl, newbr; ---- gboolean stationary_l, stationary_r, stationary_t, stationary_b; ---- ---- POINT_SET(oldtl, self->frame->area.x, self->frame->area.y); ---- POINT_SET(oldbr, self->frame->area.x + self->frame->area.width - 1, ---- self->frame->area.y + self->frame->area.height - 1); ---- POINT_SET(oldtr, oldbr.x, oldtl.y); ---- POINT_SET(oldbl, oldtl.x, oldbr.y); ---- ---- POINT_SET(newtl, *x, *y); ---- POINT_SET(newbr, *x + fw - 1, *y + fh - 1); ---- POINT_SET(newtr, newbr.x, newtl.y); ---- POINT_SET(newbl, newtl.x, newbr.y); ---- ---- /* is it moving or just resizing from some corner? */ ---- stationary_l = oldtl.x == newtl.x; ---- stationary_r = oldtr.x == newtr.x; ---- stationary_t = oldtl.y == newtl.y; ---- stationary_b = oldbl.y == newbl.y; ---- ---- /* if left edge is growing and didnt move right edge */ ---- if (stationary_r && newtl.x < oldtl.x) ---- rudel = TRUE; ---- /* if right edge is growing and didnt move left edge */ ---- if (stationary_l && newtr.x > oldtr.x) ---- ruder = TRUE; ---- /* if top edge is growing and didnt move bottom edge */ ---- if (stationary_b && newtl.y < oldtl.y) ---- rudet = TRUE; ---- /* if bottom edge is growing and didnt move top edge */ ---- if (stationary_t && newbl.y > oldbl.y) ---- rudeb = TRUE; ---- } ---- ---- /* we iterate through every monitor that the window is at least partially ---- on, to make sure it is obeying the rules on them all ---- ---- if the window does not appear on any monitors, then use the first one ---- */ ---- found_mon = FALSE; ---- for (i = 0; i < screen_num_monitors; ++i) { ---- Rect *a; ---- ---- if (!screen_physical_area_monitor_contains(i, &desired)) { ---- if (i < screen_num_monitors - 1 || found_mon) ---- continue; ---- ---- /* the window is not inside any monitor! so just use the first ---- one */ ---- a = screen_area(self->desktop, 0, NULL); ---- } else { ---- found_mon = TRUE; ---- a = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, &desired); ---- } ---- ---- /* This makes sure windows aren't entirely outside of the screen so you ---- can't see them at all. ---- It makes sure 10% of the window is on the screen at least. And don't ---- let it move itself off the top of the screen, which would hide the ---- titlebar on you. (The user can still do this if they want too, it's ---- only limiting the application. ---- */ ---- if (client_normal(self)) { ---- if (!self->strut.right && *x + fw/10 >= a->x + a->width - 1) ---- *x = a->x + a->width - fw/10; ---- if (!self->strut.bottom && *y + fh/10 >= a->y + a->height - 1) ---- *y = a->y + a->height - fh/10; ---- if (!self->strut.left && *x + fw*9/10 - 1 < a->x) ---- *x = a->x - fw*9/10; ---- if (!self->strut.top && *y + fh*9/10 - 1 < a->y) ---- *y = a->y - fh*9/10; ---- } ---- ---- /* This here doesn't let windows even a pixel outside the ---- struts/screen. When called from client_manage, programs placing ---- themselves are forced completely onscreen, while things like ---- xterm -geometry resolution-width/2 will work fine. Trying to ---- place it completely offscreen will be handled in the above code. ---- Sorry for this confused comment, i am tired. */ ---- if (rudel && !self->strut.left && *x < a->x) *x = a->x; ---- if (ruder && !self->strut.right && *x + fw > a->x + a->width) ---- *x = a->x + MAX(0, a->width - fw); ---- ---- if (rudet && !self->strut.top && *y < a->y) *y = a->y; ---- if (rudeb && !self->strut.bottom && *y + fh > a->y + a->height) ---- *y = a->y + MAX(0, a->height - fh); ---- ---- g_free(a); ---- } ---- ---- /* get where the client should be */ ---- frame_frame_gravity(self->frame, x, y); ---- ---- return ox != *x || oy != *y; ----} ---- ----static void client_get_all(ObClient *self, gboolean real) ----{ ---- /* this is needed for the frame to set itself up */ ---- client_get_area(self); ---- ---- /* these things can change the decor and functions of the window */ ---- ---- client_get_mwm_hints(self); ---- /* this can change the mwmhints for special cases */ ---- client_get_type_and_transientness(self); ---- client_get_state(self); ---- client_update_normal_hints(self); ---- ---- /* get the session related properties, these can change decorations ---- from per-app settings */ ---- client_get_session_ids(self); ---- ---- /* now we got everything that can affect the decorations */ ---- if (!real) ---- return; ---- ---- /* get this early so we have it for debugging */ ---- client_update_title(self); ---- ---- client_update_protocols(self); ---- ---- client_update_wmhints(self); ---- /* this may have already been called from client_update_wmhints */ ---- if (!self->parents && !self->transient_for_group) ---- client_update_transient_for(self); ---- ---- client_get_startup_id(self); ---- client_get_desktop(self);/* uses transient data/group/startup id if a ---- desktop is not specified */ ---- client_get_shaped(self); ---- ---- { ---- /* a couple type-based defaults for new windows */ ---- ---- /* this makes sure that these windows appear on all desktops */ ---- if (self->type == OB_CLIENT_TYPE_DESKTOP) ---- self->desktop = DESKTOP_ALL; ---- } ---- ----#ifdef SYNC ---- client_update_sync_request_counter(self); ----#endif ---- ---- client_get_colormap(self); ---- client_update_strut(self); ---- client_update_icons(self); ---- client_update_icon_geometry(self); ----} ---- ----static void client_get_startup_id(ObClient *self) ----{ ---- if (!(OBT_PROP_GETS(self->window, NET_STARTUP_ID, utf8, ---- &self->startup_id))) ---- if (self->group) ---- OBT_PROP_GETS(self->group->leader, ---- NET_STARTUP_ID, utf8, &self->startup_id); ----} ---- ----static void client_get_area(ObClient *self) ----{ ---- XWindowAttributes wattrib; ---- Status ret; ---- ---- ret = XGetWindowAttributes(obt_display, self->window, &wattrib); ---- g_assert(ret != BadWindow); ---- ---- RECT_SET(self->area, wattrib.x, wattrib.y, wattrib.width, wattrib.height); ---- POINT_SET(self->root_pos, wattrib.x, wattrib.y); ---- self->border_width = wattrib.border_width; ---- ---- ob_debug("client area: %d %d %d %d bw %d", wattrib.x, wattrib.y, ---- wattrib.width, wattrib.height, wattrib.border_width); ----} ---- ----static void client_get_desktop(ObClient *self) ----{ ---- guint32 d = screen_num_desktops; /* an always-invalid value */ ---- ---- if (OBT_PROP_GET32(self->window, NET_WM_DESKTOP, CARDINAL, &d)) { ---- if (d >= screen_num_desktops && d != DESKTOP_ALL) ---- self->desktop = screen_num_desktops - 1; ---- else ---- self->desktop = d; ---- ob_debug("client requested desktop 0x%x", self->desktop); ---- } else { ---- GSList *it; ---- gboolean first = TRUE; ---- guint all = screen_num_desktops; /* not a valid value */ ---- ---- /* if they are all on one desktop, then open it on the ---- same desktop */ ---- for (it = self->parents; it; it = g_slist_next(it)) { ---- ObClient *c = it->data; ---- ---- if (c->desktop == DESKTOP_ALL) continue; ---- ---- if (first) { ---- all = c->desktop; ---- first = FALSE; ---- } ---- else if (all != c->desktop) ---- all = screen_num_desktops; /* make it invalid */ ---- } ---- if (all != screen_num_desktops) { ---- self->desktop = all; ---- ---- ob_debug("client desktop set from parents: 0x%x", ---- self->desktop); ---- } ---- /* try get from the startup-notification protocol */ ---- else if (sn_get_desktop(self->startup_id, &self->desktop)) { ---- if (self->desktop >= screen_num_desktops && ---- self->desktop != DESKTOP_ALL) ---- self->desktop = screen_num_desktops - 1; ---- ob_debug("client desktop set from startup-notification: 0x%x", ---- self->desktop); ---- } ---- /* defaults to the current desktop */ ---- else { ---- self->desktop = screen_desktop; ---- ob_debug("client desktop set to the current desktop: %d", ---- self->desktop); ---- } ---- } ----} ---- ----static void client_get_state(ObClient *self) ----{ ---- guint32 *state; ---- guint num; ---- ---- if (OBT_PROP_GETA32(self->window, NET_WM_STATE, ATOM, &state, &num)) { ---- gulong i; ---- for (i = 0; i < num; ++i) { ---- if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_MODAL)) ---- self->modal = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_SHADED)) ---- self->shaded = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_HIDDEN)) ---- self->iconic = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR)) ---- self->skip_taskbar = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER)) ---- self->skip_pager = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN)) ---- self->fullscreen = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT)) ---- self->max_vert = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ)) ---- self->max_horz = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_ABOVE)) ---- self->above = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_BELOW)) ---- self->below = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION)) ---- self->demands_attention = TRUE; ---- else if (state[i] == OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED)) ---- self->undecorated = TRUE; - else if (state[i] == OBT_PROP_ATOM(OB_WM_STATE_LOCKED)) - self->locked = TRUE; ---- } ---- ---- g_free(state); ---- } ----} ---- ----static void client_get_shaped(ObClient *self) ----{ ---- self->shaped = FALSE; ----#ifdef SHAPE ---- if (obt_display_extension_shape) { ---- gint foo; ---- guint ufoo; ---- gint s; ---- ---- XShapeSelectInput(obt_display, self->window, ShapeNotifyMask); ---- ---- XShapeQueryExtents(obt_display, self->window, &s, &foo, ---- &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, ---- &ufoo); ---- self->shaped = !!s; ---- } ----#endif ----} ---- ----void client_update_transient_for(ObClient *self) ----{ ---- Window t = None; ---- ObClient *target = NULL; ---- gboolean trangroup = FALSE; ---- ---- if (XGetTransientForHint(obt_display, self->window, &t)) { ---- if (t != self->window) { /* can't be transient to itself! */ ---- ObWindow *tw = window_find(t); ---- /* if this happens then we need to check for it */ ---- g_assert(tw != CLIENT_AS_WINDOW(self)); ---- if (tw && WINDOW_IS_CLIENT(tw)) { ---- /* watch out for windows with a parent that is something ---- different, like a dockapp for example */ ---- target = WINDOW_AS_CLIENT(tw); ---- } ---- } ---- ---- /* Setting the transient_for to Root is actually illegal, however ---- applications from time have done this to specify transient for ---- their group */ ---- if (!target && self->group && t == obt_root(ob_screen)) ---- trangroup = TRUE; ---- } else if (self->group && self->transient) ---- trangroup = TRUE; ---- ---- client_update_transient_tree(self, self->group, self->group, ---- self->transient_for_group, trangroup, ---- client_direct_parent(self), target); ---- self->transient_for_group = trangroup; ---- ----} ---- ----static void client_update_transient_tree(ObClient *self, ---- ObGroup *oldgroup, ObGroup *newgroup, ---- gboolean oldgtran, gboolean newgtran, ---- ObClient* oldparent, ---- ObClient *newparent) ----{ ---- GSList *it, *next; ---- ObClient *c; ---- ---- g_assert(!oldgtran || oldgroup); ---- g_assert(!newgtran || newgroup); ---- g_assert((!oldgtran && !oldparent) || ---- (oldgtran && !oldparent) || ---- (!oldgtran && oldparent)); ---- g_assert((!newgtran && !newparent) || ---- (newgtran && !newparent) || ---- (!newgtran && newparent)); ---- ---- /* * * ---- Group transient windows are not allowed to have other group ---- transient windows as their children. ---- * * */ ---- ---- ---- /* No change has occured */ ---- if (oldgroup == newgroup && ---- oldgtran == newgtran && ---- oldparent == newparent) return; ---- ---- /** Remove the client from the transient tree **/ ---- ---- for (it = self->transients; it; it = next) { ---- next = g_slist_next(it); ---- c = it->data; ---- self->transients = g_slist_delete_link(self->transients, it); ---- c->parents = g_slist_remove(c->parents, self); ---- } ---- for (it = self->parents; it; it = next) { ---- next = g_slist_next(it); ---- c = it->data; ---- self->parents = g_slist_delete_link(self->parents, it); ---- c->transients = g_slist_remove(c->transients, self); ---- } ---- ---- /** Re-add the client to the transient tree **/ ---- ---- /* If we're transient for a group then we need to add ourselves to all our ---- parents */ ---- if (newgtran) { ---- for (it = newgroup->members; it; it = g_slist_next(it)) { ---- c = it->data; ---- if (c != self && ---- !client_search_top_direct_parent(c)->transient_for_group && ---- client_normal(c)) ---- { ---- c->transients = g_slist_prepend(c->transients, self); ---- self->parents = g_slist_prepend(self->parents, c); ---- } ---- } ---- } ---- ---- /* If we are now transient for a single window we need to add ourselves to ---- its children ---- ---- WARNING: Cyclical transient-ness is possible if two windows are ---- transient for eachother. ---- */ ---- else if (newparent && ---- /* don't make ourself its child if it is already our child */ ---- !client_is_direct_child(self, newparent) && ---- client_normal(newparent)) ---- { ---- newparent->transients = g_slist_prepend(newparent->transients, self); ---- self->parents = g_slist_prepend(self->parents, newparent); ---- } ---- ---- /* Add any group transient windows to our children. But if we're transient ---- for the group, then other group transients are not our children. ---- ---- WARNING: Cyclical transient-ness is possible. For e.g. if: ---- A is transient for the group ---- B is transient for A ---- C is transient for B ---- A can't be transient for C or we have a cycle ---- */ ---- if (!newgtran && newgroup && ---- (!newparent || ---- !client_search_top_direct_parent(newparent)->transient_for_group) && ---- client_normal(self)) ---- { ---- for (it = newgroup->members; it; it = g_slist_next(it)) { ---- c = it->data; ---- if (c != self && c->transient_for_group && ---- /* Don't make it our child if it is already our parent */ ---- !client_is_direct_child(c, self)) ---- { ---- self->transients = g_slist_prepend(self->transients, c); ---- c->parents = g_slist_prepend(c->parents, self); ---- } ---- } ---- } ---- ---- /** If we change our group transient-ness, our children change their ---- effective group transient-ness, which affects how they relate to other ---- group windows **/ ---- ---- for (it = self->transients; it; it = g_slist_next(it)) { ---- c = it->data; ---- if (!c->transient_for_group) ---- client_update_transient_tree(c, c->group, c->group, ---- c->transient_for_group, ---- c->transient_for_group, ---- client_direct_parent(c), ---- client_direct_parent(c)); ---- } ----} ---- ----static void client_get_mwm_hints(ObClient *self) ----{ ---- guint num; ---- guint32 *hints; ---- ---- self->mwmhints.flags = 0; /* default to none */ ---- ---- if (OBT_PROP_GETA32(self->window, MOTIF_WM_HINTS, MOTIF_WM_HINTS, ---- &hints, &num)) { ---- if (num >= OB_MWM_ELEMENTS) { ---- self->mwmhints.flags = hints[0]; ---- self->mwmhints.functions = hints[1]; ---- self->mwmhints.decorations = hints[2]; ---- } ---- g_free(hints); ---- } ----} ---- ----void client_get_type_and_transientness(ObClient *self) ----{ ---- guint num, i; ---- guint32 *val; ---- Window t; ---- ---- self->type = -1; ---- self->transient = FALSE; ---- ---- if (OBT_PROP_GETA32(self->window, NET_WM_WINDOW_TYPE, ATOM, &val, &num)) { ---- /* use the first value that we know about in the array */ ---- for (i = 0; i < num; ++i) { ---- if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DESKTOP)) ---- self->type = OB_CLIENT_TYPE_DESKTOP; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK)) ---- self->type = OB_CLIENT_TYPE_DOCK; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_TOOLBAR)) ---- self->type = OB_CLIENT_TYPE_TOOLBAR; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_MENU)) ---- self->type = OB_CLIENT_TYPE_MENU; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_UTILITY)) ---- self->type = OB_CLIENT_TYPE_UTILITY; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_SPLASH)) ---- self->type = OB_CLIENT_TYPE_SPLASH; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG)) ---- self->type = OB_CLIENT_TYPE_DIALOG; ---- else if (val[i] == OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_NORMAL)) ---- self->type = OB_CLIENT_TYPE_NORMAL; ---- else if (val[i] == OBT_PROP_ATOM(KDE_NET_WM_WINDOW_TYPE_OVERRIDE)) ---- { ---- /* prevent this window from getting any decor or ---- functionality */ ---- self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS | ---- OB_MWM_FLAG_DECORATIONS); ---- self->mwmhints.decorations = 0; ---- self->mwmhints.functions = 0; ---- } ---- if (self->type != (ObClientType) -1) ---- break; /* grab the first legit type */ ---- } ---- g_free(val); ---- } ---- ---- if (XGetTransientForHint(obt_display, self->window, &t)) ---- self->transient = TRUE; ---- ---- if (self->type == (ObClientType) -1) { ---- /*the window type hint was not set, which means we either classify ---- ourself as a normal window or a dialog, depending on if we are a ---- transient. */ ---- if (self->transient) ---- self->type = OB_CLIENT_TYPE_DIALOG; ---- else ---- self->type = OB_CLIENT_TYPE_NORMAL; ---- } ---- ---- /* then, based on our type, we can update our transientness.. */ ---- if (self->type == OB_CLIENT_TYPE_DIALOG || ---- self->type == OB_CLIENT_TYPE_TOOLBAR || ---- self->type == OB_CLIENT_TYPE_MENU || ---- self->type == OB_CLIENT_TYPE_UTILITY) ---- { ---- self->transient = TRUE; ---- } ----} ---- ----void client_update_protocols(ObClient *self) ----{ ---- guint32 *proto; ---- guint num_ret, i; ---- ---- self->focus_notify = FALSE; ---- self->delete_window = FALSE; ---- ---- if (OBT_PROP_GETA32(self->window, WM_PROTOCOLS, ATOM, &proto, &num_ret)) { ---- for (i = 0; i < num_ret; ++i) { ---- if (proto[i] == OBT_PROP_ATOM(WM_DELETE_WINDOW)) ---- /* this means we can request the window to close */ ---- self->delete_window = TRUE; ---- else if (proto[i] == OBT_PROP_ATOM(WM_TAKE_FOCUS)) ---- /* if this protocol is requested, then the window will be ---- notified whenever we want it to receive focus */ ---- self->focus_notify = TRUE; ---- else if (proto[i] == OBT_PROP_ATOM(NET_WM_PING)) ---- /* if this protocol is requested, then the window will allow ---- pings to determine if it is still alive */ ---- self->ping = TRUE; ----#ifdef SYNC ---- else if (proto[i] == OBT_PROP_ATOM(NET_WM_SYNC_REQUEST)) ---- /* if this protocol is requested, then resizing the ---- window will be synchronized between the frame and the ---- client */ ---- self->sync_request = TRUE; ----#endif ---- } ---- g_free(proto); ---- } ----} ---- ----#ifdef SYNC ----void client_update_sync_request_counter(ObClient *self) ----{ ---- guint32 i; ---- ---- if (OBT_PROP_GET32(self->window, NET_WM_SYNC_REQUEST_COUNTER, CARDINAL,&i)) ---- { ---- self->sync_counter = i; ---- } else ---- self->sync_counter = None; ----} ----#endif ---- ----static void client_get_colormap(ObClient *self) ----{ ---- XWindowAttributes wa; ---- ---- if (XGetWindowAttributes(obt_display, self->window, &wa)) ---- client_update_colormap(self, wa.colormap); ----} ---- ----void client_update_colormap(ObClient *self, Colormap colormap) ----{ ---- if (colormap == self->colormap) return; ---- ---- ob_debug("Setting client %s colormap: 0x%x", self->title, colormap); ---- ---- if (client_focused(self)) { ---- screen_install_colormap(self, FALSE); /* uninstall old one */ ---- self->colormap = colormap; ---- screen_install_colormap(self, TRUE); /* install new one */ ---- } else ---- self->colormap = colormap; ----} ---- ----void client_update_normal_hints(ObClient *self) ----{ ---- XSizeHints size; ---- glong ret; ---- ---- /* defaults */ ---- self->min_ratio = 0.0f; ---- self->max_ratio = 0.0f; ---- SIZE_SET(self->size_inc, 1, 1); ---- SIZE_SET(self->base_size, -1, -1); ---- SIZE_SET(self->min_size, 0, 0); ---- SIZE_SET(self->max_size, G_MAXINT, G_MAXINT); ---- ---- /* get the hints from the window */ ---- if (XGetWMNormalHints(obt_display, self->window, &size, &ret)) { ---- /* normal windows can't request placement! har har ---- if (!client_normal(self)) ---- */ ---- self->positioned = (size.flags & (PPosition|USPosition)); ---- self->sized = (size.flags & (PSize|USSize)); ---- ---- if (size.flags & PWinGravity) ---- self->gravity = size.win_gravity; ---- ---- if (size.flags & PAspect) { ---- if (size.min_aspect.y) ---- self->min_ratio = ---- (gfloat) size.min_aspect.x / size.min_aspect.y; ---- if (size.max_aspect.y) ---- self->max_ratio = ---- (gfloat) size.max_aspect.x / size.max_aspect.y; ---- } ---- ---- if (size.flags & PMinSize) ---- SIZE_SET(self->min_size, size.min_width, size.min_height); ---- ---- if (size.flags & PMaxSize) ---- SIZE_SET(self->max_size, size.max_width, size.max_height); ---- ---- if (size.flags & PBaseSize) ---- SIZE_SET(self->base_size, size.base_width, size.base_height); ---- ---- if (size.flags & PResizeInc && size.width_inc && size.height_inc) ---- SIZE_SET(self->size_inc, size.width_inc, size.height_inc); ---- ---- ob_debug("Normal hints: min size (%d %d) max size (%d %d)", ---- self->min_size.width, self->min_size.height, ---- self->max_size.width, self->max_size.height); ---- ob_debug("size inc (%d %d) base size (%d %d)", ---- self->size_inc.width, self->size_inc.height, ---- self->base_size.width, self->base_size.height); ---- } ---- else ---- ob_debug("Normal hints: not set"); ----} ---- ----void client_setup_decor_and_functions(ObClient *self, gboolean reconfig) ----{ ---- /* start with everything (cept fullscreen) */ ---- self->decorations = ---- (OB_FRAME_DECOR_TITLEBAR | ---- OB_FRAME_DECOR_HANDLE | ---- OB_FRAME_DECOR_GRIPS | ---- OB_FRAME_DECOR_BORDER | ---- OB_FRAME_DECOR_ICON | ---- OB_FRAME_DECOR_ALLDESKTOPS | ---- OB_FRAME_DECOR_ICONIFY | ---- OB_FRAME_DECOR_MAXIMIZE | ---- OB_FRAME_DECOR_SHADE | ---- OB_FRAME_DECOR_CLOSE); ---- self->functions = ---- (OB_CLIENT_FUNC_RESIZE | ---- OB_CLIENT_FUNC_MOVE | ---- OB_CLIENT_FUNC_ICONIFY | ---- OB_CLIENT_FUNC_MAXIMIZE | ---- OB_CLIENT_FUNC_SHADE | ---- OB_CLIENT_FUNC_CLOSE | ---- OB_CLIENT_FUNC_BELOW | ---- OB_CLIENT_FUNC_ABOVE | ---- OB_CLIENT_FUNC_UNDECORATE); ---- ---- if (!(self->min_size.width < self->max_size.width || ---- self->min_size.height < self->max_size.height)) ---- self->functions &= ~OB_CLIENT_FUNC_RESIZE; ---- ---- switch (self->type) { ---- case OB_CLIENT_TYPE_NORMAL: ---- /* normal windows retain all of the possible decorations and ---- functionality, and can be fullscreen */ ---- self->functions |= OB_CLIENT_FUNC_FULLSCREEN; ---- break; ---- ---- case OB_CLIENT_TYPE_DIALOG: ---- /* sometimes apps make dialog windows fullscreen for some reason (for ---- e.g. kpdf does this..) */ ---- self->functions |= OB_CLIENT_FUNC_FULLSCREEN; ---- break; ---- ---- case OB_CLIENT_TYPE_UTILITY: ---- /* these windows don't have anything added or removed by default */ ---- break; ---- ---- case OB_CLIENT_TYPE_MENU: ---- case OB_CLIENT_TYPE_TOOLBAR: ---- /* these windows can't iconify or maximize */ ---- self->decorations &= ~(OB_FRAME_DECOR_ICONIFY | ---- OB_FRAME_DECOR_MAXIMIZE); ---- self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | ---- OB_CLIENT_FUNC_MAXIMIZE); ---- break; ---- ---- case OB_CLIENT_TYPE_SPLASH: ---- /* these don't get get any decorations, and the only thing you can ---- do with them is move them */ ---- self->decorations = 0; ---- self->functions = OB_CLIENT_FUNC_MOVE; ---- break; ---- ---- case OB_CLIENT_TYPE_DESKTOP: ---- /* these windows are not manipulated by the window manager */ ---- self->decorations = 0; ---- self->functions = 0; ---- break; ---- ---- case OB_CLIENT_TYPE_DOCK: ---- /* these windows are not manipulated by the window manager, but they ---- can set below layer which has a special meaning */ ---- self->decorations = 0; ---- self->functions = OB_CLIENT_FUNC_BELOW; ---- break; ---- } ---- ---- /* Mwm Hints are applied subtractively to what has already been chosen for ---- decor and functionality */ ---- if (self->mwmhints.flags & OB_MWM_FLAG_DECORATIONS) { ---- if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) { ---- if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) || ---- (self->mwmhints.decorations & OB_MWM_DECOR_TITLE))) ---- { ---- /* if the mwm hints request no handle or title, then all ---- decorations are disabled, but keep the border if that's ---- specified */ ---- if (self->mwmhints.decorations & OB_MWM_DECOR_BORDER) ---- self->decorations = OB_FRAME_DECOR_BORDER; ---- else ---- self->decorations = 0; ---- } ---- } ---- } ---- ---- if (self->mwmhints.flags & OB_MWM_FLAG_FUNCTIONS) { ---- if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) { ---- if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE)) ---- self->functions &= ~OB_CLIENT_FUNC_RESIZE; ---- if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE)) ---- self->functions &= ~OB_CLIENT_FUNC_MOVE; ---- /* dont let mwm hints kill any buttons ---- if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY)) ---- self->functions &= ~OB_CLIENT_FUNC_ICONIFY; ---- if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE)) ---- self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; ---- */ ---- /* dont let mwm hints kill the close button ---- if (! (self->mwmhints.functions & MwmFunc_Close)) ---- self->functions &= ~OB_CLIENT_FUNC_CLOSE; */ ---- } ---- } ---- ---- if (!(self->functions & OB_CLIENT_FUNC_SHADE)) ---- self->decorations &= ~OB_FRAME_DECOR_SHADE; ---- if (!(self->functions & OB_CLIENT_FUNC_ICONIFY)) ---- self->decorations &= ~OB_FRAME_DECOR_ICONIFY; ---- if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) ---- self->decorations &= ~(OB_FRAME_DECOR_GRIPS | OB_FRAME_DECOR_HANDLE); ---- ---- /* can't maximize without moving/resizing */ ---- if (!((self->functions & OB_CLIENT_FUNC_MAXIMIZE) && ---- (self->functions & OB_CLIENT_FUNC_MOVE) && ---- (self->functions & OB_CLIENT_FUNC_RESIZE))) { ---- self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; ---- self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE; ---- } ---- ---- if (self->max_horz && self->max_vert) { ---- /* you can't resize fully maximized windows */ ---- self->functions &= ~OB_CLIENT_FUNC_RESIZE; ---- /* kill the handle on fully maxed windows */ ---- self->decorations &= ~(OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS); ---- } ---- ---- /* If there are no decorations to remove, don't allow the user to try ---- toggle the state */ ---- if (self->decorations == 0) ---- self->functions &= ~OB_CLIENT_FUNC_UNDECORATE; ---- ---- /* finally, the user can have requested no decorations, which overrides ---- everything (but doesnt give it a border if it doesnt have one) */ ---- if (self->undecorated) ---- self->decorations = 0; ---- ---- /* if we don't have a titlebar, then we cannot shade! */ ---- if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) ---- self->functions &= ~OB_CLIENT_FUNC_SHADE; ---- ---- /* now we need to check against rules for the client's current state */ ---- if (self->fullscreen) { ---- self->functions &= (OB_CLIENT_FUNC_CLOSE | ---- OB_CLIENT_FUNC_FULLSCREEN | ---- OB_CLIENT_FUNC_ICONIFY); ---- self->decorations = 0; ---- } ---- ---- client_change_allowed_actions(self); ---- ---- if (reconfig) ---- /* force reconfigure to make sure decorations are updated */ ---- client_reconfigure(self, TRUE); ----} ---- ----static void client_change_allowed_actions(ObClient *self) ----{ ---- gulong actions[12]; ---- gint num = 0; ---- ---- /* desktop windows are kept on all desktops */ ---- if (self->type != OB_CLIENT_TYPE_DESKTOP) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_CHANGE_DESKTOP); ---- ---- if (self->functions & OB_CLIENT_FUNC_SHADE) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_SHADE); ---- if (self->functions & OB_CLIENT_FUNC_CLOSE) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_CLOSE); ---- if (self->functions & OB_CLIENT_FUNC_MOVE) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_MOVE); ---- if (self->functions & OB_CLIENT_FUNC_ICONIFY) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_MINIMIZE); ---- if (self->functions & OB_CLIENT_FUNC_RESIZE) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_RESIZE); ---- if (self->functions & OB_CLIENT_FUNC_FULLSCREEN) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_FULLSCREEN); ---- if (self->functions & OB_CLIENT_FUNC_MAXIMIZE) { ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_MAXIMIZE_HORZ); ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_MAXIMIZE_VERT); ---- } ---- if (self->functions & OB_CLIENT_FUNC_ABOVE) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_ABOVE); ---- if (self->functions & OB_CLIENT_FUNC_BELOW) ---- actions[num++] = OBT_PROP_ATOM(NET_WM_ACTION_BELOW); ---- if (self->functions & OB_CLIENT_FUNC_UNDECORATE) ---- actions[num++] = OBT_PROP_ATOM(OB_WM_ACTION_UNDECORATE); ---- ---- OBT_PROP_SETA32(self->window, NET_WM_ALLOWED_ACTIONS, ATOM, actions, num); ---- ---- /* make sure the window isn't breaking any rules now ---- ---- don't check ICONIFY here. just cuz a window can't iconify doesnt mean ---- it can't be iconified with its parent ---- */ ---- ---- if (!(self->functions & OB_CLIENT_FUNC_SHADE) && self->shaded) { ---- if (self->frame) client_shade(self, FALSE); ---- else self->shaded = FALSE; ---- } ---- if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) && self->fullscreen) { ---- if (self->frame) client_fullscreen(self, FALSE); ---- else self->fullscreen = FALSE; ---- } ---- if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE) && (self->max_horz || ---- self->max_vert)) { ---- if (self->frame) client_maximize(self, FALSE, 0); ---- else self->max_vert = self->max_horz = FALSE; ---- } ----} ---- ----void client_update_wmhints(ObClient *self) ----{ ---- XWMHints *hints; ---- ---- /* assume a window takes input if it doesn't specify */ ---- self->can_focus = TRUE; ---- ---- if ((hints = XGetWMHints(obt_display, self->window)) != NULL) { ---- gboolean ur; ---- ---- if (hints->flags & InputHint) ---- self->can_focus = hints->input; ---- ---- /* only do this when first managing the window *AND* when we aren't ---- starting up! */ ---- if (ob_state() != OB_STATE_STARTING && self->frame == NULL) ---- if (hints->flags & StateHint) ---- self->iconic = hints->initial_state == IconicState; ---- ---- ur = self->urgent; ---- self->urgent = (hints->flags & XUrgencyHint); ---- if (self->urgent && !ur) ---- client_hilite(self, TRUE); ---- else if (!self->urgent && ur && self->demands_attention) ---- client_hilite(self, FALSE); ---- ---- if (!(hints->flags & WindowGroupHint)) ---- hints->window_group = None; ---- ---- /* did the group state change? */ ---- if (hints->window_group != ---- (self->group ? self->group->leader : None)) ---- { ---- ObGroup *oldgroup = self->group; ---- ---- /* remove from the old group if there was one */ ---- if (self->group) { ---- group_remove(self->group, self); ---- self->group = NULL; ---- } ---- ---- /* add ourself to the group if we have one */ ---- if (hints->window_group != None) { ---- self->group = group_add(hints->window_group, self); ---- } ---- ---- /* Put ourselves into the new group's transient tree, and remove ---- ourselves from the old group's */ ---- client_update_transient_tree(self, oldgroup, self->group, ---- self->transient_for_group, ---- self->transient_for_group, ---- client_direct_parent(self), ---- client_direct_parent(self)); ---- ---- /* Lastly, being in a group, or not, can change if the window is ---- transient for anything. ---- ---- The logic for this is: ---- self->transient = TRUE always if the window wants to be ---- transient for something, even if transient_for was NULL because ---- it wasn't in a group before. ---- ---- If parents was NULL and oldgroup was NULL we can assume ---- that when we add the new group, it will become transient for ---- something. ---- ---- If transient_for_group is TRUE, then it must have already ---- had a group. If it is getting a new group, the above call to ---- client_update_transient_tree has already taken care of ---- everything ! If it is losing all group status then it will ---- no longer be transient for anything and that needs to be ---- updated. ---- */ ---- if (self->transient && ---- ((self->parents == NULL && oldgroup == NULL) || ---- (self->transient_for_group && !self->group))) ---- client_update_transient_for(self); ---- } ---- ---- /* the WM_HINTS can contain an icon */ ---- if (hints->flags & IconPixmapHint) ---- client_update_icons(self); ---- ---- XFree(hints); ---- } ----} ---- ----void client_update_title(ObClient *self) ----{ ---- gchar *data = NULL; ---- gchar *visible = NULL; ---- - -- g_free(self->title); ---- g_free(self->original_title); ---- ---- /* try netwm */ ---- if (!OBT_PROP_GETS(self->window, NET_WM_NAME, utf8, &data)) { ---- /* try old x stuff */ ---- if (!(OBT_PROP_GETS(self->window, WM_NAME, locale, &data) ---- || OBT_PROP_GETS(self->window, WM_NAME, utf8, &data))) { ---- if (self->transient) { ---- /* ---- GNOME alert windows are not given titles: ---- http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html ---- */ ---- data = g_strdup(""); ---- } else ---- data = g_strdup(_("Unnamed Window")); ---- } ---- } ---- self->original_title = g_strdup(data); ---- ---- if (self->client_machine) { ---- visible = g_strdup_printf("%s (%s)", data, self->client_machine); ---- g_free(data); ---- } else ---- visible = data; ---- ---- if (self->not_responding) { ---- data = visible; ---- if (self->kill_level > 0) ---- visible = g_strdup_printf("%s - [%s]", data, _("Killing...")); ---- else ---- visible = g_strdup_printf("%s - [%s]", data, _("Not Responding")); ---- g_free(data); ---- } ---- - -- OBT_PROP_SETS(self->window, NET_WM_VISIBLE_NAME, utf8, visible); - -- self->title = visible; - if (!self->title || strcmp(self->title, visible)) { - OBT_PROP_SETS(self->window, NET_WM_VISIBLE_NAME, utf8, visible); - g_free(self->title); - self->title = visible; - } else - g_free(visible); ---- ---- if (self->frame) ---- frame_adjust_title(self->frame); ---- ---- /* update the icon title */ ---- data = NULL; - -- g_free(self->icon_title); ---- ---- /* try netwm */ ---- if (!OBT_PROP_GETS(self->window, NET_WM_ICON_NAME, utf8, &data)) ---- /* try old x stuff */ ---- if (!(OBT_PROP_GETS(self->window, WM_ICON_NAME, locale, &data) || ---- OBT_PROP_GETS(self->window, WM_ICON_NAME, utf8, &data))) ---- data = g_strdup(self->title); ---- ---- if (self->client_machine) { ---- visible = g_strdup_printf("%s (%s)", data, self->client_machine); ---- g_free(data); ---- } else ---- visible = data; ---- ---- if (self->not_responding) { ---- data = visible; ---- if (self->kill_level > 0) ---- visible = g_strdup_printf("%s - [%s]", data, _("Killing...")); ---- else ---- visible = g_strdup_printf("%s - [%s]", data, _("Not Responding")); ---- g_free(data); ---- } ---- - -- OBT_PROP_SETS(self->window, NET_WM_VISIBLE_ICON_NAME, utf8, visible); - -- self->icon_title = visible; - if (!self->icon_title || strcmp(self->icon_title, visible)) { - OBT_PROP_SETS(self->window, NET_WM_VISIBLE_ICON_NAME, utf8, visible); - g_free(self->icon_title); - self->icon_title = visible; - } else - g_free(visible); ----} ---- ----void client_update_strut(ObClient *self) ----{ ---- guint num; ---- guint32 *data; ---- gboolean got = FALSE; ---- StrutPartial strut; ---- ---- if (OBT_PROP_GETA32(self->window, NET_WM_STRUT_PARTIAL, CARDINAL, ---- &data, &num)) ---- { ---- if (num == 12) { ---- got = TRUE; ---- STRUT_PARTIAL_SET(strut, ---- data[0], data[2], data[1], data[3], ---- data[4], data[5], data[8], data[9], ---- data[6], data[7], data[10], data[11]); ---- } ---- g_free(data); ---- } ---- ---- if (!got && ---- OBT_PROP_GETA32(self->window, NET_WM_STRUT, CARDINAL, &data, &num)) { ---- if (num == 4) { ---- Rect *a; ---- ---- got = TRUE; ---- ---- /* use the screen's width/height */ ---- a = screen_physical_area_all_monitors(); ---- ---- STRUT_PARTIAL_SET(strut, ---- data[0], data[2], data[1], data[3], ---- a->y, a->y + a->height - 1, ---- a->x, a->x + a->width - 1, ---- a->y, a->y + a->height - 1, ---- a->x, a->x + a->width - 1); ---- g_free(a); ---- } ---- g_free(data); ---- } ---- ---- if (!got) ---- STRUT_PARTIAL_SET(strut, 0, 0, 0, 0, ---- 0, 0, 0, 0, 0, 0, 0, 0); ---- ---- if (!STRUT_EQUAL(strut, self->strut)) { ---- self->strut = strut; ---- ---- /* updating here is pointless while we're being mapped cuz we're not in ---- the client list yet */ ---- if (self->frame) ---- screen_update_areas(); ---- } ----} ---- ----void client_update_icons(ObClient *self) ----{ ---- guint num; ---- guint32 *data; ---- guint w, h, i, j; ---- guint num_seen; /* number of icons present */ ---- RrImage *img; ---- ---- img = NULL; ---- ---- /* grab the server, because we might be setting the window's icon and ---- we don't want them to set it in between and we overwrite their own ---- icon */ ---- grab_server(TRUE); ---- ---- if (OBT_PROP_GETA32(self->window, NET_WM_ICON, CARDINAL, &data, &num)) { ---- /* figure out how many valid icons are in here */ ---- i = 0; ---- num_seen = 0; ---- while (i + 2 < num) { /* +2 is to make sure there is a w and h */ ---- w = data[i++]; ---- h = data[i++]; ---- /* watch for the data being too small for the specified size, ---- or for zero sized icons. */ ---- if (i + w*h > num || w == 0 || h == 0) break; ---- ---- /* convert it to the right bit order for ObRender */ ---- for (j = 0; j < w*h; ++j) ---- data[i+j] = ---- (((data[i+j] >> 24) & 0xff) << RrDefaultAlphaOffset) + ---- (((data[i+j] >> 16) & 0xff) << RrDefaultRedOffset) + ---- (((data[i+j] >> 8) & 0xff) << RrDefaultGreenOffset) + ---- (((data[i+j] >> 0) & 0xff) << RrDefaultBlueOffset); ---- ---- /* is it in the cache? */ ---- img = RrImageCacheFind(ob_rr_icons, &data[i], w, h); ---- if (img) RrImageRef(img); /* own it */ ---- ---- i += w*h; ---- ++num_seen; ---- ---- /* don't bother looping anymore if we already found it in the cache ---- since we'll just use that! */ ---- if (img) break; ---- } ---- ---- /* if it's not in the cache yet, then add it to the cache now. ---- we have already converted it to the correct bit order above */ ---- if (!img && num_seen > 0) { ---- img = RrImageNew(ob_rr_icons); ---- i = 0; ---- for (j = 0; j < num_seen; ++j) { ---- w = data[i++]; ---- h = data[i++]; ---- RrImageAddPicture(img, &data[i], w, h); ---- i += w*h; ---- } ---- } ---- ---- g_free(data); ---- } ---- ---- /* if we didn't find an image from the NET_WM_ICON stuff, then try the ---- legacy X hints */ ---- if (!img) { ---- XWMHints *hints; ---- ---- if ((hints = XGetWMHints(obt_display, self->window))) { ---- if (hints->flags & IconPixmapHint) { ---- gboolean xicon; ---- obt_display_ignore_errors(TRUE); ---- xicon = RrPixmapToRGBA(ob_rr_inst, ---- hints->icon_pixmap, ---- (hints->flags & IconMaskHint ? ---- hints->icon_mask : None), ---- (gint*)&w, (gint*)&h, &data); ---- obt_display_ignore_errors(FALSE); ---- ---- ---- if (xicon) { ---- if (w > 0 && h > 0) { ---- /* is this icon in the cache yet? */ ---- img = RrImageCacheFind(ob_rr_icons, data, w, h); ---- if (img) RrImageRef(img); /* own it */ ---- ---- /* if not, then add it */ ---- if (!img) { ---- img = RrImageNew(ob_rr_icons); ---- RrImageAddPicture(img, data, w, h); ---- } ---- } ---- ---- g_free(data); ---- } ---- } ---- XFree(hints); ---- } ---- } ---- ---- /* set the client's icons to be whatever we found */ ---- RrImageUnref(self->icon_set); ---- self->icon_set = img; ---- ---- /* if the client has no icon at all, then we set a default icon onto it. ---- but, if it has parents, then one of them will have an icon already ---- */ ---- if (!self->icon_set && !self->parents) { ---- RrPixel32 *icon = ob_rr_theme->def_win_icon; ---- gulong *ldata; /* use a long here to satisfy OBT_PROP_SETA32 */ - gint32 r,g,b; - r = g_random_int_range(0,255); - g = g_random_int_range(0,255); - b = g_random_int_range(0,255); ---- ---- w = ob_rr_theme->def_win_icon_w; ---- h = ob_rr_theme->def_win_icon_h; ---- ldata = g_new(gulong, w*h+2); ---- ldata[0] = w; ---- ldata[1] = h; ---- for (i = 0; i < w*h; ++i) ---- ldata[i+2] = (((icon[i] >> RrDefaultAlphaOffset) & 0xff) << 24) + --- (((icon[i] >> RrDefaultRedOffset) & 0xff) << 16) + --- (((icon[i] >> RrDefaultGreenOffset) & 0xff) << 8) + --- (((icon[i] >> RrDefaultBlueOffset) & 0xff) << 0); - ((((icon[i] >> RrDefaultRedOffset) & 0xff)*r/255) << 16) + - ((((icon[i] >> RrDefaultGreenOffset) & 0xff)*g/255) << 8) + - ((((icon[i] >> RrDefaultBlueOffset) & 0xff)*b/255) << 0); ---- OBT_PROP_SETA32(self->window, NET_WM_ICON, CARDINAL, ldata, w*h+2); ---- g_free(ldata); ---- } else if (self->frame) ---- /* don't draw the icon empty if we're just setting one now anyways, ---- we'll get the property change any second */ ---- frame_adjust_icon(self->frame); ---- ---- grab_server(FALSE); ----} ---- ----void client_update_icon_geometry(ObClient *self) ----{ ---- guint num; ---- guint32 *data; ---- ---- RECT_SET(self->icon_geometry, 0, 0, 0, 0); ---- ---- if (OBT_PROP_GETA32(self->window, NET_WM_ICON_GEOMETRY, CARDINAL, ---- &data, &num)) ---- { ---- if (num == 4) ---- /* don't let them set it with an area < 0 */ ---- RECT_SET(self->icon_geometry, data[0], data[1], ---- MAX(data[2],0), MAX(data[3],0)); ---- g_free(data); ---- } ----} ---- ----static void client_get_session_ids(ObClient *self) ----{ ---- guint32 leader; ---- gboolean got; ---- gchar *s; ---- gchar **ss; ---- ---- if (!OBT_PROP_GET32(self->window, WM_CLIENT_LEADER, WINDOW, &leader)) ---- leader = None; ---- ---- /* get the SM_CLIENT_ID */ ---- got = FALSE; ---- if (leader) ---- got = OBT_PROP_GETS(leader, SM_CLIENT_ID, locale, &self->sm_client_id); ---- if (!got) ---- OBT_PROP_GETS(self->window, SM_CLIENT_ID, locale, &self->sm_client_id); ---- ---- /* get the WM_CLASS (name and class). make them "" if they are not ---- provided */ ---- got = FALSE; ---- if (leader) ---- got = OBT_PROP_GETSS(leader, WM_CLASS, locale, &ss); ---- if (!got) ---- got = OBT_PROP_GETSS(self->window, WM_CLASS, locale, &ss); ---- ---- if (got) { ---- if (ss[0]) { ---- self->name = g_strdup(ss[0]); ---- if (ss[1]) ---- self->class = g_strdup(ss[1]); ---- } ---- g_strfreev(ss); ---- } ---- ---- if (self->name == NULL) self->name = g_strdup(""); ---- if (self->class == NULL) self->class = g_strdup(""); ---- ---- /* get the WM_WINDOW_ROLE. make it "" if it is not provided */ ---- got = FALSE; ---- if (leader) ---- got = OBT_PROP_GETS(leader, WM_WINDOW_ROLE, locale, &s); ---- if (!got) ---- got = OBT_PROP_GETS(self->window, WM_WINDOW_ROLE, locale, &s); ---- ---- if (got) ---- self->role = s; ---- else ---- self->role = g_strdup(""); ---- ---- /* get the WM_COMMAND */ ---- got = FALSE; ---- ---- if (leader) ---- got = OBT_PROP_GETSS(leader, WM_COMMAND, locale, &ss); ---- if (!got) ---- got = OBT_PROP_GETSS(self->window, WM_COMMAND, locale, &ss); ---- ---- if (got) { ---- /* merge/mash them all together */ ---- gchar *merge = NULL; ---- gint i; ---- ---- for (i = 0; ss[i]; ++i) { ---- gchar *tmp = merge; ---- if (merge) ---- merge = g_strconcat(merge, ss[i], NULL); ---- else ---- merge = g_strconcat(ss[i], NULL); ---- g_free(tmp); ---- } ---- g_strfreev(ss); ---- ---- self->wm_command = merge; ---- } ---- ---- /* get the WM_CLIENT_MACHINE */ ---- got = FALSE; ---- if (leader) ---- got = OBT_PROP_GETS(leader, WM_CLIENT_MACHINE, locale, &s); ---- if (!got) ---- got = OBT_PROP_GETS(self->window, WM_CLIENT_MACHINE, locale, &s); ---- ---- if (got) { ---- gchar localhost[128]; ---- guint32 pid; ---- ---- gethostname(localhost, 127); ---- localhost[127] = '\0'; ---- if (strcmp(localhost, s) != 0) ---- self->client_machine = s; ---- else ---- g_free(s); ---- ---- /* see if it has the PID set too (the PID requires that the ---- WM_CLIENT_MACHINE be set) */ ---- if (OBT_PROP_GET32(self->window, NET_WM_PID, CARDINAL, &pid)) ---- self->pid = pid; ---- } ----} ---- ----static void client_change_wm_state(ObClient *self) ----{ ---- gulong state[2]; ---- glong old; ---- ---- old = self->wmstate; ---- ---- if (self->shaded || self->iconic || ---- (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop)) ---- { ---- self->wmstate = IconicState; ---- } else ---- self->wmstate = NormalState; ---- ---- if (old != self->wmstate) { ---- OBT_PROP_MSG(ob_screen, self->window, KDE_WM_CHANGE_STATE, ---- self->wmstate, 1, 0, 0, 0); ---- ---- state[0] = self->wmstate; ---- state[1] = None; ---- OBT_PROP_SETA32(self->window, WM_STATE, WM_STATE, state, 2); ---- } ----} ---- ----static void client_change_state(ObClient *self) ----{ - gulong netstate[13]; --- gulong netstate[12]; ---- guint num; ---- ---- num = 0; ---- if (self->modal) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_MODAL); ---- if (self->shaded) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_SHADED); ---- if (self->iconic) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_HIDDEN); ---- if (self->skip_taskbar) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR); ---- if (self->skip_pager) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER); ---- if (self->fullscreen) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN); ---- if (self->max_vert) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT); ---- if (self->max_horz) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ); ---- if (self->above) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_ABOVE); ---- if (self->below) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_BELOW); ---- if (self->demands_attention) ---- netstate[num++] = OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION); ---- if (self->undecorated) ---- netstate[num++] = OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED); - if (self->locked) - netstate[num++] = OBT_PROP_ATOM(OB_WM_STATE_LOCKED); ---- OBT_PROP_SETA32(self->window, NET_WM_STATE, ATOM, netstate, num); ---- ---- if (self->frame) ---- frame_adjust_state(self->frame); ----} ---- ----ObClient *client_search_focus_tree(ObClient *self) ----{ ---- GSList *it; ---- ObClient *ret; ---- ---- for (it = self->transients; it; it = g_slist_next(it)) { ---- if (client_focused(it->data)) return it->data; ---- if ((ret = client_search_focus_tree(it->data))) return ret; ---- } ---- return NULL; ----} ---- ----ObClient *client_search_focus_tree_full(ObClient *self) ----{ ---- if (self->parents) { ---- GSList *it; ---- ---- for (it = self->parents; it; it = g_slist_next(it)) { ---- ObClient *c = it->data; ---- if ((c = client_search_focus_tree_full(it->data))) return c; ---- } ---- ---- return NULL; ---- } ---- else { ---- /* this function checks the whole tree, the client_search_focus_tree ---- does not, so we need to check this window */ ---- if (client_focused(self)) ---- return self; ---- return client_search_focus_tree(self); ---- } ----} ---- ----ObClient *client_search_focus_group_full(ObClient *self) ----{ ---- GSList *it; ---- ---- if (self->group) { ---- for (it = self->group->members; it; it = g_slist_next(it)) { ---- ObClient *c = it->data; ---- ---- if (client_focused(c)) return c; ---- if ((c = client_search_focus_tree(it->data))) return c; ---- } ---- } else ---- if (client_focused(self)) return self; ---- return NULL; ----} ---- ----gboolean client_has_parent(ObClient *self) ----{ ---- return self->parents != NULL; ----} ---- ----static ObStackingLayer calc_layer(ObClient *self) ----{ ---- ObStackingLayer l; ---- Rect *monitor; ---- ---- monitor = screen_physical_area_monitor(client_monitor(self)); ---- ---- if (self->type == OB_CLIENT_TYPE_DESKTOP) ---- l = OB_STACKING_LAYER_DESKTOP; ---- else if (self->type == OB_CLIENT_TYPE_DOCK) { ---- if (self->below) l = OB_STACKING_LAYER_NORMAL; ---- else l = OB_STACKING_LAYER_ABOVE; ---- } ---- else if ((self->fullscreen || ---- /* No decorations and fills the monitor = oldskool fullscreen. ---- But not for maximized windows. ---- */ ---- (self->decorations == 0 && ---- !(self->max_horz && self->max_vert) && ---- RECT_EQUAL(self->area, *monitor))) && ---- /* you are fullscreen while you or your children are focused.. */ ---- (client_focused(self) || client_search_focus_tree(self) || ---- /* you can be fullscreen if you're on another desktop */ ---- (self->desktop != screen_desktop && ---- self->desktop != DESKTOP_ALL) || ---- /* and you can also be fullscreen if the focused client is on ---- another monitor, or nothing else is focused */ ---- (!focus_client || ---- client_monitor(focus_client) != client_monitor(self)))) ---- l = OB_STACKING_LAYER_FULLSCREEN; ---- else if (self->above) l = OB_STACKING_LAYER_ABOVE; ---- else if (self->below) l = OB_STACKING_LAYER_BELOW; ---- else l = OB_STACKING_LAYER_NORMAL; ---- ---- g_free(monitor); ---- ---- return l; ----} ---- ----static void client_calc_layer_recursive(ObClient *self, ObClient *orig, ---- ObStackingLayer min) ----{ ---- ObStackingLayer old, own; ---- GSList *it; ---- ---- old = self->layer; ---- own = calc_layer(self); ---- self->layer = MAX(own, min); ---- ---- if (self->layer != old) { ---- stacking_remove(CLIENT_AS_WINDOW(self)); ---- stacking_add_nonintrusive(CLIENT_AS_WINDOW(self)); ---- } ---- ---- /* we've been restacked */ ---- self->visited = TRUE; ---- ---- for (it = self->transients; it; it = g_slist_next(it)) ---- client_calc_layer_recursive(it->data, orig, ---- self->layer); ----} ---- ----static void client_calc_layer_internal(ObClient *self) ----{ ---- GSList *sit; ---- ---- /* transients take on the layer of their parents */ ---- sit = client_search_all_top_parents(self); ---- ---- for (; sit; sit = g_slist_next(sit)) ---- client_calc_layer_recursive(sit->data, self, 0); ----} ---- ----void client_calc_layer(ObClient *self) ----{ ---- GList *it; ---- ---- /* skip over stuff above fullscreen layer */ ---- for (it = stacking_list; it; it = g_list_next(it)) ---- if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; ---- ---- /* find the windows in the fullscreen layer, and mark them not-visited */ ---- for (; it; it = g_list_next(it)) { ---- if (window_layer(it->data) < OB_STACKING_LAYER_FULLSCREEN) break; ---- else if (WINDOW_IS_CLIENT(it->data)) ---- WINDOW_AS_CLIENT(it->data)->visited = FALSE; ---- } ---- ---- client_calc_layer_internal(self); ---- ---- /* skip over stuff above fullscreen layer */ ---- for (it = stacking_list; it; it = g_list_next(it)) ---- if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; ---- ---- /* now recalc any windows in the fullscreen layer which have not ---- had their layer recalced already */ ---- for (; it; it = g_list_next(it)) { ---- if (window_layer(it->data) < OB_STACKING_LAYER_FULLSCREEN) break; ---- else if (WINDOW_IS_CLIENT(it->data) && ---- !WINDOW_AS_CLIENT(it->data)->visited) ---- client_calc_layer_internal(it->data); ---- } ----} ---- ----gboolean client_should_show(ObClient *self) ----{ ---- if (self->iconic) ---- return FALSE; ---- if (client_normal(self) && screen_showing_desktop) ---- return FALSE; ---- if (self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) ---- return TRUE; ---- ---- return FALSE; ----} ---- ----gboolean client_show(ObClient *self) ----{ ---- gboolean show = FALSE; ---- ---- if (client_should_show(self)) { ---- /* replay pending pointer event before showing the window, in case it ---- should be going to something under the window */ ---- mouse_replay_pointer(); ---- ---- frame_show(self->frame); ---- show = TRUE; ---- ---- /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, ---- it needs to be in IconicState. This includes when it is on another ---- desktop! ---- */ ---- client_change_wm_state(self); ---- } ---- return show; ----} ---- ----gboolean client_hide(ObClient *self) ----{ ---- gboolean hide = FALSE; ---- ---- if (!client_should_show(self)) { ---- if (self == focus_client) { ---- event_cancel_all_key_grabs(); ---- } ---- ---- /* We don't need to ignore enter events here. ---- The window can hide/iconify in 3 different ways: ---- 1 - through an x message. in this case we ignore all enter events ---- caused by responding to the x message (unless underMouse) ---- 2 - by a keyboard action. in this case we ignore all enter events ---- caused by the action ---- 3 - by a mouse action. in this case they are doing stuff with the ---- mouse and focus _should_ move. ---- ---- Also in action_end, we simulate an enter event that can't be ignored ---- so trying to ignore them is futile in case 3 anyways ---- */ ---- ---- /* replay pending pointer event before hiding the window, in case it ---- should be going to the window */ ---- mouse_replay_pointer(); ---- ---- frame_hide(self->frame); ---- hide = TRUE; ---- ---- /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, ---- it needs to be in IconicState. This includes when it is on another ---- desktop! ---- */ ---- client_change_wm_state(self); ---- } ---- return hide; ----} ---- ----void client_showhide(ObClient *self) ----{ ---- if (!client_show(self)) ---- client_hide(self); ----} ---- ----gboolean client_normal(ObClient *self) { ---- return ! (self->type == OB_CLIENT_TYPE_DESKTOP || ---- self->type == OB_CLIENT_TYPE_DOCK || ---- self->type == OB_CLIENT_TYPE_SPLASH); ----} ---- ----gboolean client_helper(ObClient *self) ----{ ---- return (self->type == OB_CLIENT_TYPE_UTILITY || ---- self->type == OB_CLIENT_TYPE_MENU || ---- self->type == OB_CLIENT_TYPE_TOOLBAR); ----} ---- ----gboolean client_mouse_focusable(ObClient *self) ----{ ---- return !(self->type == OB_CLIENT_TYPE_MENU || ---- self->type == OB_CLIENT_TYPE_TOOLBAR || ---- self->type == OB_CLIENT_TYPE_SPLASH || ---- self->type == OB_CLIENT_TYPE_DOCK); ----} ---- ----gboolean client_enter_focusable(ObClient *self) ----{ ---- /* you can focus desktops but it shouldn't on enter */ ---- return (client_mouse_focusable(self) && ---- self->type != OB_CLIENT_TYPE_DESKTOP); ----} ---- ---- ----static void client_apply_startup_state(ObClient *self, ---- gint x, gint y, gint w, gint h) ----{ ---- /* save the states that we are going to apply */ ---- gboolean iconic = self->iconic; ---- gboolean fullscreen = self->fullscreen; ---- gboolean undecorated = self->undecorated; ---- gboolean shaded = self->shaded; ---- gboolean demands_attention = self->demands_attention; ---- gboolean max_horz = self->max_horz; ---- gboolean max_vert = self->max_vert; ---- Rect oldarea; ---- gint l; ---- ---- /* turn them all off in the client, so they won't affect the window ---- being placed */ ---- self->iconic = self->fullscreen = self->undecorated = self->shaded = ---- self->demands_attention = self->max_horz = self->max_vert = FALSE; ---- ---- /* move the client to its placed position, or it it's already there, ---- generate a ConfigureNotify telling the client where it is. ---- ---- do this after adjusting the frame. otherwise it gets all weird and ---- clients don't work right ---- ---- do this before applying the states so they have the correct ---- pre-max/pre-fullscreen values ---- */ ---- client_try_configure(self, &x, &y, &w, &h, &l, &l, FALSE); ---- ob_debug("placed window 0x%x at %d, %d with size %d x %d", ---- self->window, x, y, w, h); ---- /* save the area, and make it where it should be for the premax stuff */ ---- oldarea = self->area; ---- RECT_SET(self->area, x, y, w, h); ---- ---- /* apply the states. these are in a carefully crafted order.. */ ---- ---- if (iconic) ---- client_iconify(self, TRUE, FALSE, TRUE); ---- if (fullscreen) ---- client_fullscreen(self, TRUE); ---- if (undecorated) ---- client_set_undecorated(self, TRUE); ---- if (shaded) ---- client_shade(self, TRUE); ---- if (demands_attention) ---- client_hilite(self, TRUE); ---- ---- if (max_vert && max_horz) ---- client_maximize(self, TRUE, 0); ---- else if (max_vert) ---- client_maximize(self, TRUE, 2); ---- else if (max_horz) ---- client_maximize(self, TRUE, 1); ---- ---- /* if the window hasn't been configured yet, then do so now, in fact the ---- x,y,w,h may _not_ be the same as the area rect, which can end up ---- meaning that the client isn't properly moved/resized by the fullscreen ---- function ---- pho can cause this because it maps at size of the screen but not 0,0 ---- so openbox moves it on screen to 0,0 (thus x,y=0,0 and area.x,y don't). ---- then fullscreen'ing makes it go to 0,0 which it thinks it already is at ---- cuz thats where the pre-fullscreen will be. however the actual area is ---- not, so this needs to be called even if we have fullscreened/maxed ---- */ ---- self->area = oldarea; ---- client_configure(self, x, y, w, h, FALSE, TRUE, FALSE); ---- ---- /* set the desktop hint, to make sure that it always exists */ ---- OBT_PROP_SET32(self->window, NET_WM_DESKTOP, CARDINAL, self->desktop); ---- ---- /* nothing to do for the other states: ---- skip_taskbar ---- skip_pager ---- modal ---- above ---- below ---- */ ----} ---- ----void client_gravity_resize_w(ObClient *self, gint *x, gint oldw, gint neww) ----{ ---- /* these should be the current values. this is for when you're not moving, ---- just resizing */ ---- g_assert(*x == self->area.x); ---- g_assert(oldw == self->area.width); ---- ---- /* horizontal */ ---- switch (self->gravity) { ---- default: ---- case NorthWestGravity: ---- case WestGravity: ---- case SouthWestGravity: ---- case StaticGravity: ---- case ForgetGravity: ---- break; ---- case NorthGravity: ---- case CenterGravity: ---- case SouthGravity: ---- *x -= (neww - oldw) / 2; ---- break; ---- case NorthEastGravity: ---- case EastGravity: ---- case SouthEastGravity: ---- *x -= neww - oldw; ---- break; ---- } ----} ---- ----void client_gravity_resize_h(ObClient *self, gint *y, gint oldh, gint newh) ----{ ---- /* these should be the current values. this is for when you're not moving, ---- just resizing */ ---- g_assert(*y == self->area.y); ---- g_assert(oldh == self->area.height); ---- ---- /* vertical */ ---- switch (self->gravity) { ---- default: ---- case NorthWestGravity: ---- case NorthGravity: ---- case NorthEastGravity: ---- case StaticGravity: ---- case ForgetGravity: ---- break; ---- case WestGravity: ---- case CenterGravity: ---- case EastGravity: ---- *y -= (newh - oldh) / 2; ---- break; ---- case SouthWestGravity: ---- case SouthGravity: ---- case SouthEastGravity: ---- *y -= newh - oldh; ---- break; ---- } ----} ---- ----void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, ---- gint *logicalw, gint *logicalh, ---- gboolean user) ----{ ---- Rect desired = {*x, *y, *w, *h}; ---- frame_rect_to_frame(self->frame, &desired); ---- ---- /* make the frame recalculate its dimensions n shit without changing ---- anything visible for real, this way the constraints below can work with ---- the updated frame dimensions. */ ---- frame_adjust_area(self->frame, FALSE, TRUE, TRUE); ---- ---- /* gets the frame's position */ ---- frame_client_gravity(self->frame, x, y); ---- ---- /* these positions are frame positions, not client positions */ ---- ---- /* set the size and position if fullscreen */ ---- if (self->fullscreen) { ---- Rect *a; ---- guint i; ---- ---- i = screen_find_monitor(&desired); ---- a = screen_physical_area_monitor(i); ---- ---- *x = a->x; ---- *y = a->y; ---- *w = a->width; ---- *h = a->height; ---- ---- user = FALSE; /* ignore if the client can't be moved/resized when it ---- is fullscreening */ ---- ---- g_free(a); ---- } else if (self->max_horz || self->max_vert) { ---- Rect *a; ---- guint i; ---- ---- /* use all possible struts when maximizing to the full screen */ ---- i = screen_find_monitor(&desired); ---- a = screen_area(self->desktop, i, ---- (self->max_horz && self->max_vert ? NULL : &desired)); ---- ---- /* set the size and position if maximized */ ---- if (self->max_horz) { ---- *x = a->x; ---- *w = a->width - self->frame->size.left - self->frame->size.right; ---- } ---- if (self->max_vert) { ---- *y = a->y; ---- *h = a->height - self->frame->size.top - self->frame->size.bottom; ---- } ---- ---- user = FALSE; /* ignore if the client can't be moved/resized when it ---- is maximizing */ ---- ---- g_free(a); ---- } ---- ---- /* gets the client's position */ ---- frame_frame_gravity(self->frame, x, y); ---- ---- /* work within the preferred sizes given by the window */ ---- if (!(*w == self->area.width && *h == self->area.height)) { ---- gint basew, baseh, minw, minh; ---- gint incw, inch; ---- gfloat minratio, maxratio; ---- ---- incw = self->fullscreen || self->max_horz ? 1 : self->size_inc.width; ---- inch = self->fullscreen || self->max_vert ? 1 : self->size_inc.height; ---- minratio = self->fullscreen || (self->max_horz && self->max_vert) ? ---- 0 : self->min_ratio; ---- maxratio = self->fullscreen || (self->max_horz && self->max_vert) ? ---- 0 : self->max_ratio; ---- ---- /* base size is substituted with min size if not specified */ ---- if (self->base_size.width >= 0 || self->base_size.height >= 0) { ---- basew = self->base_size.width; ---- baseh = self->base_size.height; ---- } else { ---- basew = self->min_size.width; ---- baseh = self->min_size.height; ---- } ---- /* min size is substituted with base size if not specified */ ---- if (self->min_size.width || self->min_size.height) { ---- minw = self->min_size.width; ---- minh = self->min_size.height; ---- } else { ---- minw = self->base_size.width; ---- minh = self->base_size.height; ---- } ---- ---- /* This comment is no longer true */ ---- /* if this is a user-requested resize, then check against min/max ---- sizes */ ---- ---- /* smaller than min size or bigger than max size? */ ---- if (*w > self->max_size.width) *w = self->max_size.width; ---- if (*w < minw) *w = minw; ---- if (*h > self->max_size.height) *h = self->max_size.height; ---- if (*h < minh) *h = minh; ---- ---- *w -= basew; ---- *h -= baseh; ---- ---- /* keep to the increments */ ---- *w /= incw; ---- *h /= inch; ---- ---- /* you cannot resize to nothing */ ---- if (basew + *w < 1) *w = 1 - basew; ---- if (baseh + *h < 1) *h = 1 - baseh; ---- ---- /* save the logical size */ ---- *logicalw = incw > 1 ? *w : *w + basew; ---- *logicalh = inch > 1 ? *h : *h + baseh; ---- ---- *w *= incw; ---- *h *= inch; ---- ---- *w += basew; ---- *h += baseh; ---- ---- /* adjust the height to match the width for the aspect ratios. ---- for this, min size is not substituted for base size ever. */ ---- *w -= self->base_size.width; ---- *h -= self->base_size.height; ---- ---- if (minratio) ---- if (*h * minratio > *w) { ---- *h = (gint)(*w / minratio); ---- ---- /* you cannot resize to nothing */ ---- if (*h < 1) { ---- *h = 1; ---- *w = (gint)(*h * minratio); ---- } ---- } ---- if (maxratio) ---- if (*h * maxratio < *w) { ---- *h = (gint)(*w / maxratio); ---- ---- /* you cannot resize to nothing */ ---- if (*h < 1) { ---- *h = 1; ---- *w = (gint)(*h * minratio); ---- } ---- } ---- ---- *w += self->base_size.width; ---- *h += self->base_size.height; ---- } ---- ---- /* these override the above states! if you cant move you can't move! */ ---- if (user) { ---- if (!(self->functions & OB_CLIENT_FUNC_MOVE)) { ---- *x = self->area.x; ---- *y = self->area.y; ---- } ---- if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) { ---- *w = self->area.width; ---- *h = self->area.height; ---- } ---- } ---- ---- g_assert(*w > 0); ---- g_assert(*h > 0); ----} ---- ---- ----void client_configure(ObClient *self, gint x, gint y, gint w, gint h, ---- gboolean user, gboolean final, gboolean force_reply) ----{ ---- Rect oldframe; ---- gint oldw, oldh; ---- gboolean send_resize_client; ---- gboolean moved = FALSE, resized = FALSE, rootmoved = FALSE; ---- gboolean fmoved, fresized; ---- guint fdecor = self->frame->decorations; ---- gboolean fhorz = self->frame->max_horz; ---- gboolean fvert = self->frame->max_vert; ---- gint logicalw, logicalh; ---- ---- /* find the new x, y, width, and height (and logical size) */ ---- client_try_configure(self, &x, &y, &w, &h, &logicalw, &logicalh, user); ---- ---- /* set the logical size if things changed */ ---- if (!(w == self->area.width && h == self->area.height)) ---- SIZE_SET(self->logical_size, logicalw, logicalh); ---- ---- /* figure out if we moved or resized or what */ ---- moved = (x != self->area.x || y != self->area.y); ---- resized = (w != self->area.width || h != self->area.height); ---- ---- oldw = self->area.width; ---- oldh = self->area.height; ---- oldframe = self->frame->area; ---- RECT_SET(self->area, x, y, w, h); ---- ---- /* for app-requested resizes, always resize if 'resized' is true. ---- for user-requested ones, only resize if final is true, or when ---- resizing in redraw mode */ ---- send_resize_client = ((!user && resized) || ---- (user && (final || ---- (resized && config_resize_redraw)))); ---- ---- /* if the client is enlarging, then resize the client before the frame */ ---- if (send_resize_client && (w > oldw || h > oldh)) { ---- XMoveResizeWindow(obt_display, self->window, ---- self->frame->size.left, self->frame->size.top, ---- MAX(w, oldw), MAX(h, oldh)); ---- frame_adjust_client_area(self->frame); ---- } ---- ---- /* find the frame's dimensions and move/resize it */ ---- fmoved = moved; ---- fresized = resized; ---- ---- /* if decorations changed, then readjust everything for the frame */ ---- if (self->decorations != fdecor || ---- self->max_horz != fhorz || self->max_vert != fvert) ---- { ---- fmoved = fresized = TRUE; ---- } ---- ---- /* adjust the frame */ ---- if (fmoved || fresized) { ---- gulong ignore_start; ---- if (!user) ---- ignore_start = event_start_ignore_all_enters(); ---- ---- /* replay pending pointer event before move the window, in case it ---- would change what window gets the event */ ---- mouse_replay_pointer(); ---- ---- frame_adjust_area(self->frame, fmoved, fresized, FALSE); ---- ---- if (!user) ---- event_end_ignore_all_enters(ignore_start); ---- } ---- ---- if (!user || final) { ---- gint oldrx = self->root_pos.x; ---- gint oldry = self->root_pos.y; ---- /* we have reset the client to 0 border width, so don't include ---- it in these coords */ ---- POINT_SET(self->root_pos, ---- self->frame->area.x + self->frame->size.left - ---- self->border_width, ---- self->frame->area.y + self->frame->size.top - ---- self->border_width); ---- if (self->root_pos.x != oldrx || self->root_pos.y != oldry) ---- rootmoved = TRUE; ---- } ---- ---- /* This is kinda tricky and should not be changed.. let me explain! ---- ---- When user = FALSE, then the request is coming from the application ---- itself, and we are more strict about when to send a synthetic ---- ConfigureNotify. We strictly follow the rules of the ICCCM sec 4.1.5 ---- in this case (if force_reply is true) ---- ---- When user = TRUE, then the request is coming from "us", like when we ---- maximize a window or something. In this case we are more lenient. We ---- used to follow the same rules as above, but _Java_ Swing can't handle ---- this. So just to appease Swing, when user = TRUE, we always send ---- a synthetic ConfigureNotify to give the window its root coordinates. ---- */ ---- if ((!user && !resized && (rootmoved || force_reply)) || ---- (user && final && rootmoved)) ---- { ---- XEvent event; ---- ---- event.type = ConfigureNotify; ---- event.xconfigure.display = obt_display; ---- event.xconfigure.event = self->window; ---- event.xconfigure.window = self->window; ---- ---- ob_debug("Sending ConfigureNotify to %s for %d,%d %dx%d", ---- self->title, self->root_pos.x, self->root_pos.y, w, h); ---- ---- /* root window real coords */ ---- event.xconfigure.x = self->root_pos.x; ---- event.xconfigure.y = self->root_pos.y; ---- event.xconfigure.width = w; ---- event.xconfigure.height = h; ---- event.xconfigure.border_width = self->border_width; ---- event.xconfigure.above = None; ---- event.xconfigure.override_redirect = FALSE; ---- XSendEvent(event.xconfigure.display, event.xconfigure.window, ---- FALSE, StructureNotifyMask, &event); ---- } ---- ---- /* if the client is shrinking, then resize the frame before the client. ---- ---- both of these resize sections may run, because the top one only resizes ---- in the direction that is growing ---- */ ---- if (send_resize_client && (w <= oldw || h <= oldh)) { ---- frame_adjust_client_area(self->frame); ---- XMoveResizeWindow(obt_display, self->window, ---- self->frame->size.left, self->frame->size.top, w, h); ---- } ---- ---- XFlush(obt_display); ---- ---- /* if it moved between monitors, then this can affect the stacking ---- layer of this window or others - for fullscreen windows */ ---- if (screen_find_monitor(&self->frame->area) != ---- screen_find_monitor(&oldframe)) ---- { ---- client_calc_layer(self); ---- } ----} ---- ----void client_fullscreen(ObClient *self, gboolean fs) ----{ ---- gint x, y, w, h; ---- ---- if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) || /* can't */ ---- self->fullscreen == fs) return; /* already done */ ---- ---- self->fullscreen = fs; ---- client_change_state(self); /* change the state hints on the client */ ---- ---- if (fs) { ---- self->pre_fullscreen_area = self->area; ---- /* if the window is maximized, its area isn't all that meaningful. ---- save its premax area instead. */ ---- if (self->max_horz) { ---- self->pre_fullscreen_area.x = self->pre_max_area.x; ---- self->pre_fullscreen_area.width = self->pre_max_area.width; ---- } ---- if (self->max_vert) { ---- self->pre_fullscreen_area.y = self->pre_max_area.y; ---- self->pre_fullscreen_area.height = self->pre_max_area.height; ---- } ---- ---- /* these will help configure_full figure out where to fullscreen ---- the window */ ---- x = self->area.x; ---- y = self->area.y; ---- w = self->area.width; ---- h = self->area.height; ---- } else { ---- g_assert(self->pre_fullscreen_area.width > 0 && ---- self->pre_fullscreen_area.height > 0); ---- ---- x = self->pre_fullscreen_area.x; ---- y = self->pre_fullscreen_area.y; ---- w = self->pre_fullscreen_area.width; ---- h = self->pre_fullscreen_area.height; ---- RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0); ---- } ---- ---- ob_debug("Window %s going fullscreen (%d)", ---- self->title, self->fullscreen); ---- ---- client_setup_decor_and_functions(self, FALSE); ---- client_move_resize(self, x, y, w, h); ---- ---- /* and adjust our layer/stacking. do this after resizing the window, ---- and applying decorations, because windows which fill the screen are ---- considered "fullscreen" and it affects their layer */ ---- client_calc_layer(self); ---- ---- if (fs) { ---- /* try focus us when we go into fullscreen mode */ ---- client_focus(self); ---- } ----} ---- ----static void client_iconify_recursive(ObClient *self, ---- gboolean iconic, gboolean curdesk, ---- gboolean hide_animation) ----{ ---- GSList *it; ---- gboolean changed = FALSE; ---- ---- if (self->iconic != iconic) { ---- ob_debug("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"), ---- self->window); ---- ---- if (iconic) { ---- /* don't let non-normal windows iconify along with their parents ---- or whatever */ ---- if (client_normal(self)) { ---- self->iconic = iconic; ---- ---- /* update the focus lists.. iconic windows go to the bottom of ---- the list */ ---- focus_order_to_bottom(self); ---- ---- changed = TRUE; ---- } ---- } else { ---- self->iconic = iconic; ---- ---- if (curdesk && self->desktop != screen_desktop && ---- self->desktop != DESKTOP_ALL) ---- client_set_desktop(self, screen_desktop, FALSE, FALSE); ---- ---- /* this puts it after the current focused window */ ---- focus_order_remove(self); ---- focus_order_add_new(self); ---- ---- changed = TRUE; ---- } ---- } ---- ---- if (changed) { ---- client_change_state(self); ---- if (config_animate_iconify && !hide_animation) ---- frame_begin_iconify_animation(self->frame, iconic); ---- /* do this after starting the animation so it doesn't flash */ ---- client_showhide(self); ---- } ---- ---- /* iconify all direct transients, and deiconify all transients ---- (non-direct too) */ ---- for (it = self->transients; it; it = g_slist_next(it)) ---- if (it->data != self) ---- if (client_is_direct_child(self, it->data) || !iconic) ---- client_iconify_recursive(it->data, iconic, curdesk, ---- hide_animation); ----} ---- ----void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk, ---- gboolean hide_animation) ----{ ---- if (self->functions & OB_CLIENT_FUNC_ICONIFY || !iconic) { ---- /* move up the transient chain as far as possible first */ ---- self = client_search_top_direct_parent(self); ---- client_iconify_recursive(self, iconic, curdesk, hide_animation); ---- } ----} ---- ----void client_maximize(ObClient *self, gboolean max, gint dir) ----{ ---- gint x, y, w, h; ---- ---- g_assert(dir == 0 || dir == 1 || dir == 2); ---- if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */ ---- ---- /* check if already done */ ---- if (max) { ---- if (dir == 0 && self->max_horz && self->max_vert) return; ---- if (dir == 1 && self->max_horz) return; ---- if (dir == 2 && self->max_vert) return; ---- } else { ---- if (dir == 0 && !self->max_horz && !self->max_vert) return; ---- if (dir == 1 && !self->max_horz) return; ---- if (dir == 2 && !self->max_vert) return; ---- } ---- ---- /* these will help configure_full figure out which screen to fill with ---- the window */ ---- x = self->area.x; ---- y = self->area.y; ---- w = self->area.width; ---- h = self->area.height; ---- ---- if (max) { ---- if ((dir == 0 || dir == 1) && !self->max_horz) { /* horz */ ---- RECT_SET(self->pre_max_area, ---- self->area.x, self->pre_max_area.y, ---- self->area.width, self->pre_max_area.height); ---- } ---- if ((dir == 0 || dir == 2) && !self->max_vert) { /* vert */ ---- RECT_SET(self->pre_max_area, ---- self->pre_max_area.x, self->area.y, ---- self->pre_max_area.width, self->area.height); ---- } ---- } else { ---- if ((dir == 0 || dir == 1) && self->max_horz) { /* horz */ ---- g_assert(self->pre_max_area.width > 0); ---- ---- x = self->pre_max_area.x; ---- w = self->pre_max_area.width; ---- ---- RECT_SET(self->pre_max_area, 0, self->pre_max_area.y, ---- 0, self->pre_max_area.height); ---- } ---- if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */ ---- g_assert(self->pre_max_area.height > 0); ---- ---- y = self->pre_max_area.y; ---- h = self->pre_max_area.height; ---- ---- RECT_SET(self->pre_max_area, self->pre_max_area.x, 0, ---- self->pre_max_area.width, 0); ---- } ---- } ---- ---- if (dir == 0 || dir == 1) /* horz */ ---- self->max_horz = max; ---- if (dir == 0 || dir == 2) /* vert */ ---- self->max_vert = max; ---- ---- client_change_state(self); /* change the state hints on the client */ ---- ---- client_setup_decor_and_functions(self, FALSE); ---- client_move_resize(self, x, y, w, h); ----} ---- ----void client_shade(ObClient *self, gboolean shade) ----{ ---- if ((!(self->functions & OB_CLIENT_FUNC_SHADE) && ---- shade) || /* can't shade */ ---- self->shaded == shade) return; /* already done */ ---- ---- self->shaded = shade; ---- client_change_state(self); ---- client_change_wm_state(self); /* the window is being hidden/shown */ ---- /* resize the frame to just the titlebar */ ---- frame_adjust_area(self->frame, FALSE, TRUE, FALSE); ----} ---- ----static void client_ping_event(ObClient *self, gboolean dead) ----{ ---- if (self->not_responding != dead) { ---- self->not_responding = dead; ---- client_update_title(self); ---- ---- if (dead) ---- /* the client isn't responding, so ask to kill it */ ---- client_prompt_kill(self); ---- else { ---- /* it came back to life ! */ ---- ---- if (self->kill_prompt) { ---- prompt_unref(self->kill_prompt); ---- self->kill_prompt = NULL; ---- } ---- ---- self->kill_level = 0; ---- } ---- } ----} ---- ----void client_close(ObClient *self) ----{ ---- if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return; ---- ---- /* if closing an internal obprompt, that is just cancelling it */ ---- if (self->prompt) { ---- prompt_cancel(self->prompt); ---- return; ---- } ---- ---- /* in the case that the client provides no means to requesting that it ---- close, we just kill it */ ---- if (!self->delete_window) ---- /* don't use client_kill(), we should only kill based on PID in ---- response to a lack of PING replies */ ---- XKillClient(obt_display, self->window); ---- else { ---- /* request the client to close with WM_DELETE_WINDOW */ ---- OBT_PROP_MSG_TO(self->window, self->window, WM_PROTOCOLS, ---- OBT_PROP_ATOM(WM_DELETE_WINDOW), event_curtime, ---- 0, 0, 0, NoEventMask); ---- ---- /* we're trying to close the window, so see if it is responding. if it ---- is not, then we will let them kill the window */ ---- if (self->ping) ---- ping_start(self, client_ping_event); ---- ---- /* if we already know the window isn't responding (maybe they clicked ---- no in the kill dialog but it hasn't come back to life), then show ---- the kill dialog */ ---- if (self->not_responding) ---- client_prompt_kill(self); ---- } ----} ---- ----#define OB_KILL_RESULT_NO 0 ----#define OB_KILL_RESULT_YES 1 ---- ----static void client_kill_requested(ObPrompt *p, gint result, gpointer data) ----{ ---- ObClient *self = data; ---- ---- if (result == OB_KILL_RESULT_YES) ---- client_kill(self); ---- ---- prompt_unref(self->kill_prompt); ---- self->kill_prompt = NULL; ----} ---- ----static void client_prompt_kill(ObClient *self) ----{ ---- /* check if we're already prompting */ ---- if (!self->kill_prompt) { ---- ObPromptAnswer answers[] = { ---- { 0, OB_KILL_RESULT_NO }, ---- { 0, OB_KILL_RESULT_YES } ---- }; ---- gchar *m; ---- const gchar *y; ---- ---- if (client_on_localhost(self)) { ---- const gchar *sig; ---- ---- if (self->kill_level == 0) ---- sig = "terminate"; ---- else ---- sig = "kill"; ---- ---- m = g_strdup_printf ---- (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit by sending the %s signal?"), ---- self->original_title, sig); ---- y = _("End Process"); ---- } ---- else { ---- m = g_strdup_printf ---- (_("The window \"%s\" does not seem to be responding. Do you want to disconnect it from the X server?"), ---- self->original_title); ---- y = _("Disconnect"); ---- } ---- /* set the dialog buttons' text */ ---- answers[0].text = _("Cancel"); /* "no" */ ---- answers[1].text = y; /* "yes" */ ---- ---- self->kill_prompt = prompt_new(m, answers, ---- sizeof(answers)/sizeof(answers[0]), ---- OB_KILL_RESULT_NO, /* default = no */ ---- OB_KILL_RESULT_NO, /* cancel = no */ ---- client_kill_requested, self); ---- g_free(m); ---- } ---- ---- prompt_show(self->kill_prompt, self, TRUE); ----} ---- ----void client_kill(ObClient *self) ----{ ---- /* don't kill our own windows */ ---- if (self->prompt) return; ---- ---- if (client_on_localhost(self) && self->pid) { ---- /* running on the local host */ ---- if (self->kill_level == 0) { ---- ob_debug("killing window 0x%x with pid %lu, with SIGTERM", ---- self->window, self->pid); ---- kill(self->pid, SIGTERM); ---- ++self->kill_level; ---- ---- /* show that we're trying to kill it */ ---- client_update_title(self); ---- } ---- else { ---- ob_debug("killing window 0x%x with pid %lu, with SIGKILL", ---- self->window, self->pid); ---- kill(self->pid, SIGKILL); /* kill -9 */ ---- } ---- } ---- else { ---- /* running on a remote host */ ---- XKillClient(obt_display, self->window); ---- } ----} ---- ----void client_hilite(ObClient *self, gboolean hilite) ----{ ---- if (self->demands_attention == hilite) ---- return; /* no change */ ---- ---- /* don't allow focused windows to hilite */ ---- self->demands_attention = hilite && !client_focused(self); ---- if (self->frame != NULL) { /* if we're mapping, just set the state */ ---- if (self->demands_attention) ---- frame_flash_start(self->frame); ---- else ---- frame_flash_stop(self->frame); ---- client_change_state(self); ---- } ----} ---- ----static void client_set_desktop_recursive(ObClient *self, ---- guint target, ---- gboolean donthide, ---- gboolean dontraise) ----{ ---- guint old; ---- GSList *it; ---- ---- if (target != self->desktop && self->type != OB_CLIENT_TYPE_DESKTOP) { ---- ---- ob_debug("Setting desktop %u", target+1); ---- ---- g_assert(target < screen_num_desktops || target == DESKTOP_ALL); ---- ---- old = self->desktop; ---- self->desktop = target; ---- OBT_PROP_SET32(self->window, NET_WM_DESKTOP, CARDINAL, target); ---- /* the frame can display the current desktop state */ ---- frame_adjust_state(self->frame); ---- /* 'move' the window to the new desktop */ ---- if (!donthide) ---- client_hide(self); ---- client_show(self); ---- /* raise if it was not already on the desktop */ ---- if (old != DESKTOP_ALL && !dontraise) ---- stacking_raise(CLIENT_AS_WINDOW(self)); ---- if (STRUT_EXISTS(self->strut)) ---- screen_update_areas(); ---- else ---- /* the new desktop's geometry may be different, so we may need to ---- resize, for example if we are maximized */ ---- client_reconfigure(self, FALSE); ---- } ---- ---- /* move all transients */ ---- for (it = self->transients; it; it = g_slist_next(it)) ---- if (it->data != self) ---- if (client_is_direct_child(self, it->data)) ---- client_set_desktop_recursive(it->data, target, ---- donthide, dontraise); ----} ---- ----void client_set_desktop(ObClient *self, guint target, ---- gboolean donthide, gboolean dontraise) ----{ ---- self = client_search_top_direct_parent(self); ---- client_set_desktop_recursive(self, target, donthide, dontraise); ----} ---- ----gboolean client_is_direct_child(ObClient *parent, ObClient *child) ----{ ---- while (child != parent && (child = client_direct_parent(child))); ---- return child == parent; ----} ---- ----ObClient *client_search_modal_child(ObClient *self) ----{ ---- GSList *it; ---- ObClient *ret; ---- ---- for (it = self->transients; it; it = g_slist_next(it)) { ---- ObClient *c = it->data; ---- if ((ret = client_search_modal_child(c))) return ret; ---- if (c->modal) return c; ---- } ---- return NULL; ----} ---- ----gboolean client_validate(ObClient *self) ----{ ---- XEvent e; ---- ---- XSync(obt_display, FALSE); /* get all events on the server */ ---- ---- if (XCheckTypedWindowEvent(obt_display, self->window, DestroyNotify, &e) || ---- XCheckTypedWindowEvent(obt_display, self->window, UnmapNotify, &e)) ---- { ---- XPutBackEvent(obt_display, &e); ---- return FALSE; ---- } ---- ---- return TRUE; ----} ---- ----void client_set_wm_state(ObClient *self, glong state) ----{ ---- if (state == self->wmstate) return; /* no change */ ---- ---- switch (state) { ---- case IconicState: ---- client_iconify(self, TRUE, TRUE, FALSE); ---- break; ---- case NormalState: ---- client_iconify(self, FALSE, TRUE, FALSE); ---- break; ---- } ----} ---- ----void client_set_state(ObClient *self, Atom action, glong data1, glong data2) ----{ ---- gboolean shaded = self->shaded; ---- gboolean fullscreen = self->fullscreen; ---- gboolean undecorated = self->undecorated; - gboolean locked = self->locked; ---- gboolean max_horz = self->max_horz; ---- gboolean max_vert = self->max_vert; ---- gboolean modal = self->modal; ---- gboolean iconic = self->iconic; ---- gboolean demands_attention = self->demands_attention; ---- gboolean above = self->above; ---- gboolean below = self->below; ---- gint i; ---- ---- if (!(action == OBT_PROP_ATOM(NET_WM_STATE_ADD) || ---- action == OBT_PROP_ATOM(NET_WM_STATE_REMOVE) || ---- action == OBT_PROP_ATOM(NET_WM_STATE_TOGGLE))) ---- /* an invalid action was passed to the client message, ignore it */ ---- return; ---- ---- for (i = 0; i < 2; ++i) { ---- Atom state = i == 0 ? data1 : data2; ---- ---- if (!state) continue; ---- ---- /* if toggling, then pick whether we're adding or removing */ ---- if (action == OBT_PROP_ATOM(NET_WM_STATE_TOGGLE)) { ---- if (state == OBT_PROP_ATOM(NET_WM_STATE_MODAL)) ---- action = modal ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT)) ---- action = self->max_vert ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ)) ---- action = self->max_horz ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_SHADED)) ---- action = shaded ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR)) ---- action = self->skip_taskbar ? ---- OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER)) ---- action = self->skip_pager ? ---- OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_HIDDEN)) ---- action = self->iconic ? ---- OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN)) ---- action = fullscreen ? ---- OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_ABOVE)) ---- action = self->above ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_BELOW)) ---- action = self->below ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION)) ---- action = self->demands_attention ? ---- OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- else if (state == OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED)) ---- action = undecorated ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : - OBT_PROP_ATOM(NET_WM_STATE_ADD); - else if (state == OBT_PROP_ATOM(OB_WM_STATE_LOCKED)) - action = locked ? OBT_PROP_ATOM(NET_WM_STATE_REMOVE) : ---- OBT_PROP_ATOM(NET_WM_STATE_ADD); ---- } ---- ---- if (action == OBT_PROP_ATOM(NET_WM_STATE_ADD)) { ---- if (state == OBT_PROP_ATOM(NET_WM_STATE_MODAL)) { ---- modal = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT)) { ---- max_vert = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ)) { ---- max_horz = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SHADED)) { ---- shaded = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR)) { ---- self->skip_taskbar = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER)) { ---- self->skip_pager = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_HIDDEN)) { ---- iconic = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN)) { ---- fullscreen = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_ABOVE)) { ---- above = TRUE; ---- below = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_BELOW)) { ---- above = FALSE; ---- below = TRUE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION)){ ---- demands_attention = TRUE; ---- } else if (state == OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED)) { ---- undecorated = TRUE; - } else if (state == OBT_PROP_ATOM(OB_WM_STATE_LOCKED)) { - locked = TRUE; ---- } ---- ---- } else { /* action == OBT_PROP_ATOM(NET_WM_STATE_REMOVE) */ ---- if (state == OBT_PROP_ATOM(NET_WM_STATE_MODAL)) { ---- modal = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT)) { ---- max_vert = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ)) { ---- max_horz = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SHADED)) { ---- shaded = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR)) { ---- self->skip_taskbar = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER)) { ---- self->skip_pager = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_HIDDEN)) { ---- iconic = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN)) { ---- fullscreen = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_ABOVE)) { ---- above = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_BELOW)) { ---- below = FALSE; ---- } else if (state == OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION)){ ---- demands_attention = FALSE; ---- } else if (state == OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED)) { ---- undecorated = FALSE; - } else if (state == OBT_PROP_ATOM(OB_WM_STATE_LOCKED)) { - locked = FALSE; ---- } ---- } ---- } ---- ---- if (max_horz != self->max_horz || max_vert != self->max_vert) { ---- if (max_horz != self->max_horz && max_vert != self->max_vert) { ---- /* toggling both */ ---- if (max_horz == max_vert) { /* both going the same way */ ---- client_maximize(self, max_horz, 0); ---- } else { ---- client_maximize(self, max_horz, 1); ---- client_maximize(self, max_vert, 2); ---- } ---- } else { ---- /* toggling one */ ---- if (max_horz != self->max_horz) ---- client_maximize(self, max_horz, 1); ---- else ---- client_maximize(self, max_vert, 2); ---- } ---- } ---- /* change fullscreen state before shading, as it will affect if the window ---- can shade or not */ ---- if (fullscreen != self->fullscreen) ---- client_fullscreen(self, fullscreen); ---- if (shaded != self->shaded) ---- client_shade(self, shaded); ---- if (undecorated != self->undecorated) ---- client_set_undecorated(self, undecorated); - if (locked != self->locked) - client_set_locked(self, locked); ---- if (above != self->above || below != self->below) { ---- self->above = above; ---- self->below = below; ---- client_calc_layer(self); ---- } ---- ---- if (modal != self->modal) { ---- self->modal = modal; ---- /* when a window changes modality, then its stacking order with its ---- transients needs to change */ ---- stacking_raise(CLIENT_AS_WINDOW(self)); ---- ---- /* it also may get focused. if something is focused that shouldn't ---- be focused anymore, then move the focus */ ---- if (focus_client && client_focus_target(focus_client) != focus_client) ---- client_focus(focus_client); ---- } ---- ---- if (iconic != self->iconic) ---- client_iconify(self, iconic, FALSE, FALSE); ---- ---- if (demands_attention != self->demands_attention) ---- client_hilite(self, demands_attention); ---- ---- client_change_state(self); /* change the hint to reflect these changes */ ----} ---- ----ObClient *client_focus_target(ObClient *self) ----{ ---- ObClient *child = NULL; ---- ---- child = client_search_modal_child(self); ---- if (child) return child; ---- return self; ----} ---- ----gboolean client_can_focus(ObClient *self) ----{ ---- /* choose the correct target */ ---- self = client_focus_target(self); ---- ---- if (!self->frame->visible) ---- return FALSE; ---- ---- if (!(self->can_focus || self->focus_notify)) ---- return FALSE; ---- ---- return TRUE; ----} ---- ----gboolean client_focus(ObClient *self) ----{ - { - XkbStateRec state; - XkbGetState(obt_display, XkbUseCoreKbd, &state); - if (state.locked_mods & 128) - return FALSE; - } - ---- /* we might not focus this window, so if we have modal children which would ---- be focused instead, bring them to this desktop */ ---- client_bring_modal_windows(self); ---- ---- /* choose the correct target */ ---- self = client_focus_target(self); ---- ---- if (!client_can_focus(self)) { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Client %s can't be focused", self->title); ---- return FALSE; ---- } ---- ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focusing client \"%s\" (0x%x) at time %u", ---- self->title, self->window, event_curtime); ---- ---- /* if using focus_delay, stop the timer now so that focus doesn't ---- go moving on us */ ---- event_halt_focus_delay(); ---- ---- event_cancel_all_key_grabs(); ---- ---- obt_display_ignore_errors(TRUE); ---- ---- if (self->can_focus) { ---- /* This can cause a BadMatch error with CurrentTime, or if an app ---- passed in a bad time for _NET_WM_ACTIVE_WINDOW. */ ---- XSetInputFocus(obt_display, self->window, RevertToPointerRoot, ---- event_curtime); ---- } ---- ---- if (self->focus_notify) { ---- XEvent ce; ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = OBT_PROP_ATOM(WM_PROTOCOLS); ---- ce.xclient.display = obt_display; ---- ce.xclient.window = self->window; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = OBT_PROP_ATOM(WM_TAKE_FOCUS); ---- ce.xclient.data.l[1] = event_curtime; ---- ce.xclient.data.l[2] = 0l; ---- ce.xclient.data.l[3] = 0l; ---- ce.xclient.data.l[4] = 0l; ---- XSendEvent(obt_display, self->window, FALSE, NoEventMask, &ce); ---- } ---- ---- obt_display_ignore_errors(FALSE); ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "Error focusing? %d", ---- obt_display_error_occured); ---- return !obt_display_error_occured; ----} ---- ----static void client_present(ObClient *self, gboolean here, gboolean raise, ---- gboolean unshade) ----{ ---- if (client_normal(self) && screen_showing_desktop) ---- screen_show_desktop(FALSE, self); ---- if (self->iconic) ---- client_iconify(self, FALSE, here, FALSE); ---- if (self->desktop != DESKTOP_ALL && ---- self->desktop != screen_desktop) ---- { ---- if (here) ---- client_set_desktop(self, screen_desktop, FALSE, TRUE); ---- else ---- screen_set_desktop(self->desktop, FALSE); ---- } else if (!self->frame->visible) ---- /* if its not visible for other reasons, then don't mess ---- with it */ ---- return; ---- if (self->shaded && unshade) ---- client_shade(self, FALSE); ---- if (raise) ---- stacking_raise(CLIENT_AS_WINDOW(self)); ---- ---- client_focus(self); ----} ---- ----/* this function exists to map to the client_activate message in the ewmh, ---- the user arg is unused because nobody uses it correctly anyway. */ ----void client_activate(ObClient *self, gboolean here, gboolean raise, ---- gboolean unshade, gboolean user) ----{ ---- client_present(self, here, raise, unshade); ----} ---- ----static void client_bring_windows_recursive(ObClient *self, ---- guint desktop, ---- gboolean helpers, ---- gboolean modals, ---- gboolean iconic) ----{ ---- GSList *it; ---- ---- for (it = self->transients; it; it = g_slist_next(it)) ---- client_bring_windows_recursive(it->data, desktop, ---- helpers, modals, iconic); ---- ---- if (((helpers && client_helper(self)) || ---- (modals && self->modal)) && ---- ((self->desktop != desktop && self->desktop != DESKTOP_ALL) || ---- (iconic && self->iconic))) ---- { ---- if (iconic && self->iconic) ---- client_iconify(self, FALSE, TRUE, FALSE); ---- else ---- client_set_desktop(self, desktop, FALSE, FALSE); ---- } ----} ---- ----void client_bring_helper_windows(ObClient *self) ----{ ---- client_bring_windows_recursive(self, self->desktop, TRUE, FALSE, FALSE); ----} ---- ----void client_bring_modal_windows(ObClient *self) ----{ ---- client_bring_windows_recursive(self, self->desktop, FALSE, TRUE, TRUE); ----} ---- ----gboolean client_focused(ObClient *self) ----{ ---- return self == focus_client; ----} ---- ----RrImage* client_icon(ObClient *self) ----{ ---- RrImage *ret = NULL; ---- ---- if (self->icon_set) ---- ret = self->icon_set; ---- else if (self->parents) { ---- GSList *it; ---- for (it = self->parents; it && !ret; it = g_slist_next(it)) ---- ret = client_icon(it->data); ---- } ---- if (!ret) ---- ret = client_default_icon; ---- return ret; ----} ---- ----void client_set_layer(ObClient *self, gint layer) ----{ ---- if (layer < 0) { ---- self->below = TRUE; ---- self->above = FALSE; ---- } else if (layer == 0) { ---- self->below = self->above = FALSE; ---- } else { ---- self->below = FALSE; ---- self->above = TRUE; ---- } ---- client_calc_layer(self); ---- client_change_state(self); /* reflect this in the state hints */ - } - - void client_set_locked(ObClient *self, gboolean locked) - { - if (self->locked != locked) { - self->locked = locked; - client_change_state(self); - } ----} ---- ----void client_set_undecorated(ObClient *self, gboolean undecorated) ----{ ---- if (self->undecorated != undecorated && ---- /* don't let it undecorate if the function is missing, but let ---- it redecorate */ ---- (self->functions & OB_CLIENT_FUNC_UNDECORATE || !undecorated)) ---- { ---- self->undecorated = undecorated; ---- client_setup_decor_and_functions(self, TRUE); ---- client_change_state(self); /* reflect this in the state hints */ ---- } ----} ---- ----guint client_monitor(ObClient *self) ----{ ---- return screen_find_monitor(&self->frame->area); ----} ---- ----ObClient *client_direct_parent(ObClient *self) ----{ ---- if (!self->parents) return NULL; ---- if (self->transient_for_group) return NULL; ---- return self->parents->data; ----} ---- ----ObClient *client_search_top_direct_parent(ObClient *self) ----{ ---- ObClient *p; ---- while ((p = client_direct_parent(self))) self = p; ---- return self; ----} ---- ----static GSList *client_search_all_top_parents_internal(ObClient *self, ---- gboolean bylayer, ---- ObStackingLayer layer) ----{ ---- GSList *ret; ---- ObClient *p; ---- ---- /* move up the direct transient chain as far as possible */ ---- while ((p = client_direct_parent(self)) && ---- (!bylayer || p->layer == layer)) ---- self = p; ---- ---- if (!self->parents) ---- ret = g_slist_prepend(NULL, self); ---- else ---- ret = g_slist_copy(self->parents); ---- ---- return ret; ----} ---- ----GSList *client_search_all_top_parents(ObClient *self) ----{ ---- return client_search_all_top_parents_internal(self, FALSE, 0); ----} ---- ----GSList *client_search_all_top_parents_layer(ObClient *self) ----{ ---- return client_search_all_top_parents_internal(self, TRUE, self->layer); ----} ---- ----ObClient *client_search_focus_parent(ObClient *self) ----{ ---- GSList *it; ---- ---- for (it = self->parents; it; it = g_slist_next(it)) ---- if (client_focused(it->data)) return it->data; ---- ---- return NULL; ----} ---- ----ObClient *client_search_parent(ObClient *self, ObClient *search) ----{ ---- GSList *it; ---- ---- for (it = self->parents; it; it = g_slist_next(it)) ---- if (it->data == search) return search; ---- ---- return NULL; ----} ---- ----ObClient *client_search_transient(ObClient *self, ObClient *search) ----{ ---- GSList *sit; ---- ---- for (sit = self->transients; sit; sit = g_slist_next(sit)) { ---- if (sit->data == search) ---- return search; ---- if (client_search_transient(sit->data, search)) ---- return search; ---- } ---- return NULL; ----} ---- ----static void detect_edge(Rect area, ObDirection dir, ---- gint my_head, gint my_size, ---- gint my_edge_start, gint my_edge_size, ---- gint *dest, gboolean *near_edge) ----{ ---- gint edge_start, edge_size, head, tail; ---- gboolean skip_head = FALSE, skip_tail = FALSE; ---- ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_SOUTH: ---- edge_start = area.x; ---- edge_size = area.width; ---- break; ---- case OB_DIRECTION_EAST: ---- case OB_DIRECTION_WEST: ---- edge_start = area.y; ---- edge_size = area.height; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- /* do we collide with this window? */ ---- if (!RANGES_INTERSECT(my_edge_start, my_edge_size, ---- edge_start, edge_size)) ---- return; ---- ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- head = RECT_BOTTOM(area); ---- tail = RECT_TOP(area); ---- break; ---- case OB_DIRECTION_SOUTH: ---- head = RECT_TOP(area); ---- tail = RECT_BOTTOM(area); ---- break; ---- case OB_DIRECTION_WEST: ---- head = RECT_RIGHT(area); ---- tail = RECT_LEFT(area); ---- break; ---- case OB_DIRECTION_EAST: ---- head = RECT_LEFT(area); ---- tail = RECT_RIGHT(area); ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_WEST: ---- /* check if our window is past the head of this window */ ---- if (my_head <= head + 1) ---- skip_head = TRUE; ---- /* check if our window's tail is past the tail of this window */ ---- if (my_head + my_size - 1 <= tail) ---- skip_tail = TRUE; ---- /* check if the head of this window is closer than the previously ---- chosen edge (take into account that the previously chosen ---- edge might have been a tail, not a head) */ ---- if (head + (*near_edge ? 0 : my_size) < *dest) ---- skip_head = TRUE; ---- /* check if the tail of this window is closer than the previously ---- chosen edge (take into account that the previously chosen ---- edge might have been a head, not a tail) */ ---- if (tail - (!*near_edge ? 0 : my_size) < *dest) ---- skip_tail = TRUE; ---- break; ---- case OB_DIRECTION_SOUTH: ---- case OB_DIRECTION_EAST: ---- /* check if our window is past the head of this window */ ---- if (my_head >= head - 1) ---- skip_head = TRUE; ---- /* check if our window's tail is past the tail of this window */ ---- if (my_head - my_size + 1 >= tail) ---- skip_tail = TRUE; ---- /* check if the head of this window is closer than the previously ---- chosen edge (take into account that the previously chosen ---- edge might have been a tail, not a head) */ ---- if (head - (*near_edge ? 0 : my_size) > *dest) ---- skip_head = TRUE; ---- /* check if the tail of this window is closer than the previously ---- chosen edge (take into account that the previously chosen ---- edge might have been a head, not a tail) */ ---- if (tail + (!*near_edge ? 0 : my_size) > *dest) ---- skip_tail = TRUE; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- ob_debug("my head %d size %d", my_head, my_size); ---- ob_debug("head %d tail %d deest %d", head, tail, *dest); ---- if (!skip_head) { ---- ob_debug("using near edge %d", head); ---- *dest = head; ---- *near_edge = TRUE; ---- } ---- else if (!skip_tail) { ---- ob_debug("using far edge %d", tail); ---- *dest = tail; ---- *near_edge = FALSE; ---- } ----} ---- ----void client_find_edge_directional(ObClient *self, ObDirection dir, ---- gint my_head, gint my_size, ---- gint my_edge_start, gint my_edge_size, ---- gint *dest, gboolean *near_edge) ----{ ---- GList *it; ---- Rect *a, *mon; ---- Rect dock_area; ---- gint edge; ---- ---- a = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, ---- &self->frame->area); ---- mon = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, ---- &self->frame->area); ---- ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- if (my_head >= RECT_TOP(*mon) + 1) ---- edge = RECT_TOP(*mon) - 1; ---- else ---- edge = RECT_TOP(*a) - 1; ---- break; ---- case OB_DIRECTION_SOUTH: ---- if (my_head <= RECT_BOTTOM(*mon) - 1) ---- edge = RECT_BOTTOM(*mon) + 1; ---- else ---- edge = RECT_BOTTOM(*a) + 1; ---- break; ---- case OB_DIRECTION_EAST: ---- if (my_head <= RECT_RIGHT(*mon) - 1) ---- edge = RECT_RIGHT(*mon) + 1; ---- else ---- edge = RECT_RIGHT(*a) + 1; ---- break; ---- case OB_DIRECTION_WEST: ---- if (my_head >= RECT_LEFT(*mon) + 1) ---- edge = RECT_LEFT(*mon) - 1; ---- else ---- edge = RECT_LEFT(*a) - 1; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- /* default to the far edge, then narrow it down */ ---- *dest = edge; ---- *near_edge = TRUE; ---- ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *cur = it->data; ---- ---- /* skip windows to not bump into */ ---- if (cur == self) ---- continue; ---- if (cur->iconic) ---- continue; ---- if (self->desktop != cur->desktop && cur->desktop != DESKTOP_ALL && ---- cur->desktop != screen_desktop) ---- continue; ---- ---- ob_debug("trying window %s", cur->title); ---- ---- detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start, ---- my_edge_size, dest, near_edge); ---- } ---- dock_get_area(&dock_area); ---- detect_edge(dock_area, dir, my_head, my_size, my_edge_start, ---- my_edge_size, dest, near_edge); ---- g_free(a); ---- g_free(mon); ----} ---- ----void client_find_move_directional(ObClient *self, ObDirection dir, ---- gint *x, gint *y) ----{ ---- gint head, size; ---- gint e, e_start, e_size; ---- gboolean near; ---- ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- head = RECT_RIGHT(self->frame->area); ---- size = self->frame->area.width; ---- e_start = RECT_TOP(self->frame->area); ---- e_size = self->frame->area.height; ---- break; ---- case OB_DIRECTION_WEST: ---- head = RECT_LEFT(self->frame->area); ---- size = self->frame->area.width; ---- e_start = RECT_TOP(self->frame->area); ---- e_size = self->frame->area.height; ---- break; ---- case OB_DIRECTION_NORTH: ---- head = RECT_TOP(self->frame->area); ---- size = self->frame->area.height; ---- e_start = RECT_LEFT(self->frame->area); ---- e_size = self->frame->area.width; ---- break; ---- case OB_DIRECTION_SOUTH: ---- head = RECT_BOTTOM(self->frame->area); ---- size = self->frame->area.height; ---- e_start = RECT_LEFT(self->frame->area); ---- e_size = self->frame->area.width; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- client_find_edge_directional(self, dir, head, size, ---- e_start, e_size, &e, &near); ---- *x = self->frame->area.x; ---- *y = self->frame->area.y; ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- if (near) e -= self->frame->area.width; ---- else e++; ---- *x = e; ---- break; ---- case OB_DIRECTION_WEST: ---- if (near) e++; ---- else e -= self->frame->area.width; ---- *x = e; ---- break; ---- case OB_DIRECTION_NORTH: ---- if (near) e++; ---- else e -= self->frame->area.height; ---- *y = e; ---- break; ---- case OB_DIRECTION_SOUTH: ---- if (near) e -= self->frame->area.height; ---- else e++; ---- *y = e; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- frame_frame_gravity(self->frame, x, y); ----} ---- ----void client_find_resize_directional(ObClient *self, ObDirection side, ---- gboolean grow, ---- gint *x, gint *y, gint *w, gint *h) ----{ ---- gint head; ---- gint e, e_start, e_size, delta; ---- gboolean near; ---- ObDirection dir; ---- ---- switch (side) { ---- case OB_DIRECTION_EAST: ---- head = RECT_RIGHT(self->frame->area) + ---- (self->size_inc.width - 1) * (grow ? 1 : -1); ---- e_start = RECT_TOP(self->frame->area); ---- e_size = self->frame->area.height; ---- dir = grow ? OB_DIRECTION_EAST : OB_DIRECTION_WEST; ---- break; ---- case OB_DIRECTION_WEST: ---- head = RECT_LEFT(self->frame->area) - ---- (self->size_inc.width - 1) * (grow ? 1 : -1); ---- e_start = RECT_TOP(self->frame->area); ---- e_size = self->frame->area.height; ---- dir = grow ? OB_DIRECTION_WEST : OB_DIRECTION_EAST; ---- break; ---- case OB_DIRECTION_NORTH: ---- head = RECT_TOP(self->frame->area) - ---- (self->size_inc.height - 1) * (grow ? 1 : -1); ---- e_start = RECT_LEFT(self->frame->area); ---- e_size = self->frame->area.width; ---- dir = grow ? OB_DIRECTION_NORTH : OB_DIRECTION_SOUTH; ---- break; ---- case OB_DIRECTION_SOUTH: ---- head = RECT_BOTTOM(self->frame->area) + ---- (self->size_inc.height - 1) * (grow ? 1 : -1); ---- e_start = RECT_LEFT(self->frame->area); ---- e_size = self->frame->area.width; ---- dir = grow ? OB_DIRECTION_SOUTH : OB_DIRECTION_NORTH; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- ob_debug("head %d dir %d", head, dir); ---- client_find_edge_directional(self, dir, head, 1, ---- e_start, e_size, &e, &near); ---- ob_debug("edge %d", e); ---- *x = self->frame->area.x; ---- *y = self->frame->area.y; ---- *w = self->frame->area.width; ---- *h = self->frame->area.height; ---- switch (side) { ---- case OB_DIRECTION_EAST: ---- if (grow == near) --e; ---- delta = e - RECT_RIGHT(self->frame->area); ---- *w += delta; ---- break; ---- case OB_DIRECTION_WEST: ---- if (grow == near) ++e; ---- delta = RECT_LEFT(self->frame->area) - e; ---- *x -= delta; ---- *w += delta; ---- break; ---- case OB_DIRECTION_NORTH: ---- if (grow == near) ++e; ---- delta = RECT_TOP(self->frame->area) - e; ---- *y -= delta; ---- *h += delta; ---- break; ---- case OB_DIRECTION_SOUTH: ---- if (grow == near) --e; ---- delta = e - RECT_BOTTOM(self->frame->area); ---- *h += delta; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- frame_frame_gravity(self->frame, x, y); ---- *w -= self->frame->size.left + self->frame->size.right; ---- *h -= self->frame->size.top + self->frame->size.bottom; ----} ---- ----ObClient* client_under_pointer(void) ----{ ---- gint x, y; ---- GList *it; ---- ObClient *ret = NULL; ---- ---- if (screen_pointer_pos(&x, &y)) { ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = WINDOW_AS_CLIENT(it->data); ---- if (c->frame->visible && ---- /* check the desktop, this is done during desktop ---- switching and windows are shown/hidden status is not ---- reliable */ ---- (c->desktop == screen_desktop || ---- c->desktop == DESKTOP_ALL) && ---- /* ignore all animating windows */ ---- !frame_iconify_animating(c->frame) && ---- RECT_CONTAINS(c->frame->area, x, y)) ---- { ---- ret = c; ---- break; ---- } ---- } ---- } ---- } ---- return ret; ----} ---- ----gboolean client_has_group_siblings(ObClient *self) ----{ ---- return self->group && self->group->members->next; ----} ---- ----/*! Returns TRUE if the client is running on the same machine as Openbox */ ----gboolean client_on_localhost(ObClient *self) ----{ ---- return self->client_machine == NULL; ----} diff --cc openbox/client.h index 7d89c5ac,6a396cf4,6a396cf4,6a396cf4..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client.h +++ /dev/null @@@@@ -1,731 -1,725 -1,725 -1,725 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __client_h ----#define __client_h ---- ----#include "misc.h" ----#include "mwm.h" ----#include "geom.h" ----#include "stacking.h" ----#include "window.h" ----#include "render/color.h" ---- ----#include ----#include ---- ----#ifdef HAVE_SYS_TYPES_H ----# include /* for pid_t */ ----#endif ---- ----struct _ObFrame; ----struct _ObGroup; ----struct _ObSessionState; ----struct _ObPrompt; ---- ----typedef struct _ObClient ObClient; ---- ----/*! Possible window types */ ----typedef enum ----{ ---- OB_CLIENT_TYPE_DESKTOP, /*!< A desktop (bottom-most window) */ ---- OB_CLIENT_TYPE_DOCK, /*!< A dock bar/panel window */ ---- OB_CLIENT_TYPE_TOOLBAR, /*!< A toolbar window, pulled off an app */ ---- OB_CLIENT_TYPE_MENU, /*!< An unpinned menu from an app */ ---- OB_CLIENT_TYPE_UTILITY, /*!< A small utility window such as a palette */ ---- OB_CLIENT_TYPE_SPLASH, /*!< A splash screen window */ ---- OB_CLIENT_TYPE_DIALOG, /*!< A dialog window */ ---- OB_CLIENT_TYPE_NORMAL /*!< A normal application window */ ----} ObClientType; ---- ----/*! The things the user can do to the client window */ ----typedef enum ----{ ---- OB_CLIENT_FUNC_RESIZE = 1 << 0, /*!< Allow user resizing */ ---- OB_CLIENT_FUNC_MOVE = 1 << 1, /*!< Allow user moving */ ---- OB_CLIENT_FUNC_ICONIFY = 1 << 2, /*!< Allow to be iconified */ ---- OB_CLIENT_FUNC_MAXIMIZE = 1 << 3, /*!< Allow to be maximized */ ---- OB_CLIENT_FUNC_SHADE = 1 << 4, /*!< Allow to be shaded */ ---- OB_CLIENT_FUNC_FULLSCREEN = 1 << 5, /*!< Allow to be made fullscreen */ ---- OB_CLIENT_FUNC_CLOSE = 1 << 6, /*!< Allow to be closed */ ---- OB_CLIENT_FUNC_ABOVE = 1 << 7, /*!< Allow to be put in lower layer */ ---- OB_CLIENT_FUNC_BELOW = 1 << 8, /*!< Allow to be put in higher layer */ ---- OB_CLIENT_FUNC_UNDECORATE = 1 << 9 /*!< Allow to be undecorated */ ----} ObFunctions; ---- ----struct _ObClient ----{ ---- ObWindow obwin; ---- Window window; ---- ---- /*! If this client is managing an ObPrompt window, then this is set to the ---- prompt */ ---- struct _ObPrompt *prompt; ---- ---- /*! The window's decorations. NULL while the window is being managed! */ ---- struct _ObFrame *frame; ---- ---- /*! The number of unmap events to ignore on the window */ ---- gint ignore_unmaps; ---- ---- /*! The id of the group the window belongs to */ ---- struct _ObGroup *group; ---- ---- /*! Saved session data to apply to this client */ ---- struct _ObSessionState *session; ---- ---- /*! Whether or not the client is a transient window. It may or may not ---- have parents when this is true. */ ---- gboolean transient; ---- /*! Whether or not the client is transient for its group */ ---- gboolean transient_for_group; ---- /*! The client which are parents of this client */ ---- GSList *parents; ---- /*! The clients which are transients (children) of this client */ ---- GSList *transients; ---- /*! The desktop on which the window resides (0xffffffff for all ---- desktops) */ ---- guint desktop; ---- ---- /*! The startup id for the startup-notification protocol. This will be ---- NULL if a startup id is not set. */ ---- gchar *startup_id; ---- ---- /*! Normal window title */ ---- gchar *title; ---- /*! Window title when iconified */ ---- gchar *icon_title; ---- /*! The title as requested by the client, without any of our own changes */ ---- gchar *original_title; ---- /*! Hostname of machine running the client */ ---- gchar *client_machine; ---- /*! The command used to run the program. Pre-XSMP window identification. */ ---- gchar *wm_command; ---- /*! The PID of the process which owns the window */ ---- pid_t pid; ---- ---- /*! The application that created the window */ ---- gchar *name; ---- /*! The class of the window, can used for grouping */ ---- gchar *class; ---- /*! The specified role of the window, used for identification */ ---- gchar *role; ---- /*! The session client id for the window. *This can be NULL!* */ ---- gchar *sm_client_id; ---- ---- /*! The type of window (what its function is) */ ---- ObClientType type; ---- ---- /*! Position and size of the window ---- This will not always be the actual position of the window on screen, it ---- is, rather, the position requested by the client, to which the window's ---- gravity is applied. ---- */ ---- Rect area; ---- ---- /*! Position of the client window relative to the root window */ ---- Point root_pos; ---- ---- /*! Position and size of the window prior to being maximized */ ---- Rect pre_max_area; ---- /*! Position and size of the window prior to being fullscreened */ ---- Rect pre_fullscreen_area; ---- ---- /*! The window's strut ---- The strut defines areas of the screen that are marked off-bounds for ---- window placement. In theory, where this window exists. ---- */ ---- StrutPartial strut; ---- ---- /*! The logical size of the window ---- The "logical" size of the window is refers to the user's perception of ---- the size of the window, and is the value that should be displayed to the ---- user. For example, with xterms, this value it the number of characters ---- being displayed in the terminal, instead of the number of pixels. ---- */ ---- Size logical_size; ---- ---- /*! Width of the border on the window. ---- The window manager will set this to 0 while the window is being managed, ---- but needs to restore it afterwards, so it is saved here. ---- */ ---- gint border_width; ---- ---- /*! The minimum aspect ratio the client window can be sized to. ---- A value of 0 means this is ignored. ---- */ ---- gfloat min_ratio; ---- /*! The maximum aspect ratio the client window can be sized to. ---- A value of 0 means this is ignored. ---- */ ---- gfloat max_ratio; ---- ---- /*! The minimum size of the client window ---- If the min is > the max, then the window is not resizable ---- */ ---- Size min_size; ---- /*! The maximum size of the client window ---- If the min is > the max, then the window is not resizable ---- */ ---- Size max_size; ---- /*! The size of increments to resize the client window by */ ---- Size size_inc; ---- /*! The base size of the client window ---- This value should be subtracted from the window's actual size when ---- displaying its size to the user, or working with its min/max size ---- */ ---- Size base_size; ---- ---- /*! Window decoration and functionality hints */ ---- ObMwmHints mwmhints; ---- ---- /*! The client's specified colormap */ ---- Colormap colormap; ---- ---- /*! Where to place the decorated window in relation to the undecorated ---- window */ ---- gint gravity; ---- ---- /*! The state of the window, one of WithdrawnState, IconicState, or ---- NormalState */ ---- glong wmstate; ---- ---- /*! True if the client supports the delete_window protocol */ ---- gboolean delete_window; ---- ---- /*! Was the window's position requested by the application or the user? ---- if by the application, we force it completely onscreen, if by the user ---- we only force it if it tries to go completely offscreen, if neither, we ---- should place the window ourselves when it first appears */ ---- guint positioned; ---- ---- /*! Was the window's size requested by the application or the user? ---- If by the application we don't let it go outside the available area */ ---- guint sized; ---- ---- /*! Can the window receive input focus? */ ---- gboolean can_focus; ---- /*! Notify the window when it receives focus? */ ---- gboolean focus_notify; ---- ---- /*! Will the client respond to pings? */ ---- gboolean ping; ---- /*! Indicates if the client is trying to close but has stopped responding ---- to pings */ ---- gboolean not_responding; ---- /*! A prompt shown when you are trying to close a client that is not ---- responding. It asks if you want to kill the client */ ---- struct _ObPrompt *kill_prompt; ---- /*! We tried to close the window with a SIGTERM */ ---- gint kill_level; ---- ----#ifdef SYNC ---- /*! The client wants to sync during resizes */ ---- gboolean sync_request; ---- /*! The XSync counter used for synchronizing during resizes */ ---- guint32 sync_counter; ---- /*! The value we're waiting for the counter to reach */ ---- gulong sync_counter_value; ----#endif ---- ---- /*! The window uses shape extension to be non-rectangular? */ ---- gboolean shaped; ---- ---- /*! The window is modal, so it must be processed before any windows it is ---- related to can be focused */ ---- gboolean modal; ---- /*! Only the window's titlebar is displayed */ ---- gboolean shaded; ---- /*! The window is iconified */ ---- gboolean iconic; ---- /*! The window is maximized to fill the screen vertically */ ---- gboolean max_vert; ---- /*! The window is maximized to fill the screen horizontally */ ---- gboolean max_horz; ---- /*! The window should not be displayed by pagers */ ---- gboolean skip_pager; ---- /*! The window should not be displayed by taskbars */ ---- gboolean skip_taskbar; ---- /*! The window is a 'fullscreen' window, and should be on top of all ---- others */ ---- gboolean fullscreen; ---- /*! The window should be on top of other windows of the same type. ---- above takes priority over below. */ ---- gboolean above; ---- /*! The window should be underneath other windows of the same type. ---- above takes priority over below. */ ---- gboolean below; ---- /*! Demands attention flag */ ---- gboolean demands_attention; ---- ---- /*! The urgent flag */ ---- gboolean urgent; ---- ---- /*! The layer in which the window will be stacked, windows in lower layers ---- are always below windows in higher layers. */ ---- ObStackingLayer layer; ---- ---- /*! A bitmask of values in the ObFrameDecorations enum ---- The values in the variable are the decorations that the client wants to ---- be displayed around it. ---- */ ---- guint decorations; ---- ---- /*! A user option. When this is set to TRUE the client will not ever ---- be decorated. ---- */ ---- gboolean undecorated; ---- ---- /*! A bitmask of values in the ObFunctions enum ---- The values in the variable specify the ways in which the user is allowed ---- to modify this window. ---- */ ---- guint functions; - - /*! Prevent window from being accidentally acted upon */ - gboolean locked; ---- ---- /* The window's icon, in a variety of shapes and sizes */ ---- RrImage *icon_set; ---- ---- /*! Where the window should iconify to/from */ ---- Rect icon_geometry; ---- ---- /*! A boolean used for algorithms which need to mark clients as visited */ ---- gboolean visited; ----}; ---- ----extern GList *client_list; ---- ----void client_startup(gboolean reconfig); ----void client_shutdown(gboolean reconfig); ---- ----typedef void (*ObClientCallback)(ObClient *client, gpointer data); ---- ----/* Callback functions */ ---- ----/*! Get notified when the client is unmanaged */ ----void client_add_destroy_notify(ObClientCallback func, gpointer data); ----void client_remove_destroy_notify(ObClientCallback func); ---- ----/*! Manages a given window ---- @param prompt This specifies an ObPrompt which is being managed. It is ---- possible to manage Openbox-owned windows through this. ----*/ ----void client_manage(Window win, struct _ObPrompt *prompt); ----/*! Unmanages all managed windows */ ----void client_unmanage_all(void); ----/*! Unmanages a given client */ ----void client_unmanage(ObClient *client); ---- ----/*! This manages a window only so far as is needed to get it's decorations. ---- This is used when you want to determine a window's decorations before it ---- is mapped. Call client_fake_unmanage() with the returned client when you ---- are done with it. */ ----ObClient *client_fake_manage(Window win); ----/*! Free the stuff created by client_fake_manage() */ ----void client_fake_unmanage(ObClient *self); ---- ----/*! Sets the client list on the root window from the client_list */ ----void client_set_list(void); ---- ----/*! Determines if the client should be shown or hidden currently. ---- @return TRUE if it should be visible; otherwise, FALSE. ----*/ ----gboolean client_should_show(ObClient *self); ---- ----/*! Returns if the window should be treated as a normal window. ---- Some windows (desktops, docks, splash screens) have special rules applied ---- to them in a number of places regarding focus or user interaction. */ ----gboolean client_normal(ObClient *self); ---- ----/*! Returns if the window is one of an application's helper windows ---- (utilty, menu, etc) */ ----gboolean client_helper(ObClient *self); ---- ----/*! Return if the client is a type which should be given focus from mouse ---- presses on the *client* window. This doesn't affect clicking on the ---- decorations. This doesn't count for focus cycling, different rules apply to ---- that. */ ----gboolean client_mouse_focusable(ObClient *self); ---- ----/*! Return if the client is a type which should be given focus from the ---- mouse entering the window. This doesn't count for focus cycling, different ---- rules apply to that. */ ----gboolean client_enter_focusable(ObClient *self); ---- ----/* Returns if the window is focused */ ----gboolean client_focused(ObClient *self); ---- ----/*! When the client is resized but not moved, figure out the new position ---- for it based on its gravity: ---- http://standards.freedesktop.org/wm-spec/wm-spec-1.4.html#id2512541 ----*/ ----void client_gravity_resize_w(ObClient *self, gint *x, gint oldw, gint neww); ---- ----/*! When the client is resized but not moved, figure out the new position ---- for it based on its gravity: ---- http://standards.freedesktop.org/wm-spec/wm-spec-1.4.html#id2512541 ----*/ ----void client_gravity_resize_h(ObClient *self, gint *y, gint oldh, gint newh); ---- ----/*! Convert a position/size from a given gravity to the client's true gravity, ---- when the client is only resizing (the reference point doesn't move) ---- */ ----void client_convert_gravity_resize(ObClient *self, gint gravity, ---- gint *x, gint *y, ---- gint w, gint h); ---- ----#define client_move(self, x, y) \ ---- client_configure(self, x, y, self->area.width, self->area.height, TRUE, TRUE,\ ---- FALSE) ----#define client_resize(self, w, h) \ ---- client_configure(self, self->area.x, self->area.y, w, h, TRUE, TRUE, FALSE) ----#define client_move_resize(self, x, y, w, h) \ ---- client_configure(self, x, y, w, h, TRUE, TRUE, FALSE) ----#define client_reconfigure(self, force) \ ---- client_configure(self, ((ObClient*)self)->area.x, ((ObClient*)self)->area.y, \ ---- ((ObClient*)self)->area.width, \ ---- ((ObClient*)self)->area.height, FALSE, TRUE, force) ---- ----/*! Figure out where a window will end up and what size it will be if you ---- told it to move/resize to these coordinates. ---- ---- These values are what client_configure will give the window. ---- ---- @param x The x coordiante of the new position for the client. ---- @param y The y coordiante of the new position for the client. ---- @param w The width component of the new size for the client. ---- @param h The height component of the new size for the client. ---- @param logicalw Returns the width component of the new logical width. ---- This value is only returned when the new w or h calculated ---- differ from the ones passed in. ---- @param logicalh Returns the height component of the new logical height. ---- This value is only returned when the new w or h calculated ---- differ from the ones passed in. ---- @param user Specifies whether this is a user-requested change or a ---- program requested change. For program requested changes, the ---- constraints are not checked. ----*/ ----void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, ---- gint *logicalw, gint *logicalh, ---- gboolean user); ---- ----/*! Move and/or resize the window. ---- This also maintains things like the client's minsize, and size increments. ---- @param x The x coordiante of the new position for the client. ---- @param y The y coordiante of the new position for the client. ---- @param w The width component of the new size for the client. ---- @param h The height component of the new size for the client. ---- @param user Specifies whether this is a user-requested change or a ---- program requested change. For program requested changes, the ---- constraints are not checked. ---- @param final If user is true, then this should specify if this is a final ---- configuration. e.g. Final should be FALSE if doing an ---- interactive move/resize, and then be TRUE for the last call ---- only. ---- @param force_reply Send a ConfigureNotify to the client regardless of if ---- the position/size changed. ----*/ ----void client_configure(ObClient *self, gint x, gint y, gint w, gint h, ---- gboolean user, gboolean final, gboolean force_reply); ---- ----/*! Finds coordinates to keep a client on the screen. ---- @param self The client ---- @param x The x coord of the client, may be changed. ---- @param y The y coord of the client, may be changed. ---- @param w The width of the client. ---- @param w The height of the client. ---- @param rude Be rude about it. If false, it is only moved if it is entirely ---- not visible. If true, then make sure the window is inside the ---- struts if possible. ---- @return true if the client was moved to be on-screen; false if not. ----*/ ----gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, ---- gboolean rude); ---- ----/*! Moves a client so that it is on screen if it is entirely out of the ---- viewable screen. ---- @param self The client to move ---- @param rude Be rude about it. If false, it is only moved if it is entirely ---- not visible. If true, then make sure the window is inside the ---- struts if possible. ----*/ ----void client_move_onscreen(ObClient *self, gboolean rude); ---- ----/*! dir is either North, South, East or West. It can't be, for example, ---- Northwest */ ----void client_find_edge_directional(ObClient *self, ObDirection dir, ---- gint my_head, gint my_tail, ---- gint my_edge_start, gint my_edge_size, ---- gint *dest, gboolean *near_edge); ----void client_find_move_directional(ObClient *self, ObDirection dir, ---- gint *x, gint *y); ----void client_find_resize_directional(ObClient *self, ObDirection side, ---- gboolean grow, ---- gint *x, gint *y, gint *w, gint *h); ---- ----/*! Fullscreen's or unfullscreen's the client window ---- @param fs true if the window should be made fullscreen; false if it should ---- be returned to normal state. ----*/ ----void client_fullscreen(ObClient *self, gboolean fs); ---- ----/*! Iconifies or uniconifies the client window ---- @param iconic true if the window should be iconified; false if it should be ---- restored. ---- @param curdesk If iconic is FALSE, then this determines if the window will ---- be uniconified to the current viewable desktop (true) or to ---- its previous desktop (false) ----*/ ----void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk, ---- gboolean hide_animation); ---- ----/*! Maximize or unmaximize the client window ---- @param max true if the window should be maximized; false if it should be ---- returned to normal size. ---- @param dir 0 to set both horz and vert, 1 to set horz, 2 to set vert. ----*/ ----void client_maximize(ObClient *self, gboolean max, gint dir); ---- ----/*! Shades or unshades the client window ---- @param shade true if the window should be shaded; false if it should be ---- unshaded. ----*/ ----void client_shade(ObClient *self, gboolean shade); - - /*! Set a client window to be locked or not */ - void client_set_locked(ObClient *self, gboolean locked); ---- ----/*! Set a client window to have decorations or not */ ----void client_set_undecorated(ObClient *self, gboolean undecorated); ---- ----/*! Hilite the window to make the user notice it */ ----void client_hilite(ObClient *self, gboolean hilite); ---- ----/*! Request the client to close its window */ ----void client_close(ObClient *self); ---- ----/*! Kill the client off violently */ ----void client_kill(ObClient *self); ---- ----/*! Sends the window to the specified desktop ---- @param donthide If TRUE, the window will not be shown/hidden after its ---- desktop has been changed. Generally this should be FALSE. ---- @param dontraise If TRUE, the window will not be raised. Generally this should ---- be FALSE. ----*/ ----void client_set_desktop(ObClient *self, guint target, gboolean donthide, ---- gboolean dontraise); ---- ----/*! Show the client if it should be shown. Returns if the window is shown. */ ----gboolean client_show(ObClient *self); ---- ----/*! Show the client if it should be shown. Returns if the window is hidden. */ ----gboolean client_hide(ObClient *self); ---- ----/*! Show the client if it should be shown, and hide it if it should be ---- hidden. This is for example, when switching desktops. ----*/ ----void client_showhide(ObClient *self); ---- ----/*! Validate client, by making sure no Destroy or Unmap events exist in ---- the event queue for the window. ---- @return true if the client is valid; false if the client has already ---- been unmapped/destroyed, and so is invalid. ----*/ ----gboolean client_validate(ObClient *self); ---- ----/*! Sets the wm_state to the specified value */ ----void client_set_wm_state(ObClient *self, glong state); ---- ----/*! Adjusts the window's net_state ---- This should not be called as part of the window mapping process! It is for ---- use when updating the state post-mapping.
---- client_apply_startup_state is used to do the same things during the mapping ---- process. ----*/ ----void client_set_state(ObClient *self, Atom action, glong data1, glong data2); ---- ----/* Given a ObClient, find the client that focus would actually be sent to if ---- you wanted to give focus to the specified ObClient. Will return the same ---- ObClient passed to it or another ObClient if appropriate. */ ----ObClient *client_focus_target(ObClient *self); ---- ----/*! Returns what client_focus would return if passed the same client, but ---- without focusing it or modifying the focus order lists. */ ----gboolean client_can_focus(ObClient *self); ---- ----/*! Attempt to focus the client window */ ----gboolean client_focus(ObClient *self); ---- ----/*! Activates the client for use, focusing, uniconifying it, etc. To be used ---- when the user deliberately selects a window for use. ---- @param here If true, then the client is brought to the current desktop; ---- otherwise, the desktop is changed to where the client lives. ---- @param raise If true, the client is brought to the front. ---- @param unshade If true, the client is unshaded (if it is shaded) ---- @param user If true, then a user action is what requested the activation; ---- otherwise, it means an application requested it on its own ----*/ ----void client_activate(ObClient *self, gboolean here, gboolean raise, ---- gboolean unshade, gboolean user); ---- ----/*! Bring all of its helper windows to its desktop. These are the utility and ---- stuff windows. */ ----void client_bring_helper_windows(ObClient *self); ---- ----/*! Bring all of its modal windows to its desktop. */ ----void client_bring_modal_windows(ObClient *self); ---- ----/*! Calculates the stacking layer for the client window */ ----void client_calc_layer(ObClient *self); ---- ----/*! Updates the window's transient status, and any parents of it */ ----void client_update_transient_for(ObClient *self); ----/*! Update the protocols that the window supports and adjusts things if they ---- change */ ----void client_update_protocols(ObClient *self); ----#ifdef SYNC ----/*! Updates the window's sync request counter for resizes */ ----void client_update_sync_request_counter(ObClient *self); ----#endif ----/*! Updates the window's colormap */ ----void client_update_colormap(ObClient *self, Colormap colormap); ----/*! Updates the WMNormalHints and adjusts things if they change */ ----void client_update_normal_hints(ObClient *self); ---- ----/*! Updates the WMHints and adjusts things if they change ---- @param initstate Whether to read the initial_state property from the ---- WMHints. This should only be used during the mapping ---- process. ----*/ ----void client_update_wmhints(ObClient *self); ----/*! Updates the window's title and icon title */ ----void client_update_title(ObClient *self); ----/*! Updates the strut for the client */ ----void client_update_strut(ObClient *self); ----/*! Updates the window's icons */ ----void client_update_icons(ObClient *self); ----/*! Updates the window's icon geometry (where to iconify to/from) */ ----void client_update_icon_geometry(ObClient *self); ---- ----/*! Set up what decor should be shown on the window and what functions should ---- be allowed (ObClient::decorations and ObClient::functions). ---- This also updates the NET_WM_ALLOWED_ACTIONS hint. ---- @param reconfig When TRUE, the window will be reconfigured to show the ---- changes ----*/ ----void client_setup_decor_and_functions(ObClient *self, gboolean reconfig); ---- ----/*! Sets the window's type and transient flag */ ----void client_get_type_and_transientness(ObClient *self); ---- ----/*! Returns a client's icon set, or its parents (recursively) if it doesn't ---- have one ----*/ ----RrImage* client_icon(ObClient *self); ---- ----/*! Return TRUE if the client is transient for some other window. Return ---- FALSE if it's not transient or there is no window for it to be ---- transient for */ ----gboolean client_has_parent(ObClient *self); ---- ----/*! Searches a client's direct parents for a focused window. The function does ---- not check for the passed client, only for *ONE LEVEL* of its parents. ---- If no focused parentt is found, NULL is returned. ----*/ ----ObClient *client_search_focus_parent(ObClient *self); ---- ----/*! Searches a client's transients for a focused window. The function does not ---- check for the passed client, only for its transients. ---- If no focused transient is found, NULL is returned. ----*/ ----ObClient *client_search_focus_tree(ObClient *self); ---- ----/*! Searches a client's transient tree for a focused window. The function ---- searches up the tree and down other branches as well as the passed client's. ---- If no focused client is found, NULL is returned. ----*/ ----ObClient *client_search_focus_tree_full(ObClient *self); ---- ----/*! Searches a client's group and each member's transients for a focused ---- window. This doesn't go up the window's transient tree at all. If no ---- focused client is found, NULL is returned. */ ----ObClient *client_search_focus_group_full(ObClient *self); ---- ----/*! Return a modal child of the client window that can be focused. ---- @return A modal child of the client window that can be focused, or 0 if ---- none was found. ----*/ ----ObClient *client_search_modal_child(ObClient *self); ---- ----/*! Returns a list of top-level windows which this is a transient for. ---- It will only contain more than 1 element if the client is transient for its ---- group. ----*/ ----GSList *client_search_all_top_parents(ObClient *self); ---- ----/*! Returns a list of top-level windows which this is a transient for, and ---- which are in the same layer as this client. ---- It will only contain more than 1 element if the client is transient for its ---- group. ----*/ ----GSList *client_search_all_top_parents_layer(ObClient *self); ---- ----/*! Returns the client's parent when it is transient for a direct window ---- rather than a group. If it has no parents, or is transient for the ---- group, this returns null */ ----ObClient *client_direct_parent(ObClient *self); ---- ----/*! Returns a window's top level parent. This only counts direct parents, ---- not groups if it is transient for its group. ----*/ ----ObClient *client_search_top_direct_parent(ObClient *self); ---- ----/*! Is one client a direct child of another (i.e. not through the group.) ---- This checks more than one level, so there may be another direct child in ---- between */ ----gboolean client_is_direct_child(ObClient *parent, ObClient *child); ---- ----/*! Search for a parent of a client. This only searches up *ONE LEVEL*, and ---- returns the searched for parent if it is a parent, or NULL if not. */ ----ObClient *client_search_parent(ObClient *self, ObClient *search); ---- ----/*! Search for a transient of a client. The transient is returned if it is one, ---- NULL is returned if the given search is not a transient of the client. */ ----ObClient *client_search_transient(ObClient *self, ObClient *search); ---- ----/*! Set a client window to be above/below other clients. ---- @layer < 0 indicates the client should be placed below other clients.
---- = 0 indicates the client should be placed with other clients.
---- > 0 indicates the client should be placed above other clients. ----*/ ----void client_set_layer(ObClient *self, gint layer); ---- ----guint client_monitor(ObClient *self); ---- ----ObClient* client_under_pointer(void); ---- ----gboolean client_has_group_siblings(ObClient *self); ---- ----/*! Returns TRUE if the client is running on the same machine as Openbox */ ----gboolean client_on_localhost(ObClient *self); ---- ----#endif diff --cc openbox/client_list_combined_menu.c index a04d07d6,a04d07d6,a04d07d6,464036f7..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_list_combined_menu.c +++ /dev/null @@@@@ -1,158 -1,158 -1,158 -1,161 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_list_menu.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "openbox.h" ----#include "menu.h" ----#include "menuframe.h" ----#include "screen.h" ----#include "client.h" ----#include "client_list_combined_menu.h" ----#include "focus.h" ----#include "config.h" ----#include "gettext.h" ---- ----#include ---- ----#define MENU_NAME "client-list-combined-menu" ---- ----static ObMenu *combined_menu; ---- ----#define SEPARATOR -1 ----#define ADD_DESKTOP -2 ----#define REMOVE_DESKTOP -3 ---- ----static gboolean self_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- ObMenuEntry *e; ---- GList *it; ---- guint desktop; ---- ---- menu_clear_entries(menu); ---- ---- for (desktop = 0; desktop < screen_num_desktops; desktop++) { ---- gboolean empty = TRUE; ---- gboolean onlyiconic = TRUE; - gboolean noicons = TRUE; ---- ---- menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]); ---- for (it = focus_order; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (client_normal(c) && (!c->skip_taskbar || c->iconic) && ---- (c->desktop == desktop || c->desktop == DESKTOP_ALL)) ---- { ---- empty = FALSE; ---- ---- if (c->iconic) { --- gchar *title = g_strdup_printf("(%s)", c->icon_title); --- e = menu_add_normal(menu, desktop, title, NULL, FALSE); --- g_free(title); - if (noicons) { - menu_add_separator(menu, -1, NULL); - noicons = FALSE; - } - e = menu_add_normal(menu, desktop, c->icon_title, NULL, FALSE); ---- } else { ---- onlyiconic = FALSE; ---- e = menu_add_normal(menu, desktop, c->title, NULL, FALSE); ---- } ---- ---- if (config_menu_client_list_icons) { ---- e->data.normal.icon = client_icon(c); ---- RrImageRef(e->data.normal.icon); ---- e->data.normal.icon_alpha = ---- c->iconic ? OB_ICONIC_ALPHA : 0xff; ---- } ---- ---- e->data.normal.data = c; ---- } ---- } ---- ---- if (empty || onlyiconic) { ---- /* no entries or only iconified windows, so add a ---- * way to go to this desktop without uniconifying a window */ ---- if (!empty) ---- menu_add_separator(menu, SEPARATOR, NULL); ---- ---- e = menu_add_normal(menu, desktop, _("Go there..."), NULL, TRUE); ---- if (desktop == screen_desktop) ---- e->data.normal.enabled = FALSE; ---- } ---- } ---- ---- if (config_menu_manage_desktops) { ---- menu_add_separator(menu, SEPARATOR, _("Manage desktops")); ---- menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); ---- menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), ---- NULL, TRUE); ---- } ---- ---- return TRUE; /* always show the menu */ ----} ---- ----static void menu_execute(ObMenuEntry *self, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- if (self->id == ADD_DESKTOP) { ---- screen_add_desktop(FALSE); ---- menu_frame_hide_all(); ---- } ---- else if (self->id == REMOVE_DESKTOP) { ---- screen_remove_desktop(FALSE); ---- menu_frame_hide_all(); ---- } ---- else { ---- ObClient *t = self->data.normal.data; ---- if (t) { /* it's set to NULL if its destroyed */ ---- client_activate(t, FALSE, TRUE, TRUE, TRUE); ---- /* if the window is omnipresent then we need to go to its ---- desktop */ ---- if (t->desktop == DESKTOP_ALL) ---- screen_set_desktop(self->id, FALSE); ---- } ---- else ---- screen_set_desktop(self->id, TRUE); ---- } ----} ---- ----static void client_dest(ObClient *client, gpointer data) ----{ ---- /* This concise function removes all references to a closed ---- * client in the client_list_menu, so we don't have to check ---- * in client.c */ ---- GList *eit; ---- for (eit = combined_menu->entries; eit; eit = g_list_next(eit)) { ---- ObMenuEntry *meit = eit->data; ---- if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- meit->data.normal.data == client) ---- { ---- meit->data.normal.data = NULL; ---- } ---- } ----} ---- ----void client_list_combined_menu_startup(gboolean reconfig) ----{ ---- if (!reconfig) ---- client_add_destroy_notify(client_dest, NULL); ---- ---- combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL); ---- menu_set_update_func(combined_menu, self_update); ---- menu_set_execute_func(combined_menu, menu_execute); ----} ---- ----void client_list_combined_menu_shutdown(gboolean reconfig) ----{ ---- if (!reconfig) ---- client_remove_destroy_notify(client_dest); ----} diff --cc openbox/client_list_combined_menu.h index 420e898e,420e898e,420e898e,420e898e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_list_combined_menu.h +++ /dev/null @@@@@ -1,26 -1,26 -1,26 -1,26 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_list_menu.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__client_list_combined_menu_h ----#define ob__client_list_combined_menu_h ---- ----void client_list_combined_menu_startup(gboolean reconfig); ----void client_list_combined_menu_shutdown(gboolean reconfig); ---- ----#endif diff --cc openbox/client_list_menu.c index 4ec6e785,4ec6e785,4ec6e785,3fdd179b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_list_menu.c +++ /dev/null @@@@@ -1,212 -1,212 -1,212 -1,215 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_list_menu.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "openbox.h" ----#include "menu.h" ----#include "menuframe.h" ----#include "screen.h" ----#include "client.h" ----#include "client_list_menu.h" ----#include "focus.h" ----#include "config.h" ----#include "gettext.h" ---- ----#include ---- ----#define MENU_NAME "client-list-menu" ---- ----static GSList *desktop_menus; ---- ----typedef struct ----{ ---- guint desktop; ----} DesktopData; ---- ----#define SEPARATOR -1 ----#define ADD_DESKTOP -2 ----#define REMOVE_DESKTOP -3 ---- ----static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- DesktopData *d = data; ---- GList *it; ---- gboolean empty = TRUE; ---- gboolean onlyiconic = TRUE; - gboolean noicons = TRUE; ---- ---- menu_clear_entries(menu); ---- ---- for (it = focus_order; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (client_normal(c) && (!c->skip_taskbar || c->iconic) && ---- (c->desktop == d->desktop || c->desktop == DESKTOP_ALL)) ---- { ---- ObMenuEntry *e; ---- ---- empty = FALSE; ---- ---- if (c->iconic) { --- gchar *title = g_strdup_printf("(%s)", c->icon_title); --- e = menu_add_normal(menu, d->desktop, title, NULL, FALSE); --- g_free(title); - if (noicons) { - menu_add_separator(menu, -1, NULL); - noicons = FALSE; - } - e = menu_add_normal(menu, d->desktop, c->icon_title, NULL, FALSE); ---- } else { ---- onlyiconic = FALSE; ---- e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE); ---- } ---- ---- if (config_menu_client_list_icons) { ---- e->data.normal.icon = client_icon(c); ---- RrImageRef(e->data.normal.icon); ---- e->data.normal.icon_alpha = c->iconic ? OB_ICONIC_ALPHA : 0xff; ---- } ---- ---- e->data.normal.data = c; ---- } ---- } ---- ---- if (empty || onlyiconic) { ---- ObMenuEntry *e; ---- ---- /* no entries or only iconified windows, so add a ---- * way to go to this desktop without uniconifying a window */ ---- if (!empty) ---- menu_add_separator(menu, SEPARATOR, NULL); ---- ---- e = menu_add_normal(menu, d->desktop, _("Go there..."), NULL, TRUE); ---- if (d->desktop == screen_desktop) ---- e->data.normal.enabled = FALSE; ---- } ---- ---- return TRUE; /* always show */ ----} ---- ----static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- ObClient *t = self->data.normal.data; ---- if (t) { /* it's set to NULL if its destroyed */ ---- client_activate(t, FALSE, TRUE, TRUE, TRUE); ---- /* if the window is omnipresent then we need to go to its ---- desktop */ ---- if (t->desktop == DESKTOP_ALL) ---- screen_set_desktop(self->id, FALSE); ---- } ---- else ---- screen_set_desktop(self->id, TRUE); ----} ---- ----static void desk_menu_destroy(ObMenu *menu, gpointer data) ----{ ---- DesktopData *d = data; ---- ---- g_free(d); ---- ---- desktop_menus = g_slist_remove(desktop_menus, menu); ----} ---- ----static gboolean self_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- guint i; ---- ---- menu_clear_entries(menu); ---- ---- while (desktop_menus) { ---- menu_free(desktop_menus->data); ---- desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus); ---- } ---- ---- for (i = 0; i < screen_num_desktops; ++i) { ---- ObMenu *submenu; ---- gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); ---- DesktopData *ddata = g_new(DesktopData, 1); ---- ---- ddata->desktop = i; ---- submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata); ---- menu_set_update_func(submenu, desk_menu_update); ---- menu_set_execute_func(submenu, desk_menu_execute); ---- menu_set_destroy_func(submenu, desk_menu_destroy); ---- ---- menu_add_submenu(menu, i, name); ---- ---- g_free(name); ---- ---- desktop_menus = g_slist_append(desktop_menus, submenu); ---- } ---- ---- if (config_menu_manage_desktops) { ---- menu_add_separator(menu, SEPARATOR, NULL); ---- menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); ---- menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), ---- NULL, TRUE); ---- } ---- ---- return TRUE; /* always show */ ----} ---- ----static void self_execute(ObMenuEntry *self, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- if (self->id == ADD_DESKTOP) { ---- screen_add_desktop(FALSE); ---- menu_frame_hide_all(); ---- } ---- else if (self->id == REMOVE_DESKTOP) { ---- screen_remove_desktop(FALSE); ---- menu_frame_hide_all(); ---- } ----} ---- ----static void client_dest(ObClient *client, gpointer data) ----{ ---- /* This concise function removes all references to a closed ---- * client in the client_list_menu, so we don't have to check ---- * in client.c */ ---- GSList *it; ---- for (it = desktop_menus; it; it = g_slist_next(it)) { ---- ObMenu *mit = it->data; ---- GList *eit; ---- for (eit = mit->entries; eit; eit = g_list_next(eit)) { ---- ObMenuEntry *meit = eit->data; ---- if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- meit->data.normal.data == client) ---- { ---- meit->data.normal.data = NULL; ---- } ---- } ---- } ----} ---- ----void client_list_menu_startup(gboolean reconfig) ----{ ---- ObMenu *menu; ---- ---- if (!reconfig) ---- client_add_destroy_notify(client_dest, NULL); ---- ---- menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL); ---- menu_set_update_func(menu, self_update); ---- menu_set_execute_func(menu, self_execute); ----} ---- ----void client_list_menu_shutdown(gboolean reconfig) ----{ ---- if (!reconfig) ---- client_remove_destroy_notify(client_dest); ----} diff --cc openbox/client_list_menu.h index 860cd505,860cd505,860cd505,860cd505..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_list_menu.h +++ /dev/null @@@@@ -1,26 -1,26 -1,26 -1,26 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_list_menu.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__client_list_menu_h ----#define ob__client_list_menu_h ---- ----void client_list_menu_startup(gboolean reconfig); ----void client_list_menu_shutdown(gboolean reconfig); ---- ----#endif diff --cc openbox/client_menu.c index 6f154705,04f50e85,04f50e85,67b37915..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_menu.c +++ /dev/null @@@@@ -1,430 -1,426 -1,426 -1,428 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_menu.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "menu.h" ----#include "menuframe.h" ----#include "config.h" ----#include "screen.h" ----#include "client.h" ----#include "client_menu.h" ----#include "openbox.h" ----#include "frame.h" ----#include "moveresize.h" ----#include "event.h" ----#include "gettext.h" ----#include "obt/prop.h" ---- ----#include ---- ----#define CLIENT_MENU_NAME "client-menu" ----#define SEND_TO_MENU_NAME "client-send-to-menu" ----#define LAYER_MENU_NAME "client-layer-menu" ---- ----enum { ---- LAYER_TOP, ---- LAYER_NORMAL, ---- LAYER_BOTTOM ----}; ---- ----enum { ---- CLIENT_SEND_TO, ---- CLIENT_LAYER, ---- CLIENT_ICONIFY, ---- CLIENT_RESTORE, ---- CLIENT_MAXIMIZE, ---- CLIENT_SHADE, ---- CLIENT_DECORATE, ---- CLIENT_MOVE, ---- CLIENT_RESIZE, ---- CLIENT_CLOSE ----}; ---- ----static gboolean client_menu_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- GList *it; ---- ---- if (frame->client == NULL || !client_normal(frame->client)) ---- return FALSE; /* don't show the menu */ ---- ---- for (it = menu->entries; it; it = g_list_next(it)) { ---- ObMenuEntry *e = it->data; ---- gboolean *en = &e->data.normal.enabled; /* save some typing */ ---- ObClient *c = frame->client; ---- ---- if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) { - if (c->locked) { - *en = FALSE; - continue; - } ---- switch (e->id) { ---- case CLIENT_ICONIFY: ---- *en = c->functions & OB_CLIENT_FUNC_ICONIFY; ---- break; ---- case CLIENT_RESTORE: ---- *en = c->max_horz || c->max_vert; ---- break; ---- case CLIENT_MAXIMIZE: ---- *en = ((c->functions & OB_CLIENT_FUNC_MAXIMIZE) && ---- (!c->max_horz || !c->max_vert)); ---- break; ---- case CLIENT_SHADE: ---- *en = c->functions & OB_CLIENT_FUNC_SHADE; ---- break; ---- case CLIENT_MOVE: ---- *en = c->functions & OB_CLIENT_FUNC_MOVE; ---- break; ---- case CLIENT_RESIZE: ---- *en = c->functions & OB_CLIENT_FUNC_RESIZE; ---- break; ---- case CLIENT_CLOSE: ---- *en = c->functions & OB_CLIENT_FUNC_CLOSE; ---- break; ---- case CLIENT_DECORATE: ---- *en = c->functions & OB_CLIENT_FUNC_UNDECORATE; ---- break; ---- default: ---- *en = TRUE; ---- } ---- } ---- } ---- return TRUE; /* show the menu */ ----} ---- ----static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- gint x, y; ---- gulong ignore_start; ---- ---- g_assert(c); ---- ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- ---- switch (e->id) { ---- case CLIENT_ICONIFY: ---- /* the client won't be on screen anymore so hide the menu */ ---- menu_frame_hide_all(); ---- f = NULL; /* and don't update */ ---- ---- client_iconify(c, TRUE, FALSE, FALSE); ---- break; ---- case CLIENT_RESTORE: ---- client_maximize(c, FALSE, 0); ---- break; ---- case CLIENT_MAXIMIZE: ---- client_maximize(c, TRUE, 0); ---- break; ---- case CLIENT_SHADE: ---- client_shade(c, !c->shaded); ---- break; ---- case CLIENT_DECORATE: ---- client_set_undecorated(c, !c->undecorated); ---- break; ---- case CLIENT_MOVE: ---- /* this needs to grab the keyboard so hide the menu */ ---- menu_frame_hide_all(); ---- f = NULL; /* and don't update */ ---- ---- screen_pointer_pos(&x, &y); ---- moveresize_start(c, x, y, 0, ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)); ---- break; ---- case CLIENT_RESIZE: ---- /* this needs to grab the keyboard so hide the menu */ ---- menu_frame_hide_all(); ---- f = NULL; /* and don't update */ ---- ---- screen_pointer_pos(&x, &y); ---- moveresize_start(c, x, y, 0, ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)); ---- break; ---- case CLIENT_CLOSE: ---- client_close(c); ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- ---- /* update the menu cuz stuff can have changed */ ---- if (f) { ---- client_menu_update(f, NULL); ---- menu_frame_render(f); ---- } ----} ---- ----static gboolean layer_menu_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- GList *it; ---- ---- if (frame->client == NULL || !client_normal(frame->client)) ---- return FALSE; /* don't show the menu */ ---- ---- for (it = menu->entries; it; it = g_list_next(it)) { ---- ObMenuEntry *e = it->data; ---- gboolean *en = &e->data.normal.enabled; /* save some typing */ ---- ObClient *c = frame->client; ---- ---- if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) { ---- switch (e->id) { ---- case LAYER_TOP: ---- *en = !c->above && (c->functions & OB_CLIENT_FUNC_ABOVE); ---- break; ---- case LAYER_NORMAL: ---- *en = c->above || c->below; ---- break; ---- case LAYER_BOTTOM: ---- *en = !c->below && (c->functions & OB_CLIENT_FUNC_BELOW); ---- break; ---- default: ---- *en = TRUE; ---- } ---- } ---- } ---- return TRUE; /* show the menu */ ----} ---- ----static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- gulong ignore_start; ---- ---- g_assert(c); ---- ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- ---- switch (e->id) { ---- case LAYER_TOP: ---- client_set_layer(c, 1); ---- break; ---- case LAYER_NORMAL: ---- client_set_layer(c, 0); ---- break; ---- case LAYER_BOTTOM: ---- client_set_layer(c, -1); ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- ---- /* update the menu cuz stuff can have changed */ ---- if (f) { ---- layer_menu_update(f, NULL); ---- menu_frame_render(f); ---- } ----} ---- ----static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) ----{ ---- ObMenu *menu = frame->menu; ---- guint i; ---- ObMenuEntry *e; ---- ---- menu_clear_entries(menu); ---- ---- if (frame->client == NULL || !client_normal(frame->client)) ---- return FALSE; /* don't show the menu */ ---- ---- for (i = 0; i <= screen_num_desktops; ++i) { ---- const gchar *name; ---- guint desk; ---- ---- if (i >= screen_num_desktops) { ---- menu_add_separator(menu, -1, NULL); ---- ---- desk = DESKTOP_ALL; ---- name = _("All desktops"); ---- } else { ---- desk = i; ---- name = screen_desktop_names[i]; ---- } ---- ---- e = menu_add_normal(menu, desk, name, NULL, FALSE); ---- e->id = desk; ---- if (desk == DESKTOP_ALL) { ---- e->data.normal.mask = ob_rr_theme->desk_mask; ---- e->data.normal.mask_normal_color = ob_rr_theme->menu_color; ---- e->data.normal.mask_selected_color = ---- ob_rr_theme->menu_selected_color; ---- e->data.normal.mask_disabled_color = ---- ob_rr_theme->menu_disabled_color; ---- e->data.normal.mask_disabled_selected_color = ---- ob_rr_theme->menu_disabled_selected_color; ---- } ---- ---- if (frame->client->desktop == desk) ---- e->data.normal.enabled = FALSE; ---- } ---- return TRUE; /* show the menu */ ----} ---- ----static void send_to_menu_execute(ObMenuEntry *e, ObMenuFrame *f, ---- ObClient *c, guint state, gpointer data) ----{ ---- g_assert(c); ---- ---- client_set_desktop(c, e->id, FALSE, FALSE); ---- /* the client won't even be on the screen anymore, so hide the menu */ ---- if (f) ---- menu_frame_hide_all(); ----} ---- ----static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y, ---- gboolean mouse, gpointer data) ----{ ---- gint dx, dy; ---- ---- if (!mouse && frame->client) { ---- *x = frame->client->frame->area.x; ---- ---- /* try below the titlebar */ ---- *y = frame->client->frame->area.y + frame->client->frame->size.top - ---- frame->client->frame->bwidth; ---- menu_frame_move_on_screen(frame, *x, *y, &dx, &dy); ---- if (dy != 0) { ---- /* try above the titlebar */ ---- *y = frame->client->frame->area.y + frame->client->frame->bwidth - ---- frame->area.height; ---- menu_frame_move_on_screen(frame, *x, *y, &dx, &dy); ---- } ---- if (dy != 0) { ---- /* didnt fit either way, use move on screen's values */ ---- *y = frame->client->frame->area.y + frame->client->frame->size.top; ---- menu_frame_move_on_screen(frame, *x, *y, &dx, &dy); ---- } ---- ---- *x += dx; ---- *y += dy; ---- } else { ---- gint myx, myy; ---- ---- myx = *x; ---- myy = *y; ---- ---- /* try to the bottom right of the cursor */ ---- menu_frame_move_on_screen(frame, myx, myy, &dx, &dy); ---- if (dx != 0 || dy != 0) { ---- /* try to the bottom left of the cursor */ ---- myx = *x - frame->area.width; ---- myy = *y; ---- menu_frame_move_on_screen(frame, myx, myy, &dx, &dy); ---- } ---- if (dx != 0 || dy != 0) { ---- /* try to the top right of the cursor */ ---- myx = *x; ---- myy = *y - frame->area.height; ---- menu_frame_move_on_screen(frame, myx, myy, &dx, &dy); ---- } ---- if (dx != 0 || dy != 0) { ---- /* try to the top left of the cursor */ ---- myx = *x - frame->area.width; ---- myy = *y - frame->area.height; ---- menu_frame_move_on_screen(frame, myx, myy, &dx, &dy); ---- } ---- if (dx != 0 || dy != 0) { ---- /* if didnt fit on either side so just use what it says */ ---- myx = *x; ---- myy = *y; ---- menu_frame_move_on_screen(frame, myx, myy, &dx, &dy); ---- } ---- *x = myx + dx; ---- *y = myy + dy; ---- } ----} ---- ----void client_menu_startup(void) ----{ ---- ObMenu *menu; ---- ObMenuEntry *e; ---- ---- menu = menu_new(LAYER_MENU_NAME, _("_Layer"), TRUE, NULL); ---- menu_show_all_shortcuts(menu, TRUE); ---- menu_set_update_func(menu, layer_menu_update); ---- menu_set_execute_func(menu, layer_menu_execute); ---- ---- menu_add_normal(menu, LAYER_TOP, _("Always on _top"), NULL, TRUE); ---- menu_add_normal(menu, LAYER_NORMAL, _("_Normal"), NULL, TRUE); ---- menu_add_normal(menu, LAYER_BOTTOM, _("Always on _bottom"),NULL, TRUE); ---- ---- ---- menu = menu_new(SEND_TO_MENU_NAME, _("_Send to desktop"), TRUE, NULL); ---- menu_set_update_func(menu, send_to_menu_update); ---- menu_set_execute_func(menu, send_to_menu_execute); ---- ---- menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), TRUE, NULL); ---- menu_show_all_shortcuts(menu, TRUE); ---- menu_set_update_func(menu, client_menu_update); ---- menu_set_place_func(menu, client_menu_place); ---- menu_set_execute_func(menu, client_menu_execute); ---- ---- menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME); ---- ---- menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); ---- ---- e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE); ---- e->data.normal.mask = ob_rr_theme->max_toggled_mask; ---- e->data.normal.mask_normal_color = ob_rr_theme->menu_color; ---- e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; ---- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; ---- e->data.normal.mask_disabled_selected_color = ---- ob_rr_theme->menu_disabled_selected_color; ---- ---- menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE); ---- ---- menu_add_normal(menu, CLIENT_RESIZE, _("Resi_ze"), NULL, TRUE); ---- ---- e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico_nify"), NULL, TRUE); ---- e->data.normal.mask = ob_rr_theme->iconify_mask; ---- e->data.normal.mask_normal_color = ob_rr_theme->menu_color; ---- e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; ---- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; ---- e->data.normal.mask_disabled_selected_color = ---- ob_rr_theme->menu_disabled_selected_color; ---- ---- e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma_ximize"), NULL, TRUE); ---- e->data.normal.mask = ob_rr_theme->max_mask; ---- e->data.normal.mask_normal_color = ob_rr_theme->menu_color; ---- e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; ---- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; ---- e->data.normal.mask_disabled_selected_color = ---- ob_rr_theme->menu_disabled_selected_color; ---- ---- menu_add_normal(menu, CLIENT_SHADE, _("_Roll up/down"), NULL, TRUE); ---- ---- menu_add_normal(menu, CLIENT_DECORATE, _("Un/_Decorate"), NULL, TRUE); ---- - menu_add_separator(menu, -1, NULL); - menu_add_submenu(menu, 0, "client-list-menu"); ---- menu_add_separator(menu, -1, NULL); ---- ---- e = menu_add_normal(menu, CLIENT_CLOSE, _("_Close"), NULL, TRUE); ---- e->data.normal.mask = ob_rr_theme->close_mask; ---- e->data.normal.mask_normal_color = ob_rr_theme->menu_color; ---- e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; ---- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; ---- e->data.normal.mask_disabled_selected_color = ---- ob_rr_theme->menu_disabled_selected_color; ----} diff --cc openbox/client_menu.h index 5c555168,5c555168,5c555168,5c555168..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/client_menu.h +++ /dev/null @@@@@ -1,24 -1,24 -1,24 -1,24 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client_menu.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__client_menu_h ----#define ob__client_menu_h ---- ----void client_menu_startup(void); ---- ----#endif diff --cc openbox/config.c index 109b2150,bafa35ce,0d817007,109b2150..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/config.c +++ /dev/null @@@@@ -1,1025 -1,1032 -1,1027 -1,1025 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- config.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "config.h" ----#include "keyboard.h" ----#include "mouse.h" ----#include "actions.h" ----#include "translate.h" ----#include "client.h" ----#include "screen.h" ----#include "openbox.h" ----#include "gettext.h" ----#include "obt/paths.h" ---- ----gboolean config_focus_new; ----gboolean config_focus_follow; ----guint config_focus_delay; ----gboolean config_focus_raise; ----gboolean config_focus_last; ----gboolean config_focus_under_mouse; ---- ----ObPlacePolicy config_place_policy; ----gboolean config_place_center; ----ObPlaceMonitor config_place_monitor; ---- ----StrutPartial config_margins; ---- ----gchar *config_theme; ----gboolean config_theme_keepborder; ---- ----gchar *config_title_layout; ---- ----gboolean config_animate_iconify; ---- ----RrFont *config_font_activewindow; ----RrFont *config_font_inactivewindow; ----RrFont *config_font_menuitem; ----RrFont *config_font_menutitle; ----RrFont *config_font_osd; ---- ----guint config_desktops_num; ----GSList *config_desktops_names; ----guint config_screen_firstdesk; ----guint config_desktop_popup_time; - gint config_emulate_xinerama; ---- ----gboolean config_resize_redraw; ----gint config_resize_popup_show; ----ObResizePopupPos config_resize_popup_pos; ----GravityPoint config_resize_popup_fixed; ---- ----ObStackingLayer config_dock_layer; ----gboolean config_dock_floating; ----gboolean config_dock_nostrut; ----ObDirection config_dock_pos; ----gint config_dock_x; ----gint config_dock_y; ----ObOrientation config_dock_orient; ----gboolean config_dock_hide; ----guint config_dock_hide_delay; ----guint config_dock_show_delay; ----guint config_dock_app_move_button; ----guint config_dock_app_move_modifiers; ---- ----guint config_keyboard_reset_keycode; ----guint config_keyboard_reset_state; ---- ----gint config_mouse_threshold; ----gint config_mouse_dclicktime; ----gint config_mouse_screenedgetime; ---- ----guint config_menu_hide_delay; ----gboolean config_menu_middle; ----guint config_submenu_show_delay; ----gboolean config_menu_client_list_icons; ----gboolean config_menu_manage_desktops; ---- ----GSList *config_menu_files; ---- ----gint config_resist_win; ----gint config_resist_edge; ---- ----GSList *config_per_app_settings; ---- ----ObAppSettings* config_create_app_settings(void) ----{ ---- ObAppSettings *settings = g_new0(ObAppSettings, 1); ---- settings->type = -1; ---- settings->decor = -1; ---- settings->shade = -1; ---- settings->monitor = -1; ---- settings->focus = -1; ---- settings->desktop = 0; ---- settings->layer = -2; ---- settings->iconic = -1; ---- settings->skip_pager = -1; ---- settings->skip_taskbar = -1; ---- settings->fullscreen = -1; ---- settings->max_horz = -1; ---- settings->max_vert = -1; ---- return settings; ----} ---- ----#define copy_if(setting, default) \ ---- if (src->setting != default) dst->setting = src->setting ----void config_app_settings_copy_non_defaults(const ObAppSettings *src, ---- ObAppSettings *dst) ----{ ---- g_assert(src != NULL); ---- g_assert(dst != NULL); ---- ---- copy_if(type, (ObClientType)-1); ---- copy_if(decor, -1); ---- copy_if(shade, -1); ---- copy_if(focus, -1); ---- copy_if(desktop, 0); ---- copy_if(layer, -2); ---- copy_if(iconic, -1); ---- copy_if(skip_pager, -1); ---- copy_if(skip_taskbar, -1); ---- copy_if(fullscreen, -1); ---- copy_if(max_horz, -1); ---- copy_if(max_vert, -1); ---- ---- if (src->pos_given) { ---- dst->pos_given = TRUE; ---- dst->pos_force = src->pos_force; ---- dst->position = src->position; ---- dst->monitor = src->monitor; ---- } ----} ---- ----static void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c) ----{ ---- gchar *s = obt_parse_node_string(node); ---- if (!g_ascii_strcasecmp(s, "center")) ---- c->center = TRUE; ---- else { ---- if (s[0] == '-') ---- c->opposite = TRUE; ---- if (s[0] == '-' || s[0] == '+') ---- c->pos = atoi(s+1); ---- else ---- c->pos = atoi(s); ---- } ---- g_free(s); ----} ---- ----/* ---- ---- ---- false ---- ---- ---- above ---- ---- 700 ---- 0 ---- 1 ---- ---- .. there is a lot more settings available ---- ---- ----*/ ---- ----/* Manages settings for individual applications. ---- Some notes: monitor is the screen number in a multi monitor ---- (Xinerama) setup (starting from 0) or mouse, meaning the ---- monitor the pointer is on. Default: mouse. ---- Layer can be three values, above (Always on top), below ---- (Always on bottom) and everything else (normal behaviour). ---- Positions can be an integer value or center, which will ---- center the window in the specified axis. Position is within ---- the monitor, so center2 ---- will center the window on the second monitor. ----*/ ----static void parse_per_app_settings(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr app = obt_parse_find_node(node->children, "application"); ---- gchar *name = NULL, *class = NULL, *role = NULL, *type = NULL; ---- gboolean name_set, class_set, type_set; ---- gboolean x_pos_given; ---- ---- while (app) { ---- name_set = class_set = type_set = x_pos_given = FALSE; ---- ---- class_set = obt_parse_attr_string(app, "class", &class); ---- name_set = obt_parse_attr_string(app, "name", &name); ---- type_set = obt_parse_attr_string(app, "type", &type); ---- if (class_set || name_set) { ---- xmlNodePtr n, c; ---- ObAppSettings *settings = config_create_app_settings();; ---- ---- if (name_set) ---- settings->name = g_pattern_spec_new(name); ---- ---- if (class_set) ---- settings->class = g_pattern_spec_new(class); ---- ---- if (type_set) { ---- if (!g_ascii_strcasecmp(type, "normal")) ---- settings->type = OB_CLIENT_TYPE_NORMAL; ---- else if (!g_ascii_strcasecmp(type, "dialog")) ---- settings->type = OB_CLIENT_TYPE_DIALOG; ---- else if (!g_ascii_strcasecmp(type, "splash")) ---- settings->type = OB_CLIENT_TYPE_SPLASH; ---- else if (!g_ascii_strcasecmp(type, "utility")) ---- settings->type = OB_CLIENT_TYPE_UTILITY; ---- else if (!g_ascii_strcasecmp(type, "menu")) ---- settings->type = OB_CLIENT_TYPE_MENU; ---- else if (!g_ascii_strcasecmp(type, "toolbar")) ---- settings->type = OB_CLIENT_TYPE_TOOLBAR; ---- else if (!g_ascii_strcasecmp(type, "dock")) ---- settings->type = OB_CLIENT_TYPE_DOCK; ---- else if (!g_ascii_strcasecmp(type, "desktop")) ---- settings->type = OB_CLIENT_TYPE_DESKTOP; ---- } ---- ---- if (obt_parse_attr_string(app, "role", &role)) ---- settings->role = g_pattern_spec_new(role); ---- ---- if ((n = obt_parse_find_node(app->children, "decor"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->decor = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "shade"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->shade = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "position"))) { ---- if ((c = obt_parse_find_node(n->children, "x"))) ---- if (!obt_parse_node_contains(c, "default")) { ---- config_parse_gravity_coord(c, &settings->position.x); ---- x_pos_given = TRUE; ---- } ---- ---- if (x_pos_given && (c = obt_parse_find_node(n->children, "y"))) ---- if (!obt_parse_node_contains(c, "default")) { ---- config_parse_gravity_coord(c, &settings->position.y); ---- settings->pos_given = TRUE; ---- } ---- ---- if (settings->pos_given && ---- (c = obt_parse_find_node(n->children, "monitor"))) ---- if (!obt_parse_node_contains(c, "default")) { ---- gchar *s = obt_parse_node_string(c); ---- if (!g_ascii_strcasecmp(s, "mouse")) ---- settings->monitor = 0; ---- else ---- settings->monitor = obt_parse_node_int(c) + 1; ---- g_free(s); ---- } ---- ---- obt_parse_attr_bool(n, "force", &settings->pos_force); ---- } ---- ---- if ((n = obt_parse_find_node(app->children, "focus"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->focus = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "desktop"))) { ---- if (!obt_parse_node_contains(n, "default")) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "all")) ---- settings->desktop = DESKTOP_ALL; ---- else { ---- gint i = obt_parse_node_int(n); ---- if (i > 0) ---- settings->desktop = i; ---- } ---- g_free(s); ---- } ---- } ---- ---- if ((n = obt_parse_find_node(app->children, "layer"))) ---- if (!obt_parse_node_contains(n, "default")) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "above")) ---- settings->layer = 1; ---- else if (!g_ascii_strcasecmp(s, "below")) ---- settings->layer = -1; ---- else ---- settings->layer = 0; ---- g_free(s); ---- } ---- ---- if ((n = obt_parse_find_node(app->children, "iconic"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->iconic = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "skip_pager"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->skip_pager = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "skip_taskbar"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->skip_taskbar = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "fullscreen"))) ---- if (!obt_parse_node_contains(n, "default")) ---- settings->fullscreen = obt_parse_node_bool(n); ---- ---- if ((n = obt_parse_find_node(app->children, "maximized"))) ---- if (!obt_parse_node_contains(n, "default")) { ---- gchar *s = obt_parse_node_string(n); ---- if (!g_ascii_strcasecmp(s, "horizontal")) { ---- settings->max_horz = TRUE; ---- settings->max_vert = FALSE; ---- } else if (!g_ascii_strcasecmp(s, "vertical")) { ---- settings->max_horz = FALSE; ---- settings->max_vert = TRUE; ---- } else ---- settings->max_horz = settings->max_vert = ---- obt_parse_node_bool(n); ---- g_free(s); ---- } ---- ---- config_per_app_settings = g_slist_append(config_per_app_settings, ---- (gpointer) settings); ---- g_free(name); ---- g_free(class); ---- g_free(role); ---- name = class = role = NULL; ---- } ---- ---- app = obt_parse_find_node(app->next, "application"); ---- } ----} ---- ----/* ---- ---- ---- ---- 3 ---- ---- ---- ----*/ ---- ----static void parse_key(xmlNodePtr node, GList *keylist) ----{ ---- gchar *key; ---- xmlNodePtr n; ---- gboolean is_chroot = FALSE; - gboolean grab = TRUE; ---- ---- if (!obt_parse_attr_string(node, "key", &key)) ---- return; ---- ---- obt_parse_attr_bool(node, "chroot", &is_chroot); - obt_parse_attr_bool(node, "grab", &grab); ---- ---- keylist = g_list_append(keylist, key); ---- ---- if ((n = obt_parse_find_node(node->children, "keybind"))) { ---- while (n) { ---- parse_key(n, keylist); ---- n = obt_parse_find_node(n->next, "keybind"); ---- } ---- } ---- else if ((n = obt_parse_find_node(node->children, "action"))) { ---- while (n) { ---- ObActionsAct *action; ---- ---- action = actions_parse(n); ---- if (action) -- - keyboard_bind(keylist, action); - keyboard_bind(keylist, action, grab); ---- n = obt_parse_find_node(n->next, "action"); ---- } ---- } ---- ---- if (is_chroot) ---- keyboard_chroot(keylist); ---- ---- g_free(key); ---- keylist = g_list_delete_link(keylist, g_list_last(keylist)); ----} ---- ----static void parse_keyboard(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- gchar *key; ---- ---- keyboard_unbind_all(); ---- ---- if ((n = obt_parse_find_node(node->children, "chainQuitKey"))) { ---- key = obt_parse_node_string(n); ---- translate_key(key, &config_keyboard_reset_state, ---- &config_keyboard_reset_keycode); ---- g_free(key); ---- } ---- ---- if ((n = obt_parse_find_node(node->children, "keybind"))) ---- while (n) { ---- parse_key(n, NULL); ---- n = obt_parse_find_node(n->next, "keybind"); ---- } ----} ---- ----/* ---- ---- ---- ---- ---- ---- ---- ----*/ ---- ----static void parse_mouse(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n, nbut, nact; ---- gchar *buttonstr; ---- gchar *contextstr; ---- ObMouseAction mact; ---- ---- mouse_unbind_all(); ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "dragThreshold"))) ---- config_mouse_threshold = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "doubleClickTime"))) ---- config_mouse_dclicktime = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "screenEdgeWarpTime"))) ---- config_mouse_screenedgetime = obt_parse_node_int(n); ---- ---- n = obt_parse_find_node(node, "context"); ---- while (n) { ---- if (!obt_parse_attr_string(n, "name", &contextstr)) ---- goto next_n; ---- nbut = obt_parse_find_node(n->children, "mousebind"); ---- while (nbut) { ---- if (!obt_parse_attr_string(nbut, "button", &buttonstr)) ---- goto next_nbut; ---- if (obt_parse_attr_contains(nbut, "action", "press")) { ---- mact = OB_MOUSE_ACTION_PRESS; ---- } else if (obt_parse_attr_contains(nbut, "action", "release")) { ---- mact = OB_MOUSE_ACTION_RELEASE; ---- } else if (obt_parse_attr_contains(nbut, "action", "click")) { ---- mact = OB_MOUSE_ACTION_CLICK; ---- } else if (obt_parse_attr_contains(nbut, "action","doubleclick")) { ---- mact = OB_MOUSE_ACTION_DOUBLE_CLICK; ---- } else if (obt_parse_attr_contains(nbut, "action", "drag")) { ---- mact = OB_MOUSE_ACTION_MOTION; ---- } else ---- goto next_nbut; ---- nact = obt_parse_find_node(nbut->children, "action"); ---- while (nact) { ---- ObActionsAct *action; ---- ---- if ((action = actions_parse(nact))) ---- mouse_bind(buttonstr, contextstr, mact, action); ---- nact = obt_parse_find_node(nact->next, "action"); ---- } ---- g_free(buttonstr); ---- next_nbut: ---- nbut = obt_parse_find_node(nbut->next, "mousebind"); ---- } ---- g_free(contextstr); ---- next_n: ---- n = obt_parse_find_node(n->next, "context"); ---- } ----} ---- ----static void parse_focus(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "focusNew"))) ---- config_focus_new = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "followMouse"))) ---- config_focus_follow = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "focusDelay"))) ---- config_focus_delay = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "raiseOnFocus"))) ---- config_focus_raise = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "focusLast"))) ---- config_focus_last = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "underMouse"))) ---- config_focus_under_mouse = obt_parse_node_bool(n); ----} ---- ----static void parse_placement(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- - -- if ((n = obt_parse_find_node(node, "policy"))) - if ((n = obt_parse_find_node(node, "policy"))) { ---- if (obt_parse_node_contains(n, "UnderMouse")) ---- config_place_policy = OB_PLACE_POLICY_MOUSE; - if (obt_parse_node_contains(n, "Random")) - config_place_policy = OB_PLACE_POLICY_RANDOM; - } ---- if ((n = obt_parse_find_node(node, "center"))) ---- config_place_center = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "monitor"))) { ---- if (obt_parse_node_contains(n, "active")) ---- config_place_monitor = OB_PLACE_MONITOR_ACTIVE; ---- else if (obt_parse_node_contains(n, "mouse")) ---- config_place_monitor = OB_PLACE_MONITOR_MOUSE; ---- } ----} ---- ----static void parse_margins(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "top"))) ---- config_margins.top = MAX(0, obt_parse_node_int(n)); ---- if ((n = obt_parse_find_node(node, "left"))) ---- config_margins.left = MAX(0, obt_parse_node_int(n)); ---- if ((n = obt_parse_find_node(node, "right"))) ---- config_margins.right = MAX(0, obt_parse_node_int(n)); ---- if ((n = obt_parse_find_node(node, "bottom"))) ---- config_margins.bottom = MAX(0, obt_parse_node_int(n)); ----} ---- ----static void parse_theme(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "name"))) { ---- gchar *c; ---- ---- g_free(config_theme); ---- c = obt_parse_node_string(n); ---- config_theme = obt_paths_expand_tilde(c); ---- g_free(c); ---- } ---- if ((n = obt_parse_find_node(node, "titleLayout"))) { ---- gchar *c, *d; ---- ---- g_free(config_title_layout); ---- config_title_layout = obt_parse_node_string(n); ---- ---- /* replace duplicates with spaces */ ---- for (c = config_title_layout; *c != '\0'; ++c) ---- for (d = c+1; *d != '\0'; ++d) ---- if (*c == *d) *d = ' '; ---- } ---- if ((n = obt_parse_find_node(node, "keepBorder"))) ---- config_theme_keepborder = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "animateIconify"))) ---- config_animate_iconify = obt_parse_node_bool(n); ---- ---- n = obt_parse_find_node(node, "font"); ---- while (n) { ---- xmlNodePtr fnode; ---- RrFont **font; ---- gchar *name = g_strdup(RrDefaultFontFamily); ---- gint size = RrDefaultFontSize; ---- RrFontWeight weight = RrDefaultFontWeight; ---- RrFontSlant slant = RrDefaultFontSlant; ---- ---- if (obt_parse_attr_contains(n, "place", "ActiveWindow")) ---- font = &config_font_activewindow; ---- else if (obt_parse_attr_contains(n, "place", "InactiveWindow")) ---- font = &config_font_inactivewindow; ---- else if (obt_parse_attr_contains(n, "place", "MenuHeader")) ---- font = &config_font_menutitle; ---- else if (obt_parse_attr_contains(n, "place", "MenuItem")) ---- font = &config_font_menuitem; ---- else if (obt_parse_attr_contains(n, "place", "OnScreenDisplay")) ---- font = &config_font_osd; ---- else ---- goto next_font; ---- ---- if ((fnode = obt_parse_find_node(n->children, "name"))) { ---- g_free(name); ---- name = obt_parse_node_string(fnode); ---- } ---- if ((fnode = obt_parse_find_node(n->children, "size"))) { ---- int s = obt_parse_node_int(fnode); ---- if (s > 0) size = s; ---- } ---- if ((fnode = obt_parse_find_node(n->children, "weight"))) { ---- gchar *w = obt_parse_node_string(fnode); ---- if (!g_ascii_strcasecmp(w, "Bold")) ---- weight = RR_FONTWEIGHT_BOLD; ---- g_free(w); ---- } ---- if ((fnode = obt_parse_find_node(n->children, "slant"))) { ---- gchar *s = obt_parse_node_string(fnode); ---- if (!g_ascii_strcasecmp(s, "Italic")) ---- slant = RR_FONTSLANT_ITALIC; ---- if (!g_ascii_strcasecmp(s, "Oblique")) ---- slant = RR_FONTSLANT_OBLIQUE; ---- g_free(s); ---- } ---- ---- *font = RrFontOpen(ob_rr_inst, name, size, weight, slant); ---- g_free(name); ---- next_font: ---- n = obt_parse_find_node(n->next, "font"); ---- } ----} ---- ----static void parse_desktops(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "number"))) { ---- gint d = obt_parse_node_int(n); ---- if (d > 0) ---- config_desktops_num = (unsigned) d; ---- } ---- if ((n = obt_parse_find_node(node, "firstdesk"))) { ---- gint d = obt_parse_node_int(n); ---- if (d > 0) ---- config_screen_firstdesk = (unsigned) d; ---- } - if ((n = obt_parse_find_node(node, "emulatexinerama"))) - config_emulate_xinerama = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "names"))) { ---- GSList *it; ---- xmlNodePtr nname; ---- ---- for (it = config_desktops_names; it; it = it->next) ---- g_free(it->data); ---- g_slist_free(config_desktops_names); ---- config_desktops_names = NULL; ---- ---- nname = obt_parse_find_node(n->children, "name"); ---- while (nname) { ---- config_desktops_names = ---- g_slist_append(config_desktops_names, ---- obt_parse_node_string(nname)); ---- nname = obt_parse_find_node(nname->next, "name"); ---- } ---- } ---- if ((n = obt_parse_find_node(node, "popupTime"))) ---- config_desktop_popup_time = obt_parse_node_int(n); ----} ---- ----static void parse_resize(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "drawContents"))) ---- config_resize_redraw = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "popupShow"))) { ---- config_resize_popup_show = obt_parse_node_int(n); ---- if (obt_parse_node_contains(n, "Always")) ---- config_resize_popup_show = 2; ---- else if (obt_parse_node_contains(n, "Never")) ---- config_resize_popup_show = 0; ---- else if (obt_parse_node_contains(n, "Nonpixel")) ---- config_resize_popup_show = 1; ---- } ---- if ((n = obt_parse_find_node(node, "popupPosition"))) { ---- if (obt_parse_node_contains(n, "Top")) ---- config_resize_popup_pos = OB_RESIZE_POS_TOP; ---- else if (obt_parse_node_contains(n, "Center")) ---- config_resize_popup_pos = OB_RESIZE_POS_CENTER; ---- else if (obt_parse_node_contains(n, "Fixed")) { ---- config_resize_popup_pos = OB_RESIZE_POS_FIXED; ---- ---- if ((n = obt_parse_find_node(node, "popupFixedPosition"))) { ---- xmlNodePtr n2; ---- ---- if ((n2 = obt_parse_find_node(n->children, "x"))) ---- config_parse_gravity_coord(n2, ---- &config_resize_popup_fixed.x); ---- if ((n2 = obt_parse_find_node(n->children, "y"))) ---- config_parse_gravity_coord(n2, ---- &config_resize_popup_fixed.y); ---- ---- config_resize_popup_fixed.x.pos = ---- MAX(config_resize_popup_fixed.x.pos, 0); ---- config_resize_popup_fixed.y.pos = ---- MAX(config_resize_popup_fixed.y.pos, 0); ---- } ---- } ---- } ----} ---- ----static void parse_dock(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- ---- if ((n = obt_parse_find_node(node, "position"))) { ---- if (obt_parse_node_contains(n, "TopLeft")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_NORTHWEST; ---- else if (obt_parse_node_contains(n, "Top")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_NORTH; ---- else if (obt_parse_node_contains(n, "TopRight")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_NORTHEAST; ---- else if (obt_parse_node_contains(n, "Right")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_EAST; ---- else if (obt_parse_node_contains(n, "BottomRight")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_SOUTHEAST; ---- else if (obt_parse_node_contains(n, "Bottom")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_SOUTH; ---- else if (obt_parse_node_contains(n, "BottomLeft")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_SOUTHWEST; ---- else if (obt_parse_node_contains(n, "Left")) ---- config_dock_floating = FALSE, ---- config_dock_pos = OB_DIRECTION_WEST; ---- else if (obt_parse_node_contains(n, "Floating")) ---- config_dock_floating = TRUE; ---- } ---- if (config_dock_floating) { ---- if ((n = obt_parse_find_node(node, "floatingX"))) ---- config_dock_x = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "floatingY"))) ---- config_dock_y = obt_parse_node_int(n); ---- } else { ---- if ((n = obt_parse_find_node(node, "noStrut"))) ---- config_dock_nostrut = obt_parse_node_bool(n); ---- } ---- if ((n = obt_parse_find_node(node, "stacking"))) { ---- if (obt_parse_node_contains(n, "normal")) ---- config_dock_layer = OB_STACKING_LAYER_NORMAL; ---- else if (obt_parse_node_contains(n, "below")) ---- config_dock_layer = OB_STACKING_LAYER_BELOW; ---- else if (obt_parse_node_contains(n, "above")) ---- config_dock_layer = OB_STACKING_LAYER_ABOVE; ---- } ---- if ((n = obt_parse_find_node(node, "direction"))) { ---- if (obt_parse_node_contains(n, "horizontal")) ---- config_dock_orient = OB_ORIENTATION_HORZ; ---- else if (obt_parse_node_contains(n, "vertical")) ---- config_dock_orient = OB_ORIENTATION_VERT; ---- } ---- if ((n = obt_parse_find_node(node, "autoHide"))) ---- config_dock_hide = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "hideDelay"))) ---- config_dock_hide_delay = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "showDelay"))) ---- config_dock_show_delay = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "moveButton"))) { ---- gchar *str = obt_parse_node_string(n); ---- guint b, s; ---- if (translate_button(str, &s, &b)) { ---- config_dock_app_move_button = b; ---- config_dock_app_move_modifiers = s; ---- } else { ---- g_message(_("Invalid button \"%s\" specified in config file"), str); ---- } ---- g_free(str); ---- } ----} ---- ----static void parse_menu(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- for (node = node->children; node; node = node->next) { ---- if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { ---- gchar *c; ---- ---- c = obt_parse_node_string(node); ---- config_menu_files = g_slist_append(config_menu_files, ---- obt_paths_expand_tilde(c)); ---- g_free(c); ---- } ---- if ((n = obt_parse_find_node(node, "hideDelay"))) ---- config_menu_hide_delay = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "middle"))) ---- config_menu_middle = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "submenuShowDelay"))) ---- config_submenu_show_delay = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "applicationIcons"))) ---- config_menu_client_list_icons = obt_parse_node_bool(n); ---- if ((n = obt_parse_find_node(node, "manageDesktops"))) ---- config_menu_manage_desktops = obt_parse_node_bool(n); ---- } ----} ---- ----static void parse_resistance(xmlNodePtr node, gpointer d) ----{ ---- xmlNodePtr n; ---- ---- node = node->children; ---- if ((n = obt_parse_find_node(node, "strength"))) ---- config_resist_win = obt_parse_node_int(n); ---- if ((n = obt_parse_find_node(node, "screen_edge_strength"))) ---- config_resist_edge = obt_parse_node_int(n); ----} ---- ----typedef struct ----{ ---- const gchar *key; ---- const gchar *actname; ----} ObDefKeyBind; ---- ----static void bind_default_keyboard(void) ----{ ---- ObDefKeyBind *it; ---- ObDefKeyBind binds[] = { ---- { "A-Tab", "NextWindow" }, ---- { "S-A-Tab", "PreviousWindow" }, ---- { "A-F4", "Close" }, ---- { NULL, NULL } ---- }; ---- for (it = binds; it->key; ++it) { ---- GList *l = g_list_append(NULL, g_strdup(it->key)); -- - keyboard_bind(l, actions_parse_string(it->actname)); - keyboard_bind(l, actions_parse_string(it->actname), TRUE); ---- } ----} ---- ----typedef struct ----{ ---- const gchar *button; ---- const gchar *context; ---- const ObMouseAction mact; ---- const gchar *actname; ----} ObDefMouseBind; ---- ----static void bind_default_mouse(void) ----{ ---- ObDefMouseBind *it; ---- ObDefMouseBind binds[] = { ---- { "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Middle", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Right", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Titlebar", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Bottom", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "BLCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "BRCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "TLCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "TRCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Close", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Maximize", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Iconify", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Icon", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "AllDesktops", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Shade", OB_MOUSE_ACTION_PRESS, "Focus" }, ---- { "Left", "Client", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Titlebar", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Middle", "Titlebar", OB_MOUSE_ACTION_CLICK, "Lower" }, ---- { "Left", "BLCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "BRCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "TLCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "TRCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Icon", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" }, ---- { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" }, ---- { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximize" }, ---- { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" }, ---- { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" }, ---- { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" }, ---- { "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "BRCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "Top", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "Bottom", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "Left", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "Right", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { "Left", "Titlebar", OB_MOUSE_ACTION_MOTION, "Move" }, ---- { "A-Left", "Frame", OB_MOUSE_ACTION_MOTION, "Move" }, ---- { "A-Middle", "Frame", OB_MOUSE_ACTION_MOTION, "Resize" }, ---- { NULL, NULL, 0, NULL } ---- }; ---- ---- for (it = binds; it->button; ++it) ---- mouse_bind(it->button, it->context, it->mact, ---- actions_parse_string(it->actname)); ----} ---- ----void config_startup(ObtParseInst *i) ----{ ---- config_focus_new = TRUE; ---- config_focus_follow = FALSE; ---- config_focus_delay = 0; ---- config_focus_raise = FALSE; ---- config_focus_last = TRUE; ---- config_focus_under_mouse = FALSE; ---- ---- obt_parse_register(i, "focus", parse_focus, NULL); ---- ---- config_place_policy = OB_PLACE_POLICY_SMART; ---- config_place_center = TRUE; ---- config_place_monitor = OB_PLACE_MONITOR_ANY; ---- ---- obt_parse_register(i, "placement", parse_placement, NULL); ---- ---- STRUT_PARTIAL_SET(config_margins, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ---- ---- obt_parse_register(i, "margins", parse_margins, NULL); ---- ---- config_theme = NULL; ---- ---- config_animate_iconify = TRUE; ---- config_title_layout = g_strdup("NLIMC"); ---- config_theme_keepborder = TRUE; ---- ---- config_font_activewindow = NULL; ---- config_font_inactivewindow = NULL; ---- config_font_menuitem = NULL; ---- config_font_menutitle = NULL; ---- ---- obt_parse_register(i, "theme", parse_theme, NULL); ---- ---- config_desktops_num = 4; ---- config_screen_firstdesk = 1; - config_emulate_xinerama = FALSE; ---- config_desktops_names = NULL; ---- config_desktop_popup_time = 875; ---- ---- obt_parse_register(i, "desktops", parse_desktops, NULL); ---- ---- config_resize_redraw = TRUE; ---- config_resize_popup_show = 1; /* nonpixel increments */ ---- config_resize_popup_pos = OB_RESIZE_POS_CENTER; ---- GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE); ---- GRAVITY_COORD_SET(config_resize_popup_fixed.y, 0, FALSE, FALSE); ---- ---- obt_parse_register(i, "resize", parse_resize, NULL); ---- ---- config_dock_layer = OB_STACKING_LAYER_ABOVE; ---- config_dock_pos = OB_DIRECTION_NORTHEAST; ---- config_dock_floating = FALSE; ---- config_dock_nostrut = FALSE; ---- config_dock_x = 0; ---- config_dock_y = 0; ---- config_dock_orient = OB_ORIENTATION_VERT; ---- config_dock_hide = FALSE; ---- config_dock_hide_delay = 300; ---- config_dock_show_delay = 300; ---- config_dock_app_move_button = 2; /* middle */ ---- config_dock_app_move_modifiers = 0; ---- ---- obt_parse_register(i, "dock", parse_dock, NULL); ---- ---- translate_key("C-g", &config_keyboard_reset_state, ---- &config_keyboard_reset_keycode); ---- ---- bind_default_keyboard(); ---- ---- obt_parse_register(i, "keyboard", parse_keyboard, NULL); ---- ---- config_mouse_threshold = 8; ---- config_mouse_dclicktime = 200; ---- config_mouse_screenedgetime = 400; ---- ---- bind_default_mouse(); ---- ---- obt_parse_register(i, "mouse", parse_mouse, NULL); ---- ---- config_resist_win = 10; ---- config_resist_edge = 20; ---- ---- obt_parse_register(i, "resistance", parse_resistance, NULL); ---- ---- config_menu_hide_delay = 250; ---- config_menu_middle = FALSE; ---- config_submenu_show_delay = 0; ---- config_menu_client_list_icons = TRUE; ---- config_menu_manage_desktops = TRUE; ---- config_menu_files = NULL; ---- ---- obt_parse_register(i, "menu", parse_menu, NULL); ---- ---- config_per_app_settings = NULL; ---- ---- obt_parse_register(i, "applications", parse_per_app_settings, NULL); ----} ---- ----void config_shutdown(void) ----{ ---- GSList *it; ---- ---- g_free(config_theme); ---- ---- g_free(config_title_layout); ---- ---- RrFontClose(config_font_activewindow); ---- RrFontClose(config_font_inactivewindow); ---- RrFontClose(config_font_menuitem); ---- RrFontClose(config_font_menutitle); ---- RrFontClose(config_font_osd); ---- ---- for (it = config_desktops_names; it; it = g_slist_next(it)) ---- g_free(it->data); ---- g_slist_free(config_desktops_names); ---- ---- for (it = config_menu_files; it; it = g_slist_next(it)) ---- g_free(it->data); ---- g_slist_free(config_menu_files); ---- ---- for (it = config_per_app_settings; it; it = g_slist_next(it)) { ---- ObAppSettings *itd = (ObAppSettings *)it->data; ---- if (itd->name) g_pattern_spec_free(itd->name); ---- if (itd->role) g_pattern_spec_free(itd->role); ---- if (itd->class) g_pattern_spec_free(itd->class); ---- g_free(it->data); ---- } ---- g_slist_free(config_per_app_settings); ----} diff --cc openbox/config.h index 8a01ee1f,32c61309,8a01ee1f,8a01ee1f..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/config.h +++ /dev/null @@@@@ -1,201 -1,203 -1,201 -1,201 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- config.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __config_h ----#define __config_h ---- ----#include "misc.h" ----#include "stacking.h" ----#include "place.h" ----#include "client.h" ----#include "geom.h" ----#include "moveresize.h" ----#include "render/render.h" ----#include "obt/parse.h" ---- ----#include ---- ----typedef struct _ObAppSettings ObAppSettings; ---- ----struct _ObAppSettings ----{ ---- GPatternSpec *class; ---- GPatternSpec *name; ---- GPatternSpec *role; ---- ObClientType type; ---- ---- GravityPoint position; ---- gboolean pos_given; ---- gboolean pos_force; ---- ---- guint desktop; ---- gint shade; ---- gint decor; ---- gint focus; ---- gint monitor; ---- gint iconic; ---- gint skip_pager; ---- gint skip_taskbar; ---- gint max_horz; ---- gint max_vert; ---- gint fullscreen; ---- ---- gint layer; ----}; ---- ----/*! Should new windows be focused */ ----extern gboolean config_focus_new; ----/*! Focus windows when the mouse enters them */ ----extern gboolean config_focus_follow; ----/*! Timeout for focusing windows on focus follows mouse, in milliseconds */ ----extern guint config_focus_delay; ----/*! If windows should automatically be raised when they are focused in ---- focus follows mouse */ ----extern gboolean config_focus_raise; ----/*! Focus the last focused window, not under the mouse, in follow mouse mode */ ----extern gboolean config_focus_last; ----/*! Try keep focus on the window under the mouse when the mouse is not moving ---- */ ----extern gboolean config_focus_under_mouse; ---- ----/*! The algorithm to use for placing new windows */ ----extern ObPlacePolicy config_place_policy; ----/*! Place windows in the center of the free area */ ----extern gboolean config_place_center; ----/*! Place windows on the active monitor (unless they are part of an application ---- already on another monitor) */ ----extern ObPlaceMonitor config_place_monitor; ---- ----/*! User-specified margins around the edge of the screen(s) */ ----extern StrutPartial config_margins; ---- ----/*! When true windows' contents are refreshed while they are resized; otherwise ---- they are not updated until the resize is complete */ ----extern gboolean config_resize_redraw; ----/*! show move/resize popups? 0 = no, 1 = always, 2 = only ---- resizing !1 increments */ ----extern gint config_resize_popup_show; ----/*! where to show the resize popup */ ----extern ObResizePopupPos config_resize_popup_pos; ----/*! where to place the popup if it's in a fixed position */ ----extern GravityPoint config_resize_popup_fixed; ---- ----/*! The stacking layer the dock will reside in */ ----extern ObStackingLayer config_dock_layer; ----/*! Is the dock floating */ ----extern gboolean config_dock_floating; ----/*! Don't use a strut for the dock */ ----extern gboolean config_dock_nostrut; ----/*! Where to place the dock if not floating */ ----extern ObDirection config_dock_pos; ----/*! If config_dock_floating, this is the top-left corner's ---- position */ ----extern gint config_dock_x; ----/*! If config_dock_floating, this is the top-left corner's ---- position */ ----extern gint config_dock_y; ----/*! Whether the dock places the dockapps in it horizontally or vertically */ ----extern ObOrientation config_dock_orient; ----/*! Whether to auto-hide the dock when the pointer is not over it */ ----extern gboolean config_dock_hide; ----/*! The number of milliseconds to wait before hiding the dock */ ----extern guint config_dock_hide_delay; ----/*! The number of milliseconds to wait before showing the dock */ ----extern guint config_dock_show_delay; ----/*! The mouse button to be used to move dock apps */ ----extern guint config_dock_app_move_button; ----/*! The modifiers to be used with the button to move dock apps */ ----extern guint config_dock_app_move_modifiers; ---- ----/*! The name of the theme */ ----extern gchar *config_theme; ---- ----/*! Show the one-pixel border after toggleDecor */ ----extern gboolean config_theme_keepborder; ----/*! Titlebar button layout */ ----extern gchar *config_title_layout; ----/*! Animate windows iconifying and restoring */ ----extern gboolean config_animate_iconify; ---- ----/*! The font for the active window's title */ ----extern RrFont *config_font_activewindow; ----/*! The font for inactive windows' titles */ ----extern RrFont *config_font_inactivewindow; ----/*! The font for menu titles */ ----extern RrFont *config_font_menutitle; ----/*! The font for menu items */ ----extern RrFont *config_font_menuitem; ----/*! The font for on-screen-displays/popups */ ----extern RrFont *config_font_osd; ---- ----/*! The number of desktops */ ----extern guint config_desktops_num; ----/*! Desktop to start on, put 5 to start in the center of a 3x3 grid */ ----extern guint config_screen_firstdesk; - /*! Emulate xinerama by dividing screen in two halves, left and right. */ - extern gboolean config_emulate_xinerama; ----/*! Names for the desktops */ ----extern GSList *config_desktops_names; ----/*! Amount of time to show the desktop switch dialog */ ----extern guint config_desktop_popup_time; ---- ----/*! The keycode of the key combo which resets the keybaord chains */ ----extern guint config_keyboard_reset_keycode; ----/*! The modifiers of the key combo which resets the keybaord chains */ ----extern guint config_keyboard_reset_state; ---- ----/*! Number of pixels a drag must go before being considered a drag */ ----extern gint config_mouse_threshold; ----/*! Number of milliseconds within which 2 clicks must occur to be a ---- double-click */ ----extern gint config_mouse_dclicktime; ----/*! Number of milliseconds that the mouse has to be on the screen edge before ---- a screen edge event is triggered */ ----extern gint config_mouse_screenedgetime; ---- ----/*! Number of pixels to resist while crossing another window's edge */ ----extern gint config_resist_win; ----/*! Number of pixels to resist while crossing a screen's edge */ ----extern gint config_resist_edge; ---- ----/*! Delay for hiding menu when opening in milliseconds */ ----extern guint config_menu_hide_delay; ----/*! Center menus vertically about the parent entry */ ----extern gboolean config_menu_middle; ----/*! Delay before opening a submenu in milliseconds */ ----extern guint config_submenu_show_delay; ----/*! Show icons in client_list_menu */ ----extern gboolean config_menu_client_list_icons; ----/*! Show manage desktops in client_list_menu */ ----extern gboolean config_menu_manage_desktops; ----/*! User-specified menu files */ ----extern GSList *config_menu_files; ----/*! Per app settings */ ----extern GSList *config_per_app_settings; ---- ----void config_startup(ObtParseInst *i); ----void config_shutdown(void); ---- ----/*! Create an ObAppSettings structure with the default values */ ----ObAppSettings* config_create_app_settings(void); ----/*! Copies any settings in src to dest, if they are their default value in ---- src. */ ----void config_app_settings_copy_non_defaults(const ObAppSettings *src, ---- ObAppSettings *dest); ---- ---- ----#endif diff --cc openbox/debug.c index 42644868,42644868,42644868,42644868..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/debug.c +++ /dev/null @@@@@ -1,168 -1,168 -1,168 -1,168 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- debug.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "gettext.h" ----#include "obt/paths.h" ---- ----#include ----#include ----#include ----#include ----#include ---- ----#ifdef HAVE_UNISTD_H ----# include ----#endif ---- ----static gboolean enabled_types[OB_DEBUG_TYPE_NUM] = {FALSE}; ----static FILE *log_file = NULL; ----static guint rr_handler_id = 0; ----static guint obt_handler_id = 0; ----static guint ob_handler_id = 0; ---- ----static void log_handler(const gchar *log_domain, GLogLevelFlags log_level, ---- const gchar *message, gpointer user_data); ---- ----void ob_debug_startup(void) ----{ ---- ObtPaths *p = obt_paths_new(); ---- gchar *dir = g_build_filename(obt_paths_cache_home(p), ---- "openbox", NULL); ---- ---- /* log messages to a log file! fancy, no? */ ---- if (!obt_paths_mkdir_path(dir, 0777)) ---- g_message(_("Unable to make directory '%s': %s"), ---- dir, g_strerror(errno)); ---- else { ---- gchar *name = g_build_filename(obt_paths_cache_home(p), ---- "openbox", "openbox.log", NULL); ---- /* unlink it before opening to remove competition */ ---- unlink(name); ---- log_file = fopen(name, "w"); ---- g_free(name); ---- } ---- ---- rr_handler_id = ---- g_log_set_handler("ObRender", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | ---- G_LOG_FLAG_RECURSION, log_handler, NULL); ---- obt_handler_id = ---- g_log_set_handler("Obt", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | ---- G_LOG_FLAG_RECURSION, log_handler, NULL); ---- ob_handler_id = ---- g_log_set_handler("Openbox", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | ---- G_LOG_FLAG_RECURSION, log_handler, NULL); ---- ---- obt_paths_unref(p); ---- g_free(dir); ----} ---- ----void ob_debug_shutdown(void) ----{ ---- g_log_remove_handler("ObRender", rr_handler_id); ---- g_log_remove_handler("Obt", obt_handler_id); ---- g_log_remove_handler("Openbox", ob_handler_id); ---- ---- if (log_file) { ---- fclose(log_file); ---- log_file = NULL; ---- } ----} ---- ----void ob_debug_enable(ObDebugType type, gboolean enable) ----{ ---- g_assert(type < OB_DEBUG_TYPE_NUM); ---- enabled_types[type] = enable; ----} ---- ----static inline void log_print(FILE *out, const gchar* log_domain, ---- const gchar *level, const gchar *message) ----{ ---- fprintf(out, log_domain); ---- fprintf(out, "-"); ---- fprintf(out, level); ---- fprintf(out, ": "); ---- fprintf(out, message); ---- fprintf(out, "\n"); ---- fflush(out); ----} ---- ----static void log_handler(const gchar *log_domain, GLogLevelFlags log_level, ---- const gchar *message, gpointer data) ----{ ---- FILE *out; ---- const gchar *level; ---- ---- switch (log_level & G_LOG_LEVEL_MASK) { ---- case G_LOG_LEVEL_DEBUG: level = "Debug"; out = stdout; break; ---- case G_LOG_LEVEL_INFO: level = "Info"; out = stdout; break; ---- case G_LOG_LEVEL_MESSAGE: level = "Message"; out = stdout; break; ---- case G_LOG_LEVEL_WARNING: level = "Warning"; out = stderr; break; ---- case G_LOG_LEVEL_CRITICAL: level = "Critical"; out = stderr; break; ---- case G_LOG_LEVEL_ERROR: level = "Error"; out = stderr; break; ---- default: g_assert_not_reached(); /* invalid level.. */ ---- } ---- ---- log_print(out, log_domain, level, message); ---- if (log_file) log_print(log_file, log_domain, level, message); ----} ---- ----static inline void log_argv(ObDebugType type, ---- const gchar *format, va_list args) ----{ ---- const gchar *prefix; ---- gchar *message; ---- ---- g_assert(type < OB_DEBUG_TYPE_NUM); ---- if (!enabled_types[type]) return; ---- ---- switch (type) { ---- case OB_DEBUG_FOCUS: prefix = "(FOCUS) "; break; ---- case OB_DEBUG_APP_BUGS: prefix = "(APPLICATION BUG) "; break; ---- case OB_DEBUG_SM: prefix = "(SESSION) "; break; ---- default: prefix = NULL; break; ---- } ---- ---- message = g_strdup_vprintf(format, args); ---- if (prefix) { ---- gchar *a = message; ---- message = g_strconcat(prefix, message, NULL); ---- g_free(a); ---- } ---- ---- g_debug(message); ---- g_free(message); ----} ---- ----void ob_debug(const gchar *a, ...) ----{ ---- va_list vl; ---- ---- va_start(vl, a); ---- log_argv(OB_DEBUG_NORMAL, a, vl); ---- va_end(vl); ----} ---- ----void ob_debug_type(ObDebugType type, const gchar *a, ...) ----{ ---- va_list vl; ---- ---- va_start(vl, a); ---- log_argv(type, a, vl); ---- va_end(vl); ----} diff --cc openbox/debug.h index a24e66ea,a24e66ea,a24e66ea,a24e66ea..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/debug.h +++ /dev/null @@@@@ -1,41 -1,41 -1,41 -1,41 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- debug.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __ob__debug_h ----#define __ob__debug_h ---- ----#include ---- ----void ob_debug_startup(void); ----void ob_debug_shutdown(void); ---- ----void ob_debug(const gchar *a, ...); ---- ----typedef enum { ---- OB_DEBUG_NORMAL, ---- OB_DEBUG_FOCUS, ---- OB_DEBUG_APP_BUGS, ---- OB_DEBUG_SM, ---- OB_DEBUG_TYPE_NUM ----} ObDebugType; ---- ----void ob_debug_type(ObDebugType type, const gchar *a, ...); ---- ----void ob_debug_enable(ObDebugType type, gboolean enable); ---- ----#endif diff --cc openbox/dock.c index ee1202c7,ee1202c7,ee1202c7,ee1202c7..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/dock.c +++ /dev/null @@@@@ -1,675 -1,675 -1,675 -1,675 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- dock.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "dock.h" ----#include "screen.h" ----#include "config.h" ----#include "grab.h" ----#include "openbox.h" ----#include "render/theme.h" ----#include "obt/prop.h" ---- ----#define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \ ---- EnterWindowMask | LeaveWindowMask) ----#define DOCKAPP_EVENT_MASK (StructureNotifyMask) ----#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ ---- ButtonMotionMask) ---- ----static ObDock *dock; ---- ----StrutPartial dock_strut; ---- ----static void dock_app_grab_button(ObDockApp *app, gboolean grab) ----{ ---- if (grab) { ---- grab_button_full(config_dock_app_move_button, ---- config_dock_app_move_modifiers, app->icon_win, ---- ButtonPressMask | ButtonReleaseMask | ---- ButtonMotionMask, ---- GrabModeAsync, OB_CURSOR_MOVE); ---- } else { ---- ungrab_button(config_dock_app_move_button, ---- config_dock_app_move_modifiers, app->icon_win); ---- } ----} ---- ----static guint window_hash(Window *w) { return *w; } ----static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } ---- ----void dock_startup(gboolean reconfig) ----{ ---- XSetWindowAttributes attrib; ---- ---- if (reconfig) { ---- GList *it; ---- ---- XSetWindowBorder(obt_display, dock->frame, ---- RrColorPixel(ob_rr_theme->osd_border_color)); ---- XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth); ---- ---- RrAppearanceFree(dock->a_frame); ---- dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); ---- ---- stacking_add(DOCK_AS_WINDOW(dock)); ---- ---- dock_configure(); ---- dock_hide(TRUE); ---- ---- for (it = dock->dock_apps; it; it = g_list_next(it)) ---- dock_app_grab_button(it->data, TRUE); ---- return; ---- } ---- ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0, ---- 0, 0, 0, 0, 0, 0, 0, 0); ---- ---- dock = g_new0(ObDock, 1); ---- dock->obwin.type = OB_WINDOW_CLASS_DOCK; ---- ---- dock->hidden = TRUE; ---- ---- dock->dock_map = g_hash_table_new((GHashFunc)window_hash, ---- (GEqualFunc)window_comp); ---- ---- attrib.event_mask = DOCK_EVENT_MASK; ---- attrib.override_redirect = True; ---- attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK; ---- dock->frame = XCreateWindow(obt_display, obt_root(ob_screen), ---- 0, 0, 1, 1, 0, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), ---- CWOverrideRedirect | CWEventMask | ---- CWDontPropagate, ---- &attrib); ---- dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); ---- XSetWindowBorder(obt_display, dock->frame, ---- RrColorPixel(ob_rr_theme->osd_border_color)); ---- XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth); ---- ---- /* Setting the window type so xcompmgr can tell what it is */ ---- OBT_PROP_SET32(dock->frame, NET_WM_WINDOW_TYPE, ATOM, ---- OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK)); ---- ---- window_add(&dock->frame, DOCK_AS_WINDOW(dock)); ---- stacking_add(DOCK_AS_WINDOW(dock)); ----} ---- ----void dock_shutdown(gboolean reconfig) ----{ ---- if (reconfig) { ---- GList *it; ---- ---- stacking_remove(DOCK_AS_WINDOW(dock)); ---- ---- for (it = dock->dock_apps; it; it = g_list_next(it)) ---- dock_app_grab_button(it->data, FALSE); ---- return; ---- } ---- ---- g_hash_table_destroy(dock->dock_map); ---- ---- XDestroyWindow(obt_display, dock->frame); ---- RrAppearanceFree(dock->a_frame); ---- window_remove(dock->frame); ---- stacking_remove(dock); ----} ---- ----void dock_manage(Window icon_win, Window name_win) ----{ ---- ObDockApp *app; ---- XWindowAttributes attrib; ---- gchar **data; ---- ---- app = g_new0(ObDockApp, 1); ---- app->name_win = name_win; ---- app->icon_win = icon_win; ---- ---- if (OBT_PROP_GETSS(app->name_win, WM_CLASS, locale, &data)) { ---- if (data[0]) { ---- app->name = g_strdup(data[0]); ---- if (data[1]) ---- app->class = g_strdup(data[1]); ---- } ---- g_strfreev(data); ---- } ---- ---- if (app->name == NULL) app->name = g_strdup(""); ---- if (app->class == NULL) app->class = g_strdup(""); ---- ---- if (XGetWindowAttributes(obt_display, app->icon_win, &attrib)) { ---- app->w = attrib.width; ---- app->h = attrib.height; ---- } else { ---- app->w = app->h = 64; ---- } ---- ---- dock->dock_apps = g_list_append(dock->dock_apps, app); ---- g_hash_table_insert(dock->dock_map, &app->icon_win, app); ---- dock_configure(); ---- ---- XReparentWindow(obt_display, app->icon_win, dock->frame, app->x, app->y); ---- /* ---- This is the same case as in frame.c for client windows. When Openbox is ---- starting, the window is already mapped so we see unmap events occur for ---- it. There are 2 unmap events generated that we see, one with the 'event' ---- member set the root window, and one set to the client, but both get ---- handled and need to be ignored. ---- */ ---- if (ob_state() == OB_STATE_STARTING) ---- app->ignore_unmaps += 2; ---- XChangeSaveSet(obt_display, app->icon_win, SetModeInsert); ---- XMapWindow(obt_display, app->icon_win); ---- ---- if (app->name_win != app->icon_win) { ---- XReparentWindow(obt_display, app->name_win, dock->frame, -1000, -1000); ---- XChangeSaveSet(obt_display, app->name_win, SetModeInsert); ---- XMapWindow(obt_display, app->name_win); ---- } ---- ---- XSync(obt_display, False); ---- ---- XSelectInput(obt_display, app->icon_win, DOCKAPP_EVENT_MASK); ---- ---- dock_app_grab_button(app, TRUE); ---- ---- ob_debug("Managed Dock App: 0x%lx 0x%lx (%s)", ---- app->icon_win, app->name_win, app->class); ---- ---- grab_server(FALSE); ----} ---- ----void dock_unmanage_all(void) ----{ ---- while (dock->dock_apps) ---- dock_unmanage(dock->dock_apps->data, TRUE); ----} ---- ----void dock_unmanage(ObDockApp *app, gboolean reparent) ----{ ---- dock_app_grab_button(app, FALSE); ---- XSelectInput(obt_display, app->icon_win, NoEventMask); ---- /* remove the window from our save set */ ---- XChangeSaveSet(obt_display, app->icon_win, SetModeDelete); ---- XSync(obt_display, False); ---- ---- if (reparent) { ---- XReparentWindow(obt_display, app->icon_win, obt_root(ob_screen), 0, 0); ---- if (app->name_win != app->icon_win) ---- XReparentWindow(obt_display, app->name_win, ---- obt_root(ob_screen), 0, 0); ---- } ---- ---- dock->dock_apps = g_list_remove(dock->dock_apps, app); ---- g_hash_table_remove(dock->dock_map, &app->icon_win); ---- dock_configure(); ---- ---- ob_debug("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class); ---- ---- g_free(app->name); ---- g_free(app->class); ---- g_free(app); ----} ---- ----void dock_configure(void) ----{ ---- GList *it; ---- gint hspot, vspot; ---- gint gravity; ---- gint l, r, t, b; ---- gint strw, strh; ---- Rect *a; ---- gint hidesize; ---- ---- RrMargins(dock->a_frame, &l, &t, &r, &b); ---- hidesize = MAX(1, ob_rr_theme->obwidth); ---- ---- dock->area.width = dock->area.height = 0; ---- ---- /* get the size */ ---- for (it = dock->dock_apps; it; it = g_list_next(it)) { ---- ObDockApp *app = it->data; ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- dock->area.width += app->w; ---- dock->area.height = MAX(dock->area.height, app->h); ---- break; ---- case OB_ORIENTATION_VERT: ---- dock->area.width = MAX(dock->area.width, app->w); ---- dock->area.height += app->h; ---- break; ---- } ---- } ---- ---- if (dock->dock_apps) { ---- dock->area.width += l + r; ---- dock->area.height += t + b; ---- } ---- ---- hspot = l; ---- vspot = t; ---- ---- /* position the apps */ ---- for (it = dock->dock_apps; it; it = g_list_next(it)) { ---- ObDockApp *app = it->data; ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- app->x = hspot; ---- app->y = (dock->area.height - app->h) / 2; ---- hspot += app->w; ---- break; ---- case OB_ORIENTATION_VERT: ---- app->x = (dock->area.width - app->w) / 2; ---- app->y = vspot; ---- vspot += app->h; ---- break; ---- } ---- ---- XMoveWindow(obt_display, app->icon_win, app->x, app->y); ---- } ---- ---- /* used for calculating offsets */ ---- dock->area.width += ob_rr_theme->obwidth * 2; ---- dock->area.height += ob_rr_theme->obwidth * 2; ---- ---- a = screen_physical_area_all_monitors(); ---- ---- /* calculate position */ ---- if (config_dock_floating) { ---- dock->area.x = config_dock_x; ---- dock->area.y = config_dock_y; ---- gravity = NorthWestGravity; ---- } else { ---- switch (config_dock_pos) { ---- case OB_DIRECTION_NORTHWEST: ---- dock->area.x = 0; ---- dock->area.y = 0; ---- gravity = NorthWestGravity; ---- break; ---- case OB_DIRECTION_NORTH: ---- dock->area.x = a->width / 2; ---- dock->area.y = 0; ---- gravity = NorthGravity; ---- break; ---- case OB_DIRECTION_NORTHEAST: ---- dock->area.x = a->width; ---- dock->area.y = 0; ---- gravity = NorthEastGravity; ---- break; ---- case OB_DIRECTION_WEST: ---- dock->area.x = 0; ---- dock->area.y = a->height / 2; ---- gravity = WestGravity; ---- break; ---- case OB_DIRECTION_EAST: ---- dock->area.x = a->width; ---- dock->area.y = a->height / 2; ---- gravity = EastGravity; ---- break; ---- case OB_DIRECTION_SOUTHWEST: ---- dock->area.x = 0; ---- dock->area.y = a->height; ---- gravity = SouthWestGravity; ---- break; ---- case OB_DIRECTION_SOUTH: ---- dock->area.x = a->width / 2; ---- dock->area.y = a->height; ---- gravity = SouthGravity; ---- break; ---- case OB_DIRECTION_SOUTHEAST: ---- dock->area.x = a->width; ---- dock->area.y = a->height; ---- gravity = SouthEastGravity; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- } ---- ---- switch(gravity) { ---- case NorthGravity: ---- case CenterGravity: ---- case SouthGravity: ---- dock->area.x -= dock->area.width / 2; ---- break; ---- case NorthEastGravity: ---- case EastGravity: ---- case SouthEastGravity: ---- dock->area.x -= dock->area.width; ---- break; ---- } ---- switch(gravity) { ---- case WestGravity: ---- case CenterGravity: ---- case EastGravity: ---- dock->area.y -= dock->area.height / 2; ---- break; ---- case SouthWestGravity: ---- case SouthGravity: ---- case SouthEastGravity: ---- dock->area.y -= dock->area.height; ---- break; ---- } ---- ---- if (config_dock_hide && dock->hidden) { ---- if (!config_dock_floating) { ---- switch (config_dock_pos) { ---- case OB_DIRECTION_NORTHWEST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- dock->area.y -= dock->area.height - hidesize; ---- break; ---- case OB_ORIENTATION_VERT: ---- dock->area.x -= dock->area.width - hidesize; ---- break; ---- } ---- break; ---- case OB_DIRECTION_NORTH: ---- dock->area.y -= dock->area.height - hidesize; ---- break; ---- case OB_DIRECTION_NORTHEAST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- dock->area.y -= dock->area.height - hidesize; ---- break; ---- case OB_ORIENTATION_VERT: ---- dock->area.x += dock->area.width - hidesize; ---- break; ---- } ---- break; ---- case OB_DIRECTION_WEST: ---- dock->area.x -= dock->area.width - hidesize; ---- break; ---- case OB_DIRECTION_EAST: ---- dock->area.x += dock->area.width - hidesize; ---- break; ---- case OB_DIRECTION_SOUTHWEST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- dock->area.y += dock->area.height - hidesize; ---- break; ---- case OB_ORIENTATION_VERT: ---- dock->area.x -= dock->area.width - hidesize; ---- break; ---- } break; ---- case OB_DIRECTION_SOUTH: ---- dock->area.y += dock->area.height - hidesize; ---- break; ---- case OB_DIRECTION_SOUTHEAST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- dock->area.y += dock->area.height - hidesize; ---- break; ---- case OB_ORIENTATION_VERT: ---- dock->area.x += dock->area.width - hidesize; ---- break; ---- } ---- break; ---- } ---- } ---- } ---- ---- if (!config_dock_floating && config_dock_hide) { ---- strw = hidesize; ---- strh = hidesize; ---- } else { ---- strw = dock->area.width; ---- strh = dock->area.height; ---- } ---- ---- /* set the strut */ ---- if (!dock->dock_apps) { ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0, ---- 0, 0, 0, 0, 0, 0, 0, 0); ---- } ---- else if (config_dock_floating || config_dock_nostrut) { ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0, ---- 0, 0, 0, 0, 0, 0, 0, 0); ---- } ---- else { ---- switch (config_dock_pos) { ---- case OB_DIRECTION_NORTHWEST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, ---- 0, 0, dock->area.x, dock->area.x ---- + dock->area.width - 1, 0, 0, 0, 0); ---- break; ---- case OB_ORIENTATION_VERT: ---- STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, ---- dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0, 0, 0, 0, 0); ---- break; ---- } ---- break; ---- case OB_DIRECTION_NORTH: ---- STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, ---- 0, 0, dock->area.x, dock->area.x ---- + dock->area.width - 1, 0, 0, 0, 0); ---- break; ---- case OB_DIRECTION_NORTHEAST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, ---- 0, 0, dock->area.x, dock->area.x ---- + dock->area.width -1, 0, 0, 0, 0); ---- break; ---- case OB_ORIENTATION_VERT: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, ---- 0, 0, 0, 0, dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0); ---- break; ---- } ---- break; ---- case OB_DIRECTION_WEST: ---- STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, ---- dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0, 0, 0, 0, 0); ---- break; ---- case OB_DIRECTION_EAST: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, ---- 0, 0, 0, 0, dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0); ---- break; ---- case OB_DIRECTION_SOUTHWEST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, ---- 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x ---- + dock->area.width - 1); ---- break; ---- case OB_ORIENTATION_VERT: ---- STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, ---- dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0, 0, 0, 0, 0); ---- break; ---- } ---- break; ---- case OB_DIRECTION_SOUTH: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, ---- 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x ---- + dock->area.width - 1); ---- break; ---- case OB_DIRECTION_SOUTHEAST: ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, ---- 0, 0, 0, 0, 0, 0, dock->area.x, ---- dock->area.x + dock->area.width - 1); ---- break; ---- case OB_ORIENTATION_VERT: ---- STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, ---- 0, 0, 0, 0, dock->area.y, dock->area.y ---- + dock->area.height - 1, 0, 0); ---- break; ---- } ---- break; ---- } ---- } ---- ---- /* not used for actually sizing shit */ ---- dock->area.width -= ob_rr_theme->obwidth * 2; ---- dock->area.height -= ob_rr_theme->obwidth * 2; ---- ---- if (dock->dock_apps) { ---- g_assert(dock->area.width > 0); ---- g_assert(dock->area.height > 0); ---- ---- XMoveResizeWindow(obt_display, dock->frame, dock->area.x, dock->area.y, ---- dock->area.width, dock->area.height); ---- ---- RrPaint(dock->a_frame, dock->frame, dock->area.width, ---- dock->area.height); ---- XMapWindow(obt_display, dock->frame); ---- } else ---- XUnmapWindow(obt_display, dock->frame); ---- ---- /* but they are useful outside of this function! but don't add it if the ---- dock is actually not visible */ ---- if (dock->dock_apps) { ---- dock->area.width += ob_rr_theme->obwidth * 2; ---- dock->area.height += ob_rr_theme->obwidth * 2; ---- } ---- ---- screen_update_areas(); ---- ---- g_free(a); ----} ---- ----void dock_app_configure(ObDockApp *app, gint w, gint h) ----{ ---- app->w = w; ---- app->h = h; ---- dock_configure(); ----} ---- ----void dock_app_drag(ObDockApp *app, XMotionEvent *e) ----{ ---- ObDockApp *over = NULL; ---- GList *it; ---- gint x, y; ---- gboolean after; ---- gboolean stop; ---- ---- x = e->x_root; ---- y = e->y_root; ---- ---- /* are we on top of the dock? */ ---- if (!(x >= dock->area.x && ---- y >= dock->area.y && ---- x < dock->area.x + dock->area.width && ---- y < dock->area.y + dock->area.height)) ---- return; ---- ---- x -= dock->area.x; ---- y -= dock->area.y; ---- ---- /* which dock app are we on top of? */ ---- stop = FALSE; ---- for (it = dock->dock_apps; it; it = g_list_next(it)) { ---- over = it->data; ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- if (x >= over->x && x < over->x + over->w) ---- stop = TRUE; ---- break; ---- case OB_ORIENTATION_VERT: ---- if (y >= over->y && y < over->y + over->h) ---- stop = TRUE; ---- break; ---- } ---- /* dont go to it->next! */ ---- if (stop) break; ---- } ---- if (!it || app == over) return; ---- ---- x -= over->x; ---- y -= over->y; ---- ---- switch (config_dock_orient) { ---- case OB_ORIENTATION_HORZ: ---- after = (x > over->w / 2); ---- break; ---- case OB_ORIENTATION_VERT: ---- after = (y > over->h / 2); ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- /* remove before doing the it->next! */ ---- dock->dock_apps = g_list_remove(dock->dock_apps, app); ---- ---- if (after) it = it->next; ---- ---- dock->dock_apps = g_list_insert_before(dock->dock_apps, it, app); ---- dock_configure(); ----} ---- ----static gboolean hide_timeout(gpointer data) ----{ ---- /* hide */ ---- dock->hidden = TRUE; ---- dock_configure(); ---- ---- return FALSE; /* don't repeat */ ----} ---- ----static gboolean show_timeout(gpointer data) ----{ ---- /* hide */ ---- dock->hidden = FALSE; ---- dock_configure(); ---- ---- return FALSE; /* don't repeat */ ----} ---- ----void dock_hide(gboolean hide) ----{ ---- if (!hide) { ---- if (dock->hidden && config_dock_hide) { ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_dock_show_delay * 1000, ---- show_timeout, NULL, ---- g_direct_equal, NULL); ---- } else if (!dock->hidden && config_dock_hide) { ---- obt_main_loop_timeout_remove(ob_main_loop, hide_timeout); ---- } ---- } else { ---- if (!dock->hidden && config_dock_hide) { ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_dock_hide_delay * 1000, ---- hide_timeout, NULL, ---- g_direct_equal, NULL); ---- } else if (dock->hidden && config_dock_hide) { ---- obt_main_loop_timeout_remove(ob_main_loop, show_timeout); ---- } ---- } ----} ---- ----void dock_get_area(Rect *a) ----{ ---- RECT_SET(*a, dock->area.x, dock->area.y, ---- dock->area.width, dock->area.height); ----} ---- ----ObDockApp* dock_find_dockapp(Window xwin) ----{ ---- return g_hash_table_lookup(dock->dock_map, &xwin); ----} diff --cc openbox/dock.h index 3463f27b,3463f27b,3463f27b,3463f27b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/dock.h +++ /dev/null @@@@@ -1,85 -1,85 -1,85 -1,85 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- dock.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __dock_h ----#define __dock_h ---- ----#include "window.h" ----#include "stacking.h" ----#include "geom.h" ----#include "render/render.h" ---- ----#include ----#include ----#include ---- ----typedef struct _ObDock ObDock; ----typedef struct _ObDockApp ObDockApp; ---- ----struct _ObDock ----{ ---- ObWindow obwin; ---- ---- Window frame; ---- RrAppearance *a_frame; ---- ---- /* actual position (when not auto-hidden) */ ---- Rect area; ---- ---- gboolean hidden; ---- ---- GList *dock_apps; ---- GHashTable *dock_map; ----}; ---- ----struct _ObDockApp { ---- gint ignore_unmaps; ---- ---- Window icon_win; ---- Window name_win; ---- ---- gchar *name; ---- gchar *class; ---- ---- gint x; ---- gint y; ---- gint w; ---- gint h; ----}; ---- ----extern StrutPartial dock_strut; ---- ----void dock_startup(gboolean reconfig); ----void dock_shutdown(gboolean reconfig); ---- ----void dock_configure(void); ----void dock_hide(gboolean hide); ---- ----void dock_manage(Window icon_win, Window name_win); ---- ----void dock_unmanage_all(void); ----void dock_unmanage(ObDockApp *app, gboolean reparent); ---- ----void dock_app_drag(ObDockApp *app, XMotionEvent *e); ----void dock_app_configure(ObDockApp *app, gint w, gint h); ---- ----void dock_get_area(Rect *a); ---- ----ObDockApp* dock_find_dockapp(Window xwin); ---- ----#endif diff --cc openbox/event.c index 3f604b6b,4d1b6aba,4d1b6aba,9d66fde0..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/event.c +++ /dev/null @@@@@ -1,2056 -1,2046 -1,2046 -1,2065 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- event.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "event.h" ----#include "debug.h" ----#include "window.h" ----#include "openbox.h" ----#include "dock.h" ----#include "actions.h" ----#include "client.h" ----#include "config.h" ----#include "screen.h" ----#include "frame.h" ----#include "grab.h" ----#include "menu.h" ----#include "prompt.h" ----#include "menuframe.h" ----#include "keyboard.h" ----#include "mouse.h" ----#include "focus.h" ----#include "focus_cycle.h" ----#include "moveresize.h" ----#include "group.h" ----#include "stacking.h" ----#include "ping.h" ----#include "obt/display.h" ----#include "obt/prop.h" ----#include "obt/keyboard.h" ---- ----#include ----#include ----#include ---- ----#ifdef HAVE_SYS_SELECT_H ----# include ----#endif ----#ifdef HAVE_SIGNAL_H ----# include ----#endif ----#ifdef HAVE_UNISTD_H ----# include /* for usleep() */ ----#endif ----#ifdef XKB ----# include ----#endif ---- ----#ifdef USE_SM ----#include ----#endif ---- ----typedef struct ----{ ---- gboolean ignored; ----} ObEventData; ---- ----typedef struct ----{ ---- ObClient *client; ---- Time time; ---- gulong serial; ----} ObFocusDelayData; ---- ----typedef struct ----{ ---- gulong start; /* inclusive */ ---- gulong end; /* inclusive */ ----} ObSerialRange; ---- ----static void event_process(const XEvent *e, gpointer data); ----static void event_handle_root(XEvent *e); ----static gboolean event_handle_menu_input(XEvent *e); ----static void event_handle_menu(ObMenuFrame *frame, XEvent *e); ----static gboolean event_handle_prompt(ObPrompt *p, XEvent *e); ----static void event_handle_dock(ObDock *s, XEvent *e); ----static void event_handle_dockapp(ObDockApp *app, XEvent *e); ----static void event_handle_client(ObClient *c, XEvent *e); ----static void event_handle_user_input(ObClient *client, XEvent *e); ----static gboolean is_enter_focus_event_ignored(gulong serial); ----static void event_ignore_enter_range(gulong start, gulong end); ---- ----static void focus_delay_dest(gpointer data); ----static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2); ----static gboolean focus_delay_func(gpointer data); ----static void focus_delay_client_dest(ObClient *client, gpointer data); ---- ----Time event_curtime = CurrentTime; ----Time event_last_user_time = CurrentTime; ----/*! The serial of the current X event */ ---- ----static gulong event_curserial; ----static gboolean focus_left_screen = FALSE; ----/*! A list of ObSerialRanges which are to be ignored for mouse enter events */ ----static GSList *ignore_serials = NULL; ---- ----#ifdef USE_SM ----static void ice_handler(gint fd, gpointer conn) ----{ ---- Bool b; ---- IceProcessMessages(conn, NULL, &b); ----} ---- ----static void ice_watch(IceConn conn, IcePointer data, Bool opening, ---- IcePointer *watch_data) ----{ ---- static gint fd = -1; ---- ---- if (opening) { ---- fd = IceConnectionNumber(conn); ---- obt_main_loop_fd_add(ob_main_loop, fd, ice_handler, conn, NULL); ---- } else { ---- obt_main_loop_fd_remove(ob_main_loop, fd); ---- fd = -1; ---- } ----} ----#endif ---- ----void event_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- obt_main_loop_x_add(ob_main_loop, event_process, NULL, NULL); ---- ----#ifdef USE_SM ---- IceAddConnectionWatch(ice_watch, NULL); ----#endif ---- ---- client_add_destroy_notify(focus_delay_client_dest, NULL); ----} ---- ----void event_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ----#ifdef USE_SM ---- IceRemoveConnectionWatch(ice_watch, NULL); ----#endif ---- ---- client_remove_destroy_notify(focus_delay_client_dest); ----} ---- ----static Window event_get_window(XEvent *e) ----{ ---- Window window; ---- ---- /* pick a window */ ---- switch (e->type) { ---- case SelectionClear: ---- window = obt_root(ob_screen); ---- break; ---- case CreateNotify: ---- window = e->xcreatewindow.window; ---- break; ---- case MapRequest: ---- window = e->xmaprequest.window; ---- break; ---- case MapNotify: ---- window = e->xmap.window; ---- break; ---- case UnmapNotify: ---- window = e->xunmap.window; ---- break; ---- case DestroyNotify: ---- window = e->xdestroywindow.window; ---- break; ---- case ConfigureRequest: ---- window = e->xconfigurerequest.window; ---- break; ---- case ConfigureNotify: ---- window = e->xconfigure.window; ---- break; ---- default: ----#ifdef XKB ---- if (obt_display_extension_xkb && ---- e->type == obt_display_extension_xkb_basep) ---- { ---- switch (((XkbAnyEvent*)e)->xkb_type) { ---- case XkbBellNotify: ---- window = ((XkbBellNotifyEvent*)e)->window; ---- default: ---- window = None; ---- } ---- } else ----#endif ----#ifdef SYNC ---- if (obt_display_extension_sync && ---- e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) ---- { ---- window = None; ---- } else ----#endif ---- window = e->xany.window; ---- } ---- return window; ----} ---- ----static void event_set_curtime(XEvent *e) ----{ ---- Time t = CurrentTime; ---- ---- /* grab the lasttime and hack up the state */ ---- switch (e->type) { ---- case ButtonPress: ---- case ButtonRelease: ---- t = e->xbutton.time; ---- break; ---- case KeyPress: ---- t = e->xkey.time; ---- break; ---- case KeyRelease: ---- t = e->xkey.time; ---- break; ---- case MotionNotify: ---- t = e->xmotion.time; ---- break; ---- case PropertyNotify: ---- t = e->xproperty.time; ---- break; ---- case EnterNotify: ---- case LeaveNotify: ---- t = e->xcrossing.time; ---- break; ---- default: ----#ifdef SYNC ---- if (obt_display_extension_sync && ---- e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) ---- { ---- t = ((XSyncAlarmNotifyEvent*)e)->time; ---- } ----#endif ---- /* if more event types are anticipated, get their timestamp ---- explicitly */ ---- break; ---- } ---- ---- /* watch that if we get an event earlier than the last specified user_time, ---- which can happen if the clock goes backwards, we erase the last ---- specified user_time */ ---- if (t && event_last_user_time && event_time_after(event_last_user_time, t)) ---- event_last_user_time = CurrentTime; ---- ---- event_curtime = t; ----} ---- ----static void event_hack_mods(XEvent *e) ----{ ----#ifdef XKB ---- XkbStateRec xkb_state; ----#endif ---- ---- switch (e->type) { ---- case ButtonPress: ---- case ButtonRelease: ---- e->xbutton.state = obt_keyboard_only_modmasks(e->xbutton.state); ---- break; ---- case KeyPress: ---- e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state); ---- break; ---- case KeyRelease: ----#ifdef XKB ---- /* If XKB is present, then the modifiers are all strange from its ---- magic. Our X core protocol stuff won't work, so we use this to ---- find what the modifier state is instead. */ ---- if (XkbGetState(obt_display, XkbUseCoreKbd, &xkb_state) == Success) ---- e->xkey.state = ---- obt_keyboard_only_modmasks(xkb_state.compat_state); ---- else ----#endif ---- { ---- e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state); ---- /* remove from the state the mask of the modifier key being ---- released, if it is a modifier key being released that is */ ---- e->xkey.state &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode); ---- } ---- break; ---- case MotionNotify: ---- e->xmotion.state = obt_keyboard_only_modmasks(e->xmotion.state); ---- /* compress events */ ---- { ---- XEvent ce; ---- while (XCheckTypedWindowEvent(obt_display, e->xmotion.window, ---- e->type, &ce)) { ---- e->xmotion.x = ce.xmotion.x; ---- e->xmotion.y = ce.xmotion.y; ---- e->xmotion.x_root = ce.xmotion.x_root; ---- e->xmotion.y_root = ce.xmotion.y_root; ---- } ---- } ---- break; ---- } ----} ---- ----static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only) ----{ ---- gint mode = e->xfocus.mode; ---- gint detail = e->xfocus.detail; ---- Window win = e->xany.window; ---- ---- if (e->type == FocusIn) { ---- /* These are ones we never want.. */ ---- ---- /* This means focus was given by a keyboard/mouse grab. */ ---- if (mode == NotifyGrab) ---- return FALSE; ---- /* This means focus was given back from a keyboard/mouse grab. */ ---- if (mode == NotifyUngrab) ---- return FALSE; ---- ---- /* These are the ones we want.. */ ---- ---- if (win == obt_root(ob_screen)) { ---- /* If looking for a focus in on a client, then always return ---- FALSE for focus in's to the root window */ ---- if (in_client_only) ---- return FALSE; ---- /* This means focus reverted off of a client */ ---- else if (detail == NotifyPointerRoot || ---- detail == NotifyDetailNone || ---- detail == NotifyInferior || ---- /* This means focus got here from another screen */ ---- detail == NotifyNonlinear) ---- return TRUE; ---- else ---- return FALSE; ---- } ---- ---- /* It was on a client, was it a valid one? ---- It's possible to get a FocusIn event for a client that was managed ---- but has disappeared. ---- */ ---- if (in_client_only) { ---- ObWindow *w = window_find(e->xfocus.window); ---- if (!w || !WINDOW_IS_CLIENT(w)) ---- return FALSE; ---- } ---- else { ---- /* This means focus reverted to parent from the client (this ---- happens often during iconify animation) */ ---- if (detail == NotifyInferior) ---- return TRUE; ---- } ---- ---- /* This means focus moved from the root window to a client */ ---- if (detail == NotifyVirtual) ---- return TRUE; ---- /* This means focus moved from one client to another */ ---- if (detail == NotifyNonlinearVirtual) ---- return TRUE; ---- ---- /* Otherwise.. */ ---- return FALSE; ---- } else { ---- g_assert(e->type == FocusOut); ---- ---- /* These are ones we never want.. */ ---- ---- /* This means focus was taken by a keyboard/mouse grab. */ ---- if (mode == NotifyGrab) ---- return FALSE; ---- /* This means focus was grabbed on a window and it was released. */ ---- if (mode == NotifyUngrab) ---- return FALSE; ---- ---- /* Focus left the root window revertedto state */ ---- if (win == obt_root(ob_screen)) ---- return FALSE; ---- ---- /* These are the ones we want.. */ ---- ---- /* This means focus moved from a client to the root window */ ---- if (detail == NotifyVirtual) ---- return TRUE; ---- /* This means focus moved from one client to another */ ---- if (detail == NotifyNonlinearVirtual) ---- return TRUE; ---- ---- /* Otherwise.. */ ---- return FALSE; ---- } ----} ---- ----static Bool event_look_for_focusin(Display *d, XEvent *e, XPointer arg) ----{ ---- return e->type == FocusIn && wanted_focusevent(e, FALSE); ----} ---- ----static Bool event_look_for_focusin_client(Display *d, XEvent *e, XPointer arg) ----{ ---- return e->type == FocusIn && wanted_focusevent(e, TRUE); ----} ---- ----static void print_focusevent(XEvent *e) ----{ ---- gint mode = e->xfocus.mode; ---- gint detail = e->xfocus.detail; ---- Window win = e->xany.window; ---- const gchar *modestr, *detailstr; ---- ---- switch (mode) { ---- case NotifyNormal: modestr="NotifyNormal"; break; ---- case NotifyGrab: modestr="NotifyGrab"; break; ---- case NotifyUngrab: modestr="NotifyUngrab"; break; ---- case NotifyWhileGrabbed: modestr="NotifyWhileGrabbed"; break; ---- } ---- switch (detail) { ---- case NotifyAncestor: detailstr="NotifyAncestor"; break; ---- case NotifyVirtual: detailstr="NotifyVirtual"; break; ---- case NotifyInferior: detailstr="NotifyInferior"; break; ---- case NotifyNonlinear: detailstr="NotifyNonlinear"; break; ---- case NotifyNonlinearVirtual: detailstr="NotifyNonlinearVirtual"; break; ---- case NotifyPointer: detailstr="NotifyPointer"; break; ---- case NotifyPointerRoot: detailstr="NotifyPointerRoot"; break; ---- case NotifyDetailNone: detailstr="NotifyDetailNone"; break; ---- } ---- ---- if (mode == NotifyGrab || mode == NotifyUngrab) ---- return; ---- ---- g_assert(modestr); ---- g_assert(detailstr); ---- ob_debug_type(OB_DEBUG_FOCUS, "Focus%s 0x%x mode=%s detail=%s", ---- (e->xfocus.type == FocusIn ? "In" : "Out"), ---- win, ---- modestr, detailstr); ---- ----} ---- ----static gboolean event_ignore(XEvent *e, ObClient *client) ----{ ---- switch(e->type) { ---- case FocusIn: ---- print_focusevent(e); ---- if (!wanted_focusevent(e, FALSE)) ---- return TRUE; ---- break; ---- case FocusOut: ---- print_focusevent(e); ---- if (!wanted_focusevent(e, FALSE)) ---- return TRUE; ---- break; ---- } ---- return FALSE; ----} ---- ----static void event_process(const XEvent *ec, gpointer data) ----{ ---- XEvent ee, *e; ---- ObEventData *ed = data; ---- ---- Window window; ---- ObClient *client = NULL; ---- ObDock *dock = NULL; ---- ObDockApp *dockapp = NULL; ---- ObWindow *obwin = NULL; ---- ObMenuFrame *menu = NULL; ---- ObPrompt *prompt = NULL; ---- ---- /* make a copy we can mangle */ ---- ee = *ec; ---- e = ⅇ ---- ---- window = event_get_window(e); ---- if (window == obt_root(ob_screen)) ---- /* don't do any lookups, waste of cpu */; ---- else if ((obwin = window_find(window))) { ---- switch (obwin->type) { ---- case OB_WINDOW_CLASS_DOCK: ---- dock = WINDOW_AS_DOCK(obwin); ---- break; ---- case OB_WINDOW_CLASS_CLIENT: ---- client = WINDOW_AS_CLIENT(obwin); ---- /* events on clients can be events on prompt windows too */ ---- prompt = client->prompt; ---- break; ---- case OB_WINDOW_CLASS_MENUFRAME: ---- menu = WINDOW_AS_MENUFRAME(obwin); ---- break; ---- case OB_WINDOW_CLASS_INTERNAL: ---- /* we don't do anything with events directly on these windows */ ---- break; ---- case OB_WINDOW_CLASS_PROMPT: ---- prompt = WINDOW_AS_PROMPT(obwin); ---- break; ---- } ---- } ---- else ---- dockapp = dock_find_dockapp(window); ---- ---- event_set_curtime(e); ---- event_curserial = e->xany.serial; ---- event_hack_mods(e); ---- if (event_ignore(e, client)) { ---- if (ed) ---- ed->ignored = TRUE; ---- return; ---- } else if (ed) ---- ed->ignored = FALSE; ---- ---- /* deal with it in the kernel */ ---- ---- if (e->type == FocusIn) { ---- if (client && ---- e->xfocus.detail == NotifyInferior) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to the frame window"); ---- ---- focus_left_screen = FALSE; ---- ---- focus_fallback(FALSE, config_focus_under_mouse, TRUE, TRUE); ---- ---- /* We don't get a FocusOut for this case, because it's just moving ---- from our Inferior up to us. This happens when iconifying a ---- window with RevertToParent focus */ ---- frame_adjust_focus(client->frame, FALSE); ---- /* focus_set_client(NULL) has already been called */ ---- } ---- else if (e->xfocus.detail == NotifyPointerRoot || ---- e->xfocus.detail == NotifyDetailNone || ---- e->xfocus.detail == NotifyInferior || ---- e->xfocus.detail == NotifyNonlinear) ---- { ---- XEvent ce; ---- ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to root or pointer root/none"); ---- ---- if (e->xfocus.detail == NotifyInferior || ---- e->xfocus.detail == NotifyNonlinear) ---- { ---- focus_left_screen = FALSE; ---- } ---- ---- /* If another FocusIn is in the queue then don't fallback yet. This ---- fixes the fun case of: ---- window map -> send focusin ---- window unmap -> get focusout ---- window map -> send focusin ---- get first focus out -> fall back to something (new window ---- hasn't received focus yet, so something else) -> send focusin ---- which means the "something else" is the last thing to get a ---- focusin sent to it, so the new window doesn't end up with focus. ---- ---- But if the other focus in is something like PointerRoot then we ---- still want to fall back. ---- */ ---- if (XCheckIfEvent(obt_display, &ce, event_look_for_focusin_client, ---- NULL)) ---- { ---- XPutBackEvent(obt_display, &ce); ---- ob_debug_type(OB_DEBUG_FOCUS, ---- " but another FocusIn is coming"); ---- } else { ---- /* Focus has been reverted. ---- ---- FocusOut events come after UnmapNotify, so we don't need to ---- worry about focusing an invalid window ---- */ ---- ---- if (!focus_left_screen) ---- focus_fallback(FALSE, config_focus_under_mouse, ---- TRUE, TRUE); ---- } ---- } ---- else if (!client) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to a window that is already gone"); ---- ---- /* If you send focus to a window and then it disappears, you can ---- get the FocusIn for it, after it is unmanaged. ---- Just wait for the next FocusOut/FocusIn pair, but make note that ---- the window that was focused no longer is. */ ---- focus_set_client(NULL); ---- } ---- else if (client != focus_client) { ---- focus_left_screen = FALSE; ---- frame_adjust_focus(client->frame, TRUE); ---- focus_set_client(client); ---- client_calc_layer(client); ---- client_bring_helper_windows(client); ---- } ---- } else if (e->type == FocusOut) { ---- XEvent ce; ---- ---- /* Look for the followup FocusIn */ ---- if (!XCheckIfEvent(obt_display, &ce, event_look_for_focusin, NULL)) { ---- /* There is no FocusIn, this means focus went to a window that ---- is not being managed, or a window on another screen. */ ---- Window win, root; ---- gint i; ---- guint u; ---- obt_display_ignore_errors(TRUE); ---- if (XGetInputFocus(obt_display, &win, &i) && ---- XGetGeometry(obt_display, win, &root, &i,&i,&u,&u,&u,&u) && ---- root != obt_root(ob_screen)) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to another screen !"); ---- focus_left_screen = TRUE; ---- } ---- else ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to a black hole !"); ---- obt_display_ignore_errors(FALSE); ---- /* nothing is focused */ ---- focus_set_client(NULL); ---- } else { ---- /* Focus moved, so process the FocusIn event */ ---- ObEventData ed = { .ignored = FALSE }; ---- event_process(&ce, &ed); ---- if (ed.ignored) { ---- /* The FocusIn was ignored, this means it was on a window ---- that isn't a client. */ ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "Focus went to an unmanaged window 0x%x !", ---- ce.xfocus.window); ---- focus_fallback(TRUE, config_focus_under_mouse, TRUE, TRUE); ---- } ---- } ---- ---- if (client && client != focus_client) { ---- frame_adjust_focus(client->frame, FALSE); ---- /* focus_set_client(NULL) has already been called in this ---- section or by focus_fallback */ ---- } ---- } ---- else if (client) ---- event_handle_client(client, e); ---- else if (dockapp) ---- event_handle_dockapp(dockapp, e); ---- else if (dock) ---- event_handle_dock(dock, e); ---- else if (menu) ---- event_handle_menu(menu, e); ---- else if (window == obt_root(ob_screen)) ---- event_handle_root(e); ---- else if (e->type == MapRequest) ---- window_manage(window); ---- else if (e->type == MappingNotify) { ---- /* keyboard layout changes for modifier mapping changes. reload the ---- modifier map, and rebind all the key bindings as appropriate */ ---- ob_debug("Kepboard map changed. Reloading keyboard bindings."); ---- obt_keyboard_reload(); ---- keyboard_rebind(); ---- } ---- else if (e->type == ClientMessage) { ---- /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for ---- windows that are not managed yet. */ ---- if (e->xclient.message_type == ---- OBT_PROP_ATOM(NET_REQUEST_FRAME_EXTENTS)) ---- { ---- /* Pretend to manage the client, getting information used to ---- determine its decorations */ ---- ObClient *c = client_fake_manage(e->xclient.window); ---- gulong vals[4]; ---- ---- /* set the frame extents on the window */ ---- vals[0] = c->frame->size.left; ---- vals[1] = c->frame->size.right; ---- vals[2] = c->frame->size.top; ---- vals[3] = c->frame->size.bottom; ---- OBT_PROP_SETA32(e->xclient.window, NET_FRAME_EXTENTS, ---- CARDINAL, vals, 4); ---- ---- /* Free the pretend client */ ---- client_fake_unmanage(c); ---- } ---- } ---- else if (e->type == ConfigureRequest) { ---- /* unhandled configure requests must be used to configure the ---- window directly */ ---- XWindowChanges xwc; ---- ---- xwc.x = e->xconfigurerequest.x; ---- xwc.y = e->xconfigurerequest.y; ---- xwc.width = e->xconfigurerequest.width; ---- xwc.height = e->xconfigurerequest.height; ---- xwc.border_width = e->xconfigurerequest.border_width; ---- xwc.sibling = e->xconfigurerequest.above; ---- xwc.stack_mode = e->xconfigurerequest.detail; ---- ---- /* we are not to be held responsible if someone sends us an ---- invalid request! */ ---- obt_display_ignore_errors(TRUE); ---- XConfigureWindow(obt_display, window, ---- e->xconfigurerequest.value_mask, &xwc); ---- obt_display_ignore_errors(FALSE); ---- } ----#ifdef SYNC ---- else if (obt_display_extension_sync && ---- e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) ---- { ---- XSyncAlarmNotifyEvent *se = (XSyncAlarmNotifyEvent*)e; ---- if (se->alarm == moveresize_alarm && moveresize_in_progress) ---- moveresize_event(e); ---- } ----#endif ---- ---- if (prompt && event_handle_prompt(prompt, e)) ---- ; ---- else if (e->type == ButtonPress || e->type == ButtonRelease) { ---- /* If the button press was on some non-root window, or was physically ---- on the root window, then process it */ ---- if (window != obt_root(ob_screen) || ---- e->xbutton.subwindow == None) ---- { ---- event_handle_user_input(client, e); ---- } ---- /* Otherwise only process it if it was physically on an openbox ---- internal window */ ---- else { ---- ObWindow *w; ---- ---- if ((w = window_find(e->xbutton.subwindow)) && ---- WINDOW_IS_INTERNAL(w)) ---- { ---- event_handle_user_input(client, e); ---- } ---- } ---- } ---- else if (e->type == KeyPress || e->type == KeyRelease || ---- e->type == MotionNotify) ---- event_handle_user_input(client, e); ---- ---- /* if something happens and it's not from an XEvent, then we don't know ---- the time */ ---- event_curtime = CurrentTime; ---- event_curserial = 0; ----} ---- ----static void event_handle_root(XEvent *e) ----{ ---- Atom msgtype; ---- ---- switch(e->type) { ---- case SelectionClear: ---- ob_debug("Another WM has requested to replace us. Exiting."); ---- ob_exit_replace(); ---- break; ---- ---- case ClientMessage: ---- if (e->xclient.format != 32) break; ---- ---- msgtype = e->xclient.message_type; ---- if (msgtype == OBT_PROP_ATOM(NET_CURRENT_DESKTOP)) { ---- guint d = e->xclient.data.l[0]; ---- if (d < screen_num_desktops) { ---- event_curtime = e->xclient.data.l[1]; ---- if (event_curtime == 0) ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_CURRENT_DESKTOP message is missing " ---- "a timestamp"); ---- screen_set_desktop(d, TRUE); ---- } ---- } else if (msgtype == OBT_PROP_ATOM(NET_NUMBER_OF_DESKTOPS)) { ---- guint d = e->xclient.data.l[0]; ---- if (d > 0 && d <= 1000) ---- screen_set_num_desktops(d); ---- } else if (msgtype == OBT_PROP_ATOM(NET_SHOWING_DESKTOP)) { ---- screen_show_desktop(e->xclient.data.l[0] != 0, NULL); ---- } else if (msgtype == OBT_PROP_ATOM(OB_CONTROL)) { ---- ob_debug("OB_CONTROL: %d", e->xclient.data.l[0]); ---- if (e->xclient.data.l[0] == 1) ---- ob_reconfigure(); ---- else if (e->xclient.data.l[0] == 2) ---- ob_restart(); ---- else if (e->xclient.data.l[0] == 3) ---- ob_exit(0); ---- } else if (msgtype == OBT_PROP_ATOM(WM_PROTOCOLS)) { ---- if ((Atom)e->xclient.data.l[0] == OBT_PROP_ATOM(NET_WM_PING)) ---- ping_got_pong(e->xclient.data.l[1]); ---- } ---- break; ---- case PropertyNotify: ---- if (e->xproperty.atom == OBT_PROP_ATOM(NET_DESKTOP_NAMES)) { ---- ob_debug("UPDATE DESKTOP NAMES"); ---- screen_update_desktop_names(); ---- } ---- else if (e->xproperty.atom == OBT_PROP_ATOM(NET_DESKTOP_LAYOUT)) ---- screen_update_layout(); ---- break; ---- case ConfigureNotify: ----#ifdef XRANDR ---- XRRUpdateConfiguration(e); ----#endif ---- screen_resize(); ---- break; ---- default: ---- ; ---- } ----} ---- ----void event_enter_client(ObClient *client) ----{ ---- g_assert(config_focus_follow); ---- ---- if (is_enter_focus_event_ignored(event_curserial)) { ---- ob_debug_type(OB_DEBUG_FOCUS, "Ignoring enter event with serial %lu\n" ---- "on client 0x%x", event_curserial, client->window); ---- return; ---- } ---- ---- if (client_enter_focusable(client) && client_can_focus(client)) { ---- if (config_focus_delay) { ---- ObFocusDelayData *data; ---- ---- obt_main_loop_timeout_remove(ob_main_loop, focus_delay_func); ---- ---- data = g_new(ObFocusDelayData, 1); ---- data->client = client; ---- data->time = event_curtime; ---- data->serial = event_curserial; ---- ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_focus_delay * 1000, ---- focus_delay_func, ---- data, focus_delay_cmp, focus_delay_dest); ---- } else { ---- ObFocusDelayData data; ---- data.client = client; ---- data.time = event_curtime; ---- data.serial = event_curserial; ---- focus_delay_func(&data); ---- } ---- } ----} ---- ----static gboolean *context_to_button(ObFrame *f, ObFrameContext con, gboolean press) ----{ ---- if (press) { ---- switch (con) { ---- case OB_FRAME_CONTEXT_MAXIMIZE: ---- return &f->max_press; ---- case OB_FRAME_CONTEXT_CLOSE: ---- return &f->close_press; ---- case OB_FRAME_CONTEXT_ICONIFY: ---- return &f->iconify_press; ---- case OB_FRAME_CONTEXT_ALLDESKTOPS: ---- return &f->desk_press; ---- case OB_FRAME_CONTEXT_SHADE: ---- return &f->shade_press; ---- default: ---- return NULL; ---- } ---- } else { ---- switch (con) { ---- case OB_FRAME_CONTEXT_MAXIMIZE: ---- return &f->max_hover; ---- case OB_FRAME_CONTEXT_CLOSE: ---- return &f->close_hover; ---- case OB_FRAME_CONTEXT_ICONIFY: ---- return &f->iconify_hover; ---- case OB_FRAME_CONTEXT_ALLDESKTOPS: ---- return &f->desk_hover; ---- case OB_FRAME_CONTEXT_SHADE: ---- return &f->shade_hover; ---- default: ---- return NULL; ---- } ---- } ----} ---- ----static void compress_client_message_event(XEvent *e, XEvent *ce, Window window, ---- Atom msgtype) ----{ ---- /* compress changes into a single change */ ---- while (XCheckTypedWindowEvent(obt_display, window, e->type, ce)) { ---- /* XXX: it would be nice to compress ALL messages of a ---- type, not just messages in a row without other ---- message types between. */ ---- if (ce->xclient.message_type != msgtype) { ---- XPutBackEvent(obt_display, ce); ---- break; ---- } ---- e->xclient = ce->xclient; ---- } ----} ---- ----static void event_handle_client(ObClient *client, XEvent *e) ----{ ---- XEvent ce; ---- Atom msgtype; ---- ObFrameContext con; ---- gboolean *but; ---- static gint px = -1, py = -1; ---- static guint pb = 0; ---- static ObFrameContext pcon = OB_FRAME_CONTEXT_NONE; ---- ---- switch (e->type) { ---- case ButtonPress: ---- /* save where the press occured for the first button pressed */ ---- if (!pb) { ---- pb = e->xbutton.button; ---- px = e->xbutton.x; ---- py = e->xbutton.y; ---- ---- pcon = frame_context(client, e->xbutton.window, px, py); ---- pcon = mouse_button_frame_context(pcon, e->xbutton.button, ---- e->xbutton.state); ---- } ---- case ButtonRelease: ---- /* Wheel buttons don't draw because they are an instant click, so it ---- is a waste of resources to go drawing it. ---- if the user is doing an interactive thing, or has a menu open then ---- the mouse is grabbed (possibly) and if we get these events we don't ---- want to deal with them ---- */ ---- if (!(e->xbutton.button == 4 || e->xbutton.button == 5) && ---- !grab_on_keyboard()) ---- { ---- /* use where the press occured */ ---- con = frame_context(client, e->xbutton.window, px, py); ---- con = mouse_button_frame_context(con, e->xbutton.button, ---- e->xbutton.state); ---- ---- /* button presses on CLIENT_CONTEXTs are not accompanied by a ---- release because they are Replayed to the client */ ---- if ((e->type == ButtonRelease || CLIENT_CONTEXT(con, client)) && ---- e->xbutton.button == pb) ---- pb = 0, px = py = -1, pcon = OB_FRAME_CONTEXT_NONE; ---- ---- but = context_to_button(client->frame, con, TRUE); ---- if (but) { ---- *but = (e->type == ButtonPress); ---- frame_adjust_state(client->frame); ---- } ---- } ---- break; ---- case MotionNotify: ---- /* when there is a grab on the pointer, we won't get enter/leave ---- notifies, but we still get motion events */ ---- if (grab_on_pointer()) break; ---- ---- con = frame_context(client, e->xmotion.window, ---- e->xmotion.x, e->xmotion.y); ---- switch (con) { ---- case OB_FRAME_CONTEXT_TITLEBAR: ---- case OB_FRAME_CONTEXT_TLCORNER: ---- case OB_FRAME_CONTEXT_TRCORNER: ---- /* we've left the button area inside the titlebar */ ---- if (client->frame->max_hover || client->frame->desk_hover || ---- client->frame->shade_hover || client->frame->iconify_hover || ---- client->frame->close_hover) ---- { ---- client->frame->max_hover = ---- client->frame->desk_hover = ---- client->frame->shade_hover = ---- client->frame->iconify_hover = ---- client->frame->close_hover = FALSE; ---- frame_adjust_state(client->frame); ---- } ---- break; ---- default: ---- but = context_to_button(client->frame, con, FALSE); ---- if (but && !*but && !pb) { ---- *but = TRUE; ---- frame_adjust_state(client->frame); ---- } ---- break; ---- } ---- break; ---- case LeaveNotify: ---- con = frame_context(client, e->xcrossing.window, ---- e->xcrossing.x, e->xcrossing.y); ---- switch (con) { ---- case OB_FRAME_CONTEXT_TITLEBAR: ---- case OB_FRAME_CONTEXT_TLCORNER: ---- case OB_FRAME_CONTEXT_TRCORNER: ---- /* we've left the button area inside the titlebar */ ---- client->frame->max_hover = ---- client->frame->desk_hover = ---- client->frame->shade_hover = ---- client->frame->iconify_hover = ---- client->frame->close_hover = FALSE; ---- if (e->xcrossing.mode == NotifyGrab) { ---- client->frame->max_press = ---- client->frame->desk_press = ---- client->frame->shade_press = ---- client->frame->iconify_press = ---- client->frame->close_press = FALSE; ---- } ---- break; ---- case OB_FRAME_CONTEXT_FRAME: ---- /* When the mouse leaves an animating window, don't use the ---- corresponding enter events. Pretend like the animating window ---- doesn't even exist..! */ ---- if (frame_iconify_animating(client->frame)) ---- event_end_ignore_all_enters(event_start_ignore_all_enters()); ---- ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "%sNotify mode %d detail %d on %lx", ---- (e->type == EnterNotify ? "Enter" : "Leave"), ---- e->xcrossing.mode, ---- e->xcrossing.detail, (client?client->window:0)); ---- if (grab_on_keyboard()) ---- break; ---- if (config_focus_follow && config_focus_delay && ---- /* leave inferior events can happen when the mouse goes onto ---- the window's border and then into the window before the ---- delay is up */ ---- e->xcrossing.detail != NotifyInferior) ---- { ---- obt_main_loop_timeout_remove_data(ob_main_loop, ---- focus_delay_func, ---- client, FALSE); ---- } ---- break; ---- default: ---- but = context_to_button(client->frame, con, FALSE); ---- if (but) { ---- *but = FALSE; ---- if (e->xcrossing.mode == NotifyGrab) { ---- but = context_to_button(client->frame, con, TRUE); ---- *but = FALSE; ---- } ---- frame_adjust_state(client->frame); ---- } ---- break; ---- } ---- break; ---- case EnterNotify: ---- { ---- con = frame_context(client, e->xcrossing.window, ---- e->xcrossing.x, e->xcrossing.y); ---- switch (con) { ---- case OB_FRAME_CONTEXT_FRAME: ---- if (grab_on_keyboard()) ---- break; ---- if (e->xcrossing.mode == NotifyGrab || ---- e->xcrossing.mode == NotifyUngrab || ---- /*ignore enters when we're already in the window */ ---- e->xcrossing.detail == NotifyInferior) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "%sNotify mode %d detail %d serial %lu on %lx " ---- "IGNORED", ---- (e->type == EnterNotify ? "Enter" : "Leave"), ---- e->xcrossing.mode, ---- e->xcrossing.detail, ---- e->xcrossing.serial, ---- client?client->window:0); ---- } ---- else { ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "%sNotify mode %d detail %d serial %lu on %lx, " ---- "focusing window", ---- (e->type == EnterNotify ? "Enter" : "Leave"), ---- e->xcrossing.mode, ---- e->xcrossing.detail, ---- e->xcrossing.serial, ---- (client?client->window:0)); ---- if (config_focus_follow) ---- event_enter_client(client); ---- } ---- break; ---- default: ---- but = context_to_button(client->frame, con, FALSE); ---- if (but) { ---- *but = TRUE; ---- if (e->xcrossing.mode == NotifyUngrab) { ---- but = context_to_button(client->frame, con, TRUE); ---- *but = (con == pcon); ---- } ---- frame_adjust_state(client->frame); ---- } ---- break; ---- } ---- break; ---- } ---- case ConfigureRequest: ---- { - if (client->locked) - break; - ---- /* dont compress these unless you're going to watch for property ---- notifies in between (these can change what the configure would ---- do to the window). ---- also you can't compress stacking events ---- */ ---- ---- gint x, y, w, h; ---- gboolean move = FALSE; ---- gboolean resize = FALSE; ---- ---- /* get the current area */ ---- RECT_TO_DIMS(client->area, x, y, w, h); ---- ---- ob_debug("ConfigureRequest for \"%s\" desktop %d wmstate %d " ---- "visible %d", ---- client->title, ---- screen_desktop, client->wmstate, client->frame->visible); ---- ob_debug(" x %d y %d w %d h %d b %d", ---- x, y, w, h, client->border_width); ---- ---- if (e->xconfigurerequest.value_mask & CWBorderWidth) ---- if (client->border_width != e->xconfigurerequest.border_width) { ---- client->border_width = e->xconfigurerequest.border_width; ---- ---- /* if the border width is changing then that is the same ---- as requesting a resize, but we don't actually change ---- the client's border, so it will change their root ---- coordinates (since they include the border width) and ---- we need to a notify then */ ---- move = TRUE; ---- } ---- ---- ---- if (e->xconfigurerequest.value_mask & CWStackMode) { ---- ObClient *sibling = NULL; ---- gulong ignore_start; ---- gboolean ok = TRUE; ---- ---- /* get the sibling */ ---- if (e->xconfigurerequest.value_mask & CWSibling) { ---- ObWindow *win; ---- win = window_find(e->xconfigurerequest.above); ---- if (win && WINDOW_IS_CLIENT(win) && ---- WINDOW_AS_CLIENT(win) != client) ---- { ---- sibling = WINDOW_AS_CLIENT(win); ---- } ---- else ---- /* an invalid sibling was specified so don't restack at ---- all, it won't make sense no matter what we do */ ---- ok = FALSE; ---- } ---- ---- if (ok) { ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- stacking_restack_request(client, sibling, ---- e->xconfigurerequest.detail); ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- } ---- ---- /* a stacking change moves the window without resizing */ ---- move = TRUE; ---- } ---- ---- if ((e->xconfigurerequest.value_mask & CWX) || ---- (e->xconfigurerequest.value_mask & CWY) || ---- (e->xconfigurerequest.value_mask & CWWidth) || ---- (e->xconfigurerequest.value_mask & CWHeight)) ---- { ---- /* don't allow clients to move shaded windows (fvwm does this) ---- */ ---- if (e->xconfigurerequest.value_mask & CWX) { ---- if (!client->shaded) ---- x = e->xconfigurerequest.x; ---- move = TRUE; ---- } ---- if (e->xconfigurerequest.value_mask & CWY) { ---- if (!client->shaded) ---- y = e->xconfigurerequest.y; ---- move = TRUE; ---- } ---- ---- if (e->xconfigurerequest.value_mask & CWWidth) { ---- w = e->xconfigurerequest.width; ---- resize = TRUE; ---- } ---- if (e->xconfigurerequest.value_mask & CWHeight) { ---- h = e->xconfigurerequest.height; ---- resize = TRUE; ---- } ---- } ---- ---- ob_debug("ConfigureRequest x(%d) %d y(%d) %d w(%d) %d h(%d) %d " ---- "move %d resize %d", ---- e->xconfigurerequest.value_mask & CWX, x, ---- e->xconfigurerequest.value_mask & CWY, y, ---- e->xconfigurerequest.value_mask & CWWidth, w, ---- e->xconfigurerequest.value_mask & CWHeight, h, ---- move, resize); ---- ---- /* check for broken apps moving to their root position ---- ---- XXX remove this some day...that would be nice. right now all ---- kde apps do this when they try activate themselves on another ---- desktop. eg. open amarok window on desktop 1, switch to desktop ---- 2, click amarok tray icon. it will move by its decoration size. ---- */ ---- if (x != client->area.x && ---- x == (client->frame->area.x + client->frame->size.left - ---- (gint)client->border_width) && ---- y != client->area.y && ---- y == (client->frame->area.y + client->frame->size.top - ---- (gint)client->border_width) && ---- w == client->area.width && ---- h == client->area.height) ---- { ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "Application %s is trying to move via " ---- "ConfigureRequest to it's root window position " ---- "but it is not using StaticGravity", ---- client->title); ---- /* don't move it */ ---- x = client->area.x; ---- y = client->area.y; ---- ---- /* they still requested a move, so don't change whether a ---- notify is sent or not */ ---- } ---- ---- { ---- gint lw, lh; ---- ---- client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE); ---- ---- /* if x was not given, then use gravity to figure out the new ---- x. the reference point should not be moved */ ---- if ((e->xconfigurerequest.value_mask & CWWidth && ---- !(e->xconfigurerequest.value_mask & CWX))) ---- client_gravity_resize_w(client, &x, client->area.width, w); ---- /* same for y */ ---- if ((e->xconfigurerequest.value_mask & CWHeight && ---- !(e->xconfigurerequest.value_mask & CWY))) ---- client_gravity_resize_h(client, &y, client->area.height,h); ---- ---- client_find_onscreen(client, &x, &y, w, h, FALSE); ---- ---- ob_debug("Granting ConfigureRequest x %d y %d w %d h %d", ---- x, y, w, h); ---- client_configure(client, x, y, w, h, FALSE, TRUE, TRUE); ---- } ---- break; ---- } ---- case UnmapNotify: ---- ob_debug("UnmapNotify for window 0x%x eventwin 0x%x sendevent %d " ---- "ignores left %d", ---- client->window, e->xunmap.event, e->xunmap.from_configure, ---- client->ignore_unmaps); ---- if (client->ignore_unmaps) { ---- client->ignore_unmaps--; ---- break; ---- } ---- client_unmanage(client); ---- break; ---- case DestroyNotify: ---- ob_debug("DestroyNotify for window 0x%x", client->window); ---- client_unmanage(client); ---- break; ---- case ReparentNotify: ---- /* this is when the client is first taken captive in the frame */ ---- if (e->xreparent.parent == client->frame->window) break; ---- ---- /* ---- This event is quite rare and is usually handled in unmapHandler. ---- However, if the window is unmapped when the reparent event occurs, ---- the window manager never sees it because an unmap event is not sent ---- to an already unmapped window. ---- */ ---- ---- /* we don't want the reparent event, put it back on the stack for the ---- X server to deal with after we unmanage the window */ ---- XPutBackEvent(obt_display, e); ---- ---- ob_debug("ReparentNotify for window 0x%x", client->window); ---- client_unmanage(client); ---- break; ---- case MapRequest: ---- ob_debug("MapRequest for 0x%lx", client->window); ---- if (!client->iconic) break; /* this normally doesn't happen, but if it ---- does, we don't want it! ---- it can happen now when the window is on ---- another desktop, but we still don't ---- want it! */ ---- client_activate(client, FALSE, TRUE, TRUE, TRUE); ---- break; ---- case ClientMessage: ---- /* validate cuz we query stuff off the client here */ ---- if (!client_validate(client)) break; ---- ---- if (e->xclient.format != 32) return; ---- ---- msgtype = e->xclient.message_type; ---- if (msgtype == OBT_PROP_ATOM(WM_CHANGE_STATE)) { ---- compress_client_message_event(e, &ce, client->window, msgtype); - if (!client->locked) - client_set_wm_state(client, e->xclient.data.l[0]); --- client_set_wm_state(client, e->xclient.data.l[0]); ---- } else if (msgtype == OBT_PROP_ATOM(NET_WM_DESKTOP)) { ---- compress_client_message_event(e, &ce, client->window, msgtype); ---- if ((unsigned)e->xclient.data.l[0] < screen_num_desktops || ---- (unsigned)e->xclient.data.l[0] == DESKTOP_ALL) ---- client_set_desktop(client, (unsigned)e->xclient.data.l[0], ---- FALSE, FALSE); ---- } else if (msgtype == OBT_PROP_ATOM(NET_WM_STATE)) { ---- gulong ignore_start; ---- ---- /* can't compress these */ ---- ob_debug("net_wm_state %s %ld %ld for 0x%lx", ---- (e->xclient.data.l[0] == 0 ? "Remove" : ---- e->xclient.data.l[0] == 1 ? "Add" : ---- e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"), ---- e->xclient.data.l[1], e->xclient.data.l[2], ---- client->window); ---- - if (!client->locked) { - /* ignore enter events caused by these like ob actions do */ - if (!config_focus_under_mouse) - ignore_start = event_start_ignore_all_enters(); - client_set_state(client, e->xclient.data.l[0], - e->xclient.data.l[1], e->xclient.data.l[2]); - if (!config_focus_under_mouse) - event_end_ignore_all_enters(ignore_start); - } --- /* ignore enter events caused by these like ob actions do */ --- if (!config_focus_under_mouse) --- ignore_start = event_start_ignore_all_enters(); --- client_set_state(client, e->xclient.data.l[0], --- e->xclient.data.l[1], e->xclient.data.l[2]); --- if (!config_focus_under_mouse) --- event_end_ignore_all_enters(ignore_start); ---- } else if (msgtype == OBT_PROP_ATOM(NET_CLOSE_WINDOW)) { ---- ob_debug("net_close_window for 0x%lx", client->window); - if (!client->locked) - client_close(client); --- client_close(client); ---- } else if (msgtype == OBT_PROP_ATOM(NET_ACTIVE_WINDOW)) { ---- ob_debug("net_active_window for 0x%lx source=%s", ---- client->window, ---- (e->xclient.data.l[0] == 0 ? "unknown" : ---- (e->xclient.data.l[0] == 1 ? "application" : ---- (e->xclient.data.l[0] == 2 ? "user" : "INVALID")))); ---- /* XXX make use of data.l[2] !? */ ---- if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) { ---- /* don't use the user's timestamp for client_focus, cuz if it's ---- an old broken timestamp (happens all the time) then focus ---- won't move even though we're trying to move it ---- event_curtime = e->xclient.data.l[1];*/ ---- if (e->xclient.data.l[1] == 0) ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_ACTIVE_WINDOW message for window %s is" ---- " missing a timestamp", client->title); ---- } else ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_ACTIVE_WINDOW message for window %s is " ---- "missing source indication"); ---- client_activate(client, TRUE, TRUE, TRUE, ---- (e->xclient.data.l[0] == 0 || ---- e->xclient.data.l[0] == 2)); - } else if (msgtype == OBT_PROP_ATOM(OB_FOCUS)) { - client_focus(client); ---- } else if (msgtype == OBT_PROP_ATOM(NET_WM_MOVERESIZE)) { ---- ob_debug("net_wm_moveresize for 0x%lx direction %d", ---- client->window, e->xclient.data.l[2]); ---- if ((Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD) || ---- (Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) ---- { ---- moveresize_start(client, e->xclient.data.l[0], ---- e->xclient.data.l[1], e->xclient.data.l[3], ---- e->xclient.data.l[2]); ---- } ---- else if ((Atom)e->xclient.data.l[2] == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL)) ---- moveresize_end(TRUE); ---- } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) { - if (client->locked) - break; - ---- gint ograv, x, y, w, h; ---- ---- ograv = client->gravity; ---- ---- if (e->xclient.data.l[0] & 0xff) ---- client->gravity = e->xclient.data.l[0] & 0xff; ---- ---- if (e->xclient.data.l[0] & 1 << 8) ---- x = e->xclient.data.l[1]; ---- else ---- x = client->area.x; ---- if (e->xclient.data.l[0] & 1 << 9) ---- y = e->xclient.data.l[2]; ---- else ---- y = client->area.y; ---- ---- if (e->xclient.data.l[0] & 1 << 10) { ---- w = e->xclient.data.l[3]; ---- ---- /* if x was not given, then use gravity to figure out the new ---- x. the reference point should not be moved */ ---- if (!(e->xclient.data.l[0] & 1 << 8)) ---- client_gravity_resize_w(client, &x, client->area.width, w); ---- } ---- else ---- w = client->area.width; ---- ---- if (e->xclient.data.l[0] & 1 << 11) { ---- h = e->xclient.data.l[4]; ---- ---- /* same for y */ ---- if (!(e->xclient.data.l[0] & 1 << 9)) ---- client_gravity_resize_h(client, &y, client->area.height,h); ---- } ---- else ---- h = client->area.height; ---- ---- ob_debug("MOVERESIZE x %d %d y %d %d (gravity %d)", ---- e->xclient.data.l[0] & 1 << 8, x, ---- e->xclient.data.l[0] & 1 << 9, y, ---- client->gravity); ---- ---- client_find_onscreen(client, &x, &y, w, h, FALSE); ---- ---- client_configure(client, x, y, w, h, FALSE, TRUE, FALSE); ---- ---- client->gravity = ograv; ---- } else if (msgtype == OBT_PROP_ATOM(NET_RESTACK_WINDOW)) { ---- if (e->xclient.data.l[0] != 2) { ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_RESTACK_WINDOW sent for window %s with " ---- "invalid source indication %ld", ---- client->title, e->xclient.data.l[0]); ---- } else { ---- ObClient *sibling = NULL; ---- if (e->xclient.data.l[1]) { ---- ObWindow *win = window_find(e->xclient.data.l[1]); ---- if (WINDOW_IS_CLIENT(win) && ---- WINDOW_AS_CLIENT(win) != client) ---- { ---- sibling = WINDOW_AS_CLIENT(win); ---- } ---- if (sibling == NULL) ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_RESTACK_WINDOW sent for window %s " ---- "with invalid sibling 0x%x", ---- client->title, e->xclient.data.l[1]); ---- } ---- if (e->xclient.data.l[2] == Below || ---- e->xclient.data.l[2] == BottomIf || ---- e->xclient.data.l[2] == Above || ---- e->xclient.data.l[2] == TopIf || ---- e->xclient.data.l[2] == Opposite) ---- { ---- gulong ignore_start; ---- ---- if (!config_focus_under_mouse) ---- ignore_start = event_start_ignore_all_enters(); ---- /* just raise, don't activate */ ---- stacking_restack_request(client, sibling, ---- e->xclient.data.l[2]); ---- if (!config_focus_under_mouse) ---- event_end_ignore_all_enters(ignore_start); ---- ---- /* send a synthetic ConfigureNotify, cuz this is supposed ---- to be like a ConfigureRequest. */ ---- client_reconfigure(client, TRUE); ---- } else ---- ob_debug_type(OB_DEBUG_APP_BUGS, ---- "_NET_RESTACK_WINDOW sent for window %s " ---- "with invalid detail %d", ---- client->title, e->xclient.data.l[2]); ---- } ---- } ---- break; ---- case PropertyNotify: ---- /* validate cuz we query stuff off the client here */ ---- if (!client_validate(client)) break; ---- ---- /* compress changes to a single property into a single change */ ---- while (XCheckTypedWindowEvent(obt_display, client->window, ---- e->type, &ce)) { ---- Atom a, b; ---- ---- /* XXX: it would be nice to compress ALL changes to a property, ---- not just changes in a row without other props between. */ ---- ---- a = ce.xproperty.atom; ---- b = e->xproperty.atom; ---- ---- if (a == b) ---- continue; ---- if ((a == OBT_PROP_ATOM(NET_WM_NAME) || ---- a == OBT_PROP_ATOM(WM_NAME) || ---- a == OBT_PROP_ATOM(NET_WM_ICON_NAME) || ---- a == OBT_PROP_ATOM(WM_ICON_NAME)) ---- && ---- (b == OBT_PROP_ATOM(NET_WM_NAME) || ---- b == OBT_PROP_ATOM(WM_NAME) || ---- b == OBT_PROP_ATOM(NET_WM_ICON_NAME) || ---- b == OBT_PROP_ATOM(WM_ICON_NAME))) { ---- continue; ---- } ---- if (a == OBT_PROP_ATOM(NET_WM_ICON) && ---- b == OBT_PROP_ATOM(NET_WM_ICON)) ---- continue; ---- ---- XPutBackEvent(obt_display, &ce); ---- break; ---- } ---- ---- msgtype = e->xproperty.atom; ---- if (msgtype == XA_WM_NORMAL_HINTS) { ---- ob_debug("Update NORMAL hints"); ---- client_update_normal_hints(client); ---- /* normal hints can make a window non-resizable */ ---- client_setup_decor_and_functions(client, FALSE); ---- ---- /* make sure the client's sizes are within its bounds, but only ---- reconfigure the window if it needs to. emacs will update its ---- normal hints every time it receives a conigurenotify */ ---- client_reconfigure(client, FALSE); ---- } else if (msgtype == XA_WM_HINTS) { ---- client_update_wmhints(client); ---- } else if (msgtype == XA_WM_TRANSIENT_FOR) { ---- client_update_transient_for(client); ---- client_get_type_and_transientness(client); ---- /* type may have changed, so update the layer */ ---- client_calc_layer(client); ---- client_setup_decor_and_functions(client, TRUE); ---- } else if (msgtype == OBT_PROP_ATOM(NET_WM_NAME) || ---- msgtype == OBT_PROP_ATOM(WM_NAME) || ---- msgtype == OBT_PROP_ATOM(NET_WM_ICON_NAME) || ---- msgtype == OBT_PROP_ATOM(WM_ICON_NAME)) { ---- client_update_title(client); ---- } else if (msgtype == OBT_PROP_ATOM(WM_PROTOCOLS)) { ---- client_update_protocols(client); ---- client_setup_decor_and_functions(client, TRUE); ---- } ---- else if (msgtype == OBT_PROP_ATOM(NET_WM_STRUT) || ---- msgtype == OBT_PROP_ATOM(NET_WM_STRUT_PARTIAL)) { ---- client_update_strut(client); ---- } ---- else if (msgtype == OBT_PROP_ATOM(NET_WM_ICON)) { ---- client_update_icons(client); ---- } ---- else if (msgtype == OBT_PROP_ATOM(NET_WM_ICON_GEOMETRY)) { ---- client_update_icon_geometry(client); ---- } ---- else if (msgtype == OBT_PROP_ATOM(NET_WM_USER_TIME)) { ---- guint32 t; ---- if (client == focus_client && ---- OBT_PROP_GET32(client->window, NET_WM_USER_TIME, CARDINAL, &t) ---- && t && !event_time_after(t, e->xproperty.time) && ---- (!event_last_user_time || ---- event_time_after(t, event_last_user_time))) ---- { ---- event_last_user_time = t; ---- } ---- } ----#ifdef SYNC ---- else if (msgtype == OBT_PROP_ATOM(NET_WM_SYNC_REQUEST_COUNTER)) { ---- client_update_sync_request_counter(client); ---- } ----#endif ---- break; ---- case ColormapNotify: ---- client_update_colormap(client, e->xcolormap.colormap); ---- break; ---- default: ---- ; ----#ifdef SHAPE ---- if (obt_display_extension_shape && ---- e->type == obt_display_extension_shape_basep) ---- { ---- client->shaped = ((XShapeEvent*)e)->shaped; ---- frame_adjust_shape(client->frame); ---- } ----#endif ---- } ----} ---- ----static void event_handle_dock(ObDock *s, XEvent *e) ----{ ---- switch (e->type) { ---- case ButtonPress: --- if (e->xbutton.button == 1) --- stacking_raise(DOCK_AS_WINDOW(s)); --- else if (e->xbutton.button == 2) --- stacking_lower(DOCK_AS_WINDOW(s)); - switch (e->xbutton.button) { - case 1: - stacking_raise(DOCK_AS_WINDOW(s)); - break; - case 2: - stacking_lower(DOCK_AS_WINDOW(s)); - break; - case 4: - screen_set_desktop( - screen_find_desktop(screen_desktop, OB_DIRECTION_WEST, - TRUE, TRUE), TRUE); - break; - case 5: - screen_set_desktop( - screen_find_desktop(screen_desktop, OB_DIRECTION_EAST, - TRUE, TRUE), TRUE); - break; - case 8: - screen_set_desktop(screen_last_desktop, TRUE); - break; - } ---- break; ---- case EnterNotify: ---- dock_hide(FALSE); ---- break; ---- case LeaveNotify: ---- /* don't hide when moving into a dock app */ ---- if (e->xcrossing.detail != NotifyInferior) ---- dock_hide(TRUE); ---- break; ---- } ----} ---- ----static void event_handle_dockapp(ObDockApp *app, XEvent *e) ----{ ---- switch (e->type) { ---- case MotionNotify: ---- dock_app_drag(app, &e->xmotion); ---- break; ---- case UnmapNotify: ---- if (app->ignore_unmaps) { ---- app->ignore_unmaps--; ---- break; ---- } ---- dock_unmanage(app, TRUE); ---- break; ---- case DestroyNotify: ---- case ReparentNotify: ---- dock_unmanage(app, FALSE); ---- break; ---- case ConfigureNotify: ---- dock_app_configure(app, e->xconfigure.width, e->xconfigure.height); ---- break; ---- } ----} ---- ----static ObMenuFrame* find_active_menu(void) ----{ ---- GList *it; ---- ObMenuFrame *ret = NULL; ---- ---- for (it = menu_frame_visible; it; it = g_list_next(it)) { ---- ret = it->data; ---- if (ret->selected) ---- break; ---- ret = NULL; ---- } ---- return ret; ----} ---- ----static ObMenuFrame* find_active_or_last_menu(void) ----{ ---- ObMenuFrame *ret = NULL; ---- ---- ret = find_active_menu(); ---- if (!ret && menu_frame_visible) ---- ret = menu_frame_visible->data; ---- return ret; ----} ---- ----static gboolean event_handle_prompt(ObPrompt *p, XEvent *e) ----{ ---- switch (e->type) { ---- case ButtonPress: ---- case ButtonRelease: ---- case MotionNotify: ---- return prompt_mouse_event(p, e); ---- break; ---- case KeyPress: ---- return prompt_key_event(p, e); ---- break; ---- } ---- return FALSE; ----} ---- ----static gboolean event_handle_menu_input(XEvent *ev) ----{ ---- gboolean ret = FALSE; ---- ---- if (ev->type == ButtonRelease || ev->type == ButtonPress) { ---- ObMenuEntryFrame *e; ---- ---- if (menu_hide_delay_reached() && ---- (ev->xbutton.button < 4 || ev->xbutton.button > 5)) ---- { ---- if ((e = menu_entry_frame_under(ev->xbutton.x_root, ---- ev->xbutton.y_root))) ---- { ---- if (ev->type == ButtonPress && e->frame->child) ---- menu_frame_select(e->frame->child, NULL, TRUE); ---- menu_frame_select(e->frame, e, TRUE); ---- if (ev->type == ButtonRelease) ---- menu_entry_frame_execute(e, ev->xbutton.state); ---- } ---- else if (ev->type == ButtonRelease) ---- menu_frame_hide_all(); ---- } ---- ret = TRUE; ---- } ---- else if (ev->type == MotionNotify) { ---- ObMenuFrame *f; ---- ObMenuEntryFrame *e; ---- ---- if ((e = menu_entry_frame_under(ev->xmotion.x_root, ---- ev->xmotion.y_root))) ---- if (!(f = find_active_menu()) || ---- f == e->frame || ---- f->parent == e->frame || ---- f->child == e->frame) ---- menu_frame_select(e->frame, e, FALSE); ---- } ---- else if (ev->type == KeyPress || ev->type == KeyRelease) { ---- guint keycode, state; ---- gunichar unikey; ---- ObMenuFrame *frame; ---- ---- keycode = ev->xkey.keycode; ---- state = ev->xkey.state; ---- unikey = obt_keyboard_keycode_to_unichar(keycode); ---- ---- frame = find_active_or_last_menu(); ---- if (frame == NULL) ---- g_assert_not_reached(); /* there is no active menu */ ---- ---- /* Allow control while going thru the menu */ ---- else if (ev->type == KeyPress && (state & ~ControlMask) == 0) { ---- frame->got_press = TRUE; ---- ---- if (keycode == ob_keycode(OB_KEY_ESCAPE)) { ---- menu_frame_hide_all(); ---- ret = TRUE; ---- } ---- ---- else if (keycode == ob_keycode(OB_KEY_LEFT)) { ---- /* Left goes to the parent menu */ ---- menu_frame_select(frame, NULL, TRUE); ---- ret = TRUE; ---- } ---- ---- else if (keycode == ob_keycode(OB_KEY_RIGHT)) { ---- /* Right goes to the selected submenu */ ---- if (frame->child) menu_frame_select_next(frame->child); ---- ret = TRUE; ---- } ---- ---- else if (keycode == ob_keycode(OB_KEY_UP)) { ---- menu_frame_select_previous(frame); ---- ret = TRUE; ---- } ---- ---- else if (keycode == ob_keycode(OB_KEY_DOWN)) { ---- menu_frame_select_next(frame); ---- ret = TRUE; ---- } ---- } ---- ---- /* Use KeyRelease events for running things so that the key release ---- doesn't get sent to the focused application. ---- ---- Allow ControlMask only, and don't bother if the menu is empty */ ---- else if (ev->type == KeyRelease && (state & ~ControlMask) == 0 && ---- frame->entries && frame->got_press) ---- { ---- if (keycode == ob_keycode(OB_KEY_RETURN)) { ---- /* Enter runs the active item or goes into the submenu. ---- Control-Enter runs it without closing the menu. */ ---- if (frame->child) ---- menu_frame_select_next(frame->child); ---- else if (frame->selected) ---- menu_entry_frame_execute(frame->selected, state); ---- ---- ret = TRUE; ---- } ---- ---- /* keyboard accelerator shortcuts. (if it was a valid key) */ ---- else if (unikey != 0) { ---- GList *start; ---- GList *it; ---- ObMenuEntryFrame *found = NULL; ---- guint num_found = 0; ---- ---- /* start after the selected one */ ---- start = frame->entries; ---- if (frame->selected) { ---- for (it = start; frame->selected != it->data; ---- it = g_list_next(it)) ---- g_assert(it != NULL); /* nothing was selected? */ ---- /* next with wraparound */ ---- start = g_list_next(it); ---- if (start == NULL) start = frame->entries; ---- } ---- ---- it = start; ---- do { ---- ObMenuEntryFrame *e = it->data; ---- gunichar entrykey = 0; ---- ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ---- entrykey = e->entry->data.normal.shortcut; ---- else if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) ---- entrykey = e->entry->data.submenu.submenu->shortcut; ---- ---- if (unikey == entrykey) { ---- if (found == NULL) found = e; ---- ++num_found; ---- } ---- ---- /* next with wraparound */ ---- it = g_list_next(it); ---- if (it == NULL) it = frame->entries; ---- } while (it != start); ---- ---- if (found) { ---- if (found->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- num_found == 1) ---- { ---- menu_frame_select(frame, found, TRUE); ---- usleep(50000); /* highlight the item for a short bit so ---- the user can see what happened */ ---- menu_entry_frame_execute(found, state); ---- } else { ---- menu_frame_select(frame, found, TRUE); ---- if (num_found == 1) ---- menu_frame_select_next(frame->child); ---- } ---- ---- ret = TRUE; ---- } ---- } ---- } ---- } ---- ---- return ret; ----} ---- ----static void event_handle_menu(ObMenuFrame *frame, XEvent *ev) ----{ ---- ObMenuFrame *f; ---- ObMenuEntryFrame *e; ---- ---- switch (ev->type) { ---- case EnterNotify: ---- if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window))) { ---- if (e->ignore_enters) ---- --e->ignore_enters; ---- else if (!(f = find_active_menu()) || ---- f == e->frame || ---- f->parent == e->frame || ---- f->child == e->frame) ---- menu_frame_select(e->frame, e, FALSE); ---- } ---- break; ---- case LeaveNotify: ---- /*ignore leaves when we're already in the window */ ---- if (ev->xcrossing.detail == NotifyInferior) ---- break; ---- ---- if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) && ---- (f = find_active_menu()) && f->selected == e && ---- e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU) ---- { ---- menu_frame_select(e->frame, NULL, FALSE); ---- } ---- break; ---- } ----} ---- ----static void event_handle_user_input(ObClient *client, XEvent *e) ----{ ---- g_assert(e->type == ButtonPress || e->type == ButtonRelease || ---- e->type == MotionNotify || e->type == KeyPress || ---- e->type == KeyRelease); ---- ---- if (menu_frame_visible) { ---- if (event_handle_menu_input(e)) ---- /* don't use the event if the menu used it, but if the menu ---- didn't use it and it's a keypress that is bound, it will ---- close the menu and be used */ ---- return; ---- } ---- ---- /* if the keyboard interactive action uses the event then dont ---- use it for bindings. likewise is moveresize uses the event. */ ---- if (!actions_interactive_input_event(e) && !moveresize_event(e)) { ---- if (moveresize_in_progress) ---- /* make further actions work on the client being ---- moved/resized */ ---- client = moveresize_client; ---- ---- if (e->type == ButtonPress || ---- e->type == ButtonRelease || ---- e->type == MotionNotify) ---- { ---- /* the frame may not be "visible" but they can still click on it ---- in the case where it is animating before disappearing */ ---- if (!client || !frame_iconify_animating(client->frame)) ---- mouse_event(client, e); ---- } else ---- keyboard_event((focus_cycle_target ? focus_cycle_target : ---- (client ? client : focus_client)), e); ---- } ----} ---- ----static void focus_delay_dest(gpointer data) ----{ ---- g_free(data); ----} ---- ----static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2) ----{ ---- const ObFocusDelayData *f1 = d1; ---- return f1->client == d2; ----} ---- ----static gboolean focus_delay_func(gpointer data) ----{ ---- ObFocusDelayData *d = data; ---- Time old = event_curtime; ---- ---- /* don't move focus and kill the menu or the move/resize */ ---- if (menu_frame_visible || moveresize_in_progress) return FALSE; ---- ---- event_curtime = d->time; ---- event_curserial = d->serial; ---- if (client_focus(d->client) && config_focus_raise) ---- stacking_raise(CLIENT_AS_WINDOW(d->client)); ---- event_curtime = old; ---- return FALSE; /* no repeat */ ----} ---- ----static void focus_delay_client_dest(ObClient *client, gpointer data) ----{ ---- obt_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, ---- client, FALSE); ----} ---- ----void event_halt_focus_delay(void) ----{ ---- /* ignore all enter events up till the event which caused this to occur */ ---- if (event_curserial) event_ignore_enter_range(1, event_curserial); ---- obt_main_loop_timeout_remove(ob_main_loop, focus_delay_func); ----} ---- ----gulong event_start_ignore_all_enters(void) ----{ ---- return NextRequest(obt_display); ----} ---- ----static void event_ignore_enter_range(gulong start, gulong end) ----{ ---- ObSerialRange *r; ---- ---- g_assert(start != 0); ---- g_assert(end != 0); ---- ---- r = g_new(ObSerialRange, 1); ---- r->start = start; ---- r->end = end; ---- ignore_serials = g_slist_prepend(ignore_serials, r); ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "ignoring enters from %lu until %lu", ---- r->start, r->end); ---- ---- /* increment the serial so we don't ignore events we weren't meant to */ ---- OBT_PROP_ERASE(screen_support_win, MOTIF_WM_HINTS); ----} ---- ----void event_end_ignore_all_enters(gulong start) ----{ ---- /* Use (NextRequest-1) so that we ignore up to the current serial only. ---- Inside event_ignore_enter_range, we increment the serial by one, but if ---- we ignore that serial too, then any enter events generated by mouse ---- movement will be ignored until we create some further network traffic. ---- Instead ignore up to NextRequest-1, then when we increment the serial, ---- we will be *past* the range of ignored serials */ ---- event_ignore_enter_range(start, NextRequest(obt_display)-1); ----} ---- ----static gboolean is_enter_focus_event_ignored(gulong serial) ----{ ---- GSList *it, *next; ---- ---- for (it = ignore_serials; it; it = next) { ---- ObSerialRange *r = it->data; ---- ---- next = g_slist_next(it); ---- ---- if ((glong)(serial - r->end) > 0) { ---- /* past the end */ ---- ignore_serials = g_slist_delete_link(ignore_serials, it); ---- g_free(r); ---- } ---- else if ((glong)(serial - r->start) >= 0) ---- return TRUE; ---- } ---- return FALSE; ----} ---- ----void event_cancel_all_key_grabs(void) ----{ ---- if (actions_interactive_act_running()) { ---- actions_interactive_cancel_act(); ---- ob_debug("KILLED interactive action"); ---- } ---- else if (menu_frame_visible) { ---- menu_frame_hide_all(); ---- ob_debug("KILLED open menus"); ---- } ---- else if (moveresize_in_progress) { ---- moveresize_end(TRUE); ---- ob_debug("KILLED interactive moveresize"); ---- } ---- else if (grab_on_keyboard()) { ---- ungrab_keyboard(); ---- ob_debug("KILLED active grab on keyboard"); ---- } ---- else ---- ungrab_passive_key(); ---- ---- XSync(obt_display, FALSE); ----} ---- ----gboolean event_time_after(Time t1, Time t2) ----{ ---- g_assert(t1 != CurrentTime); ---- g_assert(t2 != CurrentTime); ---- ---- /* ---- Timestamp values wrap around (after about 49.7 days). The server, given ---- its current time is represented by timestamp T, always interprets ---- timestamps from clients by treating half of the timestamp space as being ---- later in time than T. ---- - http://tronche.com/gui/x/xlib/input/pointer-grabbing.html ---- */ ---- ---- /* TIME_HALF is half of the number space of a Time type variable */ ----#define TIME_HALF (Time)(1 << (sizeof(Time)*8-1)) ---- ---- if (t2 >= TIME_HALF) ---- /* t2 is in the second half so t1 might wrap around and be smaller than ---- t2 */ ---- return t1 >= t2 || t1 < (t2 + TIME_HALF); ---- else ---- /* t2 is in the first half so t1 has to come after it */ ---- return t1 >= t2 && t1 < (t2 + TIME_HALF); ----} ---- ----Time event_get_server_time(void) ----{ ---- /* Generate a timestamp */ ---- XEvent event; ---- ---- XChangeProperty(obt_display, screen_support_win, ---- OBT_PROP_ATOM(WM_CLASS), OBT_PROP_ATOM(STRING), ---- 8, PropModeAppend, NULL, 0); ---- XWindowEvent(obt_display, screen_support_win, PropertyChangeMask, &event); ---- return event.xproperty.time; ----} diff --cc openbox/event.h index 4e6fc325,4e6fc325,4e6fc325,4e6fc325..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/event.h +++ /dev/null @@@@@ -1,67 -1,67 -1,67 -1,67 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- event.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __events_h ----#define __events_h ---- ----#include ----#include ---- ----struct _ObClient; ---- ----/*! The amount of time before a window appears that is checked for user input ---- to determine if the user is working in another window */ ----#define OB_EVENT_USER_TIME_DELAY (500) /* 0.5 seconds */ ---- ----/*! Time at which the last event with a timestamp occured. */ ----extern Time event_curtime; ----/*! The last user-interaction time, as given by the clients */ ----extern Time event_last_user_time; ---- ----void event_startup(gboolean reconfig); ----void event_shutdown(gboolean reconfig); ---- ----/*! Make as if the mouse just entered the client, use only when using focus ---- follows mouse */ ----void event_enter_client(struct _ObClient *client); ---- ----/*! Make mouse focus not move at all from the stuff that happens between these ---- two function calls. */ ----gulong event_start_ignore_all_enters(void); ----void event_end_ignore_all_enters(gulong start); ---- ----/*! End *all* active and passive grabs on the keyboard ---- This is called in situations where if there is a grab going on, then ---- we need to cancel it. If we move focus during the grab, applications ---- will get NotifyWhileGrabbed events and ignore them! ---- ---- Actions should not rely on being able to move focus during an ---- interactive grab. */ ----void event_cancel_all_key_grabs(void); ---- ----/* Halts any focus delay in progress, use this when the user is selecting a ---- window for focus */ ----void event_halt_focus_delay(void); ---- ----/*! Compare t1 and t2, taking into account wraparound. True if t1 ---- comes at the same time or later than t2. */ ----gboolean event_time_after(Time t1, Time t2); ---- ----Time event_get_server_time(void); ---- ----#endif diff --cc openbox/focus.c index 7c15891a,7c15891a,7c15891a,7c15891a..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus.c +++ /dev/null @@@@@ -1,361 -1,361 -1,361 -1,361 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "event.h" ----#include "openbox.h" ----#include "grab.h" ----#include "client.h" ----#include "config.h" ----#include "group.h" ----#include "focus_cycle.h" ----#include "screen.h" ----#include "keyboard.h" ----#include "focus.h" ----#include "stacking.h" ----#include "obt/prop.h" ---- ----#include ----#include ---- ----#define FOCUS_INDICATOR_WIDTH 6 ---- ----ObClient *focus_client = NULL; ----GList *focus_order = NULL; ---- ----void focus_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- /* start with nothing focused */ ---- focus_nothing(); ----} ---- ----void focus_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- /* reset focus to root */ ---- XSetInputFocus(obt_display, PointerRoot, RevertToNone, CurrentTime); ----} ---- ----static void push_to_top(ObClient *client) ----{ ---- ObClient *p; ---- ---- /* if it is modal for a single window, then put that window at the top ---- of the focus order first, so it will be right after ours. the same is ---- done with stacking */ ---- if (client->modal && (p = client_direct_parent(client))) ---- push_to_top(p); ---- ---- focus_order = g_list_remove(focus_order, client); ---- focus_order = g_list_prepend(focus_order, client); ----} ---- ----void focus_set_client(ObClient *client) ----{ ---- Window active; ---- ---- ob_debug_type(OB_DEBUG_FOCUS, ---- "focus_set_client 0x%lx", client ? client->window : 0); ---- ---- if (focus_client == client) ---- return; ---- ---- /* uninstall the old colormap, and install the new one */ ---- screen_install_colormap(focus_client, FALSE); ---- screen_install_colormap(client, TRUE); ---- ---- /* in the middle of cycling..? kill it. */ ---- focus_cycle_stop(focus_client); ---- focus_cycle_stop(client); ---- ---- focus_client = client; ---- ---- if (client != NULL) { ---- /* move to the top of the list */ ---- push_to_top(client); ---- /* remove hiliting from the window when it gets focused */ ---- client_hilite(client, FALSE); ---- } ---- ---- /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ ---- if (ob_state() != OB_STATE_EXITING) { ---- active = client ? client->window : None; ---- OBT_PROP_SET32(obt_root(ob_screen), NET_ACTIVE_WINDOW, WINDOW, active); ---- } ----} ---- ----static ObClient* focus_fallback_target(gboolean allow_refocus, ---- gboolean allow_pointer, ---- gboolean allow_omnipresent, ---- ObClient *old) ----{ ---- GList *it; ---- ObClient *c; ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff"); ---- if (allow_pointer && config_focus_follow) ---- if ((c = client_under_pointer()) && ---- (allow_refocus || client_focus_target(c) != old) && ---- (client_normal(c) && ---- client_focus(c))) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff"); ---- return c; ---- } ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order"); ---- for (it = focus_order; it; it = g_list_next(it)) { ---- c = it->data; ---- /* fallback focus to a window if: ---- 1. it is on the current desktop. this ignores omnipresent ---- windows, which are problematic in their own rite, unless they are ---- specifically allowed ---- 2. it is a valid auto-focus target ---- 3. it is not shaded ---- */ ---- if ((allow_omnipresent || c->desktop == screen_desktop) && ---- focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, FALSE) && ---- !c->shaded && ---- (allow_refocus || client_focus_target(c) != old) && ---- client_focus(c)) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, "found in focus order"); ---- return c; ---- } ---- } ---- ---- ob_debug_type(OB_DEBUG_FOCUS, "trying a desktop window"); ---- for (it = focus_order; it; it = g_list_next(it)) { ---- c = it->data; ---- /* fallback focus to a window if: ---- 1. it is on the current desktop. this ignores omnipresent ---- windows, which are problematic in their own rite. ---- 2. it is a normal type window, don't fall back onto a dock or ---- a splashscreen or a desktop window (save the desktop as a ---- backup fallback though) ---- */ ---- if (focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, TRUE) && ---- (allow_refocus || client_focus_target(c) != old) && ---- client_focus(c)) ---- { ---- ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window"); ---- return c; ---- } ---- } ---- ---- return NULL; ----} ---- ----ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer, ---- gboolean allow_omnipresent, gboolean focus_lost) ----{ ---- ObClient *new; ---- ObClient *old = focus_client; ---- ---- /* unfocus any focused clients.. they can be focused by Pointer events ---- and such, and then when we try focus them, we won't get a FocusIn ---- event at all for them. */ ---- if (focus_lost) ---- focus_nothing(); ---- ---- new = focus_fallback_target(allow_refocus, allow_pointer, ---- allow_omnipresent, old); ---- /* get what was really focused */ ---- if (new) new = client_focus_target(new); ---- ---- return new; ----} ---- ----void focus_nothing(void) ----{ ---- /* Install our own colormap */ ---- if (focus_client != NULL) { ---- screen_install_colormap(focus_client, FALSE); ---- screen_install_colormap(NULL, TRUE); ---- } ---- ---- /* nothing is focused, update the colormap and _the root property_ */ ---- focus_set_client(NULL); ---- ---- event_cancel_all_key_grabs(); ---- ---- /* when nothing will be focused, send focus to the backup target */ ---- XSetInputFocus(obt_display, screen_support_win, RevertToPointerRoot, ---- event_curtime); ----} ---- ----void focus_order_add_new(ObClient *c) ----{ ---- if (c->iconic) ---- focus_order_to_top(c); ---- else { ---- g_assert(!g_list_find(focus_order, c)); ---- /* if there are any iconic windows, put this above them in the order, ---- but if there are not, then put it under the currently focused one */ ---- if (focus_order && ((ObClient*)focus_order->data)->iconic) ---- focus_order = g_list_insert(focus_order, c, 0); ---- else ---- focus_order = g_list_insert(focus_order, c, 1); ---- } ---- ---- /* in the middle of cycling..? kill it. */ ---- focus_cycle_stop(c); ----} ---- ----void focus_order_remove(ObClient *c) ----{ ---- focus_order = g_list_remove(focus_order, c); ---- ---- /* in the middle of cycling..? kill it. */ ---- focus_cycle_stop(c); ----} ---- ----void focus_order_to_top(ObClient *c) ----{ ---- focus_order = g_list_remove(focus_order, c); ---- if (!c->iconic) { ---- focus_order = g_list_prepend(focus_order, c); ---- } else { ---- GList *it; ---- ---- /* insert before first iconic window */ ---- for (it = focus_order; ---- it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); ---- focus_order = g_list_insert_before(focus_order, it, c); ---- } ----} ---- ----void focus_order_to_bottom(ObClient *c) ----{ ---- focus_order = g_list_remove(focus_order, c); ---- if (c->iconic) { ---- focus_order = g_list_append(focus_order, c); ---- } else { ---- GList *it; ---- ---- /* insert before first iconic window */ ---- for (it = focus_order; ---- it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); ---- focus_order = g_list_insert_before(focus_order, it, c); ---- } ----} ---- ----ObClient *focus_order_find_first(guint desktop) ----{ ---- GList *it; ---- for (it = focus_order; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (c->desktop == desktop || c->desktop == DESKTOP_ALL) ---- return c; ---- } ---- return NULL; ----} ---- ----/*! Returns if a focus target has valid group siblings that can be cycled ---- to in its place */ ----static gboolean focus_target_has_siblings(ObClient *ft, ---- gboolean iconic_windows, ---- gboolean all_desktops) ---- ----{ ---- GSList *it; ---- ---- if (!ft->group) return FALSE; ---- ---- for (it = ft->group->members; it; it = g_slist_next(it)) { ---- ObClient *c = it->data; ---- /* check that it's not a helper window to avoid infinite recursion */ ---- if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL && ---- focus_valid_target(c, TRUE, iconic_windows, all_desktops, ---- FALSE, FALSE)) ---- { ---- return TRUE; ---- } ---- } ---- return FALSE; ----} ---- ----gboolean focus_valid_target(ObClient *ft, ---- gboolean helper_windows, ---- gboolean iconic_windows, ---- gboolean all_desktops, ---- gboolean dock_windows, ---- gboolean desktop_windows) ----{ ---- gboolean ok = FALSE; ---- ---- /* it's on this desktop unless you want all desktops. ---- ---- do this check first because it will usually filter out the most ---- windows */ ---- ok = (all_desktops || ft->desktop == screen_desktop || ---- ft->desktop == DESKTOP_ALL); ---- ---- /* the window can receive focus somehow */ ---- ok = ok && (ft->can_focus || ft->focus_notify); ---- ---- /* the window is not iconic, or we're allowed to go to iconic ones */ ---- ok = ok && (iconic_windows || !ft->iconic); ---- ---- /* it's the right type of window */ ---- if (dock_windows || desktop_windows) ---- ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || ---- (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); ---- /* modal windows are important and can always get focus if they are ---- visible and stuff, so don't change 'ok' based on their type */ ---- else if (!ft->modal) ---- /* normal non-helper windows are valid targets */ ---- ok = ok && ---- ((client_normal(ft) && !client_helper(ft)) ---- || ---- /* helper windows are valid targets if... */ ---- (client_helper(ft) && ---- /* ...a window in its group already has focus and we want to ---- include helper windows ... */ ---- ((focus_client && ft->group == focus_client->group && ---- helper_windows) || ---- /* ... or if there are no other windows in its group ---- that can be focused instead */ ---- !focus_target_has_siblings(ft, iconic_windows, all_desktops)))); ---- ---- /* it's not set to skip the taskbar (but this only applies to normal typed ---- windows, and is overridden if the window is modal) */ ---- ok = ok && (ft->type != OB_CLIENT_TYPE_NORMAL || ---- ft->modal || ---- !ft->skip_taskbar); ---- ---- /* it's not going to just send focus off somewhere else (modal window), ---- unless that modal window is not one of our valid targets, then let ---- you choose this window and bring the modal one here */ ---- { ---- ObClient *cft = client_focus_target(ft); ---- ok = ok && (ft == cft || !focus_valid_target(cft, ---- TRUE, ---- iconic_windows, ---- all_desktops, ---- dock_windows, ---- desktop_windows)); ---- } ---- ---- return ok; ----} ---- diff --cc openbox/focus.h index 4f37b728,4f37b728,4f37b728,4f37b728..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus.h +++ /dev/null @@@@@ -1,74 -1,74 -1,74 -1,74 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __focus_h ----#define __focus_h ---- ----#include "misc.h" ---- ----#include ----#include ---- ----struct _ObClient; ---- ----/*! The client which is currently focused */ ----extern struct _ObClient *focus_client; ---- ----/*! The recent focus order on each desktop */ ----extern GList *focus_order; ---- ----void focus_startup(gboolean reconfig); ----void focus_shutdown(gboolean reconfig); ---- ----/*! Specify which client is currently focused, this doesn't actually ---- send focus anywhere, its called by the Focus event handlers */ ----void focus_set_client(struct _ObClient *client); ---- ----/*! Focus nothing, but let keyboard events be caught. */ ----void focus_nothing(void); ---- ----/*! Call this when you need to focus something! */ ----struct _ObClient* focus_fallback(gboolean allow_refocus, ---- gboolean allow_pointer, ---- gboolean allow_omnipresent, ---- gboolean focus_lost); ---- ----/*! Add a new client into the focus order */ ----void focus_order_add_new(struct _ObClient *c); ---- ----/*! Remove a client from the focus order */ ----void focus_order_remove(struct _ObClient *c); ---- ----/*! Move a client to the top of the focus order */ ----void focus_order_to_top(struct _ObClient *c); ---- ----/*! Move a client to the bottom of the focus order (keeps iconic windows at the ---- very bottom always though). */ ----void focus_order_to_bottom(struct _ObClient *c); ---- ----struct _ObClient *focus_order_find_first(guint desktop); ---- ----gboolean focus_valid_target(struct _ObClient *ft, ---- gboolean helper_windows, ---- gboolean iconic_windows, ---- gboolean all_desktops, ---- gboolean dock_windows, ---- gboolean desktop_windows); ---- ----#endif diff --cc openbox/focus_cycle.c index dbf79c9a,dbf79c9a,dbf79c9a,dbf79c9a..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle.c +++ /dev/null @@@@@ -1,331 -1,331 -1,331 -1,331 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "focus_cycle.h" ----#include "focus_cycle_indicator.h" ----#include "client.h" ----#include "frame.h" ----#include "focus.h" ----#include "screen.h" ----#include "openbox.h" ----#include "debug.h" ---- ----#include ----#include ---- ----ObClient *focus_cycle_target = NULL; ----static gboolean focus_cycle_iconic_windows; ----static gboolean focus_cycle_all_desktops; ----static gboolean focus_cycle_dock_windows; ----static gboolean focus_cycle_desktop_windows; ---- ----static ObClient *focus_find_directional(ObClient *c, ---- ObDirection dir, ---- gboolean dock_windows, ---- gboolean desktop_windows); ---- ----void focus_cycle_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ----} ---- ----void focus_cycle_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ----} ---- ----void focus_cycle_stop(ObClient *ifclient) ----{ ---- /* stop focus cycling if the given client is a valid focus target, ---- and so the cycling is being disrupted */ ---- if (focus_cycle_target && ifclient && ---- focus_valid_target(ifclient, TRUE, ---- focus_cycle_iconic_windows, ---- focus_cycle_all_desktops, ---- focus_cycle_dock_windows, ---- focus_cycle_desktop_windows)) ---- { ---- focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); ---- focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); ---- } ----} ---- ----ObClient* focus_cycle(gboolean forward, gboolean all_desktops, ---- gboolean dock_windows, gboolean desktop_windows, ---- gboolean linear, gboolean interactive, ---- gboolean showbar, ObFocusCyclePopupMode mode, ---- gboolean done, gboolean cancel) ----{ ---- static ObClient *t = NULL; ---- static GList *order = NULL; ---- GList *it, *start, *list; ---- ObClient *ft = NULL; ---- ObClient *ret = NULL; ---- ---- if (interactive) { ---- if (cancel) { ---- focus_cycle_target = NULL; ---- goto done_cycle; ---- } else if (done) ---- goto done_cycle; ---- ---- if (!focus_order) ---- goto done_cycle; ---- ---- if (linear) list = client_list; ---- else list = focus_order; ---- } else { ---- if (!focus_order) ---- goto done_cycle; ---- list = client_list; ---- } ---- ---- ---- if (focus_cycle_target == NULL) { ---- focus_cycle_iconic_windows = TRUE; ---- focus_cycle_all_desktops = all_desktops; ---- focus_cycle_dock_windows = dock_windows; ---- focus_cycle_desktop_windows = desktop_windows; ---- start = it = g_list_find(list, focus_client); ---- } else ---- start = it = g_list_find(list, focus_cycle_target); ---- ---- if (!start) /* switched desktops or something? */ ---- start = it = forward ? g_list_last(list) : g_list_first(list); ---- if (!start) goto done_cycle; ---- ---- do { ---- if (forward) { ---- it = it->next; ---- if (it == NULL) it = g_list_first(list); ---- } else { ---- it = it->prev; ---- if (it == NULL) it = g_list_last(list); ---- } ---- ft = it->data; ---- if (focus_valid_target(ft, TRUE, ---- focus_cycle_iconic_windows, ---- focus_cycle_all_desktops, ---- focus_cycle_dock_windows, ---- focus_cycle_desktop_windows)) ---- { ---- if (interactive) { ---- if (ft != focus_cycle_target) { /* prevents flicker */ ---- focus_cycle_target = ft; ---- focus_cycle_draw_indicator(showbar ? ft : NULL); ---- } ---- /* same arguments as focus_target_valid */ ---- focus_cycle_popup_show(ft, ---- focus_cycle_iconic_windows, ---- focus_cycle_all_desktops, ---- focus_cycle_dock_windows, ---- focus_cycle_desktop_windows, ---- mode); ---- return focus_cycle_target; ---- } else if (ft != focus_cycle_target) { ---- focus_cycle_target = ft; ---- done = TRUE; ---- break; ---- } ---- } ---- } while (it != start); ---- ----done_cycle: ---- if (done && !cancel) ret = focus_cycle_target; ---- ---- t = NULL; ---- focus_cycle_target = NULL; ---- g_list_free(order); ---- order = NULL; ---- ---- if (interactive) { ---- focus_cycle_draw_indicator(NULL); ---- focus_cycle_popup_hide(); ---- } ---- ---- return ret; ----} ---- ----/* this be mostly ripped from fvwm */ ----static ObClient *focus_find_directional(ObClient *c, ObDirection dir, ---- gboolean dock_windows, ---- gboolean desktop_windows) ----{ ---- gint my_cx, my_cy, his_cx, his_cy; ---- gint offset = 0; ---- gint distance = 0; ---- gint score, best_score; ---- ObClient *best_client, *cur; ---- GList *it; ---- ---- if (!client_list) ---- return NULL; ---- ---- /* first, find the centre coords of the currently focused window */ ---- my_cx = c->frame->area.x + c->frame->area.width / 2; ---- my_cy = c->frame->area.y + c->frame->area.height / 2; ---- ---- best_score = -1; ---- best_client = c; ---- ---- for (it = g_list_first(client_list); it; it = g_list_next(it)) { ---- cur = it->data; ---- ---- /* the currently selected window isn't interesting */ ---- if (cur == c) ---- continue; ---- if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows, ---- desktop_windows)) ---- continue; ---- ---- /* find the centre coords of this window, from the ---- * currently focused window's point of view */ ---- his_cx = (cur->frame->area.x - my_cx) ---- + cur->frame->area.width / 2; ---- his_cy = (cur->frame->area.y - my_cy) ---- + cur->frame->area.height / 2; ---- ---- if (dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || ---- dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) ---- { ---- gint tx; ---- /* Rotate the diagonals 45 degrees counterclockwise. ---- * To do this, multiply the matrix /+h +h\ with the ---- * vector (x y). \-h +h/ ---- * h = sqrt(0.5). We can set h := 1 since absolute ---- * distance doesn't matter here. */ ---- tx = his_cx + his_cy; ---- his_cy = -his_cx + his_cy; ---- his_cx = tx; ---- } ---- ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_SOUTH: ---- case OB_DIRECTION_NORTHEAST: ---- case OB_DIRECTION_SOUTHWEST: ---- offset = (his_cx < 0) ? -his_cx : his_cx; ---- distance = ((dir == OB_DIRECTION_NORTH || ---- dir == OB_DIRECTION_NORTHEAST) ? ---- -his_cy : his_cy); ---- break; ---- case OB_DIRECTION_EAST: ---- case OB_DIRECTION_WEST: ---- case OB_DIRECTION_SOUTHEAST: ---- case OB_DIRECTION_NORTHWEST: ---- offset = (his_cy < 0) ? -his_cy : his_cy; ---- distance = ((dir == OB_DIRECTION_WEST || ---- dir == OB_DIRECTION_NORTHWEST) ? ---- -his_cx : his_cx); ---- break; ---- } ---- ---- /* the target must be in the requested direction */ ---- if (distance <= 0) ---- continue; ---- ---- /* Calculate score for this window. The smaller the better. */ ---- score = distance + offset; ---- ---- /* windows more than 45 degrees off the direction are ---- * heavily penalized and will only be chosen if nothing ---- * else within a million pixels */ ---- if (offset > distance) ---- score += 1000000; ---- ---- if (best_score == -1 || score < best_score) { ---- best_client = cur; ---- best_score = score; ---- } ---- } ---- ---- return best_client; ----} ---- ----ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, ---- gboolean desktop_windows, ---- gboolean interactive, ---- gboolean showbar, gboolean dialog, ---- gboolean done, gboolean cancel) ----{ ---- static ObClient *first = NULL; ---- ObClient *ft = NULL; ---- ObClient *ret = NULL; ---- ---- if (cancel) { ---- focus_cycle_target = NULL; ---- goto done_cycle; ---- } else if (done && interactive) ---- goto done_cycle; ---- ---- if (!focus_order) ---- goto done_cycle; ---- ---- if (focus_cycle_target == NULL) { ---- focus_cycle_iconic_windows = FALSE; ---- focus_cycle_all_desktops = FALSE; ---- focus_cycle_dock_windows = dock_windows; ---- focus_cycle_desktop_windows = desktop_windows; ---- } ---- ---- if (!first) first = focus_client; ---- ---- if (focus_cycle_target) ---- ft = focus_find_directional(focus_cycle_target, dir, dock_windows, ---- desktop_windows); ---- else if (first) ---- ft = focus_find_directional(first, dir, dock_windows, desktop_windows); ---- else { ---- GList *it; ---- ---- for (it = focus_order; it; it = g_list_next(it)) ---- if (focus_valid_target(it->data, TRUE, ---- focus_cycle_iconic_windows, ---- focus_cycle_all_desktops, ---- focus_cycle_dock_windows, ---- focus_cycle_desktop_windows)) ---- ft = it->data; ---- } ---- ---- if (ft && ft != focus_cycle_target) {/* prevents flicker */ ---- focus_cycle_target = ft; ---- if (!interactive) ---- goto done_cycle; ---- focus_cycle_draw_indicator(showbar ? ft : NULL); ---- } ---- if (focus_cycle_target && dialog) ---- /* same arguments as focus_target_valid */ ---- focus_cycle_popup_single_show(focus_cycle_target, ---- focus_cycle_iconic_windows, ---- focus_cycle_all_desktops, ---- focus_cycle_dock_windows, ---- focus_cycle_desktop_windows); ---- return focus_cycle_target; ---- ----done_cycle: ---- if (done && !cancel) ret = focus_cycle_target; ---- ---- first = NULL; ---- focus_cycle_target = NULL; ---- ---- focus_cycle_draw_indicator(NULL); ---- focus_cycle_popup_single_hide(); ---- ---- return ret; ----} diff --cc openbox/focus_cycle.h index c31abc81,c31abc81,c31abc81,c31abc81..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle.h +++ /dev/null @@@@@ -1,53 -1,53 -1,53 -1,53 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __focus_cycle_h ----#define __focus_cycle_h ---- ----#include "misc.h" ----#include "focus_cycle_popup.h" ---- ----#include ----#include ---- ----struct _ObClient; ---- ----/*! The client which appears focused during a focus cycle operation */ ----extern struct _ObClient *focus_cycle_target; ---- ----void focus_cycle_startup(gboolean reconfig); ----void focus_cycle_shutdown(gboolean reconfig); ---- ----/*! Cycle focus amongst windows. */ ----struct _ObClient* focus_cycle(gboolean forward, gboolean all_desktops, ---- gboolean dock_windows, gboolean desktop_windows, ---- gboolean linear, gboolean interactive, ---- gboolean showbar, ObFocusCyclePopupMode mode, ---- gboolean done, gboolean cancel); ----struct _ObClient* focus_directional_cycle(ObDirection dir, ---- gboolean dock_windows, ---- gboolean desktop_windows, ---- gboolean interactive, ---- gboolean showbar, ---- gboolean dialog, ---- gboolean done, gboolean cancel); ---- ----void focus_cycle_stop(struct _ObClient *ifclient); ---- ----#endif diff --cc openbox/focus_cycle_indicator.c index 495a7230,495a7230,495a7230,bcc1f73c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle_indicator.c +++ /dev/null @@@@@ -1,281 -1,281 -1,281 -1,281 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle_indicator.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "focus_cycle.h" ----#include "focus_cycle_indicator.h" ----#include "client.h" ----#include "openbox.h" ----#include "frame.h" ----#include "event.h" ----#include "render/render.h" ---- ----#include ----#include ---- ----#define FOCUS_INDICATOR_WIDTH 6 ---- ----static struct ----{ ---- ObInternalWindow top; ---- ObInternalWindow left; ---- ObInternalWindow right; ---- ObInternalWindow bottom; ----} focus_indicator; ---- ----static RrAppearance *a_focus_indicator; ----static RrColor *color_white; ----static gboolean visible; ---- ----static Window create_window(Window parent, gulong mask, ---- XSetWindowAttributes *attrib) ----{ ---- return XCreateWindow(obt_display, parent, 0, 0, 1, 1, 0, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), mask, attrib); ---- ----} ---- ----void focus_cycle_indicator_startup(gboolean reconfig) ----{ ---- XSetWindowAttributes attr; ---- ---- visible = FALSE; ---- ---- if (reconfig) return; ---- ---- focus_indicator.top.type = OB_WINDOW_CLASS_INTERNAL; ---- focus_indicator.left.type = OB_WINDOW_CLASS_INTERNAL; ---- focus_indicator.right.type = OB_WINDOW_CLASS_INTERNAL; ---- focus_indicator.bottom.type = OB_WINDOW_CLASS_INTERNAL; ---- ---- attr.override_redirect = True; ---- attr.background_pixel = BlackPixel(obt_display, ob_screen); ---- focus_indicator.top.window = ---- create_window(obt_root(ob_screen), ---- CWOverrideRedirect | CWBackPixel, &attr); ---- focus_indicator.left.window = ---- create_window(obt_root(ob_screen), ---- CWOverrideRedirect | CWBackPixel, &attr); ---- focus_indicator.right.window = ---- create_window(obt_root(ob_screen), ---- CWOverrideRedirect | CWBackPixel, &attr); ---- focus_indicator.bottom.window = ---- create_window(obt_root(ob_screen), ---- CWOverrideRedirect | CWBackPixel, &attr); ---- ---- stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.top)); ---- stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.left)); ---- stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right)); ---- stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom)); ---- window_add(&focus_indicator.top.window, ---- INTERNAL_AS_WINDOW(&focus_indicator.top)); ---- window_add(&focus_indicator.left.window, ---- INTERNAL_AS_WINDOW(&focus_indicator.left)); ---- window_add(&focus_indicator.right.window, ---- INTERNAL_AS_WINDOW(&focus_indicator.right)); ---- window_add(&focus_indicator.bottom.window, ---- INTERNAL_AS_WINDOW(&focus_indicator.bottom)); ---- --- color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff); - color_white = RrColorNew(ob_rr_inst, 0x00, 0x00, 0xff); ---- ---- a_focus_indicator = RrAppearanceNew(ob_rr_inst, 4); ---- a_focus_indicator->surface.grad = RR_SURFACE_SOLID; ---- a_focus_indicator->surface.relief = RR_RELIEF_FLAT; ---- a_focus_indicator->surface.primary = RrColorNew(ob_rr_inst, --- 0, 0, 0); - 0xA6, 0xCA, 0xF4); ---- a_focus_indicator->texture[0].type = RR_TEXTURE_LINE_ART; ---- a_focus_indicator->texture[0].data.lineart.color = color_white; ---- a_focus_indicator->texture[1].type = RR_TEXTURE_LINE_ART; ---- a_focus_indicator->texture[1].data.lineart.color = color_white; ---- a_focus_indicator->texture[2].type = RR_TEXTURE_LINE_ART; ---- a_focus_indicator->texture[2].data.lineart.color = color_white; ---- a_focus_indicator->texture[3].type = RR_TEXTURE_LINE_ART; ---- a_focus_indicator->texture[3].data.lineart.color = color_white; ----} ---- ----void focus_cycle_indicator_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- RrColorFree(color_white); ---- ---- RrAppearanceFree(a_focus_indicator); ---- ---- window_remove(focus_indicator.top.window); ---- window_remove(focus_indicator.left.window); ---- window_remove(focus_indicator.right.window); ---- window_remove(focus_indicator.bottom.window); ---- ---- stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.top)); ---- stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.left)); ---- stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.right)); ---- stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.bottom)); ---- ---- XDestroyWindow(obt_display, focus_indicator.top.window); ---- XDestroyWindow(obt_display, focus_indicator.left.window); ---- XDestroyWindow(obt_display, focus_indicator.right.window); ---- XDestroyWindow(obt_display, focus_indicator.bottom.window); ----} ---- ----void focus_cycle_draw_indicator(ObClient *c) ----{ ---- if (!c && visible) { ---- gulong ignore_start; ---- ---- /* kill enter events cause by this unmapping */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- XUnmapWindow(obt_display, focus_indicator.top.window); ---- XUnmapWindow(obt_display, focus_indicator.left.window); ---- XUnmapWindow(obt_display, focus_indicator.right.window); ---- XUnmapWindow(obt_display, focus_indicator.bottom.window); ---- ---- event_end_ignore_all_enters(ignore_start); ---- ---- visible = FALSE; ---- } ---- else if (c) { ---- /* ---- if (c) ---- frame_adjust_focus(c->frame, FALSE); ---- frame_adjust_focus(c->frame, TRUE); ---- */ ---- gint x, y, w, h; ---- gint wt, wl, wr, wb; ---- gulong ignore_start; ---- ---- wt = wl = wr = wb = FOCUS_INDICATOR_WIDTH; ---- ---- x = c->frame->area.x; ---- y = c->frame->area.y; ---- w = c->frame->area.width; ---- h = wt; ---- ---- /* kill enter events cause by this moving */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- XMoveResizeWindow(obt_display, focus_indicator.top.window, ---- x, y, w, h); ---- a_focus_indicator->texture[0].data.lineart.x1 = 0; ---- a_focus_indicator->texture[0].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[0].data.lineart.x2 = 0; ---- a_focus_indicator->texture[0].data.lineart.y2 = 0; ---- a_focus_indicator->texture[1].data.lineart.x1 = 0; ---- a_focus_indicator->texture[1].data.lineart.y1 = 0; ---- a_focus_indicator->texture[1].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[1].data.lineart.y2 = 0; ---- a_focus_indicator->texture[2].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y1 = 0; ---- a_focus_indicator->texture[2].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[3].data.lineart.x1 = (wl-1); ---- a_focus_indicator->texture[3].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[3].data.lineart.x2 = w - wr; ---- a_focus_indicator->texture[3].data.lineart.y2 = h-1; ---- RrPaint(a_focus_indicator, focus_indicator.top.window, ---- w, h); ---- ---- x = c->frame->area.x; ---- y = c->frame->area.y; ---- w = wl; ---- h = c->frame->area.height; ---- ---- XMoveResizeWindow(obt_display, focus_indicator.left.window, ---- x, y, w, h); ---- a_focus_indicator->texture[0].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[0].data.lineart.y1 = 0; ---- a_focus_indicator->texture[0].data.lineart.x2 = 0; ---- a_focus_indicator->texture[0].data.lineart.y2 = 0; ---- a_focus_indicator->texture[1].data.lineart.x1 = 0; ---- a_focus_indicator->texture[1].data.lineart.y1 = 0; ---- a_focus_indicator->texture[1].data.lineart.x2 = 0; ---- a_focus_indicator->texture[1].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x1 = 0; ---- a_focus_indicator->texture[2].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[3].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[3].data.lineart.y1 = wt-1; ---- a_focus_indicator->texture[3].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[3].data.lineart.y2 = h - wb; ---- RrPaint(a_focus_indicator, focus_indicator.left.window, ---- w, h); ---- ---- x = c->frame->area.x + c->frame->area.width - wr; ---- y = c->frame->area.y; ---- w = wr; ---- h = c->frame->area.height ; ---- ---- XMoveResizeWindow(obt_display, focus_indicator.right.window, ---- x, y, w, h); ---- a_focus_indicator->texture[0].data.lineart.x1 = 0; ---- a_focus_indicator->texture[0].data.lineart.y1 = 0; ---- a_focus_indicator->texture[0].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[0].data.lineart.y2 = 0; ---- a_focus_indicator->texture[1].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[1].data.lineart.y1 = 0; ---- a_focus_indicator->texture[1].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[1].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x2 = 0; ---- a_focus_indicator->texture[2].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[3].data.lineart.x1 = 0; ---- a_focus_indicator->texture[3].data.lineart.y1 = wt-1; ---- a_focus_indicator->texture[3].data.lineart.x2 = 0; ---- a_focus_indicator->texture[3].data.lineart.y2 = h - wb; ---- RrPaint(a_focus_indicator, focus_indicator.right.window, ---- w, h); ---- ---- x = c->frame->area.x; ---- y = c->frame->area.y + c->frame->area.height - wb; ---- w = c->frame->area.width; ---- h = wb; ---- ---- XMoveResizeWindow(obt_display, focus_indicator.bottom.window, ---- x, y, w, h); ---- a_focus_indicator->texture[0].data.lineart.x1 = 0; ---- a_focus_indicator->texture[0].data.lineart.y1 = 0; ---- a_focus_indicator->texture[0].data.lineart.x2 = 0; ---- a_focus_indicator->texture[0].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[1].data.lineart.x1 = 0; ---- a_focus_indicator->texture[1].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[1].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[1].data.lineart.y2 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x1 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y1 = h-1; ---- a_focus_indicator->texture[2].data.lineart.x2 = w-1; ---- a_focus_indicator->texture[2].data.lineart.y2 = 0; ---- a_focus_indicator->texture[3].data.lineart.x1 = wl-1; ---- a_focus_indicator->texture[3].data.lineart.y1 = 0; ---- a_focus_indicator->texture[3].data.lineart.x2 = w - wr; ---- a_focus_indicator->texture[3].data.lineart.y2 = 0; ---- RrPaint(a_focus_indicator, focus_indicator.bottom.window, ---- w, h); ---- ---- XMapWindow(obt_display, focus_indicator.top.window); ---- XMapWindow(obt_display, focus_indicator.left.window); ---- XMapWindow(obt_display, focus_indicator.right.window); ---- XMapWindow(obt_display, focus_indicator.bottom.window); ---- ---- event_end_ignore_all_enters(ignore_start); ---- ---- visible = TRUE; ---- } ----} diff --cc openbox/focus_cycle_indicator.h index 28175c75,28175c75,28175c75,28175c75..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle_indicator.h +++ /dev/null @@@@@ -1,30 -1,30 -1,30 -1,30 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle_indicator.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __focus_cycle_indicator_h ----#define __focus_cycle_indicator_h ---- ----struct _ObClient; ---- ----void focus_cycle_indicator_startup(gboolean reconfig); ----void focus_cycle_indicator_shutdown(gboolean reconfig); ---- ----void focus_cycle_draw_indicator(struct _ObClient *c); ---- ----#endif diff --cc openbox/focus_cycle_popup.c index 3feac6ab,3feac6ab,3feac6ab,3feac6ab..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle_popup.c +++ /dev/null @@@@@ -1,741 -1,741 -1,741 -1,741 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle_popup.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "focus_cycle_popup.h" ----#include "popup.h" ----#include "client.h" ----#include "screen.h" ----#include "focus.h" ----#include "openbox.h" ----#include "window.h" ----#include "event.h" ----#include "render/render.h" ---- ----#include ----#include ---- ----/* Size of the hilite box around a window's icon */ ----#define HILITE_SIZE 40 ----/* Width of the outer ring around the hilite box */ ----#define HILITE_WIDTH 2 ----/* Space between the outer ring around the hilite box and the icon inside it */ ----#define HILITE_MARGIN 1 ----/* Total distance from the edge of the hilite box to the icon inside it */ ----#define HILITE_OFFSET (HILITE_WIDTH + HILITE_MARGIN) ----/* Size of the icons, which can appear inside or outside of a hilite box */ ----#define ICON_SIZE (HILITE_SIZE - 2*HILITE_OFFSET) ----/* Margin area around the outside of the dialog */ ----#define OUTSIDE_BORDER 3 ----/* Margin area around the text */ ----#define TEXT_BORDER 2 ----/* Scroll the list-mode list when the cursor gets within this many rows of the ---- top or bottom */ ----#define SCROLL_MARGIN 4 ---- ----typedef struct _ObFocusCyclePopup ObFocusCyclePopup; ----typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; ---- ----struct _ObFocusCyclePopupTarget ----{ ---- ObClient *client; ---- RrImage *icon; ---- gchar *text; ---- Window iconwin; ---- /* This is used when the popup is in list mode */ ---- Window textwin; ----}; ---- ----struct _ObFocusCyclePopup ----{ ---- ObWindow obwin; ---- Window bg; ---- ---- /* This is used when the popup is in icon mode */ ---- Window icon_mode_text; ---- ---- Window list_mode_up; ---- Window list_mode_down; ---- ---- GList *targets; ---- gint n_targets; ---- ---- const ObFocusCyclePopupTarget *last_target; ---- ---- gint maxtextw; ---- ---- /* How are the list is scrolled, in scroll mode */ ---- gint scroll; ---- ---- RrAppearance *a_bg; ---- RrAppearance *a_text; ---- RrAppearance *a_hilite_text; ---- RrAppearance *a_icon; ---- RrAppearance *a_arrow; ---- ---- gboolean mapped; ---- ObFocusCyclePopupMode mode; ----}; ---- ----/*! This popup shows all possible windows */ ----static ObFocusCyclePopup popup; ----/*! This popup shows a single window */ ----static ObIconPopup *single_popup; ---- ----static gchar *popup_get_name (ObClient *c); ----static void popup_setup (ObFocusCyclePopup *p, ---- gboolean create_targets, ---- gboolean iconic_windows, ---- gboolean all_desktops, ---- gboolean dock_windows, ---- gboolean desktop_windows); ----static void popup_render (ObFocusCyclePopup *p, ---- const ObClient *c); ---- ----static Window create_window(Window parent, guint bwidth, gulong mask, ---- XSetWindowAttributes *attr) ----{ ---- return XCreateWindow(obt_display, parent, 0, 0, 1, 1, bwidth, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), mask, attr); ----} ---- ----void focus_cycle_popup_startup(gboolean reconfig) ----{ ---- XSetWindowAttributes attrib; ---- RrPixel32 *p; ---- ---- single_popup = icon_popup_new(); ---- ---- popup.obwin.type = OB_WINDOW_CLASS_INTERNAL; ---- popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); ---- popup.a_hilite_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); ---- popup.a_text = RrAppearanceCopy(ob_rr_theme->a_unfocused_label); ---- popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear); ---- popup.a_arrow = RrAppearanceCopy(ob_rr_theme->a_clear_tex); ---- ---- popup.a_hilite_text->surface.parent = popup.a_bg; ---- popup.a_text->surface.parent = popup.a_bg; ---- popup.a_icon->surface.parent = popup.a_bg; ---- ---- popup.a_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT; ---- popup.a_hilite_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT; ---- ---- /* 2 textures. texture[0] is the icon. texture[1] is the hilight, and ---- may or may not be used */ ---- RrAppearanceAddTextures(popup.a_icon, 2); ---- ---- RrAppearanceClearTextures(popup.a_icon); ---- popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE; ---- ---- RrAppearanceClearTextures(popup.a_arrow); ---- popup.a_arrow->texture[0].type = RR_TEXTURE_MASK; ---- popup.a_arrow->texture[0].data.mask.color = ---- ob_rr_theme->osd_color; ---- ---- attrib.override_redirect = True; ---- attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color); ---- popup.bg = create_window(obt_root(ob_screen), ob_rr_theme->obwidth, ---- CWOverrideRedirect | CWBorderPixel, &attrib); ---- ---- /* create the text window used for the icon-mode popup */ ---- popup.icon_mode_text = create_window(popup.bg, 0, 0, NULL); ---- ---- /* create the windows for the up and down arrows */ ---- popup.list_mode_up = create_window(popup.bg, 0, 0, NULL); ---- popup.list_mode_down = create_window(popup.bg, 0, 0, NULL); ---- ---- popup.targets = NULL; ---- popup.n_targets = 0; ---- popup.last_target = NULL; ---- ---- /* set up the hilite texture for the icon */ ---- popup.a_icon->texture[1].data.rgba.width = HILITE_SIZE; ---- popup.a_icon->texture[1].data.rgba.height = HILITE_SIZE; ---- popup.a_icon->texture[1].data.rgba.alpha = 0xff; ---- p = g_new(RrPixel32, HILITE_SIZE * HILITE_SIZE); ---- popup.a_icon->texture[1].data.rgba.data = p; ---- ---- /* create the hilite under the target icon */ ---- { ---- RrPixel32 color; ---- gint x, y, o; ---- ---- color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) + ---- ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) + ---- ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset); ---- ---- o = 0; ---- for (x = 0; x < HILITE_SIZE; x++) ---- for (y = 0; y < HILITE_SIZE; y++) { ---- guchar a; ---- ---- if (x < HILITE_WIDTH || ---- x >= HILITE_SIZE - HILITE_WIDTH || ---- y < HILITE_WIDTH || ---- y >= HILITE_SIZE - HILITE_WIDTH) ---- { ---- /* the border of the target */ ---- a = 0x88; ---- } else { ---- /* the background of the target */ ---- a = 0x22; ---- } ---- ---- p[o++] = color + (a << RrDefaultAlphaOffset); ---- } ---- } ---- ---- stacking_add(INTERNAL_AS_WINDOW(&popup)); ---- window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup)); ----} ---- ----void focus_cycle_popup_shutdown(gboolean reconfig) ----{ ---- icon_popup_free(single_popup); ---- ---- window_remove(popup.bg); ---- stacking_remove(INTERNAL_AS_WINDOW(&popup)); ---- ---- while(popup.targets) { ---- ObFocusCyclePopupTarget *t = popup.targets->data; ---- ---- RrImageUnref(t->icon); ---- g_free(t->text); ---- XDestroyWindow(obt_display, t->iconwin); ---- XDestroyWindow(obt_display, t->textwin); ---- g_free(t); ---- ---- popup.targets = g_list_delete_link(popup.targets, popup.targets); ---- } ---- ---- g_free(popup.a_icon->texture[1].data.rgba.data); ---- popup.a_icon->texture[1].data.rgba.data = NULL; ---- ---- XDestroyWindow(obt_display, popup.list_mode_up); ---- XDestroyWindow(obt_display, popup.list_mode_down); ---- XDestroyWindow(obt_display, popup.icon_mode_text); ---- XDestroyWindow(obt_display, popup.bg); ---- ---- RrAppearanceFree(popup.a_arrow); ---- RrAppearanceFree(popup.a_icon); ---- RrAppearanceFree(popup.a_hilite_text); ---- RrAppearanceFree(popup.a_text); ---- RrAppearanceFree(popup.a_bg); ----} ---- ----static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, ---- gboolean iconic_windows, gboolean all_desktops, ---- gboolean dock_windows, gboolean desktop_windows) ----{ ---- gint maxwidth, n; ---- GList *it; ---- ---- g_assert(p->targets == NULL); ---- g_assert(p->n_targets == 0); ---- ---- /* make its width to be the width of all the possible titles */ ---- ---- /* build a list of all the valid focus targets and measure their strings, ---- and count them */ ---- maxwidth = 0; ---- n = 0; ---- for (it = g_list_last(focus_order); it; it = g_list_previous(it)) { ---- ObClient *ft = it->data; ---- ---- if (focus_valid_target(ft, TRUE, ---- iconic_windows, ---- all_desktops, ---- dock_windows, ---- desktop_windows)) ---- { ---- gchar *text = popup_get_name(ft); ---- ---- /* measure */ ---- p->a_text->texture[0].data.text.string = text; ---- maxwidth = MAX(maxwidth, RrMinWidth(p->a_text)); ---- ---- if (!create_targets) { ---- g_free(text); ---- } else { ---- ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1); ---- ---- t->client = ft; ---- t->text = text; ---- t->icon = client_icon(t->client); ---- RrImageRef(t->icon); /* own the icon so it won't go away */ ---- t->iconwin = create_window(p->bg, 0, 0, NULL); ---- t->textwin = create_window(p->bg, 0, 0, NULL); ---- ---- p->targets = g_list_prepend(p->targets, t); ---- ++n; ---- } ---- } ---- } ---- ---- p->n_targets = n; ---- p->maxtextw = maxwidth; ----} ---- ----static gchar *popup_get_name(ObClient *c) ----{ ---- ObClient *p; ---- gchar *title; ---- const gchar *desk = NULL; ---- gchar *ret; ---- ---- /* find our highest direct parent */ ---- p = client_search_top_direct_parent(c); ---- ---- if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop) ---- desk = screen_desktop_names[c->desktop]; ---- ---- title = c->iconic ? c->icon_title : c->title; ---- ---- /* use the transient's parent's title/icon if we don't have one */ ---- if (p != c && title[0] == '\0') ---- title = p->iconic ? p->icon_title : p->title; ---- ---- if (desk) ---- ret = g_strdup_printf("%s [%s]", title, desk); ---- else ---- ret = g_strdup(title); ---- ---- return ret; ----} ---- ----static void popup_render(ObFocusCyclePopup *p, const ObClient *c) ----{ ---- gint ml, mt, mr, mb; ---- gint l, t, r, b; ---- gint x, y, w, h; ---- Rect *screen_area = NULL; ---- gint rgbax, rgbay, rgbaw, rgbah; ---- gint i; ---- GList *it; ---- const ObFocusCyclePopupTarget *newtarget; ---- gint icons_per_row; ---- gint icon_rows; ---- gint textw, texth; ---- gint selected_pos; ---- gint last_scroll; ---- ---- /* vars for icon mode */ ---- gint icon_mode_textx; ---- gint icon_mode_texty; ---- gint icons_center_x; ---- ---- /* vars for list mode */ ---- gint list_mode_icon_column_w = HILITE_SIZE + OUTSIDE_BORDER; ---- gint up_arrow_x, down_arrow_x; ---- gint up_arrow_y, down_arrow_y; ---- gboolean showing_arrows = FALSE; ---- ---- g_assert(p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS || ---- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST); ---- ---- screen_area = screen_physical_area_active(); ---- ---- /* get the outside margins */ ---- RrMargins(p->a_bg, &ml, &mt, &mr, &mb); ---- ---- /* get our outside borders */ ---- l = ml + OUTSIDE_BORDER; ---- r = mr + OUTSIDE_BORDER; ---- t = mt + OUTSIDE_BORDER; ---- b = mb + OUTSIDE_BORDER; ---- ---- /* get the width from the text and keep it within limits */ ---- w = l + r + p->maxtextw; ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- /* when in list mode, there are icons down the side */ ---- w += list_mode_icon_column_w; ---- w = MIN(w, MAX(screen_area->width/3, POPUP_WIDTH)); /* max width */ ---- w = MAX(w, POPUP_WIDTH); /* min width */ ---- ---- /* get the text height */ ---- texth = RrMinHeight(p->a_hilite_text); ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- texth = MAX(MAX(texth, RrMinHeight(p->a_text)), HILITE_SIZE); ---- else ---- texth += TEXT_BORDER * 2; ---- ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { ---- /* how many icons will fit in that row? make the width fit that */ ---- w -= l + r; ---- icons_per_row = (w + HILITE_SIZE - 1) / HILITE_SIZE; ---- w = icons_per_row * HILITE_SIZE + l + r; ---- ---- /* how many rows do we need? */ ---- icon_rows = (p->n_targets-1) / icons_per_row + 1; ---- } else { ---- /* in list mode, there is one column of icons.. */ ---- icons_per_row = 1; ---- /* maximum is 80% of the screen height */ ---- icon_rows = MIN(p->n_targets, ---- (4*screen_area->height/5) /* 80% of the screen */ ---- / ---- MAX(HILITE_SIZE, texth)); /* height of each row */ ---- /* but make sure there is always one */ ---- icon_rows = MAX(icon_rows, 1); ---- } ---- ---- /* get the text width */ ---- textw = w - l - r; ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- /* leave space on the side for the icons */ ---- textw -= list_mode_icon_column_w; ---- ---- if (!p->mapped) ---- /* reset the scrolling when the dialog is first shown */ ---- p->scroll = 0; ---- ---- /* find the height of the dialog */ ---- h = t + b + (icon_rows * MAX(HILITE_SIZE, texth)); ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) ---- /* in icon mode the text sits below the icons, so make some space */ ---- h += OUTSIDE_BORDER + texth; ---- ---- /* find the focused target */ ---- newtarget = NULL; ---- for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { ---- const ObFocusCyclePopupTarget *target = it->data; ---- if (target->client == c) { ---- /* save the target */ ---- newtarget = target; ---- break; ---- } ---- } ---- selected_pos = i; ---- g_assert(newtarget != NULL); ---- ---- /* scroll the list if needed */ ---- last_scroll = p->scroll; ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) { ---- const gint top = p->scroll + SCROLL_MARGIN; ---- const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN; ---- const gint min_scroll = 0; ---- const gint max_scroll = p->n_targets - icon_rows; ---- ---- if (top - selected_pos >= 0) { ---- p->scroll -= top - selected_pos + 1; ---- p->scroll = MAX(p->scroll, min_scroll); ---- } else if (selected_pos - bottom >= 0) { ---- p->scroll += selected_pos - bottom + 1; ---- p->scroll = MIN(p->scroll, max_scroll); ---- } ---- } ---- ---- /* show the scroll arrows when appropriate */ ---- if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) { ---- XMapWindow(obt_display, p->list_mode_up); ---- showing_arrows = TRUE; ---- } else ---- XUnmapWindow(obt_display, p->list_mode_up); ---- ---- if (p->scroll < p->n_targets - icon_rows && ---- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- { ---- XMapWindow(obt_display, p->list_mode_down); ---- showing_arrows = TRUE; ---- } else ---- XUnmapWindow(obt_display, p->list_mode_down); ---- ---- /* make space for the arrows */ ---- if (showing_arrows) ---- h += ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER ---- + ob_rr_theme->down_arrow_mask->height + OUTSIDE_BORDER; ---- ---- /* center the icons if there is less than one row */ ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS && icon_rows == 1) ---- icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2; ---- else ---- icons_center_x = 0; ---- ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { ---- /* get the position of the text */ ---- icon_mode_textx = l; ---- icon_mode_texty = h - texth - b; ---- } ---- ---- /* find the position for the popup (include the outer borders) */ ---- x = screen_area->x + (screen_area->width - ---- (w + ob_rr_theme->obwidth * 2)) / 2; ---- y = screen_area->y + (screen_area->height - ---- (h + ob_rr_theme->obwidth * 2)) / 2; ---- ---- /* get the dimensions of the target hilite texture */ ---- rgbax = ml; ---- rgbay = mt; ---- rgbaw = w - ml - mr; ---- rgbah = h - mt - mb; ---- ---- if (!p->mapped) { ---- /* position the background but don't draw it */ ---- XMoveResizeWindow(obt_display, p->bg, x, y, w, h); ---- ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { ---- /* position the text */ ---- XMoveResizeWindow(obt_display, p->icon_mode_text, ---- icon_mode_textx, icon_mode_texty, textw, texth); ---- XMapWindow(obt_display, popup.icon_mode_text); ---- } else { ---- XUnmapWindow(obt_display, popup.icon_mode_text); ---- ---- up_arrow_x = (w - ob_rr_theme->up_arrow_mask->width) / 2; ---- up_arrow_y = t; ---- ---- down_arrow_x = (w - ob_rr_theme->down_arrow_mask->width) / 2; ---- down_arrow_y = h - b - ob_rr_theme->down_arrow_mask->height; ---- ---- /* position the arrows */ ---- XMoveResizeWindow(obt_display, p->list_mode_up, ---- up_arrow_x, up_arrow_y, ---- ob_rr_theme->up_arrow_mask->width, ---- ob_rr_theme->up_arrow_mask->height); ---- XMoveResizeWindow(obt_display, p->list_mode_down, ---- down_arrow_x, down_arrow_y, ---- ob_rr_theme->down_arrow_mask->width, ---- ob_rr_theme->down_arrow_mask->height); ---- } ---- } ---- ---- /* * * draw everything * * */ ---- ---- /* draw the background */ ---- if (!p->mapped) ---- RrPaint(p->a_bg, p->bg, w, h); ---- ---- /* draw the scroll arrows */ ---- if (!p->mapped && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) { ---- p->a_arrow->texture[0].data.mask.mask = ---- ob_rr_theme->up_arrow_mask; ---- p->a_arrow->surface.parent = p->a_bg; ---- p->a_arrow->surface.parentx = up_arrow_x; ---- p->a_arrow->surface.parenty = up_arrow_y; ---- RrPaint(p->a_arrow, p->list_mode_up, ---- ob_rr_theme->up_arrow_mask->width, ---- ob_rr_theme->up_arrow_mask->height); ---- ---- p->a_arrow->texture[0].data.mask.mask = ---- ob_rr_theme->down_arrow_mask; ---- p->a_arrow->surface.parent = p->a_bg; ---- p->a_arrow->surface.parentx = down_arrow_x; ---- p->a_arrow->surface.parenty = down_arrow_y; ---- RrPaint(p->a_arrow, p->list_mode_down, ---- ob_rr_theme->down_arrow_mask->width, ---- ob_rr_theme->down_arrow_mask->height); ---- } ---- ---- /* draw the icons and text */ ---- for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { ---- const ObFocusCyclePopupTarget *target = it->data; ---- ---- /* have to redraw the targetted icon and last targetted icon ---- * to update the hilite */ ---- if (!p->mapped || newtarget == target || p->last_target == target || ---- last_scroll != p->scroll) ---- { ---- /* row and column start from 0 */ ---- const gint row = i / icons_per_row - p->scroll; ---- const gint col = i % icons_per_row; ---- gint iconx, icony; ---- gint list_mode_textx, list_mode_texty; ---- RrAppearance *text; ---- ---- /* find the coordinates for the icon */ ---- iconx = icons_center_x + l + (col * HILITE_SIZE); ---- icony = t + (showing_arrows ? ob_rr_theme->up_arrow_mask->height ---- + OUTSIDE_BORDER ---- : 0) ---- + (row * MAX(texth, HILITE_SIZE)) ---- + MAX(texth - HILITE_SIZE, 0) / 2; ---- ---- /* find the dimensions of the text box */ ---- list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER; ---- list_mode_texty = icony; ---- ---- /* position the icon */ ---- XMoveResizeWindow(obt_display, target->iconwin, ---- iconx, icony, HILITE_SIZE, HILITE_SIZE); ---- ---- /* position the text */ ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- XMoveResizeWindow(obt_display, target->textwin, ---- list_mode_textx, list_mode_texty, ---- textw, texth); ---- ---- /* show/hide the right windows */ ---- if (row >= 0 && row < icon_rows) { ---- XMapWindow(obt_display, target->iconwin); ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- XMapWindow(obt_display, target->textwin); ---- else ---- XUnmapWindow(obt_display, target->textwin); ---- } else { ---- XUnmapWindow(obt_display, target->textwin); ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) ---- XUnmapWindow(obt_display, target->iconwin); ---- else ---- XMapWindow(obt_display, target->iconwin); ---- } ---- ---- /* get the icon from the client */ ---- p->a_icon->texture[0].data.image.twidth = ICON_SIZE; ---- p->a_icon->texture[0].data.image.theight = ICON_SIZE; ---- p->a_icon->texture[0].data.image.tx = HILITE_OFFSET; ---- p->a_icon->texture[0].data.image.ty = HILITE_OFFSET; ---- p->a_icon->texture[0].data.image.alpha = ---- target->client->iconic ? OB_ICONIC_ALPHA : 0xff; ---- p->a_icon->texture[0].data.image.image = target->icon; ---- ---- /* Draw the hilite? */ ---- p->a_icon->texture[1].type = (target == newtarget) ? ---- RR_TEXTURE_RGBA : RR_TEXTURE_NONE; ---- ---- /* draw the icon */ ---- p->a_icon->surface.parentx = iconx; ---- p->a_icon->surface.parenty = icony; ---- RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE); ---- ---- /* draw the text */ ---- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST || ---- target == newtarget) ---- { ---- text = (target == newtarget) ? p->a_hilite_text : p->a_text; ---- text->texture[0].data.text.string = target->text; ---- text->surface.parentx = ---- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? ---- icon_mode_textx : list_mode_textx; ---- text->surface.parenty = ---- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? ---- icon_mode_texty : list_mode_texty; ---- RrPaint(text, ---- (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? ---- p->icon_mode_text : target->textwin), ---- textw, texth); ---- } ---- } ---- } ---- ---- p->last_target = newtarget; ---- ---- g_free(screen_area); ---- ---- XFlush(obt_display); ----} ---- ----void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, ---- gboolean all_desktops, gboolean dock_windows, ---- gboolean desktop_windows, ---- ObFocusCyclePopupMode mode) ----{ ---- g_assert(c != NULL); ---- ---- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_NONE) { ---- focus_cycle_popup_hide(); ---- return; ---- } ---- ---- /* do this stuff only when the dialog is first showing */ ---- if (!popup.mapped) { ---- popup_setup(&popup, TRUE, iconic_windows, all_desktops, ---- dock_windows, desktop_windows); ---- /* this is fixed once the dialog is shown */ ---- popup.mode = mode; ---- } ---- g_assert(popup.targets != NULL); ---- ---- popup_render(&popup, c); ---- ---- if (!popup.mapped) { ---- /* show the dialog */ ---- XMapWindow(obt_display, popup.bg); ---- XFlush(obt_display); ---- popup.mapped = TRUE; ---- screen_hide_desktop_popup(); ---- } ----} ---- ----void focus_cycle_popup_hide(void) ----{ ---- gulong ignore_start; ---- ---- ignore_start = event_start_ignore_all_enters(); ---- ---- XUnmapWindow(obt_display, popup.bg); ---- XFlush(obt_display); ---- ---- event_end_ignore_all_enters(ignore_start); ---- ---- popup.mapped = FALSE; ---- ---- while(popup.targets) { ---- ObFocusCyclePopupTarget *t = popup.targets->data; ---- ---- RrImageUnref(t->icon); ---- g_free(t->text); ---- XDestroyWindow(obt_display, t->iconwin); ---- XDestroyWindow(obt_display, t->textwin); ---- g_free(t); ---- ---- popup.targets = g_list_delete_link(popup.targets, popup.targets); ---- } ---- popup.n_targets = 0; ---- popup.last_target = NULL; ----} ---- ----void focus_cycle_popup_single_show(struct _ObClient *c, ---- gboolean iconic_windows, ---- gboolean all_desktops, ---- gboolean dock_windows, ---- gboolean desktop_windows) ----{ ---- gchar *text; ---- ---- g_assert(c != NULL); ---- ---- /* do this stuff only when the dialog is first showing */ ---- if (!popup.mapped) { ---- Rect *a; ---- ---- popup_setup(&popup, FALSE, iconic_windows, all_desktops, ---- dock_windows, desktop_windows); ---- g_assert(popup.targets == NULL); ---- ---- /* position the popup */ ---- a = screen_physical_area_active(); ---- icon_popup_position(single_popup, CenterGravity, ---- a->x + a->width / 2, a->y + a->height / 2); ---- icon_popup_height(single_popup, POPUP_HEIGHT); ---- icon_popup_min_width(single_popup, POPUP_WIDTH); ---- icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH)); ---- icon_popup_text_width(single_popup, popup.maxtextw); ---- g_free(a); ---- } ---- ---- text = popup_get_name(c); ---- icon_popup_show(single_popup, text, client_icon(c)); ---- g_free(text); ---- screen_hide_desktop_popup(); ----} ---- ----void focus_cycle_popup_single_hide(void) ----{ ---- icon_popup_hide(single_popup); ----} diff --cc openbox/focus_cycle_popup.h index c289be36,c289be36,c289be36,c289be36..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/focus_cycle_popup.h +++ /dev/null @@@@@ -1,49 -1,49 -1,49 -1,49 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focus_cycle.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __focus_cycle_popup_h ----#define __focus_cycle_popup_h ---- ----struct _ObClient; ---- ----#include ---- ----typedef enum { ---- OB_FOCUS_CYCLE_POPUP_MODE_NONE, ---- OB_FOCUS_CYCLE_POPUP_MODE_ICONS, ---- OB_FOCUS_CYCLE_POPUP_MODE_LIST ----} ObFocusCyclePopupMode; ---- ----void focus_cycle_popup_startup(gboolean reconfig); ----void focus_cycle_popup_shutdown(gboolean reconfig); ---- ----void focus_cycle_popup_show(struct _ObClient *c, gboolean iconic_windows, ---- gboolean all_desktops, gboolean dock_windows, ---- gboolean desktop_windows, ---- ObFocusCyclePopupMode mode); ----void focus_cycle_popup_hide(void); ---- ----void focus_cycle_popup_single_show(struct _ObClient *c, ---- gboolean iconic_windows, ---- gboolean all_desktops, ---- gboolean dock_windows, ---- gboolean desktop_windows); ----void focus_cycle_popup_single_hide(void); ---- ----#endif diff --cc openbox/frame.c index e8a532cc,e8a532cc,e8a532cc,e8a532cc..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/frame.c +++ /dev/null @@@@@ -1,1810 -1,1810 -1,1810 -1,1810 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- frame.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "frame.h" ----#include "client.h" ----#include "openbox.h" ----#include "grab.h" ----#include "config.h" ----#include "framerender.h" ----#include "focus_cycle.h" ----#include "focus_cycle_indicator.h" ----#include "moveresize.h" ----#include "screen.h" ----#include "render/theme.h" ----#include "obt/display.h" ----#include "obt/prop.h" ---- ----#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ ---- ButtonPressMask | ButtonReleaseMask | \ ---- SubstructureRedirectMask | FocusChangeMask) ----#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ ---- ButtonMotionMask | PointerMotionMask | \ ---- EnterWindowMask | LeaveWindowMask) ---- ----#define FRAME_ANIMATE_ICONIFY_TIME 150000 /* .15 seconds */ ----#define FRAME_ANIMATE_ICONIFY_STEP_TIME (G_USEC_PER_SEC / 60) /* 60 Hz */ ---- ----#define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_b) ---- ----static void flash_done(gpointer data); ----static gboolean flash_timeout(gpointer data); ---- ----static void layout_title(ObFrame *self); ----static void set_theme_statics(ObFrame *self); ----static void free_theme_statics(ObFrame *self); ----static gboolean frame_animate_iconify(gpointer self); ----static void frame_adjust_cursors(ObFrame *self); ---- ----static Window createWindow(Window parent, Visual *visual, ---- gulong mask, XSetWindowAttributes *attrib) ----{ ---- return XCreateWindow(obt_display, parent, 0, 0, 1, 1, 0, ---- (visual ? 32 : RrDepth(ob_rr_inst)), InputOutput, ---- (visual ? visual : RrVisual(ob_rr_inst)), ---- mask, attrib); ---- ----} ---- ----static Visual *check_32bit_client(ObClient *c) ----{ ---- XWindowAttributes wattrib; ---- Status ret; ---- ---- /* we're already running at 32 bit depth, yay. we don't need to use their ---- visual */ ---- if (RrDepth(ob_rr_inst) == 32) ---- return NULL; ---- ---- ret = XGetWindowAttributes(obt_display, c->window, &wattrib); ---- g_assert(ret != BadDrawable); ---- g_assert(ret != BadWindow); ---- ---- if (wattrib.depth == 32) ---- return wattrib.visual; ---- return NULL; ----} ---- ----ObFrame *frame_new(ObClient *client) ----{ ---- XSetWindowAttributes attrib; ---- gulong mask; ---- ObFrame *self; ---- Visual *visual; ---- ---- self = g_new0(ObFrame, 1); ---- self->client = client; ---- ---- visual = check_32bit_client(client); ---- ---- /* create the non-visible decor windows */ ---- ---- mask = 0; ---- if (visual) { ---- /* client has a 32-bit visual */ ---- mask |= CWColormap | CWBackPixel | CWBorderPixel; ---- /* create a colormap with the visual */ ---- self->colormap = attrib.colormap = ---- XCreateColormap(obt_display, obt_root(ob_screen), ---- visual, AllocNone); ---- attrib.background_pixel = BlackPixel(obt_display, ob_screen); ---- attrib.border_pixel = BlackPixel(obt_display, ob_screen); ---- } ---- self->window = createWindow(obt_root(ob_screen), visual, ---- mask, &attrib); ---- ---- /* create the visible decor windows */ ---- ---- mask = 0; ---- if (visual) { ---- /* client has a 32-bit visual */ ---- mask |= CWColormap | CWBackPixel | CWBorderPixel; ---- attrib.colormap = RrColormap(ob_rr_inst); ---- } ---- ---- self->backback = createWindow(self->window, NULL, mask, &attrib); ---- self->backfront = createWindow(self->backback, NULL, mask, &attrib); ---- ---- mask |= CWEventMask; ---- attrib.event_mask = ELEMENT_EVENTMASK; ---- self->innerleft = createWindow(self->window, NULL, mask, &attrib); ---- self->innertop = createWindow(self->window, NULL, mask, &attrib); ---- self->innerright = createWindow(self->window, NULL, mask, &attrib); ---- self->innerbottom = createWindow(self->window, NULL, mask, &attrib); ---- ---- self->innerblb = createWindow(self->innerbottom, NULL, mask, &attrib); ---- self->innerbrb = createWindow(self->innerbottom, NULL, mask, &attrib); ---- self->innerbll = createWindow(self->innerleft, NULL, mask, &attrib); ---- self->innerbrr = createWindow(self->innerright, NULL, mask, &attrib); ---- ---- self->title = createWindow(self->window, NULL, mask, &attrib); ---- self->titleleft = createWindow(self->window, NULL, mask, &attrib); ---- self->titletop = createWindow(self->window, NULL, mask, &attrib); ---- self->titletopleft = createWindow(self->window, NULL, mask, &attrib); ---- self->titletopright = createWindow(self->window, NULL, mask, &attrib); ---- self->titleright = createWindow(self->window, NULL, mask, &attrib); ---- self->titlebottom = createWindow(self->window, NULL, mask, &attrib); ---- ---- self->topresize = createWindow(self->title, NULL, mask, &attrib); ---- self->tltresize = createWindow(self->title, NULL, mask, &attrib); ---- self->tllresize = createWindow(self->title, NULL, mask, &attrib); ---- self->trtresize = createWindow(self->title, NULL, mask, &attrib); ---- self->trrresize = createWindow(self->title, NULL, mask, &attrib); ---- ---- self->left = createWindow(self->window, NULL, mask, &attrib); ---- self->right = createWindow(self->window, NULL, mask, &attrib); ---- ---- self->label = createWindow(self->title, NULL, mask, &attrib); ---- self->max = createWindow(self->title, NULL, mask, &attrib); ---- self->close = createWindow(self->title, NULL, mask, &attrib); ---- self->desk = createWindow(self->title, NULL, mask, &attrib); ---- self->shade = createWindow(self->title, NULL, mask, &attrib); ---- self->icon = createWindow(self->title, NULL, mask, &attrib); ---- self->iconify = createWindow(self->title, NULL, mask, &attrib); ---- ---- self->handle = createWindow(self->window, NULL, mask, &attrib); ---- self->lgrip = createWindow(self->handle, NULL, mask, &attrib); ---- self->rgrip = createWindow(self->handle, NULL, mask, &attrib); ---- ---- self->handleleft = createWindow(self->handle, NULL, mask, &attrib); ---- self->handleright = createWindow(self->handle, NULL, mask, &attrib); ---- ---- self->handletop = createWindow(self->window, NULL, mask, &attrib); ---- self->handlebottom = createWindow(self->window, NULL, mask, &attrib); ---- self->lgripleft = createWindow(self->window, NULL, mask, &attrib); ---- self->lgriptop = createWindow(self->window, NULL, mask, &attrib); ---- self->lgripbottom = createWindow(self->window, NULL, mask, &attrib); ---- self->rgripright = createWindow(self->window, NULL, mask, &attrib); ---- self->rgriptop = createWindow(self->window, NULL, mask, &attrib); ---- self->rgripbottom = createWindow(self->window, NULL, mask, &attrib); ---- ---- self->focused = FALSE; ---- ---- /* the other stuff is shown based on decor settings */ ---- XMapWindow(obt_display, self->label); ---- XMapWindow(obt_display, self->backback); ---- XMapWindow(obt_display, self->backfront); ---- ---- self->max_press = self->close_press = self->desk_press = ---- self->iconify_press = self->shade_press = FALSE; ---- self->max_hover = self->close_hover = self->desk_hover = ---- self->iconify_hover = self->shade_hover = FALSE; ---- ---- set_theme_statics(self); ---- ---- return (ObFrame*)self; ----} ---- ----static void set_theme_statics(ObFrame *self) ----{ ---- /* set colors/appearance/sizes for stuff that doesn't change */ ---- XResizeWindow(obt_display, self->max, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ---- XResizeWindow(obt_display, self->iconify, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ---- XResizeWindow(obt_display, self->icon, ---- ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); ---- XResizeWindow(obt_display, self->close, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ---- XResizeWindow(obt_display, self->desk, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ---- XResizeWindow(obt_display, self->shade, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ---- XResizeWindow(obt_display, self->tltresize, ---- ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); ---- XResizeWindow(obt_display, self->trtresize, ---- ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); ---- XResizeWindow(obt_display, self->tllresize, ---- ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); ---- XResizeWindow(obt_display, self->trrresize, ---- ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); ----} ---- ----static void free_theme_statics(ObFrame *self) ----{ ----} ---- ----void frame_free(ObFrame *self) ----{ ---- free_theme_statics(self); ---- ---- XDestroyWindow(obt_display, self->window); ---- if (self->colormap) ---- XFreeColormap(obt_display, self->colormap); ---- ---- g_free(self); ----} ---- ----void frame_show(ObFrame *self) ----{ ---- if (!self->visible) { ---- self->visible = TRUE; ---- framerender_frame(self); ---- /* Grab the server to make sure that the frame window is mapped before ---- the client gets its MapNotify, i.e. to make sure the client is ---- _visible_ when it gets MapNotify. */ ---- grab_server(TRUE); ---- XMapWindow(obt_display, self->client->window); ---- XMapWindow(obt_display, self->window); ---- grab_server(FALSE); ---- } ----} ---- ----void frame_hide(ObFrame *self) ----{ ---- if (self->visible) { ---- self->visible = FALSE; ---- if (!frame_iconify_animating(self)) ---- XUnmapWindow(obt_display, self->window); ---- /* we unmap the client itself so that we can get MapRequest ---- events, and because the ICCCM tells us to! */ ---- XUnmapWindow(obt_display, self->client->window); ---- self->client->ignore_unmaps += 1; ---- } ----} ---- ----void frame_adjust_theme(ObFrame *self) ----{ ---- free_theme_statics(self); ---- set_theme_statics(self); ----} ---- ----void frame_adjust_shape(ObFrame *self) ----{ ----#ifdef SHAPE ---- gint num; ---- XRectangle xrect[2]; ---- ---- if (!self->client->shaped) { ---- /* clear the shape on the frame window */ ---- XShapeCombineMask(obt_display, self->window, ShapeBounding, ---- self->size.left, ---- self->size.top, ---- None, ShapeSet); ---- } else { ---- /* make the frame's shape match the clients */ ---- XShapeCombineShape(obt_display, self->window, ShapeBounding, ---- self->size.left, ---- self->size.top, ---- self->client->window, ---- ShapeBounding, ShapeSet); ---- ---- num = 0; ---- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { ---- xrect[0].x = 0; ---- xrect[0].y = 0; ---- xrect[0].width = self->area.width; ---- xrect[0].height = self->size.top; ---- ++num; ---- } ---- ---- if (self->decorations & OB_FRAME_DECOR_HANDLE && ---- ob_rr_theme->handle_height > 0) ---- { ---- xrect[1].x = 0; ---- xrect[1].y = FRAME_HANDLE_Y(self); ---- xrect[1].width = self->area.width; ---- xrect[1].height = ob_rr_theme->handle_height + ---- self->bwidth * 2; ---- ++num; ---- } ---- ---- XShapeCombineRectangles(obt_display, self->window, ---- ShapeBounding, 0, 0, xrect, num, ---- ShapeUnion, Unsorted); ---- } ----#endif ----} ---- ----void frame_adjust_area(ObFrame *self, gboolean moved, ---- gboolean resized, gboolean fake) ----{ ---- Strut oldsize; ---- ---- oldsize = self->size; ---- ---- if (resized) { ---- /* do this before changing the frame's status like max_horz max_vert */ ---- frame_adjust_cursors(self); ---- ---- self->functions = self->client->functions; ---- self->decorations = self->client->decorations; ---- self->max_horz = self->client->max_horz; ---- self->max_vert = self->client->max_vert; ---- self->shaded = self->client->shaded; ---- ---- if (self->decorations & OB_FRAME_DECOR_BORDER || ---- (self->client->undecorated && config_theme_keepborder)) ---- self->bwidth = ob_rr_theme->fbwidth; ---- else ---- self->bwidth = 0; ---- ---- if (self->decorations & OB_FRAME_DECOR_BORDER) { ---- self->cbwidth_l = self->cbwidth_r = ob_rr_theme->cbwidthx; ---- self->cbwidth_t = self->cbwidth_b = ob_rr_theme->cbwidthy; ---- } else ---- self->cbwidth_l = self->cbwidth_t = ---- self->cbwidth_r = self->cbwidth_b = 0; ---- ---- if (self->max_horz) { ---- self->cbwidth_l = self->cbwidth_r = 0; ---- self->width = self->client->area.width; ---- if (self->max_vert) ---- self->cbwidth_b = 0; ---- } else ---- self->width = self->client->area.width + ---- self->cbwidth_l + self->cbwidth_r; ---- ---- /* some elements are sized based of the width, so don't let them have ---- negative values */ ---- self->width = MAX(self->width, ---- (ob_rr_theme->grip_width + self->bwidth) * 2 + 1); ---- ---- STRUT_SET(self->size, ---- self->cbwidth_l + (!self->max_horz ? self->bwidth : 0), ---- self->cbwidth_t + ---- (!self->max_horz || !self->max_vert || ---- !self->client->undecorated ? self->bwidth : 0), ---- self->cbwidth_r + (!self->max_horz ? self->bwidth : 0), ---- self->cbwidth_b + ---- (!self->max_horz || !self->max_vert ? self->bwidth : 0)); ---- ---- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) ---- self->size.top += ob_rr_theme->title_height + self->bwidth; ---- if (self->decorations & OB_FRAME_DECOR_HANDLE && ---- ob_rr_theme->handle_height > 0) ---- { ---- self->size.bottom += ob_rr_theme->handle_height + self->bwidth; ---- } ---- ---- /* position/size and map/unmap all the windows */ ---- ---- if (!fake) { ---- gint innercornerheight = ---- ob_rr_theme->grip_width - self->size.bottom; ---- ---- if (self->cbwidth_l) { ---- XMoveResizeWindow(obt_display, self->innerleft, ---- self->size.left - self->cbwidth_l, ---- self->size.top, ---- self->cbwidth_l, self->client->area.height); ---- ---- XMapWindow(obt_display, self->innerleft); ---- } else ---- XUnmapWindow(obt_display, self->innerleft); ---- ---- if (self->cbwidth_l && innercornerheight > 0) { ---- XMoveResizeWindow(obt_display, self->innerbll, ---- 0, ---- self->client->area.height - ---- (ob_rr_theme->grip_width - ---- self->size.bottom), ---- self->cbwidth_l, ---- ob_rr_theme->grip_width - self->size.bottom); ---- ---- XMapWindow(obt_display, self->innerbll); ---- } else ---- XUnmapWindow(obt_display, self->innerbll); ---- ---- if (self->cbwidth_r) { ---- XMoveResizeWindow(obt_display, self->innerright, ---- self->size.left + self->client->area.width, ---- self->size.top, ---- self->cbwidth_r, self->client->area.height); ---- ---- XMapWindow(obt_display, self->innerright); ---- } else ---- XUnmapWindow(obt_display, self->innerright); ---- ---- if (self->cbwidth_r && innercornerheight > 0) { ---- XMoveResizeWindow(obt_display, self->innerbrr, ---- 0, ---- self->client->area.height - ---- (ob_rr_theme->grip_width - ---- self->size.bottom), ---- self->cbwidth_r, ---- ob_rr_theme->grip_width - self->size.bottom); ---- ---- XMapWindow(obt_display, self->innerbrr); ---- } else ---- XUnmapWindow(obt_display, self->innerbrr); ---- ---- if (self->cbwidth_t) { ---- XMoveResizeWindow(obt_display, self->innertop, ---- self->size.left - self->cbwidth_l, ---- self->size.top - self->cbwidth_t, ---- self->client->area.width + ---- self->cbwidth_l + self->cbwidth_r, ---- self->cbwidth_t); ---- ---- XMapWindow(obt_display, self->innertop); ---- } else ---- XUnmapWindow(obt_display, self->innertop); ---- ---- if (self->cbwidth_b) { ---- XMoveResizeWindow(obt_display, self->innerbottom, ---- self->size.left - self->cbwidth_l, ---- self->size.top + self->client->area.height, ---- self->client->area.width + ---- self->cbwidth_l + self->cbwidth_r, ---- self->cbwidth_b); ---- ---- XMoveResizeWindow(obt_display, self->innerblb, ---- 0, 0, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->cbwidth_b); ---- XMoveResizeWindow(obt_display, self->innerbrb, ---- self->client->area.width + ---- self->cbwidth_l + self->cbwidth_r - ---- (ob_rr_theme->grip_width + self->bwidth), ---- 0, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->cbwidth_b); ---- ---- XMapWindow(obt_display, self->innerbottom); ---- XMapWindow(obt_display, self->innerblb); ---- XMapWindow(obt_display, self->innerbrb); ---- } else { ---- XUnmapWindow(obt_display, self->innerbottom); ---- XUnmapWindow(obt_display, self->innerblb); ---- XUnmapWindow(obt_display, self->innerbrb); ---- } ---- ---- if (self->bwidth) { ---- gint titlesides; ---- ---- /* height of titleleft and titleright */ ---- titlesides = (!self->max_horz ? ob_rr_theme->grip_width : 0); ---- ---- XMoveResizeWindow(obt_display, self->titletop, ---- ob_rr_theme->grip_width + self->bwidth, 0, ---- /* width + bwidth*2 - bwidth*2 - grips*2 */ ---- self->width - ob_rr_theme->grip_width * 2, ---- self->bwidth); ---- XMoveResizeWindow(obt_display, self->titletopleft, ---- 0, 0, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->bwidth); ---- XMoveResizeWindow(obt_display, self->titletopright, ---- self->client->area.width + ---- self->size.left + self->size.right - ---- ob_rr_theme->grip_width - self->bwidth, ---- 0, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->bwidth); ---- ---- if (titlesides > 0) { ---- XMoveResizeWindow(obt_display, self->titleleft, ---- 0, self->bwidth, ---- self->bwidth, ---- titlesides); ---- XMoveResizeWindow(obt_display, self->titleright, ---- self->client->area.width + ---- self->size.left + self->size.right - ---- self->bwidth, ---- self->bwidth, ---- self->bwidth, ---- titlesides); ---- ---- XMapWindow(obt_display, self->titleleft); ---- XMapWindow(obt_display, self->titleright); ---- } else { ---- XUnmapWindow(obt_display, self->titleleft); ---- XUnmapWindow(obt_display, self->titleright); ---- } ---- ---- XMapWindow(obt_display, self->titletop); ---- XMapWindow(obt_display, self->titletopleft); ---- XMapWindow(obt_display, self->titletopright); ---- ---- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { ---- XMoveResizeWindow(obt_display, self->titlebottom, ---- (self->max_horz ? 0 : self->bwidth), ---- ob_rr_theme->title_height + self->bwidth, ---- self->width, ---- self->bwidth); ---- ---- XMapWindow(obt_display, self->titlebottom); ---- } else ---- XUnmapWindow(obt_display, self->titlebottom); ---- } else { ---- XUnmapWindow(obt_display, self->titlebottom); ---- ---- XUnmapWindow(obt_display, self->titletop); ---- XUnmapWindow(obt_display, self->titletopleft); ---- XUnmapWindow(obt_display, self->titletopright); ---- XUnmapWindow(obt_display, self->titleleft); ---- XUnmapWindow(obt_display, self->titleright); ---- } ---- ---- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { ---- XMoveResizeWindow(obt_display, self->title, ---- (self->max_horz ? 0 : self->bwidth), ---- self->bwidth, ---- self->width, ob_rr_theme->title_height); ---- ---- XMapWindow(obt_display, self->title); ---- ---- if (self->decorations & OB_FRAME_DECOR_GRIPS) { ---- XMoveResizeWindow(obt_display, self->topresize, ---- ob_rr_theme->grip_width, ---- 0, ---- self->width - ob_rr_theme->grip_width *2, ---- ob_rr_theme->paddingy + 1); ---- ---- XMoveWindow(obt_display, self->tltresize, 0, 0); ---- XMoveWindow(obt_display, self->tllresize, 0, 0); ---- XMoveWindow(obt_display, self->trtresize, ---- self->width - ob_rr_theme->grip_width, 0); ---- XMoveWindow(obt_display, self->trrresize, ---- self->width - ob_rr_theme->paddingx - 1, 0); ---- ---- XMapWindow(obt_display, self->topresize); ---- XMapWindow(obt_display, self->tltresize); ---- XMapWindow(obt_display, self->tllresize); ---- XMapWindow(obt_display, self->trtresize); ---- XMapWindow(obt_display, self->trrresize); ---- } else { ---- XUnmapWindow(obt_display, self->topresize); ---- XUnmapWindow(obt_display, self->tltresize); ---- XUnmapWindow(obt_display, self->tllresize); ---- XUnmapWindow(obt_display, self->trtresize); ---- XUnmapWindow(obt_display, self->trrresize); ---- } ---- } else ---- XUnmapWindow(obt_display, self->title); ---- } ---- ---- if ((self->decorations & OB_FRAME_DECOR_TITLEBAR)) ---- /* layout the title bar elements */ ---- layout_title(self); ---- ---- if (!fake) { ---- gint sidebwidth = self->max_horz ? 0 : self->bwidth; ---- ---- if (self->bwidth && self->size.bottom) { ---- XMoveResizeWindow(obt_display, self->handlebottom, ---- ob_rr_theme->grip_width + ---- self->bwidth + sidebwidth, ---- self->size.top + self->client->area.height + ---- self->size.bottom - self->bwidth, ---- self->width - (ob_rr_theme->grip_width + ---- sidebwidth) * 2, ---- self->bwidth); ---- ---- ---- if (sidebwidth) { ---- XMoveResizeWindow(obt_display, self->lgripleft, ---- 0, ---- self->size.top + ---- self->client->area.height + ---- self->size.bottom - ---- (!self->max_horz ? ---- ob_rr_theme->grip_width : ---- self->size.bottom - self->cbwidth_b), ---- self->bwidth, ---- (!self->max_horz ? ---- ob_rr_theme->grip_width : ---- self->size.bottom - self->cbwidth_b)); ---- XMoveResizeWindow(obt_display, self->rgripright, ---- self->size.left + ---- self->client->area.width + ---- self->size.right - self->bwidth, ---- self->size.top + ---- self->client->area.height + ---- self->size.bottom - ---- (!self->max_horz ? ---- ob_rr_theme->grip_width : ---- self->size.bottom - self->cbwidth_b), ---- self->bwidth, ---- (!self->max_horz ? ---- ob_rr_theme->grip_width : ---- self->size.bottom - self->cbwidth_b)); ---- ---- XMapWindow(obt_display, self->lgripleft); ---- XMapWindow(obt_display, self->rgripright); ---- } else { ---- XUnmapWindow(obt_display, self->lgripleft); ---- XUnmapWindow(obt_display, self->rgripright); ---- } ---- ---- XMoveResizeWindow(obt_display, self->lgripbottom, ---- sidebwidth, ---- self->size.top + self->client->area.height + ---- self->size.bottom - self->bwidth, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->bwidth); ---- XMoveResizeWindow(obt_display, self->rgripbottom, ---- self->size.left + self->client->area.width + ---- self->size.right - self->bwidth - sidebwidth- ---- ob_rr_theme->grip_width, ---- self->size.top + self->client->area.height + ---- self->size.bottom - self->bwidth, ---- ob_rr_theme->grip_width + self->bwidth, ---- self->bwidth); ---- ---- XMapWindow(obt_display, self->handlebottom); ---- XMapWindow(obt_display, self->lgripbottom); ---- XMapWindow(obt_display, self->rgripbottom); ---- ---- if (self->decorations & OB_FRAME_DECOR_HANDLE && ---- ob_rr_theme->handle_height > 0) ---- { ---- XMoveResizeWindow(obt_display, self->handletop, ---- ob_rr_theme->grip_width + ---- self->bwidth + sidebwidth, ---- FRAME_HANDLE_Y(self), ---- self->width - (ob_rr_theme->grip_width + ---- sidebwidth) * 2, ---- self->bwidth); ---- XMapWindow(obt_display, self->handletop); ---- ---- if (self->decorations & OB_FRAME_DECOR_GRIPS) { ---- XMoveResizeWindow(obt_display, self->handleleft, ---- ob_rr_theme->grip_width, ---- 0, ---- self->bwidth, ---- ob_rr_theme->handle_height); ---- XMoveResizeWindow(obt_display, self->handleright, ---- self->width - ---- ob_rr_theme->grip_width - ---- self->bwidth, ---- 0, ---- self->bwidth, ---- ob_rr_theme->handle_height); ---- ---- XMoveResizeWindow(obt_display, self->lgriptop, ---- sidebwidth, ---- FRAME_HANDLE_Y(self), ---- ob_rr_theme->grip_width + ---- self->bwidth, ---- self->bwidth); ---- XMoveResizeWindow(obt_display, self->rgriptop, ---- self->size.left + ---- self->client->area.width + ---- self->size.right - self->bwidth - ---- sidebwidth - ob_rr_theme->grip_width, ---- FRAME_HANDLE_Y(self), ---- ob_rr_theme->grip_width + ---- self->bwidth, ---- self->bwidth); ---- ---- XMapWindow(obt_display, self->handleleft); ---- XMapWindow(obt_display, self->handleright); ---- XMapWindow(obt_display, self->lgriptop); ---- XMapWindow(obt_display, self->rgriptop); ---- } else { ---- XUnmapWindow(obt_display, self->handleleft); ---- XUnmapWindow(obt_display, self->handleright); ---- XUnmapWindow(obt_display, self->lgriptop); ---- XUnmapWindow(obt_display, self->rgriptop); ---- } ---- } else { ---- XUnmapWindow(obt_display, self->handleleft); ---- XUnmapWindow(obt_display, self->handleright); ---- XUnmapWindow(obt_display, self->lgriptop); ---- XUnmapWindow(obt_display, self->rgriptop); ---- ---- XUnmapWindow(obt_display, self->handletop); ---- } ---- } else { ---- XUnmapWindow(obt_display, self->handleleft); ---- XUnmapWindow(obt_display, self->handleright); ---- XUnmapWindow(obt_display, self->lgriptop); ---- XUnmapWindow(obt_display, self->rgriptop); ---- ---- XUnmapWindow(obt_display, self->handletop); ---- ---- XUnmapWindow(obt_display, self->handlebottom); ---- XUnmapWindow(obt_display, self->lgripleft); ---- XUnmapWindow(obt_display, self->rgripright); ---- XUnmapWindow(obt_display, self->lgripbottom); ---- XUnmapWindow(obt_display, self->rgripbottom); ---- } ---- ---- if (self->decorations & OB_FRAME_DECOR_HANDLE && ---- ob_rr_theme->handle_height > 0) ---- { ---- XMoveResizeWindow(obt_display, self->handle, ---- sidebwidth, ---- FRAME_HANDLE_Y(self) + self->bwidth, ---- self->width, ob_rr_theme->handle_height); ---- XMapWindow(obt_display, self->handle); ---- ---- if (self->decorations & OB_FRAME_DECOR_GRIPS) { ---- XMoveResizeWindow(obt_display, self->lgrip, ---- 0, 0, ---- ob_rr_theme->grip_width, ---- ob_rr_theme->handle_height); ---- XMoveResizeWindow(obt_display, self->rgrip, ---- self->width - ob_rr_theme->grip_width, ---- 0, ---- ob_rr_theme->grip_width, ---- ob_rr_theme->handle_height); ---- ---- XMapWindow(obt_display, self->lgrip); ---- XMapWindow(obt_display, self->rgrip); ---- } else { ---- XUnmapWindow(obt_display, self->lgrip); ---- XUnmapWindow(obt_display, self->rgrip); ---- } ---- } else { ---- XUnmapWindow(obt_display, self->lgrip); ---- XUnmapWindow(obt_display, self->rgrip); ---- ---- XUnmapWindow(obt_display, self->handle); ---- } ---- ---- if (self->bwidth && !self->max_horz && ---- (self->client->area.height + self->size.top + ---- self->size.bottom) > ob_rr_theme->grip_width * 2) ---- { ---- XMoveResizeWindow(obt_display, self->left, ---- 0, ---- self->bwidth + ob_rr_theme->grip_width, ---- self->bwidth, ---- self->client->area.height + ---- self->size.top + self->size.bottom - ---- ob_rr_theme->grip_width * 2); ---- ---- XMapWindow(obt_display, self->left); ---- } else ---- XUnmapWindow(obt_display, self->left); ---- ---- if (self->bwidth && !self->max_horz && ---- (self->client->area.height + self->size.top + ---- self->size.bottom) > ob_rr_theme->grip_width * 2) ---- { ---- XMoveResizeWindow(obt_display, self->right, ---- self->client->area.width + self->cbwidth_l + ---- self->cbwidth_r + self->bwidth, ---- self->bwidth + ob_rr_theme->grip_width, ---- self->bwidth, ---- self->client->area.height + ---- self->size.top + self->size.bottom - ---- ob_rr_theme->grip_width * 2); ---- ---- XMapWindow(obt_display, self->right); ---- } else ---- XUnmapWindow(obt_display, self->right); ---- ---- XMoveResizeWindow(obt_display, self->backback, ---- self->size.left, self->size.top, ---- self->client->area.width, ---- self->client->area.height); ---- } ---- } ---- ---- /* shading can change without being moved or resized */ ---- RECT_SET_SIZE(self->area, ---- self->client->area.width + ---- self->size.left + self->size.right, ---- (self->client->shaded ? ---- ob_rr_theme->title_height + self->bwidth * 2: ---- self->client->area.height + ---- self->size.top + self->size.bottom)); ---- ---- if ((moved || resized) && !fake) { ---- /* find the new coordinates, done after setting the frame.size, for ---- frame_client_gravity. */ ---- self->area.x = self->client->area.x; ---- self->area.y = self->client->area.y; ---- frame_client_gravity(self, &self->area.x, &self->area.y); ---- } ---- ---- if (!fake) { ---- if (!frame_iconify_animating(self)) ---- /* move and resize the top level frame. ---- shading can change without being moved or resized. ---- ---- but don't do this during an iconify animation. it will be ---- reflected afterwards. ---- */ ---- XMoveResizeWindow(obt_display, self->window, ---- self->area.x, ---- self->area.y, ---- self->area.width, ---- self->area.height); ---- ---- /* when the client has StaticGravity, it likes to move around. ---- also this correctly positions the client when it maps. ---- this also needs to be run when the frame's decorations sizes change! ---- */ ---- XMoveWindow(obt_display, self->client->window, ---- self->size.left, self->size.top); ---- ---- if (resized) { ---- self->need_render = TRUE; ---- framerender_frame(self); ---- frame_adjust_shape(self); ---- } ---- ---- if (!STRUT_EQUAL(self->size, oldsize)) { ---- gulong vals[4]; ---- vals[0] = self->size.left; ---- vals[1] = self->size.right; ---- vals[2] = self->size.top; ---- vals[3] = self->size.bottom; ---- OBT_PROP_SETA32(self->client->window, NET_FRAME_EXTENTS, ---- CARDINAL, vals, 4); ---- OBT_PROP_SETA32(self->client->window, KDE_NET_WM_FRAME_STRUT, ---- CARDINAL, vals, 4); ---- } ---- ---- /* if this occurs while we are focus cycling, the indicator needs to ---- match the changes */ ---- if (focus_cycle_target == self->client) ---- focus_cycle_draw_indicator(self->client); ---- } ---- if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR)) ---- XResizeWindow(obt_display, self->label, self->label_width, ---- ob_rr_theme->label_height); ---- ----} ---- ----static void frame_adjust_cursors(ObFrame *self) ----{ ---- if ((self->functions & OB_CLIENT_FUNC_RESIZE) != ---- (self->client->functions & OB_CLIENT_FUNC_RESIZE) || ---- self->max_horz != self->client->max_horz || ---- self->max_vert != self->client->max_vert || ---- self->shaded != self->client->shaded) ---- { ---- gboolean r = (self->client->functions & OB_CLIENT_FUNC_RESIZE) && ---- !(self->client->max_horz && self->client->max_vert); ---- gboolean topbot = !self->client->max_vert; ---- gboolean sh = self->client->shaded; ---- XSetWindowAttributes a; ---- ---- /* these ones turn off when max vert, and some when shaded */ ---- a.cursor = ob_cursor(r && topbot && !sh ? ---- OB_CURSOR_NORTH : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->topresize, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->titletop, CWCursor, &a); ---- a.cursor = ob_cursor(r && topbot ? OB_CURSOR_SOUTH : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->handle, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->handletop, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->handlebottom, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerbottom, CWCursor, &a); ---- ---- /* these ones change when shaded */ ---- a.cursor = ob_cursor(r ? (sh ? OB_CURSOR_WEST : OB_CURSOR_NORTHWEST) : ---- OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->titleleft, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->tltresize, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->tllresize, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->titletopleft, CWCursor, &a); ---- a.cursor = ob_cursor(r ? (sh ? OB_CURSOR_EAST : OB_CURSOR_NORTHEAST) : ---- OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->titleright, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->trtresize, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->trrresize, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->titletopright, CWCursor,&a); ---- ---- /* these ones are pretty static */ ---- a.cursor = ob_cursor(r ? OB_CURSOR_WEST : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->left, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerleft, CWCursor, &a); ---- a.cursor = ob_cursor(r ? OB_CURSOR_EAST : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->right, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerright, CWCursor, &a); ---- a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHWEST : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->lgrip, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->handleleft, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->lgripleft, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->lgriptop, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->lgripbottom, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerbll, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerblb, CWCursor, &a); ---- a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHEAST : OB_CURSOR_NONE); ---- XChangeWindowAttributes(obt_display, self->rgrip, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->handleright, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->rgripright, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->rgriptop, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->rgripbottom, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerbrr, CWCursor, &a); ---- XChangeWindowAttributes(obt_display, self->innerbrb, CWCursor, &a); ---- } ----} ---- ----void frame_adjust_client_area(ObFrame *self) ----{ ---- /* adjust the window which is there to prevent flashing on unmap */ ---- XMoveResizeWindow(obt_display, self->backfront, 0, 0, ---- self->client->area.width, ---- self->client->area.height); ----} ---- ----void frame_adjust_state(ObFrame *self) ----{ ---- self->need_render = TRUE; ---- framerender_frame(self); ----} ---- ----void frame_adjust_focus(ObFrame *self, gboolean hilite) ----{ ---- self->focused = hilite; ---- self->need_render = TRUE; ---- framerender_frame(self); ---- XFlush(obt_display); ----} ---- ----void frame_adjust_title(ObFrame *self) ----{ ---- self->need_render = TRUE; ---- framerender_frame(self); ----} ---- ----void frame_adjust_icon(ObFrame *self) ----{ ---- self->need_render = TRUE; ---- framerender_frame(self); ----} ---- ----void frame_grab_client(ObFrame *self) ----{ ---- /* DO NOT map the client window here. we used to do that, but it is bogus. ---- we need to set up the client's dimensions and everything before we ---- send a mapnotify or we create race conditions. ---- */ ---- ---- /* reparent the client to the frame */ ---- XReparentWindow(obt_display, self->client->window, self->window, 0, 0); ---- ---- /* ---- When reparenting the client window, it is usually not mapped yet, since ---- this occurs from a MapRequest. However, in the case where Openbox is ---- starting up, the window is already mapped, so we'll see an unmap event ---- for it. ---- */ ---- if (ob_state() == OB_STATE_STARTING) ---- ++self->client->ignore_unmaps; ---- ---- /* select the event mask on the client's parent (to receive config/map ---- req's) the ButtonPress is to catch clicks on the client border */ ---- XSelectInput(obt_display, self->window, FRAME_EVENTMASK); ---- ---- /* set all the windows for the frame in the window_map */ ---- window_add(&self->window, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->backback, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->backfront, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerleft, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innertop, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerright, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerbottom, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerblb, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerbll, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerbrb, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->innerbrr, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->title, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->label, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->max, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->close, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->desk, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->shade, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->icon, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->iconify, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->handle, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->lgrip, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->rgrip, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->topresize, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->tltresize, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->tllresize, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->trtresize, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->trrresize, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->left, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->right, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titleleft, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titletop, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titletopleft, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titletopright, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titleright, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->titlebottom, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->handleleft, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->handletop, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->handleright, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->handlebottom, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->lgripleft, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->lgriptop, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->lgripbottom, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->rgripright, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->rgriptop, CLIENT_AS_WINDOW(self->client)); ---- window_add(&self->rgripbottom, CLIENT_AS_WINDOW(self->client)); ----} ---- ----void frame_release_client(ObFrame *self) ----{ ---- XEvent ev; ---- gboolean reparent = TRUE; ---- ---- /* if there was any animation going on, kill it */ ---- obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify, ---- self, FALSE); ---- ---- /* check if the app has already reparented its window away */ ---- while (XCheckTypedWindowEvent(obt_display, self->client->window, ---- ReparentNotify, &ev)) ---- { ---- /* This check makes sure we don't catch our own reparent action to ---- our frame window. This doesn't count as the app reparenting itself ---- away of course. ---- ---- Reparent events that are generated by us are just discarded here. ---- They are of no consequence to us anyhow. ---- */ ---- if (ev.xreparent.parent != self->window) { ---- reparent = FALSE; ---- XPutBackEvent(obt_display, &ev); ---- break; ---- } ---- } ---- ---- if (reparent) { ---- /* according to the ICCCM - if the client doesn't reparent itself, ---- then we will reparent the window to root for them */ ---- XReparentWindow(obt_display, self->client->window, obt_root(ob_screen), ---- self->client->area.x, self->client->area.y); ---- } ---- ---- /* remove all the windows for the frame from the window_map */ ---- window_remove(self->window); ---- window_remove(self->backback); ---- window_remove(self->backfront); ---- window_remove(self->innerleft); ---- window_remove(self->innertop); ---- window_remove(self->innerright); ---- window_remove(self->innerbottom); ---- window_remove(self->innerblb); ---- window_remove(self->innerbll); ---- window_remove(self->innerbrb); ---- window_remove(self->innerbrr); ---- window_remove(self->title); ---- window_remove(self->label); ---- window_remove(self->max); ---- window_remove(self->close); ---- window_remove(self->desk); ---- window_remove(self->shade); ---- window_remove(self->icon); ---- window_remove(self->iconify); ---- window_remove(self->handle); ---- window_remove(self->lgrip); ---- window_remove(self->rgrip); ---- window_remove(self->topresize); ---- window_remove(self->tltresize); ---- window_remove(self->tllresize); ---- window_remove(self->trtresize); ---- window_remove(self->trrresize); ---- window_remove(self->left); ---- window_remove(self->right); ---- window_remove(self->titleleft); ---- window_remove(self->titletop); ---- window_remove(self->titletopleft); ---- window_remove(self->titletopright); ---- window_remove(self->titleright); ---- window_remove(self->titlebottom); ---- window_remove(self->handleleft); ---- window_remove(self->handletop); ---- window_remove(self->handleright); ---- window_remove(self->handlebottom); ---- window_remove(self->lgripleft); ---- window_remove(self->lgriptop); ---- window_remove(self->lgripbottom); ---- window_remove(self->rgripright); ---- window_remove(self->rgriptop); ---- window_remove(self->rgripbottom); ---- ---- obt_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE); ----} ---- ----/* is there anything present between us and the label? */ ----static gboolean is_button_present(ObFrame *self, const gchar *lc, gint dir) { ---- for (; *lc != '\0' && lc >= config_title_layout; lc += dir) { ---- if (*lc == ' ') continue; /* it was invalid */ ---- if (*lc == 'N' && self->decorations & OB_FRAME_DECOR_ICON) ---- return TRUE; ---- if (*lc == 'D' && self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ---- return TRUE; ---- if (*lc == 'S' && self->decorations & OB_FRAME_DECOR_SHADE) ---- return TRUE; ---- if (*lc == 'I' && self->decorations & OB_FRAME_DECOR_ICONIFY) ---- return TRUE; ---- if (*lc == 'M' && self->decorations & OB_FRAME_DECOR_MAXIMIZE) ---- return TRUE; ---- if (*lc == 'C' && self->decorations & OB_FRAME_DECOR_CLOSE) ---- return TRUE; ---- if (*lc == 'L') return FALSE; ---- } ---- return FALSE; ----} ---- ----static void layout_title(ObFrame *self) ----{ ---- gchar *lc; ---- gint i; ---- ---- const gint bwidth = ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; ---- /* position of the left most button */ ---- const gint left = ob_rr_theme->paddingx + 1; ---- /* position of the right most button */ ---- const gint right = self->width; ---- ---- /* turn them all off */ ---- self->icon_on = self->desk_on = self->shade_on = self->iconify_on = ---- self->max_on = self->close_on = self->label_on = FALSE; ---- self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2; ---- self->leftmost = self->rightmost = OB_FRAME_CONTEXT_NONE; ---- ---- /* figure out what's being show, find each element's position, and the ---- width of the label ---- ---- do the ones before the label, then after the label, ---- i will be +1 the first time through when working to the left, ---- and -1 the second time through when working to the right */ ---- for (i = 1; i >= -1; i-=2) { ---- gint x; ---- ObFrameContext *firstcon; ---- ---- if (i > 0) { ---- x = left; ---- lc = config_title_layout; ---- firstcon = &self->leftmost; ---- } else { ---- x = right; ---- lc = config_title_layout + strlen(config_title_layout)-1; ---- firstcon = &self->rightmost; ---- } ---- ---- /* stop at the end of the string (or the label, which calls break) */ ---- for (; *lc != '\0' && lc >= config_title_layout; lc+=i) { ---- if (*lc == 'L') { ---- if (i > 0) { ---- self->label_on = TRUE; ---- self->label_x = x; ---- } ---- break; /* break the for loop, do other side of label */ ---- } else if (*lc == 'N') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICON; ---- if ((self->icon_on = is_button_present(self, lc, i))) { ---- /* icon is bigger than buttons */ ---- self->label_width -= bwidth + 2; ---- if (i > 0) self->icon_x = x; ---- x += i * (bwidth + 2); ---- if (i < 0) self->icon_x = x; ---- } ---- } else if (*lc == 'D') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_ALLDESKTOPS; ---- if ((self->desk_on = is_button_present(self, lc, i))) { ---- self->label_width -= bwidth; ---- if (i > 0) self->desk_x = x; ---- x += i * bwidth; ---- if (i < 0) self->desk_x = x; ---- } ---- } else if (*lc == 'S') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_SHADE; ---- if ((self->shade_on = is_button_present(self, lc, i))) { ---- self->label_width -= bwidth; ---- if (i > 0) self->shade_x = x; ---- x += i * bwidth; ---- if (i < 0) self->shade_x = x; ---- } ---- } else if (*lc == 'I') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICONIFY; ---- if ((self->iconify_on = is_button_present(self, lc, i))) { ---- self->label_width -= bwidth; ---- if (i > 0) self->iconify_x = x; ---- x += i * bwidth; ---- if (i < 0) self->iconify_x = x; ---- } ---- } else if (*lc == 'M') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_MAXIMIZE; ---- if ((self->max_on = is_button_present(self, lc, i))) { ---- self->label_width -= bwidth; ---- if (i > 0) self->max_x = x; ---- x += i * bwidth; ---- if (i < 0) self->max_x = x; ---- } ---- } else if (*lc == 'C') { ---- if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE; ---- if ((self->close_on = is_button_present(self, lc, i))) { ---- self->label_width -= bwidth; ---- if (i > 0) self->close_x = x; ---- x += i * bwidth; ---- if (i < 0) self->close_x = x; ---- } ---- } else ---- continue; /* don't set firstcon */ ---- firstcon = NULL; ---- } ---- } ---- ---- /* position and map the elements */ ---- if (self->icon_on) { ---- XMapWindow(obt_display, self->icon); ---- XMoveWindow(obt_display, self->icon, self->icon_x, ---- ob_rr_theme->paddingy); ---- } else ---- XUnmapWindow(obt_display, self->icon); ---- ---- if (self->desk_on) { ---- XMapWindow(obt_display, self->desk); ---- XMoveWindow(obt_display, self->desk, self->desk_x, ---- ob_rr_theme->paddingy + 1); ---- } else ---- XUnmapWindow(obt_display, self->desk); ---- ---- if (self->shade_on) { ---- XMapWindow(obt_display, self->shade); ---- XMoveWindow(obt_display, self->shade, self->shade_x, ---- ob_rr_theme->paddingy + 1); ---- } else ---- XUnmapWindow(obt_display, self->shade); ---- ---- if (self->iconify_on) { ---- XMapWindow(obt_display, self->iconify); ---- XMoveWindow(obt_display, self->iconify, self->iconify_x, ---- ob_rr_theme->paddingy + 1); ---- } else ---- XUnmapWindow(obt_display, self->iconify); ---- ---- if (self->max_on) { ---- XMapWindow(obt_display, self->max); ---- XMoveWindow(obt_display, self->max, self->max_x, ---- ob_rr_theme->paddingy + 1); ---- } else ---- XUnmapWindow(obt_display, self->max); ---- ---- if (self->close_on) { ---- XMapWindow(obt_display, self->close); ---- XMoveWindow(obt_display, self->close, self->close_x, ---- ob_rr_theme->paddingy + 1); ---- } else ---- XUnmapWindow(obt_display, self->close); ---- ---- if (self->label_on) { ---- self->label_width = MAX(1, self->label_width); /* no lower than 1 */ ---- XMapWindow(obt_display, self->label); ---- XMoveWindow(obt_display, self->label, self->label_x, ---- ob_rr_theme->paddingy); ---- } else ---- XUnmapWindow(obt_display, self->label); ----} ---- ----ObFrameContext frame_context_from_string(const gchar *name) ----{ ---- if (!g_ascii_strcasecmp("Desktop", name)) ---- return OB_FRAME_CONTEXT_DESKTOP; ---- else if (!g_ascii_strcasecmp("Root", name)) ---- return OB_FRAME_CONTEXT_ROOT; ---- else if (!g_ascii_strcasecmp("Client", name)) ---- return OB_FRAME_CONTEXT_CLIENT; ---- else if (!g_ascii_strcasecmp("Titlebar", name)) ---- return OB_FRAME_CONTEXT_TITLEBAR; ---- else if (!g_ascii_strcasecmp("Frame", name)) ---- return OB_FRAME_CONTEXT_FRAME; ---- else if (!g_ascii_strcasecmp("TLCorner", name)) ---- return OB_FRAME_CONTEXT_TLCORNER; ---- else if (!g_ascii_strcasecmp("TRCorner", name)) ---- return OB_FRAME_CONTEXT_TRCORNER; ---- else if (!g_ascii_strcasecmp("BLCorner", name)) ---- return OB_FRAME_CONTEXT_BLCORNER; ---- else if (!g_ascii_strcasecmp("BRCorner", name)) ---- return OB_FRAME_CONTEXT_BRCORNER; ---- else if (!g_ascii_strcasecmp("Top", name)) ---- return OB_FRAME_CONTEXT_TOP; ---- else if (!g_ascii_strcasecmp("Bottom", name)) ---- return OB_FRAME_CONTEXT_BOTTOM; ---- else if (!g_ascii_strcasecmp("Left", name)) ---- return OB_FRAME_CONTEXT_LEFT; ---- else if (!g_ascii_strcasecmp("Right", name)) ---- return OB_FRAME_CONTEXT_RIGHT; ---- else if (!g_ascii_strcasecmp("Maximize", name)) ---- return OB_FRAME_CONTEXT_MAXIMIZE; ---- else if (!g_ascii_strcasecmp("AllDesktops", name)) ---- return OB_FRAME_CONTEXT_ALLDESKTOPS; ---- else if (!g_ascii_strcasecmp("Shade", name)) ---- return OB_FRAME_CONTEXT_SHADE; ---- else if (!g_ascii_strcasecmp("Iconify", name)) ---- return OB_FRAME_CONTEXT_ICONIFY; ---- else if (!g_ascii_strcasecmp("Icon", name)) ---- return OB_FRAME_CONTEXT_ICON; ---- else if (!g_ascii_strcasecmp("Close", name)) ---- return OB_FRAME_CONTEXT_CLOSE; ---- else if (!g_ascii_strcasecmp("MoveResize", name)) ---- return OB_FRAME_CONTEXT_MOVE_RESIZE; ---- return OB_FRAME_CONTEXT_NONE; ----} ---- ----ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y) ----{ ---- ObFrame *self; ---- ---- if (moveresize_in_progress) ---- return OB_FRAME_CONTEXT_MOVE_RESIZE; ---- ---- if (win == obt_root(ob_screen)) ---- return OB_FRAME_CONTEXT_ROOT ; ---- if (client == NULL) return OB_FRAME_CONTEXT_NONE; ---- if (win == client->window) { ---- /* conceptually, this is the desktop, as far as users are ---- concerned */ ---- if (client->type == OB_CLIENT_TYPE_DESKTOP) ---- return OB_FRAME_CONTEXT_DESKTOP; ---- return OB_FRAME_CONTEXT_CLIENT; ---- } ---- ---- self = client->frame; ---- ---- /* when the user clicks in the corners of the titlebar and the client ---- is fully maximized, then treat it like they clicked in the ---- button that is there */ ---- if (self->max_horz && self->max_vert && ---- (win == self->title || win == self->titletop || ---- win == self->titleleft || win == self->titletopleft || ---- win == self->titleright || win == self->titletopright)) ---- { ---- /* get the mouse coords in reference to the whole frame */ ---- gint fx = x; ---- gint fy = y; ---- ---- /* these windows are down a border width from the top of the frame */ ---- if (win == self->title || ---- win == self->titleleft || win == self->titleright) ---- fy += self->bwidth; ---- ---- /* title is a border width in from the edge */ ---- if (win == self->title) ---- fx += self->bwidth; ---- /* titletop is a bit to the right */ ---- else if (win == self->titletop) ---- fx += ob_rr_theme->grip_width + self->bwidth; ---- /* titletopright is way to the right edge */ ---- else if (win == self->titletopright) ---- fx += self->area.width - (ob_rr_theme->grip_width + self->bwidth); ---- /* titleright is even more way to the right edge */ ---- else if (win == self->titleright) ---- fx += self->area.width - self->bwidth; ---- ---- /* figure out if we're over the area that should be considered a ---- button */ ---- if (fy < self->bwidth + ob_rr_theme->paddingy + 1 + ---- ob_rr_theme->button_size) ---- { ---- if (fx < (self->bwidth + ob_rr_theme->paddingx + 1 + ---- ob_rr_theme->button_size)) ---- { ---- if (self->leftmost != OB_FRAME_CONTEXT_NONE) ---- return self->leftmost; ---- } ---- else if (fx >= (self->area.width - ---- (self->bwidth + ob_rr_theme->paddingx + 1 + ---- ob_rr_theme->button_size))) ---- { ---- if (self->rightmost != OB_FRAME_CONTEXT_NONE) ---- return self->rightmost; ---- } ---- } ---- ---- /* there is no resizing maximized windows so make them the titlebar ---- context */ ---- return OB_FRAME_CONTEXT_TITLEBAR; ---- } ---- else if (self->max_vert && ---- (win == self->titletop || win == self->topresize)) ---- /* can't resize vertically when max vert */ ---- return OB_FRAME_CONTEXT_TITLEBAR; ---- else if (self->shaded && ---- (win == self->titletop || win == self->topresize)) ---- /* can't resize vertically when shaded */ ---- return OB_FRAME_CONTEXT_TITLEBAR; ---- ---- if (win == self->window) return OB_FRAME_CONTEXT_FRAME; ---- if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR; ---- if (win == self->handle) return OB_FRAME_CONTEXT_BOTTOM; ---- if (win == self->handletop) return OB_FRAME_CONTEXT_BOTTOM; ---- if (win == self->handlebottom) return OB_FRAME_CONTEXT_BOTTOM; ---- if (win == self->handleleft) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->lgripleft) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->lgriptop) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->lgripbottom) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->handleright) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->rgripright) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->rgriptop) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->rgripbottom) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR; ---- if (win == self->titlebottom) return OB_FRAME_CONTEXT_TITLEBAR; ---- if (win == self->titleleft) return OB_FRAME_CONTEXT_TLCORNER; ---- if (win == self->titletopleft) return OB_FRAME_CONTEXT_TLCORNER; ---- if (win == self->titleright) return OB_FRAME_CONTEXT_TRCORNER; ---- if (win == self->titletopright) return OB_FRAME_CONTEXT_TRCORNER; ---- if (win == self->titletop) return OB_FRAME_CONTEXT_TOP; ---- if (win == self->topresize) return OB_FRAME_CONTEXT_TOP; ---- if (win == self->tltresize) return OB_FRAME_CONTEXT_TLCORNER; ---- if (win == self->tllresize) return OB_FRAME_CONTEXT_TLCORNER; ---- if (win == self->trtresize) return OB_FRAME_CONTEXT_TRCORNER; ---- if (win == self->trrresize) return OB_FRAME_CONTEXT_TRCORNER; ---- if (win == self->left) return OB_FRAME_CONTEXT_LEFT; ---- if (win == self->right) return OB_FRAME_CONTEXT_RIGHT; ---- if (win == self->innertop) return OB_FRAME_CONTEXT_TITLEBAR; ---- if (win == self->innerleft) return OB_FRAME_CONTEXT_LEFT; ---- if (win == self->innerbottom) return OB_FRAME_CONTEXT_BOTTOM; ---- if (win == self->innerright) return OB_FRAME_CONTEXT_RIGHT; ---- if (win == self->innerbll) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->innerblb) return OB_FRAME_CONTEXT_BLCORNER; ---- if (win == self->innerbrr) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->innerbrb) return OB_FRAME_CONTEXT_BRCORNER; ---- if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE; ---- if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY; ---- if (win == self->close) return OB_FRAME_CONTEXT_CLOSE; ---- if (win == self->icon) return OB_FRAME_CONTEXT_ICON; ---- if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS; ---- if (win == self->shade) return OB_FRAME_CONTEXT_SHADE; ---- ---- return OB_FRAME_CONTEXT_NONE; ----} ---- ----void frame_client_gravity(ObFrame *self, gint *x, gint *y) ----{ ---- /* horizontal */ ---- switch (self->client->gravity) { ---- default: ---- case NorthWestGravity: ---- case SouthWestGravity: ---- case WestGravity: ---- break; ---- ---- case NorthGravity: ---- case SouthGravity: ---- case CenterGravity: ---- /* the middle of the client will be the middle of the frame */ ---- *x -= (self->size.right - self->size.left) / 2; ---- break; ---- ---- case NorthEastGravity: ---- case SouthEastGravity: ---- case EastGravity: ---- /* the right side of the client will be the right side of the frame */ ---- *x -= self->size.right + self->size.left - ---- self->client->border_width * 2; ---- break; ---- ---- case ForgetGravity: ---- case StaticGravity: ---- /* the client's position won't move */ ---- *x -= self->size.left - self->client->border_width; ---- break; ---- } ---- ---- /* vertical */ ---- switch (self->client->gravity) { ---- default: ---- case NorthWestGravity: ---- case NorthEastGravity: ---- case NorthGravity: ---- break; ---- ---- case CenterGravity: ---- case EastGravity: ---- case WestGravity: ---- /* the middle of the client will be the middle of the frame */ ---- *y -= (self->size.bottom - self->size.top) / 2; ---- break; ---- ---- case SouthWestGravity: ---- case SouthEastGravity: ---- case SouthGravity: ---- /* the bottom of the client will be the bottom of the frame */ ---- *y -= self->size.bottom + self->size.top - ---- self->client->border_width * 2; ---- break; ---- ---- case ForgetGravity: ---- case StaticGravity: ---- /* the client's position won't move */ ---- *y -= self->size.top - self->client->border_width; ---- break; ---- } ----} ---- ----void frame_frame_gravity(ObFrame *self, gint *x, gint *y) ----{ ---- /* horizontal */ ---- switch (self->client->gravity) { ---- default: ---- case NorthWestGravity: ---- case WestGravity: ---- case SouthWestGravity: ---- break; ---- case NorthGravity: ---- case CenterGravity: ---- case SouthGravity: ---- /* the middle of the client will be the middle of the frame */ ---- *x += (self->size.right - self->size.left) / 2; ---- break; ---- case NorthEastGravity: ---- case EastGravity: ---- case SouthEastGravity: ---- /* the right side of the client will be the right side of the frame */ ---- *x += self->size.right + self->size.left - ---- self->client->border_width * 2; ---- break; ---- case StaticGravity: ---- case ForgetGravity: ---- /* the client's position won't move */ ---- *x += self->size.left - self->client->border_width; ---- break; ---- } ---- ---- /* vertical */ ---- switch (self->client->gravity) { ---- default: ---- case NorthWestGravity: ---- case NorthGravity: ---- case NorthEastGravity: ---- break; ---- case WestGravity: ---- case CenterGravity: ---- case EastGravity: ---- /* the middle of the client will be the middle of the frame */ ---- *y += (self->size.bottom - self->size.top) / 2; ---- break; ---- case SouthWestGravity: ---- case SouthGravity: ---- case SouthEastGravity: ---- /* the bottom of the client will be the bottom of the frame */ ---- *y += self->size.bottom + self->size.top - ---- self->client->border_width * 2; ---- break; ---- case StaticGravity: ---- case ForgetGravity: ---- /* the client's position won't move */ ---- *y += self->size.top - self->client->border_width; ---- break; ---- } ----} ---- ----void frame_rect_to_frame(ObFrame *self, Rect *r) ----{ ---- r->width += self->size.left + self->size.right; ---- r->height += self->size.top + self->size.bottom; ---- frame_client_gravity(self, &r->x, &r->y); ----} ---- ----void frame_rect_to_client(ObFrame *self, Rect *r) ----{ ---- r->width -= self->size.left + self->size.right; ---- r->height -= self->size.top + self->size.bottom; ---- frame_frame_gravity(self, &r->x, &r->y); ----} ---- ----static void flash_done(gpointer data) ----{ ---- ObFrame *self = data; ---- ---- if (self->focused != self->flash_on) ---- frame_adjust_focus(self, self->focused); ----} ---- ----static gboolean flash_timeout(gpointer data) ----{ ---- ObFrame *self = data; ---- GTimeVal now; ---- ---- g_get_current_time(&now); ---- if (now.tv_sec > self->flash_end.tv_sec || ---- (now.tv_sec == self->flash_end.tv_sec && ---- now.tv_usec >= self->flash_end.tv_usec)) ---- self->flashing = FALSE; ---- ---- if (!self->flashing) ---- return FALSE; /* we are done */ ---- ---- self->flash_on = !self->flash_on; ---- if (!self->focused) { ---- frame_adjust_focus(self, self->flash_on); ---- self->focused = FALSE; ---- } ---- ---- return TRUE; /* go again */ ----} ---- ----void frame_flash_start(ObFrame *self) ----{ ---- self->flash_on = self->focused; ---- ---- if (!self->flashing) ---- obt_main_loop_timeout_add(ob_main_loop, ---- G_USEC_PER_SEC * 0.6, ---- flash_timeout, ---- self, ---- g_direct_equal, ---- flash_done); ---- g_get_current_time(&self->flash_end); ---- g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5); ---- ---- self->flashing = TRUE; ----} ---- ----void frame_flash_stop(ObFrame *self) ----{ ---- self->flashing = FALSE; ----} ---- ----static gulong frame_animate_iconify_time_left(ObFrame *self, ---- const GTimeVal *now) ----{ ---- glong sec, usec; ---- sec = self->iconify_animation_end.tv_sec - now->tv_sec; ---- usec = self->iconify_animation_end.tv_usec - now->tv_usec; ---- if (usec < 0) { ---- usec += G_USEC_PER_SEC; ---- sec--; ---- } ---- /* no negative values */ ---- return MAX(sec * G_USEC_PER_SEC + usec, 0); ----} ---- ----static gboolean frame_animate_iconify(gpointer p) ----{ ---- ObFrame *self = p; ---- gint x, y, w, h; ---- gint iconx, icony, iconw; ---- GTimeVal now; ---- gulong time; ---- gboolean iconifying; ---- ---- if (self->client->icon_geometry.width == 0) { ---- /* there is no icon geometry set so just go straight down */ ---- Rect *a = screen_physical_area_monitor ---- (screen_find_monitor(&self->area)); ---- iconx = self->area.x + self->area.width / 2 + 32; ---- icony = a->y + a->width; ---- iconw = 64; ---- g_free(a); ---- } else { ---- iconx = self->client->icon_geometry.x; ---- icony = self->client->icon_geometry.y; ---- iconw = self->client->icon_geometry.width; ---- } ---- ---- iconifying = self->iconify_animation_going > 0; ---- ---- /* how far do we have left to go ? */ ---- g_get_current_time(&now); ---- time = frame_animate_iconify_time_left(self, &now); ---- ---- if ((time > 0 && iconifying) || (time == 0 && !iconifying)) { ---- /* start where the frame is supposed to be */ ---- x = self->area.x; ---- y = self->area.y; ---- w = self->area.width; ---- h = self->area.height; ---- } else { ---- /* start at the icon */ ---- x = iconx; ---- y = icony; ---- w = iconw; ---- h = self->size.top; /* just the titlebar */ ---- } ---- ---- if (time > 0) { ---- glong dx, dy, dw; ---- glong elapsed; ---- ---- dx = self->area.x - iconx; ---- dy = self->area.y - icony; ---- dw = self->area.width - self->bwidth * 2 - iconw; ---- /* if restoring, we move in the opposite direction */ ---- if (!iconifying) { dx = -dx; dy = -dy; dw = -dw; } ---- ---- elapsed = FRAME_ANIMATE_ICONIFY_TIME - time; ---- x = x - (dx * elapsed) / FRAME_ANIMATE_ICONIFY_TIME; ---- y = y - (dy * elapsed) / FRAME_ANIMATE_ICONIFY_TIME; ---- w = w - (dw * elapsed) / FRAME_ANIMATE_ICONIFY_TIME; ---- h = self->size.top; /* just the titlebar */ ---- } ---- ---- XMoveResizeWindow(obt_display, self->window, x, y, w, h); ---- XFlush(obt_display); ---- ---- if (time == 0) ---- frame_end_iconify_animation(self); ---- ---- return time > 0; /* repeat until we're out of time */ ----} ---- ----void frame_end_iconify_animation(ObFrame *self) ----{ ---- /* see if there is an animation going */ ---- if (self->iconify_animation_going == 0) return; ---- ---- if (!self->visible) ---- XUnmapWindow(obt_display, self->window); ---- else { ---- /* Send a ConfigureNotify when the animation is done, this fixes ---- KDE's pager showing the window in the wrong place. since the ---- window is mapped at a different location and is then moved, we ---- need to send the synthetic configurenotify, since apps may have ---- read the position when the client mapped, apparently. */ ---- client_reconfigure(self->client, TRUE); ---- } ---- ---- /* we're not animating any more ! */ ---- self->iconify_animation_going = 0; ---- ---- XMoveResizeWindow(obt_display, self->window, ---- self->area.x, self->area.y, ---- self->area.width, self->area.height); ---- /* we delay re-rendering until after we're done animating */ ---- framerender_frame(self); ---- XFlush(obt_display); ----} ---- ----void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying) ----{ ---- gulong time; ---- gboolean new_anim = FALSE; ---- gboolean set_end = TRUE; ---- GTimeVal now; ---- ---- /* if there is no titlebar, just don't animate for now ---- XXX it would be nice tho.. */ ---- if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) ---- return; ---- ---- /* get the current time */ ---- g_get_current_time(&now); ---- ---- /* get how long until the end */ ---- time = FRAME_ANIMATE_ICONIFY_TIME; ---- if (self->iconify_animation_going) { ---- if (!!iconifying != (self->iconify_animation_going > 0)) { ---- /* animation was already going on in the opposite direction */ ---- time = time - frame_animate_iconify_time_left(self, &now); ---- } else ---- /* animation was already going in the same direction */ ---- set_end = FALSE; ---- } else ---- new_anim = TRUE; ---- self->iconify_animation_going = iconifying ? 1 : -1; ---- ---- /* set the ending time */ ---- if (set_end) { ---- self->iconify_animation_end.tv_sec = now.tv_sec; ---- self->iconify_animation_end.tv_usec = now.tv_usec; ---- g_time_val_add(&self->iconify_animation_end, time); ---- } ---- ---- if (new_anim) { ---- obt_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify, ---- self, FALSE); ---- obt_main_loop_timeout_add(ob_main_loop, ---- FRAME_ANIMATE_ICONIFY_STEP_TIME, ---- frame_animate_iconify, self, ---- g_direct_equal, NULL); ---- ---- /* do the first step */ ---- frame_animate_iconify(self); ---- ---- /* show it during the animation even if it is not "visible" */ ---- if (!self->visible) ---- XMapWindow(obt_display, self->window); ---- } ----} diff --cc openbox/frame.h index fd5adf74,fd5adf74,fd5adf74,fd5adf74..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/frame.h +++ /dev/null @@@@@ -1,255 -1,255 -1,255 -1,255 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- frame.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __frame_h ----#define __frame_h ---- ----#include "geom.h" ----#include "render/render.h" ---- ----typedef struct _ObFrame ObFrame; ---- ----struct _ObClient; ---- ----typedef void (*ObFrameIconifyAnimateFunc)(gpointer data); ---- ----typedef enum { ---- OB_FRAME_CONTEXT_NONE, ---- OB_FRAME_CONTEXT_DESKTOP, ---- OB_FRAME_CONTEXT_ROOT, ---- OB_FRAME_CONTEXT_CLIENT, ---- OB_FRAME_CONTEXT_TITLEBAR, ---- OB_FRAME_CONTEXT_FRAME, ---- OB_FRAME_CONTEXT_BLCORNER, ---- OB_FRAME_CONTEXT_BRCORNER, ---- OB_FRAME_CONTEXT_TLCORNER, ---- OB_FRAME_CONTEXT_TRCORNER, ---- OB_FRAME_CONTEXT_TOP, ---- OB_FRAME_CONTEXT_BOTTOM, ---- OB_FRAME_CONTEXT_LEFT, ---- OB_FRAME_CONTEXT_RIGHT, ---- OB_FRAME_CONTEXT_MAXIMIZE, ---- OB_FRAME_CONTEXT_ALLDESKTOPS, ---- OB_FRAME_CONTEXT_SHADE, ---- OB_FRAME_CONTEXT_ICONIFY, ---- OB_FRAME_CONTEXT_ICON, ---- OB_FRAME_CONTEXT_CLOSE, ---- /*! This is a special context, which occurs while dragging a window in ---- a move/resize */ ---- OB_FRAME_CONTEXT_MOVE_RESIZE, ---- OB_FRAME_NUM_CONTEXTS ----} ObFrameContext; ---- ----#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \ ---- co == OB_FRAME_CONTEXT_FRAME : FALSE) ----#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \ ---- co == OB_FRAME_CONTEXT_DESKTOP : \ ---- co == OB_FRAME_CONTEXT_CLIENT) ---- ----/*! The decorations the client window wants to be displayed on it */ ----typedef enum { ---- OB_FRAME_DECOR_TITLEBAR = 1 << 0, /*!< Display a titlebar */ ---- OB_FRAME_DECOR_HANDLE = 1 << 1, /*!< Display a handle (bottom) */ ---- OB_FRAME_DECOR_GRIPS = 1 << 2, /*!< Display grips in the handle */ ---- OB_FRAME_DECOR_BORDER = 1 << 3, /*!< Display a border */ ---- OB_FRAME_DECOR_ICON = 1 << 4, /*!< Display the window's icon */ ---- OB_FRAME_DECOR_ICONIFY = 1 << 5, /*!< Display an iconify button */ ---- OB_FRAME_DECOR_MAXIMIZE = 1 << 6, /*!< Display a maximize button */ ---- /*! Display a button to toggle the window's placement on ---- all desktops */ ---- OB_FRAME_DECOR_ALLDESKTOPS = 1 << 7, ---- OB_FRAME_DECOR_SHADE = 1 << 8, /*!< Display a shade button */ ---- OB_FRAME_DECOR_CLOSE = 1 << 9 /*!< Display a close button */ ----} ObFrameDecorations; ---- ----struct _ObFrame ----{ ---- struct _ObClient *client; ---- ---- Window window; ---- ---- Strut size; ---- Rect area; ---- gboolean visible; ---- ---- guint functions; ---- guint decorations; ---- ---- Window title; ---- Window label; ---- Window max; ---- Window close; ---- Window desk; ---- Window shade; ---- Window icon; ---- Window iconify; ---- Window handle; ---- Window lgrip; ---- Window rgrip; ---- ---- /* These are borders of the frame and its elements */ ---- Window titleleft; ---- Window titletop; ---- Window titletopleft; ---- Window titletopright; ---- Window titleright; ---- Window titlebottom; ---- Window left; ---- Window right; ---- Window handleleft; ---- Window handletop; ---- Window handleright; ---- Window handlebottom; ---- Window lgriptop; ---- Window lgripleft; ---- Window lgripbottom; ---- Window rgriptop; ---- Window rgripright; ---- Window rgripbottom; ---- Window innerleft; /*!< For drawing the inner client border */ ---- Window innertop; /*!< For drawing the inner client border */ ---- Window innerright; /*!< For drawing the inner client border */ ---- Window innerbottom; /*!< For drawing the inner client border */ ---- Window innerblb; ---- Window innerbll; ---- Window innerbrb; ---- Window innerbrr; ---- Window backback; /*!< A colored window shown while resizing */ ---- Window backfront; /*!< An undrawn-in window, to prevent flashing on ---- unmap */ ---- ---- /* These are resize handles inside the titlebar */ ---- Window topresize; ---- Window tltresize; ---- Window tllresize; ---- Window trtresize; ---- Window trrresize; ---- ---- Colormap colormap; ---- ---- gint icon_on; /* if the window icon button is on */ ---- gint label_on; /* if the window title is on */ ---- gint iconify_on; /* if the window iconify button is on */ ---- gint desk_on; /* if the window all-desktops button is on */ ---- gint shade_on; /* if the window shade button is on */ ---- gint max_on; /* if the window maximize button is on */ ---- gint close_on; /* if the window close button is on */ ---- ---- gint width; /* width of the titlebar and handle */ ---- gint label_width; /* width of the label in the titlebar */ ---- gint icon_x; /* x-position of the window icon button */ ---- gint label_x; /* x-position of the window title */ ---- gint iconify_x; /* x-position of the window iconify button */ ---- gint desk_x; /* x-position of the window all-desktops button */ ---- gint shade_x; /* x-position of the window shade button */ ---- gint max_x; /* x-position of the window maximize button */ ---- gint close_x; /* x-position of the window close button */ ---- gint bwidth; /* border width */ ---- gint cbwidth_l; /* client border width */ ---- gint cbwidth_t; /* client border width */ ---- gint cbwidth_r; /* client border width */ ---- gint cbwidth_b; /* client border width */ ---- gboolean max_horz; /* when maxed some decorations are hidden */ ---- gboolean max_vert; /* when maxed some decorations are hidden */ ---- gboolean shaded; /* decorations adjust when shaded */ ---- ---- /* the leftmost and rightmost elements in the titlebar */ ---- ObFrameContext leftmost; ---- ObFrameContext rightmost; ---- ---- gboolean max_press; ---- gboolean close_press; ---- gboolean desk_press; ---- gboolean shade_press; ---- gboolean iconify_press; ---- gboolean max_hover; ---- gboolean close_hover; ---- gboolean desk_hover; ---- gboolean shade_hover; ---- gboolean iconify_hover; ---- ---- gboolean focused; ---- gboolean need_render; ---- ---- gboolean flashing; ---- gboolean flash_on; ---- GTimeVal flash_end; ---- ---- /*! Is the frame currently in an animation for iconify or restore. ---- 0 means that it is not animating. > 0 means it is animating an iconify. ---- < 0 means it is animating a restore. ---- */ ---- gint iconify_animation_going; ---- GTimeVal iconify_animation_end; ----}; ---- ----ObFrame *frame_new(struct _ObClient *c); ----void frame_free(ObFrame *self); ---- ----void frame_show(ObFrame *self); ----void frame_hide(ObFrame *self); ----void frame_adjust_theme(ObFrame *self); ----void frame_adjust_shape(ObFrame *self); ----void frame_adjust_area(ObFrame *self, gboolean moved, ---- gboolean resized, gboolean fake); ----void frame_adjust_client_area(ObFrame *self); ----void frame_adjust_state(ObFrame *self); ----void frame_adjust_focus(ObFrame *self, gboolean hilite); ----void frame_adjust_title(ObFrame *self); ----void frame_adjust_icon(ObFrame *self); ----void frame_grab_client(ObFrame *self); ----void frame_release_client(ObFrame *self); ---- ----ObFrameContext frame_context_from_string(const gchar *name); ---- ----ObFrameContext frame_context(struct _ObClient *self, Window win, ---- gint x, gint y); ---- ----/*! Applies gravity to the client's position to find where the frame should ---- be positioned. ---- @return The proper coordinates for the frame, based on the client. ----*/ ----void frame_client_gravity(ObFrame *self, gint *x, gint *y); ---- ----/*! Reversly applies gravity to the frame's position to find where the client ---- should be positioned. ---- @return The proper coordinates for the client, based on the frame. ----*/ ----void frame_frame_gravity(ObFrame *self, gint *x, gint *y); ---- ----/*! Convert a rectangle in client coordinates/sizes to what it would be ---- for the frame, given its current decorations sizes */ ----void frame_rect_to_frame(ObFrame *self, Rect *r); ---- ----/*! Convert a rectangle in frame coordinates/sizes to what it would be for the ---- client, given its current decorations sizes */ ----void frame_rect_to_client(ObFrame *self, Rect *r); ---- ----void frame_flash_start(ObFrame *self); ----void frame_flash_stop(ObFrame *self); ---- ----/*! Start an animation for iconifying or restoring a frame. The callback ---- will be called when the animation finishes. But if another animation is ---- started in the meantime, the callback will never get called. */ ----void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying); ----void frame_end_iconify_animation(ObFrame *self); ---- ----#define frame_iconify_animating(f) (f->iconify_animation_going != 0) ---- ----#endif diff --cc openbox/framerender.c index bf71d2c3,bf71d2c3,bf71d2c3,bf71d2c3..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/framerender.c +++ /dev/null @@@@@ -1,408 -1,408 -1,408 -1,408 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- framerender.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "frame.h" ----#include "openbox.h" ----#include "screen.h" ----#include "client.h" ----#include "framerender.h" ----#include "render/theme.h" ---- ----static void framerender_label(ObFrame *self, RrAppearance *a); ----static void framerender_icon(ObFrame *self, RrAppearance *a); ----static void framerender_max(ObFrame *self, RrAppearance *a); ----static void framerender_iconify(ObFrame *self, RrAppearance *a); ----static void framerender_desk(ObFrame *self, RrAppearance *a); ----static void framerender_shade(ObFrame *self, RrAppearance *a); ----static void framerender_close(ObFrame *self, RrAppearance *a); ---- ----void framerender_frame(ObFrame *self) ----{ ---- if (frame_iconify_animating(self)) ---- return; /* delay redrawing until the animation is done */ ---- if (!self->need_render) ---- return; ---- if (!self->visible) ---- return; ---- self->need_render = FALSE; ---- ---- { ---- gulong px; ---- ---- px = (self->focused ? ---- RrColorPixel(ob_rr_theme->cb_focused_color) : ---- RrColorPixel(ob_rr_theme->cb_unfocused_color)); ---- ---- XSetWindowBackground(obt_display, self->backback, px); ---- XClearWindow(obt_display, self->backback); ---- XSetWindowBackground(obt_display, self->innerleft, px); ---- XClearWindow(obt_display, self->innerleft); ---- XSetWindowBackground(obt_display, self->innertop, px); ---- XClearWindow(obt_display, self->innertop); ---- XSetWindowBackground(obt_display, self->innerright, px); ---- XClearWindow(obt_display, self->innerright); ---- XSetWindowBackground(obt_display, self->innerbottom, px); ---- XClearWindow(obt_display, self->innerbottom); ---- XSetWindowBackground(obt_display, self->innerbll, px); ---- XClearWindow(obt_display, self->innerbll); ---- XSetWindowBackground(obt_display, self->innerbrr, px); ---- XClearWindow(obt_display, self->innerbrr); ---- XSetWindowBackground(obt_display, self->innerblb, px); ---- XClearWindow(obt_display, self->innerblb); ---- XSetWindowBackground(obt_display, self->innerbrb, px); ---- XClearWindow(obt_display, self->innerbrb); ---- ---- px = (self->focused ? ---- RrColorPixel(ob_rr_theme->frame_focused_border_color) : ---- RrColorPixel(ob_rr_theme->frame_unfocused_border_color)); ---- ---- XSetWindowBackground(obt_display, self->left, px); ---- XClearWindow(obt_display, self->left); ---- XSetWindowBackground(obt_display, self->right, px); ---- XClearWindow(obt_display, self->right); ---- ---- XSetWindowBackground(obt_display, self->titleleft, px); ---- XClearWindow(obt_display, self->titleleft); ---- XSetWindowBackground(obt_display, self->titletop, px); ---- XClearWindow(obt_display, self->titletop); ---- XSetWindowBackground(obt_display, self->titletopleft, px); ---- XClearWindow(obt_display, self->titletopleft); ---- XSetWindowBackground(obt_display, self->titletopright, px); ---- XClearWindow(obt_display, self->titletopright); ---- XSetWindowBackground(obt_display, self->titleright, px); ---- XClearWindow(obt_display, self->titleright); ---- ---- XSetWindowBackground(obt_display, self->handleleft, px); ---- XClearWindow(obt_display, self->handleleft); ---- XSetWindowBackground(obt_display, self->handletop, px); ---- XClearWindow(obt_display, self->handletop); ---- XSetWindowBackground(obt_display, self->handleright, px); ---- XClearWindow(obt_display, self->handleright); ---- XSetWindowBackground(obt_display, self->handlebottom, px); ---- XClearWindow(obt_display, self->handlebottom); ---- ---- XSetWindowBackground(obt_display, self->lgripleft, px); ---- XClearWindow(obt_display, self->lgripleft); ---- XSetWindowBackground(obt_display, self->lgriptop, px); ---- XClearWindow(obt_display, self->lgriptop); ---- XSetWindowBackground(obt_display, self->lgripbottom, px); ---- XClearWindow(obt_display, self->lgripbottom); ---- ---- XSetWindowBackground(obt_display, self->rgripright, px); ---- XClearWindow(obt_display, self->rgripright); ---- XSetWindowBackground(obt_display, self->rgriptop, px); ---- XClearWindow(obt_display, self->rgriptop); ---- XSetWindowBackground(obt_display, self->rgripbottom, px); ---- XClearWindow(obt_display, self->rgripbottom); ---- ---- /* don't use the separator color for shaded windows */ ---- if (!self->client->shaded) ---- px = (self->focused ? ---- RrColorPixel(ob_rr_theme->title_separator_focused_color) : ---- RrColorPixel(ob_rr_theme->title_separator_unfocused_color)); ---- ---- XSetWindowBackground(obt_display, self->titlebottom, px); ---- XClearWindow(obt_display, self->titlebottom); ---- } ---- ---- if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { ---- RrAppearance *t, *l, *m, *n, *i, *d, *s, *c, *clear; ---- if (self->focused) { ---- t = ob_rr_theme->a_focused_title; ---- l = ob_rr_theme->a_focused_label; ---- m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? ---- ob_rr_theme->a_disabled_focused_max : ---- (self->client->max_vert || self->client->max_horz ? ---- (self->max_press ? ---- ob_rr_theme->a_toggled_focused_pressed_max : ---- (self->max_hover ? ---- ob_rr_theme->a_toggled_hover_focused_max : ---- ob_rr_theme->a_toggled_focused_unpressed_max)) : ---- (self->max_press ? ---- ob_rr_theme->a_focused_pressed_max : ---- (self->max_hover ? ---- ob_rr_theme->a_hover_focused_max : ---- ob_rr_theme->a_focused_unpressed_max)))); ---- n = ob_rr_theme->a_icon; ---- i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? ---- ob_rr_theme->a_disabled_focused_iconify : ---- (self->iconify_press ? ---- ob_rr_theme->a_focused_pressed_iconify : ---- (self->iconify_hover ? ---- ob_rr_theme->a_hover_focused_iconify : ---- ob_rr_theme->a_focused_unpressed_iconify))); ---- d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ---- ob_rr_theme->a_disabled_focused_desk : ---- (self->client->desktop == DESKTOP_ALL ? ---- (self->desk_press ? ---- ob_rr_theme->a_toggled_focused_pressed_desk : ---- (self->desk_hover ? ---- ob_rr_theme->a_toggled_hover_focused_desk : ---- ob_rr_theme->a_toggled_focused_unpressed_desk)) : ---- (self->desk_press ? ---- ob_rr_theme->a_focused_pressed_desk : ---- (self->desk_hover ? ---- ob_rr_theme->a_hover_focused_desk : ---- ob_rr_theme->a_focused_unpressed_desk)))); ---- s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ---- ob_rr_theme->a_disabled_focused_shade : ---- (self->client->shaded ? ---- (self->shade_press ? ---- ob_rr_theme->a_toggled_focused_pressed_shade : ---- (self->shade_hover ? ---- ob_rr_theme->a_toggled_hover_focused_shade : ---- ob_rr_theme->a_toggled_focused_unpressed_shade)) : ---- (self->shade_press ? ---- ob_rr_theme->a_focused_pressed_shade : ---- (self->shade_hover ? ---- ob_rr_theme->a_hover_focused_shade : ---- ob_rr_theme->a_focused_unpressed_shade)))); ---- c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ---- ob_rr_theme->a_disabled_focused_close : ---- (self->close_press ? ---- ob_rr_theme->a_focused_pressed_close : ---- (self->close_hover ? ---- ob_rr_theme->a_hover_focused_close : ---- ob_rr_theme->a_focused_unpressed_close))); ---- } else { ---- t = ob_rr_theme->a_unfocused_title; ---- l = ob_rr_theme->a_unfocused_label; ---- m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? ---- ob_rr_theme->a_disabled_unfocused_max : ---- (self->client->max_vert || self->client->max_horz ? ---- (self->max_press ? ---- ob_rr_theme->a_toggled_unfocused_pressed_max : ---- (self->max_hover ? ---- ob_rr_theme->a_toggled_hover_unfocused_max : ---- ob_rr_theme->a_toggled_unfocused_unpressed_max)) : ---- (self->max_press ? ---- ob_rr_theme->a_unfocused_pressed_max : ---- (self->max_hover ? ---- ob_rr_theme->a_hover_unfocused_max : ---- ob_rr_theme->a_unfocused_unpressed_max)))); ---- n = ob_rr_theme->a_icon; ---- i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? ---- ob_rr_theme->a_disabled_unfocused_iconify : ---- (self->iconify_press ? ---- ob_rr_theme->a_unfocused_pressed_iconify : ---- (self->iconify_hover ? ---- ob_rr_theme->a_hover_unfocused_iconify : ---- ob_rr_theme->a_unfocused_unpressed_iconify))); ---- d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ---- ob_rr_theme->a_disabled_unfocused_desk : ---- (self->client->desktop == DESKTOP_ALL ? ---- (self->desk_press ? ---- ob_rr_theme->a_toggled_unfocused_pressed_desk : ---- (self->desk_hover ? ---- ob_rr_theme->a_toggled_hover_unfocused_desk : ---- ob_rr_theme->a_toggled_unfocused_unpressed_desk)) : ---- (self->desk_press ? ---- ob_rr_theme->a_unfocused_pressed_desk : ---- (self->desk_hover ? ---- ob_rr_theme->a_hover_unfocused_desk : ---- ob_rr_theme->a_unfocused_unpressed_desk)))); ---- s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ---- ob_rr_theme->a_disabled_unfocused_shade : ---- (self->client->shaded ? ---- (self->shade_press ? ---- ob_rr_theme->a_toggled_unfocused_pressed_shade : ---- (self->shade_hover ? ---- ob_rr_theme->a_toggled_hover_unfocused_shade : ---- ob_rr_theme->a_toggled_unfocused_unpressed_shade)) : ---- (self->shade_press ? ---- ob_rr_theme->a_unfocused_pressed_shade : ---- (self->shade_hover ? ---- ob_rr_theme->a_hover_unfocused_shade : ---- ob_rr_theme->a_unfocused_unpressed_shade)))); ---- c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ---- ob_rr_theme->a_disabled_unfocused_close : ---- (self->close_press ? ---- ob_rr_theme->a_unfocused_pressed_close : ---- (self->close_hover ? ---- ob_rr_theme->a_hover_unfocused_close : ---- ob_rr_theme->a_unfocused_unpressed_close))); ---- } ---- clear = ob_rr_theme->a_clear; ---- ---- RrPaint(t, self->title, self->width, ob_rr_theme->title_height); ---- ---- clear->surface.parent = t; ---- clear->surface.parenty = 0; ---- ---- clear->surface.parentx = ob_rr_theme->grip_width; ---- ---- RrPaint(clear, self->topresize, ---- self->width - ob_rr_theme->grip_width * 2, ---- ob_rr_theme->paddingy + 1); ---- ---- clear->surface.parentx = 0; ---- ---- if (ob_rr_theme->grip_width > 0) ---- RrPaint(clear, self->tltresize, ---- ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); ---- if (ob_rr_theme->title_height > 0) ---- RrPaint(clear, self->tllresize, ---- ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); ---- ---- clear->surface.parentx = self->width - ob_rr_theme->grip_width; ---- ---- if (ob_rr_theme->grip_width > 0) ---- RrPaint(clear, self->trtresize, ---- ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); ---- ---- clear->surface.parentx = self->width - (ob_rr_theme->paddingx + 1); ---- ---- if (ob_rr_theme->title_height > 0) ---- RrPaint(clear, self->trrresize, ---- ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); ---- ---- /* set parents for any parent relative guys */ ---- l->surface.parent = t; ---- l->surface.parentx = self->label_x; ---- l->surface.parenty = ob_rr_theme->paddingy; ---- ---- m->surface.parent = t; ---- m->surface.parentx = self->max_x; ---- m->surface.parenty = ob_rr_theme->paddingy + 1; ---- ---- n->surface.parent = t; ---- n->surface.parentx = self->icon_x; ---- n->surface.parenty = ob_rr_theme->paddingy; ---- ---- i->surface.parent = t; ---- i->surface.parentx = self->iconify_x; ---- i->surface.parenty = ob_rr_theme->paddingy + 1; ---- ---- d->surface.parent = t; ---- d->surface.parentx = self->desk_x; ---- d->surface.parenty = ob_rr_theme->paddingy + 1; ---- ---- s->surface.parent = t; ---- s->surface.parentx = self->shade_x; ---- s->surface.parenty = ob_rr_theme->paddingy + 1; ---- ---- c->surface.parent = t; ---- c->surface.parentx = self->close_x; ---- c->surface.parenty = ob_rr_theme->paddingy + 1; ---- ---- framerender_label(self, l); ---- framerender_max(self, m); ---- framerender_icon(self, n); ---- framerender_iconify(self, i); ---- framerender_desk(self, d); ---- framerender_shade(self, s); ---- framerender_close(self, c); ---- } ---- ---- if (self->decorations & OB_FRAME_DECOR_HANDLE && ---- ob_rr_theme->handle_height > 0) ---- { ---- RrAppearance *h, *g; ---- ---- h = (self->focused ? ---- ob_rr_theme->a_focused_handle : ob_rr_theme->a_unfocused_handle); ---- ---- RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height); ---- ---- if (self->decorations & OB_FRAME_DECOR_GRIPS) { ---- g = (self->focused ? ---- ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip); ---- ---- if (g->surface.grad == RR_SURFACE_PARENTREL) ---- g->surface.parent = h; ---- ---- g->surface.parentx = 0; ---- g->surface.parenty = 0; ---- ---- RrPaint(g, self->lgrip, ---- ob_rr_theme->grip_width, ob_rr_theme->handle_height); ---- ---- g->surface.parentx = self->width - ob_rr_theme->grip_width; ---- g->surface.parenty = 0; ---- ---- RrPaint(g, self->rgrip, ---- ob_rr_theme->grip_width, ob_rr_theme->handle_height); ---- } ---- } ---- ---- XFlush(obt_display); ----} ---- ----static void framerender_label(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->label_on) return; ---- /* set the texture's text! */ ---- a->texture[0].data.text.string = self->client->title; ---- RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height); ----} ---- ----static void framerender_icon(ObFrame *self, RrAppearance *a) ----{ ---- RrImage *icon; ---- ---- if (!self->icon_on) return; ---- ---- icon = client_icon(self->client); ---- ---- if (icon) { ---- RrAppearanceClearTextures(a); ---- a->texture[0].type = RR_TEXTURE_IMAGE; ---- a->texture[0].data.image.alpha = 0xff; ---- a->texture[0].data.image.image = icon; ---- } else { ---- RrAppearanceClearTextures(a); ---- a->texture[0].type = RR_TEXTURE_NONE; ---- } ---- ---- RrPaint(a, self->icon, ---- ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); ----} ---- ----static void framerender_max(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->max_on) return; ---- RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size); ----} ---- ----static void framerender_iconify(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->iconify_on) return; ---- RrPaint(a, self->iconify, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ----} ---- ----static void framerender_desk(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->desk_on) return; ---- RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size); ----} ---- ----static void framerender_shade(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->shade_on) return; ---- RrPaint(a, self->shade, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ----} ---- ----static void framerender_close(ObFrame *self, RrAppearance *a) ----{ ---- if (!self->close_on) return; ---- RrPaint(a, self->close, ---- ob_rr_theme->button_size, ob_rr_theme->button_size); ----} diff --cc openbox/framerender.h index 162fa578,162fa578,162fa578,162fa578..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/framerender.h +++ /dev/null @@@@@ -1,26 -1,26 -1,26 -1,26 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- framerender.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __framerender_h ----#define __framerender_h ---- ----struct _ObFrame; ---- ----void framerender_frame(struct _ObFrame *self); ---- ----#endif diff --cc openbox/geom.h index 7c5ee32e,7c5ee32e,7c5ee32e,7c5ee32e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/geom.h +++ /dev/null @@@@@ -1,165 -1,165 -1,165 -1,165 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- geom.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __geom_h ----#define __geom_h ---- ----#include ---- ----typedef struct _GravityCoord { ---- gint pos; ---- gboolean center; ---- gboolean opposite; ----} GravityCoord; ---- ----typedef struct _GravityPoint { ---- GravityCoord x; ---- GravityCoord y; ----} GravityPoint; ---- ----#define GRAVITY_COORD_SET(c, p, cen, opp) \ ---- (c).pos = (p), (c).center = (cen), (c).opposite = (opp) ---- ---- ----typedef struct _Point { ---- int x; ---- int y; ----} Point; ---- ----#define POINT_SET(pt, nx, ny) (pt).x = (nx), (pt).y = (ny) ----#define POINT_EQUAL(p1, p2) ((p1).x == (p2).x && (p1).y == (p2).y) ---- ----typedef struct _Size { ---- int width; ---- int height; ----} Size; ---- ----#define SIZE_SET(sz, w, h) (sz).width = (w), (sz).height = (h) ---- ----typedef struct _Rect { ---- int x; ---- int y; ---- int width; ---- int height; ----} Rect; ---- ----#define RECT_LEFT(r) ((r).x) ----#define RECT_TOP(r) ((r).y) ----#define RECT_RIGHT(r) ((r).x + (r).width - 1) ----#define RECT_BOTTOM(r) ((r).y + (r).height - 1) ---- ----#define RECT_SET_POINT(r, nx, ny) \ ---- (r).x = (nx), (r).y = (ny) ----#define RECT_SET_SIZE(r, w, h) \ ---- (r).width = (w), (r).height = (h) ----#define RECT_SET(r, nx, ny, w, h) \ ---- (r).x = (nx), (r).y = (ny), (r).width = (w), (r).height = (h) ---- ----#define RECT_EQUAL(r1, r2) ((r1).x == (r2).x && (r1).y == (r2).y && \ ---- (r1).width == (r2).width && \ ---- (r1).height == (r2).height) ----#define RECT_EQUAL_DIMS(r, x, y, w, h) \ ---- ((r).x == (x) && (r).y == (y) && (r).width == (w) && (r).height == (h)) ---- ----#define RECT_TO_DIMS(r, x, y, w, h) \ ---- (x) = (r).x, (y) = (r).y, (w) = (r).width, (h) = (r).height ---- ----#define RECT_CONTAINS(r, px, py) \ ---- ((px) >= (r).x && (px) < (r).x + (r).width && \ ---- (py) >= (r).y && (py) < (r).y + (r).height) ----#define RECT_CONTAINS_RECT(r, o) \ ---- ((o).x >= (r).x && (o).x + (o).width <= (r).x + (r).width && \ ---- (o).y >= (r).y && (o).y + (o).height <= (r).y + (r).height) ---- ----/* Returns true if Rect r and o intersect */ ----#define RECT_INTERSECTS_RECT(r, o) \ ---- ((o).x < (r).x + (r).width && (o).x + (o).width > (r).x && \ ---- (o).y < (r).y + (r).height && (o).y + (o).height > (r).y) ---- ----/* Sets Rect r to be the intersection of Rect a and b. */ ----#define RECT_SET_INTERSECTION(r, a, b) \ ---- ((r).x = MAX((a).x, (b).x), \ ---- (r).y = MAX((a).y, (b).y), \ ---- (r).width = MIN((a).x + (a).width - 1, \ ---- (b).x + (b).width - 1) - (r).x + 1, \ ---- (r).height = MIN((a).y + (a).height - 1, \ ---- (b).y + (b).height - 1) - (r).y + 1) ---- ----typedef struct _Strut { ---- int left; ---- int top; ---- int right; ---- int bottom; ----} Strut; ---- ----typedef struct _StrutPartial { ---- int left; ---- int top; ---- int right; ---- int bottom; ---- ---- int left_start, left_end; ---- int top_start, top_end; ---- int right_start, right_end; ---- int bottom_start, bottom_end; ----} StrutPartial; ---- ----#define STRUT_SET(s, l, t, r, b) \ ---- (s).left = (l), (s).top = (t), (s).right = (r), (s).bottom = (b) ---- ----#define STRUT_PARTIAL_SET(s, l, t, r, b, ls, le, ts, te, rs, re, bs, be) \ ---- (s).left = (l), (s).top = (t), (s).right = (r), (s).bottom = (b), \ ---- (s).left_start = (ls), (s).left_end = (le), \ ---- (s).top_start = (ts), (s).top_end = (te), \ ---- (s).right_start = (rs), (s).right_end = (re), \ ---- (s).bottom_start = (bs), (s).bottom_end = (be) ---- ----#define STRUT_ADD(s1, s2) \ ---- (s1).left = MAX((s1).left, (s2).left), \ ---- (s1).right = MAX((s1).right, (s2).right), \ ---- (s1).top = MAX((s1).top, (s2).top), \ ---- (s1).bottom = MAX((s1).bottom, (s2).bottom) ---- ----#define STRUT_EXISTS(s1) \ ---- ((s1).left || (s1).top || (s1).right || (s1).bottom) ---- ----#define STRUT_EQUAL(s1, s2) \ ---- ((s1).left == (s2).left && \ ---- (s1).top == (s2).top && \ ---- (s1).right == (s2).right && \ ---- (s1).bottom == (s2).bottom) ---- ----#define PARTIAL_STRUT_EQUAL(s1, s2) \ ---- ((s1).left == (s2).left && \ ---- (s1).top == (s2).top && \ ---- (s1).right == (s2).right && \ ---- (s1).bottom == (s2).bottom && \ ---- (s1).left_start == (s2).left_start && \ ---- (s1).left_end == (s2).left_end && \ ---- (s1).top_start == (s2).top_start && \ ---- (s1).top_end == (s2).top_end && \ ---- (s1).right_start == (s2).right_start && \ ---- (s1).right_end == (s2).right_end && \ ---- (s1).bottom_start == (s2).bottom_start && \ ---- (s1).bottom_end == (s2).bottom_end) ---- ----#define RANGES_INTERSECT(r1x, r1w, r2x, r2w) \ ---- (r1x < r2x + r2w && r1x + r1w > r2x) ---- ----#endif diff --cc openbox/grab.c index e797e44c,e797e44c,e797e44c,e797e44c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/grab.c +++ /dev/null @@@@@ -1,228 -1,228 -1,228 -1,228 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grab.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "grab.h" ----#include "openbox.h" ----#include "event.h" ----#include "screen.h" ----#include "debug.h" ----#include "obt/display.h" ----#include "obt/keyboard.h" ---- ----#include ----#include ---- ----#define GRAB_PTR_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask) ----#define GRAB_KEY_MASK (KeyPressMask | KeyReleaseMask) ---- ----#define MASK_LIST_SIZE 8 ---- ----/*! A list of all possible combinations of keyboard lock masks */ ----static guint mask_list[MASK_LIST_SIZE]; ----static guint kgrabs = 0; ----static guint pgrabs = 0; ----/*! The time at which the last grab was made */ ----static Time grab_time = CurrentTime; ----static gint passive_count = 0; ---- ----static Time ungrab_time(void) ----{ ---- Time t = event_curtime; ---- if (grab_time == CurrentTime || ---- !(t == CurrentTime || event_time_after(t, grab_time))) ---- /* When the time moves backward on the server, then we can't use ---- the grab time because that will be in the future. So instead we ---- have to use CurrentTime. ---- ---- "XUngrabPointer does not release the pointer if the specified time ---- is earlier than the last-pointer-grab time or is later than the ---- current X server time." ---- */ ---- t = CurrentTime; /*grab_time;*/ ---- return t; ----} ---- ----gboolean grab_on_keyboard(void) ----{ ---- return kgrabs > 0; ----} ---- ----gboolean grab_on_pointer(void) ----{ ---- return pgrabs > 0; ----} ---- ----gboolean grab_keyboard_full(gboolean grab) ----{ ---- gboolean ret = FALSE; ---- ---- if (grab) { ---- if (kgrabs++ == 0) { ---- ret = XGrabKeyboard(obt_display, obt_root(ob_screen), ---- False, GrabModeAsync, GrabModeAsync, ---- event_curtime) == Success; ---- if (!ret) ---- --kgrabs; ---- else { ---- passive_count = 0; ---- grab_time = event_curtime; ---- } ---- } else ---- ret = TRUE; ---- } else if (kgrabs > 0) { ---- if (--kgrabs == 0) { ---- XUngrabKeyboard(obt_display, ungrab_time()); ---- } ---- ret = TRUE; ---- } ---- ---- return ret; ----} ---- ----gboolean grab_pointer_full(gboolean grab, gboolean owner_events, ---- gboolean confine, ObCursor cur) ----{ ---- gboolean ret = FALSE; ---- ---- if (grab) { ---- if (pgrabs++ == 0) { ---- ret = XGrabPointer(obt_display, screen_support_win, owner_events, ---- GRAB_PTR_MASK, ---- GrabModeAsync, GrabModeAsync, ---- (confine ? obt_root(ob_screen) : None), ---- ob_cursor(cur), event_curtime) == Success; ---- if (!ret) ---- --pgrabs; ---- else ---- grab_time = event_curtime; ---- } else ---- ret = TRUE; ---- } else if (pgrabs > 0) { ---- if (--pgrabs == 0) { ---- XUngrabPointer(obt_display, ungrab_time()); ---- } ---- ret = TRUE; ---- } ---- return ret; ----} ---- ----gint grab_server(gboolean grab) ----{ ---- static guint sgrabs = 0; ---- if (grab) { ---- if (sgrabs++ == 0) { ---- XGrabServer(obt_display); ---- XSync(obt_display, FALSE); ---- } ---- } else if (sgrabs > 0) { ---- if (--sgrabs == 0) { ---- XUngrabServer(obt_display); ---- XFlush(obt_display); ---- } ---- } ---- return sgrabs; ----} ---- ----void grab_startup(gboolean reconfig) ----{ ---- guint i = 0; ---- guint num, caps, scroll; ---- ---- num = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_NUMLOCK); ---- caps = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CAPSLOCK); ---- scroll = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SCROLLLOCK); ---- ---- mask_list[i++] = 0; ---- mask_list[i++] = num; ---- mask_list[i++] = caps; ---- mask_list[i++] = scroll; ---- mask_list[i++] = num | caps; ---- mask_list[i++] = num | scroll; ---- mask_list[i++] = caps | scroll; ---- mask_list[i++] = num | caps | scroll; ---- g_assert(i == MASK_LIST_SIZE); ----} ---- ----void grab_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- while (ungrab_keyboard()); ---- while (ungrab_pointer()); ---- while (grab_server(FALSE)); ----} ---- ----void grab_button_full(guint button, guint state, Window win, guint mask, ---- gint pointer_mode, ObCursor cur) ----{ ---- guint i; ---- ---- /* can get BadAccess from these */ ---- obt_display_ignore_errors(TRUE); ---- for (i = 0; i < MASK_LIST_SIZE; ++i) ---- XGrabButton(obt_display, button, state | mask_list[i], win, False, ---- mask, pointer_mode, GrabModeAsync, None, ob_cursor(cur)); ---- obt_display_ignore_errors(FALSE); ---- if (obt_display_error_occured) ---- ob_debug("Failed to grab button %d modifiers %d", button, state); ----} ---- ----void ungrab_button(guint button, guint state, Window win) ----{ ---- guint i; ---- ---- for (i = 0; i < MASK_LIST_SIZE; ++i) ---- XUngrabButton(obt_display, button, state | mask_list[i], win); ----} ---- ----void grab_key(guint keycode, guint state, Window win, gint keyboard_mode) ----{ ---- guint i; ---- ---- /* can get BadAccess' from these */ ---- obt_display_ignore_errors(TRUE); ---- for (i = 0; i < MASK_LIST_SIZE; ++i) ---- XGrabKey(obt_display, keycode, state | mask_list[i], win, FALSE, ---- GrabModeAsync, keyboard_mode); ---- obt_display_ignore_errors(FALSE); ---- if (obt_display_error_occured) ---- ob_debug("Failed to grab keycode %d modifiers %d", keycode, state); ----} ---- ----void ungrab_all_keys(Window win) ----{ ---- XUngrabKey(obt_display, AnyKey, AnyModifier, win); ----} ---- ----void grab_key_passive_count(int change) ----{ ---- if (grab_on_keyboard()) return; ---- passive_count += change; ---- if (passive_count < 0) passive_count = 0; ----} ---- ----void ungrab_passive_key(void) ----{ ---- /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/ ---- if (passive_count) { ---- /* kill our passive grab */ ---- XUngrabKeyboard(obt_display, event_curtime); ---- passive_count = 0; ---- } ----} diff --cc openbox/grab.h index 82536373,82536373,82536373,82536373..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/grab.h +++ /dev/null @@@@@ -1,55 -1,55 -1,55 -1,55 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grab.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __grab_h ----#define __grab_h ---- ----#include "misc.h" ---- ----#include ----#include ---- ----void grab_startup(gboolean reconfig); ----void grab_shutdown(gboolean reconfig); ---- ----gboolean grab_keyboard_full(gboolean grab); ----/*! @param confine If true the pointer is confined to the screen */ ----gboolean grab_pointer_full(gboolean grab, gboolean owner_events, ---- gboolean confine, ObCursor cur); ----gint grab_server(gboolean grab); ---- ----#define grab_keyboard() grab_keyboard_full(TRUE) ----#define ungrab_keyboard() grab_keyboard_full(FALSE) ----#define grab_pointer(o,c,u) grab_pointer_full(TRUE, (o), (c), (u)) ----#define ungrab_pointer() grab_pointer_full(FALSE, FALSE, FALSE, OB_CURSOR_NONE) ---- ----gboolean grab_on_keyboard(void); ----gboolean grab_on_pointer(void); ---- ----void grab_button_full(guint button, guint state, Window win, guint mask, ---- gint pointer_mode, ObCursor cursor); ----void ungrab_button(guint button, guint state, Window win); ---- ----void grab_key(guint keycode, guint state, Window win, gint keyboard_mode); ---- ----void ungrab_all_keys(Window win); ---- ----void grab_key_passive_count(int change); ----void ungrab_passive_key(void); ---- ----#endif diff --cc openbox/group.c index c0ba6ed7,c0ba6ed7,c0ba6ed7,c0ba6ed7..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/group.c +++ /dev/null @@@@@ -1,66 -1,66 -1,66 -1,66 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- group.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "group.h" ----#include "client.h" ---- ----static GHashTable *group_map; ---- ----static guint window_hash(Window *w) { return *w; } ----static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } ---- ----void group_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- group_map = g_hash_table_new((GHashFunc)window_hash, ---- (GEqualFunc)window_comp); ----} ---- ----void group_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- g_hash_table_destroy(group_map); ----} ---- ----ObGroup *group_add(Window leader, ObClient *client) ----{ ---- ObGroup *self; ---- ---- self = g_hash_table_lookup(group_map, &leader); ---- if (self == NULL) { ---- self = g_new(ObGroup, 1); ---- self->leader = leader; ---- self->members = NULL; ---- g_hash_table_insert(group_map, &self->leader, self); ---- } ---- ---- self->members = g_slist_append(self->members, client); ---- ---- return self; ----} ---- ----void group_remove(ObGroup *self, ObClient *client) ----{ ---- self->members = g_slist_remove(self->members, client); ---- if (self->members == NULL) { ---- g_hash_table_remove(group_map, &self->leader); ---- g_free(self); ---- } ----} diff --cc openbox/group.h index 86b36b4c,86b36b4c,86b36b4c,86b36b4c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/group.h +++ /dev/null @@@@@ -1,44 -1,44 -1,44 -1,44 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- group.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __group_h ----#define __group_h ---- ----#include ----#include ---- ----typedef struct _ObGroup ObGroup; ---- ----struct _ObClient; ---- ----struct _ObGroup ----{ ---- Window leader; ---- ---- /* list of clients */ ---- GSList *members; ----}; ---- ----void group_startup(gboolean reconfig); ----void group_shutdown(gboolean reconfig); ---- ----ObGroup *group_add(Window leader, struct _ObClient *client); ---- ----void group_remove(ObGroup *self, struct _ObClient *client); ---- ----#endif diff --cc openbox/keyboard.c index 5ac42363,5ac42363,cd16b302,5ac42363..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/keyboard.c +++ /dev/null @@@@@ -1,327 -1,327 -1,327 -1,327 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- keyboard.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "focus.h" ----#include "screen.h" ----#include "frame.h" ----#include "openbox.h" ----#include "event.h" ----#include "grab.h" ----#include "client.h" ----#include "actions.h" ----#include "menuframe.h" ----#include "config.h" ----#include "keytree.h" ----#include "keyboard.h" ----#include "translate.h" ----#include "moveresize.h" ----#include "popup.h" ----#include "gettext.h" ---- ----#include ---- ----KeyBindingTree *keyboard_firstnode = NULL; ----static ObPopup *popup = NULL; ----static KeyBindingTree *curpos; ---- ----static void grab_keys(gboolean grab) ----{ ---- KeyBindingTree *p; ---- ---- ungrab_all_keys(obt_root(ob_screen)); ---- ---- if (grab) { ---- p = curpos ? curpos->first_child : keyboard_firstnode; ---- while (p) { -- - if (p->key) - if (p->key && p->grab) ---- grab_key(p->key, p->state, obt_root(ob_screen), ---- GrabModeSync); ---- p = p->next_sibling; ---- } ---- if (curpos) ---- grab_key(config_keyboard_reset_keycode, ---- config_keyboard_reset_state, ---- obt_root(ob_screen), GrabModeSync); ---- } ----} ---- ----static gboolean chain_timeout(gpointer data) ----{ ---- keyboard_reset_chains(0); ---- return FALSE; /* don't repeat */ ----} ---- ----static void set_curpos(KeyBindingTree *newpos) ----{ ---- if (curpos == newpos) return; ---- ---- grab_keys(FALSE); ---- curpos = newpos; ---- grab_keys(TRUE); ---- ---- if (curpos != NULL) { ---- gchar *text = NULL; ---- GList *it; ---- Rect *a; ---- ---- for (it = curpos->keylist; it; it = g_list_next(it)) { ---- gchar *oldtext = text; ---- if (text == NULL) ---- text = g_strdup(it->data); ---- else ---- text = g_strconcat(text, " - ", it->data, NULL); ---- g_free(oldtext); ---- } ---- ---- a = screen_physical_area_active(); ---- popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10); ---- /* 1 second delay for the popup to show */ ---- popup_delay_show(popup, G_USEC_PER_SEC, text); ---- g_free(text); ---- g_free(a); ---- } else { ---- popup_hide(popup); ---- } ----} ---- ----void keyboard_reset_chains(gint break_chroots) ----{ ---- KeyBindingTree *p; ---- ---- for (p = curpos; p; p = p->parent) { ---- if (p->chroot) { ---- if (break_chroots == 0) break; /* stop here */ ---- if (break_chroots > 0) ---- --break_chroots; ---- } ---- } ---- set_curpos(p); ----} ---- ----void keyboard_unbind_all(void) ----{ ---- tree_destroy(keyboard_firstnode); ---- keyboard_firstnode = NULL; ----} ---- ----void keyboard_chroot(GList *keylist) ----{ ---- /* try do it in the existing tree. if we can't that means it is an empty ---- chroot binding. so add it to the tree then. */ ---- if (!tree_chroot(keyboard_firstnode, keylist)) { ---- KeyBindingTree *tree; -- - if (!(tree = tree_build(keylist))) - if (!(tree = tree_build(keylist, TRUE))) ---- return; ---- tree_chroot(tree, keylist); ---- tree_assimilate(tree); ---- } ----} ---- -- -gboolean keyboard_bind(GList *keylist, ObActionsAct *action) - gboolean keyboard_bind(GList *keylist, ObActionsAct *action, gboolean grab) ----{ ---- KeyBindingTree *tree, *t; ---- gboolean conflict; ---- ---- g_assert(keylist != NULL); ---- g_assert(action != NULL); ---- -- - if (!(tree = tree_build(keylist))) - if (!(tree = tree_build(keylist, grab))) ---- return FALSE; ---- ---- if ((t = tree_find(tree, &conflict)) != NULL) { ---- /* already bound to something, use the existing tree */ ---- tree_destroy(tree); ---- tree = NULL; ---- } else ---- t = tree; ---- ---- if (conflict) { ---- g_message(_("Conflict with key binding in config file")); ---- tree_destroy(tree); ---- return FALSE; ---- } ---- ---- /* find the bottom node */ ---- for (; t->first_child; t = t->first_child); ---- ---- /* set the action */ ---- t->actions = g_slist_append(t->actions, action); ---- /* assimilate this built tree into the main tree. assimilation ---- destroys/uses the tree */ ---- if (tree) tree_assimilate(tree); ---- ---- return TRUE; ----} ---- ----#if 0 ----gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) ----{ ---- gboolean handled = FALSE; ---- gboolean done = FALSE; ---- gboolean cancel = FALSE; ---- ---- if (istate.active) { ---- if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) { ---- done = TRUE; ---- handled = TRUE; ---- } else if (e->type == KeyPress) { ---- /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) ---- done = TRUE; ---- else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { ---- cancel = done = TRUE; ---- handled = TRUE; ---- } ---- } else if (e->type == ButtonPress) { ---- cancel = TRUE; ---- done = TRUE; ---- handled = FALSE; ---- } ---- ---- if (done) ---- keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE); ---- ---- if (handled) ---- *client = istate.client; ---- } ---- ---- return handled; ----} ----#endif ---- ----void keyboard_event(ObClient *client, const XEvent *e) ----{ ---- KeyBindingTree *p; ---- ---- if (e->type == KeyRelease) { ---- grab_key_passive_count(-1); ---- return; ---- } ---- ---- g_assert(e->type == KeyPress); ---- grab_key_passive_count(1); ---- ---- if (e->xkey.keycode == config_keyboard_reset_keycode && ---- e->xkey.state == config_keyboard_reset_state) ---- { ---- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); ---- keyboard_reset_chains(-1); ---- return; ---- } ---- ---- if (curpos == NULL) ---- p = keyboard_firstnode; ---- else ---- p = curpos->first_child; ---- while (p) { ---- if (p->key == e->xkey.keycode && ---- p->state == e->xkey.state) ---- { ---- /* if we hit a key binding, then close any open menus and run it */ ---- if (menu_frame_visible) ---- menu_frame_hide_all(); ---- ---- if (p->first_child != NULL) { /* part of a chain */ ---- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); ---- /* 3 second timeout for chains */ ---- obt_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC, ---- chain_timeout, NULL, ---- g_direct_equal, NULL); ---- set_curpos(p); ---- } else if (p->chroot) /* an empty chroot */ ---- set_curpos(p); ---- else { ---- GSList *it; ---- ---- for (it = p->actions; it; it = g_slist_next(it)) ---- if (actions_act_is_interactive(it->data)) break; ---- if (it == NULL) /* reset if the actions are not interactive */ ---- keyboard_reset_chains(0); ---- ---- actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY, ---- e->xkey.state, e->xkey.x_root, e->xkey.y_root, ---- 0, OB_FRAME_CONTEXT_NONE, client); ---- } ---- break; ---- } ---- p = p->next_sibling; ---- } ---- ---- XAllowEvents(obt_display, AsyncKeyboard, event_curtime); ----} ---- ----static void node_rebind(KeyBindingTree *node) ----{ ---- if (node->first_child) { ---- /* find leaf nodes */ ---- node_rebind(node->first_child); ---- ---- /* for internal nodes, add them to the tree if they ---- are a chroot, but do this after adding their ---- children */ ---- if (node->chroot) ---- keyboard_chroot(node->keylist); ---- } ---- else { ---- /* for leaf nodes, rebind each action assigned to it */ ---- while (node->actions) { ---- /* add each action, and remove them from the original tree so ---- they don't get free'd on us */ -- - keyboard_bind(node->keylist, node->actions->data); - keyboard_bind(node->keylist, node->actions->data, node->grab); ---- node->actions = g_slist_delete_link(node->actions, node->actions); ---- } ---- ---- if (node->chroot) ---- keyboard_chroot(node->keylist); ---- } ---- ---- /* go through each sibling */ ---- if (node->next_sibling) node_rebind(node->next_sibling); ----} ---- ----void keyboard_rebind(void) ----{ ---- KeyBindingTree *old; ---- ---- old = keyboard_firstnode; ---- keyboard_firstnode = NULL; ---- node_rebind(old); ---- ---- tree_destroy(old); ---- set_curpos(NULL); ---- grab_keys(TRUE); ----} ---- ----void keyboard_startup(gboolean reconfig) ----{ ---- grab_keys(TRUE); ---- popup = popup_new(); ---- popup_set_text_align(popup, RR_JUSTIFY_CENTER); ----} ---- ----void keyboard_shutdown(gboolean reconfig) ----{ ---- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); ---- ---- keyboard_unbind_all(); ---- set_curpos(NULL); ---- ---- popup_free(popup); ---- popup = NULL; ----} ---- diff --cc openbox/keyboard.h index 1674cf92,1674cf92,7ffd198b,1674cf92..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/keyboard.h +++ /dev/null @@@@@ -1,48 -1,48 -1,48 -1,48 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- keyboard.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__keybaord_h ----#define ob__keybaord_h ---- ----#include "keytree.h" ----#include "frame.h" ---- ----#include ----#include ---- ----struct _ObClient; ----struct _ObActionsAct; ---- ----extern KeyBindingTree *keyboard_firstnode; ---- ----void keyboard_startup(gboolean reconfig); ----void keyboard_shutdown(gboolean reconfig); ---- ----void keyboard_rebind(void); ---- ----void keyboard_chroot(GList *keylist); -- -gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action); - gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action, gboolean grab); ----void keyboard_unbind_all(void); ---- ----void keyboard_event(struct _ObClient *client, const XEvent *e); ----/*! @param break_chroots how many chroots to break. -1 means to break them ALL! ---- */ ----void keyboard_reset_chains(gint break_chroots); ---- ----#endif diff --cc openbox/keytree.c index ca64385a,ca64385a,310f9bd7,ca64385a..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/keytree.c +++ /dev/null @@@@@ -1,152 -1,152 -1,153 -1,152 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- keytree.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "keyboard.h" ----#include "translate.h" ----#include "actions.h" ----#include ---- ----void tree_destroy(KeyBindingTree *tree) ----{ ---- KeyBindingTree *c; ---- ---- while (tree) { ---- tree_destroy(tree->next_sibling); ---- c = tree->first_child; ---- if (c == NULL) { ---- GList *it; ---- GSList *sit; ---- for (it = tree->keylist; it != NULL; it = it->next) ---- g_free(it->data); ---- g_list_free(tree->keylist); ---- for (sit = tree->actions; sit != NULL; sit = sit->next) ---- actions_act_unref(sit->data); ---- g_slist_free(tree->actions); ---- } ---- g_free(tree); ---- tree = c; ---- } ----} ---- -- -KeyBindingTree *tree_build(GList *keylist) - KeyBindingTree *tree_build(GList *keylist, gboolean grab) ----{ ---- GList *it; ---- KeyBindingTree *ret = NULL, *p; ---- ---- if (g_list_length(keylist) <= 0) ---- return NULL; /* nothing in the list.. */ ---- ---- for (it = g_list_last(keylist); it; it = g_list_previous(it)) { ---- GList *kit; ---- ---- p = ret; ---- ret = g_new0(KeyBindingTree, 1); ---- ---- for (kit = it; kit != NULL; kit = g_list_previous(kit)) ---- ret->keylist = g_list_prepend(ret->keylist, ---- g_strdup(kit->data)); /* deep copy */ ---- ret->first_child = p; - ret->grab = grab; ---- if (p != NULL) p->parent = ret; ---- translate_key(it->data, &ret->state, &ret->key); ---- } ---- return ret; ----} ---- ----void tree_assimilate(KeyBindingTree *node) ----{ ---- KeyBindingTree *a, *b, *tmp, *last; ---- ---- if (keyboard_firstnode == NULL) { ---- /* there are no nodes at this level yet */ ---- keyboard_firstnode = node; ---- } else { ---- a = keyboard_firstnode; ---- last = a; ---- b = node; ---- while (a) { ---- last = a; ---- /* check b->key != 0 for key bindings that didn't get translated */ ---- if (!(a->state == b->state && a->key == b->key && b->key != 0)) { ---- a = a->next_sibling; ---- } else { ---- tmp = b; ---- b = b->first_child; ---- g_free(tmp); ---- a = a->first_child; ---- } ---- } ---- /* check b->key != 0, and save key bindings that didn't get translated ---- as siblings here */ ---- if (!(last->state == b->state && last->key == b->key && b->key != 0)) { ---- last->next_sibling = b; ---- b->parent = last->parent; ---- } else { ---- last->first_child = b->first_child; ---- last->first_child->parent = last; ---- g_free(b); ---- } ---- } ----} ---- ----KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict) ----{ ---- KeyBindingTree *a, *b; ---- ---- *conflict = FALSE; ---- ---- a = keyboard_firstnode; ---- b = search; ---- while (a && b) { ---- /* check b->key != 0 for key bindings that didn't get translated, and ---- don't make them conflict with anything else so that they can all ---- live together in peace and harmony */ ---- if (!(a->state == b->state && a->key == b->key && b->key != 0)) { ---- a = a->next_sibling; ---- } else { ---- if ((a->first_child == NULL) == (b->first_child == NULL)) { ---- if (a->first_child == NULL) { ---- /* found it! (return the actual node, not the search's) */ ---- return a; ---- } ---- } else { ---- *conflict = TRUE; ---- return NULL; /* the chain status' don't match (conflict!) */ ---- } ---- b = b->first_child; ---- a = a->first_child; ---- } ---- } ---- return NULL; /* it just isn't in here */ ----} ---- ----gboolean tree_chroot(KeyBindingTree *tree, GList *keylist) ----{ ---- guint key, state; ---- translate_key(keylist->data, &state, &key); ---- while (tree != NULL && !(tree->state == state && tree->key == key)) ---- tree = tree->next_sibling; ---- if (tree != NULL) { ---- if (keylist->next == NULL) { ---- tree->chroot = TRUE; ---- return TRUE; ---- } else ---- return tree_chroot(tree->first_child, keylist->next); ---- } ---- return FALSE; ----} diff --cc openbox/keytree.h index 391cb154,391cb154,cf9e8028,391cb154..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/keytree.h +++ /dev/null @@@@@ -1,46 -1,46 -1,47 -1,46 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- keytree.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __plugin_keyboard_tree_h ----#define __plugin_keyboard_tree_h ---- ----#include ---- ----typedef struct KeyBindingTree { ---- guint state; ---- guint key; - gboolean grab; ---- GList *keylist; ---- GSList *actions; /* list of Action pointers */ ---- gboolean chroot; ---- ---- /* the level up in the tree */ ---- struct KeyBindingTree *parent; ---- /* the next binding in the tree at the same level */ ---- struct KeyBindingTree *next_sibling; ---- /* the first child of this binding (next binding in a chained sequence).*/ ---- struct KeyBindingTree *first_child; ----} KeyBindingTree; ---- ----void tree_destroy(KeyBindingTree *tree); -- -KeyBindingTree *tree_build(GList *keylist); - KeyBindingTree *tree_build(GList *keylist, gboolean grab); ----void tree_assimilate(KeyBindingTree *node); ----KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict); ----gboolean tree_chroot(KeyBindingTree *tree, GList *keylist); ---- ---- ----#endif diff --cc openbox/menu.c index 432aa2be,432aa2be,432aa2be,432aa2be..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/menu.c +++ /dev/null @@@@@ -1,685 -1,685 -1,685 -1,685 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- menu.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "menu.h" ----#include "openbox.h" ----#include "stacking.h" ----#include "grab.h" ----#include "client.h" ----#include "config.h" ----#include "actions.h" ----#include "screen.h" ----#include "menuframe.h" ----#include "keyboard.h" ----#include "geom.h" ----#include "misc.h" ----#include "client_menu.h" ----#include "client_list_menu.h" ----#include "client_list_combined_menu.h" ----#include "gettext.h" ----#include "obt/parse.h" ----#include "obt/paths.h" ---- ----typedef struct _ObMenuParseState ObMenuParseState; ---- ----struct _ObMenuParseState ----{ ---- ObMenu *parent; ---- ObMenu *pipe_creator; ----}; ---- ----static GHashTable *menu_hash = NULL; ----static ObtParseInst *menu_parse_inst; ----static ObMenuParseState menu_parse_state; ----static gboolean menu_can_hide = FALSE; ---- ----static void menu_destroy_hash_value(ObMenu *self); ----static void parse_menu_item(xmlNodePtr node, gpointer data); ----static void parse_menu_separator(xmlNodePtr node, gpointer data); ----static void parse_menu(xmlNodePtr node, gpointer data); ----static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, ---- gchar **strippedlabel, guint *position, ---- gboolean *always_show); ---- ---- ----static void client_dest(ObClient *client, gpointer data) ----{ ---- /* menus can be associated with a client, so close any that are since ---- we are disappearing now */ ---- menu_frame_hide_all_client(client); ----} ---- ----void menu_startup(gboolean reconfig) ----{ ---- gboolean loaded = FALSE; ---- GSList *it; ---- ---- menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, ---- (GDestroyNotify)menu_destroy_hash_value); ---- ---- client_list_menu_startup(reconfig); ---- client_list_combined_menu_startup(reconfig); ---- client_menu_startup(); ---- ---- menu_parse_inst = obt_parse_instance_new(); ---- ---- menu_parse_state.parent = NULL; ---- menu_parse_state.pipe_creator = NULL; ---- obt_parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state); ---- obt_parse_register(menu_parse_inst, "item", parse_menu_item, ---- &menu_parse_state); ---- obt_parse_register(menu_parse_inst, "separator", ---- parse_menu_separator, &menu_parse_state); ---- ---- for (it = config_menu_files; it; it = g_slist_next(it)) { ---- if (obt_parse_load_config_file(menu_parse_inst, ---- "openbox", ---- it->data, ---- "openbox_menu")) ---- { ---- loaded = TRUE; ---- obt_parse_tree_from_root(menu_parse_inst); ---- obt_parse_close(menu_parse_inst); ---- } else ---- g_message(_("Unable to find a valid menu file \"%s\""), ---- (const gchar*)it->data); ---- } ---- if (!loaded) { ---- if (obt_parse_load_config_file(menu_parse_inst, ---- "openbox", ---- "menu.xml", ---- "openbox_menu")) ---- { ---- obt_parse_tree_from_root(menu_parse_inst); ---- obt_parse_close(menu_parse_inst); ---- } else ---- g_message(_("Unable to find a valid menu file \"%s\""), ---- "menu.xml"); ---- } ---- ---- g_assert(menu_parse_state.parent == NULL); ---- ---- if (!reconfig) ---- client_add_destroy_notify(client_dest, NULL); ----} ---- ----void menu_shutdown(gboolean reconfig) ----{ ---- if (!reconfig) ---- client_remove_destroy_notify(client_dest); ---- ---- obt_parse_instance_unref(menu_parse_inst); ---- menu_parse_inst = NULL; ---- ---- client_list_menu_shutdown(reconfig); ---- client_list_combined_menu_shutdown(reconfig); ---- ---- menu_frame_hide_all(); ---- g_hash_table_destroy(menu_hash); ---- menu_hash = NULL; ----} ---- ----static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data) ----{ ---- ObMenu *menu = val; ---- return menu->pipe_creator != NULL; ----} ---- ----static void clear_cache(gpointer key, gpointer val, gpointer data) ----{ ---- ObMenu *menu = val; ---- if (menu->execute) ---- menu_clear_entries(menu); ----} ---- ----void menu_clear_pipe_caches(void) ----{ ---- /* delete any pipe menus' submenus */ ---- g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, NULL); ---- /* empty the top level pipe menus */ ---- g_hash_table_foreach(menu_hash, clear_cache, NULL); ----} ---- ----void menu_pipe_execute(ObMenu *self) ----{ ---- gchar *output; ---- GError *err = NULL; ---- ---- if (!self->execute) ---- return; ---- if (self->entries) /* the entries are already created and cached */ ---- return; ---- ---- if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) { ---- g_message(_("Failed to execute command for pipe-menu \"%s\": %s"), ---- self->execute, err->message); ---- g_error_free(err); ---- return; ---- } ---- ---- if (obt_parse_load_mem(menu_parse_inst, output, strlen(output), ---- "openbox_pipe_menu")) ---- { ---- menu_parse_state.pipe_creator = self; ---- menu_parse_state.parent = self; ---- obt_parse_tree_from_root(menu_parse_inst); ---- obt_parse_close(menu_parse_inst); ---- } else { ---- g_message(_("Invalid output from pipe-menu \"%s\""), self->execute); ---- } ---- ---- g_free(output); ----} ---- ----static ObMenu* menu_from_name(gchar *name) ----{ ---- ObMenu *self = NULL; ---- ---- g_assert(name != NULL); ---- ---- if (!(self = g_hash_table_lookup(menu_hash, name))) ---- g_message(_("Attempted to access menu \"%s\" but it does not exist"), ---- name); ---- return self; ----} ---- ----#define VALID_SHORTCUT(c) (((c) >= '0' && (c) <= '9') || \ ---- ((c) >= 'A' && (c) <= 'Z') || \ ---- ((c) >= 'a' && (c) <= 'z')) ---- ----static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, ---- gchar **strippedlabel, guint *position, ---- gboolean *always_show) ----{ ---- gunichar shortcut = 0; ---- ---- *position = 0; ---- *always_show = FALSE; ---- ---- g_assert(strippedlabel != NULL); ---- ---- if (label == NULL) { ---- *strippedlabel = NULL; ---- } else { ---- gchar *i; ---- ---- *strippedlabel = g_strdup(label); ---- ---- /* if allow_shortcut is false, then you can't use the '_', instead you ---- have to just use the first valid character ---- */ ---- ---- i = strchr(*strippedlabel, '_'); ---- if (allow_shortcut && i != NULL) { ---- /* there is an underscore in the string */ ---- ---- /* you have to use a printable ascii character for shortcuts ---- don't allow space either, so you can have like "a _ b" ---- */ ---- if (VALID_SHORTCUT(*(i+1))) { ---- shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); ---- *position = i - *strippedlabel; ---- *always_show = TRUE; ---- ---- /* remove the '_' from the string */ ---- for (; *i != '\0'; ++i) ---- *i = *(i+1); ---- } else if (*(i+1) == '\0') { ---- /* no default shortcut if the '_' is the last character ---- (eg. "Exit_") for menu entries that you don't want ---- to be executed by mistake ---- */ ---- *i = '\0'; ---- } ---- } else { ---- /* there is no underscore, so find the first valid character to use ---- instead */ ---- ---- for (i = *strippedlabel; *i != '\0'; ++i) ---- if (VALID_SHORTCUT(*i)) { ---- *position = i - *strippedlabel; ---- shortcut = g_unichar_tolower(g_utf8_get_char(i)); ---- break; ---- } ---- } ---- } ---- return shortcut; ----} ---- ----static void parse_menu_item(xmlNodePtr node, gpointer data) ----{ ---- ObMenuParseState *state = data; ---- gchar *label; ---- ---- if (state->parent) { ---- if (obt_parse_attr_string(node, "label", &label)) { ---- GSList *acts = NULL; ---- ---- for (node = node->children; node; node = node->next) ---- if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) { ---- ObActionsAct *a = actions_parse(node); ---- if (a) ---- acts = g_slist_append(acts, a); ---- } ---- menu_add_normal(state->parent, -1, label, acts, TRUE); ---- g_free(label); ---- } ---- } ----} ---- ----static void parse_menu_separator(xmlNodePtr node, gpointer data) ----{ ---- ObMenuParseState *state = data; ---- ---- if (state->parent) { ---- gchar *label; ---- ---- if (!obt_parse_attr_string(node, "label", &label)) ---- label = NULL; ---- ---- menu_add_separator(state->parent, -1, label); ---- g_free(label); ---- } ----} ---- ----static void parse_menu(xmlNodePtr node, gpointer data) ----{ ---- ObMenuParseState *state = data; ---- gchar *name = NULL, *title = NULL, *script = NULL; ---- ObMenu *menu; ---- ---- if (!obt_parse_attr_string(node, "id", &name)) ---- goto parse_menu_fail; ---- ---- if (!g_hash_table_lookup(menu_hash, name)) { ---- if (!obt_parse_attr_string(node, "label", &title)) ---- goto parse_menu_fail; ---- ---- if ((menu = menu_new(name, title, TRUE, NULL))) { ---- menu->pipe_creator = state->pipe_creator; ---- if (obt_parse_attr_string(node, "execute", &script)) { ---- menu->execute = obt_paths_expand_tilde(script); ---- } else { ---- ObMenu *old; ---- ---- old = state->parent; ---- state->parent = menu; ---- obt_parse_tree(menu_parse_inst, node->children); ---- state->parent = old; ---- } ---- } ---- } ---- ---- if (state->parent) ---- menu_add_submenu(state->parent, -1, name); ---- ----parse_menu_fail: ---- g_free(name); ---- g_free(title); ---- g_free(script); ----} ---- ----ObMenu* menu_new(const gchar *name, const gchar *title, ---- gboolean allow_shortcut_selection, gpointer data) ----{ ---- ObMenu *self; ---- ---- self = g_new0(ObMenu, 1); ---- self->name = g_strdup(name); ---- self->data = data; ---- ---- self->shortcut = parse_shortcut(title, allow_shortcut_selection, ---- &self->title, &self->shortcut_position, ---- &self->shortcut_always_show); ---- ---- g_hash_table_replace(menu_hash, self->name, self); ---- ---- /* Each menu has a single more_menu. When the menu spills past what ---- can fit on the screen, a new menu frame entry is created from this ---- more_menu, and a new menu frame for the submenu is created for this ---- menu, also pointing to the more_menu. ---- ---- This can be done multiple times using the same more_menu. ---- ---- more_menu->more_menu will always be NULL, since there is only 1 for ---- each menu. */ ---- self->more_menu = g_new0(ObMenu, 1); ---- self->more_menu->name = _("More..."); ---- self->more_menu->title = _("More..."); ---- self->more_menu->data = data; ---- self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M")); ---- ---- return self; ----} ---- ----static void menu_destroy_hash_value(ObMenu *self) ----{ ---- /* make sure its not visible */ ---- { ---- GList *it; ---- ObMenuFrame *f; ---- ---- for (it = menu_frame_visible; it; it = g_list_next(it)) { ---- f = it->data; ---- if (f->menu == self) ---- menu_frame_hide_all(); ---- } ---- } ---- ---- if (self->destroy_func) ---- self->destroy_func(self, self->data); ---- ---- menu_clear_entries(self); ---- g_free(self->name); ---- g_free(self->title); ---- g_free(self->execute); ---- g_free(self->more_menu); ---- ---- g_free(self); ----} ---- ----void menu_free(ObMenu *menu) ----{ ---- if (menu) ---- g_hash_table_remove(menu_hash, menu->name); ----} ---- ----static gboolean menu_hide_delay_func(gpointer data) ----{ ---- menu_can_hide = TRUE; ---- return FALSE; /* no repeat */ ----} ---- ----void menu_show(gchar *name, gint x, gint y, gboolean mouse, ObClient *client) ----{ ---- ObMenu *self; ---- ObMenuFrame *frame; ---- ---- if (!(self = menu_from_name(name)) || ---- grab_on_keyboard() || grab_on_pointer()) return; ---- ---- /* if the requested menu is already the top visible menu, then don't ---- bother */ ---- if (menu_frame_visible) { ---- frame = menu_frame_visible->data; ---- if (frame->menu == self) ---- return; ---- } ---- ---- menu_frame_hide_all(); ---- ---- /* clear the pipe menus when showing a new menu */ ---- menu_clear_pipe_caches(); ---- ---- frame = menu_frame_new(self, 0, client); ---- if (!menu_frame_show_topmenu(frame, x, y, mouse)) ---- menu_frame_free(frame); ---- else { ---- if (!mouse) { ---- /* select the first entry if it's not a submenu and we opened ---- * the menu with the keyboard, and skip all headers */ ---- GList *it = frame->entries; ---- while (it) { ---- ObMenuEntryFrame *e = it->data; ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { ---- menu_frame_select(frame, e, FALSE); ---- break; ---- } else if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) ---- it = g_list_next(it); ---- else ---- break; ---- } ---- } ---- ---- /* reset the hide timer */ ---- if (!mouse) ---- menu_can_hide = TRUE; ---- else { ---- menu_can_hide = FALSE; ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_menu_hide_delay * 1000, ---- menu_hide_delay_func, ---- NULL, g_direct_equal, NULL); ---- } ---- } ----} ---- ----gboolean menu_hide_delay_reached(void) ----{ ---- return menu_can_hide; ----} ---- ----static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) ----{ ---- ObMenuEntry *self; ---- ---- g_assert(menu); ---- ---- self = g_new0(ObMenuEntry, 1); ---- self->ref = 1; ---- self->type = type; ---- self->menu = menu; ---- self->id = id; ---- ---- switch (type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- self->data.normal.enabled = TRUE; ---- break; ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- break; ---- } ---- ---- return self; ----} ---- ----void menu_entry_ref(ObMenuEntry *self) ----{ ---- ++self->ref; ----} ---- ----void menu_entry_unref(ObMenuEntry *self) ----{ ---- if (self && --self->ref == 0) { ---- switch (self->type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- RrImageUnref(self->data.normal.icon); ---- g_free(self->data.normal.label); ---- while (self->data.normal.actions) { ---- actions_act_unref(self->data.normal.actions->data); ---- self->data.normal.actions = ---- g_slist_delete_link(self->data.normal.actions, ---- self->data.normal.actions); ---- } ---- break; ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- g_free(self->data.submenu.name); ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- g_free(self->data.separator.label); ---- break; ---- } ---- ---- g_free(self); ---- } ----} ---- ----void menu_clear_entries(ObMenu *self) ----{ ----#ifdef DEBUG ---- /* assert that the menu isn't visible */ ---- { ---- GList *it; ---- ObMenuFrame *f; ---- ---- for (it = menu_frame_visible; it; it = g_list_next(it)) { ---- f = it->data; ---- g_assert(f->menu != self); ---- } ---- } ----#endif ---- ---- while (self->entries) { ---- menu_entry_unref(self->entries->data); ---- self->entries = g_list_delete_link(self->entries, self->entries); ---- } ---- self->more_menu->entries = self->entries; /* keep it in sync */ ----} ---- ----void menu_entry_remove(ObMenuEntry *self) ----{ ---- self->menu->entries = g_list_remove(self->menu->entries, self); ---- menu_entry_unref(self); ----} ---- ----ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label, ---- GSList *actions, gboolean allow_shortcut) ----{ ---- ObMenuEntry *e; ---- ---- e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id); ---- e->data.normal.actions = actions; ---- ---- menu_entry_set_label(e, label, allow_shortcut); ---- ---- self->entries = g_list_append(self->entries, e); ---- self->more_menu->entries = self->entries; /* keep it in sync */ ---- return e; ----} ---- ----ObMenuEntry* menu_get_more(ObMenu *self, guint show_from) ----{ ---- ObMenuEntry *e; ---- e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, -1); ---- /* points to itself */ ---- e->data.submenu.name = g_strdup(self->name); ---- e->data.submenu.submenu = self; ---- e->data.submenu.show_from = show_from; ---- return e; ----} ---- ----ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu) ----{ ---- ObMenuEntry *e; ---- ---- e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id); ---- e->data.submenu.name = g_strdup(submenu); ---- ---- self->entries = g_list_append(self->entries, e); ---- self->more_menu->entries = self->entries; /* keep it in sync */ ---- return e; ----} ---- ----ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label) ----{ ---- ObMenuEntry *e; ---- ---- e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); ---- ---- menu_entry_set_label(e, label, FALSE); ---- ---- self->entries = g_list_append(self->entries, e); ---- self->more_menu->entries = self->entries; /* keep it in sync */ ---- return e; ----} ---- ----void menu_set_show_func(ObMenu *self, ObMenuShowFunc func) ----{ ---- self->show_func = func; ----} ---- ----void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func) ----{ ---- self->hide_func = func; ----} ---- ----void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func) ----{ ---- self->update_func = func; ----} ---- ----void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func) ----{ ---- self->execute_func = func; ---- self->more_menu->execute_func = func; /* keep it in sync */ ----} ---- ----void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func) ----{ ---- self->destroy_func = func; ----} ---- ----void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func) ----{ ---- self->place_func = func; ----} ---- ----ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) ----{ ---- ObMenuEntry *ret = NULL; ---- GList *it; ---- ---- for (it = self->entries; it; it = g_list_next(it)) { ---- ObMenuEntry *e = it->data; ---- ---- if (e->id == id) { ---- ret = e; ---- break; ---- } ---- } ---- return ret; ----} ---- ----void menu_find_submenus(ObMenu *self) ----{ ---- GList *it; ---- ---- for (it = self->entries; it; it = g_list_next(it)) { ---- ObMenuEntry *e = it->data; ---- ---- if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU) ---- e->data.submenu.submenu = menu_from_name(e->data.submenu.name); ---- } ----} ---- ----void menu_entry_set_label(ObMenuEntry *self, const gchar *label, ---- gboolean allow_shortcut) ----{ ---- switch (self->type) { ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- g_free(self->data.separator.label); ---- self->data.separator.label = g_strdup(label); ---- break; ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- g_free(self->data.normal.label); ---- self->data.normal.shortcut = ---- parse_shortcut(label, allow_shortcut, &self->data.normal.label, ---- &self->data.normal.shortcut_position, ---- &self->data.normal.shortcut_always_show); ---- break; ---- default: ---- g_assert_not_reached(); ---- } ----} ---- ----void menu_show_all_shortcuts(ObMenu *self, gboolean show) ----{ ---- self->show_all_shortcuts = show; ----} diff --cc openbox/menu.h index 43efd413,43efd413,43efd413,43efd413..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/menu.h +++ /dev/null @@@@@ -1,207 -1,207 -1,207 -1,207 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- menu.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __menu_h ----#define __menu_h ---- ----#include "window.h" ----#include "geom.h" ----#include "render/render.h" ---- ----#include ---- ----struct _ObClient; ----struct _ObMenuFrame; ----struct _ObMenuEntryFrame; ---- ----typedef struct _ObMenu ObMenu; ----typedef struct _ObMenuEntry ObMenuEntry; ----typedef struct _ObNormalMenuEntry ObNormalMenuEntry; ----typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry; ----typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry; ---- ----typedef void (*ObMenuShowFunc)(struct _ObMenuFrame *frame, gpointer data); ----typedef void (*ObMenuHideFunc)(struct _ObMenuFrame *frame, gpointer data); ----typedef gboolean (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, ---- gpointer data); ----typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, ---- struct _ObMenuFrame *frame, ---- struct _ObClient *client, ---- guint state, gpointer data); ----typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data); ----/*! @param x is the mouse x coordinate. on return it should be the x coordinate ---- for the menu ---- @param y is the mouse y coordinate. on return it should be the y coordinate ---- for the menu ----*/ ----typedef void (*ObMenuPlaceFunc)(struct _ObMenuFrame *frame, gint *x, gint *y, ---- gboolean mouse, gpointer data); ---- ----struct _ObMenu ----{ ---- /* Name of the menu. Used in the showmenu action. */ ---- gchar *name; ---- /* Displayed title */ ---- gchar *title; ---- /*! The shortcut key that would be used to activate this menu if it was ---- displayed as a submenu */ ---- gunichar shortcut; ---- /*! The shortcut's position in the string */ ---- guint shortcut_position; ---- /*! If the shortcut was specified by & and should always be drawn */ ---- gboolean shortcut_always_show; ---- ---- /*! If the shortcut key should be shown in menu entries even when it ---- is the first character in the string */ ---- gboolean show_all_shortcuts; ---- ---- /* Command to execute to rebuild the menu */ ---- gchar *execute; ---- ---- /* ObMenuEntry list */ ---- GList *entries; ---- ---- /* plugin data */ ---- gpointer data; ---- ---- ObMenuShowFunc show_func; ---- ObMenuHideFunc hide_func; ---- ObMenuUpdateFunc update_func; ---- ObMenuExecuteFunc execute_func; ---- ObMenuDestroyFunc destroy_func; ---- ObMenuPlaceFunc place_func; ---- ---- /* Pipe-menu parent, we get destroyed when it is destroyed */ ---- ObMenu *pipe_creator; ---- ---- /* The menu used as the destination for the "More..." entry for this menu*/ ---- ObMenu *more_menu; ----}; ---- ----typedef enum ----{ ---- OB_MENU_ENTRY_TYPE_NORMAL, ---- OB_MENU_ENTRY_TYPE_SUBMENU, ---- OB_MENU_ENTRY_TYPE_SEPARATOR ----} ObMenuEntryType; ---- ----struct _ObNormalMenuEntry { ---- gchar *label; ---- /*! The shortcut key that would be used to activate this menu entry */ ---- gunichar shortcut; ---- /*! The shortcut's position in the string */ ---- guint shortcut_position; ---- /*! If the shortcut was specified by & and should always be drawn */ ---- gboolean shortcut_always_show; ---- ---- /* state */ ---- gboolean enabled; ---- ---- /* List of ObActions */ ---- GSList *actions; ---- ---- /* Icon stuff. If you set this, make sure you RrImageRef() it too. */ ---- RrImage *icon; ---- gint icon_alpha; ---- ---- /* Mask icon */ ---- RrPixmapMask *mask; ---- RrColor *mask_normal_color; ---- RrColor *mask_selected_color; ---- RrColor *mask_disabled_color; ---- RrColor *mask_disabled_selected_color; ---- ---- gpointer data; ----}; ---- ----struct _ObSubmenuMenuEntry { ---- gchar *name; ---- ObMenu *submenu; ---- guint show_from; ----}; ---- ----struct _ObSeparatorMenuEntry { ---- gchar *label; ----}; ---- ----struct _ObMenuEntry ----{ ---- guint ref; ---- ---- ObMenuEntryType type; ---- ObMenu *menu; ---- ---- gint id; ---- ---- union u { ---- ObNormalMenuEntry normal; ---- ObSubmenuMenuEntry submenu; ---- ObSeparatorMenuEntry separator; ---- } data; ----}; ---- ----void menu_startup(gboolean reconfig); ----void menu_shutdown(gboolean reconfig); ---- ----void menu_entry_ref(ObMenuEntry *self); ----void menu_entry_unref(ObMenuEntry *self); ---- ----ObMenu* menu_new(const gchar *name, const gchar *title, ---- gboolean allow_shortcut_selection, gpointer data); ----void menu_free(ObMenu *menu); ---- ----/*! Repopulate a pipe-menu by running its command */ ----void menu_pipe_execute(ObMenu *self); ----/*! Clear a pipe-menu's entries */ ----void menu_clear_pipe_caches(void); ---- ----void menu_show_all_shortcuts(ObMenu *self, gboolean show); ---- ----void menu_show(gchar *name, gint x, gint y, gboolean mouse, ---- struct _ObClient *client); ----gboolean menu_hide_delay_reached(void); ---- ----void menu_set_show_func(ObMenu *menu, ObMenuShowFunc func); ----void menu_set_hide_func(ObMenu *menu, ObMenuHideFunc func); ----void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func); ----void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func); ----void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func); ----void menu_set_place_func(ObMenu *menu, ObMenuPlaceFunc func); ---- ----/* functions for building menus */ ----/*! @param allow_shortcut this should be false when the label is coming from ---- outside data like window or desktop titles */ ----ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label, ---- GSList *actions, gboolean allow_shortcut); ----ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, const gchar *submenu); ----ObMenuEntry* menu_add_separator(ObMenu *menu, gint id, const gchar *label); ---- ----void menu_clear_entries(ObMenu *menu); ----void menu_entry_remove(ObMenuEntry *self); ---- ----void menu_entry_set_label(ObMenuEntry *self, const gchar *label, ---- gboolean allow_shortcut); ---- ----ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id); ---- ----/* fills in the submenus, for use when a menu is being shown */ ----void menu_find_submenus(ObMenu *self); ---- ----ObMenuEntry* menu_get_more(ObMenu *menu, guint show_from); ---- ----#endif diff --cc openbox/menuframe.c index 7b4c872b,7b4c872b,7b4c872b,161759b3..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/menuframe.c +++ /dev/null @@@@@ -1,1273 -1,1273 -1,1273 -1,1261 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- menuframe.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "menuframe.h" ----#include "client.h" ----#include "menu.h" ----#include "screen.h" ----#include "actions.h" ----#include "grab.h" ----#include "openbox.h" ----#include "config.h" ----#include "obt/prop.h" ----#include "render/theme.h" ---- --- #define PADDING 2 -#define PADDING 0 ----#define MAX_MENU_WIDTH 400 ---- ----#define ITEM_HEIGHT (ob_rr_theme->menu_font_height + 2*PADDING) ---- ----#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ ---- LeaveWindowMask) ----#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ ---- ButtonPressMask | ButtonReleaseMask) ---- ----GList *menu_frame_visible; ----GHashTable *menu_frame_map; ---- ----static RrAppearance *a_sep; ---- ----static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ---- ObMenuFrame *frame); ----static void menu_entry_frame_free(ObMenuEntryFrame *self); ----static void menu_frame_update(ObMenuFrame *self); ----static gboolean menu_entry_frame_submenu_timeout(gpointer data); ----static void menu_frame_hide(ObMenuFrame *self); ---- ----static Window createWindow(Window parent, gulong mask, ---- XSetWindowAttributes *attrib) ----{ ---- return XCreateWindow(obt_display, parent, 0, 0, 1, 1, 0, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), mask, attrib); ----} ---- ----void menu_frame_startup(gboolean reconfig) ----{ ---- gint i; ---- ---- a_sep = RrAppearanceCopy(ob_rr_theme->a_clear); ---- RrAppearanceAddTextures(a_sep, ob_rr_theme->menu_sep_width); ---- for (i = 0; i < ob_rr_theme->menu_sep_width; ++i) { ---- a_sep->texture[i].type = RR_TEXTURE_LINE_ART; ---- a_sep->texture[i].data.lineart.color = ---- ob_rr_theme->menu_sep_color; ---- } ---- ---- if (reconfig) return; ---- ---- menu_frame_map = g_hash_table_new(g_int_hash, g_int_equal); ----} ---- ----void menu_frame_shutdown(gboolean reconfig) ----{ ---- RrAppearanceFree(a_sep); ---- ---- if (reconfig) return; ---- ---- g_hash_table_destroy(menu_frame_map); ----} ---- ----ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client) ----{ ---- ObMenuFrame *self; ---- XSetWindowAttributes attr; ---- ---- self = g_new0(ObMenuFrame, 1); ---- self->obwin.type = OB_WINDOW_CLASS_MENUFRAME; ---- self->menu = menu; ---- self->selected = NULL; ---- self->client = client; ---- self->direction_right = TRUE; ---- self->show_from = show_from; ---- ---- attr.event_mask = FRAME_EVENTMASK; ---- self->window = createWindow(obt_root(ob_screen), ---- CWEventMask, &attr); ---- ---- /* make it a popup menu type window */ ---- OBT_PROP_SET32(self->window, NET_WM_WINDOW_TYPE, ATOM, ---- OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_POPUP_MENU)); ---- ---- XSetWindowBorderWidth(obt_display, self->window, ob_rr_theme->mbwidth); ---- XSetWindowBorder(obt_display, self->window, ---- RrColorPixel(ob_rr_theme->menu_border_color)); ---- ---- self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu); ---- ---- window_add(&self->window, MENUFRAME_AS_WINDOW(self)); ---- stacking_add(MENUFRAME_AS_WINDOW(self)); ---- ---- return self; ----} ---- ----void menu_frame_free(ObMenuFrame *self) ----{ ---- if (self) { ---- while (self->entries) { ---- menu_entry_frame_free(self->entries->data); ---- self->entries = g_list_delete_link(self->entries, self->entries); ---- } ---- ---- stacking_remove(MENUFRAME_AS_WINDOW(self)); ---- window_remove(self->window); ---- ---- RrAppearanceFree(self->a_items); ---- ---- XDestroyWindow(obt_display, self->window); ---- ---- g_free(self); ---- } ----} ---- ----static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ---- ObMenuFrame *frame) ----{ ---- ObMenuEntryFrame *self; ---- XSetWindowAttributes attr; ---- ---- self = g_new0(ObMenuEntryFrame, 1); ---- self->entry = entry; ---- self->frame = frame; ---- ---- menu_entry_ref(entry); ---- ---- attr.event_mask = ENTRY_EVENTMASK; ---- self->window = createWindow(self->frame->window, CWEventMask, &attr); ---- self->text = createWindow(self->window, 0, NULL); ---- g_hash_table_insert(menu_frame_map, &self->window, self); ---- g_hash_table_insert(menu_frame_map, &self->text, self); ---- if (entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { ---- self->icon = createWindow(self->window, 0, NULL); ---- g_hash_table_insert(menu_frame_map, &self->icon, self); ---- } ---- if (entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { ---- self->bullet = createWindow(self->window, 0, NULL); ---- g_hash_table_insert(menu_frame_map, &self->bullet, self); ---- } ---- ---- XMapWindow(obt_display, self->window); ---- XMapWindow(obt_display, self->text); ---- ---- window_add(&self->window, MENUFRAME_AS_WINDOW(self->frame)); ---- ---- return self; ----} ---- ----static void menu_entry_frame_free(ObMenuEntryFrame *self) ----{ ---- if (self) { ---- menu_entry_unref(self->entry); ---- ---- window_remove(self->window); ---- ---- XDestroyWindow(obt_display, self->text); ---- XDestroyWindow(obt_display, self->window); ---- g_hash_table_remove(menu_frame_map, &self->text); ---- g_hash_table_remove(menu_frame_map, &self->window); ---- if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { ---- XDestroyWindow(obt_display, self->icon); ---- g_hash_table_remove(menu_frame_map, &self->icon); ---- } ---- if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { ---- XDestroyWindow(obt_display, self->bullet); ---- g_hash_table_remove(menu_frame_map, &self->bullet); ---- } ---- ---- g_free(self); ---- } ----} ---- ----void menu_frame_move(ObMenuFrame *self, gint x, gint y) ----{ ---- RECT_SET_POINT(self->area, x, y); ---- XMoveWindow(obt_display, self->window, self->area.x, self->area.y); ----} ---- ----static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y) ----{ ---- gint dx, dy; ---- ---- if (config_menu_middle) { --- gint myx; ---- --- myx = *x; --- *y -= self->area.height / 2; - *x -= self->area.width / 2; ---- --- /* try to the right of the cursor */ --- menu_frame_move_on_screen(self, myx, *y, &dx, &dy); - /* try below the cursor */ - menu_frame_move_on_screen(self, *x, *y, &dx, &dy); ---- self->direction_right = TRUE; --- if (dx != 0) { --- /* try to the left of the cursor */ --- myx = *x - self->area.width; --- menu_frame_move_on_screen(self, myx, *y, &dx, &dy); --- self->direction_right = FALSE; --- } --- if (dx != 0) { --- /* if didnt fit on either side so just use what it says */ --- myx = *x; --- menu_frame_move_on_screen(self, myx, *y, &dx, &dy); --- self->direction_right = TRUE; --- } --- *x = myx + dx; --- *y += dy; - *x += dx; - *y += dy+1; ---- } else { ---- gint myx, myy; ---- ---- myx = *x; ---- myy = *y; ---- ---- /* try to the bottom right of the cursor */ ---- menu_frame_move_on_screen(self, myx, myy, &dx, &dy); ---- self->direction_right = TRUE; ---- if (dx != 0 || dy != 0) { ---- /* try to the bottom left of the cursor */ ---- myx = *x - self->area.width; ---- myy = *y; ---- menu_frame_move_on_screen(self, myx, myy, &dx, &dy); ---- self->direction_right = FALSE; ---- } ---- if (dx != 0 || dy != 0) { ---- /* try to the top right of the cursor */ ---- myx = *x; ---- myy = *y - self->area.height; ---- menu_frame_move_on_screen(self, myx, myy, &dx, &dy); ---- self->direction_right = TRUE; ---- } ---- if (dx != 0 || dy != 0) { ---- /* try to the top left of the cursor */ ---- myx = *x - self->area.width; ---- myy = *y - self->area.height; ---- menu_frame_move_on_screen(self, myx, myy, &dx, &dy); ---- self->direction_right = FALSE; ---- } ---- if (dx != 0 || dy != 0) { ---- /* if didnt fit on either side so just use what it says */ ---- myx = *x; ---- myy = *y; ---- menu_frame_move_on_screen(self, myx, myy, &dx, &dy); ---- self->direction_right = TRUE; ---- } ---- *x = myx + dx; ---- *y = myy + dy; ---- } ----} ---- ----static void menu_frame_place_submenu(ObMenuFrame *self, gint *x, gint *y) ----{ ---- gint overlapx, overlapy; ---- gint bwidth; ---- ---- overlapx = ob_rr_theme->menu_overlap_x; ---- overlapy = ob_rr_theme->menu_overlap_y; ---- bwidth = ob_rr_theme->mbwidth; ---- ---- if (self->direction_right) ---- *x = self->parent->area.x + self->parent->area.width - ---- overlapx - bwidth; ---- else ---- *x = self->parent->area.x - self->area.width + overlapx + bwidth; ---- ---- *y = self->parent->area.y + self->parent_entry->area.y; ---- if (config_menu_middle) ---- *y -= (self->area.height - (bwidth * 2) - ITEM_HEIGHT) / 2; ---- else ---- *y += overlapy; ----} ---- ----void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y, ---- gint *dx, gint *dy) ----{ ---- Rect *a = NULL; ---- gint pos, half; ---- ---- *dx = *dy = 0; ---- ---- a = screen_physical_area_monitor(self->monitor); ---- ---- half = g_list_length(self->entries) / 2; ---- pos = g_list_index(self->entries, self->selected); ---- ---- /* if in the bottom half then check this stuff first, will keep the bottom ---- edge of the menu visible */ ---- if (pos > half) { ---- *dx = MAX(*dx, a->x - x); ---- *dy = MAX(*dy, a->y - y); ---- } ---- *dx = MIN(*dx, (a->x + a->width) - (x + self->area.width)); ---- *dy = MIN(*dy, (a->y + a->height) - (y + self->area.height)); ---- /* if in the top half then check this stuff last, will keep the top ---- edge of the menu visible */ ---- if (pos <= half) { ---- *dx = MAX(*dx, a->x - x); ---- *dy = MAX(*dy, a->y - y); ---- } ---- ---- g_free(a); ----} ---- ----static void menu_entry_frame_render(ObMenuEntryFrame *self) ----{ ---- RrAppearance *item_a, *text_a; ---- gint th; /* temp */ ---- ObMenu *sub; ---- ObMenuFrame *frame = self->frame; ---- ---- switch (self->entry->type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- item_a = (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- !self->entry->data.normal.enabled ? ---- /* disabled */ ---- (self == self->frame->selected ? ---- ob_rr_theme->a_menu_disabled_selected : ---- ob_rr_theme->a_menu_disabled) : ---- /* enabled */ ---- (self == self->frame->selected ? ---- ob_rr_theme->a_menu_selected : ---- ob_rr_theme->a_menu_normal)); ---- th = ITEM_HEIGHT; ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- if (self->entry->data.separator.label) { ---- item_a = ob_rr_theme->a_menu_title; ---- th = ob_rr_theme->menu_title_height; ---- } else { ---- item_a = ob_rr_theme->a_menu_normal; ---- th = ob_rr_theme->menu_sep_width + ---- 2*ob_rr_theme->menu_sep_paddingy; ---- } ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- RECT_SET_SIZE(self->area, self->frame->inner_w, th); ---- XResizeWindow(obt_display, self->window, ---- self->area.width, self->area.height); ---- item_a->surface.parent = self->frame->a_items; ---- item_a->surface.parentx = self->area.x; ---- item_a->surface.parenty = self->area.y; ---- RrPaint(item_a, self->window, self->area.width, self->area.height); ---- ---- switch (self->entry->type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- text_a = (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- !self->entry->data.normal.enabled ? ---- /* disabled */ ---- (self == self->frame->selected ? ---- ob_rr_theme->a_menu_text_disabled_selected : ---- ob_rr_theme->a_menu_text_disabled) : ---- /* enabled */ ---- (self == self->frame->selected ? ---- ob_rr_theme->a_menu_text_selected : ---- ob_rr_theme->a_menu_text_normal)); ---- text_a->texture[0].data.text.string = self->entry->data.normal.label; ---- if (self->entry->data.normal.shortcut && ---- (self->frame->menu->show_all_shortcuts || ---- self->entry->data.normal.shortcut_always_show || ---- self->entry->data.normal.shortcut_position > 0)) ---- { ---- text_a->texture[0].data.text.shortcut = TRUE; ---- text_a->texture[0].data.text.shortcut_pos = ---- self->entry->data.normal.shortcut_position; ---- } else ---- text_a->texture[0].data.text.shortcut = FALSE; ---- break; ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- text_a = (self == self->frame->selected ? ---- ob_rr_theme->a_menu_text_selected : ---- ob_rr_theme->a_menu_text_normal); ---- sub = self->entry->data.submenu.submenu; ---- text_a->texture[0].data.text.string = sub ? sub->title : ""; ---- if (sub->shortcut && (self->frame->menu->show_all_shortcuts || ---- sub->shortcut_always_show || ---- sub->shortcut_position > 0)) ---- { ---- text_a->texture[0].data.text.shortcut = TRUE; ---- text_a->texture[0].data.text.shortcut_pos = sub->shortcut_position; ---- } else ---- text_a->texture[0].data.text.shortcut = FALSE; ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- if (self->entry->data.separator.label != NULL) { ---- text_a = ob_rr_theme->a_menu_text_title; ---- text_a->texture[0].data.text.string = ---- self->entry->data.separator.label; ---- } ---- else ---- text_a = ob_rr_theme->a_menu_text_normal; ---- break; ---- } ---- ---- switch (self->entry->type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- XMoveResizeWindow(obt_display, self->text, ---- self->frame->text_x, PADDING, ---- self->frame->text_w, ---- ITEM_HEIGHT - 2*PADDING); ---- text_a->surface.parent = item_a; ---- text_a->surface.parentx = self->frame->text_x; ---- text_a->surface.parenty = PADDING; ---- RrPaint(text_a, self->text, self->frame->text_w, ---- ITEM_HEIGHT - 2*PADDING); ---- break; ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- XMoveResizeWindow(obt_display, self->text, ---- self->frame->text_x, PADDING, ---- self->frame->text_w - ITEM_HEIGHT, ---- ITEM_HEIGHT - 2*PADDING); ---- text_a->surface.parent = item_a; ---- text_a->surface.parentx = self->frame->text_x; ---- text_a->surface.parenty = PADDING; ---- RrPaint(text_a, self->text, self->frame->text_w - ITEM_HEIGHT, ---- ITEM_HEIGHT - 2*PADDING); ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- if (self->entry->data.separator.label != NULL) { ---- /* labeled separator */ ---- XMoveResizeWindow(obt_display, self->text, ---- ob_rr_theme->paddingx, ob_rr_theme->paddingy, ---- self->area.width - 2*ob_rr_theme->paddingx, ---- ob_rr_theme->menu_title_height - ---- 2*ob_rr_theme->paddingy); ---- text_a->surface.parent = item_a; ---- text_a->surface.parentx = ob_rr_theme->paddingx; ---- text_a->surface.parenty = ob_rr_theme->paddingy; ---- RrPaint(text_a, self->text, ---- self->area.width - 2*ob_rr_theme->paddingx, ---- ob_rr_theme->menu_title_height - ---- 2*ob_rr_theme->paddingy); ---- } else { ---- gint i; ---- ---- /* unlabeled separator */ ---- XMoveResizeWindow(obt_display, self->text, 0, 0, ---- self->area.width, ---- ob_rr_theme->menu_sep_width + ---- 2*ob_rr_theme->menu_sep_paddingy); ---- ---- a_sep->surface.parent = item_a; ---- a_sep->surface.parentx = 0; ---- a_sep->surface.parenty = 0; ---- for (i = 0; i < ob_rr_theme->menu_sep_width; ++i) { ---- a_sep->texture[i].data.lineart.x1 = ---- ob_rr_theme->menu_sep_paddingx; ---- a_sep->texture[i].data.lineart.y1 = ---- ob_rr_theme->menu_sep_paddingy + i; ---- a_sep->texture[i].data.lineart.x2 = ---- self->area.width - ob_rr_theme->menu_sep_paddingx - 1; ---- a_sep->texture[i].data.lineart.y2 = ---- ob_rr_theme->menu_sep_paddingy + i; ---- } ---- ---- RrPaint(a_sep, self->text, self->area.width, ---- ob_rr_theme->menu_sep_width + ---- 2*ob_rr_theme->menu_sep_paddingy); ---- } ---- break; ---- } ---- ---- if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- self->entry->data.normal.icon) ---- { ---- RrAppearance *clear; ---- ---- XMoveResizeWindow(obt_display, self->icon, ---- PADDING, frame->item_margin.top, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom); ---- ---- clear = ob_rr_theme->a_clear_tex; ---- RrAppearanceClearTextures(clear); ---- clear->texture[0].type = RR_TEXTURE_IMAGE; ---- clear->texture[0].data.image.image = ---- self->entry->data.normal.icon; ---- clear->texture[0].data.image.alpha = ---- self->entry->data.normal.icon_alpha; ---- clear->surface.parent = item_a; ---- clear->surface.parentx = PADDING; ---- clear->surface.parenty = frame->item_margin.top; ---- RrPaint(clear, self->icon, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom); ---- XMapWindow(obt_display, self->icon); ---- } else if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- self->entry->data.normal.mask) ---- { ---- RrColor *c; ---- RrAppearance *clear; ---- ---- XMoveResizeWindow(obt_display, self->icon, ---- PADDING, frame->item_margin.top, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom); ---- ---- clear = ob_rr_theme->a_clear_tex; ---- RrAppearanceClearTextures(clear); ---- clear->texture[0].type = RR_TEXTURE_MASK; ---- clear->texture[0].data.mask.mask = ---- self->entry->data.normal.mask; ---- ---- c = (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- !self->entry->data.normal.enabled ? ---- /* disabled */ ---- (self == self->frame->selected ? ---- self->entry->data.normal.mask_disabled_selected_color : ---- self->entry->data.normal.mask_disabled_color) : ---- /* enabled */ ---- (self == self->frame->selected ? ---- self->entry->data.normal.mask_selected_color : ---- self->entry->data.normal.mask_normal_color)); ---- clear->texture[0].data.mask.color = c; ---- ---- clear->surface.parent = item_a; ---- clear->surface.parentx = PADDING; ---- clear->surface.parenty = frame->item_margin.top; ---- RrPaint(clear, self->icon, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom, ---- ITEM_HEIGHT - frame->item_margin.top ---- - frame->item_margin.bottom); ---- XMapWindow(obt_display, self->icon); ---- } else ---- XUnmapWindow(obt_display, self->icon); ---- ---- if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { ---- RrAppearance *bullet_a; ---- XMoveResizeWindow(obt_display, self->bullet, ---- self->frame->text_x + self->frame->text_w - ---- ITEM_HEIGHT + PADDING, PADDING, ---- ITEM_HEIGHT - 2*PADDING, ---- ITEM_HEIGHT - 2*PADDING); ---- bullet_a = (self == self->frame->selected ? ---- ob_rr_theme->a_menu_bullet_selected : ---- ob_rr_theme->a_menu_bullet_normal); ---- bullet_a->surface.parent = item_a; ---- bullet_a->surface.parentx = ---- self->frame->text_x + self->frame->text_w - ITEM_HEIGHT + PADDING; ---- bullet_a->surface.parenty = PADDING; ---- RrPaint(bullet_a, self->bullet, ---- ITEM_HEIGHT - 2*PADDING, ---- ITEM_HEIGHT - 2*PADDING); ---- XMapWindow(obt_display, self->bullet); ---- } else ---- XUnmapWindow(obt_display, self->bullet); ---- ---- XFlush(obt_display); ----} ---- ----/*! this code is taken from the menu_frame_render. if that changes, this won't ---- work.. */ ----static gint menu_entry_frame_get_height(ObMenuEntryFrame *self, ---- gboolean first_entry, ---- gboolean last_entry) ----{ ---- ObMenuEntryType t; ---- gint h = 0; ---- ---- h += 2*PADDING; ---- ---- if (self) ---- t = self->entry->type; ---- else ---- /* this is the More... entry, it's NORMAL type */ ---- t = OB_MENU_ENTRY_TYPE_NORMAL; ---- ---- switch (t) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- h += ob_rr_theme->menu_font_height; ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- if (self->entry->data.separator.label != NULL) { ---- h += ob_rr_theme->menu_title_height + ---- (ob_rr_theme->mbwidth - PADDING) * 2; ---- ---- /* if the first entry is a labeled separator, then make its border ---- overlap with the menu's outside border */ ---- if (first_entry) ---- h -= ob_rr_theme->mbwidth; ---- /* if the last entry is a labeled separator, then make its border ---- overlap with the menu's outside border */ ---- if (last_entry) ---- h -= ob_rr_theme->mbwidth; ---- } else { ---- h += ob_rr_theme->menu_sep_width + ---- 2*ob_rr_theme->menu_sep_paddingy - PADDING * 2; ---- } ---- break; ---- } ---- ---- return h; ----} ---- ----void menu_frame_render(ObMenuFrame *self) ----{ ---- gint w = 0, h = 0; ---- gint tw, th; /* temps */ ---- GList *it; ---- gboolean has_icon = FALSE; ---- ObMenu *sub; ---- ObMenuEntryFrame *e; ---- ---- /* find text dimensions */ ---- ---- STRUT_SET(self->item_margin, 0, 0, 0, 0); ---- ---- if (self->entries) { ---- gint l, t, r, b; ---- ---- e = self->entries->data; ---- ob_rr_theme->a_menu_text_normal->texture[0].data.text.string = ""; ---- tw = RrMinWidth(ob_rr_theme->a_menu_text_normal); ---- tw += 2*PADDING; ---- ---- th = ITEM_HEIGHT; ---- ---- RrMargins(ob_rr_theme->a_menu_normal, &l, &t, &r, &b); ---- STRUT_SET(self->item_margin, ---- MAX(self->item_margin.left, l), ---- MAX(self->item_margin.top, t), ---- MAX(self->item_margin.right, r), ---- MAX(self->item_margin.bottom, b)); ---- RrMargins(ob_rr_theme->a_menu_selected, &l, &t, &r, &b); ---- STRUT_SET(self->item_margin, ---- MAX(self->item_margin.left, l), ---- MAX(self->item_margin.top, t), ---- MAX(self->item_margin.right, r), ---- MAX(self->item_margin.bottom, b)); ---- RrMargins(ob_rr_theme->a_menu_disabled, &l, &t, &r, &b); ---- STRUT_SET(self->item_margin, ---- MAX(self->item_margin.left, l), ---- MAX(self->item_margin.top, t), ---- MAX(self->item_margin.right, r), ---- MAX(self->item_margin.bottom, b)); ---- RrMargins(ob_rr_theme->a_menu_disabled_selected, &l, &t, &r, &b); ---- STRUT_SET(self->item_margin, ---- MAX(self->item_margin.left, l), ---- MAX(self->item_margin.top, t), ---- MAX(self->item_margin.right, r), ---- MAX(self->item_margin.bottom, b)); ---- } ---- ---- /* render the entries */ ---- ---- for (it = self->entries; it; it = g_list_next(it)) { ---- RrAppearance *text_a; ---- e = it->data; ---- ---- /* if the first entry is a labeled separator, then make its border ---- overlap with the menu's outside border */ ---- if (it == self->entries && ---- e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR && ---- e->entry->data.separator.label) ---- { ---- h -= ob_rr_theme->mbwidth; ---- } ---- ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR && ---- e->entry->data.separator.label) ---- { ---- e->border = ob_rr_theme->mbwidth; ---- } ---- ---- RECT_SET_POINT(e->area, 0, h+e->border); ---- XMoveWindow(obt_display, e->window, ---- e->area.x-e->border, e->area.y-e->border); ---- XSetWindowBorderWidth(obt_display, e->window, e->border); ---- XSetWindowBorder(obt_display, e->window, ---- RrColorPixel(ob_rr_theme->menu_border_color)); ---- ---- ---- text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- !e->entry->data.normal.enabled ? ---- /* disabled */ ---- (e == self->selected ? ---- ob_rr_theme->a_menu_text_disabled_selected : ---- ob_rr_theme->a_menu_text_disabled) : ---- /* enabled */ ---- (e == self->selected ? ---- ob_rr_theme->a_menu_text_selected : ---- ob_rr_theme->a_menu_text_normal)); ---- switch (e->entry->type) { ---- case OB_MENU_ENTRY_TYPE_NORMAL: ---- text_a->texture[0].data.text.string = e->entry->data.normal.label; ---- tw = RrMinWidth(text_a); ---- tw = MIN(tw, MAX_MENU_WIDTH); ---- th = ob_rr_theme->menu_font_height; ---- ---- if (e->entry->data.normal.icon || ---- e->entry->data.normal.mask) ---- has_icon = TRUE; ---- break; ---- case OB_MENU_ENTRY_TYPE_SUBMENU: ---- sub = e->entry->data.submenu.submenu; ---- text_a->texture[0].data.text.string = sub ? sub->title : ""; ---- tw = RrMinWidth(text_a); ---- tw = MIN(tw, MAX_MENU_WIDTH); ---- th = ob_rr_theme->menu_font_height; ---- ---- if (e->entry->data.normal.icon || ---- e->entry->data.normal.mask) ---- has_icon = TRUE; ---- ---- tw += ITEM_HEIGHT - PADDING; ---- break; ---- case OB_MENU_ENTRY_TYPE_SEPARATOR: ---- if (e->entry->data.separator.label != NULL) { ---- ob_rr_theme->a_menu_text_title->texture[0].data.text.string = ---- e->entry->data.separator.label; ---- tw = RrMinWidth(ob_rr_theme->a_menu_text_title) + ---- 2*ob_rr_theme->paddingx; ---- tw = MIN(tw, MAX_MENU_WIDTH); ---- th = ob_rr_theme->menu_title_height + ---- (ob_rr_theme->mbwidth - PADDING) *2; ---- } else { ---- tw = 0; ---- th = ob_rr_theme->menu_sep_width + ---- 2*ob_rr_theme->menu_sep_paddingy - 2*PADDING; ---- } ---- break; ---- } ---- tw += 2*PADDING; ---- th += 2*PADDING; ---- w = MAX(w, tw); ---- h += th; ---- } - - w += 20; ---- ---- /* if the last entry is a labeled separator, then make its border ---- overlap with the menu's outside border */ ---- it = g_list_last(self->entries); ---- e = it ? it->data : NULL; ---- if (e && e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR && ---- e->entry->data.separator.label) ---- { ---- h -= ob_rr_theme->mbwidth; ---- } ---- ---- self->text_x = PADDING; ---- self->text_w = w; ---- ---- if (self->entries) { ---- if (has_icon) { ---- w += ITEM_HEIGHT + PADDING; ---- self->text_x += ITEM_HEIGHT + PADDING; ---- } ---- } ---- ---- if (!w) w = 10; ---- if (!h) h = 3; ---- ---- XResizeWindow(obt_display, self->window, w, h); ---- ---- self->inner_w = w; ---- ---- RrPaint(self->a_items, self->window, w, h); ---- ---- for (it = self->entries; it; it = g_list_next(it)) ---- menu_entry_frame_render(it->data); ---- ---- w += ob_rr_theme->mbwidth * 2; ---- h += ob_rr_theme->mbwidth * 2; ---- ---- RECT_SET_SIZE(self->area, w, h); ---- ---- XFlush(obt_display); ----} ---- ----static void menu_frame_update(ObMenuFrame *self) ----{ ---- GList *mit, *fit; ---- Rect *a; ---- gint h; ---- ---- menu_pipe_execute(self->menu); ---- menu_find_submenus(self->menu); ---- ---- self->selected = NULL; ---- ---- /* start at show_from */ ---- mit = g_list_nth(self->menu->entries, self->show_from); ---- ---- /* go through the menu's and frame's entries and connect the frame entries ---- to the menu entries */ ---- for (fit = self->entries; mit && fit; ---- mit = g_list_next(mit), fit = g_list_next(fit)) ---- { ---- ObMenuEntryFrame *f = fit->data; ---- f->entry = mit->data; ---- } ---- ---- /* if there are more menu entries than in the frame, add them */ ---- while (mit) { ---- ObMenuEntryFrame *e = menu_entry_frame_new(mit->data, self); ---- self->entries = g_list_append(self->entries, e); ---- mit = g_list_next(mit); ---- } ---- ---- /* if there are more frame entries than menu entries then get rid of ---- them */ ---- while (fit) { ---- GList *n = g_list_next(fit); ---- menu_entry_frame_free(fit->data); ---- self->entries = g_list_delete_link(self->entries, fit); ---- fit = n; ---- } ---- ---- /* * make the menu fit on the screen */ ---- ---- /* calculate the height of the menu */ ---- h = 0; ---- for (fit = self->entries; fit; fit = g_list_next(fit)) ---- h += menu_entry_frame_get_height(fit->data, ---- fit == self->entries, ---- g_list_next(fit) == NULL); ---- /* add the border at the top and bottom */ ---- h += ob_rr_theme->mbwidth * 2; ---- ---- a = screen_physical_area_monitor(self->monitor); ---- ---- if (h > a->height) { ---- GList *flast, *tmp; ---- gboolean last_entry = TRUE; ---- ---- /* take the height of our More... entry into account */ ---- h += menu_entry_frame_get_height(NULL, FALSE, TRUE); ---- ---- /* start at the end of the entries */ ---- flast = g_list_last(self->entries); ---- ---- /* pull out all the entries from the frame that don't ---- fit on the screen, leaving at least 1 though */ ---- while (h > a->height && g_list_previous(flast) != NULL) { ---- /* update the height, without this entry */ ---- h -= menu_entry_frame_get_height(flast->data, FALSE, last_entry); ---- ---- /* destroy the entry we're not displaying */ ---- tmp = flast; ---- flast = g_list_previous(flast); ---- menu_entry_frame_free(tmp->data); ---- self->entries = g_list_delete_link(self->entries, tmp); ---- ---- /* only the first one that we see is the last entry in the menu */ ---- last_entry = FALSE; ---- }; ---- ---- { ---- ObMenuEntry *more_entry; ---- ObMenuEntryFrame *more_frame; ---- /* make the More... menu entry frame which will display in this ---- frame. ---- if self->menu->more_menu is NULL that means that this is already ---- More... menu, so just use ourself. ---- */ ---- more_entry = menu_get_more((self->menu->more_menu ? ---- self->menu->more_menu : ---- self->menu), ---- /* continue where we left off */ ---- self->show_from + ---- g_list_length(self->entries)); ---- more_frame = menu_entry_frame_new(more_entry, self); ---- /* make it get deleted when the menu frame goes away */ ---- menu_entry_unref(more_entry); ---- ---- /* add our More... entry to the frame */ ---- self->entries = g_list_append(self->entries, more_frame); ---- } ---- } ---- ---- g_free(a); ---- ---- menu_frame_render(self); ----} ---- ----static gboolean menu_frame_is_visible(ObMenuFrame *self) ----{ ---- return !!(g_list_find(menu_frame_visible, self)); ----} ---- ----static gboolean menu_frame_show(ObMenuFrame *self) ----{ ---- GList *it; ---- ---- /* determine if the underlying menu is already visible */ ---- for (it = menu_frame_visible; it; it = g_list_next(it)) { ---- ObMenuFrame *f = it->data; ---- if (f->menu == self->menu) ---- break; ---- } ---- if (!it) { ---- if (self->menu->update_func) ---- if (!self->menu->update_func(self, self->menu->data)) ---- return FALSE; ---- } ---- ---- if (menu_frame_visible == NULL) { ---- /* no menus shown yet */ ---- ---- /* grab the pointer in such a way as to pass through "owner events" ---- so that we can get enter/leave notifies in the menu. */ ---- if (!grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER)) ---- return FALSE; ---- if (!grab_keyboard()) { ---- ungrab_pointer(); ---- return FALSE; ---- } ---- } ---- ---- menu_frame_update(self); ---- ---- menu_frame_visible = g_list_prepend(menu_frame_visible, self); ---- ---- if (self->menu->show_func) ---- self->menu->show_func(self, self->menu->data); ---- ---- return TRUE; ----} ---- ----gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y, ---- gboolean mouse) ----{ ---- gint px, py; ---- guint i; ---- ---- if (menu_frame_is_visible(self)) ---- return TRUE; ---- if (!menu_frame_show(self)) ---- return FALSE; ---- ---- /* find the monitor the menu is on */ ---- for (i = 0; i < screen_num_monitors; ++i) { ---- Rect *a = screen_physical_area_monitor(i); ---- gboolean contains = RECT_CONTAINS(*a, x, y); ---- g_free(a); ---- if (contains) { ---- self->monitor = i; ---- break; ---- } ---- } ---- ---- if (self->menu->place_func) ---- self->menu->place_func(self, &x, &y, mouse, self->menu->data); ---- else ---- menu_frame_place_topmenu(self, &x, &y); ---- ---- menu_frame_move(self, x, y); ---- ---- XMapWindow(obt_display, self->window); ---- ---- if (screen_pointer_pos(&px, &py)) { ---- ObMenuEntryFrame *e = menu_entry_frame_under(px, py); ---- if (e && e->frame == self) ---- e->ignore_enters++; ---- } ---- ---- return TRUE; ----} ---- ----gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, ---- ObMenuEntryFrame *parent_entry) ----{ ---- gint x, y, dx, dy; ---- gint px, py; ---- ---- if (menu_frame_is_visible(self)) ---- return TRUE; ---- ---- self->monitor = parent->monitor; ---- self->parent = parent; ---- self->parent_entry = parent_entry; ---- ---- /* set up parent's child to be us */ ---- if (parent->child) ---- menu_frame_hide(parent->child); ---- parent->child = self; ---- ---- if (!menu_frame_show(self)) ---- return FALSE; ---- ---- menu_frame_place_submenu(self, &x, &y); ---- menu_frame_move_on_screen(self, x, y, &dx, &dy); ---- ---- if (dx != 0) { ---- /*try the other side */ ---- self->direction_right = !self->direction_right; ---- menu_frame_place_submenu(self, &x, &y); ---- menu_frame_move_on_screen(self, x, y, &dx, &dy); ---- } ---- menu_frame_move(self, x + dx, y + dy); ---- ---- XMapWindow(obt_display, self->window); ---- ---- if (screen_pointer_pos(&px, &py)) { ---- ObMenuEntryFrame *e = menu_entry_frame_under(px, py); ---- if (e && e->frame == self) ---- e->ignore_enters++; ---- } ---- ---- return TRUE; ----} ---- ----static void menu_frame_hide(ObMenuFrame *self) ----{ ---- GList *it = g_list_find(menu_frame_visible, self); ---- ---- if (!it) ---- return; ---- ---- if (self->menu->hide_func) ---- self->menu->hide_func(self, self->menu->data); ---- ---- if (self->child) ---- menu_frame_hide(self->child); ---- ---- if (self->parent) ---- self->parent->child = NULL; ---- self->parent = NULL; ---- self->parent_entry = NULL; ---- ---- menu_frame_visible = g_list_delete_link(menu_frame_visible, it); ---- ---- if (menu_frame_visible == NULL) { ---- /* last menu shown */ ---- ungrab_pointer(); ---- ungrab_keyboard(); ---- } ---- ---- XUnmapWindow(obt_display, self->window); ---- ---- menu_frame_free(self); ----} ---- ----void menu_frame_hide_all(void) ----{ ---- GList *it; ---- ---- if (config_submenu_show_delay) { ---- /* remove any submenu open requests */ ---- obt_main_loop_timeout_remove(ob_main_loop, ---- menu_entry_frame_submenu_timeout); ---- } ---- if ((it = g_list_last(menu_frame_visible))) ---- menu_frame_hide(it->data); ----} ---- ----void menu_frame_hide_all_client(ObClient *client) ----{ ---- GList *it = g_list_last(menu_frame_visible); ---- if (it) { ---- ObMenuFrame *f = it->data; ---- if (f->client == client) { ---- if (config_submenu_show_delay) { ---- /* remove any submenu open requests */ ---- obt_main_loop_timeout_remove(ob_main_loop, ---- menu_entry_frame_submenu_timeout); ---- } ---- menu_frame_hide(f); ---- } ---- } ----} ---- ---- ----ObMenuFrame* menu_frame_under(gint x, gint y) ----{ ---- ObMenuFrame *ret = NULL; ---- GList *it; ---- ---- for (it = menu_frame_visible; it; it = g_list_next(it)) { ---- ObMenuFrame *f = it->data; ---- ---- if (RECT_CONTAINS(f->area, x, y)) { ---- ret = f; ---- break; ---- } ---- } ---- return ret; ----} ---- ----ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y) ----{ ---- ObMenuFrame *frame; ---- ObMenuEntryFrame *ret = NULL; ---- GList *it; ---- ---- if ((frame = menu_frame_under(x, y))) { ---- x -= ob_rr_theme->mbwidth + frame->area.x; ---- y -= ob_rr_theme->mbwidth + frame->area.y; ---- ---- for (it = frame->entries; it; it = g_list_next(it)) { ---- ObMenuEntryFrame *e = it->data; ---- ---- if (RECT_CONTAINS(e->area, x, y)) { ---- ret = e; ---- break; ---- } ---- } ---- } ---- return ret; ----} ---- ----static gboolean menu_entry_frame_submenu_timeout(gpointer data) ----{ ---- g_assert(menu_frame_visible); ---- menu_entry_frame_show_submenu((ObMenuEntryFrame*)data); ---- return FALSE; ----} ---- ----void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry, ---- gboolean immediate) ----{ ---- ObMenuEntryFrame *old = self->selected; ---- ObMenuFrame *oldchild = self->child; ---- ---- if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) ---- entry = old; ---- ---- if (old == entry) return; ---- ---- if (config_submenu_show_delay) { ---- /* remove any submenu open requests */ ---- obt_main_loop_timeout_remove(ob_main_loop, ---- menu_entry_frame_submenu_timeout); ---- } ---- ---- self->selected = entry; ---- ---- if (old) ---- menu_entry_frame_render(old); ---- if (oldchild) ---- menu_frame_hide(oldchild); ---- ---- if (self->selected) { ---- menu_entry_frame_render(self->selected); ---- ---- if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { ---- if (config_submenu_show_delay && !immediate) { ---- /* initiate a new submenu open request */ ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_submenu_show_delay * 1000, ---- menu_entry_frame_submenu_timeout, ---- self->selected, g_direct_equal, ---- NULL); ---- } else { ---- menu_entry_frame_show_submenu(self->selected); ---- } ---- } ---- } ----} ---- ----void menu_entry_frame_show_submenu(ObMenuEntryFrame *self) ----{ ---- ObMenuFrame *f; ---- ---- if (!self->entry->data.submenu.submenu) return; ---- ---- f = menu_frame_new(self->entry->data.submenu.submenu, ---- self->entry->data.submenu.show_from, ---- self->frame->client); ---- /* pass our direction on to our child */ ---- f->direction_right = self->frame->direction_right; ---- ---- menu_frame_show_submenu(f, self->frame, self); ----} ---- ----void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state) ----{ ---- if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && ---- self->entry->data.normal.enabled) ---- { ---- /* grab all this shizzle, cuz when the menu gets hidden, 'self' ---- gets freed */ ---- ObMenuEntry *entry = self->entry; ---- ObMenuExecuteFunc func = self->frame->menu->execute_func; ---- gpointer data = self->frame->menu->data; ---- GSList *acts = self->entry->data.normal.actions; ---- ObClient *client = self->frame->client; ---- ObMenuFrame *frame = self->frame; ---- ---- /* release grabs before executing the shit */ ---- if (!(state & ControlMask)) { ---- menu_frame_hide_all(); ---- frame = NULL; ---- } ---- ---- if (func) ---- func(entry, frame, client, state, data); ---- else ---- actions_run_acts(acts, OB_USER_ACTION_MENU_SELECTION, ---- state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, client); ---- } ----} ---- ----void menu_frame_select_previous(ObMenuFrame *self) ----{ ---- GList *it = NULL, *start; ---- ---- if (self->entries) { ---- start = it = g_list_find(self->entries, self->selected); ---- while (TRUE) { ---- ObMenuEntryFrame *e; ---- ---- it = it ? g_list_previous(it) : g_list_last(self->entries); ---- if (it == start) ---- break; ---- ---- if (it) { ---- e = it->data; ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) ---- break; ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ---- break; ---- } ---- } ---- } ---- menu_frame_select(self, it ? it->data : NULL, TRUE); ----} ---- ----void menu_frame_select_next(ObMenuFrame *self) ----{ ---- GList *it = NULL, *start; ---- ---- if (self->entries) { ---- start = it = g_list_find(self->entries, self->selected); ---- while (TRUE) { ---- ObMenuEntryFrame *e; ---- ---- it = it ? g_list_next(it) : self->entries; ---- if (it == start) ---- break; ---- ---- if (it) { ---- e = it->data; ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) ---- break; ---- if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) ---- break; ---- } ---- } ---- } ---- menu_frame_select(self, it ? it->data : NULL, TRUE); ----} diff --cc openbox/menuframe.h index 1d5dd0cb,1d5dd0cb,1d5dd0cb,1d5dd0cb..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/menuframe.h +++ /dev/null @@@@@ -1,137 -1,137 -1,137 -1,137 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- menuframe.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__menuframe_h ----#define ob__menuframe_h ---- ----#include "geom.h" ----#include "window.h" ----#include "render/render.h" ---- ----#include ---- ----struct _ObClient; ----struct _ObMenu; ----struct _ObMenuEntry; ---- ----typedef struct _ObMenuFrame ObMenuFrame; ----typedef struct _ObMenuEntryFrame ObMenuEntryFrame; ---- ----extern GList *menu_frame_visible; ---- ----struct _ObMenuFrame ----{ ---- /* stuff to be an ObWindow */ ---- ObWindow obwin; ---- Window window; ---- ---- struct _ObMenu *menu; ---- ---- /* The client that the visual instance of the menu is associated with for ---- its actions */ ---- struct _ObClient *client; ---- ---- ObMenuFrame *parent; ---- ObMenuEntryFrame *parent_entry; ---- ObMenuFrame *child; ---- ---- GList *entries; ---- ObMenuEntryFrame *selected; ---- ---- /* show entries from the menu starting at this index */ ---- guint show_from; ---- ---- /* If the submenus are being drawn to the right or the left */ ---- gboolean direction_right; ---- ---- /* On-screen area (including borders!) */ ---- Rect area; ---- Strut item_margin; ---- gint inner_w; /* inside the borders */ ---- gint item_h; /* height of all normal items */ ---- gint text_x; /* offset at which the text appears in the items */ ---- gint text_w; /* width of the text area in the items */ ---- gint text_h; /* height of the items */ ---- ---- gint monitor; /* monitor on which to show the menu in xinerama */ ---- ---- /* We make a copy of this for each menu, so that we don't have to re-render ---- the background of the entire menu each time we render an item inside it. ---- */ ---- RrAppearance *a_items; ---- ---- gboolean got_press; /* don't allow a KeyRelease event to run things in the ---- menu until it has seen a KeyPress. this is to ---- avoid having the keybinding used to show the menu ---- end up running something inside the menu */ ----}; ---- ----struct _ObMenuEntryFrame ----{ ---- struct _ObMenuEntry *entry; ---- ObMenuFrame *frame; ---- ---- guint ignore_enters; ---- ---- Rect area; ---- gint border; ---- ---- Window window; ---- Window icon; ---- Window text; ---- Window bullet; ----}; ---- ----extern GHashTable *menu_frame_map; ---- ----void menu_frame_startup(gboolean reconfig); ----void menu_frame_shutdown(gboolean reconfig); ---- ----ObMenuFrame* menu_frame_new(struct _ObMenu *menu, ---- guint show_from, ---- struct _ObClient *client); ----void menu_frame_free(ObMenuFrame *self); ---- ----void menu_frame_move(ObMenuFrame *self, gint x, gint y); ----void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y, ---- gint *dx, gint *dy); ---- ----gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y, ---- gint button); ----gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, ---- ObMenuEntryFrame *parent_entry); ---- ----void menu_frame_hide_all(void); ----void menu_frame_hide_all_client(struct _ObClient *client); ---- ----void menu_frame_render(ObMenuFrame *self); ---- ----void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry, ---- gboolean immediate); ----void menu_frame_select_previous(ObMenuFrame *self); ----void menu_frame_select_next(ObMenuFrame *self); ---- ----ObMenuFrame* menu_frame_under(gint x, gint y); ----ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y); ---- ----void menu_entry_frame_show_submenu(ObMenuEntryFrame *self); ---- ----void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state); ---- ----#endif diff --cc openbox/misc.h index c73c9265,c73c9265,c73c9265,c73c9265..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/misc.h +++ /dev/null @@@@@ -1,113 -1,113 -1,113 -1,113 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- misc.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __ob__misc_h ----#define __ob__misc_h ---- ----/*! The alpha value to use for icons of iconified windows in various places ---- like the focus cycle popup and client list menus. ---- Give iconic windows 7/16 alpha. A little under 50%. ---- */ ----#define OB_ICONIC_ALPHA 0x70 ---- ----typedef enum ----{ ---- OB_CURSOR_NONE, ---- OB_CURSOR_POINTER, ---- OB_CURSOR_BUSYPOINTER, ---- OB_CURSOR_BUSY, ---- OB_CURSOR_MOVE, ---- OB_CURSOR_NORTH, ---- OB_CURSOR_NORTHEAST, ---- OB_CURSOR_EAST, ---- OB_CURSOR_SOUTHEAST, ---- OB_CURSOR_SOUTH, ---- OB_CURSOR_SOUTHWEST, ---- OB_CURSOR_WEST, ---- OB_CURSOR_NORTHWEST, ---- OB_NUM_CURSORS ----} ObCursor; ---- ----typedef enum ----{ ---- OB_KEY_RETURN, ---- OB_KEY_ESCAPE, ---- OB_KEY_LEFT, ---- OB_KEY_RIGHT, ---- OB_KEY_UP, ---- OB_KEY_DOWN, ---- OB_KEY_TAB, ---- OB_KEY_SPACE, ---- OB_NUM_KEYS ----} ObKey; ---- ----typedef enum ----{ ---- OB_STATE_STARTING, ---- OB_STATE_RUNNING, ---- OB_STATE_EXITING ----} ObState; ---- ----typedef enum ----{ ---- OB_DIRECTION_NORTH, ---- OB_DIRECTION_NORTHEAST, ---- OB_DIRECTION_EAST, ---- OB_DIRECTION_SOUTHEAST, ---- OB_DIRECTION_SOUTH, ---- OB_DIRECTION_SOUTHWEST, ---- OB_DIRECTION_WEST, ---- OB_DIRECTION_NORTHWEST ----} ObDirection; ---- ----typedef enum ----{ ---- OB_ORIENTATION_HORZ, ---- OB_ORIENTATION_VERT ----} ObOrientation; ---- ----typedef enum ----{ ---- OB_CORNER_TOPLEFT, ---- OB_CORNER_TOPRIGHT, ---- OB_CORNER_BOTTOMLEFT, ---- OB_CORNER_BOTTOMRIGHT ----} ObCorner; ---- ----typedef enum { ---- OB_MOUSE_ACTION_PRESS, ---- OB_MOUSE_ACTION_RELEASE, ---- OB_MOUSE_ACTION_CLICK, ---- OB_MOUSE_ACTION_DOUBLE_CLICK, ---- OB_MOUSE_ACTION_MOTION, ---- OB_NUM_MOUSE_ACTIONS ----} ObMouseAction; ---- ----typedef enum { ---- OB_USER_ACTION_NONE, /* being fired from inside another action and such */ ---- OB_USER_ACTION_KEYBOARD_KEY, ---- OB_USER_ACTION_MOUSE_PRESS, ---- OB_USER_ACTION_MOUSE_RELEASE, ---- OB_USER_ACTION_MOUSE_CLICK, ---- OB_USER_ACTION_MOUSE_DOUBLE_CLICK, ---- OB_USER_ACTION_MOUSE_MOTION, ---- OB_USER_ACTION_MENU_SELECTION, ---- OB_NUM_USER_ACTIONS ----} ObUserAction; ---- ----#endif diff --cc openbox/mouse.c index cd8490f1,cd8490f1,cd8490f1,cd8490f1..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/mouse.c +++ /dev/null @@@@@ -1,409 -1,409 -1,409 -1,409 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- mouse.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "openbox.h" ----#include "config.h" ----#include "actions.h" ----#include "event.h" ----#include "client.h" ----#include "grab.h" ----#include "frame.h" ----#include "translate.h" ----#include "mouse.h" ----#include "gettext.h" ----#include "obt/display.h" ---- ----#include ---- ----typedef struct { ---- guint state; ---- guint button; ---- GSList *actions[OB_NUM_MOUSE_ACTIONS]; /* lists of Action pointers */ ----} ObMouseBinding; ---- ----/* Array of GSList*s of ObMouseBinding*s. */ ----static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS]; ----/* TRUE when we have a grab on the pointer and need to replay the pointer event ---- to send it to other applications */ ----static gboolean replay_pointer_needed; ---- ----ObFrameContext mouse_button_frame_context(ObFrameContext context, ---- guint button, ---- guint state) ----{ ---- GSList *it; ---- ObFrameContext x = context; ---- ---- for (it = bound_contexts[context]; it; it = g_slist_next(it)) { ---- ObMouseBinding *b = it->data; ---- ---- if (b->button == button && b->state == state) ---- return context; ---- } ---- ---- switch (context) { ---- case OB_FRAME_CONTEXT_NONE: ---- case OB_FRAME_CONTEXT_DESKTOP: ---- case OB_FRAME_CONTEXT_CLIENT: ---- case OB_FRAME_CONTEXT_TITLEBAR: ---- case OB_FRAME_CONTEXT_FRAME: ---- case OB_FRAME_CONTEXT_MOVE_RESIZE: ---- case OB_FRAME_CONTEXT_LEFT: ---- case OB_FRAME_CONTEXT_RIGHT: ---- break; ---- case OB_FRAME_CONTEXT_ROOT: ---- x = OB_FRAME_CONTEXT_DESKTOP; ---- break; ---- case OB_FRAME_CONTEXT_BOTTOM: ---- case OB_FRAME_CONTEXT_BLCORNER: ---- case OB_FRAME_CONTEXT_BRCORNER: ---- x = OB_FRAME_CONTEXT_BOTTOM; ---- break; ---- case OB_FRAME_CONTEXT_TLCORNER: ---- case OB_FRAME_CONTEXT_TRCORNER: ---- case OB_FRAME_CONTEXT_TOP: ---- case OB_FRAME_CONTEXT_MAXIMIZE: ---- case OB_FRAME_CONTEXT_ALLDESKTOPS: ---- case OB_FRAME_CONTEXT_SHADE: ---- case OB_FRAME_CONTEXT_ICONIFY: ---- case OB_FRAME_CONTEXT_ICON: ---- case OB_FRAME_CONTEXT_CLOSE: ---- x = OB_FRAME_CONTEXT_TITLEBAR; ---- break; ---- case OB_FRAME_NUM_CONTEXTS: ---- g_assert_not_reached(); ---- } ---- ---- /* allow for multiple levels of fall-through */ ---- if (x != context) ---- return mouse_button_frame_context(x, button, state); ---- else ---- return x; ----} ---- ----void mouse_grab_for_client(ObClient *client, gboolean grab) ----{ ---- gint i; ---- GSList *it; ---- ---- for (i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) ---- for (it = bound_contexts[i]; it; it = g_slist_next(it)) { ---- /* grab/ungrab the button */ ---- ObMouseBinding *b = it->data; ---- Window win; ---- gint mode; ---- guint mask; ---- ---- if (FRAME_CONTEXT(i, client)) { ---- win = client->frame->window; ---- mode = GrabModeAsync; ---- mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; ---- } else if (CLIENT_CONTEXT(i, client)) { ---- win = client->window; ---- mode = GrabModeSync; /* this is handled in event */ ---- mask = ButtonPressMask; /* can't catch more than this with Sync ---- mode the release event is ---- manufactured in event() */ ---- } else continue; ---- ---- if (grab) ---- grab_button_full(b->button, b->state, win, mask, mode, ---- OB_CURSOR_NONE); ---- else ---- ungrab_button(b->button, b->state, win); ---- } ----} ---- ----static void grab_all_clients(gboolean grab) ----{ ---- GList *it; ---- ---- for (it = client_list; it; it = g_list_next(it)) ---- mouse_grab_for_client(it->data, grab); ----} ---- ----void mouse_unbind_all(void) ----{ ---- gint i; ---- GSList *it; ---- ---- for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) { ---- for (it = bound_contexts[i]; it; it = g_slist_next(it)) { ---- ObMouseBinding *b = it->data; ---- gint j; ---- ---- for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) { ---- GSList *jt; ---- ---- for (jt = b->actions[j]; jt; jt = g_slist_next(jt)) ---- actions_act_unref(jt->data); ---- g_slist_free(b->actions[j]); ---- } ---- g_free(b); ---- } ---- g_slist_free(bound_contexts[i]); ---- bound_contexts[i] = NULL; ---- } ----} ---- ----static ObUserAction mouse_action_to_user_action(ObMouseAction a) ----{ ---- switch (a) { ---- case OB_MOUSE_ACTION_PRESS: return OB_USER_ACTION_MOUSE_PRESS; ---- case OB_MOUSE_ACTION_RELEASE: return OB_USER_ACTION_MOUSE_RELEASE; ---- case OB_MOUSE_ACTION_CLICK: return OB_USER_ACTION_MOUSE_CLICK; ---- case OB_MOUSE_ACTION_DOUBLE_CLICK: ---- return OB_USER_ACTION_MOUSE_DOUBLE_CLICK; ---- case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION; ---- default: ---- g_assert_not_reached(); ---- } ----} ---- ----static gboolean fire_binding(ObMouseAction a, ObFrameContext context, ---- ObClient *c, guint state, ---- guint button, gint x, gint y) ----{ ---- GSList *it; ---- ObMouseBinding *b; ---- ---- for (it = bound_contexts[context]; it; it = g_slist_next(it)) { ---- b = it->data; ---- if (b->state == state && b->button == button) ---- break; ---- } ---- /* if not bound, then nothing to do! */ ---- if (it == NULL) return FALSE; ---- ---- actions_run_acts(b->actions[a], mouse_action_to_user_action(a), ---- state, x, y, button, context, c); ---- return TRUE; ----} ---- ----void mouse_replay_pointer(void) ----{ ---- if (replay_pointer_needed) { ---- /* replay the pointer event before any windows move */ ---- XAllowEvents(obt_display, ReplayPointer, event_curtime); ---- replay_pointer_needed = FALSE; ---- } ----} ---- ----void mouse_event(ObClient *client, XEvent *e) ----{ ---- static Time ltime; ---- static guint button = 0, state = 0, lbutton = 0; ---- static Window lwindow = None; ---- static gint px, py, pwx = -1, pwy = -1; ---- ---- ObFrameContext context; ---- gboolean click = FALSE; ---- gboolean dclick = FALSE; ---- ---- switch (e->type) { ---- case ButtonPress: ---- context = frame_context(client, e->xbutton.window, ---- e->xbutton.x, e->xbutton.y); ---- context = mouse_button_frame_context(context, e->xbutton.button, ---- e->xbutton.state); ---- ---- px = e->xbutton.x_root; ---- py = e->xbutton.y_root; ---- if (!button) pwx = e->xbutton.x; ---- if (!button) pwy = e->xbutton.y; ---- button = e->xbutton.button; ---- state = e->xbutton.state; ---- ---- /* if the binding was in a client context, then we need to call ---- XAllowEvents with ReplayPointer at some point, to send the event ---- through to the client. when this happens though depends. if ---- windows are going to be moved on screen, then the click will end ---- up going somewhere wrong, set that we need it, and if nothing ---- else causes the replay pointer to be run, then we will do it ---- after all the actions are finished. ---- ---- (We do it after all the actions because FocusIn interrupts ---- dragging for kdesktop, so if we send the button event now, and ---- then they get a focus event after, it breaks. Instead, wait to send ---- the button press until after the actions when possible.) ---- */ ---- if (CLIENT_CONTEXT(context, client)) ---- replay_pointer_needed = TRUE; ---- ---- fire_binding(OB_MOUSE_ACTION_PRESS, context, ---- client, e->xbutton.state, ---- e->xbutton.button, ---- e->xbutton.x_root, e->xbutton.y_root); ---- ---- /* if the bindings grab the pointer, there won't be a ButtonRelease ---- event for us */ ---- if (grab_on_pointer()) ---- button = 0; ---- ---- /* replay the pointer event if it hasn't been replayed yet (i.e. no ---- windows were moved) */ ---- mouse_replay_pointer(); ---- ---- /* in the client context, we won't get a button release because of the ---- way it is grabbed, so just fake one */ ---- if (!CLIENT_CONTEXT(context, client)) ---- break; ---- ---- case ButtonRelease: ---- /* use where the press occured in the window */ ---- context = frame_context(client, e->xbutton.window, pwx, pwy); ---- context = mouse_button_frame_context(context, e->xbutton.button, ---- e->xbutton.state); ---- ---- if (e->xbutton.button == button) ---- pwx = pwy = -1; ---- ---- if (e->xbutton.button == button) { ---- /* clicks are only valid if its released over the window */ ---- gint junk1, junk2; ---- Window wjunk; ---- guint ujunk, b, w, h; ---- /* this can cause errors to occur when the window closes */ ---- obt_display_ignore_errors(TRUE); ---- junk1 = XGetGeometry(obt_display, e->xbutton.window, ---- &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); ---- obt_display_ignore_errors(FALSE); ---- if (junk1) { ---- if (e->xbutton.x >= (signed)-b && ---- e->xbutton.y >= (signed)-b && ---- e->xbutton.x < (signed)(w+b) && ---- e->xbutton.y < (signed)(h+b)) { ---- click = TRUE; ---- /* double clicks happen if there were 2 in a row! */ ---- if (lbutton == button && ---- lwindow == e->xbutton.window && ---- e->xbutton.time - config_mouse_dclicktime <= ---- ltime) { ---- dclick = TRUE; ---- lbutton = 0; ---- } else { ---- lbutton = button; ---- lwindow = e->xbutton.window; ---- } ---- } else { ---- lbutton = 0; ---- lwindow = None; ---- } ---- } ---- ---- button = 0; ---- state = 0; ---- ltime = e->xbutton.time; ---- } ---- fire_binding(OB_MOUSE_ACTION_RELEASE, context, ---- client, e->xbutton.state, ---- e->xbutton.button, ---- e->xbutton.x_root, ---- e->xbutton.y_root); ---- if (click) ---- fire_binding(OB_MOUSE_ACTION_CLICK, context, ---- client, e->xbutton.state, ---- e->xbutton.button, ---- e->xbutton.x_root, ---- e->xbutton.y_root); ---- if (dclick) ---- fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context, ---- client, e->xbutton.state, ---- e->xbutton.button, ---- e->xbutton.x_root, ---- e->xbutton.y_root); ---- break; ---- ---- case MotionNotify: ---- if (button) { ---- context = frame_context(client, e->xmotion.window, pwx, pwy); ---- context = mouse_button_frame_context(context, button, state); ---- ---- if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold || ---- ABS(e->xmotion.y_root - py) >= config_mouse_threshold) { ---- ---- /* You can't drag on buttons */ ---- if (context == OB_FRAME_CONTEXT_MAXIMIZE || ---- context == OB_FRAME_CONTEXT_ALLDESKTOPS || ---- context == OB_FRAME_CONTEXT_SHADE || ---- context == OB_FRAME_CONTEXT_ICONIFY || ---- context == OB_FRAME_CONTEXT_ICON || ---- context == OB_FRAME_CONTEXT_CLOSE) ---- break; ---- ---- fire_binding(OB_MOUSE_ACTION_MOTION, context, ---- client, state, button, px, py); ---- button = 0; ---- state = 0; ---- } ---- } ---- break; ---- ---- default: ---- g_assert_not_reached(); ---- } ----} ---- ----gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, ---- ObMouseAction mact, ObActionsAct *action) ----{ ---- guint state, button; ---- ObFrameContext context; ---- ObMouseBinding *b; ---- GSList *it; ---- ---- if (!translate_button(buttonstr, &state, &button)) { ---- g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr); ---- return FALSE; ---- } ---- ---- context = frame_context_from_string(contextstr); ---- if (!context) { ---- g_message(_("Invalid context \"%s\" in mouse binding"), contextstr); ---- return FALSE; ---- } ---- ---- for (it = bound_contexts[context]; it; it = g_slist_next(it)) { ---- b = it->data; ---- if (b->state == state && b->button == button) { ---- b->actions[mact] = g_slist_append(b->actions[mact], action); ---- return TRUE; ---- } ---- } ---- ---- /* add the binding */ ---- b = g_new0(ObMouseBinding, 1); ---- b->state = state; ---- b->button = button; ---- b->actions[mact] = g_slist_append(NULL, action); ---- bound_contexts[context] = g_slist_append(bound_contexts[context], b); ---- ---- return TRUE; ----} ---- ----void mouse_startup(gboolean reconfig) ----{ ---- grab_all_clients(TRUE); ----} ---- ----void mouse_shutdown(gboolean reconfig) ----{ ---- grab_all_clients(FALSE); ---- mouse_unbind_all(); ----} diff --cc openbox/mouse.h index 2bd5d577,2bd5d577,2bd5d577,2bd5d577..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/mouse.h +++ /dev/null @@@@@ -1,48 -1,48 -1,48 -1,48 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- mouse.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__mouse_h ----#define ob__mouse_h ---- ----#include "frame.h" ----#include "misc.h" ---- ----#include ---- ----struct _ObActionsAct; ---- ----void mouse_startup(gboolean reconfig); ----void mouse_shutdown(gboolean reconfig); ---- ----gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, ---- ObMouseAction mact, struct _ObActionsAct *action); ----void mouse_unbind_all(void); ---- ----void mouse_event(struct _ObClient *client, XEvent *e); ---- ----void mouse_grab_for_client(struct _ObClient *client, gboolean grab); ---- ----ObFrameContext mouse_button_frame_context(ObFrameContext context, ---- guint button, guint state); ---- ----/*! If a replay pointer is needed, then do it. Call this when windows are ---- going to be moving/appearing/disappearing, so that you know the mouse click ---- will go to the right window */ ----void mouse_replay_pointer(void); ---- ----#endif diff --cc openbox/moveresize.c index ddc518ad,ddc518ad,ddc518ad,ddc518ad..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/moveresize.c +++ /dev/null @@@@@ -1,953 -1,953 -1,953 -1,953 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- moveresize.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "grab.h" ----#include "framerender.h" ----#include "screen.h" ----#include "client.h" ----#include "frame.h" ----#include "openbox.h" ----#include "resist.h" ----#include "popup.h" ----#include "moveresize.h" ----#include "config.h" ----#include "event.h" ----#include "debug.h" ----#include "render/render.h" ----#include "render/theme.h" ----#include "obt/display.h" ----#include "obt/prop.h" ----#include "obt/keyboard.h" ---- ----#include ----#include ---- ----/* how far windows move and resize with the keyboard arrows */ ----#define KEY_DIST 8 ---- ----gboolean moveresize_in_progress = FALSE; ----ObClient *moveresize_client = NULL; ----#ifdef SYNC ----XSyncAlarm moveresize_alarm = None; ----#endif ---- ----static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */ ---- ----static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch; ----static gint cur_x, cur_y, cur_w, cur_h; ----static guint button; ----static guint32 corner; ----static ObDirection edge_warp_dir = -1; ----static gboolean edge_warp_odd = FALSE; ----static ObDirection key_resize_edge = -1; ----#ifdef SYNC ----static gboolean waiting_for_sync; ----#endif ---- ----static ObPopup *popup = NULL; ---- ----static void do_edge_warp(gint x, gint y); ----static void cancel_edge_warp(); ----#ifdef SYNC ----static gboolean sync_timeout_func(gpointer data); ----#endif ---- ----static void client_dest(ObClient *client, gpointer data) ----{ ---- if (moveresize_client == client) ---- moveresize_end(TRUE); ----} ---- ----void moveresize_startup(gboolean reconfig) ----{ ---- popup = popup_new(); ---- popup_set_text_align(popup, RR_JUSTIFY_CENTER); ---- ---- if (!reconfig) ---- client_add_destroy_notify(client_dest, NULL); ----} ---- ----void moveresize_shutdown(gboolean reconfig) ----{ ---- if (!reconfig) { ---- if (moveresize_in_progress) ---- moveresize_end(FALSE); ---- client_remove_destroy_notify(client_dest); ---- } ---- ---- popup_free(popup); ---- popup = NULL; ----} ---- ----static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) ----{ ---- gchar *text; ---- ---- text = g_strdup_printf(format, a, b); ---- if (config_resize_popup_pos == OB_RESIZE_POS_TOP) ---- popup_position(popup, SouthGravity, ---- c->frame->area.x ---- + c->frame->area.width/2, ---- c->frame->area.y - ob_rr_theme->fbwidth); ---- else if (config_resize_popup_pos == OB_RESIZE_POS_CENTER) ---- popup_position(popup, CenterGravity, ---- c->frame->area.x + c->frame->size.left + ---- c->area.width / 2, ---- c->frame->area.y + c->frame->size.top + ---- c->area.height / 2); ---- else /* Fixed */ { ---- Rect *area = screen_physical_area_active(); ---- gint gravity, x, y; ---- ---- x = config_resize_popup_fixed.x.pos; ---- if (config_resize_popup_fixed.x.center) ---- x = area->x + area->width/2; ---- else if (config_resize_popup_fixed.x.opposite) ---- x = RECT_RIGHT(*area) - x; ---- else ---- x = area->x + x; ---- ---- y = config_resize_popup_fixed.y.pos; ---- if (config_resize_popup_fixed.y.center) ---- y = area->y + area->height/2; ---- else if (config_resize_popup_fixed.y.opposite) ---- y = RECT_RIGHT(*area) - y; ---- else ---- y = area->y + y; ---- ---- if (config_resize_popup_fixed.x.center) { ---- if (config_resize_popup_fixed.y.center) ---- gravity = CenterGravity; ---- else if (config_resize_popup_fixed.y.opposite) ---- gravity = SouthGravity; ---- else ---- gravity = NorthGravity; ---- } ---- else if (config_resize_popup_fixed.x.opposite) { ---- if (config_resize_popup_fixed.y.center) ---- gravity = EastGravity; ---- else if (config_resize_popup_fixed.y.opposite) ---- gravity = SouthEastGravity; ---- else ---- gravity = NorthEastGravity; ---- } ---- else { ---- if (config_resize_popup_fixed.y.center) ---- gravity = WestGravity; ---- else if (config_resize_popup_fixed.y.opposite) ---- gravity = SouthWestGravity; ---- else ---- gravity = NorthWestGravity; ---- } ---- ---- popup_position(popup, gravity, x, y); ---- ---- g_free(area); ---- } ---- popup_show(popup, text); ---- g_free(text); ----} ---- ----void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) ----{ ---- ObCursor cur; ---- gboolean mv = (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE) || ---- cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)); ---- gint up = 1; ---- gint left = 1; ---- ---- if (moveresize_in_progress || !c->frame->visible || ---- !(mv ? ---- (c->functions & OB_CLIENT_FUNC_MOVE) : ---- (c->functions & OB_CLIENT_FUNC_RESIZE))) ---- return; ---- ---- if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT)) { ---- cur = OB_CURSOR_NORTHWEST; ---- up = left = -1; ---- } ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP)) { ---- cur = OB_CURSOR_NORTH; ---- up = -1; ---- } ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) { ---- cur = OB_CURSOR_NORTHEAST; ---- up = -1; ---- } ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT)) ---- cur = OB_CURSOR_EAST; ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)) ---- cur = OB_CURSOR_SOUTHEAST; ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM)) ---- cur = OB_CURSOR_SOUTH; ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) { ---- cur = OB_CURSOR_SOUTHWEST; ---- left = -1; ---- } ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT)) { ---- cur = OB_CURSOR_WEST; ---- left = -1; ---- } ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) ---- cur = OB_CURSOR_SOUTHEAST; ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE)) ---- cur = OB_CURSOR_MOVE; ---- else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) ---- cur = OB_CURSOR_MOVE; ---- else ---- g_assert_not_reached(); ---- ---- /* keep the pointer bounded to the screen for move/resize */ ---- if (!grab_pointer(FALSE, TRUE, cur)) ---- return; ---- if (!grab_keyboard()) { ---- ungrab_pointer(); ---- return; ---- } ---- ---- frame_end_iconify_animation(c->frame); ---- ---- moving = mv; ---- moveresize_client = c; ---- start_cx = c->area.x; ---- start_cy = c->area.y; ---- start_cw = c->area.width; ---- start_ch = c->area.height; ---- /* these adjustments for the size_inc make resizing a terminal more ---- friendly. you essentially start the resize in the middle of the ---- increment instead of at 0, so you have to move half an increment ---- either way instead of a full increment one and 1 px the other. */ ---- start_x = x - (mv ? 0 : left * c->size_inc.width / 2); ---- start_y = y - (mv ? 0 : up * c->size_inc.height / 2); ---- corner = cnr; ---- button = b; ---- key_resize_edge = -1; ---- ---- /* ---- have to change start_cx and start_cy if going to do this.. ---- if (corner == prop_atoms.net_wm_moveresize_move_keyboard || ---- corner == prop_atoms.net_wm_moveresize_size_keyboard) ---- XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0, ---- c->area.width / 2, c->area.height / 2); ---- */ ---- ---- cur_x = start_cx; ---- cur_y = start_cy; ---- cur_w = start_cw; ---- cur_h = start_ch; ---- ---- moveresize_in_progress = TRUE; ---- ----#ifdef SYNC ---- if (config_resize_redraw && !moving && obt_display_extension_sync && ---- moveresize_client->sync_request && moveresize_client->sync_counter && ---- !moveresize_client->not_responding) ---- { ---- /* Initialize values for the resize syncing, and create an alarm for ---- the client's xsync counter */ ---- ---- XSyncValue val; ---- XSyncAlarmAttributes aa; ---- ---- /* set the counter to an initial value */ ---- XSyncIntToValue(&val, 0); ---- XSyncSetCounter(obt_display, moveresize_client->sync_counter, val); ---- ---- /* this will be incremented when we tell the client what we're ---- looking for */ ---- moveresize_client->sync_counter_value = 0; ---- ---- /* the next sequence we're waiting for with the alarm */ ---- XSyncIntToValue(&val, 1); ---- ---- /* set an alarm on the counter */ ---- aa.trigger.counter = moveresize_client->sync_counter; ---- aa.trigger.wait_value = val; ---- aa.trigger.value_type = XSyncAbsolute; ---- aa.trigger.test_type = XSyncPositiveTransition; ---- aa.events = True; ---- XSyncIntToValue(&aa.delta, 1); ---- moveresize_alarm = XSyncCreateAlarm(obt_display, ---- XSyncCACounter | ---- XSyncCAValue | ---- XSyncCAValueType | ---- XSyncCATestType | ---- XSyncCADelta | ---- XSyncCAEvents, ---- &aa); ---- ---- waiting_for_sync = FALSE; ---- } ----#endif ----} ---- ----void moveresize_end(gboolean cancel) ----{ ---- ungrab_keyboard(); ---- ungrab_pointer(); ---- ---- popup_hide(popup); ---- ---- if (moving) { ---- client_move(moveresize_client, ---- (cancel ? start_cx : cur_x), ---- (cancel ? start_cy : cur_y)); ---- } else { ----#ifdef SYNC ---- /* turn off the alarm */ ---- if (moveresize_alarm != None) { ---- XSyncDestroyAlarm(obt_display, moveresize_alarm); ---- moveresize_alarm = None; ---- } ---- ---- obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); ----#endif ---- ---- client_configure(moveresize_client, ---- (cancel ? start_cx : cur_x), ---- (cancel ? start_cy : cur_y), ---- (cancel ? start_cw : cur_w), ---- (cancel ? start_ch : cur_h), ---- TRUE, TRUE, FALSE); ---- } ---- ---- /* dont edge warp after its ended */ ---- cancel_edge_warp(); ---- ---- moveresize_in_progress = FALSE; ---- moveresize_client = NULL; ----} ---- ----static void do_move(gboolean keyboard, gint keydist) ----{ ---- gint resist; ---- ---- if (keyboard) resist = keydist - 1; /* resist for one key press */ ---- else resist = config_resist_win; ---- resist_move_windows(moveresize_client, resist, &cur_x, &cur_y); ---- if (!keyboard) resist = config_resist_edge; ---- resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y); ---- ---- client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, ---- TRUE, FALSE, FALSE); ---- if (config_resize_popup_show == 2) /* == "Always" */ ---- popup_coords(moveresize_client, "%d x %d", ---- moveresize_client->frame->area.x, ---- moveresize_client->frame->area.y); ----} ---- ---- ----static void do_resize(void) ----{ ---- gint x, y, w, h, lw, lh; ---- ---- /* see if it is actually going to resize */ ---- x = 0; ---- y = 0; ---- w = cur_w; ---- h = cur_h; ---- client_try_configure(moveresize_client, &x, &y, &w, &h, ---- &lw, &lh, TRUE); ---- if (w == moveresize_client->area.width && ---- h == moveresize_client->area.height) ---- { ---- return; ---- } ---- ----#ifdef SYNC ---- if (config_resize_redraw && obt_display_extension_sync && ---- moveresize_client->sync_request && moveresize_client->sync_counter && ---- !moveresize_client->not_responding) ---- { ---- XEvent ce; ---- XSyncValue val; ---- ---- /* are we already waiting for the sync counter to catch up? */ ---- if (waiting_for_sync) ---- return; ---- ---- /* increment the value we're waiting for */ ---- ++moveresize_client->sync_counter_value; ---- XSyncIntToValue(&val, moveresize_client->sync_counter_value); ---- ---- /* tell the client what we're waiting for */ ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = OBT_PROP_ATOM(WM_PROTOCOLS); ---- ce.xclient.display = obt_display; ---- ce.xclient.window = moveresize_client->window; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = OBT_PROP_ATOM(NET_WM_SYNC_REQUEST); ---- ce.xclient.data.l[1] = event_curtime; ---- ce.xclient.data.l[2] = XSyncValueLow32(val); ---- ce.xclient.data.l[3] = XSyncValueHigh32(val); ---- ce.xclient.data.l[4] = 0l; ---- XSendEvent(obt_display, moveresize_client->window, FALSE, ---- NoEventMask, &ce); ---- ---- waiting_for_sync = TRUE; ---- ---- obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); ---- obt_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2, ---- sync_timeout_func, ---- NULL, NULL, NULL); ---- } ----#endif ---- ---- client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, ---- TRUE, FALSE, FALSE); ---- ---- /* this would be better with a fixed width font ... XXX can do it better ---- if there are 2 text boxes */ ---- if (config_resize_popup_show == 2 || /* == "Always" */ ---- (config_resize_popup_show == 1 && /* == "Nonpixel" */ ---- moveresize_client->size_inc.width > 1 && ---- moveresize_client->size_inc.height > 1)) ---- popup_coords(moveresize_client, "%d x %d", ---- moveresize_client->logical_size.width, ---- moveresize_client->logical_size.height); ----} ---- ----#ifdef SYNC ----static gboolean sync_timeout_func(gpointer data) ----{ ---- waiting_for_sync = FALSE; /* we timed out waiting for our sync... */ ---- do_resize(); /* ...so let any pending resizes through */ ---- ---- return FALSE; /* don't repeat */ ----} ----#endif ---- ----static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, ---- ObDirection dir) ----{ ---- gint resist, x = 0, y = 0, lw, lh, ow, oh, nw, nh; ---- gint trydw, trydh; ---- ---- ow = cur_w; ---- oh = cur_h; ---- nw = ow + *dw; ---- nh = oh + *dh; ---- ---- if (!keyboard && ---- (moveresize_client->max_ratio || moveresize_client->min_ratio)) ---- { ---- switch (dir) { ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_SOUTH: ---- /* resize the width based on the height */ ---- if (moveresize_client->min_ratio) { ---- if (nh * moveresize_client->min_ratio > nw) ---- nw = (gint)(nh * moveresize_client->min_ratio); ---- } ---- if (moveresize_client->max_ratio) { ---- if (nh * moveresize_client->max_ratio < nw) ---- nw = (gint)(nh * moveresize_client->max_ratio); ---- } ---- break; ---- default: ---- /* resize the height based on the width */ ---- if (moveresize_client->min_ratio) { ---- if (nh * moveresize_client->min_ratio > nw) ---- nh = (gint)(nw / moveresize_client->min_ratio); ---- } ---- if (moveresize_client->max_ratio) { ---- if (nh * moveresize_client->max_ratio < nw) ---- nh = (gint)(nw / moveresize_client->max_ratio); ---- } ---- break; ---- } ---- ---- /* see its actual size (apply aspect ratios) */ ---- client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, ---- TRUE); ---- trydw = nw - ow; ---- trydh = nh - oh; ---- } ---- ---- /* resist_size_* needs the frame size */ ---- nw += moveresize_client->frame->size.left + ---- moveresize_client->frame->size.right; ---- nh += moveresize_client->frame->size.top + ---- moveresize_client->frame->size.bottom; ---- ---- if (keyboard) resist = keydist - 1; /* resist for one key press */ ---- else resist = config_resist_win; ---- resist_size_windows(moveresize_client, resist, &nw, &nh, dir); ---- if (!keyboard) resist = config_resist_edge; ---- resist_size_monitors(moveresize_client, resist, &nw, &nh, dir); ---- ---- nw -= moveresize_client->frame->size.left + ---- moveresize_client->frame->size.right; ---- nh -= moveresize_client->frame->size.top + ---- moveresize_client->frame->size.bottom; ---- ---- *dw = nw - ow; ---- *dh = nh - oh; ---- ---- /* take aspect ratios into account for resistance */ ---- if (!keyboard && ---- (moveresize_client->max_ratio || moveresize_client->min_ratio)) ---- { ---- if (*dh != trydh) { /* got resisted */ ---- /* resize the width based on the height */ ---- if (moveresize_client->min_ratio) { ---- if (nh * moveresize_client->min_ratio > nw) ---- nw = (gint)(nh * moveresize_client->min_ratio); ---- } ---- if (moveresize_client->max_ratio) { ---- if (nh * moveresize_client->max_ratio < nw) ---- nw = (gint)(nh * moveresize_client->max_ratio); ---- } ---- } ---- if (*dw != trydw) { /* got resisted */ ---- /* resize the height based on the width */ ---- if (moveresize_client->min_ratio) { ---- if (nh * moveresize_client->min_ratio > nw) ---- nh = (gint)(nw / moveresize_client->min_ratio); ---- } ---- if (moveresize_client->max_ratio) { ---- if (nh * moveresize_client->max_ratio < nw) ---- nh = (gint)(nw / moveresize_client->max_ratio); ---- } ---- } ---- } ---- ---- /* make sure it's all valid */ ---- client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, TRUE); ---- ---- *dw = nw - ow; ---- *dh = nh - oh; ----} ---- ----static gboolean edge_warp_delay_func(gpointer data) ----{ ---- guint d; ---- ---- /* only fire every second time. so it's fast the first time, but slower ---- after that */ ---- if (edge_warp_odd) { ---- d = screen_find_desktop(screen_desktop, edge_warp_dir, TRUE, FALSE); ---- if (d != screen_desktop) screen_set_desktop(d, TRUE); ---- } ---- edge_warp_odd = !edge_warp_odd; ---- ---- return TRUE; /* do repeat ! */ ----} ---- ----static void do_edge_warp(gint x, gint y) ----{ ---- guint i; ---- ObDirection dir; ---- ---- if (!config_mouse_screenedgetime) return; ---- ---- dir = -1; ---- ---- for (i = 0; i < screen_num_monitors; ++i) { ---- Rect *a = screen_physical_area_monitor(i); ---- if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST; ---- if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST; ---- if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH; ---- if (y == RECT_BOTTOM(*a)) dir = OB_DIRECTION_SOUTH; ---- ---- /* try check for xinerama boundaries */ ---- if ((x + 1 == RECT_LEFT(*a) || x - 1 == RECT_RIGHT(*a)) && ---- (dir == OB_DIRECTION_WEST || dir == OB_DIRECTION_EAST)) ---- { ---- dir = -1; ---- } ---- if ((y + 1 == RECT_TOP(*a) || y - 1 == RECT_BOTTOM(*a)) && ---- (dir == OB_DIRECTION_NORTH || dir == OB_DIRECTION_SOUTH)) ---- { ---- dir = -1; ---- } ---- g_free(a); ---- } ---- ---- if (dir != edge_warp_dir) { ---- cancel_edge_warp(); ---- if (dir != (ObDirection)-1) { ---- edge_warp_odd = TRUE; /* switch on the first timeout */ ---- obt_main_loop_timeout_add(ob_main_loop, ---- config_mouse_screenedgetime * 1000, ---- edge_warp_delay_func, ---- NULL, NULL, NULL); ---- } ---- edge_warp_dir = dir; ---- } ----} ---- ----static void cancel_edge_warp(void) ----{ ---- obt_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func); ----} ---- ----static void move_with_keys(gint keycode, gint state) ----{ ---- gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; ---- gint opx, px, opy, py; ---- gint dist = 0; ---- ---- /* shift means jump to edge */ ---- if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) { ---- gint x, y; ---- ObDirection dir; ---- ---- if (keycode == ob_keycode(OB_KEY_RIGHT)) ---- dir = OB_DIRECTION_EAST; ---- else if (keycode == ob_keycode(OB_KEY_LEFT)) ---- dir = OB_DIRECTION_WEST; ---- else if (keycode == ob_keycode(OB_KEY_DOWN)) ---- dir = OB_DIRECTION_SOUTH; ---- else /* if (keycode == ob_keycode(OB_KEY_UP)) */ ---- dir = OB_DIRECTION_NORTH; ---- ---- client_find_move_directional(moveresize_client, dir, &x, &y); ---- dx = x - moveresize_client->area.x; ---- dy = y - moveresize_client->area.y; ---- } else { ---- /* control means fine grained */ ---- if (state & ---- obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) ---- { ---- dist = 1; ---- } ---- else ---- dist = KEY_DIST; ---- ---- if (keycode == ob_keycode(OB_KEY_RIGHT)) ---- dx = dist; ---- else if (keycode == ob_keycode(OB_KEY_LEFT)) ---- dx = -dist; ---- else if (keycode == ob_keycode(OB_KEY_DOWN)) ---- dy = dist; ---- else /* if (keycode == ob_keycode(OB_KEY_UP)) */ ---- dy = -dist; ---- } ---- ---- screen_pointer_pos(&opx, &opy); ---- XWarpPointer(obt_display, None, None, 0, 0, 0, 0, dx, dy); ---- /* steal the motion events this causes */ ---- XSync(obt_display, FALSE); ---- { ---- XEvent ce; ---- while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); ---- } ---- screen_pointer_pos(&px, &py); ---- ---- cur_x += dx; ---- cur_y += dy; ---- do_move(TRUE, dist); ---- ---- /* because the cursor moves even though the window does ---- not nessesarily (resistance), this adjusts where the curor ---- thinks it started so that it keeps up with where the window ---- actually is */ ---- start_x += (px - opx) - (cur_x - ox); ---- start_y += (py - opy) - (cur_y - oy); ----} ---- ----static void resize_with_keys(gint keycode, gint state) ----{ ---- gint dw = 0, dh = 0, pdx = 0, pdy = 0, opx, opy, px, py; ---- gint dist = 0, resist = 0; ---- ObDirection dir; ---- ---- /* pick the edge if it needs to move */ ---- if (keycode == ob_keycode(OB_KEY_RIGHT)) { ---- dir = OB_DIRECTION_EAST; ---- if (key_resize_edge != OB_DIRECTION_WEST && ---- key_resize_edge != OB_DIRECTION_EAST) ---- { ---- key_resize_edge = OB_DIRECTION_EAST; ---- return; ---- } ---- } ---- if (keycode == ob_keycode(OB_KEY_LEFT)) { ---- dir = OB_DIRECTION_WEST; ---- if (key_resize_edge != OB_DIRECTION_WEST && ---- key_resize_edge != OB_DIRECTION_EAST) ---- { ---- key_resize_edge = OB_DIRECTION_WEST; ---- return; ---- } ---- } ---- if (keycode == ob_keycode(OB_KEY_UP)) { ---- dir = OB_DIRECTION_NORTH; ---- if (key_resize_edge != OB_DIRECTION_NORTH && ---- key_resize_edge != OB_DIRECTION_SOUTH) ---- { ---- key_resize_edge = OB_DIRECTION_NORTH; ---- return; ---- } ---- } ---- if (keycode == ob_keycode(OB_KEY_DOWN)) { ---- dir = OB_DIRECTION_SOUTH; ---- if (key_resize_edge != OB_DIRECTION_NORTH && ---- key_resize_edge != OB_DIRECTION_SOUTH) ---- { ---- key_resize_edge = OB_DIRECTION_SOUTH; ---- return; ---- } ---- } ---- ---- /* shift means jump to edge */ ---- if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) { ---- gint x, y, w, h; ---- ---- if (keycode == ob_keycode(OB_KEY_RIGHT)) ---- dir = OB_DIRECTION_EAST; ---- else if (keycode == ob_keycode(OB_KEY_LEFT)) ---- dir = OB_DIRECTION_WEST; ---- else if (keycode == ob_keycode(OB_KEY_DOWN)) ---- dir = OB_DIRECTION_SOUTH; ---- else /* if (keycode == ob_keycode(OB_KEY_UP)) */ ---- dir = OB_DIRECTION_NORTH; ---- ---- client_find_resize_directional(moveresize_client, key_resize_edge, ---- key_resize_edge == dir, ---- &x, &y, &w, &h); ---- dw = w - moveresize_client->area.width; ---- dh = h - moveresize_client->area.height; ---- } else { ---- gint distw, disth; ---- ---- /* control means fine grained */ ---- if (moveresize_client->size_inc.width > 1) { ---- distw = moveresize_client->size_inc.width; ---- resist = 1; ---- } ---- else if (state & ---- obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) ---- { ---- distw = 1; ---- resist = 1; ---- } ---- else { ---- distw = KEY_DIST; ---- resist = KEY_DIST; ---- } ---- if (moveresize_client->size_inc.height > 1) { ---- disth = moveresize_client->size_inc.height; ---- resist = 1; ---- } ---- else if (state & ---- obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) ---- { ---- disth = 1; ---- resist = 1; ---- } ---- else { ---- disth = KEY_DIST; ---- resist = KEY_DIST; ---- } ---- ---- if (key_resize_edge == OB_DIRECTION_WEST) { ---- if (dir == OB_DIRECTION_WEST) ---- dw = (dist = distw); ---- else ---- dw = -(dist = distw); ---- } ---- else if (key_resize_edge == OB_DIRECTION_EAST) { ---- if (dir == OB_DIRECTION_EAST) ---- dw = (dist = distw); ---- else ---- dw = -(dist = distw); ---- } ---- else if (key_resize_edge == OB_DIRECTION_NORTH) { ---- if (dir == OB_DIRECTION_NORTH) ---- dh = (dist = disth); ---- else ---- dh = -(dist = disth); ---- } ---- else /*if (key_resize_edge == OB_DIRECTION_SOUTH)*/ { ---- if (dir == OB_DIRECTION_SOUTH) ---- dh = (dist = disth); ---- else ---- dh = -(dist = disth); ---- } ---- } ---- ---- calc_resize(TRUE, resist, &dw, &dh, dir); ---- if (key_resize_edge == OB_DIRECTION_WEST) ---- cur_x -= dw; ---- else if (key_resize_edge == OB_DIRECTION_NORTH) ---- cur_y -= dh; ---- cur_w += dw; ---- cur_h += dh; ---- ---- /* how to move the pointer to keep up with the change */ ---- if (key_resize_edge == OB_DIRECTION_WEST) ---- pdx = -dw; ---- else if (key_resize_edge == OB_DIRECTION_EAST) ---- pdx = dw; ---- else if (key_resize_edge == OB_DIRECTION_NORTH) ---- pdy = -dh; ---- else if (key_resize_edge == OB_DIRECTION_SOUTH) ---- pdy = dh; ---- ---- screen_pointer_pos(&opx, &opy); ---- XWarpPointer(obt_display, None, None, 0, 0, 0, 0, pdx, pdy); ---- /* steal the motion events this causes */ ---- XSync(obt_display, FALSE); ---- { ---- XEvent ce; ---- while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); ---- } ---- screen_pointer_pos(&px, &py); ---- ---- do_resize(); ---- ---- /* because the cursor moves even though the window does ---- not nessesarily (resistance), this adjusts where the cursor ---- thinks it started so that it keeps up with where the window ---- actually is */ ---- start_x += (px - opx) - dw; ---- start_y += (py - opy) - dh; ---- ----} ---- ----gboolean moveresize_event(XEvent *e) ----{ ---- gboolean used = FALSE; ---- ---- if (!moveresize_in_progress) return FALSE; ---- ---- if (e->type == ButtonPress) { ---- if (!button) { ---- start_x = e->xbutton.x_root; ---- start_y = e->xbutton.y_root; ---- button = e->xbutton.button; /* this will end it now */ ---- } ---- used = e->xbutton.button == button; ---- } else if (e->type == ButtonRelease) { ---- if (!button || e->xbutton.button == button) { ---- moveresize_end(FALSE); ---- used = TRUE; ---- } ---- } else if (e->type == MotionNotify) { ---- if (moving) { ---- cur_x = start_cx + e->xmotion.x_root - start_x; ---- cur_y = start_cy + e->xmotion.y_root - start_y; ---- do_move(FALSE, 0); ---- do_edge_warp(e->xmotion.x_root, e->xmotion.y_root); ---- } else { ---- gint dw, dh; ---- ObDirection dir; ---- ---- if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT)) { ---- dw = -(e->xmotion.x_root - start_x); ---- dh = -(e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_NORTHWEST; ---- } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP)) { ---- dw = 0; ---- dh = -(e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_NORTH; ---- } else if (corner == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) { ---- dw = (e->xmotion.x_root - start_x); ---- dh = -(e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_NORTHEAST; ---- } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT)) { ---- dw = (e->xmotion.x_root - start_x); ---- dh = 0; ---- dir = OB_DIRECTION_EAST; ---- } else if (corner == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)) { ---- dw = (e->xmotion.x_root - start_x); ---- dh = (e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_SOUTHEAST; ---- } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM)) ---- { ---- dw = 0; ---- dh = (e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_SOUTH; ---- } else if (corner == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) { ---- dw = -(e->xmotion.x_root - start_x); ---- dh = (e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_SOUTHWEST; ---- } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT)) { ---- dw = -(e->xmotion.x_root - start_x); ---- dh = 0; ---- dir = OB_DIRECTION_WEST; ---- } else if (corner == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { ---- dw = (e->xmotion.x_root - start_x); ---- dh = (e->xmotion.y_root - start_y); ---- dir = OB_DIRECTION_SOUTHEAST; ---- } else ---- g_assert_not_reached(); ---- ---- dw -= cur_w - start_cw; ---- dh -= cur_h - start_ch; ---- ---- calc_resize(FALSE, 0, &dw, &dh, dir); ---- cur_w += dw; ---- cur_h += dh; ---- ---- if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT) || ---- corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT) || ---- corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) ---- { ---- cur_x -= dw; ---- } ---- if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT) || ---- corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP) || ---- corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) ---- { ---- cur_y -= dh; ---- } ---- ---- do_resize(); ---- } ---- used = TRUE; ---- } else if (e->type == KeyPress) { ---- if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { ---- moveresize_end(TRUE); ---- used = TRUE; ---- } else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) { ---- moveresize_end(FALSE); ---- used = TRUE; ---- } else if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT) || ---- e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || ---- e->xkey.keycode == ob_keycode(OB_KEY_DOWN) || ---- e->xkey.keycode == ob_keycode(OB_KEY_UP)) ---- { ---- if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { ---- resize_with_keys(e->xkey.keycode, e->xkey.state); ---- used = TRUE; ---- } else if (corner == ---- OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) ---- { ---- move_with_keys(e->xkey.keycode, e->xkey.state); ---- used = TRUE; ---- } ---- } ---- } ----#ifdef SYNC ---- else if (e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) ---- { ---- waiting_for_sync = FALSE; /* we got our sync... */ ---- do_resize(); /* ...so try resize if there is more change pending */ ---- used = TRUE; ---- } ----#endif ---- return used; ----} diff --cc openbox/moveresize.h index 2d0f7dce,2d0f7dce,2d0f7dce,2d0f7dce..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/moveresize.h +++ /dev/null @@@@@ -1,52 -1,52 -1,52 -1,52 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- moveresize.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __moveresize_h ----#define __moveresize_h ---- ----#include ---- ----#ifdef SYNC ----#include ----#endif ---- ----struct _ObClient; ---- ----typedef enum { ---- OB_RESIZE_POS_CENTER, ---- OB_RESIZE_POS_TOP, ---- OB_RESIZE_POS_FIXED ----} ObResizePopupPos; ---- ----extern gboolean moveresize_in_progress; ----extern struct _ObClient *moveresize_client; ----#ifdef SYNC ----extern XSyncAlarm moveresize_alarm; ----#endif ---- ----void moveresize_startup(gboolean reconfig); ----void moveresize_shutdown(gboolean reconfig); ---- ----/*! @param corner This is one of the prop_atoms.net_wm_moveresize_ atoms */ ----void moveresize_start(struct _ObClient *c, ---- gint x, gint y, guint button, guint32 corner); ----void moveresize_end(gboolean cancel); ---- ----gboolean moveresize_event(XEvent *e); ---- ----#endif diff --cc openbox/mwm.h index e7a9d396,e7a9d396,e7a9d396,e7a9d396..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/mwm.h +++ /dev/null @@@@@ -1,78 -1,78 -1,78 -1,78 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- mwm.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __ob__mwm_h ----#define __ob__mwm_h ---- ----#include ---- ----typedef struct _ObMwmHints ObMwmHints; ---- ----/*! The MWM Hints as retrieved from the window property ---- This structure only contains 3 elements, even though the Motif 2.0 ---- structure contains 5. We only use the first 3, so that is all gets ---- defined. ----*/ ----struct _ObMwmHints ----{ ---- /*! A bitmask of ObMwmFlags values */ ---- guint flags; ---- /*! A bitmask of ObMwmFunctions values */ ---- guint functions; ---- /*! A bitmask of ObMwmDecorations values */ ---- guint decorations; ----}; ---- ----/*! The number of elements in the ObMwmHints struct */ ----#define OB_MWM_ELEMENTS 3 ---- ----/*! Possible flags for MWM Hints (defined by Motif 2.0) */ ----typedef enum ----{ ---- OB_MWM_FLAG_FUNCTIONS = 1 << 0, /*!< The MMW Hints define funcs */ ---- OB_MWM_FLAG_DECORATIONS = 1 << 1 /*!< The MWM Hints define decor */ ----} ObMwmFlags; ---- ----/*! Possible functions for MWM Hints (defined by Motif 2.0) */ ----typedef enum ----{ ---- OB_MWM_FUNC_ALL = 1 << 0, /*!< All functions */ ---- OB_MWM_FUNC_RESIZE = 1 << 1, /*!< Allow resizing */ ---- OB_MWM_FUNC_MOVE = 1 << 2, /*!< Allow moving */ ---- OB_MWM_FUNC_ICONIFY = 1 << 3, /*!< Allow to be iconfied */ ---- OB_MWM_FUNC_MAXIMIZE = 1 << 4 /*!< Allow to be maximized */ ----#if 0 ---- OM_MWM_FUNC_CLOSE = 1 << 5 /*!< Allow to be closed */ ----#endif ----} ObMwmFunctions; ---- ----/*! Possible decorations for MWM Hints (defined by Motif 2.0) */ ----typedef enum ----{ ---- OB_MWM_DECOR_ALL = 1 << 0, /*!< All decorations */ ---- OB_MWM_DECOR_BORDER = 1 << 1, /*!< Show a border */ ---- OB_MWM_DECOR_HANDLE = 1 << 2, /*!< Show a handle (bottom) */ ---- OB_MWM_DECOR_TITLE = 1 << 3, /*!< Show a titlebar */ ----#if 0 ---- OB_MWM_DECOR_MENU = 1 << 4, /*!< Show a menu */ ----#endif ---- OB_MWM_DECOR_ICONIFY = 1 << 5, /*!< Show an iconify button */ ---- OB_MWM_DECOR_MAXIMIZE = 1 << 6 /*!< Show a maximize button */ ----} ObMwmDecorations; ---- ----#endif diff --cc openbox/openbox.c index 291b694b,24561f24,291b694b,291b694b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/openbox.c +++ /dev/null @@@@@ -1,691 -1,727 -1,691 -1,691 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- openbox.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "openbox.h" ----#include "session.h" ----#include "dock.h" ----#include "event.h" ----#include "menu.h" ----#include "client.h" ----#include "screen.h" ----#include "actions.h" ----#include "startupnotify.h" ----#include "focus.h" ----#include "focus_cycle.h" ----#include "focus_cycle_indicator.h" ----#include "focus_cycle_popup.h" ----#include "moveresize.h" ----#include "frame.h" ----#include "framerender.h" ----#include "keyboard.h" ----#include "mouse.h" ----#include "menuframe.h" ----#include "grab.h" ----#include "group.h" ----#include "config.h" ----#include "ping.h" ----#include "prompt.h" ----#include "gettext.h" ----#include "render/render.h" ----#include "render/theme.h" ----#include "obt/display.h" ----#include "obt/prop.h" ----#include "obt/keyboard.h" ----#include "obt/parse.h" ---- ----#ifdef HAVE_FCNTL_H ----# include ----#endif ----#ifdef HAVE_SIGNAL_H ----# include ----#endif ----#ifdef HAVE_STDLIB_H ----# include ----#endif ----#ifdef HAVE_LOCALE_H ----# include ----#endif ----#ifdef HAVE_SYS_STAT_H ----# include ----# include ----#endif ----#ifdef HAVE_SYS_WAIT_H ----# include ----# include ----#endif ----#ifdef HAVE_UNISTD_H ----# include ----#endif ----#include ---- ----#include ----#if USE_XCURSOR ----#include ----#endif ---- ----#include ----#include ---- ----RrInstance *ob_rr_inst; ----RrImageCache *ob_rr_icons; ----RrTheme *ob_rr_theme; ----ObtMainLoop *ob_main_loop; ----gint ob_screen; ----gboolean ob_replace_wm = FALSE; ----gboolean ob_sm_use = TRUE; ----gchar *ob_sm_id = NULL; ----gchar *ob_sm_save_file = NULL; ----gboolean ob_sm_restore = TRUE; ----gboolean ob_debug_xinerama = FALSE; ---- ----static ObState state; ----static gboolean xsync = FALSE; ----static gboolean reconfigure = FALSE; ----static gboolean restart = FALSE; ----static gchar *restart_path = NULL; ----static Cursor cursors[OB_NUM_CURSORS]; ----static KeyCode keys[OB_NUM_KEYS]; ----static gint exitcode = 0; ----static guint remote_control = 0; ----static gboolean being_replaced = FALSE; ----static gchar *config_file = NULL; ---- ----static void signal_handler(gint signal, gpointer data); ----static void remove_args(gint *argc, gchar **argv, gint index, gint num); ----static void parse_env(); ----static void parse_args(gint *argc, gchar **argv); ----static Cursor load_cursor(const gchar *name, guint fontval); - - #if 0 - gboolean haxxor_func(gpointer data) - { - int *foo = data; - static int dir = 1; - *foo += dir; - if (*foo >= 200 || *foo <= 0) - dir = -dir; - - Colormap cm = RrColormap(ob_rr_inst); - static XColor xcb, xcg; - xcg.red = *foo << 8; - xcg.blue = (*foo / 4) << 8; - xcg.green = *foo / 2 << 8; - - xcb.red = 0; - xcb.blue = (196 - *foo / 4) << 8; - xcb.green = 0; - XAllocColor(ob_display, cm, &xcg); - XAllocColor(ob_display, cm, &xcb); - // XAllocNamedColor(ob_display, cm, "dark blue", &xcb, &xcb); - static int i; - for (i = 1; i <= OB_CURSOR_NORTHWEST; i++) - XRecolorCursor(ob_display, cursors[i], &xcb, &xcg); - - return TRUE; - } - #endif ---- ----gint main(gint argc, gchar **argv) ----{ ---- gchar *program_name; ---- ---- state = OB_STATE_STARTING; ---- ---- ob_debug_startup(); ---- ---- /* initialize the locale */ ---- if (!setlocale(LC_ALL, "")) ---- g_message("Couldn't set locale from environment."); ---- bindtextdomain(PACKAGE_NAME, LOCALEDIR); ---- bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); ---- textdomain(PACKAGE_NAME); ---- ---- if (chdir(g_get_home_dir()) == -1) ---- g_message(_("Unable to change to home directory \"%s\": %s"), ---- g_get_home_dir(), g_strerror(errno)); ---- ---- /* parse the command line args, which can change the argv[0] */ ---- parse_args(&argc, argv); ---- /* parse the environment variables */ ---- parse_env(); ---- ---- program_name = g_path_get_basename(argv[0]); ---- g_set_prgname(program_name); ---- ---- if (!remote_control) ---- session_startup(argc, argv); ---- ---- if (!obt_display_open(NULL)) ---- ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable.")); ---- ---- if (remote_control) { ---- /* Send client message telling the OB process to: ---- * remote_control = 1 -> reconfigure ---- * remote_control = 2 -> restart */ ---- OBT_PROP_MSG(ob_screen, obt_root(ob_screen), ---- OB_CONTROL, remote_control, 0, 0, 0, 0); ---- obt_display_close(); ---- exit(EXIT_SUCCESS); ---- } ---- ---- ob_main_loop = obt_main_loop_new(); ---- ---- /* set up signal handler */ ---- obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL); ---- obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL); ---- ---- ob_screen = DefaultScreen(obt_display); ---- ---- ob_rr_inst = RrInstanceNew(obt_display, ob_screen); ---- if (ob_rr_inst == NULL) ---- ob_exit_with_error(_("Failed to initialize the obrender library.")); ---- /* Saving 3 resizes of an RrImage makes a lot of sense for icons, as there ---- are generally 3 icon sizes needed: the titlebar icon, the menu icon, ---- and the alt-tab icon ---- */ ---- ob_rr_icons = RrImageCacheNew(3); ---- ---- XSynchronize(obt_display, xsync); ---- ---- /* check for locale support */ ---- if (!XSupportsLocale()) ---- g_message(_("X server does not support locale.")); ---- if (!XSetLocaleModifiers("")) ---- g_message(_("Cannot set locale modifiers for the X server.")); ---- ---- /* set the DISPLAY environment variable for any lauched children, to the ---- display we're using, so they open in the right place. */ ---- setenv("DISPLAY", DisplayString(obt_display), TRUE); ---- ---- /* create available cursors */ ---- cursors[OB_CURSOR_NONE] = None; ---- cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr); ---- cursors[OB_CURSOR_BUSYPOINTER] = load_cursor("left_ptr_watch",XC_left_ptr); ---- cursors[OB_CURSOR_BUSY] = load_cursor("watch", XC_watch); ---- cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur); ---- cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side); ---- cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner", ---- XC_top_right_corner); ---- cursors[OB_CURSOR_EAST] = load_cursor("right_side", XC_right_side); ---- cursors[OB_CURSOR_SOUTHEAST] = load_cursor("bottom_right_corner", ---- XC_bottom_right_corner); ---- cursors[OB_CURSOR_SOUTH] = load_cursor("bottom_side", XC_bottom_side); ---- cursors[OB_CURSOR_SOUTHWEST] = load_cursor("bottom_left_corner", ---- XC_bottom_left_corner); ---- cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side); ---- cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner", ---- XC_top_left_corner); - #if 0 - int color = 0; - ob_main_loop_timeout_add(ob_main_loop, - 25000, - haxxor_func, - &color, NULL); - #endif ---- ---- if (screen_annex()) { /* it will be ours! */ ---- do { ---- if (reconfigure) obt_keyboard_reload(); ---- ---- /* get the keycodes for keys we use */ ---- keys[OB_KEY_RETURN] = obt_keyboard_keysym_to_keycode(XK_Return); ---- keys[OB_KEY_ESCAPE] = obt_keyboard_keysym_to_keycode(XK_Escape); ---- keys[OB_KEY_LEFT] = obt_keyboard_keysym_to_keycode(XK_Left); ---- keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right); ---- keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up); ---- keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down); ---- keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab); ---- keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space); ---- ---- { ---- ObtParseInst *i; ---- ---- /* startup the parsing so everything can register sections ---- of the rc */ ---- i = obt_parse_instance_new(); ---- ---- /* register all the available actions */ ---- actions_startup(reconfigure); ---- /* start up config which sets up with the parser */ ---- config_startup(i); ---- ---- /* parse/load user options */ ---- if ((config_file && ---- obt_parse_load_file(i, config_file, "openbox_config")) || ---- obt_parse_load_config_file(i, "openbox", "rc.xml", ---- "openbox_config")) ---- { ---- obt_parse_tree_from_root(i); ---- obt_parse_close(i); ---- } ---- else { ---- g_message(_("Unable to find a valid config file, using some simple defaults")); ---- config_file = NULL; ---- } ---- ---- if (config_file) { ---- gchar *p = g_filename_to_utf8(config_file, -1, ---- NULL, NULL, NULL); ---- if (p) ---- OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, ---- utf8, p); ---- g_free(p); ---- } ---- else ---- OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE); ---- ---- /* we're done with parsing now, kill it */ ---- obt_parse_instance_unref(i); ---- } ---- ---- /* load the theme specified in the rc file */ ---- { ---- RrTheme *theme; ---- if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE, ---- config_font_activewindow, ---- config_font_inactivewindow, ---- config_font_menutitle, ---- config_font_menuitem, ---- config_font_osd))) ---- { ---- RrThemeFree(ob_rr_theme); ---- ob_rr_theme = theme; ---- } ---- if (ob_rr_theme == NULL) ---- ob_exit_with_error(_("Unable to load a theme.")); ---- ---- OBT_PROP_SETS(obt_root(ob_screen), ---- OB_THEME, utf8, ob_rr_theme->name); ---- } ---- ---- if (reconfigure) { ---- GList *it; ---- ---- /* update all existing windows for the new theme */ ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- frame_adjust_theme(c->frame); ---- } ---- } ---- event_startup(reconfigure); ---- /* focus_backup is used for stacking, so this needs to come before ---- anything that calls stacking_add */ ---- sn_startup(reconfigure); ---- window_startup(reconfigure); ---- focus_startup(reconfigure); ---- focus_cycle_startup(reconfigure); ---- focus_cycle_indicator_startup(reconfigure); ---- focus_cycle_popup_startup(reconfigure); ---- screen_startup(reconfigure); ---- grab_startup(reconfigure); ---- group_startup(reconfigure); ---- ping_startup(reconfigure); ---- prompt_startup(reconfigure); ---- client_startup(reconfigure); ---- dock_startup(reconfigure); ---- moveresize_startup(reconfigure); ---- keyboard_startup(reconfigure); ---- mouse_startup(reconfigure); ---- menu_frame_startup(reconfigure); ---- menu_startup(reconfigure); ---- ---- if (!reconfigure) { ---- guint32 xid; ---- ObWindow *w; ---- ---- /* get all the existing windows */ ---- window_manage_all(); ---- focus_nothing(); ---- ---- /* focus what was focused if a wm was already running */ ---- if (OBT_PROP_GET32(obt_root(ob_screen), ---- NET_ACTIVE_WINDOW, WINDOW, &xid) && ---- (w = window_find(xid)) && WINDOW_IS_CLIENT(w)) ---- { ---- client_focus(WINDOW_AS_CLIENT(w)); ---- } ---- } else { ---- GList *it; ---- ---- /* redecorate all existing windows */ ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- ---- /* the new config can change the window's decorations */ ---- client_setup_decor_and_functions(c, FALSE); ---- /* redraw the frames */ ---- frame_adjust_area(c->frame, TRUE, TRUE, FALSE); ---- /* the decor sizes may have changed, so the windows may ---- end up in new positions */ ---- client_reconfigure(c, FALSE); ---- } ---- } ---- ---- reconfigure = FALSE; ---- ---- state = OB_STATE_RUNNING; ---- obt_main_loop_run(ob_main_loop); ---- state = OB_STATE_EXITING; ---- ---- if (!reconfigure) ---- window_unmanage_all(); ---- ---- menu_shutdown(reconfigure); ---- menu_frame_shutdown(reconfigure); ---- mouse_shutdown(reconfigure); ---- keyboard_shutdown(reconfigure); ---- moveresize_shutdown(reconfigure); ---- dock_shutdown(reconfigure); ---- client_shutdown(reconfigure); ---- prompt_shutdown(reconfigure); ---- ping_shutdown(reconfigure); ---- group_shutdown(reconfigure); ---- grab_shutdown(reconfigure); ---- screen_shutdown(reconfigure); ---- focus_cycle_popup_shutdown(reconfigure); ---- focus_cycle_indicator_shutdown(reconfigure); ---- focus_cycle_shutdown(reconfigure); ---- focus_shutdown(reconfigure); ---- window_shutdown(reconfigure); ---- sn_shutdown(reconfigure); ---- event_shutdown(reconfigure); ---- config_shutdown(); ---- actions_shutdown(reconfigure); ---- } while (reconfigure); ---- } ---- ---- XSync(obt_display, FALSE); ---- ---- RrThemeFree(ob_rr_theme); ---- RrImageCacheUnref(ob_rr_icons); ---- RrInstanceFree(ob_rr_inst); ---- ---- session_shutdown(being_replaced); ---- ---- obt_display_close(); ---- ---- if (restart) { ---- if (restart_path != NULL) { ---- gint argcp; ---- gchar **argvp; ---- GError *err = NULL; ---- ---- /* run other window manager */ ---- if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) { ---- execvp(argvp[0], argvp); ---- g_strfreev(argvp); ---- } else { ---- g_message( ---- _("Restart failed to execute new executable \"%s\": %s"), ---- restart_path, err->message); ---- g_error_free(err); ---- } ---- } ---- ---- /* we remove the session arguments from argv, so put them back, ---- also don't restore the session on restart */ ---- if (ob_sm_save_file != NULL || ob_sm_id != NULL) { ---- gchar **nargv; ---- gint i, l; ---- ---- l = argc + 1 + ---- (ob_sm_save_file != NULL ? 2 : 0) + ---- (ob_sm_id != NULL ? 2 : 0); ---- nargv = g_new0(gchar*, l+1); ---- for (i = 0; i < argc; ++i) ---- nargv[i] = argv[i]; ---- ---- if (ob_sm_save_file != NULL) { ---- nargv[i++] = g_strdup("--sm-save-file"); ---- nargv[i++] = ob_sm_save_file; ---- } ---- if (ob_sm_id != NULL) { ---- nargv[i++] = g_strdup("--sm-client-id"); ---- nargv[i++] = ob_sm_id; ---- } ---- nargv[i++] = g_strdup("--sm-no-load"); ---- g_assert(i == l); ---- argv = nargv; ---- } ---- ---- /* re-run me */ ---- execvp(argv[0], argv); /* try how we were run */ ---- execlp(argv[0], program_name, (gchar*)NULL); /* last resort */ ---- } ---- ---- /* free stuff passed in from the command line or environment */ ---- g_free(ob_sm_save_file); ---- g_free(ob_sm_id); ---- g_free(program_name); ---- ---- ob_debug_shutdown(); ---- ---- return exitcode; ----} ---- ----static void signal_handler(gint signal, gpointer data) ----{ ---- switch (signal) { ---- case SIGUSR1: ---- ob_debug("Caught signal %d. Restarting.", signal); ---- ob_restart(); ---- break; ---- case SIGUSR2: ---- ob_debug("Caught signal %d. Reconfiguring.", signal); ---- ob_reconfigure(); ---- break; ---- case SIGCHLD: ---- /* reap children */ ---- while (waitpid(-1, NULL, WNOHANG) > 0); ---- break; ---- default: ---- ob_debug("Caught signal %d. Exiting.", signal); ---- /* TERM and INT return a 0 code */ ---- ob_exit(!(signal == SIGTERM || signal == SIGINT)); ---- } ----} ---- ----static void print_version(void) ----{ ---- g_print("Openbox %s\n", PACKAGE_VERSION); ---- g_print(_("Copyright (c)")); ---- g_print(" 2008 Mikael Magnusson\n"); ---- g_print(_("Copyright (c)")); ---- g_print(" 2003-2006 Dana Jansens\n\n"); ---- g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); ---- g_print("This is free software, and you are welcome to redistribute it\n"); ---- g_print("under certain conditions. See the file COPYING for details.\n\n"); ----} ---- ----static void print_help(void) ----{ ---- g_print(_("Syntax: openbox [options]\n")); ---- g_print(_("\nOptions:\n")); ---- g_print(_(" --help Display this help and exit\n")); ---- g_print(_(" --version Display the version and exit\n")); ---- g_print(_(" --replace Replace the currently running window manager\n")); ---- g_print(_(" --config-file FILE Specify the path to the config file to use\n")); ---- g_print(_(" --sm-disable Disable connection to the session manager\n")); ---- g_print(_("\nPassing messages to a running Openbox instance:\n")); ---- g_print(_(" --reconfigure Reload Openbox's configuration\n")); ---- g_print(_(" --restart Restart Openbox\n")); ---- g_print(_(" --exit Exit Openbox\n")); ---- g_print(_("\nDebugging options:\n")); ---- g_print(_(" --sync Run in synchronous mode\n")); ---- g_print(_(" --debug Display debugging output\n")); ---- g_print(_(" --debug-focus Display debugging output for focus handling\n")); ---- g_print(_(" --debug-session Display debugging output for session managment\n")); ---- g_print(_(" --debug-xinerama Split the display into fake xinerama screens\n")); ---- g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT); ----} ---- ----static void remove_args(gint *argc, gchar **argv, gint index, gint num) ----{ ---- gint i; ---- ---- for (i = index; i < *argc - num; ++i) ---- argv[i] = argv[i+num]; ---- for (; i < *argc; ++i) ---- argv[i] = NULL; ---- *argc -= num; ----} ---- ----static void parse_env(void) ----{ ---- /* unset this so we don't pass it on unknowingly */ ---- unsetenv("DESKTOP_STARTUP_ID"); ----} ---- ----static void parse_args(gint *argc, gchar **argv) ----{ ---- gint i; ---- ---- for (i = 1; i < *argc; ++i) { ---- if (!strcmp(argv[i], "--version")) { ---- print_version(); ---- exit(0); ---- } ---- else if (!strcmp(argv[i], "--help")) { ---- print_help(); ---- exit(0); ---- } ---- else if (!strcmp(argv[i], "--g-fatal-warnings")) { ---- g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); ---- } ---- else if (!strcmp(argv[i], "--replace")) { ---- ob_replace_wm = TRUE; ---- remove_args(argc, argv, i, 1); ---- --i; /* this arg was removed so go back */ ---- } ---- else if (!strcmp(argv[i], "--sync")) { ---- xsync = TRUE; ---- } ---- else if (!strcmp(argv[i], "--debug")) { ---- ob_debug_enable(OB_DEBUG_NORMAL, TRUE); ---- ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ---- } ---- else if (!strcmp(argv[i], "--debug-focus")) { ---- ob_debug_enable(OB_DEBUG_NORMAL, TRUE); ---- ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ---- ob_debug_enable(OB_DEBUG_FOCUS, TRUE); ---- } ---- else if (!strcmp(argv[i], "--debug-session")) { ---- ob_debug_enable(OB_DEBUG_NORMAL, TRUE); ---- ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ---- ob_debug_enable(OB_DEBUG_SM, TRUE); ---- } ---- else if (!strcmp(argv[i], "--debug-xinerama")) { ---- ob_debug_xinerama = TRUE; ---- } ---- else if (!strcmp(argv[i], "--reconfigure")) { ---- remote_control = 1; ---- } ---- else if (!strcmp(argv[i], "--restart")) { ---- remote_control = 2; ---- } ---- else if (!strcmp(argv[i], "--exit")) { ---- remote_control = 3; ---- } ---- else if (!strcmp(argv[i], "--config-file")) { ---- if (i == *argc - 1) /* no args left */ ---- g_printerr(_("--config-file requires an argument\n")); ---- else { ---- /* this will be in the current locale encoding, which is ---- what we want */ ---- config_file = argv[i+1]; ---- ++i; /* skip the argument */ ---- ob_debug("--config-file %s\n", config_file); ---- } ---- } ---- else if (!strcmp(argv[i], "--sm-save-file")) { ---- if (i == *argc - 1) /* no args left */ ---- /* not translated cuz it's sekret */ ---- g_printerr("--sm-save-file requires an argument\n"); ---- else { ---- ob_sm_save_file = g_strdup(argv[i+1]); ---- remove_args(argc, argv, i, 2); ---- --i; /* this arg was removed so go back */ ---- ob_debug_type(OB_DEBUG_SM, "--sm-save-file %s", ---- ob_sm_save_file); ---- } ---- } ---- else if (!strcmp(argv[i], "--sm-client-id")) { ---- if (i == *argc - 1) /* no args left */ ---- /* not translated cuz it's sekret */ ---- g_printerr("--sm-client-id requires an argument\n"); ---- else { ---- ob_sm_id = g_strdup(argv[i+1]); ---- remove_args(argc, argv, i, 2); ---- --i; /* this arg was removed so go back */ ---- ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s", ob_sm_id); ---- } ---- } ---- else if (!strcmp(argv[i], "--sm-disable")) { ---- ob_sm_use = FALSE; ---- } ---- else if (!strcmp(argv[i], "--sm-no-load")) { ---- ob_sm_restore = FALSE; ---- remove_args(argc, argv, i, 1); ---- --i; /* this arg was removed so go back */ ---- } ---- else { ---- /* this is a memleak.. oh well.. heh */ ---- gchar *err = g_strdup_printf ---- (_("Invalid command line argument \"%s\"\n"), argv[i]); ---- ob_exit_with_error(err); ---- } ---- } ----} ---- ----static Cursor load_cursor(const gchar *name, guint fontval) ----{ ---- Cursor c = None; ---- ----#if USE_XCURSOR ---- c = XcursorLibraryLoadCursor(obt_display, name); ----#endif ---- if (c == None) ---- c = XCreateFontCursor(obt_display, fontval); ---- return c; ----} ---- ----void ob_exit_with_error(const gchar *msg) ----{ ---- g_message(msg); ---- session_shutdown(TRUE); ---- exit(EXIT_FAILURE); ----} ---- ----void ob_restart_other(const gchar *path) ----{ ---- restart_path = g_strdup(path); ---- ob_restart(); ----} ---- ----void ob_restart(void) ----{ ---- restart = TRUE; ---- ob_exit(0); ----} ---- ----void ob_reconfigure(void) ----{ ---- reconfigure = TRUE; ---- ob_exit(0); ----} ---- ----void ob_exit(gint code) ----{ ---- exitcode = code; ---- obt_main_loop_exit(ob_main_loop); ----} ---- ----void ob_exit_replace(void) ----{ ---- exitcode = 0; ---- being_replaced = TRUE; ---- obt_main_loop_exit(ob_main_loop); ----} ---- ----Cursor ob_cursor(ObCursor cursor) ----{ ---- g_assert(cursor < OB_NUM_CURSORS); ---- return cursors[cursor]; ----} ---- ----KeyCode ob_keycode(ObKey key) ----{ ---- g_assert(key < OB_NUM_KEYS); ---- return keys[key]; ----} ---- ----ObState ob_state(void) ----{ ---- return state; ----} diff --cc openbox/openbox.h index ba221832,ba221832,ba221832,ba221832..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/openbox.h +++ /dev/null @@@@@ -1,66 -1,66 -1,66 -1,66 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- openbox.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __openbox_h ----#define __openbox_h ---- ----#include "misc.h" ---- ----#include "render/render.h" ----#include "render/theme.h" ----#include "obt/mainloop.h" ----#include "obt/display.h" ---- ----#include ----#include ---- ----extern RrInstance *ob_rr_inst; ----extern RrImageCache *ob_rr_icons; ----extern RrTheme *ob_rr_theme; ---- ----extern ObtMainLoop *ob_main_loop; ---- ----/*! The number of the screen on which we're running */ ----extern gint ob_screen; ---- ----extern gboolean ob_sm_use; ----extern gchar *ob_sm_id; ----/* This save_file will get pass to ourselves if we restart too! So we won't ---- make a new file every time, yay. */ ----extern gchar *ob_sm_save_file; ----extern gboolean ob_sm_restore; ----extern gboolean ob_replace_wm; ----extern gboolean ob_debug_xinerama; ---- ----/* The state of execution of the window manager */ ----ObState ob_state(void); ---- ----void ob_restart_other(const gchar *path); ----void ob_restart(void); ----void ob_exit(gint code); ----void ob_exit_replace(void); ---- ----void ob_reconfigure(void); ---- ----void ob_exit_with_error(const gchar *msg); ---- ----Cursor ob_cursor(ObCursor cursor); ---- ----KeyCode ob_keycode(ObKey key); ---- ----#endif diff --cc openbox/ping.c index 83202493,83202493,83202493,83202493..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/ping.c +++ /dev/null @@@@@ -1,166 -1,166 -1,166 -1,166 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "ping.h" ----#include "client.h" ----#include "event.h" ----#include "debug.h" ----#include "openbox.h" ----#include "obt/mainloop.h" ----#include "obt/prop.h" ---- ----typedef struct _ObPingTarget ----{ ---- ObClient *client; ---- ObPingEventHandler h; ---- guint32 id; ---- gint waiting; ----} ObPingTarget; ---- ----static GHashTable *ping_ids = NULL; ----static guint32 ping_next_id = 1; ---- ----#define PING_TIMEOUT (G_USEC_PER_SEC * 3) ----/*! Warn the user after this many PING_TIMEOUT intervals */ ----#define PING_TIMEOUT_WARN 1 ---- ----static void ping_send(ObPingTarget *t); ----static void ping_end(ObClient *client, gpointer data); ----static gboolean ping_timeout(gpointer data); ----static gboolean find_client(gpointer key, gpointer value, gpointer client); ---- ----void ping_startup(gboolean reconfigure) ----{ ---- if (reconfigure) return; ---- ---- ping_ids = g_hash_table_new(g_int_hash, g_int_equal); ---- ---- /* listen for clients to disappear */ ---- client_add_destroy_notify(ping_end, NULL); ----} ---- ----void ping_shutdown(gboolean reconfigure) ----{ ---- if (reconfigure) return; ---- ---- g_hash_table_unref(ping_ids); ---- ping_ids = NULL; ---- ---- client_remove_destroy_notify(ping_end); ----} ---- ----void ping_start(struct _ObClient *client, ObPingEventHandler h) ----{ ---- ObPingTarget *t; ---- ---- /* make sure the client supports ping! */ ---- g_assert(client->ping == TRUE); ---- ---- /* make sure we're not already pinging the client */ ---- if (g_hash_table_find(ping_ids, find_client, client) != NULL) return; ---- ---- t = g_new0(ObPingTarget, 1); ---- t->client = client; ---- t->h = h; ---- ---- obt_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout, ---- t, g_direct_equal, NULL); ---- /* act like we just timed out immediately, to start the pinging process ---- now instead of after the first delay. this makes sure the client ---- ends up in the ping_ids hash table now. */ ---- ping_timeout(t); ---- ---- /* make sure we can remove the client later */ ---- g_assert(g_hash_table_find(ping_ids, find_client, client) != NULL); ----} ---- ----void ping_got_pong(guint32 id) ----{ ---- ObPingTarget *t; ---- ---- if ((t = g_hash_table_lookup(ping_ids, &id))) { ---- /*ob_debug("-PONG: '%s' (id %u)", t->client->title, t->id);*/ ---- if (t->waiting > PING_TIMEOUT_WARN) { ---- /* we had notified that they weren't responding, so now we ---- need to notify that they are again */ ---- t->h(t->client, FALSE); ---- } ---- t->waiting = 0; /* not waiting for a reply anymore */ ---- ---- /* we got a pong so we're happy now */ ---- ping_end(t->client, NULL); ---- } ---- else ---- ob_debug("Got PONG with id %u but not waiting for one", id); ----} ---- ----static gboolean find_client(gpointer key, gpointer value, gpointer client) ----{ ---- ObPingTarget *t = value; ---- return t->client == client; ----} ---- ----static void ping_send(ObPingTarget *t) ----{ ---- /* t->id is 0 when it hasn't been assigned an id ever yet. ---- we can reuse ids when t->waiting == 0, because we won't be getting a ---- pong for that id in the future again. that way for apps that aren't ---- timing out we don't need to remove/add them from/to the hash table */ ---- if (t->id == 0 || t->waiting > 0) { ---- /* pick an id, and reinsert in the hash table with the new id */ ---- if (t->id) g_hash_table_remove(ping_ids, &t->id); ---- t->id = ping_next_id; ---- if (++ping_next_id == 0) ++ping_next_id; /* skip 0 on wraparound */ ---- g_hash_table_insert(ping_ids, &t->id, t); ---- } ---- ---- /*ob_debug("+PING: '%s' (id %u)", t->client->title, t->id);*/ ---- OBT_PROP_MSG_TO(t->client->window, t->client->window, WM_PROTOCOLS, ---- OBT_PROP_ATOM(NET_WM_PING), t->id, t->client->window, 0, 0, ---- NoEventMask); ----} ---- ----static gboolean ping_timeout(gpointer data) ----{ ---- ObPingTarget *t = data; ---- ---- ping_send(t); ---- ---- /* if the client hasn't been responding then do something about it */ ---- if (t->waiting == PING_TIMEOUT_WARN) ---- t->h(t->client, TRUE); /* notify that the client isn't responding */ ---- ---- ++t->waiting; ---- ---- return TRUE; /* repeat */ ----} ---- ----static void ping_end(ObClient *client, gpointer data) ----{ ---- ObPingTarget *t; ---- ---- if ((t = g_hash_table_find(ping_ids, find_client, client))) { ---- g_hash_table_remove(ping_ids, &t->id); ---- ---- obt_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, ---- t, FALSE); ---- ---- g_free(t); ---- } ----} diff --cc openbox/ping.h index ceb0bdb0,ceb0bdb0,ceb0bdb0,ceb0bdb0..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/ping.h +++ /dev/null @@@@@ -1,43 -1,43 -1,43 -1,43 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- client.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __ping_h ----#define __ping_h ---- ----#include ----#include ---- ----struct _ObClient; ---- ----/*! ---- Notifies when the client application isn't responding to pings, or when it ---- starts responding again. ---- @param dead TRUE if the app isn't responding, FALSE if it starts responding ---- again ----*/ ----typedef void (*ObPingEventHandler) (struct _ObClient *c, gboolean dead); ---- ----void ping_startup(gboolean reconfigure); ----void ping_shutdown(gboolean reconfigure); ---- ----void ping_start(struct _ObClient *c, ObPingEventHandler h); ---- ----void ping_got_pong(guint32 id); ---- ----#endif diff --cc openbox/place.c index aac40e8a,aac40e8a,aac40e8a,aac40e8a..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/place.c +++ /dev/null @@@@@ -1,511 -1,511 -1,511 -1,511 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- place.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "client.h" ----#include "group.h" ----#include "screen.h" ----#include "frame.h" ----#include "focus.h" ----#include "config.h" ----#include "dock.h" ----#include "debug.h" ---- ----extern ObDock *dock; ---- ----static void add_choice(guint *choice, guint mychoice) ----{ ---- guint i; ---- for (i = 0; i < screen_num_monitors; ++i) { ---- if (choice[i] == mychoice) ---- return; ---- else if (choice[i] == screen_num_monitors) { ---- choice[i] = mychoice; ---- return; ---- } ---- } ----} ---- ----static Rect *pick_pointer_head(ObClient *c) ----{ ---- guint i; ---- gint px, py; ---- ---- if (screen_pointer_pos(&px, &py)) { ---- for (i = 0; i < screen_num_monitors; ++i) { ---- Rect *monitor = screen_physical_area_monitor(i); ---- gboolean contain = RECT_CONTAINS(*monitor, px, py); ---- g_free(monitor); ---- if (contain) ---- return screen_area(c->desktop, i, NULL); ---- } ---- g_assert_not_reached(); ---- } else ---- return NULL; ----} ---- ----/*! Pick a monitor to place a window on. */ ----static Rect **pick_head(ObClient *c) ----{ ---- Rect **area; ---- guint *choice; ---- guint i; ---- gint px, py; ---- ObClient *p; ---- ---- area = g_new(Rect*, screen_num_monitors); ---- choice = g_new(guint, screen_num_monitors); ---- for (i = 0; i < screen_num_monitors; ++i) ---- choice[i] = screen_num_monitors; /* make them all invalid to start */ ---- ---- /* try direct parent first */ ---- if ((p = client_direct_parent(c))) { ---- add_choice(choice, client_monitor(p)); ---- ob_debug("placement adding choice %d for parent", ---- client_monitor(p)); ---- } ---- ---- /* more than one window in its group (more than just this window) */ ---- if (client_has_group_siblings(c)) { ---- GSList *it; ---- ---- /* try on the client's desktop */ ---- for (it = c->group->members; it; it = g_slist_next(it)) { ---- ObClient *itc = it->data; ---- if (itc != c && ---- (itc->desktop == c->desktop || ---- itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL)) ---- { ---- add_choice(choice, client_monitor(it->data)); ---- ob_debug("placement adding choice %d for group sibling", ---- client_monitor(it->data)); ---- } ---- } ---- ---- /* try on all desktops */ ---- for (it = c->group->members; it; it = g_slist_next(it)) { ---- ObClient *itc = it->data; ---- if (itc != c) { ---- add_choice(choice, client_monitor(it->data)); ---- ob_debug("placement adding choice %d for group sibling on " ---- "another desktop", client_monitor(it->data)); ---- } ---- } ---- } ---- ---- /* skip this if placing by the mouse position */ ---- if (focus_client && client_normal(focus_client) && ---- config_place_monitor != OB_PLACE_MONITOR_MOUSE) ---- { ---- add_choice(choice, client_monitor(focus_client)); ---- ob_debug("placement adding choice %d for normal focused window", ---- client_monitor(focus_client)); ---- } ---- ---- screen_pointer_pos(&px, &py); ---- ---- for (i = 0; i < screen_num_monitors; i++) { ---- Rect *monitor = screen_physical_area_monitor(i); ---- gboolean contain = RECT_CONTAINS(*monitor, px, py); ---- g_free(monitor); ---- if (contain) { ---- add_choice(choice, i); ---- ob_debug("placement adding choice %d for mouse pointer", i); ---- break; ---- } ---- } ---- ---- /* add any leftover choices */ ---- for (i = 0; i < screen_num_monitors; ++i) ---- add_choice(choice, i); ---- ---- for (i = 0; i < screen_num_monitors; ++i) ---- area[i] = screen_area(c->desktop, choice[i], NULL); ---- ---- g_free(choice); ---- ---- return area; ----} ---- ----static gboolean place_random(ObClient *client, gint *x, gint *y) ----{ ---- gint l, r, t, b; ---- Rect **areas; ---- guint i; ---- ---- areas = pick_head(client); ---- i = (config_place_monitor != OB_PLACE_MONITOR_ANY) ? ---- 0 : g_random_int_range(0, screen_num_monitors); ---- ---- l = areas[i]->x; ---- t = areas[i]->y; ---- r = areas[i]->x + areas[i]->width - client->frame->area.width; ---- b = areas[i]->y + areas[i]->height - client->frame->area.height; ---- ---- if (r > l) *x = g_random_int_range(l, r + 1); ---- else *x = areas[i]->x; ---- if (b > t) *y = g_random_int_range(t, b + 1); ---- else *y = areas[i]->y; ---- ---- for (i = 0; i < screen_num_monitors; ++i) ---- g_free(areas[i]); ---- g_free(areas); ---- ---- return TRUE; ----} ---- ----static GSList* area_add(GSList *list, Rect *a) ----{ ---- Rect *r = g_new(Rect, 1); ---- *r = *a; ---- return g_slist_prepend(list, r); ----} ---- ----static GSList* area_remove(GSList *list, Rect *a) ----{ ---- GSList *sit; ---- GSList *result = NULL; ---- ---- for (sit = list; sit; sit = g_slist_next(sit)) { ---- Rect *r = sit->data; ---- ---- if (!RECT_INTERSECTS_RECT(*r, *a)) { ---- result = g_slist_prepend(result, r); ---- /* dont free r, it's moved to the result list */ ---- } else { ---- Rect isect, extra; ---- ---- /* Use an intersection of a and r to determine the space ---- around r that we can use. ---- ---- NOTE: the spaces calculated can overlap. ---- */ ---- ---- RECT_SET_INTERSECTION(isect, *r, *a); ---- ---- if (RECT_LEFT(isect) > RECT_LEFT(*r)) { ---- RECT_SET(extra, r->x, r->y, ---- RECT_LEFT(isect) - r->x, r->height); ---- result = area_add(result, &extra); ---- } ---- ---- if (RECT_TOP(isect) > RECT_TOP(*r)) { ---- RECT_SET(extra, r->x, r->y, ---- r->width, RECT_TOP(isect) - r->y + 1); ---- result = area_add(result, &extra); ---- } ---- ---- if (RECT_RIGHT(isect) < RECT_RIGHT(*r)) { ---- RECT_SET(extra, RECT_RIGHT(isect) + 1, r->y, ---- RECT_RIGHT(*r) - RECT_RIGHT(isect), r->height); ---- result = area_add(result, &extra); ---- } ---- ---- if (RECT_BOTTOM(isect) < RECT_BOTTOM(*r)) { ---- RECT_SET(extra, r->x, RECT_BOTTOM(isect) + 1, ---- r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect)); ---- result = area_add(result, &extra); ---- } ---- ---- /* 'r' is not being added to the result list, so free it */ ---- g_free(r); ---- } ---- } ---- g_slist_free(list); ---- return result; ----} ---- ----enum { ---- IGNORE_FULLSCREEN = 1, ---- IGNORE_MAXIMIZED = 2, ---- IGNORE_MENUTOOL = 3, ---- /*IGNORE_SHADED = 3,*/ ---- IGNORE_NONGROUP = 4, ---- IGNORE_BELOW = 5, ---- /*IGNORE_NONFOCUS = 1 << 5,*/ ---- IGNORE_DOCK = 6, ---- IGNORE_END = 7 ----}; ---- ----static gboolean place_nooverlap(ObClient *c, gint *x, gint *y) ----{ ---- Rect **areas; ---- gint ignore; ---- gboolean ret; ---- gint maxsize; ---- GSList *spaces = NULL, *sit, *maxit; ---- guint i; ---- ---- areas = pick_head(c); ---- ret = FALSE; ---- maxsize = 0; ---- maxit = NULL; ---- ---- /* try ignoring different things to find empty space */ ---- for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) { ---- /* try all monitors in order of preference, but only the first one ---- if config_place_monitor is MOUSE or ACTIVE */ ---- for (i = 0; (i < (config_place_monitor != OB_PLACE_MONITOR_ANY ? ---- 1 : screen_num_monitors) && !ret); ++i) ---- { ---- GList *it; ---- ---- /* add the whole monitor */ ---- spaces = area_add(spaces, areas[i]); ---- ---- /* go thru all the windows */ ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *test = it->data; ---- ---- /* should we ignore this client? */ ---- if (screen_showing_desktop) continue; ---- if (c == test) continue; ---- if (test->iconic) continue; ---- if (c->desktop != DESKTOP_ALL) { ---- if (test->desktop != c->desktop && ---- test->desktop != DESKTOP_ALL) continue; ---- } else { ---- if (test->desktop != screen_desktop && ---- test->desktop != DESKTOP_ALL) continue; ---- } ---- if (test->type == OB_CLIENT_TYPE_SPLASH || ---- test->type == OB_CLIENT_TYPE_DESKTOP) continue; ---- ---- ---- if ((ignore >= IGNORE_FULLSCREEN) && ---- test->fullscreen) continue; ---- if ((ignore >= IGNORE_MAXIMIZED) && ---- test->max_horz && test->max_vert) continue; ---- if ((ignore >= IGNORE_MENUTOOL) && ---- (test->type == OB_CLIENT_TYPE_MENU || ---- test->type == OB_CLIENT_TYPE_TOOLBAR) && ---- client_has_parent(c)) continue; ---- /* ---- if ((ignore >= IGNORE_SHADED) && ---- test->shaded) continue; ---- */ ---- if ((ignore >= IGNORE_NONGROUP) && ---- client_has_group_siblings(c) && ---- test->group != c->group) continue; ---- if ((ignore >= IGNORE_BELOW) && ---- test->layer < c->layer) continue; ---- /* ---- if ((ignore >= IGNORE_NONFOCUS) && ---- focus_client != test) continue; ---- */ ---- /* don't ignore this window, so remove it from the available ---- area */ ---- spaces = area_remove(spaces, &test->frame->area); ---- } ---- ---- if (ignore < IGNORE_DOCK) { ---- Rect a; ---- dock_get_area(&a); ---- spaces = area_remove(spaces, &a); ---- } ---- ---- for (sit = spaces; sit; sit = g_slist_next(sit)) { ---- Rect *r = sit->data; ---- ---- if (r->width >= c->frame->area.width && ---- r->height >= c->frame->area.height && ---- r->width * r->height > maxsize) ---- { ---- maxsize = r->width * r->height; ---- maxit = sit; ---- } ---- } ---- ---- if (maxit) { ---- Rect *r = maxit->data; ---- ---- /* center it in the area */ ---- *x = r->x; ---- *y = r->y; ---- if (config_place_center) { ---- *x += (r->width - c->frame->area.width) / 2; ---- *y += (r->height - c->frame->area.height) / 2; ---- } ---- ret = TRUE; ---- } ---- ---- while (spaces) { ---- g_free(spaces->data); ---- spaces = g_slist_delete_link(spaces, spaces); ---- } ---- } ---- } ---- ---- for (i = 0; i < screen_num_monitors; ++i) ---- g_free(areas[i]); ---- g_free(areas); ---- return ret; ----} ---- ----static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) ----{ ---- gint l, r, t, b; ---- gint px, py; ---- Rect *area; ---- ---- if (!screen_pointer_pos(&px, &py)) ---- return FALSE; ---- area = pick_pointer_head(client); ---- ---- l = area->x; ---- t = area->y; ---- r = area->x + area->width - client->frame->area.width; ---- b = area->y + area->height - client->frame->area.height; ---- ---- *x = px - client->area.width / 2 - client->frame->size.left; ---- *x = MIN(MAX(*x, l), r); ---- *y = py - client->area.height / 2 - client->frame->size.top; ---- *y = MIN(MAX(*y, t), b); ---- ---- return TRUE; ----} ---- ----static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, ---- ObAppSettings *settings) ----{ ---- Rect *screen = NULL; ---- ---- if (!settings || (settings && !settings->pos_given)) ---- return FALSE; ---- ---- /* Find which head the pointer is on */ ---- if (settings->monitor == 0) ---- /* this can return NULL */ ---- screen = pick_pointer_head(client); ---- else if (settings->monitor > 0 && ---- (guint)settings->monitor <= screen_num_monitors) ---- screen = screen_area(client->desktop, (guint)settings->monitor - 1, ---- NULL); ---- ---- /* if we have't found a screen yet.. */ ---- if (!screen) { ---- Rect **areas; ---- guint i; ---- ---- areas = pick_head(client); ---- screen = areas[0]; ---- ---- /* don't free the first one, it's being set as "screen" */ ---- for (i = 1; i < screen_num_monitors; ++i) ---- g_free(areas[i]); ---- g_free(areas); ---- } ---- ---- if (settings->position.x.center) ---- *x = screen->x + screen->width / 2 - client->area.width / 2; ---- else if (settings->position.x.opposite) ---- *x = screen->x + screen->width - client->frame->area.width - ---- settings->position.x.pos; ---- else ---- *x = screen->x + settings->position.x.pos; ---- ---- if (settings->position.y.center) ---- *y = screen->y + screen->height / 2 - client->area.height / 2; ---- else if (settings->position.y.opposite) ---- *y = screen->y + screen->height - client->frame->area.height - ---- settings->position.y.pos; ---- else ---- *y = screen->y + settings->position.y.pos; ---- ---- g_free(screen); ---- return TRUE; ----} ---- ----static gboolean place_transient_splash(ObClient *client, gint *x, gint *y) ----{ ---- if (client->type == OB_CLIENT_TYPE_DIALOG) { ---- GSList *it; ---- gboolean first = TRUE; ---- gint l, r, t, b; ---- for (it = client->parents; it; it = g_slist_next(it)) { ---- ObClient *m = it->data; ---- if (!m->iconic) { ---- if (first) { ---- l = RECT_LEFT(m->frame->area); ---- t = RECT_TOP(m->frame->area); ---- r = RECT_RIGHT(m->frame->area); ---- b = RECT_BOTTOM(m->frame->area); ---- first = FALSE; ---- } else { ---- l = MIN(l, RECT_LEFT(m->frame->area)); ---- t = MIN(t, RECT_TOP(m->frame->area)); ---- r = MAX(r, RECT_RIGHT(m->frame->area)); ---- b = MAX(b, RECT_BOTTOM(m->frame->area)); ---- } ---- } ---- if (!first) { ---- *x = ((r + 1 - l) - client->frame->area.width) / 2 + l; ---- *y = ((b + 1 - t) - client->frame->area.height) / 2 + t; ---- return TRUE; ---- } ---- } ---- } ---- ---- if (client->type == OB_CLIENT_TYPE_DIALOG || ---- client->type == OB_CLIENT_TYPE_SPLASH) ---- { ---- Rect **areas; ---- guint i; ---- ---- areas = pick_head(client); ---- ---- *x = (areas[0]->width - client->frame->area.width) / 2 + areas[0]->x; ---- *y = (areas[0]->height - client->frame->area.height) / 2 + areas[0]->y; ---- ---- for (i = 0; i < screen_num_monitors; ++i) ---- g_free(areas[i]); ---- g_free(areas); ---- return TRUE; ---- } ---- ---- return FALSE; ----} ---- ----/* Return TRUE if we want client.c to enforce on-screen-keeping */ ----gboolean place_client(ObClient *client, gint *x, gint *y, ---- ObAppSettings *settings) ----{ ---- gboolean ret; ---- gboolean userplaced = FALSE; ---- ---- /* per-app settings override program specified position ---- * but not user specified, unless pos_force is enabled */ ---- if (((client->positioned & USPosition) && ---- !(settings && settings->pos_given && settings->pos_force)) || ---- ((client->positioned & PPosition) && ---- !(settings && settings->pos_given))) ---- return FALSE; ---- ---- /* try a number of methods */ ---- ret = place_transient_splash(client, x, y) || ---- (userplaced = place_per_app_setting(client, x, y, settings)) || ---- (config_place_policy == OB_PLACE_POLICY_MOUSE && ---- place_under_mouse(client, x, y)) || ---- place_nooverlap(client, x, y) || ---- place_random(client, x, y); ---- g_assert(ret); ---- ---- /* get where the client should be */ ---- frame_frame_gravity(client->frame, x, y); ---- return !userplaced; ----} diff --cc openbox/place.h index 6a9add40,deb7bbfa,6a9add40,6a9add40..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/place.h +++ /dev/null @@@@@ -1,44 -1,45 -1,44 -1,44 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- place.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__place_h ----#define ob__place_h ---- ----#include ---- ----struct _ObClient; ----struct _ObAppSettings; ---- ----typedef enum ----{ ---- OB_PLACE_POLICY_SMART, - OB_PLACE_POLICY_RANDOM, ---- OB_PLACE_POLICY_MOUSE ----} ObPlacePolicy; ---- ----typedef enum ----{ ---- OB_PLACE_MONITOR_ANY, ---- OB_PLACE_MONITOR_ACTIVE, ---- OB_PLACE_MONITOR_MOUSE ----} ObPlaceMonitor; ---- ----gboolean place_client(struct _ObClient *client, gint *x, gint *y, ---- struct _ObAppSettings *settings); ---- ----#endif diff --cc openbox/popup.c index fd31846e,fd31846e,fd31846e,fd31846e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/popup.c +++ /dev/null @@@@@ -1,568 -1,568 -1,568 -1,568 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- popup.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "popup.h" ---- ----#include "openbox.h" ----#include "frame.h" ----#include "client.h" ----#include "stacking.h" ----#include "event.h" ----#include "screen.h" ----#include "render/render.h" ----#include "render/theme.h" ---- ----ObPopup *popup_new(void) ----{ ---- XSetWindowAttributes attrib; ---- ObPopup *self = g_new0(ObPopup, 1); ---- ---- self->obwin.type = OB_WINDOW_CLASS_INTERNAL; ---- self->gravity = NorthWestGravity; ---- self->x = self->y = self->textw = self->h = 0; ---- self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); ---- self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); ---- self->iconwm = self->iconhm = 1; ---- ---- attrib.override_redirect = True; ---- self->bg = XCreateWindow(obt_display, obt_root(ob_screen), ---- 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), ---- InputOutput, RrVisual(ob_rr_inst), ---- CWOverrideRedirect, &attrib); ---- ---- self->text = XCreateWindow(obt_display, self->bg, ---- 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), ---- InputOutput, RrVisual(ob_rr_inst), 0, NULL); ---- ---- XSetWindowBorderWidth(obt_display, self->bg, ob_rr_theme->obwidth); ---- XSetWindowBorder(obt_display, self->bg, ---- RrColorPixel(ob_rr_theme->osd_border_color)); ---- ---- XMapWindow(obt_display, self->text); ---- ---- stacking_add(INTERNAL_AS_WINDOW(self)); ---- window_add(&self->bg, INTERNAL_AS_WINDOW(self)); ---- return self; ----} ---- ----void popup_free(ObPopup *self) ----{ ---- if (self) { ---- XDestroyWindow(obt_display, self->bg); ---- XDestroyWindow(obt_display, self->text); ---- RrAppearanceFree(self->a_bg); ---- RrAppearanceFree(self->a_text); ---- window_remove(self->bg); ---- stacking_remove(self); ---- g_free(self); ---- } ----} ---- ----void popup_position(ObPopup *self, gint gravity, gint x, gint y) ----{ ---- self->gravity = gravity; ---- self->x = x; ---- self->y = y; ----} ---- ----void popup_text_width(ObPopup *self, gint w) ----{ ---- self->textw = w; ----} ---- ----void popup_min_width(ObPopup *self, gint minw) ----{ ---- self->minw = minw; ----} ---- ----void popup_max_width(ObPopup *self, gint maxw) ----{ ---- self->maxw = maxw; ----} ---- ----void popup_height(ObPopup *self, gint h) ----{ ---- gint texth; ---- ---- /* don't let the height be smaller than the text */ ---- texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2; ---- self->h = MAX(h, texth); ----} ---- ----void popup_text_width_to_string(ObPopup *self, gchar *text) ----{ ---- if (text[0] != '\0') { ---- self->a_text->texture[0].data.text.string = text; ---- self->textw = RrMinWidth(self->a_text); ---- } else ---- self->textw = 0; ----} ---- ----void popup_height_to_string(ObPopup *self, gchar *text) ----{ ---- self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2; ----} ---- ----void popup_text_width_to_strings(ObPopup *self, gchar **strings, gint num) ----{ ---- gint i, maxw; ---- ---- maxw = 0; ---- for (i = 0; i < num; ++i) { ---- popup_text_width_to_string(self, strings[i]); ---- maxw = MAX(maxw, self->textw); ---- } ---- self->textw = maxw; ----} ---- ----void popup_set_text_align(ObPopup *self, RrJustify align) ----{ ---- self->a_text->texture[0].data.text.justify = align; ----} ---- ----static gboolean popup_show_timeout(gpointer data) ----{ ---- ObPopup *self = data; ---- ---- XMapWindow(obt_display, self->bg); ---- stacking_raise(INTERNAL_AS_WINDOW(self)); ---- self->mapped = TRUE; ---- self->delay_mapped = FALSE; ---- ---- return FALSE; /* don't repeat */ ----} ---- ----void popup_delay_show(ObPopup *self, gulong usec, gchar *text) ----{ ---- gint l, t, r, b; ---- gint x, y, w, h; ---- guint m; ---- gint emptyx, emptyy; /* empty space between elements */ ---- gint textx, texty, textw, texth; ---- gint iconx, icony, iconw, iconh; ---- Rect *area, mon; ---- ---- /* when there is no icon and the text is not parent relative, then ---- fill the whole dialog with the text appearance, don't use the bg at all ---- */ ---- if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) ---- RrMargins(self->a_bg, &l, &t, &r, &b); ---- else ---- l = t = r = b = 0; ---- ---- /* set up the textures */ ---- self->a_text->texture[0].data.text.string = text; ---- ---- /* measure the text out */ ---- if (text[0] != '\0') { ---- RrMinSize(self->a_text, &textw, &texth); ---- } else { ---- textw = 0; ---- texth = RrMinHeight(self->a_text); ---- } ---- ---- /* get the height, which is also used for the icon width */ ---- emptyy = t + b + ob_rr_theme->paddingy * 2; ---- if (self->h) ---- texth = self->h - emptyy; ---- h = texth * self->iconhm + emptyy; ---- ---- if (self->textw) ---- textw = self->textw; ---- ---- iconx = textx = l + ob_rr_theme->paddingx; ---- ---- emptyx = l + r + ob_rr_theme->paddingx * 2; ---- if (self->hasicon) { ---- iconw = texth * self->iconwm; ---- iconh = texth * self->iconhm; ---- textx += iconw + ob_rr_theme->paddingx; ---- if (textw) ---- emptyx += ob_rr_theme->paddingx; /* between the icon and text */ ---- } else ---- iconw = 0; ---- ---- texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy; ---- icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy; ---- ---- /* when there is no icon, then fill the whole dialog with the text ---- appearance ---- */ ---- if (!self->hasicon) ---- { ---- textx = texty = 0; ---- texth += emptyy; ---- textw += emptyx; ---- emptyx = emptyy = 0; ---- } ---- ---- w = textw + emptyx + iconw; ---- /* cap it at maxw/minw */ ---- if (self->maxw) w = MIN(w, self->maxw); ---- if (self->minw) w = MAX(w, self->minw); ---- textw = w - emptyx - iconw; ---- ---- /* sanity checks to avoid crashes! */ ---- if (w < 1) w = 1; ---- if (h < 1) h = 1; ---- if (texth < 1) texth = 1; ---- ---- /* set up the x coord */ ---- x = self->x; ---- switch (self->gravity) { ---- case NorthGravity: case CenterGravity: case SouthGravity: ---- x -= w / 2; ---- break; ---- case NorthEastGravity: case EastGravity: case SouthEastGravity: ---- x -= w; ---- break; ---- } ---- ---- /* set up the y coord */ ---- y = self->y; ---- switch (self->gravity) { ---- case WestGravity: case CenterGravity: case EastGravity: ---- y -= h / 2; ---- break; ---- case SouthWestGravity: case SouthGravity: case SouthEastGravity: ---- y -= h; ---- break; ---- } ---- ---- /* Find the monitor which contains the biggest part of the popup. ---- * If the popup is completely off screen, limit it to the intersection ---- * of all monitors and then try again. If it's still off screen, put it ---- * on monitor 0. */ ---- RECT_SET(mon, x, y, w, h); ---- m = screen_find_monitor(&mon); ---- area = screen_physical_area_monitor(m); ---- ---- x=MAX(MIN(x, area->x+area->width-w),area->x); ---- y=MAX(MIN(y, area->y+area->height-h),area->y); ---- ---- g_free(area); ---- ---- if (m == screen_num_monitors) { ---- RECT_SET(mon, x, y, w, h); ---- m = screen_find_monitor(&mon); ---- if (m == screen_num_monitors) ---- m = 0; ---- area = screen_physical_area_monitor(m); ---- ---- x=MAX(MIN(x, area->x+area->width-w),area->x); ---- y=MAX(MIN(y, area->y+area->height-h),area->y); ---- ---- g_free(area); ---- } ---- ---- /* set the windows/appearances up */ ---- XMoveResizeWindow(obt_display, self->bg, x, y, w, h); ---- /* when there is no icon and the text is not parent relative, then ---- fill the whole dialog with the text appearance, don't use the bg at all ---- */ ---- if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) ---- RrPaint(self->a_bg, self->bg, w, h); ---- ---- if (textw) { ---- self->a_text->surface.parent = self->a_bg; ---- self->a_text->surface.parentx = textx; ---- self->a_text->surface.parenty = texty; ---- XMoveResizeWindow(obt_display, self->text, textx, texty, textw, texth); ---- RrPaint(self->a_text, self->text, textw, texth); ---- } ---- ---- if (self->hasicon) ---- self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data); ---- ---- /* do the actual showing */ ---- if (!self->mapped) { ---- if (usec) { ---- /* don't kill previous show timers */ ---- if (!self->delay_mapped) { ---- obt_main_loop_timeout_add(ob_main_loop, usec, ---- popup_show_timeout, self, ---- g_direct_equal, NULL); ---- self->delay_mapped = TRUE; ---- } ---- } else { ---- popup_show_timeout(self); ---- } ---- } ----} ---- ----void popup_hide(ObPopup *self) ----{ ---- if (self->mapped) { ---- gulong ignore_start; ---- ---- /* kill enter events cause by this unmapping */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- XUnmapWindow(obt_display, self->bg); ---- self->mapped = FALSE; ---- ---- event_end_ignore_all_enters(ignore_start); ---- } else if (self->delay_mapped) { ---- obt_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); ---- self->delay_mapped = FALSE; ---- } ----} ---- ----static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data) ----{ ---- ObIconPopup *self = data; ---- ---- self->a_icon->surface.parent = self->popup->a_bg; ---- self->a_icon->surface.parentx = x; ---- self->a_icon->surface.parenty = y; ---- XMoveResizeWindow(obt_display, self->icon, x, y, w, h); ---- RrPaint(self->a_icon, self->icon, w, h); ----} ---- ----ObIconPopup *icon_popup_new(void) ----{ ---- ObIconPopup *self; ---- ---- self = g_new0(ObIconPopup, 1); ---- self->popup = popup_new(); ---- self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); ---- self->icon = XCreateWindow(obt_display, self->popup->bg, ---- 0, 0, 1, 1, 0, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), 0, NULL); ---- XMapWindow(obt_display, self->icon); ---- ---- self->popup->hasicon = TRUE; ---- self->popup->draw_icon = icon_popup_draw_icon; ---- self->popup->draw_icon_data = self; ---- ---- return self; ----} ---- ----void icon_popup_free(ObIconPopup *self) ----{ ---- if (self) { ---- XDestroyWindow(obt_display, self->icon); ---- RrAppearanceFree(self->a_icon); ---- popup_free(self->popup); ---- g_free(self); ---- } ----} ---- ----void icon_popup_delay_show(ObIconPopup *self, gulong usec, ---- gchar *text, RrImage *icon) ----{ ---- if (icon) { ---- RrAppearanceClearTextures(self->a_icon); ---- self->a_icon->texture[0].type = RR_TEXTURE_IMAGE; ---- self->a_icon->texture[0].data.image.alpha = 0xff; ---- self->a_icon->texture[0].data.image.image = icon; ---- } else { ---- RrAppearanceClearTextures(self->a_icon); ---- self->a_icon->texture[0].type = RR_TEXTURE_NONE; ---- } ---- ---- popup_delay_show(self->popup, usec, text); ----} ---- ----void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm) ----{ ---- /* cap them at 1 */ ---- self->popup->iconwm = MAX(1, wm); ---- self->popup->iconhm = MAX(1, hm); ----} ---- ----static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, ---- gpointer data) ----{ ---- ObPagerPopup *self = data; ---- gint x, y; ---- guint rown, n; ---- guint horz_inc; ---- guint vert_inc; ---- guint r, c; ---- gint eachw, eachh; ---- const guint cols = screen_desktop_layout.columns; ---- const guint rows = screen_desktop_layout.rows; ---- const gint linewidth = ob_rr_theme->obwidth; ---- ---- eachw = (w - ((cols + 1) * linewidth)) / cols; ---- eachh = (h - ((rows + 1) * linewidth)) / rows; ---- /* make them squares */ ---- eachw = eachh = MIN(eachw, eachh); ---- ---- /* center */ ---- px += (w - (cols * (eachw + linewidth) + linewidth)) / 2; ---- py += (h - (rows * (eachh + linewidth) + linewidth)) / 2; ---- ---- if (eachw <= 0 || eachh <= 0) ---- return; ---- ---- switch (screen_desktop_layout.orientation) { ---- case OB_ORIENTATION_HORZ: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- n = 0; ---- horz_inc = 1; ---- vert_inc = cols; ---- break; ---- case OB_CORNER_TOPRIGHT: ---- n = cols - 1; ---- horz_inc = -1; ---- vert_inc = cols; ---- break; ---- case OB_CORNER_BOTTOMRIGHT: ---- n = rows * cols - 1; ---- horz_inc = -1; ---- vert_inc = -screen_desktop_layout.columns; ---- break; ---- case OB_CORNER_BOTTOMLEFT: ---- n = (rows - 1) * cols; ---- horz_inc = 1; ---- vert_inc = -cols; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- break; ---- case OB_ORIENTATION_VERT: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- n = 0; ---- horz_inc = rows; ---- vert_inc = 1; ---- break; ---- case OB_CORNER_TOPRIGHT: ---- n = rows * (cols - 1); ---- horz_inc = -rows; ---- vert_inc = 1; ---- break; ---- case OB_CORNER_BOTTOMRIGHT: ---- n = rows * cols - 1; ---- horz_inc = -rows; ---- vert_inc = -1; ---- break; ---- case OB_CORNER_BOTTOMLEFT: ---- n = rows - 1; ---- horz_inc = rows; ---- vert_inc = -1; ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- break; ---- default: ---- g_assert_not_reached(); ---- } ---- ---- rown = n; ---- for (r = 0, y = 0; r < rows; ++r, y += eachh + linewidth) ---- { ---- for (c = 0, x = 0; c < cols; ++c, x += eachw + linewidth) ---- { ---- RrAppearance *a; ---- ---- if (n < self->desks) { ---- a = (n == self->curdesk ? self->hilight : self->unhilight); ---- ---- a->surface.parent = self->popup->a_bg; ---- a->surface.parentx = x + px; ---- a->surface.parenty = y + py; ---- XMoveResizeWindow(obt_display, self->wins[n], ---- x + px, y + py, eachw, eachh); ---- RrPaint(a, self->wins[n], eachw, eachh); ---- } ---- n += horz_inc; ---- } ---- n = rown += vert_inc; ---- } ----} ---- ----ObPagerPopup *pager_popup_new(void) ----{ ---- ObPagerPopup *self; ---- ---- self = g_new(ObPagerPopup, 1); ---- self->popup = popup_new(); ---- ---- self->desks = 0; ---- self->wins = g_new(Window, self->desks); ---- self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg); ---- self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg); ---- ---- self->popup->hasicon = TRUE; ---- self->popup->draw_icon = pager_popup_draw_icon; ---- self->popup->draw_icon_data = self; ---- ---- return self; ----} ---- ----void pager_popup_free(ObPagerPopup *self) ----{ ---- if (self) { ---- guint i; ---- ---- for (i = 0; i < self->desks; ++i) ---- XDestroyWindow(obt_display, self->wins[i]); ---- g_free(self->wins); ---- RrAppearanceFree(self->hilight); ---- RrAppearanceFree(self->unhilight); ---- popup_free(self->popup); ---- g_free(self); ---- } ----} ---- ----void pager_popup_delay_show(ObPagerPopup *self, gulong usec, ---- gchar *text, guint desk) ----{ ---- guint i; ---- ---- if (screen_num_desktops < self->desks) ---- for (i = screen_num_desktops; i < self->desks; ++i) ---- XDestroyWindow(obt_display, self->wins[i]); ---- ---- if (screen_num_desktops != self->desks) ---- self->wins = g_renew(Window, self->wins, screen_num_desktops); ---- ---- if (screen_num_desktops > self->desks) ---- for (i = self->desks; i < screen_num_desktops; ++i) { ---- XSetWindowAttributes attr; ---- ---- attr.border_pixel = ---- RrColorPixel(ob_rr_theme->osd_border_color); ---- self->wins[i] = XCreateWindow(obt_display, self->popup->bg, ---- 0, 0, 1, 1, ob_rr_theme->obwidth, ---- RrDepth(ob_rr_inst), InputOutput, ---- RrVisual(ob_rr_inst), CWBorderPixel, ---- &attr); ---- XMapWindow(obt_display, self->wins[i]); ---- } ---- ---- self->desks = screen_num_desktops; ---- self->curdesk = desk; ---- ---- popup_delay_show(self->popup, usec, text); ----} ---- ----void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm) ----{ ---- /* cap them at 1 */ ---- self->popup->iconwm = MAX(1, wm); ---- self->popup->iconhm = MAX(1, hm); ----} diff --cc openbox/popup.h index 503e2773,503e2773,503e2773,503e2773..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/popup.h +++ /dev/null @@@@@ -1,146 -1,146 -1,146 -1,146 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- popup.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __popup_h ----#define __popup_h ---- ----#include "window.h" ----#include "render/render.h" ----#include ---- ----struct _ObClientIcon; ---- ----#define POPUP_WIDTH 320 ----#define POPUP_HEIGHT 48 ---- ----typedef struct _ObPopup ObPopup; ----typedef struct _ObIconPopup ObIconPopup; ----typedef struct _ObPagerPopup ObPagerPopup; ---- ----struct _ObPopup ----{ ---- ObWindow obwin; ---- Window bg; ---- ---- Window text; ---- ---- gboolean hasicon; ---- RrAppearance *a_bg; ---- RrAppearance *a_text; ---- gint gravity; ---- gint x; ---- gint y; ---- gint textw; ---- gint h; ---- gint minw; ---- gint maxw; ---- guint iconwm; /* icon width multiplier. multiplied by the normal width */ ---- guint iconhm; /* icon height multiplier. multipled by the normal height */ ---- gboolean mapped; ---- gboolean delay_mapped; ---- ---- void (*draw_icon)(gint x, gint y, gint w, gint h, gpointer data); ---- gpointer draw_icon_data; ----}; ---- ----struct _ObIconPopup ----{ ---- ObPopup *popup; ---- ---- Window icon; ---- RrAppearance *a_icon; ----}; ---- ----struct _ObPagerPopup ----{ ---- ObPopup *popup; ---- ---- guint desks; ---- guint curdesk; ---- Window *wins; ---- RrAppearance *hilight; ---- RrAppearance *unhilight; ----}; ---- ----ObPopup *popup_new(void); ----void popup_free(ObPopup *self); ---- ----/*! Position the popup. The gravity rules are not the same X uses for windows, ---- instead of the position being the top-left of the window, the gravity ---- specifies which corner of the popup will be placed at the given coords. ---- Static and Forget gravity are equivilent to NorthWest. ----*/ ----void popup_position(ObPopup *self, gint gravity, gint x, gint y); ----/*! Set the sizes for the popup. When set to 0, the size will be based on ---- the text size. */ ----void popup_height(ObPopup *self, gint w); ----void popup_min_width(ObPopup *self, gint minw); ----void popup_max_width(ObPopup *self, gint maxw); ----void popup_text_width(ObPopup *self, gint w); ----void popup_text_width_to_string(ObPopup *self, gchar *text); ----void popup_height_to_string(ObPopup *self, gchar *text); ----void popup_text_width_to_strings(ObPopup *self, gchar **strings, gint num); ---- ----void popup_set_text_align(ObPopup *self, RrJustify align); ---- ----#define popup_show(s, t) popup_delay_show((s),0,(t)) ----void popup_delay_show(ObPopup *self, gulong usec, gchar *text); ----void popup_hide(ObPopup *self); ---- ----RrAppearance *popup_icon_appearance(ObPopup *self); ---- ---- ----ObIconPopup *icon_popup_new(void); ----void icon_popup_free(ObIconPopup *self); ---- ----#define icon_popup_show(s, t, i) icon_popup_delay_show((s),0,(t),(i)) ----void icon_popup_delay_show(ObIconPopup *self, gulong usec, ---- gchar *text, RrImage *icon); ----#define icon_popup_hide(p) popup_hide((p)->popup) ----#define icon_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y)) ----#define icon_popup_text_width(p, w) popup_text_width((p)->popup,(w)) ----#define icon_popup_height(p, h) popup_height((p)->popup,(h)) ----#define icon_popup_min_width(p, m) popup_min_width((p)->popup,(m)) ----#define icon_popup_max_width(p, m) popup_max_width((p)->popup,(m)) ----#define icon_popup_text_width_to_string(p, s) \ ---- popup_text_width_to_string((p)->popup,(s)) ----#define icon_popup_text_width_to_strings(p, s, n) \ ---- popup_text_width_to_strings((p)->popup,(s),(n)) ----#define icon_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j)) ----void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm); ---- ----ObPagerPopup *pager_popup_new(void); ----void pager_popup_free(ObPagerPopup *self); ---- ----#define pager_popup_show(s, t, d) pager_popup_delay_show((s),0,(t),(d)) ----void pager_popup_delay_show(ObPagerPopup *self, gulong usec, ---- gchar *text, guint desk); ----#define pager_popup_hide(p) popup_hide((p)->popup) ----#define pager_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y)) ----#define pager_popup_text_width(p, w) popup_text_width((p)->popup,(w)) ----#define pager_popup_height(p, h) popup_height((p)->popup,(h)) ----#define pager_popup_min_width(p, m) popup_min_width((p)->popup,(m)) ----#define pager_popup_max_width(p, m) popup_max_width((p)->popup,(m)) ----#define pager_popup_text_width_to_string(p, s) \ ---- popup_text_width_to_string((p)->popup,(s)) ----#define pager_popup_text_width_to_strings(p, s, n) \ ---- popup_text_width_to_strings((p)->popup,(s),(n)) ----#define pager_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j)) ----void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm); ---- ----#endif diff --cc openbox/prompt.c index 9e91d249,9e91d249,9e91d249,9e91d249..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/prompt.c +++ /dev/null @@@@@ -1,604 -1,604 -1,604 -1,604 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- prompt.c for the Openbox window manager ---- Copyright (c) 2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "prompt.h" ----#include "openbox.h" ----#include "screen.h" ----#include "client.h" ----#include "group.h" ----#include "event.h" ----#include "obt/display.h" ----#include "obt/keyboard.h" ----#include "obt/prop.h" ----#include "gettext.h" ---- ----static GList *prompt_list = NULL; ---- ----/* we construct these */ ----static RrAppearance *prompt_a_bg; ----static RrAppearance *prompt_a_button; ----static RrAppearance *prompt_a_focus; ----static RrAppearance *prompt_a_press; ----static RrAppearance *prompt_a_pfocus; ----/* we change the max width which would screw with others */ ----static RrAppearance *prompt_a_msg; ---- ----/* sizing stuff */ ----#define OUTSIDE_MARGIN 4 ----#define MSG_BUTTON_SEPARATION 4 ----#define BUTTON_SEPARATION 4 ----#define BUTTON_VMARGIN 4 ----#define BUTTON_HMARGIN 12 ----#define MAX_WIDTH 400 ---- ----static void prompt_layout(ObPrompt *self); ----static void render_all(ObPrompt *self); ----static void render_button(ObPrompt *self, ObPromptElement *e); ----static void prompt_resize(ObPrompt *self, gint w, gint h); ---- ----void prompt_startup(gboolean reconfig) ----{ ---- RrColor *c_button, *c_focus, *c_press, *c_pfocus; ---- ---- /* note: this is not a copy, don't free it */ ---- prompt_a_bg = ob_rr_theme->osd_hilite_bg; ---- ---- prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close); ---- prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close); ---- prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close); ---- prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close); ---- ---- c_button = prompt_a_button->texture[0].data.mask.color; ---- c_focus = prompt_a_focus->texture[0].data.mask.color; ---- c_press = prompt_a_press->texture[0].data.mask.color; ---- c_pfocus = prompt_a_press->texture[0].data.mask.color; ---- ---- RrAppearanceRemoveTextures(prompt_a_button); ---- RrAppearanceRemoveTextures(prompt_a_focus); ---- RrAppearanceRemoveTextures(prompt_a_press); ---- RrAppearanceRemoveTextures(prompt_a_pfocus); ---- ---- /* texture[0] is the text and texture[1-4] (for prompt_a_focus and ---- prompt_a_pfocus) is lineart to show where keyboard focus is */ ---- RrAppearanceAddTextures(prompt_a_button, 1); ---- RrAppearanceAddTextures(prompt_a_focus, 5); ---- RrAppearanceAddTextures(prompt_a_press, 1); ---- RrAppearanceAddTextures(prompt_a_pfocus, 5); ---- ---- /* totally cheating here.. */ ---- prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; ---- prompt_a_focus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; ---- prompt_a_press->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; ---- prompt_a_pfocus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; ---- ---- prompt_a_button->texture[0].data.text.justify = RR_JUSTIFY_CENTER; ---- prompt_a_focus->texture[0].data.text.justify = RR_JUSTIFY_CENTER; ---- prompt_a_press->texture[0].data.text.justify = RR_JUSTIFY_CENTER; ---- prompt_a_pfocus->texture[0].data.text.justify = RR_JUSTIFY_CENTER; ---- ---- prompt_a_button->texture[0].data.text.color = c_button; ---- prompt_a_focus->texture[0].data.text.color = c_focus; ---- prompt_a_press->texture[0].data.text.color = c_press; ---- prompt_a_pfocus->texture[0].data.text.color = c_press; ---- ---- prompt_a_focus->texture[1].data.lineart.color = c_focus; ---- prompt_a_focus->texture[2].data.lineart.color = c_focus; ---- prompt_a_focus->texture[3].data.lineart.color = c_focus; ---- prompt_a_focus->texture[4].data.lineart.color = c_focus; ---- ---- prompt_a_pfocus->texture[1].data.lineart.color = c_press; ---- prompt_a_pfocus->texture[2].data.lineart.color = c_press; ---- prompt_a_pfocus->texture[3].data.lineart.color = c_press; ---- prompt_a_pfocus->texture[4].data.lineart.color = c_press; ---- ---- prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); ---- prompt_a_msg->texture[0].data.text.flow = TRUE; ---- ---- if (reconfig) { ---- GList *it; ---- for (it = prompt_list; it; it = g_list_next(it)) { ---- ObPrompt *p = it->data; ---- prompt_layout(p); ---- render_all(p); ---- } ---- } ----} ---- ----void prompt_shutdown(gboolean reconfig) ----{ ---- RrAppearanceFree(prompt_a_button); ---- RrAppearanceFree(prompt_a_focus); ---- RrAppearanceFree(prompt_a_press); ---- RrAppearanceFree(prompt_a_pfocus); ---- RrAppearanceFree(prompt_a_msg); ----} ---- ----ObPrompt* prompt_new(const gchar *msg, ---- const ObPromptAnswer *answers, gint n_answers, ---- gint default_result, gint cancel_result, ---- ObPromptCallback func, gpointer data) ----{ ---- ObPrompt *self; ---- XSetWindowAttributes attrib; ---- gint i; ---- ---- attrib.override_redirect = FALSE; ---- ---- self = g_new0(ObPrompt, 1); ---- self->ref = 1; ---- self->func = func; ---- self->data = data; ---- self->default_result = default_result; ---- self->cancel_result = cancel_result; ---- self->super.type = OB_WINDOW_CLASS_PROMPT; ---- self->super.window = XCreateWindow(obt_display, obt_root(ob_screen), ---- 0, 0, 1, 1, 0, ---- CopyFromParent, InputOutput, ---- CopyFromParent, ---- CWOverrideRedirect, ---- &attrib); ---- ---- /* make it a dialog type window */ ---- OBT_PROP_SET32(self->super.window, NET_WM_WINDOW_TYPE, ATOM, ---- OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG)); ---- ---- /* listen for key presses on the window */ ---- self->event_mask = KeyPressMask; ---- ---- /* set up the text message widow */ ---- self->msg.text = g_strdup(msg); ---- self->msg.window = XCreateWindow(obt_display, self->super.window, ---- 0, 0, 1, 1, 0, ---- CopyFromParent, InputOutput, ---- CopyFromParent, 0, NULL); ---- XMapWindow(obt_display, self->msg.window); ---- ---- /* set up the buttons from the answers */ ---- ---- self->n_buttons = n_answers; ---- if (!self->n_buttons) ---- self->n_buttons = 1; ---- ---- self->button = g_new0(ObPromptElement, self->n_buttons); ---- ---- if (n_answers == 0) { ---- g_assert(self->n_buttons == 1); /* should be set to this above.. */ ---- self->button[0].text = g_strdup(_("OK")); ---- } ---- else { ---- g_assert(self->n_buttons > 0); ---- for (i = 0; i < self->n_buttons; ++i) { ---- self->button[i].text = g_strdup(answers[i].text); ---- self->button[i].result = answers[i].result; ---- } ---- } ---- ---- for (i = 0; i < self->n_buttons; ++i) { ---- self->button[i].window = XCreateWindow(obt_display, self->super.window, ---- 0, 0, 1, 1, 0, ---- CopyFromParent, InputOutput, ---- CopyFromParent, 0, NULL); ---- XMapWindow(obt_display, self->button[i].window); ---- window_add(&self->button[i].window, PROMPT_AS_WINDOW(self)); ---- ---- /* listen for button presses on the buttons */ ---- XSelectInput(obt_display, self->button[i].window, ---- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask); ---- } ---- ---- prompt_list = g_list_prepend(prompt_list, self); ---- ---- return self; ----} ---- ----void prompt_ref(ObPrompt *self) ----{ ---- ++self->ref; ----} ---- ----void prompt_unref(ObPrompt *self) ----{ ---- if (self && --self->ref == 0) { ---- gint i; ---- ---- prompt_list = g_list_remove(prompt_list, self); ---- ---- for (i = 0; i < self->n_buttons; ++i) { ---- window_remove(self->button[i].window); ---- XDestroyWindow(obt_display, self->button[i].window); ---- } ---- ---- XDestroyWindow(obt_display, self->msg.window); ---- XDestroyWindow(obt_display, self->super.window); ---- g_free(self); ---- } ----} ---- ----static void prompt_layout(ObPrompt *self) ----{ ---- gint l, r, t, b; ---- gint i; ---- gint allbuttonsw, allbuttonsh, buttonx; ---- gint w, h; ---- gint maxw; ---- ---- RrMargins(prompt_a_bg, &l, &t, &r, &b); ---- l += OUTSIDE_MARGIN; ---- t += OUTSIDE_MARGIN; ---- r += OUTSIDE_MARGIN; ---- b += OUTSIDE_MARGIN; ---- ---- { ---- Rect *area = screen_physical_area_all_monitors(); ---- maxw = MIN(MAX_WIDTH, area->width*4/5); ---- g_free(area); ---- } ---- ---- /* find the button sizes and how much space we need for them */ ---- allbuttonsw = allbuttonsh = 0; ---- for (i = 0; i < self->n_buttons; ++i) { ---- gint bw, bh; ---- ---- prompt_a_button->texture[0].data.text.string = self->button[i].text; ---- prompt_a_focus->texture[0].data.text.string = self->button[i].text; ---- prompt_a_press->texture[0].data.text.string = self->button[i].text; ---- prompt_a_pfocus->texture[0].data.text.string = self->button[i].text; ---- RrMinSize(prompt_a_button, &bw, &bh); ---- self->button[i].width = bw; ---- self->button[i].height = bh; ---- RrMinSize(prompt_a_focus, &bw, &bh); ---- g_print("button w %d h %d\n", bw, bh); ---- self->button[i].width = MAX(self->button[i].width, bw); ---- self->button[i].height = MAX(self->button[i].height, bh); ---- RrMinSize(prompt_a_press, &bw, &bh); ---- self->button[i].width = MAX(self->button[i].width, bw); ---- self->button[i].height = MAX(self->button[i].height, bh); ---- RrMinSize(prompt_a_pfocus, &bw, &bh); ---- self->button[i].width = MAX(self->button[i].width, bw); ---- self->button[i].height = MAX(self->button[i].height, bh); ---- ---- ---- self->button[i].width += BUTTON_HMARGIN * 2; ---- self->button[i].height += BUTTON_VMARGIN * 2; ---- ---- allbuttonsw += self->button[i].width + (i > 0 ? BUTTON_SEPARATION : 0); ---- allbuttonsh = MAX(allbuttonsh, self->button[i].height); ---- } ---- ---- self->msg_wbound = MAX(allbuttonsw, maxw); ---- ---- /* measure the text message area */ ---- prompt_a_msg->texture[0].data.text.string = self->msg.text; ---- prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound; ---- RrMinSize(prompt_a_msg, &self->msg.width, &self->msg.height); ---- ---- /* width and height inside the outer margins */ ---- w = MAX(self->msg.width, allbuttonsw); ---- h = self->msg.height + MSG_BUTTON_SEPARATION + allbuttonsh; ---- ---- /* position the text message */ ---- self->msg.x = l + (w - self->msg.width) / 2; ---- self->msg.y = t; ---- ---- /* position the button buttons on the right of the dialog */ ---- buttonx = l + w; ---- for (i = self->n_buttons - 1; i >= 0; --i) { ---- self->button[i].x = buttonx - self->button[i].width; ---- buttonx -= self->button[i].width + BUTTON_SEPARATION; ---- self->button[i].y = t + h - allbuttonsh; ---- self->button[i].y += (allbuttonsh - self->button[i].height) / 2; ---- } ---- ---- /* size and position the toplevel window */ ---- prompt_resize(self, w + l + r, h + t + b); ---- ---- /* move and resize the internal windows */ ---- XMoveResizeWindow(obt_display, self->msg.window, ---- self->msg.x, self->msg.y, ---- self->msg.width, self->msg.height); ---- for (i = 0; i < self->n_buttons; ++i) ---- XMoveResizeWindow(obt_display, self->button[i].window, ---- self->button[i].x, self->button[i].y, ---- self->button[i].width, self->button[i].height); ----} ---- ----static void prompt_resize(ObPrompt *self, gint w, gint h) ----{ ---- XConfigureRequestEvent req; ---- XSizeHints hints; ---- ---- self->width = w; ---- self->height = h; ---- ---- /* the user can't resize the prompt */ ---- hints.flags = PMinSize | PMaxSize; ---- hints.min_width = hints.max_width = w; ---- hints.min_height = hints.max_height = h; ---- XSetWMNormalHints(obt_display, self->super.window, &hints); ---- ---- if (self->mapped) { ---- /* send a configure request like a normal client would */ ---- req.type = ConfigureRequest; ---- req.display = obt_display; ---- req.parent = obt_root(ob_screen); ---- req.window = self->super.window; ---- req.width = w; ---- req.height = h; ---- req.value_mask = CWWidth | CWHeight; ---- XSendEvent(req.display, req.window, FALSE, StructureNotifyMask, ---- (XEvent*)&req); ---- } ---- else ---- XResizeWindow(obt_display, self->super.window, w, h); ----} ---- ----static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a, ---- gboolean on) ----{ ---- gint i, l, r, t, b; ---- ---- for (i = 1; i < 5; ++i) ---- a->texture[i].type = on ? RR_TEXTURE_LINE_ART : RR_TEXTURE_NONE; ---- ---- if (!on) return; ---- ---- RrMargins(a, &l, &t, &r, &b); ---- l += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2; ---- r += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2; ---- t += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2; ---- b += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2; ---- ---- /* top line */ ---- a->texture[1].data.lineart.x1 = l; ---- a->texture[1].data.lineart.x2 = e->width - r - 1; ---- a->texture[1].data.lineart.y1 = t; ---- a->texture[1].data.lineart.y2 = t; ---- ---- /* bottom line */ ---- a->texture[2].data.lineart.x1 = l; ---- a->texture[2].data.lineart.x2 = e->width - r - 1; ---- a->texture[2].data.lineart.y1 = e->height - b - 1; ---- a->texture[2].data.lineart.y2 = e->height - b - 1; ---- ---- /* left line */ ---- a->texture[3].data.lineart.x1 = l; ---- a->texture[3].data.lineart.x2 = l; ---- a->texture[3].data.lineart.y1 = t; ---- a->texture[3].data.lineart.y2 = e->height - b - 1; ---- ---- /* right line */ ---- a->texture[4].data.lineart.x1 = e->width - r - 1; ---- a->texture[4].data.lineart.x2 = e->width - r - 1; ---- a->texture[4].data.lineart.y1 = t; ---- a->texture[4].data.lineart.y2 = e->height - b - 1; ---- ---- g_print("setting x2 %d\n", e->width - r - 1); ----} ---- ----static void render_button(ObPrompt *self, ObPromptElement *e) ----{ ---- RrAppearance *a; ---- ---- if (e->pressed && self->focus == e) a = prompt_a_pfocus; ---- else if (self->focus == e) a = prompt_a_focus; ---- else if (e->pressed) a = prompt_a_press; ---- else a = prompt_a_button; ---- ---- a->surface.parent = prompt_a_bg; ---- a->surface.parentx = e->x; ---- a->surface.parenty = e->y; ---- ---- /* draw the keyfocus line */ ---- if (a == prompt_a_pfocus || a == prompt_a_focus) ---- setup_button_focus_tex(e, a, TRUE); ---- ---- a->texture[0].data.text.string = e->text; ---- RrPaint(a, e->window, e->width, e->height); ---- ---- /* turn off the keyfocus line so that it doesn't affect size calculations ---- */ ---- if (a == prompt_a_pfocus || a == prompt_a_focus) ---- setup_button_focus_tex(e, a, FALSE); ----} ---- ----static void render_all(ObPrompt *self) ----{ ---- gint i; ---- ---- RrPaint(prompt_a_bg, self->super.window, self->width, self->height); ---- ---- prompt_a_msg->surface.parent = prompt_a_bg; ---- prompt_a_msg->surface.parentx = self->msg.x; ---- prompt_a_msg->surface.parenty = self->msg.y; ---- ---- prompt_a_msg->texture[0].data.text.string = self->msg.text; ---- prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound; ---- RrPaint(prompt_a_msg, self->msg.window, self->msg.width, self->msg.height); ---- ---- for (i = 0; i < self->n_buttons; ++i) ---- render_button(self, &self->button[i]); ----} ---- ----void prompt_show(ObPrompt *self, ObClient *parent, gboolean modal) ----{ ---- gint i; ---- ---- if (self->mapped) { ---- /* activate the prompt */ ---- OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW, ---- 1, /* from an application.. */ ---- event_curtime, ---- 0, ---- 0, 0); ---- return; ---- } ---- ---- /* set the focused button (if not found then the first button is used) */ ---- self->focus = &self->button[0]; ---- for (i = 0; i < self->n_buttons; ++i) ---- if (self->button[i].result == self->default_result) { ---- self->focus = &self->button[i]; ---- break; ---- } ---- ---- if (parent) { ---- Atom states[1]; ---- gint nstates; ---- Window p; ---- XWMHints h; ---- ---- if (parent->group) { ---- /* make it transient for the window's group */ ---- h.flags = WindowGroupHint; ---- h.window_group = parent->group->leader; ---- p = obt_root(ob_screen); ---- } ---- else { ---- /* make it transient for the window directly */ ---- h.flags = 0; ---- p = parent->window; ---- } ---- ---- XSetWMHints(obt_display, self->super.window, &h); ---- OBT_PROP_SET32(self->super.window, WM_TRANSIENT_FOR, WINDOW, p); ---- ---- states[0] = OBT_PROP_ATOM(NET_WM_STATE_MODAL); ---- nstates = (modal ? 1 : 0); ---- OBT_PROP_SETA32(self->super.window, NET_WM_STATE, ATOM, ---- states, nstates); ---- } ---- else ---- OBT_PROP_ERASE(self->super.window, WM_TRANSIENT_FOR); ---- ---- /* set up the dialog and render it */ ---- prompt_layout(self); ---- render_all(self); ---- ---- client_manage(self->super.window, self); ---- ---- self->mapped = TRUE; ----} ---- ----void prompt_hide(ObPrompt *self) ----{ ---- XUnmapWindow(obt_display, self->super.window); ---- self->mapped = FALSE; ----} ---- ----gboolean prompt_key_event(ObPrompt *self, XEvent *e) ----{ ---- gboolean shift; ---- guint shift_mask; ---- ---- if (e->type != KeyPress) return FALSE; ---- ---- shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT); ---- shift = !!(e->xkey.state & shift_mask); ---- ---- /* only accept shift */ ---- if (e->xkey.state != 0 && e->xkey.state != shift_mask) ---- return FALSE; ---- ---- if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) ---- prompt_cancel(self); ---- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) || ---- e->xkey.keycode == ob_keycode(OB_KEY_SPACE)) ---- { ---- if (self->func) self->func(self, self->focus->result, self->data); ---- prompt_hide(self); ---- } ---- else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) || ---- e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || ---- e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) ---- { ---- gint i; ---- gboolean left; ---- ObPromptElement *oldfocus; ---- ---- left = e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || ---- (e->xkey.keycode == ob_keycode(OB_KEY_TAB) && shift); ---- oldfocus = self->focus; ---- ---- for (i = 0; i < self->n_buttons; ++i) ---- if (self->focus == &self->button[i]) break; ---- i += (left ? -1 : 1); ---- if (i < 0) i = self->n_buttons - 1; ---- else if (i >= self->n_buttons) i = 0; ---- self->focus = &self->button[i]; ---- ---- if (oldfocus != self->focus) render_button(self, oldfocus); ---- render_button(self, self->focus); ---- } ---- return TRUE; ----} ---- ----gboolean prompt_mouse_event(ObPrompt *self, XEvent *e) ----{ ---- gint i; ---- ObPromptElement *but; ---- ---- if (e->type != ButtonPress && e->type != ButtonRelease && ---- e->type != MotionNotify) return FALSE; ---- ---- /* find the button */ ---- but = NULL; ---- for (i = 0; i < self->n_buttons; ++i) ---- if (self->button[i].window == ---- (e->type == MotionNotify ? e->xmotion.window : e->xbutton.window)) ---- { ---- but = &self->button[i]; ---- break; ---- } ---- if (!but) return FALSE; ---- ---- if (e->type == ButtonPress) { ---- ObPromptElement *oldfocus; ---- ---- oldfocus = self->focus; ---- ---- but->pressed = TRUE; ---- self->focus = but; ---- ---- if (oldfocus != but) render_button(self, oldfocus); ---- render_button(self, but); ---- } ---- else if (e->type == ButtonRelease) { ---- if (but->pressed) { ---- if (self->func) self->func(self, but->result, self->data); ---- prompt_hide(self); ---- } ---- } ---- else if (e->type == MotionNotify) { ---- gboolean press; ---- ---- press = (e->xmotion.x >= 0 && e->xmotion.y >= 0 && ---- e->xmotion.x < but->width && e->xmotion.y < but->height); ---- ---- if (press != but->pressed) { ---- but->pressed = press; ---- render_button(self, but); ---- } ---- } ---- return TRUE; ----} ---- ----void prompt_cancel(ObPrompt *self) ----{ ---- if (self->func) self->func(self, self->cancel_result, self->data); ---- prompt_hide(self); ----} diff --cc openbox/prompt.h index 107aafd1,107aafd1,107aafd1,107aafd1..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/prompt.h +++ /dev/null @@@@@ -1,110 -1,110 -1,110 -1,110 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- prompt.h for the Openbox window manager ---- Copyright (c) 2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__prompt_h ----#define ob__prompt_h ---- ----#include "window.h" ----#include "geom.h" ----#include "render/render.h" ----#include ----#include ---- ----typedef struct _ObPrompt ObPrompt; ----typedef struct _ObPromptElement ObPromptElement; ----typedef struct _ObPromptAnswer ObPromptAnswer; ---- ----typedef void (*ObPromptCallback)(ObPrompt *p, gint result, gpointer data); ---- ----struct _ObPromptElement { ---- gchar *text; ---- Window window; ---- ---- gint x, y, width, height; ---- gboolean pressed; ---- gint result; ----}; ---- ----struct _ObPrompt ----{ ---- ObInternalWindow super; ---- gint ref; ---- ---- guint event_mask; ---- ---- /* keep a copy of this because we re-render things that may need it ---- (i.e. the buttons) */ ---- RrAppearance *a_bg; ---- ---- gboolean mapped; ---- gint width, height; ---- gint msg_wbound; ---- ---- ObPromptElement msg; ---- ---- /* one for each answer */ ---- ObPromptElement *button; ---- gint n_buttons; ---- ---- /* points to the button with the focus */ ---- ObPromptElement *focus; ---- /* the default button to have selected */ ---- gint default_result; ---- /* the cancel result if the dialog is closed */ ---- gint cancel_result; ---- ---- ObPromptCallback func; ---- gpointer data; ----}; ---- ----struct _ObPromptAnswer { ---- const gchar *text; ---- gint result; ----}; ---- ----void prompt_startup(gboolean reconfig); ----void prompt_shutdown(gboolean reconfig); ---- ----/*! Create a new prompt ---- @param answers A number of ObPromptAnswers which define the buttons which ---- will appear in the dialog from left to right, and the result ---- returned when they are selected. ---- @param n_answers The number of answers ---- @param default_result The result for the answer button selected by default ---- @param cancel_result The result that is given if the dialog is closed instead ---- of having a button presssed ---- @param func The callback function which is called when the dialog is closed ---- or a button is pressed ---- @param data User defined data which will be passed to the callback ----*/ ----ObPrompt* prompt_new(const gchar *msg, ---- const ObPromptAnswer *answers, gint n_answers, ---- gint default_result, gint cancel_result, ---- ObPromptCallback func, gpointer data); ----void prompt_ref(ObPrompt *self); ----void prompt_unref(ObPrompt *self); ---- ----/*! Show the prompt. It will be centered within the given area rectangle */ ----void prompt_show(ObPrompt *self, struct _ObClient *parent, gboolean modal); ----void prompt_hide(ObPrompt *self); ---- ----gboolean prompt_key_event(ObPrompt *self, XEvent *e); ----gboolean prompt_mouse_event(ObPrompt *self, XEvent *e); ----void prompt_cancel(ObPrompt *self); ---- ----#endif diff --cc openbox/resist.c index 3bcb95ff,3bcb95ff,3bcb95ff,0b231ccd..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/resist.c +++ /dev/null @@@@@ -1,423 -1,423 -1,423 -1,417 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- resist.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "resist.h" ----#include "client.h" ----#include "frame.h" ----#include "stacking.h" ----#include "screen.h" ----#include "dock.h" ----#include "config.h" ---- ----#include ---- ----static gboolean resist_move_window(Rect window, ---- Rect target, gint resist, ---- gint *x, gint *y) ----{ ---- gint l, t, r, b; /* requested edges */ ---- gint cl, ct, cr, cb; /* current edges */ ---- gint w, h; /* current size */ ---- gint tl, tt, tr, tb; /* 1 past the target's edges on each side */ ---- gboolean snapx = 0, snapy = 0; ---- ---- w = window.width; ---- h = window.height; ---- ---- l = *x; ---- t = *y; ---- r = l + w - 1; ---- b = t + h - 1; ---- ---- cl = RECT_LEFT(window); ---- ct = RECT_TOP(window); ---- cr = RECT_RIGHT(window); ---- cb = RECT_BOTTOM(window); ---- ---- tl = RECT_LEFT(target) - 1; ---- tt = RECT_TOP(target) - 1; ---- tr = RECT_RIGHT(target) + 1; ---- tb = RECT_BOTTOM(target) + 1; ---- ---- /* snapx and snapy ensure that the window snaps to the top-most ---- window edge available, without going all the way from ---- bottom-to-top in the stacking list ---- */ ---- if (!snapx) { ---- if (ct < tb && cb > tt) { ---- if (cl >= tr && l < tr && l >= tr - resist) ---- *x = tr, snapx = TRUE; ---- else if (cr <= tl && r > tl && ---- r <= tl + resist) ---- *x = tl - w + 1, snapx = TRUE; ---- if (snapx) { ---- /* try to corner snap to the window */ ---- if (ct > tt && t <= tt && ---- t > tt - resist) ---- *y = tt + 1, snapy = TRUE; ---- else if (cb < tb && b >= tb && ---- b < tb + resist) ---- *y = tb - h, snapy = TRUE; ---- } ---- } ---- } ---- if (!snapy) { ---- if (cl < tr && cr > tl) { ---- if (ct >= tb && t < tb && t >= tb - resist) ---- *y = tb, snapy = TRUE; ---- else if (cb <= tt && b > tt && ---- b <= tt + resist) ---- *y = tt - h + 1, snapy = TRUE; ---- if (snapy) { ---- /* try to corner snap to the window */ ---- if (cl > tl && l <= tl && ---- l > tl - resist) ---- *x = tl + 1, snapx = TRUE; ---- else if (cr < tr && r >= tr && ---- r < tr + resist) ---- *x = tr - w, snapx = TRUE; ---- } ---- } ---- } ---- ---- return snapx && snapy; ----} ---- ----void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) ----{ ---- GList *it; ---- Rect dock_area; ---- ---- if (!resist) return; ---- ---- frame_client_gravity(c->frame, x, y); ---- ---- ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- ObClient *target; ---- ---- if (!WINDOW_IS_CLIENT(it->data)) ---- continue; ---- target = it->data; ---- ---- /* don't snap to self or non-visibles */ ---- if (!target->frame->visible || target == c) --- continue; --- /* don't snap to windows set to below and skip_taskbar (desklets) */ --- if (target->below && !c->below && target->skip_taskbar) ---- continue; ---- ---- if (resist_move_window(c->frame->area, target->frame->area, ---- resist, x, y)) ---- break; ---- } ---- dock_get_area(&dock_area); ---- resist_move_window(c->frame->area, dock_area, resist, x, y); ---- ---- frame_frame_gravity(c->frame, x, y); ----} ---- ----void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y) ----{ ---- Rect *area, *parea; ---- guint i; ---- gint l, t, r, b; /* requested edges */ ---- gint al, at, ar, ab; /* screen area edges */ ---- gint pl, pt, pr, pb; /* physical screen area edges */ ---- gint cl, ct, cr, cb; /* current edges */ ---- gint w, h; /* current size */ ---- Rect desired_area; ---- ---- if (!resist) return; ---- ---- frame_client_gravity(c->frame, x, y); ---- ---- w = c->frame->area.width; ---- h = c->frame->area.height; ---- ---- l = *x; ---- t = *y; ---- r = l + w - 1; ---- b = t + h - 1; ---- ---- cl = RECT_LEFT(c->frame->area); ---- ct = RECT_TOP(c->frame->area); ---- cr = RECT_RIGHT(c->frame->area); ---- cb = RECT_BOTTOM(c->frame->area); ---- ---- RECT_SET(desired_area, *x, *y, c->area.width, c->area.height); ---- ---- for (i = 0; i < screen_num_monitors; ++i) { ---- parea = screen_physical_area_monitor(i); ---- ---- if (!RECT_INTERSECTS_RECT(*parea, c->frame->area)) { ---- g_free(parea); ---- continue; ---- } ---- ---- area = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, ---- &desired_area); ---- ---- al = RECT_LEFT(*area); ---- at = RECT_TOP(*area); ---- ar = RECT_RIGHT(*area); ---- ab = RECT_BOTTOM(*area); ---- pl = RECT_LEFT(*parea); ---- pt = RECT_TOP(*parea); ---- pr = RECT_RIGHT(*parea); ---- pb = RECT_BOTTOM(*parea); ---- ---- if (cl >= al && l < al && l >= al - resist) ---- *x = al; ---- else if (cr <= ar && r > ar && r <= ar + resist) ---- *x = ar - w + 1; ---- else if (cl >= pl && l < pl && l >= pl - resist) ---- *x = pl; ---- else if (cr <= pr && r > pr && r <= pr + resist) ---- *x = pr - w + 1; ---- ---- if (ct >= at && t < at && t >= at - resist) ---- *y = at; ---- else if (cb <= ab && b > ab && b < ab + resist) ---- *y = ab - h + 1; ---- else if (ct >= pt && t < pt && t >= pt - resist) ---- *y = pt; ---- else if (cb <= pb && b > pb && b < pb + resist) ---- *y = pb - h + 1; ---- ---- g_free(area); ---- g_free(parea); ---- } ---- ---- frame_frame_gravity(c->frame, x, y); ----} ---- ----static gboolean resist_size_window(Rect window, Rect target, gint resist, ---- gint *w, gint *h, ObDirection dir) ----{ ---- gint l, t, r, b; /* my left, top, right and bottom sides */ ---- gint tl, tt, tr, tb; /* target's left, top, right and bottom bottom sides*/ ---- gint dlt, drb; /* my destination left/top and right/bottom sides */ ---- gboolean snapx = 0, snapy = 0; ---- gint orgw, orgh; ---- ---- l = RECT_LEFT(window); ---- t = RECT_TOP(window); ---- r = RECT_RIGHT(window); ---- b = RECT_BOTTOM(window); ---- ---- orgw = window.width; ---- orgh = window.height; ---- ---- tl = RECT_LEFT(target); ---- tt = RECT_TOP(target); ---- tr = RECT_RIGHT(target); ---- tb = RECT_BOTTOM(target); ---- ---- if (!snapx) { ---- /* horizontal snapping */ ---- if (t < tb && b > tt) { ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- case OB_DIRECTION_NORTHEAST: ---- case OB_DIRECTION_SOUTHEAST: ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_SOUTH: ---- dlt = l; ---- drb = r + *w - orgw; ---- if (r < tl && drb >= tl && ---- drb < tl + resist) ---- *w = tl - l, snapx = TRUE; ---- break; ---- case OB_DIRECTION_WEST: ---- case OB_DIRECTION_NORTHWEST: ---- case OB_DIRECTION_SOUTHWEST: ---- dlt = l - *w + orgw; ---- drb = r; ---- if (l > tr && dlt <= tr && ---- dlt > tr - resist) ---- *w = r - tr, snapx = TRUE; ---- break; ---- } ---- } ---- } ---- ---- if (!snapy) { ---- /* vertical snapping */ ---- if (l < tr && r > tl) { ---- switch (dir) { ---- case OB_DIRECTION_SOUTH: ---- case OB_DIRECTION_SOUTHWEST: ---- case OB_DIRECTION_SOUTHEAST: ---- case OB_DIRECTION_EAST: ---- case OB_DIRECTION_WEST: ---- dlt = t; ---- drb = b + *h - orgh; ---- if (b < tt && drb >= tt && ---- drb < tt + resist) ---- *h = tt - t, snapy = TRUE; ---- break; ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_NORTHWEST: ---- case OB_DIRECTION_NORTHEAST: ---- dlt = t - *h + orgh; ---- drb = b; ---- if (t > tb && dlt <= tb && ---- dlt > tb - resist) ---- *h = b - tb, snapy = TRUE; ---- break; ---- } ---- } ---- } ---- ---- /* snapped both ways */ ---- return snapx && snapy; ----} ---- ----void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, ---- ObDirection dir) ----{ ---- GList *it; ---- ObClient *target; /* target */ ---- Rect dock_area; ---- ---- if (!resist) return; ---- ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- if (!WINDOW_IS_CLIENT(it->data)) ---- continue; ---- target = it->data; ---- ---- /* don't snap to invisibles or ourself */ ---- if (!target->frame->visible || target == c) --- continue; --- /* don't snap to windows set to below and skip_taskbar (desklets) */ --- if (target->below && !c->below && target->skip_taskbar) ---- continue; ---- ---- if (resist_size_window(c->frame->area, target->frame->area, ---- resist, w, h, dir)) ---- break; ---- } ---- dock_get_area(&dock_area); ---- resist_size_window(c->frame->area, dock_area, ---- resist, w, h, dir); ----} ---- ----void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, ---- ObDirection dir) ----{ ---- gint l, t, r, b; /* my left, top, right and bottom sides */ ---- gint dlt, drb; /* my destination left/top and right/bottom sides */ ---- Rect *area, *parea; ---- gint al, at, ar, ab; /* screen boundaries */ ---- gint pl, pt, pr, pb; /* physical screen boundaries */ ---- gint incw, inch; ---- guint i; ---- Rect desired_area; ---- ---- if (!resist) return; ---- ---- l = RECT_LEFT(c->frame->area); ---- r = RECT_RIGHT(c->frame->area); ---- t = RECT_TOP(c->frame->area); ---- b = RECT_BOTTOM(c->frame->area); ---- ---- incw = c->size_inc.width; ---- inch = c->size_inc.height; ---- ---- RECT_SET(desired_area, c->area.x, c->area.y, *w, *h); ---- ---- for (i = 0; i < screen_num_monitors; ++i) { ---- parea = screen_physical_area_monitor(i); ---- ---- if (!RECT_INTERSECTS_RECT(*parea, c->frame->area)) { ---- g_free(parea); ---- continue; ---- } ---- ---- area = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, ---- &desired_area); ---- ---- /* get the screen boundaries */ ---- al = RECT_LEFT(*area); ---- at = RECT_TOP(*area); ---- ar = RECT_RIGHT(*area); ---- ab = RECT_BOTTOM(*area); ---- pl = RECT_LEFT(*parea); ---- pt = RECT_TOP(*parea); ---- pr = RECT_RIGHT(*parea); ---- pb = RECT_BOTTOM(*parea); ---- ---- /* horizontal snapping */ ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- case OB_DIRECTION_NORTHEAST: ---- case OB_DIRECTION_SOUTHEAST: ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_SOUTH: ---- dlt = l; ---- drb = r + *w - c->frame->area.width; ---- if (r <= ar && drb > ar && drb <= ar + resist) ---- *w = ar - l + 1; ---- else if (r <= pr && drb > pr && drb <= pr + resist) ---- *w = pr - l + 1; ---- break; ---- case OB_DIRECTION_WEST: ---- case OB_DIRECTION_NORTHWEST: ---- case OB_DIRECTION_SOUTHWEST: ---- dlt = l - *w + c->frame->area.width; ---- drb = r; ---- if (l >= al && dlt < al && dlt >= al - resist) ---- *w = r - al + 1; ---- else if (l >= pl && dlt < pl && dlt >= pl - resist) ---- *w = r - pl + 1; ---- break; ---- } ---- ---- /* vertical snapping */ ---- switch (dir) { ---- case OB_DIRECTION_SOUTH: ---- case OB_DIRECTION_SOUTHWEST: ---- case OB_DIRECTION_SOUTHEAST: ---- case OB_DIRECTION_WEST: ---- case OB_DIRECTION_EAST: ---- dlt = t; ---- drb = b + *h - c->frame->area.height; ---- if (b <= ab && drb > ab && drb <= ab + resist) ---- *h = ab - t + 1; ---- else if (b <= pb && drb > pb && drb <= pb + resist) ---- *h = pb - t + 1; ---- break; ---- case OB_DIRECTION_NORTH: ---- case OB_DIRECTION_NORTHWEST: ---- case OB_DIRECTION_NORTHEAST: ---- dlt = t - *h + c->frame->area.height; ---- drb = b; ---- if (t >= at && dlt < at && dlt >= at - resist) ---- *h = b - at + 1; ---- else if (t >= pt && dlt < pt && dlt >= pt - resist) ---- *h = b - pt + 1; ---- break; ---- } ---- ---- g_free(area); ---- g_free(parea); ---- } ----} diff --cc openbox/resist.h index 31cc7177,31cc7177,31cc7177,31cc7177..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/resist.h +++ /dev/null @@@@@ -1,41 -1,41 -1,41 -1,41 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- resist.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__resist_h ----#define ob__resist_h ---- ----#include "misc.h" ---- ----#include ---- ----struct _ObClient; ---- ----/*! @x The client's x destination (in the client's coordinates, not the frame's ---- @y The client's y destination (in the client's coordinates, not the frame's ----*/ ----void resist_move_windows(struct _ObClient *c, gint resist, gint *x, gint *y); ----/*! @x The client's x destination (in the client's coordinates, not the frame's ---- @y The client's y destination (in the client's coordinates, not the frame's ----*/ ----void resist_move_monitors(struct _ObClient *c, gint resist, gint *x, gint *y); ----void resist_size_windows(struct _ObClient *c, gint resist, gint *w, gint *h, ---- ObDirection dir); ----void resist_size_monitors(struct _ObClient *c, gint resist, gint *w, gint *h, ---- ObDirection dir); ---- ----#endif diff --cc openbox/screen.c index 221e338d,109d0f1d,221e338d,9c16356c..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/screen.c +++ /dev/null @@@@@ -1,1728 -1,1742 -1,1728 -1,1734 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- screen.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "debug.h" ----#include "openbox.h" ----#include "dock.h" ----#include "grab.h" ----#include "startupnotify.h" ----#include "moveresize.h" ----#include "config.h" ----#include "screen.h" ----#include "client.h" ----#include "session.h" ----#include "frame.h" ----#include "event.h" ----#include "focus.h" ----#include "popup.h" ----#include "render/render.h" ----#include "gettext.h" ----#include "obt/display.h" ----#include "obt/prop.h" ----#include "obt/mainloop.h" ---- ----#include ----#ifdef HAVE_UNISTD_H ----# include ----# include ----#endif ----#include ---- ----/*! The event mask to grab on the root window */ ----#define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \ ---- EnterWindowMask | LeaveWindowMask | \ ---- SubstructureRedirectMask | FocusChangeMask | \ ---- ButtonPressMask | ButtonReleaseMask) ---- ----static gboolean screen_validate_layout(ObDesktopLayout *l); ----static gboolean replace_wm(void); --- static void screen_tell_ksplash(void); -//static void screen_tell_ksplash(void); ----static void screen_fallback_focus(void); ---- ----guint screen_num_desktops; ----guint screen_num_monitors; ----guint screen_desktop; ----guint screen_last_desktop; ----gboolean screen_showing_desktop; ----ObDesktopLayout screen_desktop_layout; ----gchar **screen_desktop_names; ----Window screen_support_win; ----Time screen_desktop_user_time = CurrentTime; ---- ----static Size screen_physical_size; ----static guint screen_old_desktop; ----static gboolean screen_desktop_timeout = TRUE; ----/*! An array of desktops, holding array of areas per monitor */ ----static Rect *monitor_area = NULL; ----/*! An array of desktops, holding an array of struts */ ----static GSList *struts_top = NULL; ----static GSList *struts_left = NULL; ----static GSList *struts_right = NULL; ----static GSList *struts_bottom = NULL; ---- ----static ObPagerPopup *desktop_popup; ---- ----/*! The number of microseconds that you need to be on a desktop before it will ---- replace the remembered "last desktop" */ ----#define REMEMBER_LAST_DESKTOP_TIME 750000 ---- ----static gboolean replace_wm(void) ----{ ---- gchar *wm_sn; ---- Atom wm_sn_atom; ---- Window current_wm_sn_owner; ---- Time timestamp; ---- ---- wm_sn = g_strdup_printf("WM_S%d", ob_screen); ---- wm_sn_atom = XInternAtom(obt_display, wm_sn, FALSE); ---- g_free(wm_sn); ---- ---- current_wm_sn_owner = XGetSelectionOwner(obt_display, wm_sn_atom); ---- if (current_wm_sn_owner == screen_support_win) ---- current_wm_sn_owner = None; ---- if (current_wm_sn_owner) { ---- if (!ob_replace_wm) { ---- g_message(_("A window manager is already running on screen %d"), ---- ob_screen); ---- return FALSE; ---- } ---- obt_display_ignore_errors(TRUE); ---- ---- /* We want to find out when the current selection owner dies */ ---- XSelectInput(obt_display, current_wm_sn_owner, StructureNotifyMask); ---- XSync(obt_display, FALSE); ---- ---- obt_display_ignore_errors(FALSE); ---- if (obt_display_error_occured) ---- current_wm_sn_owner = None; ---- } ---- ---- timestamp = event_get_server_time(); ---- ---- XSetSelectionOwner(obt_display, wm_sn_atom, screen_support_win, ---- timestamp); ---- ---- if (XGetSelectionOwner(obt_display, wm_sn_atom) != screen_support_win) { ---- g_message(_("Could not acquire window manager selection on screen %d"), ---- ob_screen); ---- return FALSE; ---- } ---- ---- /* Wait for old window manager to go away */ ---- if (current_wm_sn_owner) { ---- XEvent event; ---- gulong wait = 0; ---- const gulong timeout = G_USEC_PER_SEC * 15; /* wait for 15s max */ ---- ---- while (wait < timeout) { ---- if (XCheckWindowEvent(obt_display, current_wm_sn_owner, ---- StructureNotifyMask, &event) && ---- event.type == DestroyNotify) ---- break; ---- g_usleep(G_USEC_PER_SEC / 10); ---- wait += G_USEC_PER_SEC / 10; ---- } ---- ---- if (wait >= timeout) { ---- g_message(_("The WM on screen %d is not exiting"), ob_screen); ---- return FALSE; ---- } ---- } ---- ---- /* Send client message indicating that we are now the WM */ ---- obt_prop_message(ob_screen, obt_root(ob_screen), OBT_PROP_ATOM(MANAGER), ---- timestamp, wm_sn_atom, screen_support_win, 0, 0, ---- SubstructureNotifyMask); ---- ---- return TRUE; ----} ---- ----gboolean screen_annex(void) ----{ ---- XSetWindowAttributes attrib; ---- pid_t pid; ---- gint i, num_support; ---- gulong *supported; ---- ---- /* create the netwm support window */ ---- attrib.override_redirect = TRUE; ---- attrib.event_mask = PropertyChangeMask; ---- screen_support_win = XCreateWindow(obt_display, obt_root(ob_screen), ---- -100, -100, 1, 1, 0, ---- CopyFromParent, InputOutput, ---- CopyFromParent, ---- CWEventMask | CWOverrideRedirect, ---- &attrib); ---- XMapWindow(obt_display, screen_support_win); ---- XLowerWindow(obt_display, screen_support_win); ---- ---- if (!replace_wm()) { ---- XDestroyWindow(obt_display, screen_support_win); ---- return FALSE; ---- } ---- ---- obt_display_ignore_errors(TRUE); ---- XSelectInput(obt_display, obt_root(ob_screen), ROOT_EVENTMASK); ---- obt_display_ignore_errors(FALSE); ---- if (obt_display_error_occured) { ---- g_message(_("A window manager is already running on screen %d"), ---- ob_screen); ---- ---- XDestroyWindow(obt_display, screen_support_win); ---- return FALSE; ---- } ---- ---- screen_set_root_cursor(); ---- ---- /* set the OPENBOX_PID hint */ ---- pid = getpid(); ---- OBT_PROP_SET32(obt_root(ob_screen), OPENBOX_PID, CARDINAL, pid); ---- ---- /* set supporting window */ ---- OBT_PROP_SET32(obt_root(ob_screen), ---- NET_SUPPORTING_WM_CHECK, WINDOW, screen_support_win); ---- ---- /* set properties on the supporting window */ ---- OBT_PROP_SETS(screen_support_win, NET_WM_NAME, utf8, "Openbox"); ---- OBT_PROP_SET32(screen_support_win, NET_SUPPORTING_WM_CHECK, ---- WINDOW, screen_support_win); ---- ---- /* set the _NET_SUPPORTED_ATOMS hint */ ---- ---- /* this is all the atoms after NET_SUPPORTED in the ObtPropAtoms enum */ ---- num_support = OBT_PROP_NUM_ATOMS - OBT_PROP_NET_SUPPORTED - 1; ---- i = 0; ---- supported = g_new(gulong, num_support); ---- supported[i++] = OBT_PROP_ATOM(NET_SUPPORTING_WM_CHECK); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_FULL_PLACEMENT); ---- supported[i++] = OBT_PROP_ATOM(NET_CURRENT_DESKTOP); ---- supported[i++] = OBT_PROP_ATOM(NET_NUMBER_OF_DESKTOPS); ---- supported[i++] = OBT_PROP_ATOM(NET_DESKTOP_GEOMETRY); ---- supported[i++] = OBT_PROP_ATOM(NET_DESKTOP_VIEWPORT); ---- supported[i++] = OBT_PROP_ATOM(NET_ACTIVE_WINDOW); ---- supported[i++] = OBT_PROP_ATOM(NET_WORKAREA); ---- supported[i++] = OBT_PROP_ATOM(NET_CLIENT_LIST); ---- supported[i++] = OBT_PROP_ATOM(NET_CLIENT_LIST_STACKING); ---- supported[i++] = OBT_PROP_ATOM(NET_DESKTOP_NAMES); ---- supported[i++] = OBT_PROP_ATOM(NET_CLOSE_WINDOW); ---- supported[i++] = OBT_PROP_ATOM(NET_DESKTOP_LAYOUT); ---- supported[i++] = OBT_PROP_ATOM(NET_SHOWING_DESKTOP); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_NAME); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_VISIBLE_NAME); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ICON_NAME); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_VISIBLE_ICON_NAME); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_DESKTOP); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STRUT); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STRUT_PARTIAL); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ICON); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ICON_GEOMETRY); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DESKTOP); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_TOOLBAR); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_MENU); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_UTILITY); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_SPLASH); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_NORMAL); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ALLOWED_ACTIONS); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_MOVE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_RESIZE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_MINIMIZE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_SHADE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_MAXIMIZE_HORZ); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_MAXIMIZE_VERT); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_FULLSCREEN); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_CHANGE_DESKTOP); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_CLOSE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_ABOVE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_ACTION_BELOW); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_MODAL); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_VERT); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_MAXIMIZED_HORZ); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_SHADED); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_SKIP_TASKBAR); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_SKIP_PAGER); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_HIDDEN); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_FULLSCREEN); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_ABOVE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_BELOW); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_STATE_DEMANDS_ATTENTION); ---- supported[i++] = OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_MOVERESIZE); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_USER_TIME); ----/* ---- supported[i++] = OBT_PROP_ATOM(NET_WM_USER_TIME_WINDOW); ----*/ ---- supported[i++] = OBT_PROP_ATOM(NET_FRAME_EXTENTS); ---- supported[i++] = OBT_PROP_ATOM(NET_REQUEST_FRAME_EXTENTS); ---- supported[i++] = OBT_PROP_ATOM(NET_RESTACK_WINDOW); ---- supported[i++] = OBT_PROP_ATOM(NET_STARTUP_ID); ----#ifdef SYNC ---- supported[i++] = OBT_PROP_ATOM(NET_WM_SYNC_REQUEST); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_SYNC_REQUEST_COUNTER); ----#endif ---- supported[i++] = OBT_PROP_ATOM(NET_WM_PID); ---- supported[i++] = OBT_PROP_ATOM(NET_WM_PING); ---- ---- supported[i++] = OBT_PROP_ATOM(KDE_WM_CHANGE_STATE); ---- supported[i++] = OBT_PROP_ATOM(KDE_NET_WM_FRAME_STRUT); ---- supported[i++] = OBT_PROP_ATOM(KDE_NET_WM_WINDOW_TYPE_OVERRIDE); ---- - supported[i++] = OBT_PROP_ATOM(OB_FOCUS); ---- supported[i++] = OBT_PROP_ATOM(OB_WM_ACTION_UNDECORATE); ---- supported[i++] = OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED); ---- supported[i++] = OBT_PROP_ATOM(OPENBOX_PID); ---- supported[i++] = OBT_PROP_ATOM(OB_THEME); ---- supported[i++] = OBT_PROP_ATOM(OB_CONFIG_FILE); ---- supported[i++] = OBT_PROP_ATOM(OB_CONTROL); ---- g_assert(i == num_support); ---- ---- OBT_PROP_SETA32(obt_root(ob_screen), ---- NET_SUPPORTED, ATOM, supported, num_support); ---- g_free(supported); ---- --- screen_tell_ksplash(); -// screen_tell_ksplash(); ---- ---- return TRUE; ----} --- -#if 0 ----static void screen_tell_ksplash(void) ----{ ---- XEvent e; ---- char **argv; ---- ---- argv = g_new(gchar*, 6); ---- argv[0] = g_strdup("dcop"); ---- argv[1] = g_strdup("ksplash"); ---- argv[2] = g_strdup("ksplash"); ---- argv[3] = g_strdup("upAndRunning(QString)"); ---- argv[4] = g_strdup("wm started"); ---- argv[5] = NULL; ---- ---- /* tell ksplash through the dcop server command line interface */ ---- g_spawn_async(NULL, argv, NULL, ---- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | ---- G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_STDOUT_TO_DEV_NULL, ---- NULL, NULL, NULL, NULL); ---- g_strfreev(argv); ---- ---- /* i'm not sure why we do this, kwin does it, but ksplash doesn't seem to ---- hear it anyways. perhaps it is for old ksplash. or new ksplash. or ---- something. oh well. */ ---- e.xclient.type = ClientMessage; ---- e.xclient.display = obt_display; ---- e.xclient.window = obt_root(ob_screen); ---- e.xclient.message_type = ---- XInternAtom(obt_display, "_KDE_SPLASH_PROGRESS", False ); ---- e.xclient.format = 8; ---- strcpy(e.xclient.data.b, "wm started"); ---- XSendEvent(obt_display, obt_root(ob_screen), ---- False, SubstructureNotifyMask, &e); ----} --- -#endif ----void screen_startup(gboolean reconfig) ----{ ---- gchar **names = NULL; ---- guint32 d; ---- gboolean namesexist = FALSE; ---- ---- desktop_popup = pager_popup_new(); ---- pager_popup_height(desktop_popup, POPUP_HEIGHT); ---- ---- if (reconfig) { ---- /* update the pager popup's width */ ---- pager_popup_text_width_to_strings(desktop_popup, ---- screen_desktop_names, ---- screen_num_desktops); ---- return; ---- } ---- ---- /* get the initial size */ ---- screen_resize(); ---- ---- /* have names already been set for the desktops? */ ---- if (OBT_PROP_GETSS(obt_root(ob_screen), NET_DESKTOP_NAMES, utf8, &names)) { ---- g_strfreev(names); ---- namesexist = TRUE; ---- } ---- ---- /* if names don't exist and we have session names, set those. ---- do this stuff BEFORE setting the number of desktops, because that ---- will create default names for them ---- */ ---- if (!namesexist && session_desktop_names != NULL) { ---- guint i, numnames; ---- GSList *it; ---- ---- /* get the desktop names */ ---- numnames = g_slist_length(session_desktop_names); ---- names = g_new(gchar*, numnames + 1); ---- names[numnames] = NULL; ---- for (i = 0, it = session_desktop_names; it; ++i, it = g_slist_next(it)) ---- names[i] = g_strdup(it->data); ---- ---- /* set the root window property */ ---- OBT_PROP_SETSS(obt_root(ob_screen), ---- NET_DESKTOP_NAMES, utf8, (const gchar**)names); ---- ---- g_strfreev(names); ---- } ---- ---- /* set the number of desktops, if it's not already set. ---- ---- this will also set the default names from the config file up for ---- desktops that don't have names yet */ ---- screen_num_desktops = 0; ---- if (OBT_PROP_GET32(obt_root(ob_screen), ---- NET_NUMBER_OF_DESKTOPS, CARDINAL, &d)) ---- { ---- if (d != config_desktops_num) { ---- /* TRANSLATORS: If you need to specify a different order of the ---- arguments, you can use %1$d for the first one and %2$d for the ---- second one. For example, ---- "The current session has %2$d desktops, but Openbox is configured for %1$d ..." */ ---- g_warning(_("Openbox is configured for %d desktops, but the current session has %d. Overriding the Openbox configuration."), ---- config_desktops_num, d); ---- } ---- screen_set_num_desktops(d); ---- } ---- /* restore from session if possible */ ---- else if (session_num_desktops) ---- screen_set_num_desktops(session_num_desktops); ---- else ---- screen_set_num_desktops(config_desktops_num); ---- ---- screen_desktop = screen_num_desktops; /* something invalid */ ---- /* start on the current desktop when a wm was already running */ ---- if (OBT_PROP_GET32(obt_root(ob_screen), ---- NET_CURRENT_DESKTOP, CARDINAL, &d) && ---- d < screen_num_desktops) ---- { ---- screen_set_desktop(d, FALSE); ---- } else if (session_desktop >= 0) ---- screen_set_desktop(MIN((guint)session_desktop, ---- screen_num_desktops), FALSE); ---- else ---- screen_set_desktop(MIN(config_screen_firstdesk, ---- screen_num_desktops) - 1, FALSE); --- screen_last_desktop = screen_desktop; - OBT_PROP_GET32(obt_root(ob_screen), OB_LAST_DESKTOP, CARDINAL, &screen_last_desktop); - if (screen_last_desktop < 0 || screen_last_desktop >= screen_num_desktops) { - screen_last_desktop = screen_desktop; - OBT_PROP_SET32(obt_root(ob_screen), OB_LAST_DESKTOP, CARDINAL, screen_last_desktop); - } ---- ---- /* don't start in showing-desktop mode */ ---- screen_showing_desktop = FALSE; ---- OBT_PROP_SET32(obt_root(ob_screen), ---- NET_SHOWING_DESKTOP, CARDINAL, screen_showing_desktop); ---- ---- if (session_desktop_layout_present && ---- screen_validate_layout(&session_desktop_layout)) ---- { ---- screen_desktop_layout = session_desktop_layout; ---- } ---- else ---- screen_update_layout(); ----} ---- ----void screen_shutdown(gboolean reconfig) ----{ ---- pager_popup_free(desktop_popup); ---- ---- if (reconfig) ---- return; ---- ---- XSelectInput(obt_display, obt_root(ob_screen), NoEventMask); ---- ---- /* we're not running here no more! */ ---- OBT_PROP_ERASE(obt_root(ob_screen), OPENBOX_PID); ---- /* not without us */ ---- OBT_PROP_ERASE(obt_root(ob_screen), NET_SUPPORTED); ---- /* don't keep this mode */ ---- OBT_PROP_ERASE(obt_root(ob_screen), NET_SHOWING_DESKTOP); ---- ---- XDestroyWindow(obt_display, screen_support_win); ---- ---- g_strfreev(screen_desktop_names); ---- screen_desktop_names = NULL; ----} ---- ----void screen_resize(void) ----{ ---- static gint oldw = 0, oldh = 0; ---- gint w, h; ---- GList *it; ---- gulong geometry[2]; ---- ---- w = WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)); ---- h = HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen)); ---- ---- if (w == oldw && h == oldh) return; ---- ---- oldw = w; oldh = h; ---- ---- /* Set the _NET_DESKTOP_GEOMETRY hint */ ---- screen_physical_size.width = geometry[0] = w; ---- screen_physical_size.height = geometry[1] = h; ---- OBT_PROP_SETA32(obt_root(ob_screen), ---- NET_DESKTOP_GEOMETRY, CARDINAL, geometry, 2); ---- ---- if (ob_state() == OB_STATE_STARTING) ---- return; ---- ---- screen_update_areas(); ---- dock_configure(); ---- ---- for (it = client_list; it; it = g_list_next(it)) ---- client_move_onscreen(it->data, FALSE); ----} ---- ----void screen_set_num_desktops(guint num) ----{ ---- guint old; ---- gulong *viewport; ---- GList *it, *stacking_copy; ---- ---- g_assert(num > 0); ---- ---- if (screen_num_desktops == num) return; ---- ---- old = screen_num_desktops; ---- screen_num_desktops = num; ---- OBT_PROP_SET32(obt_root(ob_screen), NET_NUMBER_OF_DESKTOPS, CARDINAL, num); ---- ---- /* set the viewport hint */ ---- viewport = g_new0(gulong, num * 2); ---- OBT_PROP_SETA32(obt_root(ob_screen), ---- NET_DESKTOP_VIEWPORT, CARDINAL, viewport, num * 2); ---- g_free(viewport); ---- ---- /* the number of rows/columns will differ */ ---- screen_update_layout(); ---- ---- /* move windows on desktops that will no longer exist! ---- make a copy of the list cuz we're changing it */ ---- stacking_copy = g_list_copy(stacking_list); ---- for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- if (c->desktop != DESKTOP_ALL && c->desktop >= num) ---- client_set_desktop(c, num - 1, FALSE, TRUE); ---- /* raise all the windows that are on the current desktop which ---- is being merged */ ---- else if (screen_desktop == num - 1 && ---- (c->desktop == DESKTOP_ALL || ---- c->desktop == screen_desktop)) ---- stacking_raise(CLIENT_AS_WINDOW(c)); ---- } ---- } ---- ---- /* change our struts/area to match (after moving windows) */ ---- screen_update_areas(); ---- ---- /* may be some unnamed desktops that we need to fill in with names ---- (after updating the areas so the popup can resize) */ ---- screen_update_desktop_names(); ---- ---- /* change our desktop if we're on one that no longer exists! */ ---- if (screen_desktop >= screen_num_desktops) ---- screen_set_desktop(num - 1, TRUE); ----} ---- ----static void screen_fallback_focus(void) ----{ ---- ObClient *c; ---- gboolean allow_omni; ---- ---- /* only allow omnipresent windows to get focus on desktop change if ---- an omnipresent window is already focused (it'll keep focus probably, but ---- maybe not depending on mouse-focus options) */ ---- allow_omni = focus_client && (client_normal(focus_client) && ---- focus_client->desktop == DESKTOP_ALL); ---- ---- /* the client moved there already so don't move focus. prevent flicker ---- on sendtodesktop + follow */ ---- if (focus_client && focus_client->desktop == screen_desktop) ---- return; ---- ---- /* have to try focus here because when you leave an empty desktop ---- there is no focus out to watch for. also, we have different rules ---- here. we always allow it to look under the mouse pointer if ---- config_focus_last is FALSE ---- ---- do this before hiding the windows so if helper windows are coming ---- with us, they don't get hidden ---- */ ---- if ((c = focus_fallback(TRUE, !config_focus_last, allow_omni, ---- !allow_omni))) ---- { ---- /* only do the flicker reducing stuff ahead of time if we are going ---- to call xsetinputfocus on the window ourselves. otherwise there is ---- no guarantee the window will actually take focus.. */ ---- if (c->can_focus) { ---- /* reduce flicker by hiliting now rather than waiting for the ---- server FocusIn event */ ---- frame_adjust_focus(c->frame, TRUE); ---- /* do this here so that if you switch desktops to a window with ---- helper windows then the helper windows won't flash */ ---- client_bring_helper_windows(c); ---- } ---- } ----} ---- ----static gboolean last_desktop_func(gpointer data) ----{ ---- screen_desktop_timeout = TRUE; - OBT_PROP_SET32(obt_root(ob_screen), OB_LAST_DESKTOP, CARDINAL, screen_last_desktop); ---- return FALSE; ----} ---- ----void screen_set_desktop(guint num, gboolean dofocus) ----{ ---- GList *it; ---- guint previous; ---- gulong ignore_start; ---- ---- g_assert(num < screen_num_desktops); ---- ---- previous = screen_desktop; ---- screen_desktop = num; ---- ---- if (previous == num) return; ---- ---- OBT_PROP_SET32(obt_root(ob_screen), NET_CURRENT_DESKTOP, CARDINAL, num); ---- ---- /* This whole thing decides when/how to save the screen_last_desktop so ---- that it can be restored later if you want */ ---- if (screen_desktop_timeout) { ---- /* If screen_desktop_timeout is true, then we've been on this desktop ---- long enough and we can save it as the last desktop. */ ---- ---- if (screen_last_desktop == previous) ---- /* this is the startup state only */ ---- screen_old_desktop = screen_desktop; ---- else { ---- /* save the "last desktop" as the "old desktop" */ ---- screen_old_desktop = screen_last_desktop; ---- /* save the desktop we're coming from as the "last desktop" */ ---- screen_last_desktop = previous; ---- } ---- } ---- else { ---- /* If screen_desktop_timeout is false, then we just got to this desktop ---- and we are moving away again. */ ---- ---- if (screen_desktop == screen_last_desktop) { ---- /* If we are moving to the "last desktop" .. */ ---- if (previous == screen_old_desktop) { ---- /* .. from the "old desktop", change the last desktop to ---- be where we are coming from */ ---- screen_last_desktop = screen_old_desktop; ---- } ---- else if (screen_last_desktop == screen_old_desktop) { ---- /* .. and also to the "old desktop", change the "last ---- desktop" to be where we are coming from */ ---- screen_last_desktop = previous; ---- } ---- else { ---- /* .. from some other desktop, then set the "last desktop" to ---- be the saved "old desktop", i.e. where we were before the ---- "last desktop" */ ---- screen_last_desktop = screen_old_desktop; ---- } ---- } ---- else { ---- /* If we are moving to any desktop besides the "last desktop".. ---- (this is the normal case) */ ---- if (screen_desktop == screen_old_desktop) { ---- /* If moving to the "old desktop", which is not the ---- "last desktop", don't save anything */ ---- } ---- else if (previous == screen_old_desktop) { ---- /* If moving from the "old desktop", and not to the ---- "last desktop", don't save anything */ ---- } ---- else if (screen_last_desktop == screen_old_desktop) { ---- /* If the "last desktop" is the same as "old desktop" and ---- you're not moving to the "last desktop" then save where ---- we're coming from as the "last desktop" */ ---- screen_last_desktop = previous; ---- } ---- else { ---- /* If the "last desktop" is different from the "old desktop" ---- and you're not moving to the "last desktop", then don't save ---- anything */ ---- } ---- } ---- } ---- screen_desktop_timeout = FALSE; ---- obt_main_loop_timeout_remove(ob_main_loop, last_desktop_func); ---- obt_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME, ---- last_desktop_func, NULL, NULL, NULL); ---- ---- ob_debug("Moving to desktop %d", num+1); ---- ---- if (ob_state() == OB_STATE_RUNNING) ---- screen_show_desktop_popup(screen_desktop); ---- ---- /* ignore enter events caused by the move */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- if (moveresize_client) ---- client_set_desktop(moveresize_client, num, TRUE, FALSE); ---- ---- /* show windows before hiding the rest to lessen the enter/leave events */ ---- ---- /* show windows from top to bottom */ ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- client_show(c); ---- } ---- } ---- ---- if (dofocus) screen_fallback_focus(); ---- ---- /* hide windows from bottom to top */ ---- for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- client_hide(c); ---- } ---- } ---- ---- event_end_ignore_all_enters(ignore_start); ---- ---- if (event_curtime != CurrentTime) ---- screen_desktop_user_time = event_curtime; ----} ---- ----void screen_add_desktop(gboolean current) ----{ ---- gulong ignore_start; ---- ---- /* ignore enter events caused by this */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- screen_set_num_desktops(screen_num_desktops+1); ---- ---- /* move all the clients over */ ---- if (current) { ---- GList *it; ---- ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop && ---- /* don't move direct children, they'll be moved with their ---- parent - which will have to be on the same desktop */ ---- !client_direct_parent(c)) ---- { ---- ob_debug("moving window %s", c->title); ---- client_set_desktop(c, c->desktop+1, FALSE, TRUE); ---- } ---- } ---- } ---- ---- event_end_ignore_all_enters(ignore_start); ----} ---- ----void screen_remove_desktop(gboolean current) ----{ ---- guint rmdesktop, movedesktop; ---- GList *it, *stacking_copy; ---- gulong ignore_start; ---- ---- if (screen_num_desktops <= 1) return; ---- ---- /* ignore enter events caused by this */ ---- ignore_start = event_start_ignore_all_enters(); ---- ---- /* what desktop are we removing and moving to? */ ---- if (current) ---- rmdesktop = screen_desktop; ---- else ---- rmdesktop = screen_num_desktops - 1; ---- if (rmdesktop < screen_num_desktops - 1) ---- movedesktop = rmdesktop + 1; ---- else ---- movedesktop = rmdesktop; ---- ---- /* make a copy of the list cuz we're changing it */ ---- stacking_copy = g_list_copy(stacking_list); ---- for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- guint d = c->desktop; ---- if (d != DESKTOP_ALL && d >= movedesktop && ---- /* don't move direct children, they'll be moved with their ---- parent - which will have to be on the same desktop */ ---- !client_direct_parent(c)) ---- { ---- ob_debug("moving window %s", c->title); ---- client_set_desktop(c, c->desktop - 1, TRUE, TRUE); ---- } ---- /* raise all the windows that are on the current desktop which ---- is being merged */ ---- if ((screen_desktop == rmdesktop - 1 || ---- screen_desktop == rmdesktop) && ---- (d == DESKTOP_ALL || d == screen_desktop)) ---- { ---- stacking_raise(CLIENT_AS_WINDOW(c)); ---- ob_debug("raising window %s", c->title); ---- } ---- } ---- } ---- ---- /* fallback focus like we're changing desktops */ ---- if (screen_desktop < screen_num_desktops - 1) { ---- screen_fallback_focus(); ---- ob_debug("fake desktop change"); ---- } ---- ---- screen_set_num_desktops(screen_num_desktops-1); ---- ---- event_end_ignore_all_enters(ignore_start); ----} ---- ----static void get_row_col(guint d, guint *r, guint *c) ----{ ---- switch (screen_desktop_layout.orientation) { ---- case OB_ORIENTATION_HORZ: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- *r = d / screen_desktop_layout.columns; ---- *c = d % screen_desktop_layout.columns; ---- break; ---- case OB_CORNER_BOTTOMLEFT: ---- *r = screen_desktop_layout.rows - 1 - ---- d / screen_desktop_layout.columns; ---- *c = d % screen_desktop_layout.columns; ---- break; ---- case OB_CORNER_TOPRIGHT: ---- *r = d / screen_desktop_layout.columns; ---- *c = screen_desktop_layout.columns - 1 - ---- d % screen_desktop_layout.columns; ---- break; ---- case OB_CORNER_BOTTOMRIGHT: ---- *r = screen_desktop_layout.rows - 1 - ---- d / screen_desktop_layout.columns; ---- *c = screen_desktop_layout.columns - 1 - ---- d % screen_desktop_layout.columns; ---- break; ---- } ---- break; ---- case OB_ORIENTATION_VERT: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- *r = d % screen_desktop_layout.rows; ---- *c = d / screen_desktop_layout.rows; ---- break; ---- case OB_CORNER_BOTTOMLEFT: ---- *r = screen_desktop_layout.rows - 1 - ---- d % screen_desktop_layout.rows; ---- *c = d / screen_desktop_layout.rows; ---- break; ---- case OB_CORNER_TOPRIGHT: ---- *r = d % screen_desktop_layout.rows; ---- *c = screen_desktop_layout.columns - 1 - ---- d / screen_desktop_layout.rows; ---- break; ---- case OB_CORNER_BOTTOMRIGHT: ---- *r = screen_desktop_layout.rows - 1 - ---- d % screen_desktop_layout.rows; ---- *c = screen_desktop_layout.columns - 1 - ---- d / screen_desktop_layout.rows; ---- break; ---- } ---- break; ---- } ----} ---- ----static guint translate_row_col(guint r, guint c) ----{ ---- switch (screen_desktop_layout.orientation) { ---- case OB_ORIENTATION_HORZ: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- return r % screen_desktop_layout.rows * ---- screen_desktop_layout.columns + ---- c % screen_desktop_layout.columns; ---- case OB_CORNER_BOTTOMLEFT: ---- return (screen_desktop_layout.rows - 1 - ---- r % screen_desktop_layout.rows) * ---- screen_desktop_layout.columns + ---- c % screen_desktop_layout.columns; ---- case OB_CORNER_TOPRIGHT: ---- return r % screen_desktop_layout.rows * ---- screen_desktop_layout.columns + ---- (screen_desktop_layout.columns - 1 - ---- c % screen_desktop_layout.columns); ---- case OB_CORNER_BOTTOMRIGHT: ---- return (screen_desktop_layout.rows - 1 - ---- r % screen_desktop_layout.rows) * ---- screen_desktop_layout.columns + ---- (screen_desktop_layout.columns - 1 - ---- c % screen_desktop_layout.columns); ---- } ---- case OB_ORIENTATION_VERT: ---- switch (screen_desktop_layout.start_corner) { ---- case OB_CORNER_TOPLEFT: ---- return c % screen_desktop_layout.columns * ---- screen_desktop_layout.rows + ---- r % screen_desktop_layout.rows; ---- case OB_CORNER_BOTTOMLEFT: ---- return c % screen_desktop_layout.columns * ---- screen_desktop_layout.rows + ---- (screen_desktop_layout.rows - 1 - ---- r % screen_desktop_layout.rows); ---- case OB_CORNER_TOPRIGHT: ---- return (screen_desktop_layout.columns - 1 - ---- c % screen_desktop_layout.columns) * ---- screen_desktop_layout.rows + ---- r % screen_desktop_layout.rows; ---- case OB_CORNER_BOTTOMRIGHT: ---- return (screen_desktop_layout.columns - 1 - ---- c % screen_desktop_layout.columns) * ---- screen_desktop_layout.rows + ---- (screen_desktop_layout.rows - 1 - ---- r % screen_desktop_layout.rows); ---- } ---- } ---- g_assert_not_reached(); ---- return 0; ----} ---- ----static gboolean hide_desktop_popup_func(gpointer data) ----{ ---- pager_popup_hide(desktop_popup); ---- return FALSE; /* don't repeat */ ----} ---- ----void screen_show_desktop_popup(guint d) ----{ ---- Rect *a; ---- ---- /* 0 means don't show the popup */ ---- if (!config_desktop_popup_time) return; ---- ---- a = screen_physical_area_active(); ---- pager_popup_position(desktop_popup, CenterGravity, ---- a->x + a->width / 2, a->y + a->height / 2); ---- pager_popup_icon_size_multiplier(desktop_popup, ---- (screen_desktop_layout.columns / ---- screen_desktop_layout.rows) / 2, ---- (screen_desktop_layout.rows/ ---- screen_desktop_layout.columns) / 2); ---- pager_popup_max_width(desktop_popup, ---- MAX(a->width/3, POPUP_WIDTH)); ---- pager_popup_show(desktop_popup, screen_desktop_names[d], d); ---- ---- obt_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func); ---- obt_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000, ---- hide_desktop_popup_func, NULL, NULL, NULL); ---- g_free(a); ----} ---- ----void screen_hide_desktop_popup(void) ----{ ---- obt_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func); ---- pager_popup_hide(desktop_popup); ----} ---- ----guint screen_find_desktop(guint from, ObDirection dir, ---- gboolean wrap, gboolean linear) ----{ ---- guint r, c; ---- guint d; ---- ---- d = from; ---- get_row_col(d, &r, &c); ---- if (linear) { ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- if (d < screen_num_desktops - 1) ---- ++d; ---- else if (wrap) ---- d = 0; ---- else ---- return from; ---- break; ---- case OB_DIRECTION_WEST: ---- if (d > 0) ---- --d; ---- else if (wrap) ---- d = screen_num_desktops - 1; ---- else ---- return from; ---- break; ---- default: ---- g_assert_not_reached(); ---- return from; ---- } ---- } else { ---- switch (dir) { ---- case OB_DIRECTION_EAST: ---- ++c; ---- if (c >= screen_desktop_layout.columns) { ---- if (wrap) ---- c = 0; ---- else ---- return from; ---- } ---- d = translate_row_col(r, c); ---- if (d >= screen_num_desktops) { ---- if (wrap) ---- ++c; ---- else ---- return from; ---- } ---- break; ---- case OB_DIRECTION_WEST: ---- --c; ---- if (c >= screen_desktop_layout.columns) { ---- if (wrap) ---- c = screen_desktop_layout.columns - 1; ---- else ---- return from; ---- } ---- d = translate_row_col(r, c); ---- if (d >= screen_num_desktops) { ---- if (wrap) ---- --c; ---- else ---- return from; ---- } ---- break; ---- case OB_DIRECTION_SOUTH: ---- ++r; ---- if (r >= screen_desktop_layout.rows) { ---- if (wrap) ---- r = 0; ---- else ---- return from; ---- } ---- d = translate_row_col(r, c); ---- if (d >= screen_num_desktops) { ---- if (wrap) ---- ++r; ---- else ---- return from; ---- } ---- break; ---- case OB_DIRECTION_NORTH: ---- --r; ---- if (r >= screen_desktop_layout.rows) { ---- if (wrap) ---- r = screen_desktop_layout.rows - 1; ---- else ---- return from; ---- } ---- d = translate_row_col(r, c); ---- if (d >= screen_num_desktops) { ---- if (wrap) ---- --r; ---- else ---- return from; ---- } ---- break; ---- default: ---- g_assert_not_reached(); ---- return from; ---- } ---- ---- d = translate_row_col(r, c); ---- } ---- return d; ----} ---- ----static gboolean screen_validate_layout(ObDesktopLayout *l) ----{ ---- if (l->columns == 0 && l->rows == 0) /* both 0's is bad data.. */ ---- return FALSE; ---- ---- /* fill in a zero rows/columns */ ---- if (l->columns == 0) { ---- l->columns = screen_num_desktops / l->rows; ---- if (l->rows * l->columns < screen_num_desktops) ---- l->columns++; ---- if (l->rows * l->columns >= screen_num_desktops + l->columns) ---- l->rows--; ---- } else if (l->rows == 0) { ---- l->rows = screen_num_desktops / l->columns; ---- if (l->columns * l->rows < screen_num_desktops) ---- l->rows++; ---- if (l->columns * l->rows >= screen_num_desktops + l->rows) ---- l->columns--; ---- } ---- ---- /* bounds checking */ ---- if (l->orientation == OB_ORIENTATION_HORZ) { ---- l->columns = MIN(screen_num_desktops, l->columns); ---- l->rows = MIN(l->rows, ---- (screen_num_desktops + l->columns - 1) / l->columns); ---- l->columns = screen_num_desktops / l->rows + ---- !!(screen_num_desktops % l->rows); ---- } else { ---- l->rows = MIN(screen_num_desktops, l->rows); ---- l->columns = MIN(l->columns, ---- (screen_num_desktops + l->rows - 1) / l->rows); ---- l->rows = screen_num_desktops / l->columns + ---- !!(screen_num_desktops % l->columns); ---- } ---- return TRUE; ----} ---- ----void screen_update_layout(void) ---- ----{ ---- ObDesktopLayout l; ---- guint32 *data; ---- guint num; ---- ---- screen_desktop_layout.orientation = OB_ORIENTATION_HORZ; ---- screen_desktop_layout.start_corner = OB_CORNER_TOPLEFT; ---- screen_desktop_layout.rows = 1; ---- screen_desktop_layout.columns = screen_num_desktops; ---- ---- if (OBT_PROP_GETA32(obt_root(ob_screen), ---- NET_DESKTOP_LAYOUT, CARDINAL, &data, &num)) { ---- if (num == 3 || num == 4) { ---- ---- if (data[0] == OBT_PROP_ATOM(NET_WM_ORIENTATION_VERT)) ---- l.orientation = OB_ORIENTATION_VERT; ---- else if (data[0] == OBT_PROP_ATOM(NET_WM_ORIENTATION_HORZ)) ---- l.orientation = OB_ORIENTATION_HORZ; ---- else ---- return; ---- ---- if (num < 4) ---- l.start_corner = OB_CORNER_TOPLEFT; ---- else { ---- if (data[3] == OBT_PROP_ATOM(NET_WM_TOPLEFT)) ---- l.start_corner = OB_CORNER_TOPLEFT; ---- else if (data[3] == OBT_PROP_ATOM(NET_WM_TOPRIGHT)) ---- l.start_corner = OB_CORNER_TOPRIGHT; ---- else if (data[3] == OBT_PROP_ATOM(NET_WM_BOTTOMRIGHT)) ---- l.start_corner = OB_CORNER_BOTTOMRIGHT; ---- else if (data[3] == OBT_PROP_ATOM(NET_WM_BOTTOMLEFT)) ---- l.start_corner = OB_CORNER_BOTTOMLEFT; ---- else ---- return; ---- } ---- ---- l.columns = data[1]; ---- l.rows = data[2]; ---- ---- if (screen_validate_layout(&l)) ---- screen_desktop_layout = l; ---- ---- g_free(data); ---- } ---- } ----} ---- ----void screen_update_desktop_names(void) ----{ ---- guint i; ---- ---- /* empty the array */ ---- g_strfreev(screen_desktop_names); ---- screen_desktop_names = NULL; ---- ---- if (OBT_PROP_GETSS(obt_root(ob_screen), ---- NET_DESKTOP_NAMES, utf8, &screen_desktop_names)) ---- for (i = 0; screen_desktop_names[i] && i < screen_num_desktops; ++i); ---- else ---- i = 0; ---- if (i < screen_num_desktops) { ---- GSList *it; ---- ---- screen_desktop_names = g_renew(gchar*, screen_desktop_names, ---- screen_num_desktops + 1); ---- screen_desktop_names[screen_num_desktops] = NULL; ---- ---- it = g_slist_nth(config_desktops_names, i); ---- ---- for (; i < screen_num_desktops; ++i) { ---- if (it && ((char*)it->data)[0]) /* not empty */ ---- /* use the names from the config file when possible */ ---- screen_desktop_names[i] = g_strdup(it->data); ---- else ---- /* make up a nice name if it's not though */ ---- screen_desktop_names[i] = g_strdup_printf(_("desktop %i"), ---- i + 1); ---- if (it) it = g_slist_next(it); ---- } ---- ---- /* if we changed any names, then set the root property so we can ---- all agree on the names */ ---- OBT_PROP_SETSS(obt_root(ob_screen), NET_DESKTOP_NAMES, ---- utf8, (const gchar**)screen_desktop_names); ---- } ---- ---- /* resize the pager for these names */ ---- pager_popup_text_width_to_strings(desktop_popup, ---- screen_desktop_names, ---- screen_num_desktops); ----} ---- ----void screen_show_desktop(gboolean show, ObClient *show_only) ----{ ---- GList *it; ---- ---- if (show == screen_showing_desktop) return; /* no change */ ---- ---- screen_showing_desktop = show; ---- ---- if (show) { ---- /* hide windows bottom to top */ ---- for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *client = it->data; ---- client_showhide(client); ---- } ---- } ---- } ---- else { ---- /* restore windows top to bottom */ ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *client = it->data; ---- if (client_should_show(client)) { ---- if (!show_only || client == show_only) ---- client_show(client); ---- else ---- client_iconify(client, TRUE, FALSE, TRUE); ---- } ---- } ---- } ---- } ---- ---- if (show) { ---- /* focus the desktop */ ---- for (it = focus_order; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (c->type == OB_CLIENT_TYPE_DESKTOP && ---- (c->desktop == screen_desktop || c->desktop == DESKTOP_ALL) && ---- client_focus(it->data)) ---- break; ---- } ---- } ---- else if (!show_only) { ---- ObClient *c; ---- ---- if ((c = focus_fallback(TRUE, FALSE, TRUE, FALSE))) { ---- /* only do the flicker reducing stuff ahead of time if we are going ---- to call xsetinputfocus on the window ourselves. otherwise there ---- is no guarantee the window will actually take focus.. */ ---- if (c->can_focus) { ---- /* reduce flicker by hiliting now rather than waiting for the ---- server FocusIn event */ ---- frame_adjust_focus(c->frame, TRUE); ---- } ---- } ---- } ---- ---- show = !!show; /* make it boolean */ ---- OBT_PROP_SET32(obt_root(ob_screen), NET_SHOWING_DESKTOP, CARDINAL, show); ----} ---- ----void screen_install_colormap(ObClient *client, gboolean install) ----{ ---- if (client == NULL || client->colormap == None) { ---- if (install) ---- XInstallColormap(obt_display, RrColormap(ob_rr_inst)); ---- else ---- XUninstallColormap(obt_display, RrColormap(ob_rr_inst)); ---- } else { ---- obt_display_ignore_errors(TRUE); ---- if (install) ---- XInstallColormap(obt_display, client->colormap); ---- else ---- XUninstallColormap(obt_display, client->colormap); ---- obt_display_ignore_errors(FALSE); ---- } ----} ---- ----#define STRUT_LEFT_ON_MONITOR(s, i) \ ---- (RANGES_INTERSECT(s->left_start, s->left_end - s->left_start + 1, \ ---- monitor_area[i].y, monitor_area[i].height)) ----#define STRUT_RIGHT_ON_MONITOR(s, i) \ ---- (RANGES_INTERSECT(s->right_start, s->right_end - s->right_start + 1, \ ---- monitor_area[i].y, monitor_area[i].height)) ----#define STRUT_TOP_ON_MONITOR(s, i) \ ---- (RANGES_INTERSECT(s->top_start, s->top_end - s->top_start + 1, \ ---- monitor_area[i].x, monitor_area[i].width)) ----#define STRUT_BOTTOM_ON_MONITOR(s, i) \ ---- (RANGES_INTERSECT(s->bottom_start, s->bottom_end - s->bottom_start + 1, \ ---- monitor_area[i].x, monitor_area[i].width)) ---- ----typedef struct { ---- guint desktop; ---- StrutPartial *strut; ----} ObScreenStrut; ---- ----#define RESET_STRUT_LIST(sl) \ ---- (g_slist_free(sl), sl = NULL) ---- ----#define ADD_STRUT_TO_LIST(sl, d, s) \ ----{ \ ---- ObScreenStrut *ss = g_new(ObScreenStrut, 1); \ ---- ss->desktop = d; \ ---- ss->strut = s; \ ---- sl = g_slist_prepend(sl, ss); \ ----} ---- ----#define VALIDATE_STRUTS(sl, side, max) \ ----{ \ ---- GSList *it; \ ---- for (it = sl; it; it = g_slist_next(it)) { \ ---- ObScreenStrut *ss = it->data; \ ---- ss->strut->side = MIN(max, ss->strut->side); \ ---- } \ ----} ---- ----static void get_xinerama_screens(Rect **xin_areas, guint *nxin) ----{ ---- guint i; ---- gint l, r, t, b; ---- ---- if (ob_debug_xinerama) { ---- gint w = WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)); ---- gint h = HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen)); ---- *nxin = 2; ---- *xin_areas = g_new(Rect, *nxin + 1); ---- RECT_SET((*xin_areas)[0], 0, 0, w/2, h); ---- RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h); - } else if (config_emulate_xinerama) { - *nxin = 2; - *xin_areas = g_new(Rect, *nxin + 1); - RECT_SET((*xin_areas)[0], 0, 0, - WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)) / 2, - HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen))); - RECT_SET((*xin_areas)[1], - WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)) / 2, - 0, - WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)) / 2, - HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen))); - RECT_SET((*xin_areas)[*nxin], 0, 0, - WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)), - HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen))); ---- } ----#ifdef XINERAMA ---- else if (obt_display_extension_xinerama) { ---- guint i; ---- gint n; ---- XineramaScreenInfo *info = XineramaQueryScreens(obt_display, &n); ---- *nxin = n; ---- *xin_areas = g_new(Rect, *nxin + 1); ---- for (i = 0; i < *nxin; ++i) ---- RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org, ---- info[i].width, info[i].height); ---- XFree(info); ---- } ----#endif ---- else { ---- *nxin = 1; ---- *xin_areas = g_new(Rect, *nxin + 1); ---- RECT_SET((*xin_areas)[0], 0, 0, ---- WidthOfScreen(ScreenOfDisplay(obt_display, ob_screen)), ---- HeightOfScreen(ScreenOfDisplay(obt_display, ob_screen))); ---- } ---- ---- /* returns one extra with the total area in it */ ---- l = (*xin_areas)[0].x; ---- t = (*xin_areas)[0].y; ---- r = (*xin_areas)[0].x + (*xin_areas)[0].width - 1; ---- b = (*xin_areas)[0].y + (*xin_areas)[0].height - 1; ---- for (i = 1; i < *nxin; ++i) { ---- l = MIN(l, (*xin_areas)[i].x); ---- t = MIN(l, (*xin_areas)[i].y); ---- r = MAX(r, (*xin_areas)[i].x + (*xin_areas)[i].width - 1); ---- b = MAX(b, (*xin_areas)[i].y + (*xin_areas)[i].height - 1); ---- } ---- RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1); ----} ---- ----void screen_update_areas(void) ----{ ---- guint i, j; ---- gulong *dims; ---- GList *it; ---- GSList *sit; ---- ---- g_free(monitor_area); ---- get_xinerama_screens(&monitor_area, &screen_num_monitors); ---- ---- /* set up the user-specified margins */ ---- config_margins.top_start = RECT_LEFT(monitor_area[screen_num_monitors]); ---- config_margins.top_end = RECT_RIGHT(monitor_area[screen_num_monitors]); ---- config_margins.bottom_start = RECT_LEFT(monitor_area[screen_num_monitors]); ---- config_margins.bottom_end = RECT_RIGHT(monitor_area[screen_num_monitors]); ---- config_margins.left_start = RECT_TOP(monitor_area[screen_num_monitors]); ---- config_margins.left_end = RECT_BOTTOM(monitor_area[screen_num_monitors]); ---- config_margins.right_start = RECT_TOP(monitor_area[screen_num_monitors]); ---- config_margins.right_end = RECT_BOTTOM(monitor_area[screen_num_monitors]); ---- ---- dims = g_new(gulong, 4 * screen_num_desktops * screen_num_monitors); ---- ---- RESET_STRUT_LIST(struts_left); ---- RESET_STRUT_LIST(struts_top); ---- RESET_STRUT_LIST(struts_right); ---- RESET_STRUT_LIST(struts_bottom); ---- ---- /* collect the struts */ ---- for (it = client_list; it; it = g_list_next(it)) { ---- ObClient *c = it->data; ---- if (c->strut.left) ---- ADD_STRUT_TO_LIST(struts_left, c->desktop, &c->strut); ---- if (c->strut.top) ---- ADD_STRUT_TO_LIST(struts_top, c->desktop, &c->strut); ---- if (c->strut.right) ---- ADD_STRUT_TO_LIST(struts_right, c->desktop, &c->strut); ---- if (c->strut.bottom) ---- ADD_STRUT_TO_LIST(struts_bottom, c->desktop, &c->strut); ---- } ---- if (dock_strut.left) ---- ADD_STRUT_TO_LIST(struts_left, DESKTOP_ALL, &dock_strut); ---- if (dock_strut.top) ---- ADD_STRUT_TO_LIST(struts_top, DESKTOP_ALL, &dock_strut); ---- if (dock_strut.right) ---- ADD_STRUT_TO_LIST(struts_right, DESKTOP_ALL, &dock_strut); ---- if (dock_strut.bottom) ---- ADD_STRUT_TO_LIST(struts_bottom, DESKTOP_ALL, &dock_strut); ---- ---- if (config_margins.left) ---- ADD_STRUT_TO_LIST(struts_left, DESKTOP_ALL, &config_margins); ---- if (config_margins.top) ---- ADD_STRUT_TO_LIST(struts_top, DESKTOP_ALL, &config_margins); ---- if (config_margins.right) ---- ADD_STRUT_TO_LIST(struts_right, DESKTOP_ALL, &config_margins); ---- if (config_margins.bottom) ---- ADD_STRUT_TO_LIST(struts_bottom, DESKTOP_ALL, &config_margins); ---- ---- VALIDATE_STRUTS(struts_left, left, ---- monitor_area[screen_num_monitors].width / 2); ---- VALIDATE_STRUTS(struts_right, right, ---- monitor_area[screen_num_monitors].width / 2); ---- VALIDATE_STRUTS(struts_top, top, ---- monitor_area[screen_num_monitors].height / 2); ---- VALIDATE_STRUTS(struts_bottom, bottom, ---- monitor_area[screen_num_monitors].height / 2); ---- ---- /* set up the work areas to be full screen */ ---- for (i = 0; i < screen_num_monitors; ++i) ---- for (j = 0; j < screen_num_desktops; ++j) { ---- dims[(i * screen_num_desktops + j) * 4+0] = monitor_area[i].x; ---- dims[(i * screen_num_desktops + j) * 4+1] = monitor_area[i].y; ---- dims[(i * screen_num_desktops + j) * 4+2] = monitor_area[i].width; ---- dims[(i * screen_num_desktops + j) * 4+3] = monitor_area[i].height; ---- } ---- ---- /* calculate the work areas from the struts */ ---- for (i = 0; i < screen_num_monitors; ++i) ---- for (j = 0; j < screen_num_desktops; ++j) { ---- gint l = 0, r = 0, t = 0, b = 0; ---- ---- /* only add the strut to the area if it touches the monitor */ ---- ---- for (sit = struts_left; sit; sit = g_slist_next(sit)) { ---- ObScreenStrut *s = sit->data; ---- if ((s->desktop == j || s->desktop == DESKTOP_ALL) && ---- STRUT_LEFT_ON_MONITOR(s->strut, i)) ---- l = MAX(l, s->strut->left); ---- } ---- for (sit = struts_top; sit; sit = g_slist_next(sit)) { ---- ObScreenStrut *s = sit->data; ---- if ((s->desktop == j || s->desktop == DESKTOP_ALL) && ---- STRUT_TOP_ON_MONITOR(s->strut, i)) ---- t = MAX(t, s->strut->top); ---- } ---- for (sit = struts_right; sit; sit = g_slist_next(sit)) { ---- ObScreenStrut *s = sit->data; ---- if ((s->desktop == j || s->desktop == DESKTOP_ALL) && ---- STRUT_RIGHT_ON_MONITOR(s->strut, i)) ---- r = MAX(r, s->strut->right); ---- } ---- for (sit = struts_bottom; sit; sit = g_slist_next(sit)) { ---- ObScreenStrut *s = sit->data; ---- if ((s->desktop == j || s->desktop == DESKTOP_ALL) && ---- STRUT_BOTTOM_ON_MONITOR(s->strut, i)) ---- b = MAX(b, s->strut->bottom); ---- } ---- ---- /* based on these margins, set the work area for the ---- monitor/desktop */ ---- dims[(i * screen_num_desktops + j) * 4 + 0] += l; ---- dims[(i * screen_num_desktops + j) * 4 + 1] += t; ---- dims[(i * screen_num_desktops + j) * 4 + 2] -= l + r; ---- dims[(i * screen_num_desktops + j) * 4 + 3] -= t + b; ---- } ---- ---- /* all the work areas are not used here, only the ones for the first ---- monitor are */ ---- OBT_PROP_SETA32(obt_root(ob_screen), NET_WORKAREA, CARDINAL, ---- dims, 4 * screen_num_desktops); ---- ---- /* the area has changed, adjust all the windows if they need it */ ---- for (it = client_list; it; it = g_list_next(it)) ---- client_reconfigure(it->data, FALSE); ---- ---- g_free(dims); ----} ---- ----#if 0 ----Rect* screen_area_all_monitors(guint desktop) ----{ ---- guint i; ---- Rect *a; ---- ---- a = screen_area_monitor(desktop, 0); ---- ---- /* combine all the monitors together */ ---- for (i = 1; i < screen_num_monitors; ++i) { ---- Rect *m = screen_area_monitor(desktop, i); ---- gint l, r, t, b; ---- ---- l = MIN(RECT_LEFT(*a), RECT_LEFT(*m)); ---- t = MIN(RECT_TOP(*a), RECT_TOP(*m)); ---- r = MAX(RECT_RIGHT(*a), RECT_RIGHT(*m)); ---- b = MAX(RECT_BOTTOM(*a), RECT_BOTTOM(*m)); ---- ---- RECT_SET(*a, l, t, r - l + 1, b - t + 1); ---- ---- g_free(m); ---- } ---- ---- return a; ----} ----#endif ---- ----#define STRUT_LEFT_IN_SEARCH(s, search) \ ---- (RANGES_INTERSECT(search->y, search->height, \ ---- s->left_start, s->left_end - s->left_start + 1)) ----#define STRUT_RIGHT_IN_SEARCH(s, search) \ ---- (RANGES_INTERSECT(search->y, search->height, \ ---- s->right_start, s->right_end - s->right_start + 1)) ----#define STRUT_TOP_IN_SEARCH(s, search) \ ---- (RANGES_INTERSECT(search->x, search->width, \ ---- s->top_start, s->top_end - s->top_start + 1)) ----#define STRUT_BOTTOM_IN_SEARCH(s, search) \ ---- (RANGES_INTERSECT(search->x, search->width, \ ---- s->bottom_start, s->bottom_end - s->bottom_start + 1)) ---- ----#define STRUT_LEFT_IGNORE(s, us, search) \ ---- (head == SCREEN_AREA_ALL_MONITORS && us && \ ---- RECT_LEFT(monitor_area[i]) + s->left > RECT_LEFT(*search)) ----#define STRUT_RIGHT_IGNORE(s, us, search) \ ---- (head == SCREEN_AREA_ALL_MONITORS && us && \ ---- RECT_RIGHT(monitor_area[i]) - s->right < RECT_RIGHT(*search)) ----#define STRUT_TOP_IGNORE(s, us, search) \ ---- (head == SCREEN_AREA_ALL_MONITORS && us && \ ---- RECT_TOP(monitor_area[i]) + s->top > RECT_TOP(*search)) ----#define STRUT_BOTTOM_IGNORE(s, us, search) \ ---- (head == SCREEN_AREA_ALL_MONITORS && us && \ ---- RECT_BOTTOM(monitor_area[i]) - s->bottom < RECT_BOTTOM(*search)) ---- ----Rect* screen_area(guint desktop, guint head, Rect *search) ----{ ---- Rect *a; ---- GSList *it; ---- gint l, r, t, b, al, ar, at, ab; ---- guint i, d; ---- gboolean us = search != NULL; /* user provided search */ ---- ---- g_assert(desktop < screen_num_desktops || desktop == DESKTOP_ALL); ---- g_assert(head < screen_num_monitors || head == SCREEN_AREA_ONE_MONITOR || ---- head == SCREEN_AREA_ALL_MONITORS); ---- g_assert(!(head == SCREEN_AREA_ONE_MONITOR && search == NULL)); ---- ---- /* find any struts for this monitor ---- which will be affecting the search area. ---- */ ---- ---- /* search everything if search is null */ ---- if (!search) { ---- if (head < screen_num_monitors) search = &monitor_area[head]; ---- else search = &monitor_area[screen_num_monitors]; ---- } ---- if (head == SCREEN_AREA_ONE_MONITOR) head = screen_find_monitor(search); ---- ---- /* al is "all left" meaning the furthest left you can get, l is our ---- "working left" meaning our current strut edge which we're calculating ---- */ ---- ---- /* only include monitors which the search area lines up with */ ---- if (RECT_INTERSECTS_RECT(monitor_area[screen_num_monitors], *search)) { ---- al = l = RECT_RIGHT(monitor_area[screen_num_monitors]); ---- at = t = RECT_BOTTOM(monitor_area[screen_num_monitors]); ---- ar = r = RECT_LEFT(monitor_area[screen_num_monitors]); ---- ab = b = RECT_TOP(monitor_area[screen_num_monitors]); ---- for (i = 0; i < screen_num_monitors; ++i) { ---- /* add the monitor if applicable */ ---- if (RANGES_INTERSECT(search->x, search->width, ---- monitor_area[i].x, monitor_area[i].width)) ---- { ---- at = t = MIN(t, RECT_TOP(monitor_area[i])); ---- ab = b = MAX(b, RECT_BOTTOM(monitor_area[i])); ---- } ---- if (RANGES_INTERSECT(search->y, search->height, ---- monitor_area[i].y, monitor_area[i].height)) ---- { ---- al = l = MIN(l, RECT_LEFT(monitor_area[i])); ---- ar = r = MAX(r, RECT_RIGHT(monitor_area[i])); ---- } ---- } ---- } else { ---- al = l = RECT_LEFT(monitor_area[screen_num_monitors]); ---- at = t = RECT_TOP(monitor_area[screen_num_monitors]); ---- ar = r = RECT_RIGHT(monitor_area[screen_num_monitors]); ---- ab = b = RECT_BOTTOM(monitor_area[screen_num_monitors]); ---- } ---- ---- for (d = 0; d < screen_num_desktops; ++d) { ---- if (d != desktop && desktop != DESKTOP_ALL) continue; ---- ---- for (i = 0; i < screen_num_monitors; ++i) { ---- if (head != SCREEN_AREA_ALL_MONITORS && head != i) continue; ---- ---- for (it = struts_left; it; it = g_slist_next(it)) { ---- ObScreenStrut *s = it->data; ---- if ((s->desktop == d || s->desktop == DESKTOP_ALL) && ---- STRUT_LEFT_IN_SEARCH(s->strut, search) && ---- !STRUT_LEFT_IGNORE(s->strut, us, search)) ---- l = MAX(l, al + s->strut->left); ---- } ---- for (it = struts_top; it; it = g_slist_next(it)) { ---- ObScreenStrut *s = it->data; ---- if ((s->desktop == d || s->desktop == DESKTOP_ALL) && ---- STRUT_TOP_IN_SEARCH(s->strut, search) && ---- !STRUT_TOP_IGNORE(s->strut, us, search)) ---- t = MAX(t, at + s->strut->top); ---- } ---- for (it = struts_right; it; it = g_slist_next(it)) { ---- ObScreenStrut *s = it->data; ---- if ((s->desktop == d || s->desktop == DESKTOP_ALL) && ---- STRUT_RIGHT_IN_SEARCH(s->strut, search) && ---- !STRUT_RIGHT_IGNORE(s->strut, us, search)) ---- r = MIN(r, ar - s->strut->right); ---- } ---- for (it = struts_bottom; it; it = g_slist_next(it)) { ---- ObScreenStrut *s = it->data; ---- if ((s->desktop == d || s->desktop == DESKTOP_ALL) && ---- STRUT_BOTTOM_IN_SEARCH(s->strut, search) && ---- !STRUT_BOTTOM_IGNORE(s->strut, us, search)) ---- b = MIN(b, ab - s->strut->bottom); ---- } ---- ---- /* limit to this monitor */ ---- if (head == i) { ---- l = MAX(l, RECT_LEFT(monitor_area[i])); ---- t = MAX(t, RECT_TOP(monitor_area[i])); ---- r = MIN(r, RECT_RIGHT(monitor_area[i])); ---- b = MIN(b, RECT_BOTTOM(monitor_area[i])); ---- } ---- } ---- } ---- ---- a = g_new(Rect, 1); ---- a->x = l; ---- a->y = t; ---- a->width = r - l + 1; ---- a->height = b - t + 1; ---- return a; ----} ---- ----guint screen_find_monitor(Rect *search) ----{ ---- guint i; ---- guint most = screen_num_monitors; ---- guint mostv = 0; ---- ---- for (i = 0; i < screen_num_monitors; ++i) { ---- Rect *area = screen_physical_area_monitor(i); ---- if (RECT_INTERSECTS_RECT(*area, *search)) { ---- Rect r; ---- guint v; ---- ---- RECT_SET_INTERSECTION(r, *area, *search); ---- v = r.width * r.height; ---- ---- if (v > mostv) { ---- mostv = v; ---- most = i; ---- } ---- } ---- g_free(area); ---- } ---- return most; ----} ---- ----Rect* screen_physical_area_all_monitors(void) ----{ ---- return screen_physical_area_monitor(screen_num_monitors); ----} ---- ----Rect* screen_physical_area_monitor(guint head) ----{ ---- Rect *a; ---- g_assert(head <= screen_num_monitors); ---- ---- a = g_new(Rect, 1); ---- *a = monitor_area[head]; ---- return a; ----} ---- ----gboolean screen_physical_area_monitor_contains(guint head, Rect *search) ----{ ---- g_assert(head <= screen_num_monitors); ---- g_assert(search); ---- return RECT_INTERSECTS_RECT(monitor_area[head], *search); ----} ---- ----Rect* screen_physical_area_active(void) ----{ ---- Rect *a; ---- gint x, y; ---- ---- if (moveresize_client) ---- a = screen_physical_area_monitor(client_monitor(focus_client)); ---- else if (focus_client) ---- a = screen_physical_area_monitor(client_monitor(focus_client)); ---- else { ---- Rect mon; ---- if (screen_pointer_pos(&x, &y)) ---- RECT_SET(mon, x, y, 1, 1); ---- else ---- RECT_SET(mon, 0, 0, 1, 1); ---- a = screen_physical_area_monitor(screen_find_monitor(&mon)); ---- } ---- return a; ----} ---- ----void screen_set_root_cursor(void) ----{ ---- if (sn_app_starting()) ---- XDefineCursor(obt_display, obt_root(ob_screen), --- ob_cursor(OB_CURSOR_BUSYPOINTER)); - ob_cursor(OB_CURSOR_BUSY)); ---- else ---- XDefineCursor(obt_display, obt_root(ob_screen), ---- ob_cursor(OB_CURSOR_POINTER)); ----} ---- ----gboolean screen_pointer_pos(gint *x, gint *y) ----{ ---- Window w; ---- gint i; ---- guint u; ---- gboolean ret; ---- ---- ret = !!XQueryPointer(obt_display, obt_root(ob_screen), ---- &w, &w, x, y, &i, &i, &u); ---- if (!ret) { ---- for (i = 0; i < ScreenCount(obt_display); ++i) ---- if (i != ob_screen) ---- if (XQueryPointer(obt_display, obt_root(i), ---- &w, &w, x, y, &i, &i, &u)) ---- break; ---- } ---- return ret; ----} diff --cc openbox/screen.h index 11915f11,11915f11,11915f11,11915f11..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/screen.h +++ /dev/null @@@@@ -1,136 -1,136 -1,136 -1,136 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- screen.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __screen_h ----#define __screen_h ---- ----#include "misc.h" ----#include "geom.h" ---- ----struct _ObClient; ---- ----#define DESKTOP_ALL (0xffffffff) ---- ----/*! The number of available desktops */ ----extern guint screen_num_desktops; ----/*! The number of virtual "xinerama" screens/heads */ ----extern guint screen_num_monitors; ----/*! The current desktop */ ----extern guint screen_desktop; ----/*! The desktop which was last visible */ ----extern guint screen_last_desktop; ----/*! Are we in showing-desktop mode? */ ----extern gboolean screen_showing_desktop; ----/*! The support window also used for focus and stacking */ ----extern Window screen_support_win; ----/*! The last time at which the user changed desktops */ ----extern Time screen_desktop_user_time; ---- ----typedef struct ObDesktopLayout { ---- ObOrientation orientation; ---- ObCorner start_corner; ---- guint rows; ---- guint columns; ----} ObDesktopLayout; ----extern ObDesktopLayout screen_desktop_layout; ---- ----/*! An array of gchar*'s which are desktop names in UTF-8 format */ ----extern gchar **screen_desktop_names; ---- ----/*! Take over the screen, set the basic hints on it claming it as ours */ ----gboolean screen_annex(void); ---- ----/*! Once the screen is ours, set up its initial state */ ----void screen_startup(gboolean reconfig); ----/*! Free resources */ ----void screen_shutdown(gboolean reconfig); ---- ----/*! Figure out the new size of the screen and adjust stuff for it */ ----void screen_resize(void); ---- ----/*! Change the number of available desktops */ ----void screen_set_num_desktops(guint num); ----/*! Change the current desktop */ ----void screen_set_desktop(guint num, gboolean dofocus); ----/*! Add a new desktop either at the end or inserted at the current desktop */ ----void screen_add_desktop(gboolean current); ----/*! Remove a desktop, either at the end or the current desktop */ ----void screen_remove_desktop(gboolean current); ---- ----guint screen_find_desktop(guint from, ObDirection dir, ---- gboolean wrap, gboolean linear); ---- ----/*! Show the desktop popup/notification */ ----void screen_show_desktop_popup(guint d); ----/*! Hide it */ ----void screen_hide_desktop_popup(void); ---- ----/*! Shows and focuses the desktop and hides all the client windows, or ---- returns to the normal state, showing client windows. ---- @param If show_only is non-NULL, then only that client is shown (assuming ---- show is FALSE (restoring from show-desktop mode), and the rest are ---- iconified. ----*/ ----void screen_show_desktop(gboolean show, struct _ObClient *show_only); ---- ----/*! Updates the desktop layout from the root property if available */ ----void screen_update_layout(void); ---- ----/*! Get desktop names from the root window property */ ----void screen_update_desktop_names(void); ---- ----/*! Installs or uninstalls a colormap for a client. If client is NULL, then ---- it handles the root colormap. */ ----void screen_install_colormap(struct _ObClient *client, gboolean install); ---- ----void screen_update_areas(void); ---- ----Rect *screen_physical_area_all_monitors(void); ---- ----Rect *screen_physical_area_monitor(guint head); ---- ----Rect *screen_physical_area_active(void); ---- ----/* doesn't include struts which the search area is already outside of when ---- 'search' is not NULL */ ----#define SCREEN_AREA_ALL_MONITORS ((unsigned)-1) ----#define SCREEN_AREA_ONE_MONITOR ((unsigned)-2) ---- ----/*! @param head is the number of the head or one of SCREEN_AREA_ALL_MONITORS, ---- SCREEN_AREA_ONE_MONITOR ---- @param search NULL or the whole monitor(s) ---- */ ----Rect* screen_area(guint desktop, guint head, Rect *search); ---- ----gboolean screen_physical_area_monitor_contains(guint head, Rect *search); ---- ----/*! Determines which physical monitor a rectangle is on by calculating the ---- area of the part of the rectable on each monitor. The number of the ---- monitor containing the greatest area of the rectangle is returned. ----*/ ----guint screen_find_monitor(Rect *search); ---- ----/*! Sets the root cursor. This function decides which cursor to use, but you ---- gotta call it to let it know it should change. */ ----void screen_set_root_cursor(void); ---- ----/*! Gives back the pointer's position in x and y. Returns TRUE if the pointer ---- is on this screen and FALSE if it is on another screen. */ ----gboolean screen_pointer_pos(gint *x, gint *y); ---- ----#endif diff --cc openbox/session.c index 99d66221,99d66221,99d66221,99d66221..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/session.c +++ /dev/null @@@@@ -1,816 -1,816 -1,816 -1,816 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- session.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----/* This session code is largely inspired by metacity code. */ ---- ----#include "session.h" ---- ----struct _ObClient; ---- ----GList *session_saved_state = NULL; ----gint session_desktop = -1; ----gint session_num_desktops = 0; ----gboolean session_desktop_layout_present = FALSE; ----ObDesktopLayout session_desktop_layout; ----GSList *session_desktop_names = NULL; ---- ----#ifndef USE_SM ----void session_startup(gint argc, gchar **argv) {} ----void session_shutdown(gboolean permanent) {} ----GList* session_state_find(struct _ObClient *c) { return NULL; } ----#else ---- ----#include "debug.h" ----#include "openbox.h" ----#include "client.h" ----#include "focus.h" ----#include "gettext.h" ----#include "obt/parse.h" ----#include "obt/paths.h" ---- ----#include ----#include ----#include ---- ----#ifdef HAVE_UNISTD_H ----# include ----# include ----#endif ---- ----#include ---- ----#define SM_ERR_LEN 1024 ---- ----static SmcConn sm_conn; ----static gint sm_argc; ----static gchar **sm_argv; ---- ----/* Data saved from the first level save yourself */ ----typedef struct { ---- ObClient *focus_client; ---- gint desktop; ----} ObSMSaveData; ---- ----static gboolean session_connect(); ---- ----static void session_load_file(const gchar *path); ----static gboolean session_save_to_file(const ObSMSaveData *savedata); ---- ----static void session_setup_program(); ----static void session_setup_user(); ----static void session_setup_restart_style(gboolean restart); ----static void session_setup_pid(); ----static void session_setup_priority(); ----static void session_setup_clone_command(); ----static void session_setup_restart_command(); ---- ----static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, ---- Bool shutdown, gint interact_style, Bool fast); ----static void sm_die(SmcConn conn, SmPointer data); ----static void sm_save_complete(SmcConn conn, SmPointer data); ----static void sm_shutdown_cancelled(SmcConn conn, SmPointer data); ---- ----static gboolean session_state_cmp(ObSessionState *s, ObClient *c); ----static void session_state_free(ObSessionState *state); ---- ----void session_startup(gint argc, gchar **argv) ----{ ---- gchar *dir; ---- ObtPaths *p; ---- ---- if (!ob_sm_use) return; ---- ---- sm_argc = argc; ---- sm_argv = argv; ---- ---- p = obt_paths_new(); ---- dir = g_build_filename(obt_paths_cache_home(p), ---- "openbox", "sessions", NULL); ---- obt_paths_unref(p), p = NULL; ---- ---- if (!obt_paths_mkdir_path(dir, 0700)) { ---- g_message(_("Unable to make directory \"%s\": %s"), ---- dir, g_strerror(errno)); ---- } ---- ---- if (ob_sm_save_file != NULL) { ---- if (ob_sm_restore) { ---- ob_debug_type(OB_DEBUG_SM, "Loading from session file %s", ---- ob_sm_save_file); ---- session_load_file(ob_sm_save_file); ---- } ---- } else { ---- gchar *filename; ---- ---- /* this algo is from metacity */ ---- filename = g_strdup_printf("%u-%u-%u.obs", ---- (guint)time(NULL), ---- (guint)getpid(), ---- g_random_int()); ---- ob_sm_save_file = g_build_filename(dir, filename, NULL); ---- g_free(filename); ---- } ---- ---- if (session_connect()) { ---- session_setup_program(); ---- session_setup_user(); ---- session_setup_restart_style(TRUE); ---- session_setup_pid(); ---- session_setup_priority(); ---- session_setup_clone_command(); ---- } ---- ---- g_free(dir); ----} ---- ----void session_shutdown(gboolean permanent) ----{ ---- if (!ob_sm_use) return; ---- ---- if (sm_conn) { ---- /* if permanent is true then we will change our session state so that ---- the SM won't run us again */ ---- if (permanent) ---- session_setup_restart_style(FALSE); ---- ---- SmcCloseConnection(sm_conn, 0, NULL); ---- ---- while (session_saved_state) { ---- session_state_free(session_saved_state->data); ---- session_saved_state = g_list_delete_link(session_saved_state, ---- session_saved_state); ---- } ---- } ----} ---- ----/*! Connect to the session manager and set up our callback functions */ ----static gboolean session_connect(void) ----{ ---- SmcCallbacks cb; ---- gchar *oldid; ---- gchar sm_err[SM_ERR_LEN]; ---- ---- /* set up our callback functions */ ---- cb.save_yourself.callback = sm_save_yourself; ---- cb.save_yourself.client_data = NULL; ---- cb.die.callback = sm_die; ---- cb.die.client_data = NULL; ---- cb.save_complete.callback = sm_save_complete; ---- cb.save_complete.client_data = NULL; ---- cb.shutdown_cancelled.callback = sm_shutdown_cancelled; ---- cb.shutdown_cancelled.client_data = NULL; ---- ---- /* connect to the server */ ---- oldid = ob_sm_id; ---- ob_debug_type(OB_DEBUG_SM, "Connecting to SM with id: %s", ---- oldid ? oldid : "(null)"); ---- sm_conn = SmcOpenConnection(NULL, NULL, 1, 0, ---- SmcSaveYourselfProcMask | ---- SmcDieProcMask | ---- SmcSaveCompleteProcMask | ---- SmcShutdownCancelledProcMask, ---- &cb, oldid, &ob_sm_id, ---- SM_ERR_LEN-1, sm_err); ---- g_free(oldid); ---- ob_debug_type(OB_DEBUG_SM, "Connected to SM with id: %s", ob_sm_id); ---- if (sm_conn == NULL) ---- ob_debug("Failed to connect to session manager: %s", sm_err); ---- return sm_conn != NULL; ----} ---- ----static void session_setup_program(void) ----{ ---- SmPropValue vals = { ---- .value = sm_argv[0], ---- .length = strlen(sm_argv[0]) + 1 ---- }; ---- SmProp prop = { ---- .name = g_strdup(SmProgram), ---- .type = g_strdup(SmARRAY8), ---- .num_vals = 1, ---- .vals = &vals ---- }; ---- SmProp *list = ∝ ---- ob_debug_type(OB_DEBUG_SM, "Setting program: %s", sm_argv[0]); ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ----} ---- ----static void session_setup_user(void) ----{ ---- char *user = g_strdup(g_get_user_name()); ---- ---- SmPropValue vals = { ---- .value = user, ---- .length = strlen(user) + 1 ---- }; ---- SmProp prop = { ---- .name = g_strdup(SmUserID), ---- .type = g_strdup(SmARRAY8), ---- .num_vals = 1, ---- .vals = &vals ---- }; ---- SmProp *list = ∝ ---- ob_debug_type(OB_DEBUG_SM, "Setting user: %s", user); ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ---- g_free(user); ----} ---- ----static void session_setup_restart_style(gboolean restart) ----{ ---- gchar restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning; ---- ---- SmPropValue vals = { ---- .value = &restart_hint, ---- .length = 1 ---- }; ---- SmProp prop = { ---- .name = g_strdup(SmRestartStyleHint), ---- .type = g_strdup(SmCARD8), ---- .num_vals = 1, ---- .vals = &vals ---- }; ---- SmProp *list = ∝ ---- ob_debug_type(OB_DEBUG_SM, "Setting restart: %d", restart); ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ----} ---- ----static void session_setup_pid(void) ----{ ---- gchar *pid = g_strdup_printf("%ld", (glong) getpid()); ---- ---- SmPropValue vals = { ---- .value = pid, ---- .length = strlen(pid) + 1 ---- }; ---- SmProp prop = { ---- .name = g_strdup(SmProcessID), ---- .type = g_strdup(SmARRAY8), ---- .num_vals = 1, ---- .vals = &vals ---- }; ---- SmProp *list = ∝ ---- ob_debug_type(OB_DEBUG_SM, "Setting pid: %s", pid); ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ---- g_free(pid); ----} ---- ----/*! This is a gnome-session-manager extension */ ----static void session_setup_priority(void) ----{ ---- gchar priority = 20; /* 20 is a lower prioity to run before other apps */ ---- ---- SmPropValue vals = { ---- .value = &priority, ---- .length = 1 ---- }; ---- SmProp prop = { ---- .name = g_strdup("_GSM_Priority"), ---- .type = g_strdup(SmCARD8), ---- .num_vals = 1, ---- .vals = &vals ---- }; ---- SmProp *list = ∝ ---- ob_debug_type(OB_DEBUG_SM, "Setting priority: %d", priority); ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ----} ---- ----static void session_setup_clone_command(void) ----{ ---- gint i; ---- ---- SmPropValue *vals = g_new(SmPropValue, sm_argc); ---- SmProp prop = { ---- .name = g_strdup(SmCloneCommand), ---- .type = g_strdup(SmLISTofARRAY8), ---- .num_vals = sm_argc, ---- .vals = vals ---- }; ---- SmProp *list = ∝ ---- ---- ob_debug_type(OB_DEBUG_SM, "Setting clone command: (%d)", sm_argc); ---- for (i = 0; i < sm_argc; ++i) { ---- vals[i].value = sm_argv[i]; ---- vals[i].length = strlen(sm_argv[i]) + 1; ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i].value); ---- } ---- ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ---- g_free(vals); ----} ---- ----static void session_setup_restart_command(void) ----{ ---- gint i; ---- ---- SmPropValue *vals = g_new(SmPropValue, sm_argc + 4); ---- SmProp prop = { ---- .name = g_strdup(SmRestartCommand), ---- .type = g_strdup(SmLISTofARRAY8), ---- .num_vals = sm_argc + 4, ---- .vals = vals ---- }; ---- SmProp *list = ∝ ---- ---- ob_debug_type(OB_DEBUG_SM, "Setting restart command: (%d)", sm_argc+4); ---- for (i = 0; i < sm_argc; ++i) { ---- vals[i].value = sm_argv[i]; ---- vals[i].length = strlen(sm_argv[i]) + 1; ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i].value); ---- } ---- ---- vals[i].value = g_strdup("--sm-client-id"); ---- vals[i].length = strlen("--sm-client-id") + 1; ---- vals[i+1].value = ob_sm_id; ---- vals[i+1].length = strlen(ob_sm_id) + 1; ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i].value); ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i+1].value); ---- ---- vals[i+2].value = g_strdup("--sm-save-file"); ---- vals[i+2].length = strlen("--sm-save-file") + 1; ---- vals[i+3].value = ob_sm_save_file; ---- vals[i+3].length = strlen(ob_sm_save_file) + 1; ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i+2].value); ---- ob_debug_type(OB_DEBUG_SM, " %s", vals[i+3].value); ---- ---- SmcSetProperties(sm_conn, 1, &list); ---- g_free(prop.name); ---- g_free(prop.type); ---- g_free(vals[i].value); ---- g_free(vals[i+2].value); ---- g_free(vals); ----} ---- ----static ObSMSaveData *sm_save_get_data(void) ----{ ---- ObSMSaveData *savedata = g_new0(ObSMSaveData, 1); ---- /* save the active desktop and client. ---- we don't bother to preemptively save the other desktop state like ---- number and names of desktops, cuz those shouldn't be changing during ---- the save.. */ ---- savedata->focus_client = focus_client; ---- savedata->desktop = screen_desktop; ---- return savedata; ----} ---- ----static void sm_save_yourself_2(SmcConn conn, SmPointer data) ----{ ---- gboolean success; ---- ObSMSaveData *savedata = data; ---- ---- /* save the current state */ ---- ob_debug_type(OB_DEBUG_SM, "Session save phase 2 requested"); ---- ob_debug_type(OB_DEBUG_SM, ---- " Saving session to file '%s'", ob_sm_save_file); ---- if (savedata == NULL) ---- savedata = sm_save_get_data(); ---- success = session_save_to_file(savedata); ---- g_free(savedata); ---- ---- /* tell the session manager how to restore this state */ ---- if (success) session_setup_restart_command(); ---- ---- ob_debug_type(OB_DEBUG_SM, "Saving is done (success = %d)", success); ---- SmcSaveYourselfDone(conn, success); ----} ---- ---- ----static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, ---- Bool shutdown, gint interact_style, Bool fast) ----{ ---- ObSMSaveData *savedata = NULL; ---- gchar *vendor; ---- ---- ob_debug_type(OB_DEBUG_SM, "Session save requested"); ---- ---- vendor = SmcVendor(sm_conn); ---- ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s", vendor); ---- ---- if (!strcmp(vendor, "KDE")) { ---- /* ksmserver guarantees that phase 1 will complete before allowing any ---- clients interaction, so we can save this sanely here before they ---- get messed up from interaction */ ---- savedata = sm_save_get_data(); ---- } ---- free(vendor); ---- ---- if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) { ---- ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed"); ---- g_free(savedata); ---- SmcSaveYourselfDone(conn, FALSE); ---- } ----} ---- ----static void sm_die(SmcConn conn, SmPointer data) ----{ ---- ob_debug_type(OB_DEBUG_SM, "Die requested"); ---- ob_exit(0); ----} ---- ----static void sm_save_complete(SmcConn conn, SmPointer data) ----{ ---- ob_debug_type(OB_DEBUG_SM, "Save complete"); ----} ---- ----static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) ----{ ---- ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled"); ----} ---- ----static gboolean session_save_to_file(const ObSMSaveData *savedata) ----{ ---- FILE *f; ---- GList *it; ---- gboolean success = TRUE; ---- ---- f = fopen(ob_sm_save_file, "w"); ---- if (!f) { ---- success = FALSE; ---- g_message(_("Unable to save the session to \"%s\": %s"), ---- ob_sm_save_file, g_strerror(errno)); ---- } else { ---- fprintf(f, "\n\n"); ---- fprintf(f, "\n\n"); ---- ---- fprintf(f, "%d\n", savedata->desktop); ---- ---- fprintf(f, "%d\n", screen_num_desktops); ---- ---- fprintf(f, "\n"); ---- fprintf(f, " %d\n", ---- screen_desktop_layout.orientation); ---- fprintf(f, " %d\n", ---- screen_desktop_layout.start_corner); ---- fprintf(f, " %d\n", ---- screen_desktop_layout.columns); ---- fprintf(f, " %d\n", ---- screen_desktop_layout.rows); ---- fprintf(f, "\n"); ---- ---- if (screen_desktop_names) { ---- gint i; ---- ---- fprintf(f, "\n"); ---- for (i = 0; screen_desktop_names[i]; ++i) ---- fprintf(f, " %s\n", screen_desktop_names[i]); ---- fprintf(f, "\n"); ---- } ---- ---- /* they are ordered top to bottom in stacking order */ ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- gint prex, prey, prew, preh; ---- ObClient *c; ---- gchar *t; ---- ---- if (WINDOW_IS_CLIENT(it->data)) ---- c = WINDOW_AS_CLIENT(it->data); ---- else ---- continue; ---- ---- if (!client_normal(c)) ---- continue; ---- ---- if (!c->sm_client_id) { ---- ob_debug_type(OB_DEBUG_SM, "Client %s does not have a " ---- "session id set", ---- c->title); ---- if (!c->wm_command) { ---- ob_debug_type(OB_DEBUG_SM, "Client %s does not have an " ---- "oldskool wm_command set either. We won't " ---- "be saving its data", ---- c->title); ---- continue; ---- } ---- } ---- ---- ob_debug_type(OB_DEBUG_SM, "Saving state for client %s", ---- c->title); ---- ---- prex = c->area.x; ---- prey = c->area.y; ---- prew = c->area.width; ---- preh = c->area.height; ---- if (c->fullscreen) { ---- prex = c->pre_fullscreen_area.x; ---- prey = c->pre_fullscreen_area.x; ---- prew = c->pre_fullscreen_area.width; ---- preh = c->pre_fullscreen_area.height; ---- } ---- if (c->max_horz) { ---- prex = c->pre_max_area.x; ---- prew = c->pre_max_area.width; ---- } ---- if (c->max_vert) { ---- prey = c->pre_max_area.y; ---- preh = c->pre_max_area.height; ---- } ---- ---- if (c->sm_client_id) ---- fprintf(f, "\n", c->sm_client_id); ---- else ---- fprintf(f, "\n", c->wm_command); ---- ---- t = g_markup_escape_text(c->name, -1); ---- fprintf(f, "\t%s\n", t); ---- g_free(t); ---- ---- t = g_markup_escape_text(c->class, -1); ---- fprintf(f, "\t%s\n", t); ---- g_free(t); ---- ---- t = g_markup_escape_text(c->role, -1); ---- fprintf(f, "\t%s\n", t); ---- g_free(t); ---- ---- fprintf(f, "\t%d\n", c->type); ---- ---- fprintf(f, "\t%d\n", c->desktop); ---- fprintf(f, "\t%d\n", prex); ---- fprintf(f, "\t%d\n", prey); ---- fprintf(f, "\t%d\n", prew); ---- fprintf(f, "\t%d\n", preh); ---- if (c->shaded) ---- fprintf(f, "\t\n"); ---- if (c->iconic) ---- fprintf(f, "\t\n"); ---- if (c->skip_pager) ---- fprintf(f, "\t\n"); ---- if (c->skip_taskbar) ---- fprintf(f, "\t\n"); ---- if (c->fullscreen) ---- fprintf(f, "\t\n"); ---- if (c->above) ---- fprintf(f, "\t\n"); ---- if (c->below) ---- fprintf(f, "\t\n"); ---- if (c->max_horz) ---- fprintf(f, "\t\n"); ---- if (c->max_vert) ---- fprintf(f, "\t\n"); ---- if (c->undecorated) ---- fprintf(f, "\t\n"); ---- if (savedata->focus_client == c) ---- fprintf(f, "\t\n"); ---- fprintf(f, "\n\n"); ---- } ---- ---- fprintf(f, "\n"); ---- ---- if (fflush(f)) { ---- success = FALSE; ---- g_message(_("Error while saving the session to \"%s\": %s"), ---- ob_sm_save_file, g_strerror(errno)); ---- } ---- fclose(f); ---- } ---- ---- return success; ----} ---- ----static void session_state_free(ObSessionState *state) ----{ ---- if (state) { ---- g_free(state->id); ---- g_free(state->command); ---- g_free(state->name); ---- g_free(state->class); ---- g_free(state->role); ---- ---- g_free(state); ---- } ----} ---- ----static gboolean session_state_cmp(ObSessionState *s, ObClient *c) ----{ ---- ob_debug_type(OB_DEBUG_SM, "Comparing client against saved state: "); ---- ob_debug_type(OB_DEBUG_SM, " client id: %s ", c->sm_client_id); ---- ob_debug_type(OB_DEBUG_SM, " client name: %s ", c->name); ---- ob_debug_type(OB_DEBUG_SM, " client class: %s ", c->class); ---- ob_debug_type(OB_DEBUG_SM, " client role: %s ", c->role); ---- ob_debug_type(OB_DEBUG_SM, " client type: %d ", c->type); ---- ob_debug_type(OB_DEBUG_SM, " client command: %s ", ---- c->wm_command ? c->wm_command : "(null)"); ---- ob_debug_type(OB_DEBUG_SM, " state id: %s ", s->id); ---- ob_debug_type(OB_DEBUG_SM, " state name: %s ", s->name); ---- ob_debug_type(OB_DEBUG_SM, " state class: %s ", s->class); ---- ob_debug_type(OB_DEBUG_SM, " state role: %s ", s->role); ---- ob_debug_type(OB_DEBUG_SM, " state type: %d ", s->type); ---- ob_debug_type(OB_DEBUG_SM, " state command: %s ", ---- s->command ? s->command : "(null)"); ---- ---- if ((c->sm_client_id && s->id && !strcmp(c->sm_client_id, s->id)) || ---- (c->wm_command && s->command && !strcmp(c->wm_command, s->command))) ---- { ---- return (!strcmp(s->name, c->name) && ---- !strcmp(s->class, c->class) && ---- !strcmp(s->role, c->role) && ---- /* the check for type is to catch broken clients, like ---- firefox, which open a different window on startup ---- with the same info as the one we saved. only do this ---- check for old windows that dont use xsmp, others should ---- know better ! */ ---- (!s->command || c->type == s->type)); ---- } ---- return FALSE; ----} ---- ----GList* session_state_find(ObClient *c) ----{ ---- GList *it; ---- ---- for (it = session_saved_state; it; it = g_list_next(it)) { ---- ObSessionState *s = it->data; ---- if (!s->matched && session_state_cmp(s, c)) { ---- s->matched = TRUE; ---- break; ---- } ---- } ---- return it; ----} ---- ----static void session_load_file(const gchar *path) ----{ ---- ObtParseInst *i; ---- xmlNodePtr node, n, m; ---- GList *it, *inext; ---- ---- i = obt_parse_instance_new(); ---- ---- if (!obt_parse_load_file(i, path, "openbox_session")) { ---- obt_parse_instance_unref(i); ---- return; ---- } ---- node = obt_parse_root(i); ---- ---- if ((n = obt_parse_find_node(node->children, "desktop"))) ---- session_desktop = obt_parse_node_int(n); ---- ---- if ((n = obt_parse_find_node(node->children, "numdesktops"))) ---- session_num_desktops = obt_parse_node_int(n); ---- ---- if ((n = obt_parse_find_node(node->children, "desktoplayout"))) { ---- /* make sure they are all there for it to be valid */ ---- if ((m = obt_parse_find_node(n->children, "orientation"))) ---- session_desktop_layout.orientation = obt_parse_node_int(m); ---- if (m && (m = obt_parse_find_node(n->children, "startcorner"))) ---- session_desktop_layout.start_corner = obt_parse_node_int(m); ---- if (m && (m = obt_parse_find_node(n->children, "columns"))) ---- session_desktop_layout.columns = obt_parse_node_int(m); ---- if (m && (m = obt_parse_find_node(n->children, "rows"))) ---- session_desktop_layout.rows = obt_parse_node_int(m); ---- session_desktop_layout_present = m != NULL; ---- } ---- ---- if ((n = obt_parse_find_node(node->children, "desktopnames"))) { ---- for (m = obt_parse_find_node(n->children, "name"); m; ---- m = obt_parse_find_node(m->next, "name")) ---- { ---- session_desktop_names = g_slist_append(session_desktop_names, ---- obt_parse_node_string(m)); ---- } ---- } ---- ---- for (node = obt_parse_find_node(node->children, "window"); node != NULL; ---- node = obt_parse_find_node(node->next, "window")) ---- { ---- ObSessionState *state; ---- ---- state = g_new0(ObSessionState, 1); ---- ---- if (!obt_parse_attr_string(node, "id", &state->id)) ---- if (!obt_parse_attr_string(node, "command", &state->command)) ---- goto session_load_bail; ---- if (!(n = obt_parse_find_node(node->children, "name"))) ---- goto session_load_bail; ---- state->name = obt_parse_node_string(n); ---- if (!(n = obt_parse_find_node(node->children, "class"))) ---- goto session_load_bail; ---- state->class = obt_parse_node_string(n); ---- if (!(n = obt_parse_find_node(node->children, "role"))) ---- goto session_load_bail; ---- state->role = obt_parse_node_string(n); ---- if (!(n = obt_parse_find_node(node->children, "windowtype"))) ---- goto session_load_bail; ---- state->type = obt_parse_node_int(n); ---- if (!(n = obt_parse_find_node(node->children, "desktop"))) ---- goto session_load_bail; ---- state->desktop = obt_parse_node_int(n); ---- if (!(n = obt_parse_find_node(node->children, "x"))) ---- goto session_load_bail; ---- state->x = obt_parse_node_int(n); ---- if (!(n = obt_parse_find_node(node->children, "y"))) ---- goto session_load_bail; ---- state->y = obt_parse_node_int(n); ---- if (!(n = obt_parse_find_node(node->children, "width"))) ---- goto session_load_bail; ---- state->w = obt_parse_node_int(n); ---- if (!(n = obt_parse_find_node(node->children, "height"))) ---- goto session_load_bail; ---- state->h = obt_parse_node_int(n); ---- ---- state->shaded = ---- obt_parse_find_node(node->children, "shaded") != NULL; ---- state->iconic = ---- obt_parse_find_node(node->children, "iconic") != NULL; ---- state->skip_pager = ---- obt_parse_find_node(node->children, "skip_pager") != NULL; ---- state->skip_taskbar = ---- obt_parse_find_node(node->children, "skip_taskbar") != NULL; ---- state->fullscreen = ---- obt_parse_find_node(node->children, "fullscreen") != NULL; ---- state->above = ---- obt_parse_find_node(node->children, "above") != NULL; ---- state->below = ---- obt_parse_find_node(node->children, "below") != NULL; ---- state->max_horz = ---- obt_parse_find_node(node->children, "max_horz") != NULL; ---- state->max_vert = ---- obt_parse_find_node(node->children, "max_vert") != NULL; ---- state->undecorated = ---- obt_parse_find_node(node->children, "undecorated") != NULL; ---- state->focused = ---- obt_parse_find_node(node->children, "focused") != NULL; ---- ---- /* save this. they are in the file in stacking order, so preserve ---- that order here */ ---- session_saved_state = g_list_append(session_saved_state, state); ---- continue; ---- ---- session_load_bail: ---- session_state_free(state); ---- } ---- ---- /* Remove any duplicates. This means that if two windows (or more) are ---- saved with the same session state, we won't restore a session for any ---- of them because we don't know what window to put what on. AHEM FIREFOX. ---- ---- This is going to be an O(2^n) kind of operation unfortunately. ---- */ ---- for (it = session_saved_state; it; it = inext) { ---- GList *jt, *jnext; ---- gboolean founddup = FALSE; ---- ObSessionState *s1 = it->data; ---- ---- inext = g_list_next(it); ---- ---- for (jt = g_list_next(it); jt; jt = jnext) { ---- ObSessionState *s2 = jt->data; ---- gboolean match; ---- ---- jnext = g_list_next(jt); ---- ---- if (s1->id && s2->id) ---- match = strcmp(s1->id, s2->id) == 0; ---- else if (s1->command && s2->command) ---- match = strcmp(s1->command, s2->command) == 0; ---- else ---- match = FALSE; ---- ---- if (match && ---- !strcmp(s1->name, s2->name) && ---- !strcmp(s1->class, s2->class) && ---- !strcmp(s1->role, s2->role)) ---- { ---- session_state_free(s2); ---- session_saved_state = ---- g_list_delete_link(session_saved_state, jt); ---- founddup = TRUE; ---- } ---- } ---- ---- if (founddup) { ---- session_state_free(s1); ---- session_saved_state = g_list_delete_link(session_saved_state, it); ---- } ---- } ---- ---- obt_parse_instance_unref(i); ----} ---- ----#endif diff --cc openbox/session.h index b4ce6d91,b4ce6d91,b4ce6d91,b4ce6d91..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/session.h +++ /dev/null @@@@@ -1,56 -1,56 -1,56 -1,56 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- session.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __ob__session_h ----#define __ob__session_h ---- ----#include "client.h" ----#include "screen.h" ---- ----#include ---- ----typedef struct _ObSessionState ObSessionState; ---- ----struct _ObSessionState { ---- gchar *id, *command, *name, *class, *role; ---- ObClientType type; ---- guint desktop; ---- gint x, y, w, h; ---- gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen; ---- gboolean above, below, max_horz, max_vert, undecorated; ---- gboolean focused; ---- ---- gboolean matched; ----}; ---- ----/*! The desktop being viewed when the session was saved. A valud of -1 means ---- it was not saved */ ----extern gint session_desktop; ----extern gint session_num_desktops; ----extern gboolean session_desktop_layout_present; ----extern ObDesktopLayout session_desktop_layout; ----extern GSList *session_desktop_names; ---- ----extern GList *session_saved_state; ---- ----void session_startup(gint argc, gchar **argv); ----void session_shutdown(gboolean permanent); ---- ----GList* session_state_find(struct _ObClient *c); ---- ----#endif diff --cc openbox/stacking.c index 3c05df49,3c05df49,3c05df49,3c05df49..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/stacking.c +++ /dev/null @@@@@ -1,686 -1,686 -1,686 -1,686 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- stacking.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "openbox.h" ----#include "screen.h" ----#include "focus.h" ----#include "client.h" ----#include "group.h" ----#include "frame.h" ----#include "window.h" ----#include "event.h" ----#include "debug.h" ----#include "obt/prop.h" ---- ----GList *stacking_list = NULL; ----/*! When true, stacking changes will not be reflected on the screen. This is ---- to freeze the on-screen stacking order while a window is being temporarily ---- raised during focus cycling */ ----static gboolean pause_changes = FALSE; ---- ----void stacking_set_list(void) ----{ ---- Window *windows = NULL; ---- GList *it; ---- guint i = 0; ---- ---- /* on shutdown, don't update the properties, so that we can read it back ---- in on startup and re-stack the windows as they were before we shut down ---- */ ---- if (ob_state() == OB_STATE_EXITING) return; ---- ---- /* create an array of the window ids (from bottom to top, ---- reverse order!) */ ---- if (stacking_list) { ---- windows = g_new(Window, g_list_length(stacking_list)); ---- for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) ---- windows[i++] = WINDOW_AS_CLIENT(it->data)->window; ---- } ---- } ---- ---- OBT_PROP_SETA32(obt_root(ob_screen), NET_CLIENT_LIST_STACKING, WINDOW, ---- (gulong*)windows, i); ---- ---- g_free(windows); ----} ---- ----static void do_restack(GList *wins, GList *before) ----{ ---- GList *it; ---- Window *win; ---- gint i; ---- ----#ifdef DEBUG ---- GList *next; ---- /* pls only restack stuff in the same layer at a time */ ---- for (it = wins; it; it = next) { ---- next = g_list_next(it); ---- if (!next) break; ---- g_assert (window_layer(it->data) == window_layer(next->data)); ---- } ---- if (before) ---- g_assert(window_layer(it->data) >= window_layer(before->data)); ----#endif ---- ---- win = g_new(Window, g_list_length(wins) + 1); ---- ---- if (before == stacking_list) ---- win[0] = screen_support_win; ---- else if (!before) ---- win[0] = window_top(g_list_last(stacking_list)->data); ---- else ---- win[0] = window_top(g_list_previous(before)->data); ---- ---- for (i = 1, it = wins; it; ++i, it = g_list_next(it)) { ---- win[i] = window_top(it->data); ---- g_assert(win[i] != None); /* better not call stacking shit before ---- setting your top level window value */ ---- stacking_list = g_list_insert_before(stacking_list, before, it->data); ---- } ---- ----#ifdef DEBUG ---- /* some debug checking of the stacking list's order */ ---- for (it = stacking_list; ; it = next) { ---- next = g_list_next(it); ---- if (!next) break; ---- g_assert(window_layer(it->data) >= window_layer(next->data)); ---- } ----#endif ---- ---- if (!pause_changes) ---- XRestackWindows(obt_display, win, i); ---- g_free(win); ---- ---- stacking_set_list(); ----} ---- ----void stacking_temp_raise(ObWindow *window) ----{ ---- Window win[2]; ---- GList *it; ---- gulong start; ---- ---- /* don't use this for internal windows..! it would lower them.. */ ---- g_assert(window_layer(window) < OB_STACKING_LAYER_INTERNAL); ---- ---- /* find the window to drop it underneath */ ---- win[0] = screen_support_win; ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- ObWindow *w = it->data; ---- if (window_layer(w) >= OB_STACKING_LAYER_INTERNAL) ---- win[0] = window_top(w); ---- else ---- break; ---- } ---- ---- win[1] = window_top(window); ---- start = event_start_ignore_all_enters(); ---- XRestackWindows(obt_display, win, 2); ---- event_end_ignore_all_enters(start); ---- ---- pause_changes = TRUE; ----} ---- ----void stacking_restore(void) ----{ ---- Window *win; ---- GList *it; ---- gint i; ---- gulong start; ---- ---- win = g_new(Window, g_list_length(stacking_list) + 1); ---- win[0] = screen_support_win; ---- for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it)) ---- win[i] = window_top(it->data); ---- start = event_start_ignore_all_enters(); ---- XRestackWindows(obt_display, win, i); ---- event_end_ignore_all_enters(start); ---- g_free(win); ---- ---- pause_changes = FALSE; ----} ---- ----static void do_raise(GList *wins) ----{ ---- GList *it; ---- GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; ---- gint i; ---- ---- for (it = wins; it; it = g_list_next(it)) { ---- ObStackingLayer l; ---- ---- l = window_layer(it->data); ---- layer[l] = g_list_append(layer[l], it->data); ---- } ---- ---- it = stacking_list; ---- for (i = OB_NUM_STACKING_LAYERS - 1; i >= 0; --i) { ---- if (layer[i]) { ---- for (; it; it = g_list_next(it)) { ---- /* look for the top of the layer */ ---- if (window_layer(it->data) <= (ObStackingLayer) i) ---- break; ---- } ---- do_restack(layer[i], it); ---- g_list_free(layer[i]); ---- } ---- } ----} ---- ----static void do_lower(GList *wins) ----{ ---- GList *it; ---- GList *layer[OB_NUM_STACKING_LAYERS] = {NULL}; ---- gint i; ---- ---- for (it = wins; it; it = g_list_next(it)) { ---- ObStackingLayer l; ---- ---- l = window_layer(it->data); ---- layer[l] = g_list_append(layer[l], it->data); ---- } ---- ---- it = stacking_list; ---- for (i = OB_NUM_STACKING_LAYERS - 1; i >= 0; --i) { ---- if (layer[i]) { ---- for (; it; it = g_list_next(it)) { ---- /* look for the top of the next layer down */ ---- if (window_layer(it->data) < (ObStackingLayer) i) ---- break; ---- } ---- do_restack(layer[i], it); ---- g_list_free(layer[i]); ---- } ---- } ----} ---- ----static void restack_windows(ObClient *selected, gboolean raise) ----{ ---- GList *it, *last, *below, *above, *next; ---- GList *wins = NULL; ---- ---- GList *group_modals = NULL; ---- GList *group_trans = NULL; ---- GList *modals = NULL; ---- GList *trans = NULL; ---- ---- if (raise) { ---- ObClient *p; ---- ---- /* if a window is modal for another single window, then raise it to the ---- top too, the same is done with the focus order */ ---- while (selected->modal && (p = client_direct_parent(selected))) ---- selected = p; ---- } ---- ---- /* remove first so we can't run into ourself */ ---- it = g_list_find(stacking_list, selected); ---- g_assert(it); ---- stacking_list = g_list_delete_link(stacking_list, it); ---- ---- /* go from the bottom of the stacking list up. don't move any other windows ---- when lowering, we call this for each window independently */ ---- if (raise) { ---- for (it = g_list_last(stacking_list); it; it = next) { ---- next = g_list_previous(it); ---- ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *ch = it->data; ---- ---- /* only move windows in the same stacking layer */ ---- if (ch->layer == selected->layer && ---- client_search_transient(selected, ch)) ---- { ---- if (client_is_direct_child(selected, ch)) { ---- if (ch->modal) ---- modals = g_list_prepend(modals, ch); ---- else ---- trans = g_list_prepend(trans, ch); ---- } ---- else { ---- if (ch->modal) ---- group_modals = g_list_prepend(group_modals, ch); ---- else ---- group_trans = g_list_prepend(group_trans, ch); ---- } ---- stacking_list = g_list_delete_link(stacking_list, it); ---- } ---- } ---- } ---- } ---- ---- /* put transients of the selected window right above it */ ---- wins = g_list_concat(modals, trans); ---- wins = g_list_append(wins, selected); ---- ---- /* if selected window is transient for group then raise it above others */ ---- if (selected->transient_for_group) { ---- /* if it's modal, raise it above those also */ ---- if (selected->modal) { ---- wins = g_list_concat(wins, group_modals); ---- group_modals = NULL; ---- } ---- wins = g_list_concat(wins, group_trans); ---- group_trans = NULL; ---- } ---- ---- /* find where to put the selected window, start from bottom of list, ---- this is the window below everything we are re-adding to the list */ ---- last = NULL; ---- for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) ---- { ---- if (window_layer(it->data) < selected->layer) { ---- last = it; ---- continue; ---- } ---- /* if lowering, stop at the beginning of the layer */ ---- if (!raise) ---- break; ---- /* if raising, stop at the end of the layer */ ---- if (window_layer(it->data) > selected->layer) ---- break; ---- ---- last = it; ---- } ---- ---- /* save this position in the stacking list */ ---- below = last; ---- ---- /* find where to put the group transients, start from the top of list */ ---- for (it = stacking_list; it; it = g_list_next(it)) { ---- /* skip past higher layers */ ---- if (window_layer(it->data) > selected->layer) ---- continue; ---- /* if we reach the end of the layer (how?) then don't go further */ ---- if (window_layer(it->data) < selected->layer) ---- break; ---- /* stop when we reach the first window in the group */ ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- if (c->group == selected->group) ---- break; ---- } ---- /* if we don't hit any other group members, stop here because this ---- is where we are putting the selected window (and its children) */ ---- if (it == below) ---- break; ---- } ---- ---- /* save this position, this is the top of the group of windows between the ---- group transient ones we're restacking and the others up above that we're ---- restacking ---- ---- we actually want to save 1 position _above_ that, for for loops to work ---- nicely, so move back one position in the list while saving it ---- */ ---- above = it ? g_list_previous(it) : g_list_last(stacking_list); ---- ---- /* put the windows inside the gap to the other windows we're stacking ---- into the restacking list, go from the bottom up so that we can use ---- g_list_prepend */ ---- if (below) it = g_list_previous(below); ---- else it = g_list_last(stacking_list); ---- for (; it != above; it = next) { ---- next = g_list_previous(it); ---- wins = g_list_prepend(wins, it->data); ---- stacking_list = g_list_delete_link(stacking_list, it); ---- } ---- ---- /* group transients go above the rest of the stuff acquired to now */ ---- wins = g_list_concat(group_trans, wins); ---- /* group modals go on the very top */ ---- wins = g_list_concat(group_modals, wins); ---- ---- do_restack(wins, below); ---- g_list_free(wins); ---- ---- /* lower our parents after us, so they go below us */ ---- if (!raise && selected->parents) { ---- GSList *parents_copy, *sit; ---- GSList *reorder = NULL; ---- ---- parents_copy = g_slist_copy(selected->parents); ---- ---- /* go thru stacking list backwards so we can use g_slist_prepend */ ---- for (it = g_list_last(stacking_list); it && parents_copy; ---- it = g_list_previous(it)) ---- if ((sit = g_slist_find(parents_copy, it->data))) { ---- reorder = g_slist_prepend(reorder, sit->data); ---- parents_copy = g_slist_delete_link(parents_copy, sit); ---- } ---- g_assert(parents_copy == NULL); ---- ---- /* call restack for each of these to lower them */ ---- for (sit = reorder; sit; sit = g_slist_next(sit)) ---- restack_windows(sit->data, raise); ---- } ----} ---- ----void stacking_raise(ObWindow *window) ----{ ---- if (WINDOW_IS_CLIENT(window)) { ---- ObClient *selected; ---- selected = WINDOW_AS_CLIENT(window); ---- restack_windows(selected, TRUE); ---- } else { ---- GList *wins; ---- wins = g_list_append(NULL, window); ---- stacking_list = g_list_remove(stacking_list, window); ---- do_raise(wins); ---- g_list_free(wins); ---- } ----} ---- ----void stacking_lower(ObWindow *window) ----{ ---- if (WINDOW_IS_CLIENT(window)) { ---- ObClient *selected; ---- selected = WINDOW_AS_CLIENT(window); ---- restack_windows(selected, FALSE); ---- } else { ---- GList *wins; ---- wins = g_list_append(NULL, window); ---- stacking_list = g_list_remove(stacking_list, window); ---- do_lower(wins); ---- g_list_free(wins); ---- } ----} ---- ----void stacking_below(ObWindow *window, ObWindow *below) ----{ ---- GList *wins, *before; ---- ---- if (window_layer(window) != window_layer(below)) ---- return; ---- ---- wins = g_list_append(NULL, window); ---- stacking_list = g_list_remove(stacking_list, window); ---- before = g_list_next(g_list_find(stacking_list, below)); ---- do_restack(wins, before); ---- g_list_free(wins); ----} ---- ----void stacking_add(ObWindow *win) ----{ ---- g_assert(screen_support_win != None); /* make sure I dont break this in the ---- future */ ---- ---- stacking_list = g_list_append(stacking_list, win); ---- stacking_raise(win); ----} ---- ----static GList *find_highest_relative(ObClient *client) ----{ ---- GList *ret = NULL; ---- ---- if (client->parents) { ---- GList *it; ---- GSList *top; ---- ---- /* get all top level relatives of this client */ ---- top = client_search_all_top_parents_layer(client); ---- ---- /* go from the top of the stacking order down */ ---- for (it = stacking_list; !ret && it; it = g_list_next(it)) { ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- /* only look at windows in the same layer and that are ---- visible */ ---- if (c->layer == client->layer && ---- !c->iconic && ---- (c->desktop == client->desktop || ---- c->desktop == DESKTOP_ALL || ---- client->desktop == DESKTOP_ALL)) ---- { ---- GSList *sit; ---- ---- /* go through each top level parent and see it this window ---- is related to them */ ---- for (sit = top; !ret && sit; sit = g_slist_next(sit)) { ---- ObClient *topc = sit->data; ---- ---- /* are they related ? */ ---- if (topc == c || client_search_transient(topc, c)) ---- ret = it; ---- } ---- } ---- } ---- } ---- } ---- return ret; ----} ---- ----void stacking_add_nonintrusive(ObWindow *win) ----{ ---- ObClient *client; ---- GList *it_below = NULL; /* this client will be below us */ ---- GList *it_above; ---- GList *wins; ---- ---- if (!WINDOW_IS_CLIENT(win)) { ---- stacking_add(win); /* no special rules for others */ ---- return; ---- } ---- ---- client = WINDOW_AS_CLIENT(win); ---- ---- /* insert above its highest parent (or its highest child !) */ ---- it_below = find_highest_relative(client); ---- ---- if (!it_below) { ---- /* nothing to put it directly above, so try find the focused client ---- to put it underneath it */ ---- if (focus_client && client != focus_client && ---- focus_client->layer == client->layer) ---- { ---- it_below = g_list_find(stacking_list, focus_client); ---- /* this can give NULL, but it means the focused window is on the ---- bottom of the stacking order, so go to the bottom in that case, ---- below it */ ---- it_below = g_list_next(it_below); ---- } ---- else { ---- /* There is no window to put this directly above, so put it at the ---- top, so you know it is there. ---- ---- It used to do this only if the window was focused and lower ---- it otherwise. ---- ---- We also put it at the top not the bottom to fix a bug with ---- fullscreen windows. When focusLast is off and followsMouse is ---- on, when you switch desktops, the fullscreen window loses ---- focus and goes into its lower layer. If this puts it at the ---- bottom then when you come back to the desktop, the window is ---- at the bottom and won't get focus back. ---- */ ---- it_below = stacking_list; ---- } ---- } ---- ---- /* make sure it's not in the wrong layer though ! */ ---- for (; it_below; it_below = g_list_next(it_below)) { ---- /* stop when the window is not in a higher layer than the window ---- it is going above (it_below) */ ---- if (client->layer >= window_layer(it_below->data)) ---- break; ---- } ---- for (; it_below != stacking_list; it_below = it_above) { ---- /* stop when the window is not in a lower layer than the ---- window it is going under (it_above) */ ---- it_above = it_below ? ---- g_list_previous(it_below) : g_list_last(stacking_list); ---- if (client->layer <= window_layer(it_above->data)) ---- break; ---- } ---- ---- wins = g_list_append(NULL, win); ---- do_restack(wins, it_below); ---- g_list_free(wins); ----} ---- ----/*! Returns TRUE if client is occluded by the sibling. If sibling is NULL it ---- tries against all other clients. ----*/ ----static gboolean stacking_occluded(ObClient *client, ObClient *sibling) ----{ ---- GList *it; ---- gboolean occluded = FALSE; ---- gboolean found = FALSE; ---- ---- /* no need for any looping in this case */ ---- if (sibling && client->layer != sibling->layer) ---- return occluded; ---- ---- for (it = stacking_list; it; ---- it = (found ? g_list_previous(it) :g_list_next(it))) ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- if (found && !c->iconic && ---- (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || ---- c->desktop == client->desktop) && ---- !client_search_transient(client, c)) ---- { ---- if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) ---- { ---- if (sibling != NULL) { ---- if (c == sibling) { ---- occluded = TRUE; ---- break; ---- } ---- } ---- else if (c->layer == client->layer) { ---- occluded = TRUE; ---- break; ---- } ---- else if (c->layer > client->layer) ---- break; /* we past its layer */ ---- } ---- } ---- else if (c == client) ---- found = TRUE; ---- } ---- return occluded; ----} ---- ----/*! Returns TRUE if client occludes the sibling. If sibling is NULL it tries ---- against all other clients. ----*/ ----static gboolean stacking_occludes(ObClient *client, ObClient *sibling) ----{ ---- GList *it; ---- gboolean occludes = FALSE; ---- gboolean found = FALSE; ---- ---- /* no need for any looping in this case */ ---- if (sibling && client->layer != sibling->layer) ---- return occludes; ---- ---- for (it = stacking_list; it; it = g_list_next(it)) ---- if (WINDOW_IS_CLIENT(it->data)) { ---- ObClient *c = it->data; ---- if (found && !c->iconic && ---- (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || ---- c->desktop == client->desktop) && ---- !client_search_transient(c, client)) ---- { ---- if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area)) ---- { ---- if (sibling != NULL) { ---- if (c == sibling) { ---- occludes = TRUE; ---- break; ---- } ---- } ---- else if (c->layer == client->layer) { ---- occludes = TRUE; ---- break; ---- } ---- else if (c->layer < client->layer) ---- break; /* we past its layer */ ---- } ---- } ---- else if (c == client) ---- found = TRUE; ---- } ---- return occludes; ----} ---- ----gboolean stacking_restack_request(ObClient *client, ObClient *sibling, ---- gint detail) ----{ ---- gboolean ret = FALSE; ---- ---- if (sibling && ((client->desktop != sibling->desktop && ---- client->desktop != DESKTOP_ALL && ---- sibling->desktop != DESKTOP_ALL) || ---- sibling->iconic)) ---- { ---- ob_debug("Setting restack sibling to NULL, they are not on the same " ---- "desktop or it is iconified"); ---- sibling = NULL; ---- } ---- ---- switch (detail) { ---- case Below: ---- ob_debug("Restack request Below for client %s sibling %s", ---- client->title, sibling ? sibling->title : "(all)"); ---- /* just lower it */ ---- stacking_lower(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- break; ---- case BottomIf: ---- ob_debug("Restack request BottomIf for client %s sibling %s", ---- client->title, sibling ? sibling->title : "(all)"); ---- /* if this client occludes sibling (or anything if NULL), then ---- lower it to the bottom */ ---- if (stacking_occludes(client, sibling)) { ---- stacking_lower(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- } ---- break; ---- case Above: ---- ob_debug("Restack request Above for client %s sibling %s", ---- client->title, sibling ? sibling->title : "(all)"); ---- stacking_raise(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- break; ---- case TopIf: ---- ob_debug("Restack request TopIf for client %s sibling %s", ---- client->title, sibling ? sibling->title : "(all)"); ---- if (stacking_occluded(client, sibling)) { ---- stacking_raise(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- } ---- break; ---- case Opposite: ---- ob_debug("Restack request Opposite for client %s sibling %s", ---- client->title, sibling ? sibling->title : "(all)"); ---- if (stacking_occluded(client, sibling)) { ---- stacking_raise(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- } ---- else if (stacking_occludes(client, sibling)) { ---- stacking_lower(CLIENT_AS_WINDOW(client)); ---- ret = TRUE; ---- } ---- break; ---- } ---- return ret; ----} diff --cc openbox/stacking.h index 773f6588,773f6588,773f6588,773f6588..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/stacking.h +++ /dev/null @@@@@ -1,83 -1,83 -1,83 -1,83 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- stacking.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __stacking_h ----#define __stacking_h ---- ----#include ----#include ---- ----struct _ObWindow; ----struct _ObClient; ---- ----/*! The possible stacking layers a client window can be a part of */ ----typedef enum { ---- OB_STACKING_LAYER_INVALID, ---- OB_STACKING_LAYER_DESKTOP, /*!< 0 - desktop windows */ ---- OB_STACKING_LAYER_BELOW, /*!< 1 - normal windows w/ below */ ---- OB_STACKING_LAYER_NORMAL, /*!< 2 - normal windows */ ---- OB_STACKING_LAYER_ABOVE, /*!< 3 - normal windows w/ above */ ---- OB_STACKING_LAYER_FULLSCREEN, /*!< 4 - fullscreeen windows */ ---- OB_STACKING_LAYER_INTERNAL, /*!< 5 - openbox windows/menus */ ---- OB_NUM_STACKING_LAYERS ----} ObStackingLayer; ---- ----/* list of ObWindow*s in stacking order from highest to lowest */ ----extern GList *stacking_list; ---- ----/*! Sets the window stacking list on the root window from the ---- stacking_list */ ----void stacking_set_list(void); ---- ----void stacking_add(struct _ObWindow *win); ----void stacking_add_nonintrusive(struct _ObWindow *win); ----#define stacking_remove(win) stacking_list = g_list_remove(stacking_list, win); ---- ----/*! Raises a window above all others in its stacking layer */ ----void stacking_raise(struct _ObWindow *window); ---- ----/*! Temporarily raises a window above all others */ ----void stacking_temp_raise(struct _ObWindow *window); ---- ----/*! Restores any temporarily raised windows to their correct place */ ----void stacking_restore(void); ---- ----/*! Lowers a window below all others in its stacking layer */ ----void stacking_lower(struct _ObWindow *window); ---- ----/*! Moves a window below another if its in the same layer. ---- This function does not enforce stacking rules IRT transients n such, and so ---- it should really ONLY be used to restore stacking orders from saved sessions ----*/ ----void stacking_below(struct _ObWindow *window, struct _ObWindow *below); ---- ----/*! Restack a window based upon a sibling (or all windows) in various ways. ---- @param client The client to be restacked ---- @param sibling Another client to compare to, or NULL to compare to all ---- windows ---- @param detail One of Above, Below, TopIf, BottomIf, Opposite ---- @return TRUE if the client was restacked ---- See http://tronche.com/gui/x/xlib/window/configure.html for details on ---- how each detail works with and without a sibling. ----*/ ----gboolean stacking_restack_request(struct _ObClient *client, ---- struct _ObClient *sibling, ---- gint detail); ---- ----#endif diff --cc openbox/startupnotify.c index 3e8799f8,3e8799f8,3e8799f8,3e8799f8..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/startupnotify.c +++ /dev/null @@@@@ -1,278 -1,278 -1,278 -1,278 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- startupnotify.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "startupnotify.h" ----#include "gettext.h" ----#include "event.h" ---- ----#ifdef HAVE_STDLIB_H ----# include ----#endif ---- ----#ifndef USE_LIBSN ---- ----void sn_startup(gboolean reconfig) {} ----void sn_shutdown(gboolean reconfig) {} ----gboolean sn_app_starting() { return FALSE; } ----Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name) ----{ ---- return CurrentTime; ----} ----gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; } ----void sn_setup_spawn_environment(const gchar *program, const gchar *name, ---- const gchar *icon_name, const gchar *wmclass, ---- gint desktop) {} ----void sn_spawn_cancel() {} ---- ----#else ---- ----#include "openbox.h" ----#include "screen.h" ---- ----#define SN_API_NOT_YET_FROZEN ----#include ---- ----static SnDisplay *sn_display; ----static SnMonitorContext *sn_context; ----static SnLauncherContext *sn_launcher; ----static GSList *sn_waits; /* list of SnStartupSequences we're waiting on */ ---- ----static SnStartupSequence* sequence_find(const gchar *id); ---- ----static void sn_handler(const XEvent *e, gpointer data); ----static void sn_event_func(SnMonitorEvent *event, gpointer data); ---- ----void sn_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- sn_display = sn_display_new(obt_display, NULL, NULL); ---- sn_context = sn_monitor_context_new(sn_display, ob_screen, ---- sn_event_func, NULL, NULL); ---- sn_launcher = sn_launcher_context_new(sn_display, ob_screen); ---- ---- obt_main_loop_x_add(ob_main_loop, sn_handler, NULL, NULL); ----} ---- ----void sn_shutdown(gboolean reconfig) ----{ ---- GSList *it; ---- ---- if (reconfig) return; ---- ---- obt_main_loop_x_remove(ob_main_loop, sn_handler); ---- ---- for (it = sn_waits; it; it = g_slist_next(it)) ---- sn_startup_sequence_unref((SnStartupSequence*)it->data); ---- g_slist_free(sn_waits); ---- sn_waits = NULL; ---- ---- screen_set_root_cursor(); ---- ---- sn_launcher_context_unref(sn_launcher); ---- sn_monitor_context_unref(sn_context); ---- sn_display_unref(sn_display); ----} ---- ----static SnStartupSequence* sequence_find(const gchar *id) ----{ ---- SnStartupSequence*ret = NULL; ---- GSList *it; ---- ---- for (it = sn_waits; it; it = g_slist_next(it)) { ---- SnStartupSequence *seq = it->data; ---- if (!strcmp(id, sn_startup_sequence_get_id(seq))) { ---- ret = seq; ---- break; ---- } ---- } ---- return ret; ----} ---- ----gboolean sn_app_starting(void) ----{ ---- return sn_waits != NULL; ----} ---- ----static gboolean sn_wait_timeout(gpointer data) ----{ ---- SnStartupSequence *seq = data; ---- sn_waits = g_slist_remove(sn_waits, seq); ---- screen_set_root_cursor(); ---- return FALSE; /* don't repeat */ ----} ---- ----static void sn_handler(const XEvent *e, gpointer data) ----{ ---- XEvent ec; ---- ec = *e; ---- sn_display_process_event(sn_display, &ec); ----} ---- ----static void sn_event_func(SnMonitorEvent *ev, gpointer data) ----{ ---- SnStartupSequence *seq; ---- gboolean change = FALSE; ---- ---- if (!(seq = sn_monitor_event_get_startup_sequence(ev))) ---- return; ---- ---- switch (sn_monitor_event_get_type(ev)) { ---- case SN_MONITOR_EVENT_INITIATED: ---- sn_startup_sequence_ref(seq); ---- sn_waits = g_slist_prepend(sn_waits, seq); ---- /* 20 second timeout for apps to start if the launcher doesn't ---- have a timeout */ ---- obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC, ---- sn_wait_timeout, seq, ---- g_direct_equal, ---- (GDestroyNotify)sn_startup_sequence_unref); ---- change = TRUE; ---- break; ---- case SN_MONITOR_EVENT_CHANGED: ---- /* XXX feedback changed? */ ---- change = TRUE; ---- break; ---- case SN_MONITOR_EVENT_COMPLETED: ---- case SN_MONITOR_EVENT_CANCELED: ---- if ((seq = sequence_find(sn_startup_sequence_get_id(seq)))) { ---- sn_waits = g_slist_remove(sn_waits, seq); ---- obt_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout, ---- seq, FALSE); ---- change = TRUE; ---- } ---- break; ---- }; ---- ---- if (change) ---- screen_set_root_cursor(); ----} ---- ----Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name) ----{ ---- GSList *it; ---- Time t = CurrentTime; ---- ---- if (!id && !wmclass) ---- return t; ---- ---- for (it = sn_waits; it; it = g_slist_next(it)) { ---- SnStartupSequence *seq = it->data; ---- gboolean found = FALSE; ---- const gchar *seqid, *seqclass, *seqbin; ---- seqid = sn_startup_sequence_get_id(seq); ---- seqclass = sn_startup_sequence_get_wmclass(seq); ---- seqbin = sn_startup_sequence_get_binary_name(seq); ---- ---- if (id && seqid) { ---- /* if the app has a startup id, then look for that for highest ---- accuracy */ ---- if (!strcmp(seqid, id)) ---- found = TRUE; ---- } ---- else if (seqclass) { ---- /* seqclass = "a string to match against the "resource name" or ---- "resource class" hints. These are WM_CLASS[0] and WM_CLASS[1]" ---- - from the startup-notification spec ---- */ ---- found = (seqclass && !strcmp(seqclass, wmclass)) || ---- (seqclass && !strcmp(seqclass, name)); ---- } ---- else if (seqbin) { ---- /* Check the binary name against the class and name hints ---- as well, to help apps that don't have the class set ---- correctly */ ---- found = (seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) || ---- (seqbin && !g_ascii_strcasecmp(seqbin, name)); ---- } ---- ---- if (found) { ---- sn_startup_sequence_complete(seq); ---- t = sn_startup_sequence_get_timestamp(seq); ---- break; ---- } ---- } ---- return t; ----} ---- ----gboolean sn_get_desktop(gchar *id, guint *desktop) ----{ ---- SnStartupSequence *seq; ---- ---- if (id && (seq = sequence_find(id))) { ---- gint desk = sn_startup_sequence_get_workspace(seq); ---- if (desk != -1) { ---- *desktop = desk; ---- return TRUE; ---- } ---- } ---- return FALSE; ----} ---- ----static gboolean sn_launch_wait_timeout(gpointer data) ----{ ---- SnLauncherContext *sn = data; ---- sn_launcher_context_complete(sn); ---- return FALSE; /* don't repeat */ ----} ---- ----void sn_setup_spawn_environment(const gchar *program, const gchar *name, ---- const gchar *icon_name, const gchar *wmclass, ---- gint desktop) ----{ ---- gchar *desc; ---- const char *id; ---- ---- desc = g_strdup_printf(_("Running %s\n"), program); ---- ---- if (sn_launcher_context_get_initiated(sn_launcher)) { ---- sn_launcher_context_unref(sn_launcher); ---- sn_launcher = sn_launcher_context_new(sn_display, ob_screen); ---- } ---- ---- sn_launcher_context_set_name(sn_launcher, name ? name : program); ---- sn_launcher_context_set_description(sn_launcher, desc); ---- sn_launcher_context_set_icon_name(sn_launcher, icon_name ? ---- icon_name : program); ---- sn_launcher_context_set_binary_name(sn_launcher, program); ---- if (wmclass) sn_launcher_context_set_wmclass(sn_launcher, wmclass); ---- if (desktop >= 0 && (unsigned) desktop < screen_num_desktops) ---- sn_launcher_context_set_workspace(sn_launcher, (signed) desktop); ---- sn_launcher_context_initiate(sn_launcher, "openbox", program, ---- event_curtime); ---- id = sn_launcher_context_get_startup_id(sn_launcher); ---- ---- /* 20 second timeout for apps to start */ ---- sn_launcher_context_ref(sn_launcher); ---- obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC, ---- sn_launch_wait_timeout, sn_launcher, ---- g_direct_equal, ---- (GDestroyNotify)sn_launcher_context_unref); ---- ---- setenv("DESKTOP_STARTUP_ID", id, TRUE); ---- ---- g_free(desc); ----} ---- ----void sn_spawn_cancel(void) ----{ ---- sn_launcher_context_complete(sn_launcher); ----} ---- ----#endif diff --cc openbox/startupnotify.h index d524bcaa,d524bcaa,d524bcaa,d524bcaa..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/startupnotify.h +++ /dev/null @@@@@ -1,50 -1,50 -1,50 -1,50 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- startupnotify.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__startupnotify_h ----#define ob__startupnotify_h ---- ----#include ----#include ---- ----void sn_startup(gboolean reconfig); ----void sn_shutdown(gboolean reconfig); ---- ----gboolean sn_app_starting(void); ---- ----/*! Notify that an app has started ---- @param wmclass the WM_CLASS[1] hint ---- @param name the WM_CLASS[0] hint ---- */ ----Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name); ---- ----/*! Get the desktop requested via the startup-notiication protocol if one ---- was requested */ ----gboolean sn_get_desktop(gchar *id, guint *desktop); ---- ----/* Get the environment to run the program in, with startup notification */ ----void sn_setup_spawn_environment(const gchar *program, const gchar *name, ---- const gchar *icon_name, const gchar *wmclass, ---- gint desktop); ---- ----/* Tell startup notification we're not actually running the program we ---- told it we were ----*/ ----void sn_spawn_cancel(void); ---- ----#endif diff --cc openbox/translate.c index 50d50008,50d50008,50d50008,50d50008..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/translate.c +++ /dev/null @@@@@ -1,160 -1,160 -1,160 -1,160 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- translate.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "openbox.h" ----#include "mouse.h" ----#include "gettext.h" ----#include "obt/keyboard.h" ---- ----#include ----#include ----#include ---- ----static guint translate_modifier(gchar *str) ----{ ---- guint mask = 0; ---- ---- if (!g_ascii_strcasecmp("Mod1", str)) mask = Mod1Mask; ---- else if (!g_ascii_strcasecmp("Mod2", str)) mask = Mod2Mask; ---- else if (!g_ascii_strcasecmp("Mod3", str)) mask = Mod3Mask; ---- else if (!g_ascii_strcasecmp("Mod4", str)) mask = Mod4Mask; ---- else if (!g_ascii_strcasecmp("Mod5", str)) mask = Mod5Mask; ---- ---- else if (!g_ascii_strcasecmp("Control", str) || ---- !g_ascii_strcasecmp("C", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL); ---- else if (!g_ascii_strcasecmp("Alt", str) || ---- !g_ascii_strcasecmp("A", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_ALT); ---- else if (!g_ascii_strcasecmp("Meta", str) || ---- !g_ascii_strcasecmp("M", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_META); ---- /* W = windows key, is linked to the Super_L/R buttons */ ---- else if (!g_ascii_strcasecmp("Super", str) || ---- !g_ascii_strcasecmp("W", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SUPER); ---- else if (!g_ascii_strcasecmp("Shift", str) || ---- !g_ascii_strcasecmp("S", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT); ---- else if (!g_ascii_strcasecmp("Hyper", str) || ---- !g_ascii_strcasecmp("H", str)) ---- mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_HYPER); ---- else ---- g_message(_("Invalid modifier key \"%s\" in key/mouse binding"), str); ---- ---- return mask; ----} ---- ----gboolean translate_button(const gchar *str, guint *state, guint *button) ----{ ---- gchar **parsed; ---- gchar *l; ---- gint i; ---- gboolean ret = FALSE; ---- ---- parsed = g_strsplit(str, "-", -1); ---- ---- /* first, find the button (last token) */ ---- l = NULL; ---- for (i = 0; parsed[i] != NULL; ++i) ---- l = parsed[i]; ---- if (l == NULL) ---- goto translation_fail; ---- ---- /* figure out the mod mask */ ---- *state = 0; ---- for (i = 0; parsed[i] != l; ++i) { ---- guint m = translate_modifier(parsed[i]); ---- if (!m) goto translation_fail; ---- *state |= m; ---- } ---- ---- /* figure out the button */ ---- if (!g_ascii_strcasecmp("Left", l)) *button = 1; ---- else if (!g_ascii_strcasecmp("Middle", l)) *button = 2; ---- else if (!g_ascii_strcasecmp("Right", l)) *button = 3; ---- else if (!g_ascii_strcasecmp("Up", l)) *button = 4; ---- else if (!g_ascii_strcasecmp("Down", l)) *button = 5; ---- else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6); ---- if (!*button) ---- goto translation_fail; ---- ---- ret = TRUE; ---- ----translation_fail: ---- g_strfreev(parsed); ---- return ret; ----} ---- ----gboolean translate_key(const gchar *str, guint *state, guint *keycode) ----{ ---- gchar **parsed; ---- gchar *l; ---- gint i; ---- gboolean ret = FALSE; ---- KeySym sym; ---- ---- parsed = g_strsplit(str, "-", -1); ---- ---- *state = *keycode = 0; ---- ---- /* first, find the key (last token) */ ---- l = NULL; ---- for (i = 0; parsed[i] != NULL; ++i) ---- l = parsed[i]; ---- if (l == NULL) ---- goto translation_fail; ---- ---- /* figure out the mod mask */ ---- *state = 0; ---- for (i = 0; parsed[i] != l; ++i) { ---- guint m = translate_modifier(parsed[i]); ---- if (!m) goto translation_fail; ---- *state |= m; ---- } ---- ---- if (!g_ascii_strncasecmp("0x", l, 2)) { ---- gchar *end; ---- ---- /* take it directly */ ---- *keycode = strtol(l, &end, 16); ---- if (*l == '\0' || *end != '\0') { ---- g_message(_("Invalid key code \"%s\" in key binding"), l); ---- goto translation_fail; ---- } ---- } else { ---- /* figure out the keycode */ ---- sym = XStringToKeysym(l); ---- if (sym == NoSymbol) { ---- g_message(_("Invalid key name \"%s\" in key binding"), l); ---- goto translation_fail; ---- } ---- *keycode = XKeysymToKeycode(obt_display, sym); ---- } ---- if (!*keycode) { ---- g_message(_("Requested key \"%s\" does not exist on the display"), l); ---- goto translation_fail; ---- } ---- ---- ret = TRUE; ---- ----translation_fail: ---- g_strfreev(parsed); ---- return ret; ----} diff --cc openbox/translate.h index 8249514e,8249514e,8249514e,8249514e..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/translate.h +++ /dev/null @@@@@ -1,27 -1,27 -1,27 -1,27 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- translate.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef ob__translate_h ----#define ob__translate_h ---- ----#include ---- ----gboolean translate_button(const gchar *str, guint *state, guint *keycode); ----gboolean translate_key(const gchar *str, guint *state, guint *keycode); ---- ----#endif diff --cc openbox/window.c index b90dc509,b90dc509,b90dc509,b90dc509..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/window.c +++ /dev/null @@@@@ -1,211 -1,211 -1,211 -1,211 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- window.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "window.h" ----#include "menuframe.h" ----#include "config.h" ----#include "dock.h" ----#include "client.h" ----#include "frame.h" ----#include "openbox.h" ----#include "prompt.h" ----#include "debug.h" ----#include "grab.h" ---- ----static GHashTable *window_map; ---- ----static guint window_hash(Window *w) { return *w; } ----static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } ---- ----void window_startup(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- window_map = g_hash_table_new((GHashFunc)window_hash, ---- (GEqualFunc)window_comp); ----} ---- ----void window_shutdown(gboolean reconfig) ----{ ---- if (reconfig) return; ---- ---- g_hash_table_destroy(window_map); ----} ---- ----Window window_top(ObWindow *self) ----{ ---- switch (self->type) { ---- case OB_WINDOW_CLASS_MENUFRAME: ---- return WINDOW_AS_MENUFRAME(self)->window; ---- case OB_WINDOW_CLASS_DOCK: ---- return WINDOW_AS_DOCK(self)->frame; ---- case OB_WINDOW_CLASS_CLIENT: ---- return WINDOW_AS_CLIENT(self)->frame->window; ---- case OB_WINDOW_CLASS_INTERNAL: ---- return WINDOW_AS_INTERNAL(self)->window; ---- case OB_WINDOW_CLASS_PROMPT: ---- return WINDOW_AS_PROMPT(self)->super.window; ---- } ---- g_assert_not_reached(); ---- return None; ----} ---- ----ObStackingLayer window_layer(ObWindow *self) ----{ ---- switch (self->type) { ---- case OB_WINDOW_CLASS_DOCK: ---- return config_dock_layer; ---- case OB_WINDOW_CLASS_CLIENT: ---- return ((ObClient*)self)->layer; ---- case OB_WINDOW_CLASS_MENUFRAME: ---- case OB_WINDOW_CLASS_INTERNAL: ---- return OB_STACKING_LAYER_INTERNAL; ---- case OB_WINDOW_CLASS_PROMPT: ---- /* not used directly for stacking, prompts are managed as clients */ ---- g_assert_not_reached(); ---- break; ---- } ---- g_assert_not_reached(); ---- return None; ----} ---- ----ObWindow* window_find(Window xwin) ----{ ---- return g_hash_table_lookup(window_map, &xwin); ----} ---- ----void window_add(Window *xwin, ObWindow *win) ----{ ---- g_assert(xwin != NULL); ---- g_assert(win != NULL); ---- g_hash_table_insert(window_map, xwin, win); ----} ---- ----void window_remove(Window xwin) ----{ ---- g_assert(xwin != None); ---- g_hash_table_remove(window_map, &xwin); ----} ---- ----void window_manage_all(void) ----{ ---- guint i, j, nchild; ---- Window w, *children; ---- XWMHints *wmhints; ---- XWindowAttributes attrib; ---- ---- if (!XQueryTree(obt_display, RootWindow(obt_display, ob_screen), ---- &w, &w, &children, &nchild)) { ---- ob_debug("XQueryTree failed in window_manage_all"); ---- nchild = 0; ---- } ---- ---- /* remove all icon windows from the list */ ---- for (i = 0; i < nchild; i++) { ---- if (children[i] == None) continue; ---- wmhints = XGetWMHints(obt_display, children[i]); ---- if (wmhints) { ---- if ((wmhints->flags & IconWindowHint) && ---- (wmhints->icon_window != children[i])) ---- for (j = 0; j < nchild; j++) ---- if (children[j] == wmhints->icon_window) { ---- /* XXX watch the window though */ ---- children[j] = None; ---- break; ---- } ---- XFree(wmhints); ---- } ---- } ---- ---- for (i = 0; i < nchild; ++i) { ---- if (children[i] == None) continue; ---- if (window_find(children[i])) continue; /* skip our own windows */ ---- if (XGetWindowAttributes(obt_display, children[i], &attrib)) { ---- if (attrib.map_state == IsUnmapped) ---- ; ---- else ---- window_manage(children[i]); ---- } ---- } ---- ---- if (children) XFree(children); ----} ---- ----void window_manage(Window win) ----{ ---- XEvent e; ---- XWindowAttributes attrib; ---- gboolean no_manage = FALSE; ---- gboolean is_dockapp = FALSE; ---- Window icon_win = None; ---- ---- grab_server(TRUE); ---- ---- /* check if it has already been unmapped by the time we started ---- mapping. the grab does a sync so we don't have to here */ ---- if (XCheckTypedWindowEvent(obt_display, win, DestroyNotify, &e) || ---- XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e)) ---- { ---- XPutBackEvent(obt_display, &e); ---- ob_debug("Trying to manage unmapped window. Aborting that.\n"); ---- no_manage = TRUE; ---- } ---- ---- if (!XGetWindowAttributes(obt_display, win, &attrib)) ---- no_manage = TRUE; ---- else { ---- XWMHints *wmhints; ---- ---- /* is the window a docking app */ ---- is_dockapp = FALSE; ---- if ((wmhints = XGetWMHints(obt_display, win))) { ---- if ((wmhints->flags & StateHint) && ---- wmhints->initial_state == WithdrawnState) ---- { ---- if (wmhints->flags & IconWindowHint) ---- icon_win = wmhints->icon_window; ---- is_dockapp = TRUE; ---- } ---- XFree(wmhints); ---- } ---- } ---- ---- if (!no_manage) { ---- if (attrib.override_redirect) { ---- ob_debug("not managing override redirect window 0x%x\n", win); ---- grab_server(FALSE); ---- } ---- else if (is_dockapp) { ---- if (!icon_win) ---- icon_win = win; ---- dock_manage(icon_win, win); ---- } ---- else ---- client_manage(win, NULL); ---- } ---- else { ---- grab_server(FALSE); ---- ob_debug("FAILED to manage window 0x%x\n", win); ---- } ----} ---- ----void window_unmanage_all(void) ----{ ---- dock_unmanage_all(); ---- client_unmanage_all(); ----} diff --cc openbox/window.h index 24a7d07b,24a7d07b,24a7d07b,24a7d07b..00000000 deleted file mode 100644,100644,100644,100644 --- a/openbox/window.h +++ /dev/null @@@@@ -1,93 -1,93 -1,93 -1,93 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- window.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __window_h ----#define __window_h ---- ----#include "stacking.h" ---- ----#include ----#include ---- ----typedef struct _ObWindow ObWindow; ----typedef struct _ObInternalWindow ObInternalWindow; ---- ----typedef enum { ---- OB_WINDOW_CLASS_MENUFRAME, ---- OB_WINDOW_CLASS_DOCK, ---- OB_WINDOW_CLASS_CLIENT, ---- OB_WINDOW_CLASS_INTERNAL, ---- OB_WINDOW_CLASS_PROMPT ----} ObWindowClass; ---- ----/* In order to be an ObWindow, you need to make this struct the top of your ---- struct */ ----struct _ObWindow { ---- ObWindowClass type; ----}; ---- ----#define WINDOW_IS_MENUFRAME(win) \ ---- (((ObWindow*)win)->type == OB_WINDOW_CLASS_MENUFRAME) ----#define WINDOW_IS_DOCK(win) \ ---- (((ObWindow*)win)->type == OB_WINDOW_CLASS_DOCK) ----#define WINDOW_IS_CLIENT(win) \ ---- (((ObWindow*)win)->type == OB_WINDOW_CLASS_CLIENT) ----#define WINDOW_IS_INTERNAL(win) \ ---- (((ObWindow*)win)->type == OB_WINDOW_CLASS_INTERNAL) ----#define WINDOW_IS_PROMPT(win) \ ---- (((ObWindow*)win)->type == OB_WINDOW_CLASS_PROMPT) ---- ----struct _ObMenu; ----struct _ObDock; ----struct _ObDockApp; ----struct _ObClient; ----struct _ObPrompt; ---- ----#define WINDOW_AS_MENUFRAME(win) ((struct _ObMenuFrame*)win) ----#define WINDOW_AS_DOCK(win) ((struct _ObDock*)win) ----#define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win) ----#define WINDOW_AS_INTERNAL(win) ((struct _ObInternalWindow*)win) ----#define WINDOW_AS_PROMPT(win) ((struct _ObPrompt*)win) ---- ----#define MENUFRAME_AS_WINDOW(menu) ((ObWindow*)menu) ----#define DOCK_AS_WINDOW(dock) ((ObWindow*)dock) ----#define CLIENT_AS_WINDOW(client) ((ObWindow*)client) ----#define INTERNAL_AS_WINDOW(intern) ((ObWindow*)intern) ----#define PROMPT_AS_WINDOW(prompt) ((ObWindow*)prompt) ---- ----void window_startup (gboolean reconfig); ----void window_shutdown(gboolean reconfig); ---- ----Window window_top (ObWindow *self); ----ObStackingLayer window_layer(ObWindow *self); ---- ----ObWindow* window_find (Window xwin); ----void window_add (Window *xwin, ObWindow *win); ----void window_remove(Window xwin); ---- ----/* Internal openbox-owned windows like the alt-tab popup */ ----struct _ObInternalWindow { ---- ObWindowClass type; ---- Window window; ----}; ---- ----void window_manage_all(void); ----void window_manage(Window win); ----void window_unmanage_all(void); ---- ----#endif diff --cc po/LINGUAS index d95268a1,d95268a1,d95268a1,d95268a1..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/LINGUAS +++ /dev/null @@@@@ -1,28 -1,28 -1,28 -1,28 +1,0 @@@@@ ----zh_TW ----zh_CN ----de ----es ----eu ----ca ----sv ----sk ----no ----fr ----ru ----pl ----pt ----pt_BR ----fi ----en@quot en@boldquot ----et ----cs ----nl ----ar ----bn_IN ----it ----vi ----ja ----ua ----hu ---- ----#hr diff --cc po/Makevars index 05231b89,05231b89,05231b89,05231b89..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/Makevars +++ /dev/null @@@@@ -1,41 -1,41 -1,41 -1,41 +1,0 @@@@@ ----# Makefile variables for PO directory in any package using GNU gettext. ---- ----# Usually the message domain is the same as the package name. ----DOMAIN = $(PACKAGE) ---- ----# These two variables depend on the location of this directory. ----subdir = po ----top_builddir = .. ---- ----# These options get passed to xgettext. ----XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ ---- ----# This is the copyright holder that gets inserted into the header of the ----# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ----# package. (Note that the msgstr strings, extracted from the package's ----# sources, belong to the copyright holder of the package.) Translators are ----# expected to transfer the copyright for their translations to this person ----# or entity, or to disclaim their copyright. The empty string stands for ----# the public domain; in this case the translators are expected to disclaim ----# their copyright. ----COPYRIGHT_HOLDER = Dana Jansens ---- ----# This is the email address or URL to which the translators shall report ----# bugs in the untranslated strings: ----# - Strings which are not entire sentences, see the maintainer guidelines ----# in the GNU gettext documentation, section 'Preparing Strings'. ----# - Strings which use unclear terms or require additional context to be ----# understood. ----# - Strings which make invalid assumptions about notation of date, time or ----# money. ----# - Pluralisation problems. ----# - Incorrect English spelling. ----# - Incorrect formatting. ----# It can be your email address, or a mailing list address where translators ----# can write to without being subscribed, or the URL of a web page through ----# which the translators can contact you. ----MSGID_BUGS_ADDRESS = http://bugzilla.icculus.org ---- ----# This is the list of locale categories, beyond LC_MESSAGES, for which the ----# message catalogs shall be used. It is usually empty. ----EXTRA_LOCALE_CATEGORIES = diff --cc po/POTFILES.in index f61e4435,200e9ca3,200e9ca3,200e9ca3..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/POTFILES.in +++ /dev/null @@@@@ -1,20 -1,19 -1,19 -1,19 +1,0 @@@@@ ----# List of source files containing translatable strings. ----openbox/actions.c ----openbox/actions/execute.c ----openbox/actions/exit.c - openbox/actions/sendkeyevent.c ----openbox/client.c ----openbox/client_list_combined_menu.c ----openbox/client_list_menu.c ----openbox/client_menu.c ----openbox/config.c ----openbox/debug.c ----openbox/keyboard.c ----openbox/menu.c ----openbox/mouse.c ----openbox/openbox.c ----openbox/screen.c ----openbox/session.c ----openbox/startupnotify.c ----openbox/translate.c ----openbox/prompt.c diff --cc po/ar.po index bf4062a2,bf4062a2,bf4062a2,bf4062a2..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/ar.po +++ /dev/null @@@@@ -1,423 -1,423 -1,423 -1,423 +1,0 @@@@@ ----# translation of openbox.pot to Arabic ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the Openbox package. ----# ----# Khaled Hosny , 2007. ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-07-21 14:43+0300\n" ----"Last-Translator: Khaled Hosny \n" ----"Language-Team: Arabic \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"X-Generator: KBabel 1.11.4\n" ----"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " ----"3\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "فشلت في تحويل المسار \"%s\" من utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "فشلت في تنفيذ \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "اذهب هناك..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "أدِر أسطح المكتب" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "أضِف سطح مكتب جديد (_A)" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "احذف آخر سطح مكتب (_R)" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "نوافذ" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "أسطح مكتب" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "كل أسطح المكتب" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "طبقة (_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "دائما على السطح (_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "طبيعي (_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "دائما في القاع (_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "أرسِل إلى سطح المكتب (_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "قائمة العميل" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "استعِد (_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "انقل (_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "حجِّم (_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "صغّر (_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "كبّر (_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "لُف لأعلى/لأسفل (_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "ضع/أزل الحواف (_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "أغلق (_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "زر غير صحيح \"%s\" محدد في ملف الإعدادات" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "لم أعثر على ملف قائمة سليم \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "فشل تنفيذ أمر ل pipe-menu \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "خرج غير سليم من pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "حاولت الوصول إلى القائمة \"%s\" لكنها غير موجودة" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "المزيد..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "زر غير صحيح \"%s\" في ارتباط الفأرة" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "سياق غير صحيح \"%s\" في ارتباط الفأرة" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "لم أستطع تغيير المجلد المنزلي \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "تعذّر بدأ مكتبة obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "خادم إكس لا يدعم المحليّة." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "لم أستطِع تحميل سِمة." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "حقوق النسخ" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "الصيغة: openbox [options]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"الخيارات:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help اعرض هذه المساعدة ثم اخرج\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version اعرض النسخة ثم اخرج\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace استبدل مدير النوافذ الذي يعمل حاليا\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable عطِّل الإتصال بمدير الجلسة\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure أعِد تحميل إعدادات أوبن‌بوكس\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart أعِد تشغيل أوبن‌بوكس\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"خيارات التنقيح:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync شغّل في النمط المزامن\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug اعرض خرْج التنقيح\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus اعرض خرج التنقيح للتعامل مع البؤرة\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama شق العرض إلى شاشات xinerama زائفة\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"من فضلك أبلغ عن العلل إلى %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "معامل سطر أوامر غير سليم \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "مدير النوافذ على الشاشة %Id لا وجود له" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "سطح المكتب %Ii" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "لم أستطِع إنشاء الدليل \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "لم أستطِع حفظ الجلسة إلى \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "خطأ أثناء حفظ الجلسة إلى \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "تشغيل %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "مفتاح مُغيِّر \"%s\" غير سليم في ارتبط الفأرة/لوحة المفاتيح" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "رمز مفتاح \"%s\" غير سليم في ارتباط المفتاح" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "اسم مفتاح \"%s\" غير سليم في ارتباط المفتاح" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "المفتاح المطلوب \"%s\" لا وجود له في العرض" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "خطأ إكس: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/bn_IN.po index a95364fe,a95364fe,a95364fe,a95364fe..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/bn_IN.po +++ /dev/null @@@@@ -1,429 -1,429 -1,429 -1,429 +1,0 @@@@@ ----# translation of openbox to Bengali (India) ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the Openbox package. ----# ----# Runa Bhattacharjee , 2007. ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.2\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-06-01 19:02+0530\n" ----"Last-Translator: Runa Bhattacharjee \n" ----"Language-Team: Bengali (India) \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"X-Generator: KBabel 1.11.4\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ----"অবৈধ কর্ম \"%s\"-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "\"%s\" পাথটি utf8 থেকে রূপান্তর করতে ব্যর্থ" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "\"%s\" সঞ্চালন করতে ব্যর্থ: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "চিহ্নিত স্থানে চলুন..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "উইন্ডো" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "ডেস্কটপ" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "সর্বপ্রকার ডেস্কটপ" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "স্তর (_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "সর্বদা উপরে (_t)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "স্বাভাবিক (_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "সর্বদা নীচে (_b)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "ডেস্কটপে পাঠানো হবে (_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "ক্লায়েন্ট মেনু" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "পুনরুদ্ধার (_e)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "স্থানান্তরণ (_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "মাপ পরিবর্তন (_z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "আইকন রূপে প্রদর্শন (_n)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "বড় করুন (_x)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "উপরে/নীচে গুটিয়ে নিন (_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "বিন্যাস পরিবর্তন (_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "বন্ধ করুন (_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "কনফিগ ফাইলে অবৈধ বাটন \"%s\" উল্লিখিত হয়েছে" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "বৈধ মেনু ফাইল \"%s\" সনাক্ত করতে ব্যর্থ" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "পাইপ-মেনু \"%s\"-র জন্য কমান্ড সঞ্চালন করতে ব্যর্থ: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "পাইপ-মেনু \"%s\" থেকে অবৈধ ফলাফল প্রাপ্ত হয়েছে" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "অনুপস্থিত মেনু \"%s\" ব্যবহারের প্রচেষ্টা হয়েছে" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "অতিরিক্ত..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ বাটন \"%s\"" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট \"%s\"" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "ব্যক্তিগত ডিরেক্টরি \"%s\"-তে পরিবর্তন করতে ব্যর্থ: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "থিম লোড করতে ব্যর্থ।" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল \"%s\" সঞ্চালন করতে ব্যর্থ: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "স্বত্বাধিকার (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"বিবিধ বিকল্প:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version সংস্করণ প্রদর্শন করে প্রস্থান\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ----" --sm-disable সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Openbox-র কনফিগারেশন পুনরায় লোড করে\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Openbox পুনরারম্ভ\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"ডিবাগ করার বিভিন্ন বিকল্প:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug ডিবাগ-এর ফলাফল প্রদর্শন করে\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "desktop %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "\"%s\" ডিরেক্টরি নির্মাণ করতে ব্যর্থ: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "\"%s\"-র সেশান সংরক্ষণ করতে ব্যর্থ: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "\"%s\"-এ সেশান সংরক্ষণকালে সমস্যা: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "%s সঞ্চালিত হচ্ছে\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "কি/মাউস বাইন্ডিং-র মধ্যে অবৈধ মডিফায়ার-কি \"%s\"" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "কি-বাইন্ডিং-র মধ্যে অবৈধ কি-কোড \"%s\"" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "কি-বাইন্ডিং-র মধ্যে অবৈধ কি-র নাম \"%s\"" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "অনুরোধ করা কি \"%s\", প্রদর্শন ক্ষেত্রে উপস্থিত নেই" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X সংক্রান্ত ত্রুটি: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "\"%s\" কর্মের অবৈধ ব্যবহার। কর্ম উপেক্ষা করা হবে।" diff --cc po/ca.po index 0b2cbc0c,0b2cbc0c,0b2cbc0c,0b2cbc0c..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/ca.po +++ /dev/null @@@@@ -1,437 -1,437 -1,437 -1,437 +1,0 @@@@@ ----# Missatges en català per a openbox. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# David Majà Martínez , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.2\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-05-28 15:54+0200\n" ----"Last-Translator: David Majà Martínez \n" ----"Language-Team: catalan\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "L'acció sollicitada \"%s\" no és vàlida. Aquesta acció no existeix." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "No s'ha pogut convertir el camí \"%s\" des de utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "No s'ha pogut executar \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Vés aquí..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Finestres" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Escriptoris" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Tots els escriptoris" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Capa" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Sempre a so_bre" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Sempre a so_ta" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "A l'_escriptori" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menú del client" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Restaur_a" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mou" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Redimen_siona" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimitza" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximitza" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "En/Desen_rotlla" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Sense/Amb _decoració" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Tanca" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "El botó especificat al fitxer de configuració \"%s\" no és vàlid." ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "No s'ha pogut trobar un fitxer de menú \"%s\" vàlid" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "" ----"S'ha produït un error en executar l'ordre per al menú de conducte \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "La sortida del menú de conducte \"%s\" no és vàlida" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "S'ha intentat accedir al menú \"%s\" ja que no existeix" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Més..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "El botó \"%s\" no és vàlid en la vinculació del ratolí" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "El context \"%s\" no és vàlid en la vinculació del ratolí" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "No s'ha pogut canviar al directori de l'usuari \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "S'ha produït un error en inicialitza la llibreria obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "El servidor X no te suport per a idiomes" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns " ----"valors predeterminats" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "No s'ha pogut carregar el tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"S'ha produït un error en tornar a iniciar i executar el nou executable \"%s" ----"\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintaxis: openbox [opcions]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opcions:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Visualitza aquesta ajuda i surt\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Visualitza la versió i surt\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Reemplaça el gestor de finestres que s'està executant " ----"actualment\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Inhabilita la connexió amb gestor de sessió\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"S'està transferint missatges a la instància del Openbox que s'està " ----"executant:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Torna a carregar la configuració de Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Torna a iniciar Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opcions de depuració:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Executa en mode sincronitzat\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Mostra la sortida de depuració\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Mostra la sortida de depuració per a la gestió del " ----"focus\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ----" --debug-xinerama Divideix la visualització en pantalles xinerama " ----"falses\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Informeu dels errors a %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Opció \"%s\" no vàlida a la línia d'ordres\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Encara s'està executant un gestor de finestres a la pantalla %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ----"No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "El gestor de finestres de la pantalla %d no està sortint" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "escriptori %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "No és pot crear el directori \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "No s'ha pogut desar la sessió a \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "S'ha produït un error mentre es desava la sessió a \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Executant %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"La tecla modificadora \"%s\" no és vàlida en la vinculació de tecles/ratolí" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "El codi de tecla \"%s\" no és vàlid en la vinculació de tecles" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "El nom de la tecla \"%s\" no és vàlid en la vinculació de tecles" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "La tecla seleccionada \"%s\" no existeix a la pantalla" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Error d'X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "L'ús de l'acció \"%s\" no és vàlid. S'ignorarà aquesta acció." diff --cc po/cs.po index 137e5dd2,137e5dd2,137e5dd2,137e5dd2..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/cs.po +++ /dev/null @@@@@ -1,427 -1,427 -1,427 -1,427 +1,0 @@@@@ ----# Czech translation for Openbox. ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the Openbox 3 package. ----# tezlo , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-09 09:33+0100\n" ----"Last-Translator: tezlo \n" ----"Language-Team: Czech \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Požadována neplatná akce \"%s\". Žádná taková akce neexistuje." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Nepodařilo se převést cestu \"%s\" z utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Nepodařilo se spustit \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Ukončování..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Neodpovídá" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Jdi tam..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Spravovat plochy" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Přidat novou plochu" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Odstranit poslední plochu" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Okna" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Plochy" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "VÅ¡echny plochy" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "V_rstva" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Vždy na_vrchu" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normální" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Vždy ve_spodu" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Poslat na plochu" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu klienta" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Obnovit" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Přes_unout" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Veli_kost" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimalizovat" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximalizovat" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "S_rolovat/Vyrolovat" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Oz_dobit/Odzdobit" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Zavřít" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Neplatné tlačítko \"%s\" v konfiguračním souboru" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt klávesových zkratek v konfiguračním souboru" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Nepodařilo se najít platný menu soubor \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Nepodařilo se spustit příkaz pro pipe-menu \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Neplatný výstup z pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Pokus o přístup k menu \"%s\", ale ono neexistuje" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Víc..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Neplatné tlačítko \"%s\" v nastavení myÅ¡i" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Neplatný kontext \"%s\" v nastavení myÅ¡i" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Nepodařilo se přejít do domácího adresáře \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Nepodařilo se inicializovat knihovnu obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server nepodporuje lokalizaci." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Nelze nastavit modifikátory lokalizace pro X server." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím " ----"nastavením" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Nepodařilo se načíst motiv." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Při restartu se nepodařilo spustit nový program \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntaxe: openbox [přepínače]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Přepínače:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Zobrazit tuto nápovědu a skončit\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Zobrazit verzi a skončit\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Nahradit běžící window manager\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Nepřipojovat se k session manageru\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Zasílání zpráv běžící instanci Openbox:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Znovu načíst konfiguraci Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Restartovat Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Ukončit Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Ladící přepínače:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Spustit v synchronním módu\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Zobrazit ladící výstup\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Zobrazit ladící výstup pro správu oken\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Rozdělit displej na faleÅ¡né obrazovky xinerama\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Prosím hlaÅ¡te chyby na %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file vyžaduje argument\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Neplatný argument příkazové řádky \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Na obrazovce %d již nějaký window manager běží" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Window manager na obrazovce %d ne a ne skončit" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox je konfigurován pro %d ploch, ale současné sezení má %d. " ----"KOnfigurace Openboxu bude změněna." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "plochu %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Nepodařilo se vytvořit adresář \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Nepodařilo se uložit session do \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Chyba během ukládání session do \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "SpouÅ¡tím %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Neplatný modifikátor \"%s\" v nastavení klávesnice/myÅ¡i" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Neplatný kód klávesy \"%s\" v nastevení" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Neplatné jméno klávesy \"%s\" v nastavení" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Požadovaná klávesa \"%s\" na displeji neexistuje" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X Chyba: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Neplatné užití akce \"%s\". Akce bude ignorována." diff --cc po/de.po index db266018,db266018,db266018,db266018..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/de.po +++ /dev/null @@@@@ -1,433 -1,433 -1,433 -1,433 +1,0 @@@@@ ----# German messages for openbox. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Sebastian Vahl , 2006. ----# Simon A. Wilper , Apr 2007 ----# Peter Schwindt ----# Finn Zirngibl , 2008" ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-17 22:49+0100\n" ----"Last-Translator: Finn Zirngibl \n" ----"Language-Team: \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Unzulässige Aktion \"%s\" angefordert. Diese Aktion existiert nicht." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Konnte Pfad \"%s\" nicht von utf8 konvertieren" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Konnte \"%s\" nicht ausführen: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Wird beendet..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Reagiert nicht" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Hierher wechseln..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Desktops verwalten" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Neuen Desktop hinzufügen" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Letzten Desktop entfernen" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Fenster" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Desktops" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Alle Desktops" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Layer" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Immer im _Vordergrund" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Immer im _Hintergrund" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_An Desktop senden" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Client menu" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Wi_ederherstellen" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Vers_chieben" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "_Größe ändern" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimieren" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximieren" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Auf/Ab_rollen" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Dekoration entfernen/_Dekorieren" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Schließen" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Unzulässiger Knopf \"%s\" in der Konfigurationsdatei angegeben" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Konnte keine gültige Menü-Datei \"%s\" finden" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Konnte Befehl \"%s\" für pipe-menu nicht ausführen: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Ungültige Ausgabe vom pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "" ----"Das Menü \"%s\" wurde bei dem Versuch darauf zuzugreifen nicht gefunden" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Mehr..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Maus-Binding enthält ungültigen Button \"%s\"" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Maus-Binding enthält ungültigen Kontext \"%s\"" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Konnte nicht in das Heimatverzeichnis \"%s\" wechseln: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht öffnen." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Konnte die obrender Bibliothek nicht initialisieren." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ----"Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache " ----"Standardwerte." ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Konnte kein Thema laden." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"Neustart fehlgeschlagen, um die ausführbare Datei \"%s\" zu starten: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [Optionen]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Optionen:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Diese Hilfe anzeigen und beenden\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Version anzeigen und beenden\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Den aktuell laufenden Fenstermanager ersetzen\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Keine Verbindung zum Sitzungsmanager aufbauen\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Openbox's Konfiguration neu laden\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Openbox neu starten\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Beende Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debugging Optionen:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync im Synchronisierungsmodus starten\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Debugging-Informationen anzeigen\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Debugging-Informationen für's Fokus-Handling anzeigen\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ----" --debug-xinerama Anzeige in künstliche Xinerama-Bildschirme aufteilen\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Bitte melden Sie Bugreports an: %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Ungültiges Kommandozeilen Argument \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Ein Fenstermanager läuft bereits auf Bildschirm %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Konnte die Fenstermanagerauswahl auf Bildschirm %d nicht reservieren" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "desktop %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Das Verzeichnis \"%s\" konnte nicht angelegt werden: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Konnte die Sitzung \"%s\" nicht sichern: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Fehler beim Speichern der Sitzung nach \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Starte %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Ungültige Modifier-Taste \"%s\" in Tastenbelegung/Maus-Binding" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Ungültiger Keycode \"%s\" in Tastenkombination" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Ungültiger Tastenname \"%s\" in Tastenkombination" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Angeforderte Taste \"%s\" existiert nicht auf dem Display" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X Fehler: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Unzulässiger Einsatz der Aktion \"%s\". Aktion wird ignoriert." diff --cc po/en@boldquot.po index 2914136f,2914136f,2914136f,2914136f..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/en@boldquot.po +++ /dev/null @@@@@ -1,452 -1,452 -1,452 -1,452 +1,0 @@@@@ ----# English translations for openbox package. ----# Copyright (C) 2008 Dana Jansens ----# This file is distributed under the same license as the openbox package. ----# Automatically generated, 2008. ----# ----# All this catalog "translates" are quotation characters. ----# The msgids must be ASCII and therefore cannot contain real quotation ----# characters, only substitutes like grave accent (0x60), apostrophe (0x27) ----# and double quote (0x22). These substitutes look strange; see ----# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html ----# ----# This catalog translates grave accent (0x60) and apostrophe (0x27) to ----# left single quotation mark (U+2018) and right single quotation mark (U+2019). ----# It also translates pairs of apostrophe (0x27) to ----# left single quotation mark (U+2018) and right single quotation mark (U+2019) ----# and pairs of quotation mark (0x22) to ----# left double quotation mark (U+201C) and right double quotation mark (U+201D). ----# ----# When output to an UTF-8 terminal, the quotation characters appear perfectly. ----# When output to an ISO-8859-1 terminal, the single quotation marks are ----# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to ----# grave/acute accent (by libiconv), and the double quotation marks are ----# transliterated to 0x22. ----# When output to an ASCII terminal, the single quotation marks are ----# transliterated to apostrophes, and the double quotation marks are ----# transliterated to 0x22. ----# ----# This catalog furthermore displays the text between the quotation marks in ----# bold face, assuming the VT100/XTerm escape sequences. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: openbox 3.999.0\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-27 21:03-0500\n" ----"Last-Translator: Automatically generated\n" ----"Language-Team: none\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Invalid action “%s” requested. No such action exists." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "No" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "Yes" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Failed to convert the path “%s” from utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Failed to execute “%s”: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "Are you sure you want to exit Openbox?" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "Unnamed Window" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Killing..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Not Responding" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ----"The window “%s” does not seem to be responding. Do you want to force " ----"it to exit by sending the %s signal?" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "End Process" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ----"The window “%s” does not seem to be responding. Do you want to " ----"disconnect it from the X server?" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "Disconnect" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "Cancel" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Go there..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Manage desktops" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Add new desktop" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Remove last desktop" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Windows" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Desktops" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "All desktops" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Layer" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Always on _top" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Always on _bottom" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Send to desktop" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Client menu" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "R_estore" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Move" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Resi_ze" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Ico_nify" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximize" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Roll up/down" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Un/_Decorate" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Close" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Invalid button “%s” specified in config file" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflict with key binding in config file" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Unable to find a valid menu file “%s”" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Failed to execute command for pipe-menu “%s”: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Invalid output from pipe-menu “%s”" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Attempted to access menu “%s” but it does not exist" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "More..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Invalid button “%s” in mouse binding" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Invalid context “%s” in mouse binding" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Unable to change to home directory “%s”: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Failed to open the display from the DISPLAY environment variable." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Failed to initialize the obrender library." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server does not support locale." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Cannot set locale modifiers for the X server." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "Unable to find a valid config file, using some simple defaults" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Unable to load a theme." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Restart failed to execute new executable “%s”: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [options]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Options:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Display this help and exit\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Display the version and exit\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Replace the currently running window manager\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr " --config-file FILE Specify the path to the config file to use\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Disable connection to the session manager\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Reload Openbox's configuration\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Restart Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Exit Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debugging options:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Run in synchronous mode\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Display debugging output\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Display debugging output for focus handling\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Split the display into fake xinerama screens\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Please report bugs at %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file requires an argument\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Invalid command line argument “%s”\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "A window manager is already running on screen %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Could not acquire window manager selection on screen %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "The WM on screen %d is not exiting" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "desktop %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Unable to make directory “%s”: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Unable to save the session to “%s”: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Error while saving the session to “%s”: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Running %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Invalid modifier key “%s” in key/mouse binding" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Invalid key code “%s” in key binding" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Invalid key name “%s” in key binding" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Requested key “%s” does not exist on the display" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X Error: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "OK" diff --cc po/en@quot.po index 643e3085,643e3085,643e3085,643e3085..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/en@quot.po +++ /dev/null @@@@@ -1,449 -1,449 -1,449 -1,449 +1,0 @@@@@ ----# English translations for openbox package. ----# Copyright (C) 2008 Dana Jansens ----# This file is distributed under the same license as the openbox package. ----# Automatically generated, 2008. ----# ----# All this catalog "translates" are quotation characters. ----# The msgids must be ASCII and therefore cannot contain real quotation ----# characters, only substitutes like grave accent (0x60), apostrophe (0x27) ----# and double quote (0x22). These substitutes look strange; see ----# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html ----# ----# This catalog translates grave accent (0x60) and apostrophe (0x27) to ----# left single quotation mark (U+2018) and right single quotation mark (U+2019). ----# It also translates pairs of apostrophe (0x27) to ----# left single quotation mark (U+2018) and right single quotation mark (U+2019) ----# and pairs of quotation mark (0x22) to ----# left double quotation mark (U+201C) and right double quotation mark (U+201D). ----# ----# When output to an UTF-8 terminal, the quotation characters appear perfectly. ----# When output to an ISO-8859-1 terminal, the single quotation marks are ----# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to ----# grave/acute accent (by libiconv), and the double quotation marks are ----# transliterated to 0x22. ----# When output to an ASCII terminal, the single quotation marks are ----# transliterated to apostrophes, and the double quotation marks are ----# transliterated to 0x22. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: openbox 3.999.0\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-27 21:03-0500\n" ----"Last-Translator: Automatically generated\n" ----"Language-Team: none\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Invalid action “%s” requested. No such action exists." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "No" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "Yes" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Failed to convert the path “%s” from utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Failed to execute “%s”: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "Are you sure you want to exit Openbox?" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "Unnamed Window" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Killing..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Not Responding" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ----"The window “%s” does not seem to be responding. Do you want to force it to " ----"exit by sending the %s signal?" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "End Process" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ----"The window “%s” does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "Disconnect" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "Cancel" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Go there..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Manage desktops" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Add new desktop" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Remove last desktop" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Windows" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Desktops" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "All desktops" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Layer" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Always on _top" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Always on _bottom" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Send to desktop" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Client menu" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "R_estore" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Move" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Resi_ze" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Ico_nify" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximize" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Roll up/down" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Un/_Decorate" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Close" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Invalid button “%s” specified in config file" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflict with key binding in config file" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Unable to find a valid menu file “%s”" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Failed to execute command for pipe-menu “%s”: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Invalid output from pipe-menu “%s”" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Attempted to access menu “%s” but it does not exist" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "More..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Invalid button “%s” in mouse binding" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Invalid context “%s” in mouse binding" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Unable to change to home directory “%s”: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Failed to open the display from the DISPLAY environment variable." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Failed to initialize the obrender library." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server does not support locale." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Cannot set locale modifiers for the X server." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "Unable to find a valid config file, using some simple defaults" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Unable to load a theme." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Restart failed to execute new executable “%s”: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [options]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Options:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Display this help and exit\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Display the version and exit\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Replace the currently running window manager\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr " --config-file FILE Specify the path to the config file to use\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Disable connection to the session manager\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Reload Openbox's configuration\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Restart Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Exit Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debugging options:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Run in synchronous mode\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Display debugging output\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Display debugging output for focus handling\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Split the display into fake xinerama screens\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Please report bugs at %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file requires an argument\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Invalid command line argument “%s”\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "A window manager is already running on screen %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Could not acquire window manager selection on screen %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "The WM on screen %d is not exiting" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "desktop %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Unable to make directory “%s”: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Unable to save the session to “%s”: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Error while saving the session to “%s”: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Running %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Invalid modifier key “%s” in key/mouse binding" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Invalid key code “%s” in key binding" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Invalid key name “%s” in key binding" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Requested key “%s” does not exist on the display" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X Error: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "OK" diff --cc po/es.po index 71e06a4d,71e06a4d,71e06a4d,71e06a4d..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/es.po +++ /dev/null @@@@@ -1,446 -1,446 -1,446 -1,446 +1,0 @@@@@ ----# Spanish messages for openbox. ----# Copyright (C) 2005 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Miguel Calleja Gómez , 2005. ----# Gustavo Varela , 2007 ----# David Merino , 2007. ----# Elián Hanisch , 2008. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6.1\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-19 00:15+0100\n" ----"Last-Translator: Elián Hanisch \n" ----"Language-Team: español \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "La acción \"%s\" solicitada es inválida. No existe tal acción." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "No" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "Sí" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Falló al convertir la ruta \"%s\" desde utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Falló al ejecutar \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Terminando..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "No está respondiendo" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ----"La ventana \"%s\" no parece estar respondiendo. ¿Desea forzarla a salir " ----"enviándole la señal %s?" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ----"La ventana \"%s\" no parece estar respondiendo. ¿Desea desconectarla del " ----"servidor X?" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Ir ahí..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Administrar escritorios" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Añadir un nuevo escritorio" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Remover el último escritorio" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Ventanas" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Escritorios" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Todos los escritorios" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Capa" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Siempre _encima" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Siempre _debajo" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Enviar al escritorio" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menú del cliente" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Rest_aurar" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mover" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Redimen_sionar" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimizar" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximizar" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "En/Desen_rollar" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "_Decorar" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Cerrar" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Botón inválido \"%s\" especificado en el archivo de configuración" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflicto con la combinación de teclas en el archivo de configuración" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "No es posible encontrar un archivo de menú \"%s\" válido" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Falló al ejecutar el comando para el pipe-menu \"%s\": \"%s\"" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Salida inválida del pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Intentó acceder al menú \"%s\" pero este no existe" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Más..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Botón inválido \"%s\" en mouse binding" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Contexto inválido \"%s\" en mouse binding" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "No es posible cambiar al directorio home \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Falló la inicialización de la librería obrender" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "El servidor X no soporta localizaciones." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ----"No se puede establecer los modificadores de localización para el servidor X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"No es posible encontrar un archivo de configuración válido, usando algunos " ----"valores por defecto" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "No es posible cargar el tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "El reinicio falló en ejecutar el nuevo ejecutable \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintaxis: openbox [opciones]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opciones:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Muestra esta ayuda y sale\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Muestra la versión y sale\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Remplaza el gestor de ventanas que esta corriendo " ----"actualmente\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ----" --config-file ARCHIVO\n" ----" Especifique la ruta del archivo de configuración a " ----"usar\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ----" --sm-disable Deshabilita la conexión con el gestor de sesión\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Pasando mensajes a la instancia que esta corriendo de Openbox:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Recarga la configuración de Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Reinicia Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Cierra Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opciones de depuración:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Correr en modo sincrónico\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Mostrar salida del depurador\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Mostrar salida del depurador para el manejo del foco\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ----" --debug-xinerama Separar la visualización en pantallas de xinerama " ----"falsas\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Por favor reportar errores a %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file requiere un argumento\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Argumento de la línea de comando inválido \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "No se pudo obtener la selección del gestor de ventanas en pantalla %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "El WM en la pantalla %d no está saliendo" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox está configurado para escritorios %d, pero la sesión actual a %d. " ----"Invalidando la configuración de Openbox." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "Escritorio %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "No se puede crear el directorio \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "No se puede salvar la sesión a \"%s\": \"%s\"" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Error mientras se salvaba la sesión a \"%s\": \"%s\"" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Ejecutando %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"Modificador de tecla \"%s\" inválido en combinaciones de teclas o ratón" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Código de tecla \"%s\" inválido en combinaciones de teclas" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Nombre de tecla \"%s\" inválido en combinaciones de teclas" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Tecla solicitada \"%s\" no existe en la pantalla" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Error en X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "OK" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Uso inválido de la acción \"%s\". La acción sera ignorada." diff --cc po/et.po index d2798d3f,d2798d3f,d2798d3f,d2798d3f..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/et.po +++ /dev/null @@@@@ -1,426 -1,426 -1,426 -1,426 +1,0 @@@@@ ----# translation of openbox to Estonian ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the Openbox 3 package. ----# ----# Andres Järv , 2007. ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-07-20 16:54+0200\n" ----"Last-Translator: Andres Järv \n" ----"Language-Team: Estonian \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Taotleti kehtetut käsklust \"%s\". Sellist käsklust pole olemas." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Raja \"%s\" ümberkodeerimine UTF8-st ebaõnnestus" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "\"%s\" käivitamine ebaõnnestus: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Mine sinna..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Halda töölaudu" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Lisa uus töölaud" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Eemalda viimane töölaud" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Aknad" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Töölauad" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Kõik töölauad" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Kiht" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Aken teiste _peal" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normaalne" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Aken teiste _all" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Saada töölauale" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Kliendi menüü" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Taasta" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Liiguta" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Muuda _suurust" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Muuda _ikooniks" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ksimeeri" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Rulli üles/alla" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Äär_ed sisse/välja" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "S_ulge" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Vigane nupp \"%s\" määratletud konfiguratsioonifailis" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt kiirklahviga konfiguratsioonifailis" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Ei suudetud leida kehtivat menüüfaili \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Ei suudetud käivitada torumenüü \"%s\" käsku: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Vigane väljund torumenüüst \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Üritati ligi pääseda menüüle \"%s\", aga seda pole olemas" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Rohkem..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Vigane nupp \"%s\" hiire kiirklahvides" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Vigane kontekst \"%s\" hiire kiirklahvides" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Ei suudetud siseneda kodukataloogi \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Obrender-damisteegi käivitamine ebaõnnestus." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server ei toeta lokaati." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid " ----"vaikimisi seadeid" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Ei suudetud laadida teemat." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili \"%s\" käivitamine: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Autoriõigused (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Süntaks: openbox [seaded]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Seaded:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Selle abi kuvamine ja väljumine\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Versiooni kuvamine ja väljumine\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Hetkel töötava aknahalduri asendamine\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Seansihalduriga ühenduse keelamine\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Jooksvale Openboxi seansile sõnumite edastamine:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Openboxi konfiguratsioon uuesti laadimine\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Openboxi taaskäivitamine\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Silumise seaded:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Sünkroonselt jooksutamine\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Silumisväljundi kuvamine\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Fookusekäsitluse siluriväljundi kuvamine\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Ekraani võlts-Xinerama ekraanideks jagamine\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Palun teata vigadest siia %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Vigane käsurea argument \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Ekraanil %d juba jookseb aknahaldur" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Aknahaldur ekraanil %d ei sulgu" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "töölaud %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Kausta \"%s\" tegemine ebaõnnestus: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Seansi \"%s\" salvestamine ebaõnnestus: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Seansi \"%s\" salvestamisel ilmnes viga: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Jooksev %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Vigane muutujaklahv \"%s\" hiire/klaviatuuri kiirklahvides" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Vigane klahvikood \"%s\" kiirklahvil" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Vigane klahvinimi \"%s\" kiirklahvil" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Soovitud klahvi \"%s\" ei ole sellel ekraanil" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X-i viga: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Käskluse \"%s\" kasutus on kehtetu. Käsklust ignoreeritakse." diff --cc po/eu.po index e68d72ce,e68d72ce,e68d72ce,e68d72ce..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/eu.po +++ /dev/null @@@@@ -1,426 -1,426 -1,426 -1,426 +1,0 @@@@@ ----# Basque translation for openbox. ----# Copyright (C) 2008 Inko Illarramendi Arancibia ----# This file is distributed under the same license as the openbox package. ----# Inko Illarramendi Arancibia , 2008. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-19 14:34+0100\n" ----"Last-Translator: Inko I. A. \n" ----"Language-Team: Inko I. A. \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Eskatutako \"%s\" ekintza baliogabea. Ez da ekintza hori existitzen." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Hutsegitea \"%s\" helbidea utf8-tik bihurtzean" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Hutsegitea \"%s\" exekutatzean: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Akabatzen..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Erantzunik Ez" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Hona joan..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Idazmahaiak kudeatu" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "Idazmahai berria _gehitu" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "Azken idazmahaia _ezabatu" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Leihoak" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Idazmahaiak" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Idazmahai guztiak" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Geruza" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Beti _gainean" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Ohikoa" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Beti _azpian" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Bidali idazmahaira" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Bezero menua" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Berr_ezarri" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mugitu" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "_Tamaina aldatu" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Iko_notu" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximizatu" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Bildu/_Zabaldu" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Des/_Dekoratu" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Itxi" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Konfigurazio fitxategian zehaztutako \"%s\" botoia baliogabea" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Gatazka konfigurazio fitxategiko tekla elkarketarekin" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Ezin da \"%s\" baliozko menu fitxategi bat aurkitu" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Hutsegitea \"%s\" pipe-menuarentzat komandoa exekutatzean: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Baliogabeko irteera \"%s\" pipe-menutik" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "\"%s\" menua atzitzen saiatu da baina ez da existitzen" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Gehiago..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Baliogabeko \"%s\" botoia sagu elkarketan" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Baliogabeko \"%s\" testuingurua sagu elkarketan" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Ezin da \"%s\" hasiera direktoriora aldatu: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Hutsegitea pantaila irekitzean DISPLAY ingurune aldagaitik." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Hutsegitea obrender liburutegia hasieratzean." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X zerbitzariak ez du locale euskarririk." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Ezin da locale modifikatzailerik ezarri X zerbitzariarentzat." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Ezin da baliozko konfigurazio fitxategirik aurkitu, hainbat aukera lehenetsi " ----"sinple erabiltzen" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Ezin da gai bat kargatu." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Berrabiarazteak hutsegitea \"%s\" exekutagarri berria exekutatzean: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintaxia: openbox [aukerak]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Aukerak:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Mezu hau erakutsi eta irten\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Bertsioa bistarazi eta irten\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Ordezkatu exekutatzen ari den leiho-kudeatzailea\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Ezgaitu saio kudeatzailearekiko konexioa\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Exekutatzen ari den Openbox instantzia bati mezuak pasatzen:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Birkargatu Openbox-en konfigurazioa\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Berrabiarazi Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Itxi Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Arazketa aukerak:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Modu sinkronoan exekutatu\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Arazketa irteera erakutsi\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Erakutsi arazketa irteera foku maneiurako\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Zatitu pantaila xinerama pantaila faltsuetan\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"%s helbidean erroreen berri eman mesedez\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "\"%s\" komando lerro argumentu baliogabea\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "" ----"Bistaratzeko %d pantailan aurretik leiho-kudeatzaile bat exekutatzen ari da" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ----"Ezin izan da eskuratu leiho-kudeatzailearen hautapena bistaratzeko %d " ----"pantailan" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "%i Idazmahaia" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Ezin da \"%s\" direktorioa sortu: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Ezin da saioa \"%s\"-n gorde: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Errorea saioa \"%s\"-n gordetzean: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Egikaritzen %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr " tekla/sagu elkarketan \"%s\" modifikatzaile tekla baliogabea" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr " tekla elkarketan \"%s\" tekla kode baliogabea" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr " tekla elkarketan \"%s\" tekla izen baliogabea" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Eskatutako \"%s\" tekla ez da pantaila existitzen" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X errorea: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/fi.po index 7ab8c627,7ab8c627,7ab8c627,7ab8c627..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/fi.po +++ /dev/null @@@@@ -1,432 -1,432 -1,432 -1,432 +1,0 @@@@@ ----# Openbox Finnish translation. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Pauli Virtanen , 2005. ----# Lauri Hakko , 2008. ----# Elias Julkunen , 2008. ----# Jarkko Piiroinen , 2008. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6.1\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-20 20:58+0200\n" ----"Last-Translator: Elias Julkunen \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Pyydettiin virheellinen toiminto \"%s\". Toimintoa ei ole olemassa." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "Ei" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "Kyllä" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Polun \"%s\" muuntaminen utf8:sta epäonnistui" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Ohjelman \"%s\" suorittaminen epäonnistui: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Tapetaan..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Ei vastaa" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ----"Ikkuna \"%s\" ei näytä vastaavan. Haluatko sulkea sen lähettämällä sille " ----"singaalin %s?" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ----"Ikkuna \"%s\" ei näytä vastaavan. Haluatko katkaista sen yhteyden X-" ----"palvelimeen?" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Näytä tämä..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Työtilojen hallinta" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Lisää uusi työtila" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Poista viimeisin työtila" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Ikkunat" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Työtilat" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Kaikkiin työtiloihin" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Kerros" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Aina _päällimmäisenä" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Tavallinen" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Aina _alimmaisena" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Lähetä työtilaan" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Ikkunan valikko" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Palauta" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "S_iirrä" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "_Muuta kokoa" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Pie_nennä" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Suurenn_a" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Rullaa _ylös/alas" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "(Epä)_reunusta" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Sulje" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Asetustiedostossa määritelty painike \"%s\" on virheellinen" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Päällekäisiä näppäinsidontoja asetustiedostossa" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Toimivaa valikkotiedostoa ei löytynyt \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Putkivalikon suorittaminen epäonnistui \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Virheellinen tulos putkivalikosta \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Valikon \"%s\" lukemista yritettiin, mutta sitä ei ole olemassa" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Lisää..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Virheellinen painike \"%s\" hiirisidonnoissa" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Virheellinen asiayhteys \"%s\" hiirisidonnoissa" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Kotihakemistoon \"%s\" vaihtaminen epäonnistui: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Obrender-kirjaston käynnistäminen epäonnistui." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X-palvelin ei tue maa-asetusta." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Maa-asetusmuuttujia ei voitu tehdä X-palvelimelle." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Kelvollista asetustiedostoa ei löytynyt, käytetään yksinkertaisia " ----"oletusarvoja" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Teeman lataaminen epäonnistui." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"Uudelleenkäynnistys ei onnistunut käynnistämään uutta ohjelmaa \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Tekijänoikeudet (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntaksi: openbox [valitsin]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Käyttö:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Näytä tämä ohje ja poistu\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Näytä version tiedot ja poistu\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Korvaa käynnissä oleva ikkunointiohjelma\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr " --config-file FILE Määritä käytettävän asetustiedoston polku\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Estä yhteys istuntojen hallintaan\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Komentojen antaminen käynnissä olevalle Openboxille:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Lataa Openboxin asetustiedosto uudelleen\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Käynnistä Openbox uudelleen\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Sulje Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Vianjäljityksen asetukset:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Aja synkronointi-tilassa\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Näytä vianjäljitystuloste\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Näytä vianjäljitystuloste ikkunavalitsimelle\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Jaa näyttö kahteen vale-xinerama-ruutuun\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Ilmoita virheistä: %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file tarvitsee argumentin\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Virheellinen valitsin \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Ikkunointiohjelma on jo käynnissä näytöllä %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Ikkunointiohjelman valinta ruudulla %d ei onnistunut" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox on asetettu käyttämään %d työtilaa, mutta nykyisessä istunnossa " ----"työtiloja on %d. Ohitetaan Openboxin asetus." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "työtila %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Hakemiston \"%s\" luonti epäonnistui: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Istuntoa ei voitu tallentaa hakemistoon \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Virhe tallennettaessa istuntoa hakemistoon \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Suoritetaan %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Virheellinen valintanäppäin \"%s\" näppäin- tai hiirisidonnoissa" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Virheellinen näppäinkoodi \"%s\" pikanäppäimissä" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Virheellinen näppäin \"%s\" pikanäppäimissä" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Pyydettyä näppäintä \"%s\" ei ole olemassa näytöllä" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X-virhe: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "OK" diff --cc po/fr.po index a49db830,a49db830,a49db830,a49db830..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/fr.po +++ /dev/null @@@@@ -1,441 -1,441 -1,441 -1,441 +1,0 @@@@@ ----# French translation of Openbox. ----# Copyright (C) 2004 Mikael Magnusson ----# This file is distributed under the same license as the Openbox package. ----# ----# tioui , 2004. ----# Cyrille Bagard , 2007-2008. ----# Jacques BON , 2007. ----# Éric Lassauge , 2008 ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-17 22:53+0100\n" ----"Last-Translator: Cyrille Bagard \n" ----"Language-Team: français \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=ISO-8859-1\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Action demandée invalide \"%s\". Une telle action n'existe pas." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Échec de la conversion du chemin « %s » depuis l'UTF-8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Échec de l'exécution de « %s » : %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Tue..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Ne répond pas" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Aller là..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Gérer les bureaux" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Ajouter un bureau" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Supprimer le dernier bureau" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Fenêtres" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Bureaux" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Tous les bureaux" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Disposition" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "_Toujours au premier plan" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Toujours en _arrière plan" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "En_voyer vers le bureau" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu de la fenêtre" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "R_estaurer" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Dé_placer" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Red_imensionner" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Ico_nifier" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximiser" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "En/Dé_rouler" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Ne pas/Dé_corer" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Fermer" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Bouton « %s » indiqué dans le fichier de configuration invalide" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Impossible de trouver un fichier de menus valide « %s »" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Échec lors de l'exécution de la commande pour un pipe-menu « %s » : %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Sortie du pipe-menu invalide « %s »" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Tentative d'accès au menu « %s » qui n'existe pas" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Plus..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Bouton « %s » invalide dans le paramétrage de la souris" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Contexte « %s » invalide dans le paramétrage de la souris" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Impossible de changer vers le répertoire de l'utilisateur « %s » : %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "" ----"Échec de l'ouverture de l'affichage depuis la variable d'environnement " ----"DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Échec de l'initialisation de la bibliothèque obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Le serveur X ne supporte pas la localisation." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ----"Impossible d'appliquer les modifications de localisation pour le serveur X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Impossible de trouver un fichier de configuration valide, utilisation de " ----"défauts simples" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Impossible de charger un thème." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"Le redémarrage n'a pas réussi à exécuter le nouvel exécutable « %s » : %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntaxe : openbox [options]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Options :\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Affiche cette aide et quitte\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Affiche la version et quitte\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Remplace le gestionnaire de fenêtres actuellement en " ----"usage\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ----" --sm-disable Désactive la connexion au gestionnaire de sessions\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Passage de messages à l'instance d'Openbox en cours :\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Recharge la configuration d'Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Redémarre Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Sortir d'Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Options de déboguage :\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Exécute en mode synchrone\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Affiche la sortie de déboguage\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Affiche la sortie de déboguage pour la gestion du " ----"focus\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ----" --debug-xinerama Découpe l'affichage en écrans xinerama factices\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Veuillez soumettre les rapports de bogues à %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Argument de la ligne de commande invalide « %s »\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Un gestionnaire de fenêtres est déjà lancé sur l'écran %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ----"Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran %" ----"d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "" ----"Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de se terminer" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "bureau %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Impossible de créer le répertoire « %s » : %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Impossible de sauvegarder la session dans « %s » : %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Erreur lors de la sauvegarde de la session depuis « %s » : %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Exécution de %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"Touche de modification « %s » invalide dans le paramétrage du clavier / de la " ----"souris" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Code de touche « %s » invalide dans le raccourci clavier" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Nom de touche « %s » invalide dans le raccourci clavier" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "La touche demandée « %s » n'existe pas pour l'affichage" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Erreur X : %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/hr.po index 82f6a80f,82f6a80f,82f6a80f,82f6a80f..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/hr.po +++ /dev/null @@@@@ -1,328 -1,328 -1,328 -1,328 +1,0 @@@@@ ----# Croatian messages for openbox. ----# Copyright (C) 2006 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Daniel Radetic , 2006. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2007-05-23 16:20+0200\n" ----"PO-Revision-Date: 2006-09-05 16:45+0100\n" ----"Last-Translator: Daniel Radetic \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/action.c:954 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/action.c:957 ----#, c-format ----msgid "Invalid use of action \"%s\". Action will be ignored." ----msgstr "" ---- ----#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "" ---- ----#: openbox/action.c:1265 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104 ----msgid "Go there..." ----msgstr "Odi na..." ---- ----#: openbox/client_list_combined_menu.c:148 ----msgid "Windows" ----msgstr "" ---- ----#: openbox/client_list_menu.c:196 ----msgid "Desktops" ----msgstr "Radne povrÅ¡ine" ---- ----#: openbox/client_menu.c:246 ----msgid "All desktops" ----msgstr "Sve radne povrÅ¡ine" ---- ----#: openbox/client_menu.c:351 ----msgid "_Layer" ----msgstr "" ---- ----#: openbox/client_menu.c:356 ----msgid "Always on _top" ----msgstr "Uvijek na _vrhu" ---- ----#: openbox/client_menu.c:357 ----msgid "_Normal" ----msgstr "_Normalno" ---- ----#: openbox/client_menu.c:358 ----msgid "Always on _bottom" ----msgstr "Uvijek na _dnu" ---- ----#: openbox/client_menu.c:361 ----msgid "_Send to desktop" ----msgstr "_PoÅ¡alji na radnu povrÅ¡inu" ---- ----#: openbox/client_menu.c:365 ----msgid "Client menu" ----msgstr "Meni klijenta" ---- ----#: openbox/client_menu.c:371 ----msgid "R_estore" ----msgstr "Ponovno uspostav_i" ---- ----#: openbox/client_menu.c:379 ----msgid "_Move" ----msgstr "Po_makni" ---- ----#: openbox/client_menu.c:381 ----msgid "Resi_ze" ----msgstr "Prom_jeni veličinu" ---- ----#: openbox/client_menu.c:383 ----msgid "Ico_nify" ----msgstr "Iko_nificiraj" ---- ----#: openbox/client_menu.c:391 ----msgid "Ma_ximize" ----msgstr "M_aksimiziraj" ---- ----#: openbox/client_menu.c:399 ----msgid "_Roll up/down" ----msgstr "" ---- ----#: openbox/client_menu.c:401 ----msgid "Un/_Decorate" ----msgstr "" ---- ----#: openbox/client_menu.c:411 ----msgid "_Close" ----msgstr "_Zatvori" ---- ----#: openbox/config.c:701 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "" ---- ----#: openbox/keyboard.c:162 ----msgid "Conflict with key binding in config file" ----msgstr "" ---- ----#: openbox/menu.c:98 openbox/menu.c:106 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "" ---- ----#: openbox/menu.c:149 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "" ---- ----#: openbox/menu.c:166 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "" ---- ----#: openbox/menu.c:179 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "" ---- ----#: openbox/menu.c:331 openbox/menu.c:332 ----msgid "More..." ----msgstr "" ---- ----#: openbox/mouse.c:338 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "" ---- ----#: openbox/mouse.c:344 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "" ---- ----#: openbox/openbox.c:129 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "" ---- ----#: openbox/openbox.c:149 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "" ---- ----#: openbox/openbox.c:180 ----msgid "Failed to initialize the obrender library." ----msgstr "" ---- ----#: openbox/openbox.c:186 ----msgid "X server does not support locale." ----msgstr "" ---- ----#: openbox/openbox.c:188 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ---- ----#: openbox/openbox.c:249 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ---- ----#: openbox/openbox.c:275 ----msgid "Unable to load a theme." ----msgstr "" ---- ----#: openbox/openbox.c:394 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ---- ----#: openbox/openbox.c:464 openbox/openbox.c:466 ----msgid "Copyright (c)" ----msgstr "" ---- ----#: openbox/openbox.c:475 ----msgid "Syntax: openbox [options]\n" ----msgstr "" ---- ----#: openbox/openbox.c:476 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:477 ----msgid " --help Display this help and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:478 ----msgid " --version Display the version and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:479 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:480 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:481 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ---- ----#: openbox/openbox.c:482 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr "" ---- ----#: openbox/openbox.c:483 ----msgid " --restart Restart Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:484 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:485 ----msgid " --sync Run in synchronous mode\n" ----msgstr "" ---- ----#: openbox/openbox.c:486 ----msgid " --debug Display debugging output\n" ----msgstr "" ---- ----#: openbox/openbox.c:487 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ---- ----#: openbox/openbox.c:488 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ---- ----#: openbox/openbox.c:489 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ---- ----#: openbox/openbox.c:586 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "" ---- ----#: openbox/screen.c:88 openbox/screen.c:189 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "" ---- ----#: openbox/screen.c:125 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ---- ----#: openbox/screen.c:146 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "" ---- ----#: openbox/screen.c:939 ----#, c-format ----msgid "desktop %i" ----msgstr "" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Nemogu napraviti direktorij \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "" ---- ----#: openbox/startupnotify.c:237 ----#, c-format ----msgid "Running %s\n" ----msgstr "" ---- ----#: openbox/translate.c:58 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ---- ----#: openbox/translate.c:135 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "" ---- ----#: openbox/translate.c:142 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "" ---- ----#: openbox/translate.c:148 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "" ---- ----#: openbox/xerror.c:39 ----#, c-format ----msgid "X Error: %s" ----msgstr "" diff --cc po/hu.po index 8f206564,8f206564,8f206564,8f206564..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/hu.po +++ /dev/null @@@@@ -1,423 -1,423 -1,423 -1,423 +1,0 @@@@@ ----# Hungarian messages for openbox. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Robert Kuszinger , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-12-21 14:33+0100\n" ----"Last-Translator: Robert Kuszinger \n" ----"Language-Team: Hungarian \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n != 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Az útvonalat nem sikerült átalakítani utf8-ból: \"%s\"" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Nem sikerült futtatni ezt a programot \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Menjünk oda..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Munkaasztal-kezelés" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "Új _munkaasztal" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "Utolsó munkaasztal _eltávolítása" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Ablakok" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Munkaasztalok" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Összes munkaasztal" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Réteg" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Mindig _felül" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normál" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Mindig _alul" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Munkaasztalra _küldeni" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Kliens menü" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Visszaállítás" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mozgatás" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "_Átméretezés" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Iko_nná alakítás" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximalizálás" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Görgetés fel/le" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "_Dekoráció eltávilítása" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Bezárás" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Érvénytelen gomb a konfigurációs fájlban \"%s\"" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Ütköző billentyű-műveletek a konfigurációs fájlban" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Nem található ilyen érvényes menü fájl: \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Sikertelen parancsfuttatás a csővezeték-menüben \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Érvnytelen válasz a csővezeték menüből \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "\"%s\" menü elérésére történt kísérlet, de az nem létezik" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Tovább..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Érvénytelen gomb \"%s\" az egér parancsoknál" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Érvénytelen környezet az egér parancsoknál: \"%s\"" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Nem lehet a saját mappába váltani \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Nem nyitható meg a DISPLAY változóban beállított képernyő" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Nem sikerült használatba venni az obernder függvénykönyvtárat" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Az X kiszolgáló nem támogatja ezt a nemzetközi beállítást." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "A nemzetközi beálljtás módosítók nem állíthatók be az X szerveren." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "Nincs konfigurációs fájl, ezért egyszerű alapértelmezéseket használunk" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Nem tölthető be a téma." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Az újraindítás során ez az új program nem volt indítható \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Szerzői jogok (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Használat: openbox [options]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opciók:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Súgó megjelenítése és kilépés\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Verzió kiírása majd kilépés\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Futó ablakkezelő cseréje\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Ne csatlakozzon a szekció-kezelőhöz\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Üzenet küldése a futó Openbox példánynak\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Konfiguráció úrjatöltése\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Openbox újraindítása\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Kilépés az Openboxból\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debug (hibakereső) lehetőségek:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Futtatás szinkron módban\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Hibakeresési információk megjelenítése\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Fókuszkezelésre vonatkozó hibakeresési információk " ----"kiírása\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Képernyő felosztása két ál-xinerama képernyőre\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Légyszi jelentsd a hibát itt: %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Érvénytelen parancssori opció: \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Már fut egy ablakkezelő ezen a képernyőn %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Nem tudok ablakkezelőt váltani ezen a képernyőn %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Ezen a képernyőn: %d az ablakkezelő nem lép ki" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "%i. munkaasztal" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Nem hozható létre a könyvtár \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Nem tudom elmenti ide a futó környezetet \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Hiba a futási környezet mentése közben \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Futtatás %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Érvénytelen módosító gomb \"%s\" egér vagy billentyűparancsnál" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Érvénytelen billentyűkód \"%s\" billentyűparancsnál" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Érvénytelen billentyűnév \"%s\" billentyűparancsnál" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "A kért gomb \"%s\" nem létezik a képernyőn" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X rendszer hiba: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/it.po index 53fc742f,53fc742f,53fc742f,53fc742f..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/it.po +++ /dev/null @@@@@ -1,435 -1,435 -1,435 -1,435 +1,0 @@@@@ ----# Italian translation for Openbox ----# Copyright (C) 2007 Davide Truffa ----# This file is distributed under the same license as the openbox package. ----# Davide Truffa , 2007. ----# ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-07-20 15:18+0200\n" ----"Last-Translator: Davide Truffa \n" ----"Language-Team: Italian \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Impossibile convertire il percorso utf8 \"%s\"" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Impossibile eseguire il comando \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Vai a..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Gestisci i desktop" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Aggiungi un nuovo desktop" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Rimuovi l'ultimo desktop" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Finestre" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Desktop" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Tutti i desktop" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Livello" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Sempre _sopra" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normale" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Sempre s_otto" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Invia al _desktop" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menù della finestra" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Ripristina" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Muovi" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "R_idimensiona" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimizza" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ssimizza" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "A_rrotola" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Si/No _Decorazioni" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Chiudi" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Il pulsante \"%s\" specificato nel file di configurazione non è valido" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "" ----"Conflitto con la scorciatoia da tastiera specificata nel file di " ----"configurazione" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Impossibile trovare il file di menù \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Impossibile eseguire il comando nel pipe-menù \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Output del pipe-menù \"%s\" non valido" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Tentativo di accedere al menù \"%s\". Il menù non esiste" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Altri..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Il pulsante \"%s\" specificato nelle associazioni mouse non è valido" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Il contesto \"%s\" specificato nelle associazioni mouse non è valido" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Impossibile accedere alla directory home \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Impossibile accedere al display specificato nella variabile DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Impossibile inizializzare la libreria obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Il server X non ha il supporto per la localizzazione." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ----"Impossibile impostare la localizzazione dei tasti modificatori per il server " ----"X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Impossibile trovare un file di configurazione valido, verranno utilizzate le " ----"impostazioni predefinite" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Impossibile caricare un tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Non è stato possibile riavviare il nuovo eseguibile \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintassi: openbox [opzioni]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opzioni:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Mostra questo messaggio di aiuto ed esce\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Mostra il numero di versione ed esce\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Sostituisce l'attuale window manager attivo\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Disabilita la connessione al session manager\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Inviare messaggi ad un'istanza di Openbox attiva:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Ricarica la configurazione di Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Riavvia Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opzioni di debug:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Esegue in modalità sincrona\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Mostra le informazioni di debug\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Mostra le informazioni di debug sulla gestione del " ----"focus\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Divide lo schermo per simulare xinerama\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Segnalate eventuali bug a %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Argomento da linea di comando non valido \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Un window manager è già attivo sullo schermo %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Il WM sullo schermo %d non è terminato" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "desktop %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Impossibile creare la directory \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Impossibile salvare la sessione in \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Errore durante il salvataggio della sessione in \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Sto eseguendo %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"Il nome del tasto \"%s\" specificato nelle associazioni di mouse/tastiera " ----"non è valido" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "" ----"Il codice tastiera \"%s\" specificato nelle associazioni di mouse/tastiera " ----"non è valido" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "" ----"Il nome del tasto \"%s\" specificato nelle associazioni di mouse/tastiera " ----"non è valido" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Il tasto richiesto \"%s\" non esiste sul display" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Errore del server X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/ja.po index e9b7a998,e9b7a998,e9b7a998,e9b7a998..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/ja.po +++ /dev/null @@@@@ -1,419 -1,419 -1,419 -1,419 +1,0 @@@@@ ----# Japanese messages for openbox. ----# Copyright (C) 2004 Mikael Magnusson ----# This file is distributed under the same license as the Openbox package. ----# Yukihiro Nakai , 2003. ----# Ryoichiro Suzuki , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-06-07 14:49+0200\n" ----"Last-Translator: Ryoichiro Suzuki \n" ----"Language-Team: Japanese \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=1; plural=0;\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ----"不正なアクション\"%s\"が要求されました。そのようなアクションは存在しません。" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "パス\"%s\"を utf8 から変換するのに失敗しました。" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "\"%s\"の実行に失敗しました: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "移動する..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "デスクトップを管理" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "新しくデスクトップを追加(_A)" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "最後のデスクトップを削除(_R)" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "ウィンドウ" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "デスクトップ" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "すべてのデスクトップ(_A)" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "階層(_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "常に最上位にする(_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "通常(_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "常に最下位にする(_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "デスクトップに送る(_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "クライアントメニュー" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "復元(_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "移動(_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "サイズの変更(_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "アイコン化(_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "最大化(_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "巻き上げ/展開(_R)" ---- ----# not sure about this one ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "非/装飾(_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "閉じる(_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "不正なボタン\"%s\"が設定ファイルで指定されています。" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "設定ファイルにキー割り当ての衝突があります。" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "正当なメニューファイル\"%s\"を見つけることができません。" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "パイプメニューの為のコマンド\"%s\"の実行に失敗しました: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "パイプメニュー\"%s\"からの不正な出力です。" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "メニュー\"%s\"へのアクセスを試みましたが、それは存在しません。" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "もっと..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "マウス割り当てに於いて不正なボタン \"%s\"" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "マウス割り当てに於いて不正なコンテクスト \"%s\"" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "ホームディレクトリ\"%s\"に移動できません: %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "環境変数 DISPLAY からディスプレイを開くのに失敗しました。" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "obrender ライブラリの初期化に失敗しました。" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Xサーバはロケールをサポートしていません。" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Xサーバの為のロケール修飾子を設定できません。" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "正当な設定ファイルを見つけられません。単純な初期設定を使います。" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "テーマを読み込めません。" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "再起動の際新しい実行ファイル\"%s\"の実行に失敗しました: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr "" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr "" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr "" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "不正なコマンドライン引数 \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "スクリーン%dでウィンドウマネージャが既に起動しています。" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "スクリーン%dでウィンドウマネージャの選択を取得できませんでした。" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "スクリーン%dのWMが終了しません。" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "デスクトップ%i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "ディレクトリ\"%s\"を作れません: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "セッションを\"%s\"に保存できません: %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "セッションを\"%s\"に保存中にエラーが起きました: %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "起動中 %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "キー/マウス割り当ての中の不正な修飾キー \"%s\"" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "キー割り当ての中の不正なキーコード \"%s\"" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "キー割り当ての中の不正なキー名称 \"%s\"" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "要求されたキー\"%s\"はそのディスプレイに存在しません。" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Xエラー: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "アクション\"%s\"の不正な使用です。このアクションは無視されます。" diff --cc po/nl.po index 7eeb3634,7eeb3634,7eeb3634,7eeb3634..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/nl.po +++ /dev/null @@@@@ -1,431 -1,431 -1,431 -1,431 +1,0 @@@@@ ----# Dutch messages for openbox. ----# Copyright (C) 2007 Mark Pustjens ----# This file is distributed under the same license as the openbox package. ----# Mark Pustjens , 2007. ----# Jochem Kossen , 2007. ----# Marvin Vek, 2008 ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6.1\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-07-12 13:01+0200\n" ----"Last-Translator: Marvin Vek\n" ----"Language-Team: Dutch \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Ongeldige actie \"%s\" gevraagd. Deze actie bestaat niet" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Converteren van het pad \"%s\" vanuit utf8 mislukt" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Uitvoeren van \"%s\" mislukt: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Termineren..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Reageert Niet" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Ga hierheen..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Beheer bureaubladen" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Voeg nieuw bureaublad toe" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "V_erwijder laatste bureaublad" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Vensters" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Bureaubladen" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Alle bureaubladen" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Laag" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Altijd _bovenop" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normaal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Altijd _onderop" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Verplaats _naar bureaublad" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Venster menu" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Herstellen" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Verplaatsen" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "_Grootte aanpassen" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "_Iconificeren" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "_Maximaliseren" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Op/neerklappen" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "_Vensterrand weghalen/toevoegen" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Sluiten" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Ongeldige knop \"%s\" gespecificeerd in het configuratiebestand" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflict met toetsenbinding in het configuratiebestand" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Het vinden van een geldig menubestand \"%s\" is mislukt" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Uitvoeren mislukt van het commando \"%s\" voor pipe-menu: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Ongeldige uitvoer van pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Toegang gevraagd tot menu \"%s\" maar het bestaat niet" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Meer..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Ongeldige knop \"%s\" in muis binding" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Ongeldige context \"%s\" in muis binding" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Pad instellen mislukt naar de thuismap \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Scherm van de DISPLAY omgevingsvariabele te openen mislukt." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Initialiseren van de obrender bibliotheek mislukt." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server ondersteunt locale niet" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Kan de locale bepaling van de X server niet instellen" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Kon geen geldig configuratiebestand vinden, simpele standaardinstellingen " ----"worden gebruikt" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Thema laden mislukt." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Uitvoeren van nieuw programma \"%s\" tijdens herstart miskukt: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [opties]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opties:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Toon deze helptekst en sluit af\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Toon versie en sluit af\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Vervang de huidig draaiende window manager\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ----" --config-file FILE Specificeer het pad naar het te gebruiken " ----"configuratiebestand\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Verbinding met de sessiebeheerder uitschakelen\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Berichten worden naar een draaiende Openbox instantie gestuurd:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Openbox configuratie opnieuw laden\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Herstart Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Openbox afsluiten\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debugging opties:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Start in synchrone modus\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Debuguitvoer weergeven\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Debug uitvoer voor focusafhandeling weergeven\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Splits het scherm in nep xinerama schermen\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Gelieve bugs te melden bij %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file vereist een argument\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Onbekende optie \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Er draait al een window manager op scherm %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Kon window manager selectie op scherm %d niet verkrijgen" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "De window manager op scherm %d sluit zichzelf niet af" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox is geconfigureerd voor %d bureaubladen, maar de huidige sessie heeft " ----"%d. Overnemen van de Openbox configuratie." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "bureaublad %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Kan map \"%s\" niet aanmaken: %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Kan de sessie niet opslaan naar \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Fout tijdens het opslaan van de sessie naar \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Starten %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Ongeldige modificatietoets \"%s\" in toetsen-/muisbinding" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Ongeldige toetscode \"%s\" in toetsenbinding" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Ongeldige toetsnaam \"%s\" in toetsenbinding" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Aangevraagde toets \"%s\" bestaat niet op het scherm" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X Fout: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Ongeldig gebruik van actie \"%s\". Actie wordt genegeerd." diff --cc po/no.po index 5899cb55,5899cb55,5899cb55,5899cb55..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/no.po +++ /dev/null @@@@@ -1,425 -1,425 -1,425 -1,425 +1,0 @@@@@ ----# Norwegian messages for openbox ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the openbox package. ----# ----# Michael Kjelbergvik Thung , 2008. ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-29 13:37+0100\n" ----"Last-Translator: Michael Kjelbergvik Thung \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Ugyldig operasjon \"%s\" etterspurt. Operasjonen finnes ikke." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Feil ved konvertering av \"%s\" fra utf8 " ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Kunne ikke kjøre \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Dreper..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Svarer Ikke" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "GÃ¥ dit..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Behandle skrivebord" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Nytt skrivebord" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Fjern siste skrivebord" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Vinduer" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Skrivebord" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Alle skrivebord" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "La_g" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Alltid ø_verst" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "Nor_mal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Alltid _nederst" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Send til" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Klient-meny" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Tilbak_estill" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Flytt" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Endre s_tørrelse" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "_Minimer" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximer" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Rull opp/ned" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Fjern/Legg til _dekorasjon" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Lukk" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Ugyldig tast \"%s\" spesifisert i konfigurasjonsfilen" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Kan ikke finne en gyldig menyfil \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Kunne ikke kjøre kommando for pipe-meny \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Ugyldig utdata fra pipe-menyen \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Forsøkte Ã¥ Ã¥pne menyen \"%s\", men denne finnes ikke" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Mer..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Ugyldig knapp \"%s\" i binding for mus" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Ugyldig innhold \"%s\" i binding for mus" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Kan ikke endre til hjemmekatalogen \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Kunne ikke Ã¥pne displayet fra DISPLAY-miljøvariabelen" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Kunne ikke starte obrender-biblioteket." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X-serveren støtter ikke lokalisering." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Kan ikke laste et tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Restart kunne ikke starte nytt program \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [alternativer\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Alternativ:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Vise denne hjelpeteksten og avslutt\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Vis versjonsnummeret og avslutt\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Erstatt den kjørende vindusbehandleren\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Deaktiver tilkobling til sesjonsbehandleren\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Sender beskjeder til en kjørende Openbox-instans:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Oppdater Openbox' konfigurasjon\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Start Openbox pÃ¥ nytt\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Avslutt Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debug-alternativ:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Kjør i synkron-modus\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Vis debuggingsinformasjon\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Vis debuggingsinformasjon for fokus-hÃ¥ndtering\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " -debug-xinerama Splitt displayet for falske xinerama-skjermer\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Vennligst rapporter bugs til %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Ugyldig kommandolinje-argument \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "En vindusbehandler kjører allerede pÃ¥ skjerm %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Kunne ikke hendte vindusbehandlerens markering pÃ¥ skjerm %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Vindusbehandleren pÃ¥ skjerm %d vil ikke avslutte" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox er innstillt til %d skrivebord, men nÃ¥værende sesjon har %d. " ----"Benytter sesjonens innstilling." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "skrivebord %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Kan ikke lage katalog \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Kan ikke lagre sesjon til \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Feil ved lagring av sesjon til \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Kjører %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Ugyldig modifikasjonsknapp \"%s\" i binding for tast/mus" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Ugyldig tastekode \"%s\" i hurtigtastbinding" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Ugyldig tastenavn \"%s\" i hurtigtastbinding" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Ønsket tast \"%s\" eksisterer ikke i displayet" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Feil i X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Ugyldig bruk av aksjonen \"%s\". Aksjonen vil bli ignorert." diff --cc po/openbox.pot index 0845175a,0845175a,0845175a,0845175a..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/openbox.pot +++ /dev/null @@@@@ -1,413 -1,413 -1,413 -1,413 +1,0 @@@@@ ----# SOME DESCRIPTIVE TITLE. ----# Copyright (C) YEAR Dana Jansens ----# This file is distributed under the same license as the PACKAGE package. ----# FIRST AUTHOR , YEAR. ----# ----#, fuzzy ----msgid "" ----msgstr "" ----"Project-Id-Version: PACKAGE VERSION\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ----"Last-Translator: FULL NAME \n" ----"Language-Team: LANGUAGE \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=CHARSET\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "" ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr "" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr "" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr "" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr "" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/pl.po index a17cd27f,a17cd27f,a17cd27f,a17cd27f..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/pl.po +++ /dev/null @@@@@ -1,428 -1,428 -1,428 -1,428 +1,0 @@@@@ ----# Polish translation of Openbox 3. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the Openbox 3 package. ----# Madej , 2004. ----# Paweł Rusinek , 2007. ----# Piotr Drąg , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-07-14 00:43+0200\n" ----"Last-Translator: Piotr Drąg \n" ----"Language-Team: Polish \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Nie można przekonwertować ścieżki \"%s\" z UTF-8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Wykonanie \"%s\" nie powiodło się: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Przejdź..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Zarządzaj pulpitami" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "Dod_aj nowy pulpit" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Usuń ostatni pulpit" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Okna" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Pulpity" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Wszystkie pulpity" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Warstwa" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Zawsze na _wierzchu" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normalnie" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Zawsze pod _spodem" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Wyślij na p_ulpit" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu klienta" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "P_rzywróć" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Przesuń" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Zmień _rozmiar" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Zmi_nimalizuj" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Zma_ksymalizuj" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Zwiń/Rozwiń" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Wyświetl/ukryj _dekoracje" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Z_amknij" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Nieprawidłowy klawisz \"%s\" określony w pliku konfiguracyjnym" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt skrótów klawiszowych w pliku konfiguracyjnym" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Nie można znaleźć prawidłowego pliku menu \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Wykonanie polecenia dla pipe-menu \"%s\" nie powiodło się: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Nieprawidłowe wyjście z pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Spróbowano uzyskać dostęp do menu \"%s\", ale ono nie istnieje" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Więcej..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Nieprawidłowy klawisz \"%s\" w skrócie myszy" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Nieprawidłowy kontekst \"%s\" w skrócie myszy" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Nie można przejść do katalogu domowego \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Otwarcie ekranu ze zmiennej środowiskowej DISPLAY nie powiodło się." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Zainicjowanie biblioteki obrender nie powiodło się." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Serwer X nie obsługuje ustawień lokalnych." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Nie można znaleźć prawidłowego pliku konfiguracyjnego, używanie " ----"domyślnychwartości" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Nie można wczytać motywu." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"Wykonanie nowego pliku wykonywalnego \"%s\" podczas ponownego " ----"uruchomienianie powiodło się: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Składnia: openbox [opcje]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opcje:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Wyświetla tę pomoc i kończy\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Wyświetla wersję i kończy\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Zastępuje aktualnie działający menedżer okien\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Nie tworzy połączenia z menedżerem sesji\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Przekazywanie komunikatów do działającej instancji Openboksa:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Ponownie wczytuje pliki konfiguracyjne\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Ponownie uruchamia Openboksa\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opcje debugowania:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Uruchamia w trybie synchronicznym\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Wyświetla informacje o debugowaniu\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Wyświetla wyjście debugowania obsługi aktywacji\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Dzieli ekran na sztuczne ekrany xineramy\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Nieprawidłowy argument wiersza poleceń \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Menedżer okien jest już uruchomiony na ekranie %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Menedżer okien na ekranie %d nie kończy działania" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "pulpit %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Nie można utworzyć katalogu \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Nie można zapisać sesji do \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Wystąpił błąd podczas zapisywania sesji do \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Uruchamianie %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"Nieprawidłowy klawisz modyfikatora \"%s\" w skrócie klawiszowym lub myszy" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Nieprawidłowy kod \"%s\" w skrócie klawiszowym" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Nieprawidłowa nazwa \"%s\" w skrócie klawiszowym" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Żądany klawisz \"%s\" nie istnieje na ekranie" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Błąd X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/pt.po index 15886410,15886410,15886410,15886410..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/pt.po +++ /dev/null @@@@@ -1,428 -1,428 -1,428 -1,428 +1,0 @@@@@ ----# Portuguese messages for openbox ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Gonçalo Ferreira , 2006. ----# Althaser , 2008. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-22 22:17+0100\n" ----"Last-Translator: Althaser \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=ISO-8859-1\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Pedido de acção \"%s\" inválido. Não existem quaisquer acções." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Falha a converter o caminho \"%s\" do utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Falha a executar \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Terminando..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Não está a responder" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Ir para..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Gerir áreas de trabalho" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Adicionar nova área de trabalho" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Remover a última área de trabalho" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Janelas" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Áreas de trabalho" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Todas as áreas de trabalho" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Camada" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Sempre em _cima" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Sempre no _fundo" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Enviar para área de _trabalho" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu de clientes" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "R_estaurar" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mover" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Redimen_sionar" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimizar" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximizar" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Des/en_rolar" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "Des/_Decorar" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Fechar" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Botão inválido \"%s\" especificado no ficheiro de configuração" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflito com tecla de atalho no ficheiro de configuração" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Incapaz de encontrar um ficheiro de menu válido \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Falha no comando de execução para o menu de processamento \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Resultado inválido do menu de processamento \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Tentei aceder ao menu \"%s\" mas ele não existe" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Mais..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Botão inválido \"%s\" no atalho do rato" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Contexto inválido \"%s\" no atalho do rato" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Incapaz de mudar para o directório home \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Falha a abrir o ecrã pela variável de ambiente DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Falha a inicializar a biblioteca obrender" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "O servidor X não suporta o locale." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Não pode definir locales modificados para o servidor X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Incapaz de encontrar um ficheiro de configuração válido, usando algumas " ----"configurações simples de omissão" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Incapaz de carregar o tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Falha a reiniciar a execução de um novo executável \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Direitos de autor (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintaxe: openbox [opções]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opções:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Mostra este help e sai\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Mostra a versão e sai\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Substitui o corrente gestor de janelas\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Desactiva a ligação com o gestor de sessões\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Passando mensagens para a solicitação do Openbox em execução\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Recarrega a configuração do Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Reinicia o Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --saida Sai do Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opções de depuração\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Executa em modo sincronizado\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Mostra o resultado da depuração\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Mostra o resultado da depuração para manipulação em " ----"foco\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Divide o ecrã em falsos ecrãs xinerama\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Por favor reporte erros em %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Argumento inválido na linha de comandos \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "O gestor de janelas já está em execução no ecrã %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "O gestor de janelas no ecrã %d não está a fechar" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "área de trabalho %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Incapaz de criar o directório \"%s\": %s " ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Incapaz de guardar a sessão em \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Erro enquanto guardava a sessão em \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Executando %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Chave modificadora \"%s\" inválida no atalho de tecla/rato" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Código de chave \"%s\" inválido na tecla de atalho" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Nome de chave \"%s\" inválido na tecla de atalho" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Chave pedida \"%s\" não existe no ecrã" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Erro no X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Uso inválido da acção \"%s\". A acção será ignorada." diff --cc po/pt_BR.po index a9101453,a9101453,a9101453,a9101453..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/pt_BR.po +++ /dev/null @@@@@ -1,433 -1,433 -1,433 -1,433 +1,0 @@@@@ ----# Portuguese Brazil (pt_BR) messages for openbox ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# crimeboy, 2007. ----# Og Maciel , 2007, 2008. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-22 21:42+0100\n" ----"Last-Translator: Og Maciel \n" ----"Language-Team: Brazilian Portuguese \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=2; plural=(n > 1);\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Ação inválida \"%s\" requisitada. Ação não existe." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Falha ao converter o caminho \"%s\" do utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Falha ao executar \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Terminando..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Não Responsivo" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Ir lá..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Gerenciar áreas de trabalho" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Adicionar nova área de trabalho" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Remover última área de trabalho" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Janelas" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Áreas de trabalho" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Todas as áreas de trabalho" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Camada" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Sempre no _topo" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Sempre no _fundo" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Enviar para área de _trabalho" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu do cliente" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "R_estaurar" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Mover" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Redimen_sionar" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimizar" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximizar" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "(Des)en_rolar" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "(Não) _Decorar" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "_Fechar" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Botão inválido \"%s\" especificado no arquivo de configuração" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Conflito com associação de chave no arquivo de configuração" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Não foi possível encontrar um arquivo de menu \"%s\" válido" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Falha ao executar comando para menu de processamento \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Saída inválida do menu de processamento \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Tentou acessar menu \"%s\" mas ele não existe" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Mais.." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Botão inválido \"%s\" na associação do mouse" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Contexto \"%s\" inválido na associação do mouse" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Não foi possível mudar para o diretório pessoal \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Falha ao iniciar a biblioteca obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "Servidor X não suporta localização." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "" ----"Não foi possível configurar modificadores de localização para o servidor X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Não foi possível encontrar um arquivo de configuração válido, usando alguns " ----"valores padrão simples." ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Não foi possível carregar um tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "O comando de reiniciar falhou ao executar novo executável \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Sintaxe: openbox [opções]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Opções:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Mostra esta ajuda e sai\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Mostra a versão e sai\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Substitui o gerenciador de janelas ativo\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr "" ----" --sm-disable Desabilita conexão com o gerenciador de sessões\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Passando mensagens para uma instância do Openbox em execução:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Recarrega a configuração do Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Reinicia o Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Sai do Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Opções de depuração:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Executa em modo sincronizado\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Mostra saida de depuração\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Mostra saída de depuração para manipulação de foco\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr "" ----" --debug-xinerama Divide a exibição de telas em telas de xinerama " ----"falsas\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Por favor reporte erros em %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Argumento de linha de comando inválido \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Um gerenciador de janelas já está em execução na tela %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "" ----"Não foi possível adquirir a seleção do gerenciador de janelas na tela %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "O gerenciador de janelas na tela %d não está saindo" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "área de trabalho %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Não foi possível criar o diretório \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Não foi possível salvar a sessão em \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Erro enquanto salvando a sessão em \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Executando %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Chave modificadora \"%s\" inválida na associação de tecla/mouse" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Código chave \"%s\" inválido na associação de chave" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Nome de chave \"%s\" inválido na associação de chave" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Chave requerida \"%s\" não existe na tela" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Erro no X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Uso inválido da ação \"%s\". Ação será ignorada." diff --cc po/ru.po index 8acfdf1a,8acfdf1a,8acfdf1a,8acfdf1a..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/ru.po +++ /dev/null @@@@@ -1,425 -1,425 -1,425 -1,425 +1,0 @@@@@ ----# Russian translation of Openbox ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Alexey Remizov , 2004. ----# Nikita Bukhvostov , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-22 07:56+0100\n" ----"Last-Translator: Nikita Bukhvostov \n" ----"Language-Team: Russian \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Запрошенное действие \"%s\" не найдено." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Не удалось сконвертировать путь \"%s\" из utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Не удалось запустить \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Завершение..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Не отвечает" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Перейти..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Управление рабочими столами" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Добавить новый рабочий стол" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Удалить последний рабочий стол" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Окна" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Рабочие столы" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Все рабочие столы" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "Слой(_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Поверх всех окон(_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "Обычное поведение(_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Под всеми окнами(_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Отправить на рабочий стол(_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Меню клиентов" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Восстановить(_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Переместить(_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Изменить размер(_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Свернуть(_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Развернуть(_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Скрутить/Раскрутить(_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "(От)декорировать(_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Закрыть(_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Некорректная клавиша \"%s\" упомянута в конфигурационном файле" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Конфликт привязок клавиш в конфигурационном файле" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Не могу найти корректный файл меню \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Не могу запустить команду pipe-меню \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Некорректный вывод pipe-меню \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Попытка доступа к несуществующему меню \"%s\"." ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Больше..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Некорректная кнопка \"%s\" в привязке мыши" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Некорректный контекст \"%s\" в привязке мыши" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Не могу перейти в домашнюю директорию \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Не могу открыть экран из переменной окружения DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Не могу инициализировать библиотеку obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X-сервер не поддерживает локали." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Не могу установить модификаторы локали X-сервера." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Не могу найти корректный конфигурационный файл, использую значения по-" ----"умолчанию" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Не могу загрузить тему." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "При перезапуске не удалось запустить исполняемый файл \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Синтаксис: openbox [параметры]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Параметры:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Показать эту справку и выйти\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Показать версию и выйти\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Заменить текущий менеджер окон\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Не соединяться с менеджером сессий\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Передаю сообщения запущенной инстанции Openbox:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Перезагрузить конфигурацию Openbox\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Перезапустить Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Выход из Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Отладочные параметры:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Запустить в синхронном режиме\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Отображать отладочную информацию\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Отображать отладочную информацию об управлении " ----"фокусом\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Разбить экран на фальшивые экраны xinerama\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Пожалуйста, сообщайте об ошибках на %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Некорректный командный параметр \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "На экране %d уже запущен менеджер окон" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Не могу получить выбор менеджера окон на экране %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Менеджер окон на экране %d не завершается" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "рабочий стол %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Невозможно создать каталог \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Не могу сохранить сессию в \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Ошибка при сохранении сессии в \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Запущен %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Некорректное название модификатора \"%s\" в привязке клавиши/мыши" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Некорректный код клавиши \"%s\" в привязке" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Некорректное название клавиши \"%s\" в привязке" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Запрошенная клавиша \"%s\" не существует на экране" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Ошибка X-сервера: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" diff --cc po/sk.po index 19daf5e9,19daf5e9,19daf5e9,19daf5e9..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/sk.po +++ /dev/null @@@@@ -1,427 -1,427 -1,427 -1,427 +1,0 @@@@@ ----# Translation of openbox.pot to Slovak. ----# Copyright (C) 2006 Mikael Magnusson ----# This file is distributed under the same license as the Openbox 3 package. ----# Jozef Říha , 2006, 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox-3.4.3\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n" ----"Last-Translator: Jozef Riha \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Vyžiadaná neplatná akcia \"%s\". Takáto akcia neexistuje." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Nepodarilo sa skonvertovaÅ¥ cestu \"%s\" z utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Nepodarilo sa spustiÅ¥ \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "PrejsÅ¥ na..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Správa plôch" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_PridaÅ¥ novú plochu" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_OdstrániÅ¥ poslednú plochu" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Okná" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Plochy" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "VÅ¡etky plochy" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Vrstva" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Vždy _navrchu" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "Nor_málna" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Vždy _dole" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_PoslaÅ¥ na plochu" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Menu klienta" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_ObnoviÅ¥" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Pre_sunúť" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Z_mena veľkosti" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Do iko_ny" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximalizovaÅ¥" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Ro/_Zvinúť" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "(Ne)_DekorovaÅ¥" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Z_avrieÅ¥" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Neplatné tlačidlo \"%s\" Å¡pecifikované v konfiguračnom súbore" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt priradenie klávesov v konfiguračnom súbore" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Nepodarilo sa nájsÅ¥ platný súbor menu \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Nepodarilo sa spustiÅ¥ príkaz pre pipe-menu \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Neplatný výstup z pipe-menu \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Pokus o sprístupnenie menu \"%s\", ale to neexistuje" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Viac..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Neplatné tlačidlo \"%s\" v priradení myÅ¡i" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Neplatný kontext \"%s\" v priradení myÅ¡i" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Nepodarilo sa prejsÅ¥ do domovského adresára \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Nepodarilo sa otvoriÅ¥ displej z premennej prostredia DISPLAY" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Nepodarilo sa inicializovaÅ¥ knižnicu obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X server nepodporuje locale." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Nemôžem nastaviÅ¥ locale pre X server." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Nepodarilo sa nájsÅ¥ platný konfiguračný súbor, použijem jednoduché " ----"implicitné nastavenia" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Nepodarilo sa nahraÅ¥ tému." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "ReÅ¡tart zlyhal pri spúšťaní novej binárky \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [volby]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Volby:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Zobrazi tuto napovedu a skonci\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Zobrazi cislo verzie a skonci\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Nahradi momentalne beziace sedenie window manazera\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Vypne spojenie k manazerovi sedenia\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Predavanie sprav beziacej instancii Openboxu:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Opatovne nacita konfiguraciu Openboxu\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Restartuje Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Volby ladenia:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Spustit v synchronnom mode\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Zobrazit ladiaci vystup\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Zobrazit ladiaci vystup pre manipulaciu s fokusom\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Rozdelit displej na neprave obrazovky xineramy\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Prosim hlaste chyby na %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Neplatny parameter prikazoveho riadku \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "Okenny manazer uz bezi na obrazovke %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Nepodarilo sa získaÅ¥ výber okenného manažéra na obrazovke %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Okenný manažér na obrazovke %d sa neukončuje" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "plocha %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Nebolo možné vytvoriÅ¥ adresár \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Nepodarilo sa uložiÅ¥ sedenie \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Chyba pri ukladaní sedenia do \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Spúšťam %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Neplatný kláves pre modifikátor \"%s\" v priradení klávesov/myÅ¡i" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Neplatný kód klávesu \"%s\" v priradení klávesov" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Neplatný názov klávesu \"%s\" v priradení klávesov" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Požadovaný kláves \"%s\" na displeji neexistuje" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Chyba X: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Neplatné použitie akcie \"%s\". Akcia bude ignorovaná." diff --cc po/sv.po index 0548ac67,0548ac67,0548ac67,0548ac67..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/sv.po +++ /dev/null @@@@@ -1,431 -1,431 -1,431 -1,431 +1,0 @@@@@ ----# Swedish messages for openbox ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Mikael Magnusson , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6.1\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-27 04:53+0100\n" ----"Last-Translator: Mikael Magnusson \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=iso-8859-1\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Ogiltig action \"%s\" efterfrågades, men den finns inte." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "Nej" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "Ja" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Lyckades inte konvertera sökvägen \"%s\" från utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Kunde inte exekvera \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "Namnlöst Fönster" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Dödar..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Svarar Inte" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ----"Fönstret \"%s\" verkar inte svara. Vill du tvinga det att avslutas genom " ----"att skicka signalen %s?" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "Avsluta Process" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ----"Fönstret \"%s\" verkar inte svara. Vill du stänga dess anslutning till X-" ----"servern?" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "Stäng Anslutning" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "Avbryt" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Gå dit..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Hantera skrivbord" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Lägg till nytt skrivbord" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Ta bort sista skrivbordet" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Fönster" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Skrivbord" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Alla skrivbord" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "_Lager" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Alltid ö_verst" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Normal" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Alltid _underst" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "_Skicka till skrivbord" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Klientmeny" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Åt_erställ" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "_Flytta" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Ändra s_torlek" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Mi_nimera" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Ma_ximera" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Rulla upp/ner" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "_Dekorationer" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Stän_g" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Ogiltig knapp \"%s\" angiven i konfigurationsfilen" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Konflikt med annan tangentbindning i konfigurationsfilen" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Kunde inte hitta en giltig menyfil \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Misslyckades att köra kommando för pipe-menyn \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Ogiltig utdata från pipe-menyn \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Försökte öppna menyn \"%s\", men den finns inte" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Mer..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Ogiltig knapp \"%s\" i musbindning" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Ogiltig kontext \"%s\" i musbindning" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Kunde inte gå till hemkatalogen \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Kunde inte öppna en display från miljövariabeln DISPLAY." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Kunde inte initialisera obrender-biblioteket." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X-servern stödjer inte lokalisering." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Kan inte sätta lokaliseringsmodifierare för X-servern." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Kunde inte hitta en giltig konfigurationsfil, använder enkla standardvärden" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Kunde inte ladda ett tema." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Restart misslyckades att starta nytt program \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Copyright (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Syntax: openbox [alternativ]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Alternativ:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Visa den här hjälpen och avsluta\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version Visa versionen och avsluta\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Ersätt den befintliga fönsterhanteraren\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ----" --config-file FIL Ange sökvägen till konfigurationsfil att använda\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Avaktivera anslutning till sessionshanteraren\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Skicka meddelanden till en exekverande instans av Openbox:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Ladda om Openbox konfiguration\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Starta om Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Avsluta Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debug-alternativ:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Kör i synkroniserat läge\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Visa debuginformation\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus Visa debuginformation för fokushantering\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Dela skärmen i simulerade xinerama-skärmar\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Rapportera buggar till %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file kräver ett argument\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Ogiltigt kommandoradsargument \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "En fönsterhanterare körs redan på skärm %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Kunde inte erhålla fönsterhanterarmarkeringen på skärm %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Fönsterhanteraren på skärm %d avslutar inte" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox är inställt på %d skrivbord, men nuvarande session har %d. Använder " ----"sessionens inställning." ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "skrivbord %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Kunde inte skapa katalogen \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Kunde inte spara sessionen till \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Fel inträffade när sessionen skulle sparas till \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Kör %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Ogiltig modifikationstangent \"%s\" i tangent-/musbindning" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Ogiltig tangentkod \"%s\" i tantentbindning" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Ogiltigt tangentnamn \"%s\" i tangentbindning" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Efterfrågad tangent \"%s\" finns inte på displayen" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X-fel: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "OK" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Ogiltigt användande av action \"%s\", den kommer ignoreras." diff --cc po/ua.po index f34dc7fb,f34dc7fb,f34dc7fb,f34dc7fb..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/ua.po +++ /dev/null @@@@@ -1,428 -1,428 -1,428 -1,428 +1,0 @@@@@ ----# Ukrainian translation for Openbox. ----# Copyright (C) 2007 Dmitriy Moroz ----# This file is distributed under the same license as the openbox package. ----# Dmitriy Moroz , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.2\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2007-06-16 13:02+0200\n" ----"Last-Translator: Dmitriy Moroz \n" ----"Language-Team: Ukrainian \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=utf-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Здійснено запит на некоректну дію \"%s\". Нема такої дії." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Не вдалося сконвертувати шлях \"%s\" з utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Невдалося виконати \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "" ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Перейти...." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Вікна" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Стільниці" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Всі стільниці" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "Шар(_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Зверху всіх вікон(_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "Звичайне положення(_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Знизу всіх вікон(_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Відправити на стільницю(_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Меню клієнтів" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "Відновити(_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Перемістити(_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Змінити розмір(_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Згорнути(_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Розгорнути(_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "Скрутити/Розкрутити(_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "(Від)декорувати(_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Закрити(_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Некоректна клавіша \"%s\" вказана у файлі конфігурації" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Конфлікт прив'язки клавіш у файлі конфігурації" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Не вдалося знайти коректний файл меню \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Не вдалося виконати команду для pipe-меню \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Некоректний вивід з pipe-меню \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Спроба доступа до меню \"%s\" якого не існує" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Більше..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Некоректна клавіша \"%s\" в прив'язці клавіш мишки" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Некоректний контекст \"%s\" в прив'зці клавіш мишки" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Не вдалося перейти в домашню директорію \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Не вдалося ініцаілізувати бібліотеку obrender" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X-сервер не підтримує локалі" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Не можу встановити модифікатори локалі для X-сервера" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "" ----"Не вдалося знайти коректний файл конфігурації, використовую стандартні " ----"налаштування" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Не вдалося загрузити стиль" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "" ----"При перезавантаженні не вдалося виконати новий виконуваний файл \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Авторські права (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Синтакс: openbox [параметри]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Параметри:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help Показати цю справку і вийти\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --vesrion Показати версію і вийти\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace Замінити поточний менеджер вікон\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Не з'єднуватися з сесійним менеджером\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Передаю повідомлення процесу Openbox що виконується\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Перезапустити Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr "" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Налагоджувальні параметри\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Запустити в синхронному режимі\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug Показувати інформацію налагоджування\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus Показувати інформацію налагоджування для уравління\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Будь-ласка, повідомляйте про помилки на %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Некоректний командний аргумент \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "На дисплеї %d вже запущений менеджер вікон" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "Менеджео вікон на дисплеї %d не завершується" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "стільниця %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Не вдалося створити директорію \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Не вдалося зберегти сесію в \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "Помилка при збереженні сесії в \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Виконується %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "" ----"Некоректна назва модифікатору \"%s\" у прив'язці клавіш клавіатури/мишки" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Некоректний код клавіши \"%s\" у прив'зці клавіш" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Некоректна назва клавіши \"%s\" у прив'язці клавіш" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Клавіша \"%s\" на яку здійснено запит - не існує на дисплеї" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "Помилка X-серверу: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Некоректне викристання дії \"%s\". Дія буде проігнорована." diff --cc po/vi.po index a45bdc75,a45bdc75,a45bdc75,a45bdc75..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/vi.po +++ /dev/null @@@@@ -1,425 -1,425 -1,425 -1,425 +1,0 @@@@@ ----# Vietnamese messages for Openbox. ----# Copyright (C) 2007 Dana Jansens ----# This file is distributed under the same license as the Openbox package. ----# Quan Tran , 2007. ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-17 23:08+0100\n" ----"Last-Translator: Quan Tran \n" ----"Language-Team: None\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=utf-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "Hành động \"%s\" làm không được. Hành động đó không có." ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "Không thể chuyển chỗ \"%s\" từ utf8" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "Làm không được \"%s\": %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "Đang giết..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "Không phản ứng" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "Đi đến chỗ đó" ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "Quản lý chỗ làm việc" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "_Cộng thêm chỗ làm việc" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "_Bỏ lát chỗ làm việc" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "Cá»­a sổ" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "Chỗ làm việc" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "Tất cả chỗ làm việc" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "Lớ_p" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "Luôn luôn ở _trên" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "_Bình thường" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "Luôn luôn ở _dưới" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "Gá»­i đến chỗ làm _việc" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "Khách thá»±c đơn" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "_Hoàn lại" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "Chu_yển đi" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "Làm _nhỏ hÆ¡n/lớn hÆ¡n" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "Biến _xuống" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "Biến _lớn nhất" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "_Cuốn lên/xuống" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "_Trang/Không Trang trí" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "Đón_g" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "Sai nút \"%s\" ở trong hình thể" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "Xung đột với chữ trói ở trong hình thể" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "Không có thể tìm vững chắc thá»±c đơn \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "Không có thể chạy lệnh cho ống-thá»±c đơn \"%s\": %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "Vô hiệu sản xuất của ống-thá»±c đơn \"%s\"" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "Thá»­ mở thá»±c đơn \"%s\" nhÆ°ng mà cái đó không có" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "Thêm nữa" ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "Vô hiệu nút \"%s\" ở trong máy chuột đặt" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "Vô hiệu văn cảnh \"%s\" ở trong chuột đặt" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "Không thể đổi đến chỗ nhà \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "Không mở hình từ DISPLAY được." ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "Không mở được thÆ° viện obrender." ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "ChÆ°Æ¡ng trình X không có locale cho tiếng nay." ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "Không thể dùng locale cho chÆ°Æ¡ng trình X." ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "Không thể đọc theme." ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "Bắt đầu lại hỏng mở được executable mới \"%s\": %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "Bản quyền (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "Cách dùng: openbox [chọn lá»±a]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"Chọn lá»±a:\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help TrÆ°ng bày giúp đỡ này và đi ra\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version TrÆ°ng bày số của chÆ°Æ¡ng trình và đi ra\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr "" ----" --replace Thay thế chÆ°Æ¡ng trình quản lý cá»­a sổ cho đến openbox\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable Tắt liên lạc đến session quản lý\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"Đưa thông báo cho chÆ°Æ¡ng trình Openbox:\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure Bắt đầu lại Openbox's hình thể\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart Bắt đầu lại Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit Đi ra Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"Debugging chọn lá»±a:\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync Chạy trong cách thức synchronous\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug TrÆ°ng bày debugging đoàn chữ\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr "" ----" --debug-focus TrÆ°ng bày debugging đoàn chữ cho điều khiển tập trung\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama Tách trÆ°ng bày vào giả xinerama màn\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"Làm Æ¡n báo cáo bugs ở chỗ %s\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "Mệnh lệnh viết sai \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ khác đang chạy trên màn hình %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "Không thể lấy được chÆ°Æ¡ng trình quản lý cá»­a sổ ở trên màn hình %d" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ trên màn hình %d không đi ra" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "chỗ làm việc %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "Không thể chế directory \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "Không thể tiết kiệm thời kỳ cho \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "BÄ© trục chật lúc tiết kiệm thời kỳ cho \"%s\": %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "Đan Chạy %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "Vô hiệu Modifier key \"%s\" ở chỗ máy keyboard/chuột đặt" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "Vô hiệu key mã \"%s\" ở chỗ key đặt" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "Vô hiệu key tên \"%s\" ở chỗ key đặt" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "Yêu cầu key \"%s\" không có ở chỗ màn hình" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X trục chật: %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "Sá»± dùng hành động \"%s\" sai rồi. Không làm hành động đó." diff --cc po/zh_CN.po index 0913aab4,0913aab4,0913aab4,0913aab4..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/zh_CN.po +++ /dev/null @@@@@ -1,424 -1,424 -1,424 -1,424 +1,0 @@@@@ ----# 简体中文 / Simplified Chinese Messages for openbox. ----# Copyright (C) 2007 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# ----# Xiaoyu PENG , 2007. ----# Shaodong Di , 2008. ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.5\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-01-18 15:02+0100\n" ----"Last-Translator: Shaodong Di \n" ----"Language-Team: 简体中文\n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "请求的动作 \"%s\" 无效。该动作不存在。" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "从 utf8 转换路径 \"%s\" 时失败" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "执行 \"%s\" 时失败: %s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "杀死中..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "无响应" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "跳转到..." ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "管理桌面" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "添加新桌面(_A)" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "移除最后一个桌面(_R)" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "窗口" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "桌面" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "所有桌面" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "层(_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "总在最上层(_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "常规(_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "总在最底层(_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "发送到桌面(_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "客户端菜单" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "还原(_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "移动(_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "调整大小(_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "最小化(_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "最大化(_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "卷起/放下(_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "去除装饰(_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "关闭(_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "配置文件中指定的按钮 \"%s\" 无效" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "配置文件中的组合键冲突" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "无法找到有效的菜单文件 \"%s\"" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "执行管道菜单的命令 \"%s\" 时失败: %s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "管道菜单 \"%s\" 的输出无效" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "尝试读取菜单 \"%s\"，但是它不存在" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "更多..." ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "鼠标绑定中的无效按键 \"%s\"" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "鼠标绑定中无效的上下文 \"%s\"" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "无法切换到主目录 \"%s\": %s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "在打开DISPLAY环境变量所指定的X显示时失败。" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "初始化obrender库时失败。" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X服务器不支持locale。" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "无法设置X服务器的locale修饰键。" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "无法找到有效的配置文件，使用一些简单的默认值" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "无法读入主题。" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "重新启动以执行新的可执行文件 \"%s\" 时失败: %s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "版权所有 (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "用法: openbox [选项]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"选项： \n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help 显示该帮助信息后退出\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version 显示版本号后退出\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace 替换当前运行的窗口管理器\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr "" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable 禁止连接到会话管理器\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"传递信息给运行中的 Openbox 实例：\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure 重新载入 Openbox 的配置\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart 重新启动 Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit 退出 Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"调试选项：\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync 在同步模式中运行\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug 显示调试输出\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus 显示焦点处理的调试输出\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama 分割显示到伪造的 xinerama 屏幕中\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"请向 %s 报告错误\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "无效的命令行参数 \"%s\"\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "已经有窗口管理器运行在屏幕 %d" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "在屏幕 %d 无法被选为窗口管理器" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "屏幕 %d 的窗口管理器没有退出" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "桌面 %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "无法创建目录 \"%s\": %s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "无法保存会话到 \"%s\": %s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "在保存会话到 \"%s\" 时出错： %s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "运行 %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "键盘/鼠标的绑定 \"%s\" 无效" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "按盘绑定中无效的键盘码 \"%s\"" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "按键绑定中无效的键名 \"%s\"" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "请求的按键 \"%s\" 在显示中不存在" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X 错误： %s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "使用的动作 \"%s\" 无效。动作将被忽略。" diff --cc po/zh_TW.po index ea423067,ea423067,ea423067,ea423067..00000000 deleted file mode 100644,100644,100644,100644 --- a/po/zh_TW.po +++ /dev/null @@@@@ -1,427 -1,427 -1,427 -1,427 +1,0 @@@@@ ----# Traditional Chinese Messages for openbox. ----# Copyright (C) 2006 Mikael Magnusson ----# This file is distributed under the same license as the openbox package. ----# Wei-Lun Chao , 2006, 07. ----# 洪任諭 , 2008 ----# ----msgid "" ----msgstr "" ----"Project-Id-Version: Openbox 3.4.6.1\n" ----"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" ----"POT-Creation-Date: 2008-02-27 21:03-0500\n" ----"PO-Revision-Date: 2008-02-17 23:29+0800\n" ----"Last-Translator: 洪任諭 \n" ----"Language-Team: Chinese (traditional) \n" ----"MIME-Version: 1.0\n" ----"Content-Type: text/plain; charset=UTF-8\n" ----"Content-Transfer-Encoding: 8bit\n" ----"Plural-Forms: nplurals=1; plural=0;\n" ---- ----#: openbox/actions.c:150 ----#, c-format ----msgid "Invalid action \"%s\" requested. No such action exists." ----msgstr "要求的動作「%s」無效。無此類動作存在。" ---- ----#: openbox/actions/execute.c:130 openbox/actions/exit.c:46 ----msgid "No" ----msgstr "否" ---- ----#: openbox/actions/execute.c:131 openbox/actions/exit.c:47 ----msgid "Yes" ----msgstr "是" ---- ----#: openbox/actions/execute.c:143 ----#, c-format ----msgid "Failed to convert the path \"%s\" from utf8" ----msgstr "轉換路徑「%s」自 utf8 時失敗" ---- ----#: openbox/actions/execute.c:152 openbox/actions/execute.c:171 ----#, c-format ----msgid "Failed to execute \"%s\": %s" ----msgstr "執行「%s」時失敗：%s" ---- ----#: openbox/actions/exit.c:50 ----msgid "Are you sure you want to exit Openbox?" ----msgstr "" ---- ----#: openbox/client.c:1996 ----msgid "Unnamed Window" ----msgstr "" ---- ----#: openbox/client.c:2010 openbox/client.c:2042 ----msgid "Killing..." ----msgstr "正在中止..." ---- ----#: openbox/client.c:2012 openbox/client.c:2044 ----msgid "Not Responding" ----msgstr "沒有回應" ---- ----#: openbox/client.c:3424 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to force it " ----"to exit by sending the %s signal?" ----msgstr "視窗「%s」似乎已經停止回應。 你想送出 \"%s\" 訊息強制結束程式嗎？" ---- ----#: openbox/client.c:3426 ----msgid "End Process" ----msgstr "" ---- ----#: openbox/client.c:3430 ----#, c-format ----msgid "" ----"The window \"%s\" does not seem to be responding. Do you want to disconnect " ----"it from the X server?" ----msgstr "視窗「%s」似乎已經停止回應。 你想從 X 伺服器將它斷線嗎？" ---- ----#: openbox/client.c:3432 ----msgid "Disconnect" ----msgstr "" ---- ----#: openbox/client.c:3435 ----msgid "Cancel" ----msgstr "" ---- ----#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 ----msgid "Go there..." ----msgstr "到那裏去…" ---- ----#: openbox/client_list_combined_menu.c:94 ----msgid "Manage desktops" ----msgstr "管理桌面" ---- ----#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 ----msgid "_Add new desktop" ----msgstr "加入新桌面(_A)" ---- ----#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 ----msgid "_Remove last desktop" ----msgstr "移除尾端桌面(_R)" ---- ----#: openbox/client_list_combined_menu.c:149 ----msgid "Windows" ----msgstr "視窗" ---- ----#: openbox/client_list_menu.c:203 ----msgid "Desktops" ----msgstr "桌面" ---- ----#: openbox/client_menu.c:257 ----msgid "All desktops" ----msgstr "所有桌面" ---- ----#: openbox/client_menu.c:361 ----msgid "_Layer" ----msgstr "層次(_L)" ---- ----#: openbox/client_menu.c:366 ----msgid "Always on _top" ----msgstr "最上層(_T)" ---- ----#: openbox/client_menu.c:367 ----msgid "_Normal" ----msgstr "一般(_N)" ---- ----#: openbox/client_menu.c:368 ----msgid "Always on _bottom" ----msgstr "最下層(_B)" ---- ----#: openbox/client_menu.c:371 ----msgid "_Send to desktop" ----msgstr "傳送到桌面(_S)" ---- ----#: openbox/client_menu.c:375 ----msgid "Client menu" ----msgstr "客戶端選單" ---- ----#: openbox/client_menu.c:385 ----msgid "R_estore" ----msgstr "還原(_E)" ---- ----#: openbox/client_menu.c:393 ----msgid "_Move" ----msgstr "移動(_M)" ---- ----#: openbox/client_menu.c:395 ----msgid "Resi_ze" ----msgstr "調整大小(_Z)" ---- ----#: openbox/client_menu.c:397 ----msgid "Ico_nify" ----msgstr "最小化(_N)" ---- ----#: openbox/client_menu.c:405 ----msgid "Ma_ximize" ----msgstr "最大化(_X)" ---- ----#: openbox/client_menu.c:413 ----msgid "_Roll up/down" ----msgstr "向上/向下捲動(_R)" ---- ----#: openbox/client_menu.c:415 ----msgid "Un/_Decorate" ----msgstr "開/關視窗裝飾(_D)" ---- ----#: openbox/client_menu.c:419 ----msgid "_Close" ----msgstr "關閉(_C)" ---- ----#: openbox/config.c:781 ----#, c-format ----msgid "Invalid button \"%s\" specified in config file" ----msgstr "在配置檔中指定的按鈕「%s」無效" ---- ----#: openbox/keyboard.c:157 ----msgid "Conflict with key binding in config file" ----msgstr "與配置檔中的按鍵組合衝突" ---- ----#: openbox/menu.c:103 openbox/menu.c:111 ----#, c-format ----msgid "Unable to find a valid menu file \"%s\"" ----msgstr "無法找到有效的選單檔案「%s」" ---- ----#: openbox/menu.c:171 ----#, c-format ----msgid "Failed to execute command for pipe-menu \"%s\": %s" ----msgstr "執行命令於管線選單「%s」時失敗：%s" ---- ----#: openbox/menu.c:185 ----#, c-format ----msgid "Invalid output from pipe-menu \"%s\"" ----msgstr "從管線選單「%s」的輸出無效" ---- ----#: openbox/menu.c:198 ----#, c-format ----msgid "Attempted to access menu \"%s\" but it does not exist" ----msgstr "試圖存取選單「%s」但是它不存在" ---- ----#: openbox/menu.c:368 openbox/menu.c:369 ----msgid "More..." ----msgstr "更多…" ---- ----#: openbox/mouse.c:373 ----#, c-format ----msgid "Invalid button \"%s\" in mouse binding" ----msgstr "與滑鼠組合的按鈕「%s」無效" ---- ----#: openbox/mouse.c:379 ----#, c-format ----msgid "Invalid context \"%s\" in mouse binding" ----msgstr "與滑鼠組合的上下文「%s」無效" ---- ----#: openbox/openbox.c:134 ----#, c-format ----msgid "Unable to change to home directory \"%s\": %s" ----msgstr "無法變更到主目錄「%s」：%s" ---- ----#: openbox/openbox.c:154 ----msgid "Failed to open the display from the DISPLAY environment variable." ----msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。" ---- ----#: openbox/openbox.c:185 ----msgid "Failed to initialize the obrender library." ----msgstr "初始化 obrender 函式庫時失敗。" ---- ----#: openbox/openbox.c:196 ----msgid "X server does not support locale." ----msgstr "X 伺服器不支援語區。" ---- ----#: openbox/openbox.c:198 ----msgid "Cannot set locale modifiers for the X server." ----msgstr "無法設定用於 X 伺服器的語區修飾項。" ---- ----#: openbox/openbox.c:264 ----msgid "Unable to find a valid config file, using some simple defaults" ----msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值" ---- ----#: openbox/openbox.c:298 ----msgid "Unable to load a theme." ----msgstr "無法載入佈景主題。" ---- ----#: openbox/openbox.c:428 ----#, c-format ----msgid "Restart failed to execute new executable \"%s\": %s" ----msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s" ---- ----#: openbox/openbox.c:498 openbox/openbox.c:500 ----msgid "Copyright (c)" ----msgstr "著作權 (c)" ---- ----#: openbox/openbox.c:509 ----msgid "Syntax: openbox [options]\n" ----msgstr "語法：openbox [選項]\n" ---- ----#: openbox/openbox.c:510 ----msgid "" ----"\n" ----"Options:\n" ----msgstr "" ----"\n" ----"選項：\n" ---- ----#: openbox/openbox.c:511 ----msgid " --help Display this help and exit\n" ----msgstr " --help 顯示此說明然後離開\n" ---- ----#: openbox/openbox.c:512 ----msgid " --version Display the version and exit\n" ----msgstr " --version 顯示版本然後離開\n" ---- ----#: openbox/openbox.c:513 ----msgid " --replace Replace the currently running window manager\n" ----msgstr " --replace 替換目前執行的視窗管理員\n" ---- ----#: openbox/openbox.c:514 ----msgid " --config-file FILE Specify the path to the config file to use\n" ----msgstr " --config-file <檔案> 指定要使用的設定檔路徑\n" ---- ----#: openbox/openbox.c:515 ----msgid " --sm-disable Disable connection to the session manager\n" ----msgstr " --sm-disable 停用與執行階段管理程式的連結\n" ---- ----#: openbox/openbox.c:516 ----msgid "" ----"\n" ----"Passing messages to a running Openbox instance:\n" ----msgstr "" ----"\n" ----"傳遞訊息到執行中的 Openbox 實體：\n" ---- ----#: openbox/openbox.c:517 ----msgid " --reconfigure Reload Openbox's configuration\n" ----msgstr " --reconfigure 重新載入 Openbox 配置\n" ---- ----#: openbox/openbox.c:518 ----msgid " --restart Restart Openbox\n" ----msgstr " --restart 重新啟動 Openbox\n" ---- ----#: openbox/openbox.c:519 ----msgid " --exit Exit Openbox\n" ----msgstr " --exit 結束 Openbox\n" ---- ----#: openbox/openbox.c:520 ----msgid "" ----"\n" ----"Debugging options:\n" ----msgstr "" ----"\n" ----"偵錯選項：\n" ---- ----#: openbox/openbox.c:521 ----msgid " --sync Run in synchronous mode\n" ----msgstr " --sync 在同步模式中運行\n" ---- ----#: openbox/openbox.c:522 ----msgid " --debug Display debugging output\n" ----msgstr " --debug 顯示偵錯輸出\n" ---- ----#: openbox/openbox.c:523 ----msgid " --debug-focus Display debugging output for focus handling\n" ----msgstr " --debug-focus 顯示焦點處理的偵錯輸出\n" ---- ----#: openbox/openbox.c:524 ----msgid " --debug-xinerama Split the display into fake xinerama screens\n" ----msgstr " --debug-xinerama 分割顯示以進入假造的 xinerama 螢幕\n" ---- ----#: openbox/openbox.c:525 ----#, c-format ----msgid "" ----"\n" ----"Please report bugs at %s\n" ----msgstr "" ----"\n" ----"請向 %s 報告錯誤\n" ---- ----#: openbox/openbox.c:594 ----msgid "--config-file requires an argument\n" ----msgstr "--config-file 需要一個參數\n" ---- ----#: openbox/openbox.c:637 ----#, c-format ----msgid "Invalid command line argument \"%s\"\n" ----msgstr "無效的命令列引數「%s」\n" ---- ----#: openbox/screen.c:102 openbox/screen.c:190 ----#, c-format ----msgid "A window manager is already running on screen %d" ----msgstr "螢幕 %d 中已經有視窗管理員在運行" ---- ----#: openbox/screen.c:124 ----#, c-format ----msgid "Could not acquire window manager selection on screen %d" ----msgstr "無法於螢幕 %d 獲選為視窗管理員" ---- ----#: openbox/screen.c:145 ----#, c-format ----msgid "The WM on screen %d is not exiting" ----msgstr "螢幕 %d 中的視窗管理員並未離開" ---- ----#. TRANSLATORS: If you need to specify a different order of the ----#. arguments, you can use %1$d for the first one and %2$d for the ----#. second one. For example, ----#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." ----#: openbox/screen.c:412 ----#, c-format ----msgid "" ----"Openbox is configured for %d desktops, but the current session has %d. " ----"Overriding the Openbox configuration." ----msgstr "" ----"Openbox 原先被設定為使用 %d 個桌面，但目前的作業階段有其他程式變更設定為 %d " ----"個，因此忽略 Openbox 的設定" ---- ----#: openbox/screen.c:1178 ----#, c-format ----msgid "desktop %i" ----msgstr "桌面 %i" ---- ----#: openbox/session.c:103 ----#, c-format ----msgid "Unable to make directory \"%s\": %s" ----msgstr "無法製作目錄「%s」：%s" ---- ----#: openbox/session.c:451 ----#, c-format ----msgid "Unable to save the session to \"%s\": %s" ----msgstr "無法儲存執行階段到「%s」：%s" ---- ----#: openbox/session.c:583 ----#, c-format ----msgid "Error while saving the session to \"%s\": %s" ----msgstr "當儲存執行階段「%s」時發生錯誤：%s" ---- ----#: openbox/startupnotify.c:243 ----#, c-format ----msgid "Running %s\n" ----msgstr "正在運行 %s\n" ---- ----#: openbox/translate.c:59 ----#, c-format ----msgid "Invalid modifier key \"%s\" in key/mouse binding" ----msgstr "與鍵盤/滑鼠組合的輔助按鍵「%s」無效" ---- ----#: openbox/translate.c:138 ----#, c-format ----msgid "Invalid key code \"%s\" in key binding" ----msgstr "與按鍵組合的鍵碼「%s」無效" ---- ----#: openbox/translate.c:145 ----#, c-format ----msgid "Invalid key name \"%s\" in key binding" ----msgstr "與按鍵組合的鍵名「%s」無效" ---- ----#: openbox/translate.c:151 ----#, c-format ----msgid "Requested key \"%s\" does not exist on the display" ----msgstr "要求的按鍵「%s」不存在於畫面之中" ---- ----#: openbox/xerror.c:40 ----#, c-format ----msgid "X Error: %s" ----msgstr "X 錯誤：%s" ---- ----#: openbox/prompt.c:182 ----msgid "OK" ----msgstr "確定" ---- ----#~ msgid "Invalid use of action \"%s\". Action will be ignored." ----#~ msgstr "使用的動作「%s」無效。動作將被忽略。" diff --cc render/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc render/color.c index 41fcc710,41fcc710,41fcc710,41fcc710..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/color.c +++ /dev/null @@@@@ -1,339 -1,339 -1,339 -1,339 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- color.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "color.h" ----#include "instance.h" ---- ----#include ----#include ----#include ---- ----void RrColorAllocateGC(RrColor *in) ----{ ---- XGCValues gcv; ---- ---- gcv.foreground = in->pixel; ---- gcv.cap_style = CapProjecting; ---- in->gc = XCreateGC(RrDisplay(in->inst), ---- RrRootWindow(in->inst), ---- GCForeground | GCCapStyle, &gcv); ----} ---- ----RrColor *RrColorParse(const RrInstance *inst, gchar *colorname) ----{ ---- XColor xcol; ---- ---- g_assert(colorname != NULL); ---- /* get rgb values from colorname */ ---- ---- xcol.red = 0; ---- xcol.green = 0; ---- xcol.blue = 0; ---- xcol.pixel = 0; ---- if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) { ---- g_message("Unable to parse color '%s'", colorname); ---- return NULL; ---- } ---- return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8); ----} ---- ----/*#define NO_COLOR_CACHE*/ ----#ifdef DEBUG ----gint id; ----#endif ---- ----RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b) ----{ ---- /* this should be replaced with something far cooler */ ---- RrColor *out = NULL; ---- XColor xcol; ---- gint key; ---- ---- g_assert(r >= 0 && r < 256); ---- g_assert(g >= 0 && g < 256); ---- g_assert(b >= 0 && b < 256); ---- ---- key = (r << 24) + (g << 16) + (b << 8); ----#ifndef NO_COLOR_CACHE ---- if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) { ---- out->refcount++; ---- } else { ----#endif ---- xcol.red = (r << 8) | r; ---- xcol.green = (g << 8) | g; ---- xcol.blue = (b << 8) | b; ---- if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) { ---- out = g_new(RrColor, 1); ---- out->inst = inst; ---- out->r = xcol.red >> 8; ---- out->g = xcol.green >> 8; ---- out->b = xcol.blue >> 8; ---- out->gc = None; ---- out->pixel = xcol.pixel; ---- out->key = key; ---- out->refcount = 1; ----#ifdef DEBUG ---- out->id = id++; ----#endif ----#ifndef NO_COLOR_CACHE ---- g_hash_table_insert(RrColorHash(inst), &out->key, out); ---- } ----#endif ---- } ---- return out; ----} ---- ----void RrColorFree(RrColor *c) ----{ ---- if (c) { ---- if (--c->refcount < 1) { ----#ifndef NO_COLOR_CACHE ---- g_assert(g_hash_table_lookup(RrColorHash(c->inst), &c->key)); ---- g_hash_table_remove(RrColorHash(c->inst), &c->key); ----#endif ---- if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst), ---- &c->pixel, 1, 0); ---- if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc); ---- g_free(c); ---- } ---- } ----} ---- ----void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) ----{ ---- gint r, g, b; ---- gint x,y; ---- RrPixel32 *p32 = (RrPixel32 *) im->data; ---- RrPixel16 *p16 = (RrPixel16 *) im->data; ---- RrPixel8 *p8 = (RrPixel8 *) im->data; ---- switch (im->bits_per_pixel) { ---- case 32: ---- if ((RrRedOffset(inst) != RrDefaultRedOffset) || ---- (RrBlueOffset(inst) != RrDefaultBlueOffset) || ---- (RrGreenOffset(inst) != RrDefaultGreenOffset)) { ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- r = (data[x] >> RrDefaultRedOffset) & 0xFF; ---- g = (data[x] >> RrDefaultGreenOffset) & 0xFF; ---- b = (data[x] >> RrDefaultBlueOffset) & 0xFF; ---- p32[x] = (r << RrRedOffset(inst)) ---- + (g << RrGreenOffset(inst)) ---- + (b << RrBlueOffset(inst)); ---- } ---- data += im->width; ---- p32 += im->width; ---- } ---- } else im->data = (gchar*) data; ---- break; ---- case 16: ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- r = (data[x] >> RrDefaultRedOffset) & 0xFF; ---- r = r >> RrRedShift(inst); ---- g = (data[x] >> RrDefaultGreenOffset) & 0xFF; ---- g = g >> RrGreenShift(inst); ---- b = (data[x] >> RrDefaultBlueOffset) & 0xFF; ---- b = b >> RrBlueShift(inst); ---- p16[x] = (r << RrRedOffset(inst)) ---- + (g << RrGreenOffset(inst)) ---- + (b << RrBlueOffset(inst)); ---- } ---- data += im->width; ---- p16 += im->bytes_per_line/2; ---- } ---- break; ---- case 8: ---- if (RrVisual(inst)->class == TrueColor) { ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- r = (data[x] >> RrDefaultRedOffset) & 0xFF; ---- r = r >> RrRedShift(inst); ---- g = (data[x] >> RrDefaultGreenOffset) & 0xFF; ---- g = g >> RrGreenShift(inst); ---- b = (data[x] >> RrDefaultBlueOffset) & 0xFF; ---- b = b >> RrBlueShift(inst); ---- p8[x] = (r << RrRedOffset(inst)) ---- + (g << RrGreenOffset(inst)) ---- + (b << RrBlueOffset(inst)); ---- } ---- data += im->width; ---- p8 += im->bytes_per_line; ---- } ---- } else { ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- p8[x] = RrPickColor(inst, ---- data[x] >> RrDefaultRedOffset, ---- data[x] >> RrDefaultGreenOffset, ---- data[x] >> RrDefaultBlueOffset)->pixel; ---- } ---- data += im->width; ---- p8 += im->bytes_per_line; ---- } ---- } ---- break; ---- default: ---- g_error("Your bit depth is currently unhandled\n"); ---- ---- } ----} ---- ----XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) ----{ ---- r = (r & 0xff) >> (8-RrPseudoBPC(inst)); ---- g = (g & 0xff) >> (8-RrPseudoBPC(inst)); ---- b = (b & 0xff) >> (8-RrPseudoBPC(inst)); ---- return &RrPseudoColors(inst)[(r << (2*RrPseudoBPC(inst))) + ---- (g << (1*RrPseudoBPC(inst))) + ---- b]; ----} ---- ----static void swap_byte_order(XImage *im) ----{ ---- gint x, y, di; ---- ---- di = 0; ---- for (y = 0; y < im->height; ++y) { ---- for (x = 0; x < im->height; ++x) { ---- gchar *c = &im->data[di + x * im->bits_per_pixel / 8]; ---- gchar t; ---- ---- switch (im->bits_per_pixel) { ---- case 32: ---- t = c[2]; ---- c[2] = c[3]; ---- c[3] = t; ---- case 16: ---- t = c[0]; ---- c[0] = c[1]; ---- c[1] = t; ---- case 8: ---- case 1: ---- break; ---- default: ---- g_error("Your bit depth (%i) is currently unhandled", ---- im->bits_per_pixel); ---- } ---- } ---- di += im->bytes_per_line; ---- } ---- ---- if (im->byte_order == LSBFirst) ---- im->byte_order = MSBFirst; ---- else ---- im->byte_order = LSBFirst; ----} ---- ----void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) ----{ ---- gint r, g, b; ---- gint x,y; ---- RrPixel32 *p32 = (RrPixel32 *) im->data; ---- RrPixel16 *p16 = (RrPixel16 *) im->data; ---- guchar *p8 = (guchar *)im->data; ---- ---- if (im->byte_order != LSBFirst) ---- swap_byte_order(im); ---- ---- switch (im->bits_per_pixel) { ---- case 32: ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- r = (p32[x] >> RrRedOffset(inst)) & 0xff; ---- g = (p32[x] >> RrGreenOffset(inst)) & 0xff; ---- b = (p32[x] >> RrBlueOffset(inst)) & 0xff; ---- data[x] = (r << RrDefaultRedOffset) ---- + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset) ---- + (0xff << RrDefaultAlphaOffset); ---- } ---- data += im->width; ---- p32 += im->bytes_per_line/4; ---- } ---- break; ---- case 16: ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- r = (p16[x] & RrRedMask(inst)) >> ---- RrRedOffset(inst) << ---- RrRedShift(inst); ---- g = (p16[x] & RrGreenMask(inst)) >> ---- RrGreenOffset(inst) << ---- RrGreenShift(inst); ---- b = (p16[x] & RrBlueMask(inst)) >> ---- RrBlueOffset(inst) << ---- RrBlueShift(inst); ---- data[x] = (r << RrDefaultRedOffset) ---- + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset) ---- + (0xff << RrDefaultAlphaOffset); ---- } ---- data += im->width; ---- p16 += im->bytes_per_line/2; ---- } ---- break; ---- case 8: ---- g_error("This image bit depth (%i) is currently unhandled", 8); ---- break; ---- case 1: ---- for (y = 0; y < im->height; y++) { ---- for (x = 0; x < im->width; x++) { ---- if (!(((p8[x / 8]) >> (x % 8)) & 0x1)) ---- data[x] = 0xff << RrDefaultAlphaOffset; /* black */ ---- else ---- data[x] = 0xffffffff; /* white */ ---- } ---- data += im->width; ---- p8 += im->bytes_per_line; ---- } ---- break; ---- default: ---- g_error("This image bit depth (%i) is currently unhandled", ---- im->bits_per_pixel); ---- } ----} ---- ----gint RrColorRed(const RrColor *c) ----{ ---- return c->r; ----} ---- ----gint RrColorGreen(const RrColor *c) ----{ ---- return c->g; ----} ---- ----gint RrColorBlue(const RrColor *c) ----{ ---- return c->b; ----} ---- ----gulong RrColorPixel(const RrColor *c) ----{ ---- return c->pixel; ----} ---- ----GC RrColorGC(RrColor *c) ----{ ---- if (!c->gc) ---- RrColorAllocateGC(c); ---- return c->gc; ----} diff --cc render/color.h index 26fa7afe,26fa7afe,26fa7afe,26fa7afe..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/color.h +++ /dev/null @@@@@ -1,51 -1,51 -1,51 -1,51 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- color.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __color_h ----#define __color_h ---- ----#include "render.h" ---- ----#include ----#include ----#include ---- ----struct _RrColor { ---- const RrInstance *inst; ---- ---- gint r; ---- gint g; ---- gint b; ---- gulong pixel; ---- GC gc; ---- ---- gint key; ---- gint refcount; ---- ----#ifdef DEBUG ---- gint id; ----#endif ----}; ---- ----void RrColorAllocateGC(RrColor *in); ----XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b); ----void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im); ----void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im); ---- ----#endif /* __color_h */ diff --cc render/font.c index 583c9f7d,583c9f7d,583c9f7d,10df5e09..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/font.c +++ /dev/null @@@@@ -1,378 -1,378 -1,378 -1,378 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- font.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "font.h" ----#include "color.h" ----#include "mask.h" ----#include "theme.h" ----#include "geom.h" ----#include "instance.h" ----#include "gettext.h" ---- ----#include ----#include ----#include ----#include ---- ----static void measure_font(const RrInstance *inst, RrFont *f) ----{ ---- PangoFontMetrics *metrics; ---- static PangoLanguage *lang = NULL; ---- ---- if (lang == NULL) { ----#if PANGO_VERSION_MAJOR > 1 || \ ---- (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) ---- lang = pango_language_get_default(); ----#else ---- gchar *locale, *p; ---- /* get the default language from the locale ---- (based on gtk_get_default_language in gtkmain.c) */ ---- locale = g_strdup(setlocale(LC_CTYPE, NULL)); ---- if ((p = strchr(locale, '.'))) *p = '\0'; /* strip off the . */ ---- if ((p = strchr(locale, '@'))) *p = '\0'; /* strip off the @ */ ---- lang = pango_language_from_string(locale); ---- g_free(locale); ----#endif ---- } ---- ---- /* measure the ascent and descent */ ---- metrics = pango_context_get_metrics(inst->pango, f->font_desc, lang); ---- f->ascent = pango_font_metrics_get_ascent(metrics); ---- f->descent = pango_font_metrics_get_descent(metrics); ---- pango_font_metrics_unref(metrics); ---- ----} ---- ----RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, ---- RrFontWeight weight, RrFontSlant slant) ----{ ---- RrFont *out; ---- PangoWeight pweight; ---- PangoStyle pstyle; ---- PangoAttrList *attrlist; ---- ---- out = g_new(RrFont, 1); ---- out->inst = inst; ---- out->ref = 1; ---- out->font_desc = pango_font_description_new(); ---- out->layout = pango_layout_new(inst->pango); ---- out->shortcut_underline = pango_attr_underline_new(PANGO_UNDERLINE_LOW); ---- out->shortcut_underline->start_index = 0; ---- out->shortcut_underline->end_index = 0; ---- ---- attrlist = pango_attr_list_new(); ---- /* shortcut_underline is owned by the attrlist */ ---- pango_attr_list_insert(attrlist, out->shortcut_underline); ---- /* the attributes are owned by the layout */ ---- pango_layout_set_attributes(out->layout, attrlist); ---- pango_attr_list_unref(attrlist); ---- ---- switch (weight) { ---- case RR_FONTWEIGHT_LIGHT: pweight = PANGO_WEIGHT_LIGHT; break; ---- case RR_FONTWEIGHT_NORMAL: pweight = PANGO_WEIGHT_NORMAL; break; ---- case RR_FONTWEIGHT_SEMIBOLD: pweight = PANGO_WEIGHT_SEMIBOLD; break; ---- case RR_FONTWEIGHT_BOLD: pweight = PANGO_WEIGHT_BOLD; break; ---- case RR_FONTWEIGHT_ULTRABOLD: pweight = PANGO_WEIGHT_ULTRABOLD; break; ---- default: g_assert_not_reached(); ---- } ---- ---- switch (slant) { ---- case RR_FONTSLANT_NORMAL: pstyle = PANGO_STYLE_NORMAL; break; ---- case RR_FONTSLANT_ITALIC: pstyle = PANGO_STYLE_ITALIC; break; ---- case RR_FONTSLANT_OBLIQUE: pstyle = PANGO_STYLE_OBLIQUE; break; ---- default: g_assert_not_reached(); ---- } ---- ---- /* setup the font */ ---- pango_font_description_set_family(out->font_desc, name); ---- pango_font_description_set_weight(out->font_desc, pweight); ---- pango_font_description_set_style(out->font_desc, pstyle); ---- pango_font_description_set_size(out->font_desc, size * PANGO_SCALE); ---- ---- /* setup the layout */ ---- pango_layout_set_font_description(out->layout, out->font_desc); ---- pango_layout_set_wrap(out->layout, PANGO_WRAP_WORD_CHAR); ---- ---- /* get the ascent and descent */ ---- measure_font(inst, out); ---- ---- return out; ----} ---- ----RrFont *RrFontOpenDefault(const RrInstance *inst) ----{ ---- return RrFontOpen(inst, RrDefaultFontFamily, RrDefaultFontSize, ---- RrDefaultFontWeight, RrDefaultFontSlant); ----} ---- ----void RrFontRef(RrFont *f) ----{ ---- ++f->ref; ----} ---- ----void RrFontClose(RrFont *f) ----{ ---- if (f) { ---- if (--f->ref < 1) { ---- g_object_unref(f->layout); ---- pango_font_description_free(f->font_desc); ---- g_free(f); ---- } ---- } ----} ---- ----static void font_measure_full(const RrFont *f, const gchar *str, ---- gint *x, gint *y, gint shadow_x, gint shadow_y, ---- gboolean flow, gint maxwidth) ----{ ---- PangoRectangle rect; ---- ---- pango_layout_set_text(f->layout, str, -1); ---- if (flow) { ---- pango_layout_set_single_paragraph_mode(f->layout, FALSE); ---- pango_layout_set_width(f->layout, maxwidth * PANGO_SCALE); ---- pango_layout_set_ellipsize(f->layout, PANGO_ELLIPSIZE_NONE); ---- } ---- else { ---- /* single line mode */ ---- pango_layout_set_single_paragraph_mode(f->layout, TRUE); ---- pango_layout_set_width(f->layout, -1); ---- pango_layout_set_ellipsize(f->layout, PANGO_ELLIPSIZE_MIDDLE); ---- } ---- ---- /* pango_layout_get_pixel_extents lies! this is the right way to get the ---- size of the text's area */ ---- pango_layout_get_extents(f->layout, NULL, &rect); ----#if PANGO_VERSION_MAJOR > 1 || \ ---- (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) ---- /* pass the logical rect as the ink rect, this is on purpose so we get the ---- full area for the text */ ---- pango_extents_to_pixels(&rect, NULL); ----#else ---- rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE; ---- rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; ----#endif --- *x = rect.width + ABS(shadow_x) + 4 /* we put a 2 px edge on each side */; --- *y = rect.height + ABS(shadow_y); - *x = rect.width + /* ABS(shadow_x) +*/ 4 /* we put a 2 px edge on each side */; - *y = rect.height /*+ ABS(shadow_y) */; ----} ---- ----RrSize *RrFontMeasureString(const RrFont *f, const gchar *str, ---- gint shadow_x, gint shadow_y, ---- gboolean flow, gint maxwidth) ----{ ---- RrSize *size; ---- ---- g_assert(!flow || maxwidth > 0); ---- ---- size = g_new(RrSize, 1); ---- font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y, ---- flow, maxwidth); ---- return size; ----} ---- ----gint RrFontHeight(const RrFont *f, gint shadow_y) ----{ --- return (f->ascent + f->descent) / PANGO_SCALE + ABS(shadow_y); - return (f->ascent + f->descent) / PANGO_SCALE + 0-1;//ABS(shadow_y); ----} ---- ----static inline int font_calculate_baseline(RrFont *f, gint height) ----{ ----/* For my own reference: ---- * _________ ---- * ^space/2 ^height ^baseline ---- * v_________|_ | ---- * | ^ascent | _ _ ---- * | | | | |_ _____ _| |_ _ _ ---- * | | | | _/ -_) \ / _| || | ---- * | v_________v \__\___/_\_\\__|\_, | ---- * | ^descent |__/ ---- * __________|_v ---- * ^space/2 | ---- * V_________v ---- */ ---- return (((height * PANGO_SCALE) /* height of the space in pango units */ ---- - (f->ascent + f->descent)) /* minus space taken up by text */ ---- / 2 /* divided by two -> half of the empty space (this is the top ---- of the text) */ ---- + f->ascent) /* now move down to the baseline */ ---- / PANGO_SCALE; /* back to pixels */ ----} ---- ----void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) ----{ ---- gint x,y,w,h; ---- XftColor c; ---- gint mw; ---- PangoRectangle rect; ---- PangoAttrList *attrlist; ---- PangoEllipsizeMode ell; ---- ---- g_assert(!t->flow || t->maxwidth > 0); ---- ---- y = area->y; ---- if (!t->flow) ---- /* center the text vertically ---- We do this centering based on the 'baseline' since different fonts ---- have different top edges. It looks bad when the whole string is ---- moved when 1 character from a non-default language is included in ---- the string */ ---- y += font_calculate_baseline(t->font, area->height); ---- ---- /* the +2 and -4 leave a small blank edge on the sides */ ---- x = area->x + 2; ---- w = area->width; ---- if (t->flow) w = MAX(w, t->maxwidth); ---- w -= 4; ---- h = area->height; ---- ---- if (t->flow) ---- ell = PANGO_ELLIPSIZE_NONE; ---- else { ---- switch (t->ellipsize) { ---- case RR_ELLIPSIZE_NONE: ---- ell = PANGO_ELLIPSIZE_NONE; ---- break; ---- case RR_ELLIPSIZE_START: ---- ell = PANGO_ELLIPSIZE_START; ---- break; ---- case RR_ELLIPSIZE_MIDDLE: ---- ell = PANGO_ELLIPSIZE_MIDDLE; ---- break; ---- case RR_ELLIPSIZE_END: ---- ell = PANGO_ELLIPSIZE_END; ---- break; ---- } ---- } ---- ---- pango_layout_set_text(t->font->layout, t->string, -1); ---- pango_layout_set_width(t->font->layout, w * PANGO_SCALE); ---- pango_layout_set_ellipsize(t->font->layout, ell); ---- pango_layout_set_single_paragraph_mode(t->font->layout, !t->flow); ---- ---- /* * * end of setting up the layout * * */ ---- ---- pango_layout_get_pixel_extents(t->font->layout, NULL, &rect); ---- mw = rect.width; ---- ---- /* pango_layout_set_alignment doesn't work with ---- pango_xft_render_layout_line */ ---- switch (t->justify) { ---- case RR_JUSTIFY_LEFT: ---- break; ---- case RR_JUSTIFY_RIGHT: ---- x += (w - mw); ---- break; ---- case RR_JUSTIFY_CENTER: ---- x += (w - mw) / 2; ---- break; ---- } ---- ---- if (t->shadow_offset_x || t->shadow_offset_y) { ---- /* From nvidia's readme (chapter 23): ---- ---- When rendering to a 32-bit window, keep in mind that the X RENDER ---- extension, used by most composite managers, expects "premultiplied ---- alpha" colors. This means that if your color has components (r,g,b) ---- and alpha value a, then you must render (a*r, a*g, a*b, a) into the ---- target window. ---- */ ---- c.color.red = (t->shadow_color->r | t->shadow_color->r << 8) * ---- t->shadow_alpha / 255; ---- c.color.green = (t->shadow_color->g | t->shadow_color->g << 8) * ---- t->shadow_alpha / 255; ---- c.color.blue = (t->shadow_color->b | t->shadow_color->b << 8) * ---- t->shadow_alpha / 255; ---- c.color.alpha = 0xffff * t->shadow_alpha / 255; ---- c.pixel = t->shadow_color->pixel; ---- ---- /* see below... */ ---- if (!t->flow) { ---- pango_xft_render_layout_line ---- (d, &c, ----#if PANGO_VERSION_MAJOR > 1 || \ ---- (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) ---- pango_layout_get_line_readonly(t->font->layout, 0), ----#else ---- pango_layout_get_line(t->font->layout, 0), ----#endif ---- (x + t->shadow_offset_x) * PANGO_SCALE, ---- (y + t->shadow_offset_y) * PANGO_SCALE); ---- } ---- else { ---- pango_xft_render_layout(d, &c, t->font->layout, ---- (x + t->shadow_offset_x) * PANGO_SCALE, ---- (y + t->shadow_offset_y) * PANGO_SCALE); ---- } ---- } ---- ---- c.color.red = t->color->r | t->color->r << 8; ---- c.color.green = t->color->g | t->color->g << 8; ---- c.color.blue = t->color->b | t->color->b << 8; ---- c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */ ---- c.pixel = t->color->pixel; ---- ---- if (t->shortcut) { ---- const gchar *s = t->string + t->shortcut_pos; ---- ---- t->font->shortcut_underline->start_index = t->shortcut_pos; ---- t->font->shortcut_underline->end_index = t->shortcut_pos + ---- (g_utf8_next_char(s) - s); ---- ---- /* the attributes are owned by the layout. ---- re-add the attributes to the layout after changing the ---- start and end index */ ---- attrlist = pango_layout_get_attributes(t->font->layout); ---- pango_attr_list_ref(attrlist); ---- pango_layout_set_attributes(t->font->layout, attrlist); ---- pango_attr_list_unref(attrlist); ---- } ---- ---- /* layout_line() uses y to specify the baseline ---- The line doesn't need to be freed, it's a part of the layout */ ---- if (!t->flow) { ---- pango_xft_render_layout_line ---- (d, &c, ----#if PANGO_VERSION_MAJOR > 1 || \ ---- (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) ---- pango_layout_get_line_readonly(t->font->layout, 0), ----#else ---- pango_layout_get_line(t->font->layout, 0), ----#endif ---- x * PANGO_SCALE, ---- y * PANGO_SCALE); ---- } ---- else { ---- pango_xft_render_layout(d, &c, t->font->layout, ---- x * PANGO_SCALE, ---- y * PANGO_SCALE); ---- } ---- ---- if (t->shortcut) { ---- t->font->shortcut_underline->start_index = 0; ---- t->font->shortcut_underline->end_index = 0; ---- /* the attributes are owned by the layout. ---- re-add the attributes to the layout after changing the ---- start and end index */ ---- attrlist = pango_layout_get_attributes(t->font->layout); ---- pango_attr_list_ref(attrlist); ---- pango_layout_set_attributes(t->font->layout, attrlist); ---- pango_attr_list_unref(attrlist); ---- } ----} diff --cc render/font.h index 07d648d1,07d648d1,07d648d1,07d648d1..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/font.h +++ /dev/null @@@@@ -1,42 -1,42 -1,42 -1,42 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- font.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __font_h ----#define __font_h ----#include "render.h" ----#include "geom.h" ----#include ---- ----struct _RrFont { ---- const RrInstance *inst; ---- gint ref; ---- PangoFontDescription *font_desc; ---- PangoLayout *layout; /*!< Used for measuring and rendering strings */ ---- PangoAttribute *shortcut_underline; /*< For underlining the shortcut key */ ---- gint ascent; /*!< The font's ascent in pango-units */ ---- gint descent; /*!< The font's descent in pango-units */ ----}; ---- ----void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position); ---- ----/*! Increment the references for this font, RrFontClose will decrement until 0 ---- and then really close it */ ----void RrFontRef(RrFont *f); ---- ----#endif /* __font_h */ diff --cc render/geom.h index 4d81e4b3,4d81e4b3,4d81e4b3,4d81e4b3..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/geom.h +++ /dev/null @@@@@ -1,38 -1,38 -1,38 -1,38 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- geom.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __render_geom_h ----#define __render_geom_h ---- ----typedef struct { ---- int width; ---- int height; ----} RrSize; ---- ----typedef struct { ---- int x; ---- int y; ---- int width; ---- int height; ----} RrRect; ---- ----#define RECT_SET(r, nx, ny, w, h) \ ---- (r).x = (nx), (r).y = (ny), (r).width = (w), (r).height = (h) ---- ----#endif diff --cc render/gradient.c index fc75047f,fc75047f,fc75047f,fc75047f..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/gradient.c +++ /dev/null @@@@@ -1,833 -1,833 -1,833 -1,833 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- gradient.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2008 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "gradient.h" ----#include "color.h" ----#include ----#include ---- ----static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, ---- gboolean raised); ----static void gradient_parentrelative(RrAppearance *a, gint w, gint h); ----static void gradient_solid(RrAppearance *l, gint w, gint h); ----static void gradient_splitvertical(RrAppearance *a, gint w, gint h); ----static void gradient_vertical(RrSurface *sf, gint w, gint h); ----static void gradient_horizontal(RrSurface *sf, gint w, gint h); ----static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h); ----static void gradient_diagonal(RrSurface *sf, gint w, gint h); ----static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h); ----static void gradient_pyramid(RrSurface *sf, gint inw, gint inh); ---- ----void RrRender(RrAppearance *a, gint w, gint h) ----{ ---- RrPixel32 *data = a->surface.pixel_data; ---- RrPixel32 current; ---- guint r,g,b; ---- gint off, x; ---- ---- switch (a->surface.grad) { ---- case RR_SURFACE_PARENTREL: ---- gradient_parentrelative(a, w, h); ---- break; ---- case RR_SURFACE_SOLID: ---- gradient_solid(a, w, h); ---- break; ---- case RR_SURFACE_SPLIT_VERTICAL: ---- gradient_splitvertical(a, w, h); ---- break; ---- case RR_SURFACE_VERTICAL: ---- gradient_vertical(&a->surface, w, h); ---- break; ---- case RR_SURFACE_HORIZONTAL: ---- gradient_horizontal(&a->surface, w, h); ---- break; ---- case RR_SURFACE_MIRROR_HORIZONTAL: ---- gradient_mirrorhorizontal(&a->surface, w, h); ---- break; ---- case RR_SURFACE_DIAGONAL: ---- gradient_diagonal(&a->surface, w, h); ---- break; ---- case RR_SURFACE_CROSS_DIAGONAL: ---- gradient_crossdiagonal(&a->surface, w, h); ---- break; ---- case RR_SURFACE_PYRAMID: ---- gradient_pyramid(&a->surface, w, h); ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled gradient */ ---- return; ---- } ---- ---- if (a->surface.interlaced) { ---- gint i; ---- RrPixel32 *p; ---- ---- r = a->surface.interlace_color->r; ---- g = a->surface.interlace_color->g; ---- b = a->surface.interlace_color->b; ---- current = (r << RrDefaultRedOffset) ---- + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset); ---- p = data; ---- for (i = 0; i < h; i += 2, p += w) ---- for (x = 0; x < w; ++x, ++p) ---- *p = current; ---- } ---- ---- if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) { ---- r = a->surface.border_color->r; ---- g = a->surface.border_color->g; ---- b = a->surface.border_color->b; ---- current = (r << RrDefaultRedOffset) ---- + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset); ---- for (off = 0, x = 0; x < w; ++x, off++) { ---- *(data + off) = current; ---- *(data + off + ((h-1) * w)) = current; ---- } ---- for (off = 0, x = 0; x < h; ++x, off++) { ---- *(data + (off * w)) = current; ---- *(data + (off * w) + w - 1) = current; ---- } ---- } ---- ---- if (a->surface.relief != RR_RELIEF_FLAT) { ---- if (a->surface.bevel == RR_BEVEL_1) { ---- for (off = 1, x = 1; x < w - 1; ++x, off++) ---- highlight(&a->surface, data + off, ---- data + off + (h-1) * w, ---- a->surface.relief==RR_RELIEF_RAISED); ---- for (off = 0, x = 0; x < h; ++x, off++) ---- highlight(&a->surface, data + off * w, ---- data + off * w + w - 1, ---- a->surface.relief==RR_RELIEF_RAISED); ---- } ---- ---- if (a->surface.bevel == RR_BEVEL_2) { ---- for (off = 2, x = 2; x < w - 2; ++x, off++) ---- highlight(&a->surface, data + off + w, ---- data + off + (h-2) * w, ---- a->surface.relief==RR_RELIEF_RAISED); ---- for (off = 1, x = 1; x < h-1; ++x, off++) ---- highlight(&a->surface, data + off * w + 1, ---- data + off * w + w - 2, ---- a->surface.relief==RR_RELIEF_RAISED); ---- } ---- } ----} ---- ----static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised) ----{ ---- gint r, g, b; ---- ---- RrPixel32 *up, *down; ---- if (raised) { ---- up = x; ---- down = y; ---- } else { ---- up = y; ---- down = x; ---- } ---- ---- r = (*up >> RrDefaultRedOffset) & 0xFF; ---- r += (r * s->bevel_light_adjust) >> 8; ---- g = (*up >> RrDefaultGreenOffset) & 0xFF; ---- g += (g * s->bevel_light_adjust) >> 8; ---- b = (*up >> RrDefaultBlueOffset) & 0xFF; ---- b += (b * s->bevel_light_adjust) >> 8; ---- if (r > 0xFF) r = 0xFF; ---- if (g > 0xFF) g = 0xFF; ---- if (b > 0xFF) b = 0xFF; ---- *up = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset); ---- ---- r = (*down >> RrDefaultRedOffset) & 0xFF; ---- r -= (r * s->bevel_dark_adjust) >> 8; ---- g = (*down >> RrDefaultGreenOffset) & 0xFF; ---- g -= (g * s->bevel_dark_adjust) >> 8; ---- b = (*down >> RrDefaultBlueOffset) & 0xFF; ---- b -= (b * s->bevel_dark_adjust) >> 8; ---- *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) ---- + (b << RrDefaultBlueOffset); ----} ---- ----static void create_bevel_colors(RrAppearance *l) ----{ ---- gint r, g, b; ---- ---- /* light color */ ---- r = l->surface.primary->r; ---- r += (r * l->surface.bevel_light_adjust) >> 8; ---- g = l->surface.primary->g; ---- g += (g * l->surface.bevel_light_adjust) >> 8; ---- b = l->surface.primary->b; ---- b += (b * l->surface.bevel_light_adjust) >> 8; ---- if (r > 0xFF) r = 0xFF; ---- if (g > 0xFF) g = 0xFF; ---- if (b > 0xFF) b = 0xFF; ---- g_assert(!l->surface.bevel_light); ---- l->surface.bevel_light = RrColorNew(l->inst, r, g, b); ---- ---- /* dark color */ ---- r = l->surface.primary->r; ---- r -= (r * l->surface.bevel_dark_adjust) >> 8; ---- g = l->surface.primary->g; ---- g -= (g * l->surface.bevel_dark_adjust) >> 8; ---- b = l->surface.primary->b; ---- b -= (b * l->surface.bevel_dark_adjust) >> 8; ---- g_assert(!l->surface.bevel_dark); ---- l->surface.bevel_dark = RrColorNew(l->inst, r, g, b); ----} ---- ----/*! Repeat the first pixel over the entire block of memory ---- @param start The block of memory. start[0] will be copied ---- to the rest of the block. ---- @param w The width of the block of memory (including the already-set first ---- element ----*/ ----static inline void repeat_pixel(RrPixel32 *start, gint w) ----{ ---- gint x; ---- RrPixel32 *dest; ---- ---- dest = start + 1; ---- ---- /* for really small things, just copy ourselves */ ---- if (w < 8) { ---- for (x = w-1; x > 0; --x) ---- *(dest++) = *start; ---- } ---- ---- /* for >= 8, then use O(log n) memcpy's... */ ---- else { ---- gchar *cdest; ---- gint lenbytes; ---- ---- /* copy the first 3 * 32 bits (3 words) ourselves - then we have ---- 3 + the original 1 = 4 words to make copies of at a time ---- ---- this is faster than doing memcpy for 1 or 2 words at a time ---- */ ---- for (x = 3; x > 0; --x) ---- *(dest++) = *start; ---- ---- /* cdest is a pointer to the pixel data that is typed char* so that ---- adding 1 to its position moves it only one byte ---- ---- lenbytes is the amount of bytes that we will be copying each ---- iteration. this doubles each time through the loop. ---- ---- x is the number of bytes left to copy into. lenbytes will alwaysa ---- be bounded by x ---- ---- this loop will run O(log n) times (n is the number of bytes we ---- need to copy into), since the size of the copy is doubled each ---- iteration. it seems that gcc does some nice optimizations to make ---- this memcpy very fast on hardware with support for vector operations ---- such as mmx or see. here is an idea of the kind of speed up we are ---- getting by doing this (splitvertical3 switches from doing ---- "*(data++) = color" n times to doing this memcpy thing log n times: ---- ---- % cumulative self self total ---- time seconds seconds calls ms/call ms/call name ---- 49.44 0.88 0.88 1063 0.83 0.83 splitvertical1 ---- 47.19 1.72 0.84 1063 0.79 0.79 splitvertical2 ---- 2.81 1.77 0.05 1063 0.05 0.05 splitvertical3 ---- */ ---- cdest = (gchar*)dest; ---- lenbytes = 4 * sizeof(RrPixel32); ---- for (x = (w - 4) * sizeof(RrPixel32); x > 0;) { ---- memcpy(cdest, start, lenbytes); ---- x -= lenbytes; ---- cdest += lenbytes; ---- lenbytes <<= 1; ---- if (lenbytes > x) ---- lenbytes = x; ---- } ---- } ----} ---- ----static void gradient_parentrelative(RrAppearance *a, gint w, gint h) ----{ ---- RrPixel32 *source, *dest; ---- gint sw, sh, partial_w, partial_h, i; ---- ---- g_assert (a->surface.parent); ---- g_assert (a->surface.parent->w); ---- ---- sw = a->surface.parent->w; ---- sh = a->surface.parent->h; ---- ---- /* This is a little hack. When a texture is parentrelative, and the same ---- area as the parent, and has a bevel, it will draw its bevel on top ---- of the parent's, amplifying it. So instead, rerender the child with ---- the parent's settings, but the child's bevel and interlace */ ---- if (a->surface.relief != RR_RELIEF_FLAT && ---- (a->surface.parent->surface.relief != RR_RELIEF_FLAT || ---- a->surface.parent->surface.border) && ---- !a->surface.parentx && !a->surface.parenty && ---- sw == w && sh == h) ---- { ---- RrSurface old = a->surface; ---- a->surface = a->surface.parent->surface; ---- ---- /* turn these off for the parent */ ---- a->surface.relief = RR_RELIEF_FLAT; ---- a->surface.border = FALSE; ---- ---- a->surface.pixel_data = old.pixel_data; ---- ---- RrRender(a, w, h); ---- a->surface = old; ---- } else { ---- source = (a->surface.parent->surface.pixel_data + ---- a->surface.parentx + sw * a->surface.parenty); ---- dest = a->surface.pixel_data; ---- ---- if (a->surface.parentx + w > sw) { ---- partial_w = sw - a->surface.parentx; ---- } else partial_w = w; ---- ---- if (a->surface.parenty + h > sh) { ---- partial_h = sh - a->surface.parenty; ---- } else partial_h = h; ---- ---- for (i = 0; i < partial_h; i++, source += sw, dest += w) { ---- memcpy(dest, source, partial_w * sizeof(RrPixel32)); ---- } ---- } ----} ---- ----static void gradient_solid(RrAppearance *l, gint w, gint h) ----{ ---- gint i; ---- RrPixel32 pix; ---- RrPixel32 *data = l->surface.pixel_data; ---- RrSurface *sp = &l->surface; ---- gint left = 0, top = 0, right = w - 1, bottom = h - 1; ---- ---- pix = (sp->primary->r << RrDefaultRedOffset) ---- + (sp->primary->g << RrDefaultGreenOffset) ---- + (sp->primary->b << RrDefaultBlueOffset); ---- ---- for (i = 0; i < w * h; i++) ---- *data++ = pix; ---- ---- if (sp->interlaced) ---- return; ---- ---- XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary), ---- 0, 0, w, h); ---- ---- switch (sp->relief) { ---- case RR_RELIEF_RAISED: ---- if (!sp->bevel_dark) ---- create_bevel_colors(l); ---- ---- switch (sp->bevel) { ---- case RR_BEVEL_1: ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left, bottom, right, bottom); ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- right, bottom, right, top); ---- ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left, top, right, top); ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left, bottom, left, top); ---- break; ---- case RR_BEVEL_2: ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left + 2, bottom - 1, right - 2, bottom - 1); ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- right - 1, bottom - 1, right - 1, top + 1); ---- ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left + 2, top + 1, right - 2, top + 1); ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left + 1, bottom - 1, left + 1, top + 1); ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled BevelType */ ---- } ---- break; ---- case RR_RELIEF_SUNKEN: ---- if (!sp->bevel_dark) ---- create_bevel_colors(l); ---- ---- switch (sp->bevel) { ---- case RR_BEVEL_1: ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left, bottom, right, bottom); ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- right, bottom, right, top); ---- ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left, top, right, top); ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left, bottom, left, top); ---- break; ---- case RR_BEVEL_2: ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- left + 2, bottom - 1, right - 2, bottom - 1); ---- XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), ---- right - 1, bottom - 1, right - 1, top + 1); ---- ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left + 2, top + 1, right - 2, top + 1); ---- XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), ---- left + 1, bottom - 1, left + 1, top + 1); ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled BevelType */ ---- } ---- break; ---- case RR_RELIEF_FLAT: ---- if (sp->border) { ---- XDrawRectangle(RrDisplay(l->inst), l->pixmap, ---- RrColorGC(sp->border_color), ---- left, top, right, bottom); ---- } ---- break; ---- default: ---- g_assert_not_reached(); /* unhandled ReliefType */ ---- } ----} ---- ----/* * * * * * * * * * * * * * GRADIENT MAGIC WOOT * * * * * * * * * * * * * * */ ---- ----#define VARS(x) \ ---- guint color##x[3]; \ ---- gint len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \ ---- gboolean bigslope##x[3] /* color slope > 1 */ ---- ----#define SETUP(x, from, to, w) \ ---- len##x = w; \ ---- \ ---- color##x[0] = from->r; \ ---- color##x[1] = from->g; \ ---- color##x[2] = from->b; \ ---- \ ---- cdelta##x[0] = to->r - from->r; \ ---- cdelta##x[1] = to->g - from->g; \ ---- cdelta##x[2] = to->b - from->b; \ ---- \ ---- if (cdelta##x[0] < 0) { \ ---- cdelta##x[0] = -cdelta##x[0]; \ ---- inc##x[0] = -1; \ ---- } else \ ---- inc##x[0] = 1; \ ---- if (cdelta##x[1] < 0) { \ ---- cdelta##x[1] = -cdelta##x[1]; \ ---- inc##x[1] = -1; \ ---- } else \ ---- inc##x[1] = 1; \ ---- if (cdelta##x[2] < 0) { \ ---- cdelta##x[2] = -cdelta##x[2]; \ ---- inc##x[2] = -1; \ ---- } else \ ---- inc##x[2] = 1; \ ---- bigslope##x[0] = cdelta##x[0] > w;\ ---- bigslope##x[1] = cdelta##x[1] > w;\ ---- bigslope##x[2] = cdelta##x[2] > w ---- ----#define COLOR_RR(x, c) \ ---- c->r = color##x[0]; \ ---- c->g = color##x[1]; \ ---- c->b = color##x[2] ---- ----#define COLOR(x) \ ---- ((color##x[0] << RrDefaultRedOffset) + \ ---- (color##x[1] << RrDefaultGreenOffset) + \ ---- (color##x[2] << RrDefaultBlueOffset)) ---- ----#define INCREMENT(x, i) \ ---- (inc##x[i]) ---- ----#define NEXT(x) \ ----{ \ ---- gint i; \ ---- for (i = 2; i >= 0; --i) { \ ---- if (!cdelta##x[i]) continue; \ ---- \ ---- if (!bigslope##x[i]) { \ ---- /* Y (color) is dependant on X */ \ ---- error##x[i] += cdelta##x[i]; \ ---- if ((error##x[i] << 1) >= len##x) { \ ---- color##x[i] += INCREMENT(x, i); \ ---- error##x[i] -= len##x; \ ---- } \ ---- } else { \ ---- /* X is dependant on Y (color) */ \ ---- while (1) { \ ---- color##x[i] += INCREMENT(x, i); \ ---- error##x[i] += len##x; \ ---- if ((error##x[i] << 1) >= cdelta##x[i]) { \ ---- error##x[i] -= cdelta##x[i]; \ ---- break; \ ---- } \ ---- } \ ---- } \ ---- } \ ----} ---- ----static void gradient_splitvertical(RrAppearance *a, gint w, gint h) ----{ ---- gint y1, y2, y3; ---- RrSurface *sf = &a->surface; ---- RrPixel32 *data; ---- gint y1sz, y2sz, y3sz; ---- ---- VARS(y1); ---- VARS(y2); ---- VARS(y3); ---- ---- /* if h <= 5, then a 0 or 1px middle gradient. ---- if h > 5, then always a 1px middle gradient. ---- */ ---- if (h <= 5) { ---- y1sz = MAX(h/2, 0); ---- y2sz = (h < 3 ? 0 : h % 2); ---- y3sz = MAX(h/2, 1); ---- } ---- else { ---- y1sz = h/2 - (1 - (h % 2)); ---- y2sz = 1; ---- y3sz = h/2; ---- } ---- ---- SETUP(y1, sf->split_primary, sf->primary, y1sz); ---- if (y2sz) { ---- /* setup to get the colors _in between_ these other 2 */ ---- SETUP(y2, sf->primary, sf->secondary, y2sz + 2); ---- NEXT(y2); /* skip the first one, its the same as the last of y1 */ ---- } ---- SETUP(y3, sf->secondary, sf->split_secondary, y3sz); ---- ---- /* find the color for the first pixel of each row first */ ---- data = sf->pixel_data; ---- ---- for (y1 = y1sz-1; y1 > 0; --y1) { ---- *data = COLOR(y1); ---- data += w; ---- NEXT(y1); ---- } ---- *data = COLOR(y1); ---- data += w; ---- for (y2 = y2sz-1; y2 > 0; --y2) { ---- *data = COLOR(y2); ---- data += w; ---- NEXT(y2); ---- } ---- *data = COLOR(y2); ---- data += w; ---- for (y3 = y3sz-1; y3 > 0; --y3) { ---- *data = COLOR(y3); ---- data += w; ---- NEXT(y3); ---- } ---- *data = COLOR(y3); ---- ---- /* copy the first pixels into the whole rows */ ---- data = sf->pixel_data; ---- for (y1 = h; y1 > 0; --y1) { ---- repeat_pixel(data, w); ---- data += w; ---- } ----} ---- ----static void gradient_horizontal(RrSurface *sf, gint w, gint h) ----{ ---- gint x, y, cpbytes; ---- RrPixel32 *data = sf->pixel_data, *datav; ---- gchar *datac; ---- ---- VARS(x); ---- SETUP(x, sf->primary, sf->secondary, w); ---- ---- /* set the color values for the first row */ ---- datav = data; ---- for (x = w - 1; x > 0; --x) { /* 0 -> w - 1 */ ---- *datav = COLOR(x); ---- ++datav; ---- NEXT(x); ---- } ---- *datav = COLOR(x); ---- ++datav; ---- ---- /* copy the first row to the rest in O(logn) copies */ ---- datac = (gchar*)datav; ---- cpbytes = 1 * w * sizeof(RrPixel32); ---- for (y = (h - 1) * w * sizeof(RrPixel32); y > 0;) { ---- memcpy(datac, data, cpbytes); ---- y -= cpbytes; ---- datac += cpbytes; ---- cpbytes <<= 1; ---- if (cpbytes > y) ---- cpbytes = y; ---- } ----} ---- ----static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h) ----{ ---- gint x, y, half1, half2, cpbytes; ---- RrPixel32 *data = sf->pixel_data, *datav; ---- gchar *datac; ---- ---- VARS(x); ---- ---- half1 = (w + 1) / 2; ---- half2 = w / 2; ---- ---- /* set the color values for the first row */ ---- ---- SETUP(x, sf->primary, sf->secondary, half1); ---- datav = data; ---- for (x = half1 - 1; x > 0; --x) { /* 0 -> half1 - 1 */ ---- *datav = COLOR(x); ---- ++datav; ---- NEXT(x); ---- } ---- *datav = COLOR(x); ---- ++datav; ---- ---- if (half2 > 0) { ---- SETUP(x, sf->secondary, sf->primary, half2); ---- for (x = half2 - 1; x > 0; --x) { /* 0 -> half2 - 1 */ ---- *datav = COLOR(x); ---- ++datav; ---- NEXT(x); ---- } ---- *datav = COLOR(x); ---- ++datav; ---- } ---- ---- /* copy the first row to the rest in O(logn) copies */ ---- datac = (gchar*)datav; ---- cpbytes = 1 * w * sizeof(RrPixel32); ---- for (y = (h - 1) * w * sizeof(RrPixel32); y > 0;) { ---- memcpy(datac, data, cpbytes); ---- y -= cpbytes; ---- datac += cpbytes; ---- cpbytes <<= 1; ---- if (cpbytes > y) ---- cpbytes = y; ---- } ----} ---- ----static void gradient_vertical(RrSurface *sf, gint w, gint h) ----{ ---- gint y; ---- RrPixel32 *data; ---- ---- VARS(y); ---- SETUP(y, sf->primary, sf->secondary, h); ---- ---- /* find the color for the first pixel of each row first */ ---- data = sf->pixel_data; ---- ---- for (y = h - 1; y > 0; --y) { /* 0 -> h-1 */ ---- *data = COLOR(y); ---- data += w; ---- NEXT(y); ---- } ---- *data = COLOR(y); ---- ---- /* copy the first pixels into the whole rows */ ---- data = sf->pixel_data; ---- for (y = h; y > 0; --y) { ---- repeat_pixel(data, w); ---- data += w; ---- } ----} ---- ---- ----static void gradient_diagonal(RrSurface *sf, gint w, gint h) ----{ ---- gint x, y; ---- RrPixel32 *data = sf->pixel_data; ---- RrColor left, right; ---- RrColor extracorner; ---- ---- VARS(lefty); ---- VARS(righty); ---- VARS(x); ---- ---- extracorner.r = (sf->primary->r + sf->secondary->r) / 2; ---- extracorner.g = (sf->primary->g + sf->secondary->g) / 2; ---- extracorner.b = (sf->primary->b + sf->secondary->b) / 2; ---- ---- SETUP(lefty, sf->primary, (&extracorner), h); ---- SETUP(righty, (&extracorner), sf->secondary, h); ---- ---- for (y = h - 1; y > 0; --y) { /* 0 -> h-1 */ ---- COLOR_RR(lefty, (&left)); ---- COLOR_RR(righty, (&right)); ---- ---- SETUP(x, (&left), (&right), w); ---- ---- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ ---- *(data++) = COLOR(x); ---- ---- NEXT(x); ---- } ---- *(data++) = COLOR(x); ---- ---- NEXT(lefty); ---- NEXT(righty); ---- } ---- COLOR_RR(lefty, (&left)); ---- COLOR_RR(righty, (&right)); ---- ---- SETUP(x, (&left), (&right), w); ---- ---- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ ---- *(data++) = COLOR(x); ---- ---- NEXT(x); ---- } ---- *data = COLOR(x); ----} ---- ----static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h) ----{ ---- gint x, y; ---- RrPixel32 *data = sf->pixel_data; ---- RrColor left, right; ---- RrColor extracorner; ---- ---- VARS(lefty); ---- VARS(righty); ---- VARS(x); ---- ---- extracorner.r = (sf->primary->r + sf->secondary->r) / 2; ---- extracorner.g = (sf->primary->g + sf->secondary->g) / 2; ---- extracorner.b = (sf->primary->b + sf->secondary->b) / 2; ---- ---- SETUP(lefty, (&extracorner), sf->secondary, h); ---- SETUP(righty, sf->primary, (&extracorner), h); ---- ---- for (y = h - 1; y > 0; --y) { /* 0 -> h-1 */ ---- COLOR_RR(lefty, (&left)); ---- COLOR_RR(righty, (&right)); ---- ---- SETUP(x, (&left), (&right), w); ---- ---- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ ---- *(data++) = COLOR(x); ---- ---- NEXT(x); ---- } ---- *(data++) = COLOR(x); ---- ---- NEXT(lefty); ---- NEXT(righty); ---- } ---- COLOR_RR(lefty, (&left)); ---- COLOR_RR(righty, (&right)); ---- ---- SETUP(x, (&left), (&right), w); ---- ---- for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ ---- *(data++) = COLOR(x); ---- ---- NEXT(x); ---- } ---- *data = COLOR(x); ----} ---- ----static void gradient_pyramid(RrSurface *sf, gint w, gint h) ----{ ---- RrPixel32 *ldata, *rdata; ---- RrPixel32 *cp; ---- RrColor left, right; ---- RrColor extracorner; ---- gint x, y, halfw, halfh, midx, midy; ---- ---- VARS(lefty); ---- VARS(righty); ---- VARS(x); ---- ---- extracorner.r = (sf->primary->r + sf->secondary->r) / 2; ---- extracorner.g = (sf->primary->g + sf->secondary->g) / 2; ---- extracorner.b = (sf->primary->b + sf->secondary->b) / 2; ---- ---- halfw = w >> 1; ---- halfh = h >> 1; ---- midx = w - halfw - halfw; /* 0 or 1, depending if w is even or odd */ ---- midy = h - halfh - halfh; /* 0 or 1, depending if h is even or odd */ ---- ---- SETUP(lefty, sf->primary, (&extracorner), halfh + midy); ---- SETUP(righty, (&extracorner), sf->secondary, halfh + midy); ---- ---- /* draw the top half ---- ---- it is faster to draw both top quarters together than to draw one and ---- then copy it over to the other side. ---- */ ---- ---- ldata = sf->pixel_data; ---- rdata = ldata + w - 1; ---- for (y = halfh + midy; y > 0; --y) { /* 0 -> (h+1)/2 */ ---- RrPixel32 c; ---- ---- COLOR_RR(lefty, (&left)); ---- COLOR_RR(righty, (&right)); ---- ---- SETUP(x, (&left), (&right), halfw + midx); ---- ---- for (x = halfw + midx - 1; x > 0; --x) { /* 0 -> (w+1)/2 */ ---- c = COLOR(x); ---- *(ldata++) = *(rdata--) = c; ---- ---- NEXT(x); ---- } ---- c = COLOR(x); ---- *ldata = *rdata = c; ---- ldata += halfw + 1; ---- rdata += halfw - 1 + midx + w; ---- ---- NEXT(lefty); ---- NEXT(righty); ---- } ---- ---- /* copy the top half into the bottom half, mirroring it, so we can only ---- copy one row at a time ---- ---- it is faster, to move the writing pointer forward, and the reading ---- pointer backward ---- ---- this is the current code, moving the write pointer forward and read ---- pointer backward ---- 41.78 4.26 1.78 504 3.53 3.53 gradient_pyramid2 ---- this is the opposite, moving the read pointer forward and the write ---- pointer backward ---- 42.27 4.40 1.86 504 3.69 3.69 gradient_pyramid2 ---- ---- */ ---- ldata = sf->pixel_data + (halfh - 1) * w; ---- cp = ldata + (midy + 1) * w; ---- for (y = halfh; y > 0; --y) { ---- memcpy(cp, ldata, w * sizeof(RrPixel32)); ---- ldata -= w; ---- cp += w; ---- } ----} diff --cc render/gradient.h index 8613f0ce,8613f0ce,8613f0ce,8613f0ce..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/gradient.h +++ /dev/null @@@@@ -1,27 -1,27 -1,27 -1,27 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- gradient.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __gradient_h ----#define __gradient_h ---- ----#include "render.h" ---- ----void RrRender(RrAppearance *a, gint w, gint h); ---- ----#endif /* __gradient_h */ diff --cc render/icon.h index f0b2d267,f0b2d267,f0b2d267,f0b2d267..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/icon.h +++ /dev/null @@@@@ -1,422 -1,422 -1,422 -1,422 +1,0 @@@@@ ----/* GIMP RGBA C-Source image dump (icon.h) */ ---- ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- icon.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#define OB_DEFAULT_ICON_WIDTH (48) ----#define OB_DEFAULT_ICON_HEIGHT (48) ----#define OB_DEFAULT_ICON_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ ----#define OB_DEFAULT_ICON_COMMENT \ ---- "To recreate this file, save an image as \"C-Source\" in The Gimp. Use \"ob_default_icon\" as the Prefixed Name. Enable Glib Types. Enable Save Alpha Channel. Enable Use Macros instead of Struct." ----#define OB_DEFAULT_ICON_PIXEL_DATA ((guint8*) OB_DEFAULT_ICON_pixel_data) ----static const guint8 OB_DEFAULT_ICON_pixel_data[48 * 48 * 4 + 1] = ----("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ---- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\40J\207\15\40J\207\23\40J\207" ---- "\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J" ---- "\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23" ---- "\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207" ---- "\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J" ---- "\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23" ---- "\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207\23\40J\207" ---- "\23\40J\207\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'P\213\267'Q\214\275'Q\214\275" ---- "'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214" ---- "\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275" ---- "'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275(R\215\275'Q\214\275'Q\214" ---- "\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275" ---- "'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275'Q\214\275(R\215" ---- "\275(R\215\275(R\215\275&P\213\267\40J\207\20\0\0\0\0\0\0\0\0\40J\207+Y{\252" ---- "\377\216\253\320\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243" ---- "\314\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243\314\377\204" ---- "\243\314\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243\314\377" ---- "\204\243\314\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243\314" ---- "\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243\314\377\204\243" ---- "\314\377\204\243\314\377\203\243\314\377\203\243\313\377\203\243\313\377\203" ---- "\243\313\377\203\242\313\377\202\242\313\377\202\242\313\377\202\241\313\377" ---- "\201\241\312\377\201\241\312\377\201\240\312\377\201\240\312\377\200\240\312" ---- "\377\200\240\312\377\200\240\312\377\200\240\312\377\211\247\316\377Jn\241" ---- "\377\40J\207+\0\0\0\0\0\0\0\0\40J\207+Wy\251\377]\207\275\377>o\260\377>o" ---- "\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260" ---- "\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377" ---- ">o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260\377>o\260" ---- "\377>o\260\377>o\260\377>o\260\377>o\260\377=o\260\377=o\260\377=o\260\377" ---- "=o\260\377=o\260\377=o\260\377=o\260\377=o\260\377=o\260\377=o\260\377=o\260" ---- "\377=o\260\377_\210\275\377Hm\241\377\40J\207+\0\0\0\0\0\0\0\0\40J\207+Tw" ---- "\251\377]\207\276\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r" ---- "\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263" ---- "\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377" ---- "?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263" ---- "\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377" ---- "?r\263\377?r\263\377?r\263\377?r\263\377?r\263\377]\210\277\377Fl\241\377" ---- "\40J\207+\0\0\0\0\0\0\0\0\40J\207+Rv\250\377\\\210\300\377At\265\377At\265" ---- "\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377" ---- "At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265" ---- "\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377" ---- "At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265" ---- "\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377At\265\377" ---- "At\265\377\\\210\300\377Dj\240\377\40J\207+\0\0\0\0\0\0\0\0\40J\207+Ot\247" ---- "\377\\\211\302\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271" ---- "\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377" ---- "Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271" ---- "\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377" ---- "Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377Dw\271" ---- "\377Dw\271\377Dw\271\377Dw\271\377Dw\271\377[\211\302\377Bi\240\377\40J\207" ---- "+\0\0\0\0\0\0\0\0\40J\207+Ls\247\377\\\211\303\377Fy\273\377Fy\273\377Fy\273" ---- "\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377" ---- "Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273" ---- "\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377" ---- "Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273" ---- "\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377Fy\273\377" ---- "\\\211\303\377Ah\240\377\40J\207+\0\0\0\0\0\0\0\0\40J\207+Jq\246\377\\\212" ---- "\305\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277" ---- "\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377" ---- "I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277" ---- "\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377" ---- "I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277" ---- "\377I}\277\377I}\277\377I}\277\377[\212\305\377?g\237\377\40J\207+\0\0\0\0" ---- "\0\0\0\0\40J\207+Jq\246\377\\\212\305\377I}\277\377I}\277\377I}\277\377I}" ---- "\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277" ---- "\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377I}\277\377" ---- "I}\277\377I}\277\377I}\277\377J~\300\377K\177\301\377K\177\301\377K\177\301" ---- "\377K\177\301\377K\177\301\377K\177\301\377K\177\301\377K\177\301\377K\177" ---- "\301\377K\177\301\377K\177\301\377K\177\301\377K\177\301\377K\177\301\377" ---- "K\177\301\377K\177\301\377K\177\301\377K\177\301\377Z\212\307\377=f\237\377" ---- "\40J\207+\0\0\0\0\0\0\0\0\40J\207+Ip\247\377\\\213\307\377J\177\301\377J\177" ---- "\301\377J\177\301\377J\177\301\377J\177\301\377J\177\301\377J\177\301\377" ---- "J\177\301\377J\177\301\377J\177\301\377J\177\301\377J\177\301\377J\177\301" ---- "\377J\177\301\377J\177\301\377J\177\301\377J\177\301\377J\177\301\377J\177" ---- "\301\377J\177\301\377J\177\301\377K\200\302\377K\200\302\377K\200\302\377" ---- "K\200\302\377K\200\302\377K\200\302\377K\200\302\377K\200\302\377K\200\302" ---- "\377K\200\302\377K\200\302\377K\200\302\377K\200\302\377K\200\302\377K\200" ---- "\302\377K\200\302\377K\200\302\377K\200\302\377K\200\302\377Z\212\307\377" ---- "=f\237\377\40J\207+\0\0\0\0\0\0\0\0\40J\207+Ho\247\377e\223\314\377Z\213\310" ---- "\377Z\213\310\377Z\213\310\377Z\213\310\377Z\213\307\377Z\213\307\377Z\213" ---- "\307\377Z\213\307\377Z\213\307\377Y\212\307\377Y\212\307\377Y\212\307\377" ---- "Y\212\307\377Y\212\307\377X\212\307\377X\212\307\377X\212\307\377X\211\307" ---- "\377X\212\307\377X\212\307\377X\211\307\377X\211\307\377X\211\307\377X\211" ---- "\307\377X\211\307\377X\211\307\377X\211\307\377X\211\307\377X\211\307\377" ---- "X\211\307\377W\211\307\377W\211\307\377W\211\307\377W\211\307\377W\211\307" ---- "\377W\211\307\377V\211\307\377V\211\307\377V\210\307\377V\210\307\377`\217" ---- "\312\377 ---- ----#define FRACTION 12 ----#define FLOOR(i) ((i) & (~0UL << FRACTION)) ----#define AVERAGE(a, b) (((((a) ^ (b)) & 0xfefefefeL) >> 1) + ((a) & (b))) ---- ----void RrImagePicInit(RrImagePic *pic, gint w, gint h, RrPixel32 *data) ----{ ---- gint i; ---- ---- pic->width = w; ---- pic->height = h; ---- pic->data = data; ---- pic->sum = 0; ---- for (i = w*h; i > 0; --i) ---- pic->sum += *(data++); ----} ---- ----static void RrImagePicFree(RrImagePic *pic) ----{ ---- if (pic) { ---- g_free(pic->data); ---- g_free(pic); ---- } ----} ---- ----/*! Add a picture to an Image, that is, add another copy of the image at ---- another size. This may add it to the "originals" list or to the ---- "resized" list. */ ----static void AddPicture(RrImage *self, RrImagePic ***list, gint *len, ---- RrImagePic *pic) ----{ ---- gint i; ---- ---- g_assert(pic->width > 0 && pic->height > 0); ---- ---- g_assert(g_hash_table_lookup(self->cache->table, pic) == NULL); ---- ---- /* grow the list */ ---- *list = g_renew(RrImagePic*, *list, ++*len); ---- ---- /* move everything else down one */ ---- for (i = *len-1; i > 0; --i) ---- (*list)[i] = (*list)[i-1]; ---- ---- /* set the new picture up at the front of the list */ ---- (*list)[0] = pic; ---- ---- /* add the picture as a key to point to this image in the cache */ ---- g_hash_table_insert(self->cache->table, (*list)[0], self); ---- ----#ifdef DEBUG ---- g_message("Adding %s picture to the cache:\n " ---- "Image 0x%x, w %d h %d Hash %u", ---- (*list == self->original ? "ORIGINAL" : "RESIZED"), ---- (guint)self, pic->width, pic->height, RrImagePicHash(pic)); ----#endif ----} ---- ----/*! Remove a picture from an Image. This may remove it from the "originals" ---- list or the "resized" list. */ ----static void RemovePicture(RrImage *self, RrImagePic ***list, ---- gint i, gint *len) ----{ ---- gint j; ---- ----#ifdef DEBUG ---- g_message("Removing %s picture from the cache:\n " ---- "Image 0x%x, w %d h %d Hash %u", ---- (*list == self->original ? "ORIGINAL" : "RESIZED"), ---- (guint)self, (*list)[i]->width, (*list)[i]->height, ---- RrImagePicHash((*list)[i])); ----#endif ---- ---- /* remove the picture as a key in the cache */ ---- g_hash_table_remove(self->cache->table, (*list)[i]); ---- ---- /* free the picture */ ---- RrImagePicFree((*list)[i]); ---- /* shift everything down one */ ---- for (j = i; j < *len-1; ++j) ---- (*list)[j] = (*list)[j+1]; ---- /* shrink the list */ ---- *list = g_renew(RrImagePic*, *list, --*len); ----} ---- ----/*! Given a picture in RGBA format, of a specified size, resize it to the new ---- requested size (but keep its aspect ratio). If the image does not need to ---- be resized (it is already the right size) then this returns NULL. Otherwise ---- it returns a newly allocated RrImagePic with the resized picture inside it ----*/ ----static RrImagePic* ResizeImage(RrPixel32 *src, ---- gulong srcW, gulong srcH, ---- gulong dstW, gulong dstH) ----{ ---- RrPixel32 *dst, *dststart; ---- RrImagePic *pic; ---- gulong dstX, dstY, srcX, srcY; ---- gulong srcX1, srcX2, srcY1, srcY2; ---- gulong ratioX, ratioY; ---- gulong aspectW, aspectH; ---- ---- /* keep the aspect ratio */ ---- aspectW = dstW; ---- aspectH = (gint)(dstW * ((gdouble)srcH / srcW)); ---- if (aspectH > dstH) { ---- aspectH = dstH; ---- aspectW = (gint)(dstH * ((gdouble)srcW / srcH)); ---- } ---- dstW = aspectW; ---- dstH = aspectH; ---- ---- if (srcW == dstW && srcH == dstH) ---- return NULL; /* no scaling needed ! */ ---- ---- dststart = dst = g_new(RrPixel32, dstW * dstH); ---- ---- ratioX = (srcW << FRACTION) / dstW; ---- ratioY = (srcH << FRACTION) / dstH; ---- ---- srcY2 = 0; ---- for (dstY = 0; dstY < dstH; dstY++) { ---- srcY1 = srcY2; ---- srcY2 += ratioY; ---- ---- srcX2 = 0; ---- for (dstX = 0; dstX < dstW; dstX++) { ---- gulong red = 0, green = 0, blue = 0, alpha = 0; ---- gulong portionX, portionY, portionXY, sumXY = 0; ---- RrPixel32 pixel; ---- ---- srcX1 = srcX2; ---- srcX2 += ratioX; ---- ---- for (srcY = srcY1; srcY < srcY2; srcY += (1UL << FRACTION)) { ---- if (srcY == srcY1) { ---- srcY = FLOOR(srcY); ---- portionY = (1UL << FRACTION) - (srcY1 - srcY); ---- if (portionY > srcY2 - srcY1) ---- portionY = srcY2 - srcY1; ---- } ---- else if (srcY == FLOOR(srcY2)) ---- portionY = srcY2 - srcY; ---- else ---- portionY = (1UL << FRACTION); ---- ---- for (srcX = srcX1; srcX < srcX2; srcX += (1UL << FRACTION)) { ---- if (srcX == srcX1) { ---- srcX = FLOOR(srcX); ---- portionX = (1UL << FRACTION) - (srcX1 - srcX); ---- if (portionX > srcX2 - srcX1) ---- portionX = srcX2 - srcX1; ---- } ---- else if (srcX == FLOOR(srcX2)) ---- portionX = srcX2 - srcX; ---- else ---- portionX = (1UL << FRACTION); ---- ---- portionXY = (portionX * portionY) >> FRACTION; ---- sumXY += portionXY; ---- ---- pixel = *(src + (srcY >> FRACTION) * srcW ---- + (srcX >> FRACTION)); ---- red += ((pixel >> RrDefaultRedOffset) & 0xFF) ---- * portionXY; ---- green += ((pixel >> RrDefaultGreenOffset) & 0xFF) ---- * portionXY; ---- blue += ((pixel >> RrDefaultBlueOffset) & 0xFF) ---- * portionXY; ---- alpha += ((pixel >> RrDefaultAlphaOffset) & 0xFF) ---- * portionXY; ---- } ---- } ---- ---- g_assert(sumXY != 0); ---- red /= sumXY; ---- green /= sumXY; ---- blue /= sumXY; ---- alpha /= sumXY; ---- ---- *dst++ = (red << RrDefaultRedOffset) | ---- (green << RrDefaultGreenOffset) | ---- (blue << RrDefaultBlueOffset) | ---- (alpha << RrDefaultAlphaOffset); ---- } ---- } ---- ---- pic = g_new(RrImagePic, 1); ---- RrImagePicInit(pic, dstW, dstH, dststart); ---- ---- return pic; ----} ---- ----/*! This drawns an RGBA picture into the target, within the rectangle specified ---- by the area parameter. If the area's size differs from the source's then it ---- will be centered within the rectangle */ ----void DrawRGBA(RrPixel32 *target, gint target_w, gint target_h, ---- RrPixel32 *source, gint source_w, gint source_h, ---- gint alpha, RrRect *area) ----{ ---- RrPixel32 *dest; ---- gint col, num_pixels; ---- gint dw, dh; ---- ---- g_assert(source_w <= area->width && source_h <= area->height); ---- g_assert(area->x + area->width <= target_w); ---- g_assert(area->y + area->height <= target_h); ---- ---- /* keep the aspect ratio */ ---- dw = area->width; ---- dh = (gint)(dw * ((gdouble)source_h / source_w)); ---- if (dh > area->height) { ---- dh = area->height; ---- dw = (gint)(dh * ((gdouble)source_w / source_h)); ---- } ---- ---- /* copy source -> dest, and apply the alpha channel. ---- center the image if it is smaller than the area */ ---- col = 0; ---- num_pixels = dw * dh; ---- dest = target + area->x + (area->width - dw) / 2 + ---- (target_w * (area->y + (area->height - dh) / 2)); ---- while (num_pixels-- > 0) { ---- guchar a, r, g, b, bgr, bgg, bgb; ---- ---- /* apply the rgba's opacity as well */ ---- a = ((*source >> RrDefaultAlphaOffset) * alpha) >> 8; ---- r = *source >> RrDefaultRedOffset; ---- g = *source >> RrDefaultGreenOffset; ---- b = *source >> RrDefaultBlueOffset; ---- ---- /* background color */ ---- bgr = *dest >> RrDefaultRedOffset; ---- bgg = *dest >> RrDefaultGreenOffset; ---- bgb = *dest >> RrDefaultBlueOffset; ---- ---- r = bgr + (((r - bgr) * a) >> 8); ---- g = bgg + (((g - bgg) * a) >> 8); ---- b = bgb + (((b - bgb) * a) >> 8); ---- ---- *dest = ((r << RrDefaultRedOffset) | ---- (g << RrDefaultGreenOffset) | ---- (b << RrDefaultBlueOffset)); ---- ---- dest++; ---- source++; ---- ---- if (++col >= dw) { ---- col = 0; ---- dest += target_w - dw; ---- } ---- } ----} ---- ----/*! Draw an RGBA texture into a target pixel buffer. */ ----void RrImageDrawRGBA(RrPixel32 *target, RrTextureRGBA *rgba, ---- gint target_w, gint target_h, ---- RrRect *area) ----{ ---- RrImagePic *scaled; ---- ---- scaled = ResizeImage(rgba->data, rgba->width, rgba->height, ---- area->width, area->height); ---- ---- if (scaled) { ----#ifdef DEBUG ---- g_warning("Scaling an RGBA! You should avoid this and just make " ---- "it the right size yourself!"); ----#endif ---- DrawRGBA(target, target_w, target_h, ---- scaled->data, scaled->width, scaled->height, ---- rgba->alpha, area); ---- } ---- else ---- DrawRGBA(target, target_w, target_h, ---- rgba->data, rgba->width, rgba->height, ---- rgba->alpha, area); ----} ---- ----/*! Create a new RrImage, which is linked to an image cache */ ----RrImage* RrImageNew(RrImageCache *cache) ----{ ---- RrImage *self; ---- ---- g_assert(cache != NULL); ---- ---- self = g_new0(RrImage, 1); ---- self->ref = 1; ---- self->cache = cache; ---- return self; ----} ---- ----void RrImageRef(RrImage *self) ----{ ---- ++self->ref; ----} ---- ----void RrImageUnref(RrImage *self) ----{ ---- if (self && --self->ref == 0) { ----#ifdef DEBUG ---- g_message("Refcount to 0, removing ALL pictures from the cache:\n " ---- "Image 0x%x", (guint)self); ----#endif ---- while (self->n_original > 0) ---- RemovePicture(self, &self->original, 0, &self->n_original); ---- while (self->n_resized > 0) ---- RemovePicture(self, &self->resized, 0, &self->n_resized); ---- g_free(self); ---- } ----} ---- ----/*! Add a new picture with the given RGBA pixel data and dimensions into the ---- RrImage. This adds an "original" picture to the image. ----*/ ----void RrImageAddPicture(RrImage *self, RrPixel32 *data, gint w, gint h) ----{ ---- gint i; ---- RrImagePic *pic; ---- ---- /* make sure we don't already have this size.. */ ---- for (i = 0; i < self->n_original; ++i) ---- if (self->original[i]->width == w && self->original[i]->height == h) { ----#ifdef DEBUG ---- g_message("Found duplicate ORIGINAL image:\n " ---- "Image 0x%x, w %d h %d", (guint)self, w, h); ----#endif ---- return; ---- } ---- ---- /* remove any resized pictures of this same size */ ---- for (i = 0; i < self->n_resized; ++i) ---- if (self->resized[i]->width == w || self->resized[i]->height == h) { ---- RemovePicture(self, &self->resized, i, &self->n_resized); ---- break; ---- } ---- ---- /* add the new picture */ ---- pic = g_new(RrImagePic, 1); ---- RrImagePicInit(pic, w, h, g_memdup(data, w*h*sizeof(RrPixel32))); ---- AddPicture(self, &self->original, &self->n_original, pic); ----} ---- ----/*! Remove the picture from the RrImage which has the given dimensions. This ---- removes an "original" picture from the image. ----*/ ----void RrImageRemovePicture(RrImage *self, gint w, gint h) ----{ ---- gint i; ---- ---- /* remove any resized pictures of this same size */ ---- for (i = 0; i < self->n_original; ++i) ---- if (self->original[i]->width == w && self->original[i]->height == h) { ---- RemovePicture(self, &self->original, i, &self->n_original); ---- break; ---- } ----} ---- ----/*! Draw an RrImage texture into a target pixel buffer. If the RrImage does ---- not contain a picture of the appropriate size, then one of its "original" ---- pictures will be resized and used (and stored in the RrImage as a "resized" ---- picture). ---- */ ----void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, ---- gint target_w, gint target_h, ---- RrRect *area) ----{ ---- gint i, min_diff, min_i, min_aspect_diff, min_aspect_i; ---- RrImage *self; ---- RrImagePic *pic; ---- gboolean free_pic; ---- ---- self = img->image; ---- pic = NULL; ---- free_pic = FALSE; ---- ---- /* is there an original of this size? (only w or h has to be right cuz ---- we maintain aspect ratios) */ ---- for (i = 0; i < self->n_original; ++i) ---- if (self->original[i]->width == area->width || ---- self->original[i]->height == area->height) ---- { ---- pic = self->original[i]; ---- break; ---- } ---- ---- /* is there a resize of this size? */ ---- for (i = 0; i < self->n_resized; ++i) ---- if (self->resized[i]->width == area->width || ---- self->resized[i]->height == area->height) ---- { ---- gint j; ---- RrImagePic *saved; ---- ---- /* save the selected one */ ---- saved = self->resized[i]; ---- ---- /* shift all the others down */ ---- for (j = i; j > 0; --j) ---- self->resized[j] = self->resized[j-1]; ---- ---- /* and move the selected one to the top of the list */ ---- self->resized[0] = saved; ---- ---- pic = self->resized[0]; ---- break; ---- } ---- ---- if (!pic) { ---- gdouble aspect; ---- ---- /* find an original with a close size */ ---- min_diff = min_aspect_diff = -1; ---- min_i = min_aspect_i = 0; ---- aspect = ((gdouble)area->width) / area->height; ---- for (i = 0; i < self->n_original; ++i) { ---- gint diff; ---- gint wdiff, hdiff; ---- gdouble myasp; ---- ---- /* our size difference metric.. */ ---- wdiff = self->original[i]->width - area->width; ---- hdiff = self->original[i]->height - area->height; ---- diff = (wdiff * wdiff) + (hdiff * hdiff); ---- ---- /* find the smallest difference */ ---- if (min_diff < 0 || diff < min_diff) { ---- min_diff = diff; ---- min_i = i; ---- } ---- /* and also find the smallest difference with the same aspect ---- ratio (and prefer this one) */ ---- myasp = ((gdouble)self->original[i]->width) / ---- self->original[i]->height; ---- if (ABS(aspect - myasp) < 0.0000001 && ---- (min_aspect_diff < 0 || diff < min_aspect_diff)) ---- { ---- min_aspect_diff = diff; ---- min_aspect_i = i; ---- } ---- } ---- ---- /* use the aspect ratio correct source if there is one */ ---- if (min_aspect_i >= 0) ---- min_i = min_aspect_i; ---- ---- /* resize the original to the given area */ ---- pic = ResizeImage(self->original[min_i]->data, ---- self->original[min_i]->width, ---- self->original[min_i]->height, ---- area->width, area->height); ---- ---- /* add the resized image to the image, as the first in the resized ---- list */ ---- if (self->n_resized >= self->cache->max_resized_saved) ---- /* remove the last one (last used one) */ ---- RemovePicture(self, &self->resized, self->n_resized - 1, ---- &self->n_resized); ---- if (self->cache->max_resized_saved) ---- /* add it to the top of the resized list */ ---- AddPicture(self, &self->resized, &self->n_resized, pic); ---- else ---- free_pic = TRUE; /* don't leak mem! */ ---- } ---- ---- g_assert(pic != NULL); ---- ---- DrawRGBA(target, target_w, target_h, ---- pic->data, pic->width, pic->height, ---- img->alpha, area); ---- if (free_pic) ---- RrImagePicFree(pic); ----} diff --cc render/image.h index b478daf9,b478daf9,b478daf9,b478daf9..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/image.h +++ /dev/null @@@@@ -1,35 -1,35 -1,35 -1,35 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- image.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __image_h ----#define __image_h ---- ----#include "render.h" ----#include "geom.h" ---- ----/*! Initialize an RrImagePicture to the specified dimensions and pixel data */ ----void RrImagePicInit(RrImagePic *pic, gint w, gint h, RrPixel32 *data); ---- ----void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, ---- gint target_w, gint target_h, ---- RrRect *area); ----void RrImageDrawRGBA(RrPixel32 *target, RrTextureRGBA *rgba, ---- gint target_w, gint target_h, ---- RrRect *area); ---- ----#endif diff --cc render/imagecache.c index 9c605f9d,9c605f9d,9c605f9d,9c605f9d..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/imagecache.c +++ /dev/null @@@@@ -1,144 -1,144 -1,144 -1,144 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- imagecache.c for the Openbox window manager ---- Copyright (c) 2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "imagecache.h" ----#include "image.h" ---- ----static gboolean RrImagePicEqual(const RrImagePic *p1, ---- const RrImagePic *p2); ---- ----RrImageCache* RrImageCacheNew(gint max_resized_saved) ----{ ---- RrImageCache *self; ---- ---- g_assert(max_resized_saved >= 0); ---- ---- self = g_new(RrImageCache, 1); ---- self->ref = 1; ---- self->max_resized_saved = max_resized_saved; ---- self->table = g_hash_table_new((GHashFunc)RrImagePicHash, ---- (GEqualFunc)RrImagePicEqual); ---- return self; ----} ---- ----void RrImageCacheRef(RrImageCache *self) ----{ ---- ++self->ref; ----} ---- ----void RrImageCacheUnref(RrImageCache *self) ----{ ---- if (self && --self->ref == 0) { ---- g_assert(g_hash_table_size(self->table) == 0); ---- g_hash_table_unref(self->table); ---- ---- g_free(self); ---- } ----} ---- ----/*! Finds an image in the cache, if it is already in there */ ----RrImage* RrImageCacheFind(RrImageCache *self, ---- RrPixel32 *data, gint w, gint h) ----{ ---- RrImagePic pic; ---- ---- RrImagePicInit(&pic, w, h, data); ---- return g_hash_table_lookup(self->table, &pic); ----} ---- ----#define hashsize(n) ((RrPixel32)1<<(n)) ----#define hashmask(n) (hashsize(n)-1) ----#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) ----/* mix -- mix 3 32-bit values reversibly. */ ----#define mix(a,b,c) \ ----{ \ ---- a -= c; a ^= rot(c, 4); c += b; \ ---- b -= a; b ^= rot(a, 6); a += c; \ ---- c -= b; c ^= rot(b, 8); b += a; \ ---- a -= c; a ^= rot(c,16); c += b; \ ---- b -= a; b ^= rot(a,19); a += c; \ ---- c -= b; c ^= rot(b, 4); b += a; \ ----} ----/* final -- final mixing of 3 32-bit values (a,b,c) into c */ ----#define final(a,b,c) \ ----{ \ ---- c ^= b; c -= rot(b,14); \ ---- a ^= c; a -= rot(c,11); \ ---- b ^= a; b -= rot(a,25); \ ---- c ^= b; c -= rot(b,16); \ ---- a ^= c; a -= rot(c,4); \ ---- b ^= a; b -= rot(a,14); \ ---- c ^= b; c -= rot(b,24); \ ----} ---- ----/* This is a fast, reversable hash function called "lookup3", found here: ---- http://burtleburtle.net/bob/c/lookup3.c, by Bob Jenkins ---- ---- This hashing algorithm is "reversible", that is, not cryptographically ---- secure at all. But we don't care about that, we just want something to ---- tell when images are the same or different relatively quickly. ----*/ ----guint32 hashword(const guint32 *key, gint length, guint32 initval) ----{ ---- guint32 a,b,c; ---- ---- /* Set up the internal state */ ---- a = b = c = 0xdeadbeef + (((guint32)length)<<2) + initval; ---- ---- /* handle most of the key */ ---- while (length > 3) ---- { ---- a += key[0]; ---- b += key[1]; ---- c += key[2]; ---- mix(a,b,c); ---- length -= 3; ---- key += 3; ---- } ---- ---- /* handle the last 3 guint32's */ ---- switch(length) /* all the case statements fall through */ ---- { ---- case 3: c+=key[2]; ---- case 2: b+=key[1]; ---- case 1: a+=key[0]; ---- final(a,b,c); ---- case 0: /* case 0: nothing left to add */ ---- break; ---- } ---- /* report the result */ ---- return c; ----} ---- ----/*! This is some arbitrary initial value for the hashing function. It's ---- constant so that you get the same result from the same data each time. ----*/ ----#define HASH_INITVAL 0xf00d ---- ----guint RrImagePicHash(const RrImagePic *p) ----{ ---- return hashword(p->data, p->width * p->height, HASH_INITVAL); ----} ---- ----static gboolean RrImagePicEqual(const RrImagePic *p1, ---- const RrImagePic *p2) ----{ ---- return p1->width == p2->width && p1->height == p2->height && ---- p1->sum == p2->sum; ----} diff --cc render/imagecache.h index 4ad2deae,4ad2deae,4ad2deae,4ad2deae..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/imagecache.h +++ /dev/null @@@@@ -1,51 -1,51 -1,51 -1,51 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- imagecache.h for the Openbox window manager ---- Copyright (c) 2008 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __imagecache_h ----#define __imagecache_h ---- ----#include ---- ----struct _RrImagePic; ---- ----guint RrImagePicHash(const struct _RrImagePic *p); ---- ----/*! Create a new image cache. An image cache is basically a hash table to look ---- up RrImages. Each RrImage in the cache may contain one or more Pictures, ---- that is one or more actual copies of image data at various sizes. For eg, ---- for a window, all of its various icons are loaded into the same RrImage. ---- When an RrImage is drawn and a picture inside it needs to be resized, that ---- is also saved within the RrImage. ---- ---- For each picture that an RrImage has, the picture is hashed and that is used ---- as a key to find the RrImage. So, given any picture in any RrImage in the ---- cache, if you hash it, you will find the RrImage. ----*/ ----struct _RrImageCache { ---- gint ref; ---- /*! When an original picture is resized for an RrImage, the resized picture ---- is saved in the RrImage. This specifies how many pictures should be ---- saved at a time. When this is exceeded, the least recently used ---- "resized" picture is deleted. ---- */ ---- gint max_resized_saved; ---- ---- GHashTable *table; ----}; ---- ----#endif diff --cc render/instance.c index b867815c,b867815c,b867815c,b867815c..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/instance.c +++ /dev/null @@@@@ -1,309 -1,309 -1,309 -1,309 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- instance.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "instance.h" ---- ----static RrInstance *definst = NULL; ---- ----static void RrTrueColorSetup (RrInstance *inst); ----static void RrPseudoColorSetup (RrInstance *inst); ---- ----#ifdef DEBUG ----#include "color.h" ----#endif ----static void ----dest(gpointer data) ----{ ----#ifdef DEBUG ---- RrColor *c = data; ---- if (c->refcount > 0) ---- g_error("color %d (%d,%d,%d) in hash table with %d " ---- "leftover references", ---- c->id, RrColorRed(c), RrColorGreen(c), RrColorBlue(c), ---- c->refcount); ----#endif ----} ---- ----#if 0 ----static void f(gpointer key, gpointer value, gpointer n) ----{ ---- RrColor *c = value; ---- if (c->id == *(gint*)n) ---- g_message("color %d has %d references", c->id, c->refcount); ----} ---- ----void print_refs(gint id) ----{ ---- g_hash_table_foreach(RrColorHash(definst), f, &id); ----} ----#endif ---- ----RrInstance* RrInstanceNew (Display *display, gint screen) ----{ ---- g_type_init(); /* supposedly needed for pango but seems to work without */ ---- ---- definst = g_new (RrInstance, 1); ---- definst->display = display; ---- definst->screen = screen; ---- ---- definst->depth = DefaultDepth(display, screen); ---- definst->visual = DefaultVisual(display, screen); ---- definst->colormap = DefaultColormap(display, screen); ---- definst->pango = pango_xft_get_context(display, screen); ---- ---- definst->pseudo_colors = NULL; ---- ---- definst->color_hash = g_hash_table_new_full(g_int_hash, g_int_equal, ---- NULL, dest); ---- ---- switch (definst->visual->class) { ---- case TrueColor: ---- RrTrueColorSetup(definst); ---- break; ---- case PseudoColor: ---- case StaticColor: ---- case GrayScale: ---- case StaticGray: ---- RrPseudoColorSetup(definst); ---- break; ---- default: ---- g_critical("Unsupported visual class"); ---- g_free (definst); ---- return definst = NULL; ---- } ---- return definst; ----} ---- ----static void RrTrueColorSetup (RrInstance *inst) ----{ ---- gulong red_mask, green_mask, blue_mask; ---- XImage *timage = NULL; ---- ---- timage = XCreateImage(inst->display, inst->visual, inst->depth, ---- ZPixmap, 0, NULL, 1, 1, 32, 0); ---- g_assert(timage != NULL); ---- /* find the offsets for each color in the visual's masks */ ---- inst->red_mask = red_mask = timage->red_mask; ---- inst->green_mask = green_mask = timage->green_mask; ---- inst->blue_mask = blue_mask = timage->blue_mask; ---- ---- inst->red_offset = 0; ---- inst->green_offset = 0; ---- inst->blue_offset = 0; ---- ---- while (! (red_mask & 1)) { inst->red_offset++; red_mask >>= 1; } ---- while (! (green_mask & 1)) { inst->green_offset++; green_mask >>= 1; } ---- while (! (blue_mask & 1)) { inst->blue_offset++; blue_mask >>= 1; } ---- ---- inst->red_shift = inst->green_shift = inst->blue_shift = 8; ---- while (red_mask) { red_mask >>= 1; inst->red_shift--; } ---- while (green_mask) { green_mask >>= 1; inst->green_shift--; } ---- while (blue_mask) { blue_mask >>= 1; inst->blue_shift--; } ---- XFree(timage); ----} ---- ----#define RrPseudoNcolors(inst) (1 << (inst->pseudo_bpc * 3)) ---- ----static void RrPseudoColorSetup (RrInstance *inst) ----{ ---- XColor icolors[256]; ---- gint tr, tg, tb, n, r, g, b, i, incolors, ii; ---- gulong dev; ---- gint cpc, _ncolors; ---- ---- /* determine the number of colors and the bits-per-color */ ---- inst->pseudo_bpc = 2; /* XXX THIS SHOULD BE A USER OPTION */ ---- g_assert(inst->pseudo_bpc >= 1); ---- _ncolors = RrPseudoNcolors(inst); ---- ---- if (_ncolors > 1 << inst->depth) { ---- g_message("Invalid colormap size. Resizing."); ---- inst->pseudo_bpc = 1 << (inst->depth/3) >> 3; ---- _ncolors = 1 << (inst->pseudo_bpc * 3); ---- } ---- ---- /* build a color cube */ ---- inst->pseudo_colors = g_new(XColor, _ncolors); ---- cpc = 1 << inst->pseudo_bpc; /* colors per channel */ ---- ---- for (n = 0, r = 0; r < cpc; r++) ---- for (g = 0; g < cpc; g++) ---- for (b = 0; b < cpc; b++, n++) { ---- tr = (gint)(((gfloat)(r)/(gfloat)(cpc-1)) * 0xFF); ---- tg = (gint)(((gfloat)(g)/(gfloat)(cpc-1)) * 0xFF); ---- tb = (gint)(((gfloat)(b)/(gfloat)(cpc-1)) * 0xFF); ---- inst->pseudo_colors[n].red = tr | tr << 8; ---- inst->pseudo_colors[n].green = tg | tg << 8; ---- inst->pseudo_colors[n].blue = tb | tb << 8; ---- /* used to track allocation */ ---- inst->pseudo_colors[n].flags = DoRed|DoGreen|DoBlue; ---- } ---- ---- /* allocate the colors */ ---- for (i = 0; i < _ncolors; i++) ---- if (!XAllocColor(inst->display, inst->colormap, ---- &inst->pseudo_colors[i])) ---- inst->pseudo_colors[i].flags = 0; /* mark it as unallocated */ ---- ---- /* try allocate any colors that failed allocation above */ ---- ---- /* get the allocated values from the X server ---- (only the first 256 XXX why!?) ---- */ ---- incolors = (((1 << inst->depth) > 256) ? 256 : (1 << inst->depth)); ---- for (i = 0; i < incolors; i++) ---- icolors[i].pixel = i; ---- XQueryColors(inst->display, inst->colormap, icolors, incolors); ---- ---- /* try match unallocated ones */ ---- for (i = 0; i < _ncolors; i++) { ---- if (!inst->pseudo_colors[i].flags) { /* if it wasn't allocated... */ ---- gulong closest = 0xffffffff, close = 0; ---- for (ii = 0; ii < incolors; ii++) { ---- /* find deviations */ ---- r = (inst->pseudo_colors[i].red - icolors[ii].red) & 0xff; ---- g = (inst->pseudo_colors[i].green - icolors[ii].green) & 0xff; ---- b = (inst->pseudo_colors[i].blue - icolors[ii].blue) & 0xff; ---- /* find a weighted absolute deviation */ ---- dev = (r * r) + (g * g) + (b * b); ---- ---- if (dev < closest) { ---- closest = dev; ---- close = ii; ---- } ---- } ---- ---- inst->pseudo_colors[i].red = icolors[close].red; ---- inst->pseudo_colors[i].green = icolors[close].green; ---- inst->pseudo_colors[i].blue = icolors[close].blue; ---- inst->pseudo_colors[i].pixel = icolors[close].pixel; ---- ---- /* try alloc this closest color, it had better succeed! */ ---- if (XAllocColor(inst->display, inst->colormap, ---- &inst->pseudo_colors[i])) ---- /* mark as alloced */ ---- inst->pseudo_colors[i].flags = DoRed|DoGreen|DoBlue; ---- else ---- /* wtf has gone wrong, its already alloced for chissake! */ ---- g_assert_not_reached(); ---- } ---- } ----} ---- ----void RrInstanceFree (RrInstance *inst) ----{ ---- if (inst) { ---- if (inst == definst) definst = NULL; ---- g_free(inst->pseudo_colors); ---- g_hash_table_destroy(inst->color_hash); ---- g_object_unref(inst->pango); ---- g_free(inst); ---- } ----} ---- ----Display* RrDisplay (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->display; ----} ---- ----gint RrScreen (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->screen; ----} ---- ----Window RrRootWindow (const RrInstance *inst) ----{ ---- return RootWindow (RrDisplay (inst), RrScreen (inst)); ----} ---- ----Visual *RrVisual (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->visual; ----} ---- ----gint RrDepth (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->depth; ----} ---- ----Colormap RrColormap (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->colormap; ----} ---- ----gint RrRedOffset (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->red_offset; ----} ---- ----gint RrGreenOffset (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->green_offset; ----} ---- ----gint RrBlueOffset (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->blue_offset; ----} ---- ----gint RrRedShift (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->red_shift; ----} ---- ----gint RrGreenShift (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->green_shift; ----} ---- ----gint RrBlueShift (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->blue_shift; ----} ---- ----gint RrRedMask (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->red_mask; ----} ---- ----gint RrGreenMask (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->green_mask; ----} ---- ----gint RrBlueMask (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->blue_mask; ----} ---- ----guint RrPseudoBPC (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->pseudo_bpc; ----} ---- ----XColor *RrPseudoColors (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->pseudo_colors; ----} ---- ----GHashTable* RrColorHash (const RrInstance *inst) ----{ ---- return (inst ? inst : definst)->color_hash; ----} diff --cc render/instance.h index 324f061a,324f061a,324f061a,324f061a..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/instance.h +++ /dev/null @@@@@ -1,57 -1,57 -1,57 -1,57 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- instance.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __render_instance_h ----#define __render_instance_h ---- ----#include ----#include ----#include ---- ----struct _RrInstance { ---- Display *display; ---- gint screen; ---- ---- Visual *visual; ---- gint depth; ---- Colormap colormap; ---- PangoContext *pango; ---- ---- gint red_offset; ---- gint green_offset; ---- gint blue_offset; ---- ---- gint red_shift; ---- gint green_shift; ---- gint blue_shift; ---- ---- gint red_mask; ---- gint green_mask; ---- gint blue_mask; ---- ---- gint pseudo_bpc; ---- XColor *pseudo_colors; ---- ---- GHashTable *color_hash; ----}; ---- ----guint RrPseudoBPC (const RrInstance *inst); ----XColor* RrPseudoColors (const RrInstance *inst); ----GHashTable* RrColorHash (const RrInstance *inst); ---- ----#endif diff --cc render/mask.c index b6e3c443,b6e3c443,b6e3c443,b6e3c443..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/mask.c +++ /dev/null @@@@@ -1,82 -1,82 -1,82 -1,82 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- mask.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "color.h" ----#include "mask.h" ---- ----RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst, ---- gint w, gint h, const gchar *data) ----{ ---- RrPixmapMask *m = g_new(RrPixmapMask, 1); ---- m->inst = inst; ---- m->width = w; ---- m->height = h; ---- /* round up to nearest byte */ ---- m->data = g_memdup(data, (w + 7) / 8 * h); ---- m->mask = XCreateBitmapFromData(RrDisplay(inst), RrRootWindow(inst), ---- data, w, h); ---- return m; ----} ---- ----void RrPixmapMaskFree(RrPixmapMask *m) ----{ ---- if (m) { ---- XFreePixmap(RrDisplay(m->inst), m->mask); ---- g_free(m->data); ---- g_free(m); ---- } ----} ---- ----void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area) ----{ ---- gint x, y; ---- if (m->mask == NULL) return; /* no mask given */ ---- ---- /* set the clip region */ ---- x = area->x + (area->width - m->mask->width) / 2; ---- y = area->y + (area->height - m->mask->height) / 2; ---- ---- if (x < 0) x = 0; ---- if (y < 0) y = 0; ---- ---- XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), m->mask->mask); ---- XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), x, y); ---- ---- /* fill in the clipped region */ ---- XFillRectangle(RrDisplay(m->mask->inst), p, RrColorGC(m->color), x, y, ---- x + m->mask->width, y + m->mask->height); ---- ---- /* unset the clip region */ ---- XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), None); ---- XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), 0, 0); ----} ---- ----RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src) ----{ ---- RrPixmapMask *m = g_new(RrPixmapMask, 1); ---- m->inst = src->inst; ---- m->width = src->width; ---- m->height = src->height; ---- /* round up to nearest byte */ ---- m->data = g_memdup(src->data, (src->width + 7) / 8 * src->height); ---- m->mask = XCreateBitmapFromData(RrDisplay(m->inst), RrRootWindow(m->inst), ---- m->data, m->width, m->height); ---- return m; ----} diff --cc render/mask.h index 4dc85031,4dc85031,4dc85031,4dc85031..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/mask.h +++ /dev/null @@@@@ -1,32 -1,32 -1,32 -1,32 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- mask.h for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __mask_h ----#define __mask_h ---- ----#include "render.h" ----#include "geom.h" ---- ----RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst, ---- gint w, gint h, const gchar *data); ----void RrPixmapMaskFree(RrPixmapMask *m); ----RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src); ----void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area); ---- ----#endif diff --cc render/obrender-4.0.pc.in index 9c310569,9c310569,9c310569,9c310569..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/obrender-4.0.pc.in +++ /dev/null @@@@@ -1,14 -1,14 -1,14 -1,14 +1,0 @@@@@ ----prefix=@prefix@ ----exec_prefix=@exec_prefix@ ----libdir=@libdir@ ----includedir=@includedir@ ---- ----xcflags=@X_CFLAGS@ ----xlibs=@X_LIBS@ ---- ----Name: ObRender ----Description: Openbox Render Library ----Version: @VERSION@ ----Requires: obparser-4.0 glib-2.0 xft pangoxft ----Libs: -L${libdir} -lobrender ${xlibs} ----Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} diff --cc render/render.c index fd442d26,fd442d26,fd442d26,fd442d26..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/render.c +++ /dev/null @@@@@ -1,561 -1,561 -1,561 -1,561 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- render.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "gradient.h" ----#include "font.h" ----#include "mask.h" ----#include "color.h" ----#include "image.h" ----#include "theme.h" ---- ----#include ----#include ----#include ----#include ---- ----#ifdef HAVE_STDLIB_H ----# include ----#endif ---- ----static void pixel_data_to_pixmap(RrAppearance *l, ---- gint x, gint y, gint w, gint h); ---- ----Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) ----{ ---- gint i, transferred = 0, force_transfer = 0; ---- Pixmap oldp = None; ---- RrRect tarea; /* area in which to draw textures */ ---- gboolean resized; ---- ---- if (w <= 0 || h <= 0) return None; ---- ---- if (a->surface.parentx < 0 || a->surface.parenty < 0) { ---- /* ob_debug("Invalid parent co-ordinates\n"); */ ---- return None; ---- } ---- ---- if (a->surface.grad == RR_SURFACE_PARENTREL && ---- (a->surface.parentx >= a->surface.parent->w || ---- a->surface.parenty >= a->surface.parent->h)) ---- { ---- return None; ---- } ---- ---- resized = (a->w != w || a->h != h); ---- ---- oldp = a->pixmap; /* save to free after changing the visible pixmap */ ---- a->pixmap = XCreatePixmap(RrDisplay(a->inst), ---- RrRootWindow(a->inst), ---- w, h, RrDepth(a->inst)); ---- ---- g_assert(a->pixmap != None); ---- a->w = w; ---- a->h = h; ---- ---- if (a->xftdraw != NULL) ---- XftDrawDestroy(a->xftdraw); ---- a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, ---- RrVisual(a->inst), RrColormap(a->inst)); ---- g_assert(a->xftdraw != NULL); ---- ---- if (resized) { ---- g_free(a->surface.pixel_data); ---- a->surface.pixel_data = g_new(RrPixel32, w * h); ---- } ---- ---- RrRender(a, w, h); ---- ---- { ---- gint l, t, r, b; ---- RrMargins(a, &l, &t, &r, &b); ---- RECT_SET(tarea, l, t, w - l - r, h - t - b); ---- } ---- ---- for (i = 0; i < a->textures; i++) { ---- switch (a->texture[i].type) { ---- case RR_TEXTURE_NONE: ---- break; ---- case RR_TEXTURE_TEXT: ---- if (!transferred) { ---- transferred = 1; ---- if ((a->surface.grad != RR_SURFACE_SOLID) ---- || (a->surface.interlaced)) ---- pixel_data_to_pixmap(a, 0, 0, w, h); ---- } ---- if (a->xftdraw == NULL) { ---- a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, ---- RrVisual(a->inst), ---- RrColormap(a->inst)); ---- } ---- RrFontDraw(a->xftdraw, &a->texture[i].data.text, &tarea); ---- break; ---- case RR_TEXTURE_LINE_ART: ---- if (!transferred) { ---- transferred = 1; ---- if ((a->surface.grad != RR_SURFACE_SOLID) ---- || (a->surface.interlaced)) ---- pixel_data_to_pixmap(a, 0, 0, w, h); ---- } ---- XDrawLine(RrDisplay(a->inst), a->pixmap, ---- RrColorGC(a->texture[i].data.lineart.color), ---- a->texture[i].data.lineart.x1, ---- a->texture[i].data.lineart.y1, ---- a->texture[i].data.lineart.x2, ---- a->texture[i].data.lineart.y2); ---- break; ---- case RR_TEXTURE_MASK: ---- if (!transferred) { ---- transferred = 1; ---- if ((a->surface.grad != RR_SURFACE_SOLID) ---- || (a->surface.interlaced)) ---- pixel_data_to_pixmap(a, 0, 0, w, h); ---- } ---- RrPixmapMaskDraw(a->pixmap, &a->texture[i].data.mask, &tarea); ---- break; ---- case RR_TEXTURE_IMAGE: ---- g_assert(!transferred); ---- { ---- RrRect narea = tarea; ---- RrTextureImage *img = &a->texture[i].data.image; ---- if (img->twidth) ---- narea.width = MIN(tarea.width, img->twidth); ---- if (img->theight) ---- narea.height = MIN(tarea.height, img->theight); ---- narea.x += img->tx; ---- narea.y += img->ty; ---- RrImageDrawImage(a->surface.pixel_data, ---- &a->texture[i].data.image, ---- a->w, a->h, ---- &narea); ---- } ---- force_transfer = 1; ---- break; ---- case RR_TEXTURE_RGBA: ---- g_assert(!transferred); ---- { ---- RrRect narea = tarea; ---- RrTextureRGBA *rgb = &a->texture[i].data.rgba; ---- if (rgb->twidth) ---- narea.width = MIN(tarea.width, rgb->twidth); ---- if (rgb->theight) ---- narea.height = MIN(tarea.height, rgb->theight); ---- narea.x += rgb->tx; ---- narea.y += rgb->ty; ---- RrImageDrawRGBA(a->surface.pixel_data, ---- &a->texture[i].data.rgba, ---- a->w, a->h, ---- &narea); ---- } ---- force_transfer = 1; ---- break; ---- } ---- } ---- ---- if (!transferred) { ---- transferred = 1; ---- if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced) || ---- force_transfer) ---- { ---- pixel_data_to_pixmap(a, 0, 0, w, h); ---- } ---- } ---- ---- return oldp; ----} ---- ----void RrPaint(RrAppearance *a, Window win, gint w, gint h) ----{ ---- Pixmap oldp; ---- ---- oldp = RrPaintPixmap(a, w, h); ---- XSetWindowBackgroundPixmap(RrDisplay(a->inst), win, a->pixmap); ---- XClearWindow(RrDisplay(a->inst), win); ---- /* free this after changing the visible pixmap */ ---- if (oldp) XFreePixmap(RrDisplay(a->inst), oldp); ----} ---- ----RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex) ----{ ---- RrAppearance *out; ---- ---- out = g_new0(RrAppearance, 1); ---- out->inst = inst; ---- out->textures = numtex; ---- out->surface.bevel_light_adjust = 128; ---- out->surface.bevel_dark_adjust = 64; ---- if (numtex) out->texture = g_new0(RrTexture, numtex); ---- ---- return out; ----} ---- ----void RrAppearanceRemoveTextures(RrAppearance *a) ----{ ---- g_free(a->texture); ---- a->textures = 0; ----} ---- ----void RrAppearanceAddTextures(RrAppearance *a, gint numtex) ----{ ---- g_assert(a->textures == 0); ---- ---- a->textures = numtex; ---- if (numtex) a->texture = g_new0(RrTexture, numtex); ----} ---- ----void RrAppearanceClearTextures(RrAppearance *a) ----{ ---- memset(a->texture, 0, a->textures * sizeof(RrTexture)); ----} ---- ----RrAppearance *RrAppearanceCopy(RrAppearance *orig) ----{ ---- RrSurface *spo, *spc; ---- RrAppearance *copy = g_new(RrAppearance, 1); ---- ---- copy->inst = orig->inst; ---- ---- spo = &(orig->surface); ---- spc = &(copy->surface); ---- spc->grad = spo->grad; ---- spc->relief = spo->relief; ---- spc->bevel = spo->bevel; ---- if (spo->primary != NULL) ---- spc->primary = RrColorNew(copy->inst, ---- spo->primary->r, ---- spo->primary->g, ---- spo->primary->b); ---- else spc->primary = NULL; ---- ---- if (spo->secondary != NULL) ---- spc->secondary = RrColorNew(copy->inst, ---- spo->secondary->r, ---- spo->secondary->g, ---- spo->secondary->b); ---- else spc->secondary = NULL; ---- ---- if (spo->border_color != NULL) ---- spc->border_color = RrColorNew(copy->inst, ---- spo->border_color->r, ---- spo->border_color->g, ---- spo->border_color->b); ---- else spc->border_color = NULL; ---- ---- if (spo->interlace_color != NULL) ---- spc->interlace_color = RrColorNew(copy->inst, ---- spo->interlace_color->r, ---- spo->interlace_color->g, ---- spo->interlace_color->b); ---- else spc->interlace_color = NULL; ---- ---- if (spo->bevel_dark != NULL) ---- spc->bevel_dark = RrColorNew(copy->inst, ---- spo->bevel_dark->r, ---- spo->bevel_dark->g, ---- spo->bevel_dark->b); ---- else spc->bevel_dark = NULL; ---- ---- if (spo->bevel_light != NULL) ---- spc->bevel_light = RrColorNew(copy->inst, ---- spo->bevel_light->r, ---- spo->bevel_light->g, ---- spo->bevel_light->b); ---- else spc->bevel_light = NULL; ---- ---- if (spo->split_primary != NULL) ---- spc->split_primary = RrColorNew(copy->inst, ---- spo->split_primary->r, ---- spo->split_primary->g, ---- spo->split_primary->b); ---- else spc->split_primary = NULL; ---- ---- if (spo->split_secondary != NULL) ---- spc->split_secondary = RrColorNew(copy->inst, ---- spo->split_secondary->r, ---- spo->split_secondary->g, ---- spo->split_secondary->b); ---- else spc->split_secondary = NULL; ---- ---- spc->interlaced = spo->interlaced; ---- spc->bevel_light_adjust = spo->bevel_light_adjust; ---- spc->bevel_dark_adjust = spo->bevel_dark_adjust; ---- spc->border = spo->border; ---- spc->parent = NULL; ---- spc->parentx = spc->parenty = 0; ---- spc->pixel_data = NULL; ---- ---- copy->textures = orig->textures; ---- copy->texture = g_memdup(orig->texture, ---- orig->textures * sizeof(RrTexture)); ---- copy->pixmap = None; ---- copy->xftdraw = NULL; ---- copy->w = copy->h = 0; ---- return copy; ----} ---- ----void RrAppearanceFree(RrAppearance *a) ----{ ---- if (a) { ---- RrSurface *p; ---- if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap); ---- if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw); ---- if (a->textures) ---- g_free(a->texture); ---- p = &a->surface; ---- RrColorFree(p->primary); ---- RrColorFree(p->secondary); ---- RrColorFree(p->border_color); ---- RrColorFree(p->interlace_color); ---- RrColorFree(p->bevel_dark); ---- RrColorFree(p->bevel_light); ---- RrColorFree(p->split_primary); ---- RrColorFree(p->split_secondary); ---- g_free(p->pixel_data); ---- p->pixel_data = NULL; ---- g_free(a); ---- } ----} ---- ---- ----static void pixel_data_to_pixmap(RrAppearance *l, ---- gint x, gint y, gint w, gint h) ----{ ---- RrPixel32 *in, *scratch; ---- Pixmap out; ---- XImage *im = NULL; ---- im = XCreateImage(RrDisplay(l->inst), RrVisual(l->inst), RrDepth(l->inst), ---- ZPixmap, 0, NULL, w, h, 32, 0); ---- g_assert(im != NULL); ---- ---- in = l->surface.pixel_data; ---- out = l->pixmap; ---- ----/* this malloc is a complete waste of time on normal 32bpp ---- as reduce_depth just sets im->data = data and returns ----*/ ---- scratch = g_new(RrPixel32, im->width * im->height); ---- im->data = (gchar*) scratch; ---- RrReduceDepth(l->inst, in, im); ---- XPutImage(RrDisplay(l->inst), out, ---- DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)), ---- im, 0, 0, x, y, w, h); ---- im->data = NULL; ---- XDestroyImage(im); ---- g_free(scratch); ----} ---- ----void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b) ----{ ---- *l = *t = *r = *b = 0; ---- ---- if (a->surface.grad != RR_SURFACE_PARENTREL) { ---- if (a->surface.relief != RR_RELIEF_FLAT) { ---- switch (a->surface.bevel) { ---- case RR_BEVEL_1: ---- *l = *t = *r = *b = 1; ---- break; ---- case RR_BEVEL_2: ---- *l = *t = *r = *b = 2; ---- break; ---- } ---- } else if (a->surface.border) { ---- *l = *t = *r = *b = 1; ---- } ---- } ----} ---- ----void RrMinSize(RrAppearance *a, gint *w, gint *h) ----{ ---- *w = RrMinWidth(a); ---- *h = RrMinHeight(a); ----} ---- ----gint RrMinWidth(RrAppearance *a) ----{ ---- gint i; ---- RrSize *m; ---- gint l, t, r, b; ---- gint w = 0; ---- ---- RrMargins(a, &l, &t, &r, &b); ---- ---- for (i = 0; i < a->textures; ++i) { ---- switch (a->texture[i].type) { ---- case RR_TEXTURE_NONE: ---- break; ---- case RR_TEXTURE_MASK: ---- w = MAX(w, a->texture[i].data.mask.mask->width); ---- break; ---- case RR_TEXTURE_TEXT: ---- m = RrFontMeasureString(a->texture[i].data.text.font, ---- a->texture[i].data.text.string, ---- a->texture[i].data.text.shadow_offset_x, ---- a->texture[i].data.text.shadow_offset_y, ---- a->texture[i].data.text.flow, ---- a->texture[i].data.text.maxwidth); ---- w = MAX(w, m->width); ---- g_free(m); ---- break; ---- case RR_TEXTURE_RGBA: ---- w += MAX(w, a->texture[i].data.rgba.width); ---- break; ---- case RR_TEXTURE_IMAGE: ---- /* images resize so they don't contribute anything to the min */ ---- break; ---- case RR_TEXTURE_LINE_ART: ---- w = MAX(w, MAX(a->texture[i].data.lineart.x1 - l - r, ---- a->texture[i].data.lineart.x2 - l - r)); ---- break; ---- } ---- } ---- ---- w += l + r; ---- ---- if (w < 1) w = 1; ---- return w; ----} ---- ----gint RrMinHeight(RrAppearance *a) ----{ ---- gint i; ---- gint l, t, r, b; ---- RrSize *m; ---- gint h = 0; ---- ---- RrMargins(a, &l, &t, &r, &b); ---- ---- for (i = 0; i < a->textures; ++i) { ---- switch (a->texture[i].type) { ---- case RR_TEXTURE_NONE: ---- break; ---- case RR_TEXTURE_MASK: ---- h = MAX(h, a->texture[i].data.mask.mask->height); ---- break; ---- case RR_TEXTURE_TEXT: ---- if (a->texture[i].data.text.flow) { ---- g_assert(a->texture[i].data.text.string != NULL); ---- ---- m = RrFontMeasureString ---- (a->texture[i].data.text.font, ---- a->texture[i].data.text.string, ---- a->texture[i].data.text.shadow_offset_x, ---- a->texture[i].data.text.shadow_offset_y, ---- a->texture[i].data.text.flow, ---- a->texture[i].data.text.maxwidth); ---- h += MAX(h, m->height); ---- g_free(m); ---- } ---- else ---- h += MAX(h, ---- RrFontHeight ---- (a->texture[i].data.text.font, ---- a->texture[i].data.text.shadow_offset_y)); ---- break; ---- case RR_TEXTURE_RGBA: ---- h += MAX(h, a->texture[i].data.rgba.height); ---- break; ---- case RR_TEXTURE_IMAGE: ---- /* images resize so they don't contribute anything to the min */ ---- break; ---- case RR_TEXTURE_LINE_ART: ---- h = MAX(h, MAX(a->texture[i].data.lineart.y1 - t - b, ---- a->texture[i].data.lineart.y2 - t - b)); ---- break; ---- } ---- } ---- ---- h += t + b; ---- ---- if (h < 1) h = 1; ---- return h; ----} ---- ----static void reverse_bits(gchar *c, gint n) ----{ ---- gint i; ---- for (i = 0; i < n; i++, c++) ---- *c = (((*c * 0x0802UL & 0x22110UL) | ---- (*c * 0x8020UL & 0x88440UL)) * 0x10101UL) >> 16; ----} ---- ----gboolean RrPixmapToRGBA(const RrInstance *inst, ---- Pixmap pmap, Pixmap mask, ---- gint *w, gint *h, RrPixel32 **data) ----{ ---- Window xr; ---- gint xx, xy; ---- guint pw, ph, mw, mh, xb, xd, i, x, y, di; ---- XImage *xi, *xm = NULL; ---- ---- if (!XGetGeometry(RrDisplay(inst), pmap, ---- &xr, &xx, &xy, &pw, &ph, &xb, &xd)) ---- return FALSE; ---- ---- if (mask) { ---- if (!XGetGeometry(RrDisplay(inst), mask, ---- &xr, &xx, &xy, &mw, &mh, &xb, &xd)) ---- return FALSE; ---- if (pw != mw || ph != mh || xd != 1) ---- return FALSE; ---- } ---- ---- xi = XGetImage(RrDisplay(inst), pmap, ---- 0, 0, pw, ph, 0xffffffff, ZPixmap); ---- if (!xi) ---- return FALSE; ---- ---- if (mask) { ---- xm = XGetImage(RrDisplay(inst), mask, ---- 0, 0, mw, mh, 0xffffffff, ZPixmap); ---- if (!xm) { ---- XDestroyImage(xi); ---- return FALSE; ---- } ---- if ((xm->bits_per_pixel == 1) && (xm->bitmap_bit_order != LSBFirst)) ---- reverse_bits(xm->data, xm->bytes_per_line * xm->height); ---- } ---- ---- if ((xi->bits_per_pixel == 1) && (xi->bitmap_bit_order != LSBFirst)) ---- reverse_bits(xi->data, xi->bytes_per_line * xi->height); ---- ---- *data = g_new(RrPixel32, pw * ph); ---- RrIncreaseDepth(inst, *data, xi); ---- ---- if (mask) { ---- /* apply transparency from the mask */ ---- di = 0; ---- for (i = 0, y = 0; y < ph; ++y) { ---- for (x = 0; x < pw; ++x, ++i) { ---- if (!((((unsigned)xm->data[di + x / 8]) >> (x % 8)) & 0x1)) ---- (*data)[i] &= ~(0xff << RrDefaultAlphaOffset); ---- } ---- di += xm->bytes_per_line; ---- } ---- } ---- ---- *w = pw; ---- *h = ph; ---- ---- XDestroyImage(xi); ---- if (mask) ---- XDestroyImage(xm); ---- ---- return TRUE; ----} diff --cc render/render.h index 706843e3,706843e3,706843e3,706843e3..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/render.h +++ /dev/null @@@@@ -1,350 -1,350 -1,350 -1,350 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- render.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __render_h ----#define __render_h ---- ----#include "geom.h" ----#include "render/version.h" ---- ----#include /* some platforms dont include this as needed for Xft */ ----#include ----#include ---- ----G_BEGIN_DECLS ---- ----typedef union _RrTextureData RrTextureData; ----typedef struct _RrAppearance RrAppearance; ----typedef struct _RrSurface RrSurface; ----typedef struct _RrFont RrFont; ----typedef struct _RrTexture RrTexture; ----typedef struct _RrTextureMask RrTextureMask; ----typedef struct _RrTextureRGBA RrTextureRGBA; ----typedef struct _RrTextureImage RrTextureImage; ----typedef struct _RrTextureText RrTextureText; ----typedef struct _RrTextureLineArt RrTextureLineArt; ----typedef struct _RrPixmapMask RrPixmapMask; ----typedef struct _RrInstance RrInstance; ----typedef struct _RrColor RrColor; ----typedef struct _RrImage RrImage; ----typedef struct _RrImagePic RrImagePic; ----typedef struct _RrImageCache RrImageCache; ---- ----typedef guint32 RrPixel32; ----typedef guint16 RrPixel16; ----typedef guchar RrPixel8; ---- ----typedef enum { ---- RR_RELIEF_FLAT, ---- RR_RELIEF_RAISED, ---- RR_RELIEF_SUNKEN ----} RrReliefType; ---- ----typedef enum { ---- RR_BEVEL_1, ---- RR_BEVEL_2 ----} RrBevelType; ---- ----typedef enum { ---- RR_SURFACE_NONE, ---- RR_SURFACE_PARENTREL, ---- RR_SURFACE_SOLID, ---- RR_SURFACE_SPLIT_VERTICAL, ---- RR_SURFACE_HORIZONTAL, ---- RR_SURFACE_VERTICAL, ---- RR_SURFACE_DIAGONAL, ---- RR_SURFACE_CROSS_DIAGONAL, ---- RR_SURFACE_PYRAMID, ---- RR_SURFACE_MIRROR_HORIZONTAL ----} RrSurfaceColorType; ---- ----typedef enum { ---- RR_TEXTURE_NONE, ---- RR_TEXTURE_MASK, ---- RR_TEXTURE_TEXT, ---- RR_TEXTURE_LINE_ART, ---- RR_TEXTURE_RGBA, ---- RR_TEXTURE_IMAGE ----} RrTextureType; ---- ----typedef enum { ---- RR_JUSTIFY_LEFT, ---- RR_JUSTIFY_CENTER, ---- RR_JUSTIFY_RIGHT ----} RrJustify; ---- ----/* Put middle first so it's the default */ ----typedef enum { ---- RR_ELLIPSIZE_MIDDLE, ---- RR_ELLIPSIZE_NONE, ---- RR_ELLIPSIZE_START, ---- RR_ELLIPSIZE_END ----} RrEllipsizeMode; ---- ----typedef enum { ---- RR_FONTWEIGHT_LIGHT, ---- RR_FONTWEIGHT_NORMAL, ---- RR_FONTWEIGHT_SEMIBOLD, ---- RR_FONTWEIGHT_BOLD, ---- RR_FONTWEIGHT_ULTRABOLD ----} RrFontWeight; ---- ----typedef enum { ---- RR_FONTSLANT_NORMAL, ---- RR_FONTSLANT_ITALIC, ---- RR_FONTSLANT_OBLIQUE ----} RrFontSlant; ---- ----struct _RrSurface { ---- RrSurfaceColorType grad; ---- RrReliefType relief; ---- RrBevelType bevel; ---- RrColor *primary; ---- RrColor *secondary; ---- RrColor *border_color; ---- RrColor *bevel_dark; ---- RrColor *bevel_light; ---- RrColor *interlace_color; ---- gboolean interlaced; ---- gboolean border; ---- RrAppearance *parent; ---- gint parentx; ---- gint parenty; ---- RrPixel32 *pixel_data; ---- gint bevel_dark_adjust; /* 0-255, default is 64 */ ---- gint bevel_light_adjust; /* 0-255, default is 128 */ ---- RrColor *split_primary; ---- RrColor *split_secondary; ----}; ---- ----struct _RrTextureText { ---- RrFont *font; ---- RrJustify justify; ---- RrColor *color; ---- const gchar *string; ---- gint shadow_offset_x; ---- gint shadow_offset_y; ---- RrColor *shadow_color; ---- gboolean shortcut; /*!< Underline a character */ ---- guint shortcut_pos; /*!< Position in bytes of the character to underline */ ---- RrEllipsizeMode ellipsize; ---- gboolean flow; /* allow multiple lines. must set maxwidth below */ ---- gint maxwidth; ---- guchar shadow_alpha; /* at the bottom to improve alignment */ ----}; ---- ----struct _RrPixmapMask { ---- const RrInstance *inst; ---- Pixmap mask; ---- gint width; ---- gint height; ---- gchar *data; ----}; ---- ----struct _RrTextureMask { ---- RrColor *color; ---- RrPixmapMask *mask; ----}; ---- ----struct _RrTextureRGBA { ---- gint width; ---- gint height; ---- gint alpha; ---- RrPixel32 *data; ---- /* size and position to draw at (if these are zero, then it will be ---- drawn to fill the entire texture */ ---- gint tx; ---- gint ty; ---- gint twidth; ---- gint theight; ----}; ---- ----struct _RrTextureImage { ---- RrImage *image; ---- gint alpha; ---- /* size and position to draw at (if these are zero, then it will be ---- drawn to fill the entire texture */ ---- gint tx; ---- gint ty; ---- gint twidth; ---- gint theight; ----}; ---- ----struct _RrTextureLineArt { ---- RrColor *color; ---- gint x1; ---- gint y1; ---- gint x2; ---- gint y2; ----}; ---- ----union _RrTextureData { ---- RrTextureRGBA rgba; ---- RrTextureImage image; ---- RrTextureText text; ---- RrTextureMask mask; ---- RrTextureLineArt lineart; ----}; ---- ----struct _RrTexture { ---- /* If changing the type of a texture, you should DEFINITELY call ---- RrAppearanceClearTextures() first! */ ---- RrTextureType type; ---- RrTextureData data; ----}; ---- ----struct _RrAppearance { ---- const RrInstance *inst; ---- ---- RrSurface surface; ---- gint textures; ---- RrTexture *texture; ---- Pixmap pixmap; ---- XftDraw *xftdraw; ---- ---- /* cached for internal use */ ---- gint w, h; ----}; ---- ----/*! Holds a RGBA image picture */ ----struct _RrImagePic { ---- gint width, height; ---- RrPixel32 *data; ---- /* The sum of all the pixels. This is used to compare pictures if their ---- hashes match. */ ---- gint sum; ----}; ---- ----/*! An RrImage is a sort of meta-image. It can contain multiple versions of ---- an image at different sizes, which may or may not be completely different ---- pictures */ ----struct _RrImage { ---- gint ref; ---- RrImageCache *cache; ---- ---- /*! An array of "originals", that is of RrPictures that have been added ---- to the image in various sizes, and that have not been resized. These ---- are explicitly added to the RrImage. */ ---- RrImagePic **original; ---- gint n_original; ---- /*! An array of "resized" pictures. When an "original" RrPicture ---- needs to be resized for drawing, it is saved in here so that it doesn't ---- need to be resized again. These are automatically added to the ---- RrImage. */ ---- RrImagePic **resized; ---- gint n_resized; ----}; ---- ----/* these are the same on all endian machines because it seems to be dependant ---- on the endianness of the gfx card, not the cpu. */ ----#define RrDefaultAlphaOffset 24 ----#define RrDefaultRedOffset 16 ----#define RrDefaultGreenOffset 8 ----#define RrDefaultBlueOffset 0 ---- ----#define RrDefaultFontFamily "arial,sans" ----#define RrDefaultFontSize 8 ----#define RrDefaultFontWeight RR_FONTWEIGHT_NORMAL ----#define RrDefaultFontSlant RR_FONTSLANT_NORMAL ---- ----RrInstance* RrInstanceNew (Display *display, gint screen); ----void RrInstanceFree (RrInstance *inst); ---- ----Display* RrDisplay (const RrInstance *inst); ----gint RrScreen (const RrInstance *inst); ----Window RrRootWindow (const RrInstance *inst); ----Visual* RrVisual (const RrInstance *inst); ----gint RrDepth (const RrInstance *inst); ----Colormap RrColormap (const RrInstance *inst); ----gint RrRedOffset (const RrInstance *inst); ----gint RrGreenOffset (const RrInstance *inst); ----gint RrBlueOffset (const RrInstance *inst); ----gint RrRedShift (const RrInstance *inst); ----gint RrGreenShift (const RrInstance *inst); ----gint RrBlueShift (const RrInstance *inst); ----gint RrRedMask (const RrInstance *inst); ----gint RrGreenMask (const RrInstance *inst); ----gint RrBlueMask (const RrInstance *inst); ---- ----RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); ----RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); ----void RrColorFree (RrColor *in); ---- ----gint RrColorRed (const RrColor *c); ----gint RrColorGreen (const RrColor *c); ----gint RrColorBlue (const RrColor *c); ----gulong RrColorPixel (const RrColor *c); ----GC RrColorGC (RrColor *c); ---- ----RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex); ----RrAppearance *RrAppearanceCopy (RrAppearance *a); ----void RrAppearanceFree (RrAppearance *a); ----void RrAppearanceRemoveTextures(RrAppearance *a); ----void RrAppearanceAddTextures(RrAppearance *a, gint numtex); ----/*! Always call this when changing the type of a texture in an appearance */ ----void RrAppearanceClearTextures(RrAppearance *a); ---- ----RrFont *RrFontOpen (const RrInstance *inst, const gchar *name, ---- gint size, RrFontWeight weight, RrFontSlant slant); ----RrFont *RrFontOpenDefault (const RrInstance *inst); ----void RrFontClose (RrFont *f); ----RrSize *RrFontMeasureString (const RrFont *f, const gchar *str, ---- gint shadow_offset_x, gint shadow_offset_y, ---- gboolean flow, gint maxwidth); ----gint RrFontHeight (const RrFont *f, gint shadow_offset_y); ----gint RrFontMaxCharWidth (const RrFont *f); ---- ----/* Paint into the appearance. The old pixmap is returned (if there was one). It ---- is the responsibility of the caller to call XFreePixmap on the return when ---- it is non-null. */ ----Pixmap RrPaintPixmap (RrAppearance *a, gint w, gint h); ----void RrPaint (RrAppearance *a, Window win, gint w, gint h); ----void RrMinSize (RrAppearance *a, gint *w, gint *h); ----gint RrMinWidth (RrAppearance *a); ----/* For text textures, if flow is TRUE, then the string must be set before ---- calling this, otherwise it doesn't need to be */ ----gint RrMinHeight (RrAppearance *a); ----void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b); ---- ----gboolean RrPixmapToRGBA(const RrInstance *inst, ---- Pixmap pmap, Pixmap mask, ---- gint *w, gint *h, RrPixel32 **data); ---- ----/*! Create a new image cache for RrImages. ---- @param max_resized_saved The number of resized copies of an image to save ----*/ ----RrImageCache* RrImageCacheNew(gint max_resized_saved); ----void RrImageCacheRef(RrImageCache *self); ----void RrImageCacheUnref(RrImageCache *self); ---- ----/*! Finds an image in the cache, if it is already in there */ ----RrImage* RrImageCacheFind(RrImageCache *self, ---- RrPixel32 *data, gint w, gint h); ---- ----RrImage* RrImageNew(RrImageCache *cache); ----void RrImageRef(RrImage *im); ----void RrImageUnref(RrImage *im); ---- ----void RrImageAddPicture(RrImage *im, RrPixel32 *data, gint w, gint h); ----void RrImageRemovePicture(RrImage *im, gint w, gint h); ---- ----G_END_DECLS ---- ----#endif /*__render_h*/ diff --cc render/test.c index 36c962da,94137b48,36c962da,36c962da..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/test.c +++ /dev/null @@@@@ -1,116 -1,119 -1,116 -1,116 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- test.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- Copyright (c) 2003 Derek Foreman ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ----#include ----#include ----#include "render.h" ----#include ---- ----static gint x_error_handler(Display * disp, XErrorEvent * error) ----{ ---- gchar buf[1024]; ---- XGetErrorText(disp, error->error_code, buf, 1024); ---- printf("%s\n", buf); ---- return 0; ----} ---- ----Display *ob_display; ----gint ob_screen; ----Window ob_root; ---- ----gint main() ----{ ---- Window win; ---- RrInstance *inst; ---- RrAppearance *look; ---- int done; ---- ---- Window root; ---- XEvent report; ---- gint h = 500, w = 500; ---- ---- ob_display = XOpenDisplay(NULL); ---- XSetErrorHandler(x_error_handler); ---- ob_screen = DefaultScreen(ob_display); ---- ob_root = RootWindow(ob_display, ob_screen); ---- win = ---- XCreateWindow(ob_display, RootWindow(ob_display, 0), ---- 10, 10, w, h, 10, ---- CopyFromParent, /* depth */ ---- CopyFromParent, /* class */ ---- CopyFromParent, /* visual */ ---- 0, /* valuemask */ ---- 0); /* attributes */ ---- XMapWindow(ob_display, win); ---- XSelectInput(ob_display, win, ExposureMask | StructureNotifyMask); ---- root = RootWindow (ob_display, DefaultScreen (ob_display)); ---- inst = RrInstanceNew(ob_display, ob_screen); ---- ---- look = RrAppearanceNew(inst, 0); ---- look->surface.grad = RR_SURFACE_MIRROR_HORIZONTAL; - -- look->surface.secondary = RrColorParse(inst, "Yellow"); ---- look->surface.split_secondary = RrColorParse(inst, "Red"); ---- look->surface.split_primary = RrColorParse(inst, "Green"); - -- look->surface.primary = RrColorParse(inst, "Blue"); - look->surface.secondary = RrColorParse(inst, "Dark Orange"); - look->surface.primary = RrColorParse(inst, "Dark Blue"); ---- look->surface.interlaced = FALSE; ---- if (ob_display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ----#if BIGTEST ---- int i; ---- look->surface.pixel_data = g_new(RrPixel32, w*h); ---- for (i = 0; i < 10000; ++i) { ---- printf("\r%d", i); ---- fflush(stdout); ---- RrRender(look, w, h); ---- } ---- exit (0); ----#endif ---- ---- ---- RrPaint(look, win, w, h); ---- done = 0; ---- while (!done) { ---- XNextEvent(ob_display, &report); ---- switch (report.type) { ---- case Expose: ---- break; ---- case ConfigureNotify: - look->surface.grad += 1; - if (look->surface.grad > RR_SURFACE_MIRROR_HORIZONTAL) - look->surface.grad = RR_SURFACE_SPLIT_VERTICAL; ---- RrPaint(look, win, ---- report.xconfigure.width, ---- report.xconfigure.height); ---- break; ---- case UnmapNotify: ---- done = 1; ---- break; ---- } ---- } ---- ---- RrAppearanceFree (look); ---- RrInstanceFree (inst); ---- ---- return 1; ----} diff --cc render/theme.c index ece4037c,ece4037c,ece4037c,5d5427b5..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/theme.c +++ /dev/null @@@@@ -1,1928 -1,1928 -1,1928 -1,1931 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- theme.c for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include "render.h" ----#include "color.h" ----#include "font.h" ----#include "mask.h" ----#include "theme.h" --- #include "icon.h" -#ifdef MIKACHU -# include "icon-mikamika.h" -#else -# include "icon.h" -#endif ----#include "obt/paths.h" ---- ----#include ----#include ----#include ----#include ----#include ---- ----static XrmDatabase loaddb(const gchar *name, gchar **path); ----static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value); ----static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value); ----static gboolean read_color(XrmDatabase db, const RrInstance *inst, ---- const gchar *rname, RrColor **value); ----static gboolean read_mask(const RrInstance *inst, const gchar *path, ---- RrTheme *theme, const gchar *maskname, ---- RrPixmapMask **value); ----static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, ---- const gchar *rname, RrAppearance *value, ---- gboolean allow_trans); ----static int parse_inline_number(const char *p); ----static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); ----static void set_default_appearance(RrAppearance *a); ---- ----RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, ---- gboolean allow_fallback, ---- RrFont *active_window_font, RrFont *inactive_window_font, ---- RrFont *menu_title_font, RrFont *menu_item_font, ---- RrFont *osd_font) ----{ ---- XrmDatabase db = NULL; ---- RrJustify winjust, mtitlejust; ---- gchar *str; ---- RrTheme *theme; ---- gchar *path; ---- gboolean userdef; ---- ---- if (name) { ---- db = loaddb(name, &path); ---- if (db == NULL) { ---- g_message("Unable to load the theme '%s'", name); ---- if (allow_fallback) ---- g_message("Falling back to the default theme '%s'", ---- DEFAULT_THEME); ---- /* fallback to the default theme */ ---- name = NULL; ---- } ---- } ---- if (name == NULL) { ---- if (allow_fallback) { ---- db = loaddb(DEFAULT_THEME, &path); ---- if (db == NULL) { ---- g_message("Unable to load the theme '%s'", DEFAULT_THEME); ---- return NULL; ---- } ---- } else ---- return NULL; ---- } ---- ---- theme = g_new0(RrTheme, 1); ---- ---- theme->inst = inst; ---- theme->name = g_strdup(name ? name : DEFAULT_THEME); ---- ---- theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); ---- theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); ---- theme->a_hover_focused_max = RrAppearanceNew(inst, 1); ---- theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); ---- theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); ---- theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); ---- theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); ---- theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); ---- theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); ---- theme->a_focused_grip = RrAppearanceNew(inst, 0); ---- theme->a_unfocused_grip = RrAppearanceNew(inst, 0); ---- theme->a_focused_title = RrAppearanceNew(inst, 0); ---- theme->a_unfocused_title = RrAppearanceNew(inst, 0); ---- theme->a_focused_label = RrAppearanceNew(inst, 1); ---- theme->a_unfocused_label = RrAppearanceNew(inst, 1); ---- theme->a_icon = RrAppearanceNew(inst, 1); ---- theme->a_focused_handle = RrAppearanceNew(inst, 0); ---- theme->a_unfocused_handle = RrAppearanceNew(inst, 0); ---- theme->a_menu = RrAppearanceNew(inst, 0); ---- theme->a_menu_title = RrAppearanceNew(inst, 0); ---- theme->a_menu_text_title = RrAppearanceNew(inst, 1); ---- theme->a_menu_normal = RrAppearanceNew(inst, 0); ---- theme->a_menu_selected = RrAppearanceNew(inst, 0); ---- theme->a_menu_disabled = RrAppearanceNew(inst, 0); ---- /* a_menu_disabled_selected is copied from a_menu_selected */ ---- theme->a_menu_text_normal = RrAppearanceNew(inst, 1); ---- theme->a_menu_text_selected = RrAppearanceNew(inst, 1); ---- theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); ---- theme->a_menu_text_disabled_selected = RrAppearanceNew(inst, 1); ---- theme->a_menu_bullet_normal = RrAppearanceNew(inst, 1); ---- theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1); ---- theme->a_clear = RrAppearanceNew(inst, 0); ---- theme->a_clear_tex = RrAppearanceNew(inst, 1); ---- theme->osd_hilite_bg = RrAppearanceNew(inst, 0); ---- theme->osd_hilite_label = RrAppearanceNew(inst, 1); ---- theme->osd_hilite_fg = RrAppearanceNew(inst, 0); ---- theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); ---- ---- /* load the font stuff */ ---- if (active_window_font) { ---- theme->win_font_focused = active_window_font; ---- RrFontRef(active_window_font); ---- } else ---- theme->win_font_focused = RrFontOpenDefault(inst); ---- ---- if (inactive_window_font) { ---- theme->win_font_unfocused = inactive_window_font; ---- RrFontRef(inactive_window_font); ---- } else ---- theme->win_font_unfocused = RrFontOpenDefault(inst); ---- ---- winjust = RR_JUSTIFY_LEFT; ---- if (read_string(db, "window.label.text.justify", &str)) { ---- if (!g_ascii_strcasecmp(str, "right")) ---- winjust = RR_JUSTIFY_RIGHT; ---- else if (!g_ascii_strcasecmp(str, "center")) ---- winjust = RR_JUSTIFY_CENTER; ---- } ---- ---- if (menu_title_font) { ---- theme->menu_title_font = menu_title_font; ---- RrFontRef(menu_title_font); ---- } else ---- theme->menu_title_font = RrFontOpenDefault(inst); ---- ---- mtitlejust = RR_JUSTIFY_LEFT; ---- if (read_string(db, "menu.title.text.justify", &str)) { ---- if (!g_ascii_strcasecmp(str, "right")) ---- mtitlejust = RR_JUSTIFY_RIGHT; ---- else if (!g_ascii_strcasecmp(str, "center")) ---- mtitlejust = RR_JUSTIFY_CENTER; ---- } ---- ---- if (menu_item_font) { ---- theme->menu_font = menu_item_font; ---- RrFontRef(menu_item_font); ---- } else ---- theme->menu_font = RrFontOpenDefault(inst); ---- ---- if (osd_font) { ---- theme->osd_font = osd_font; ---- RrFontRef(osd_font); ---- } else ---- theme->osd_font = RrFontOpenDefault(inst); ---- ---- /* load direct dimensions */ ---- if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && ---- !read_int(db, "menu.overlap", &theme->menu_overlap_x)) || ---- theme->menu_overlap_x < -100 || theme->menu_overlap_x > 100) ---- theme->menu_overlap_x = 0; ---- if ((!read_int(db, "menu.overlap.y", &theme->menu_overlap_y) && ---- !read_int(db, "menu.overlap", &theme->menu_overlap_y)) || ---- theme->menu_overlap_y < -100 || theme->menu_overlap_y > 100) ---- theme->menu_overlap_y = 0; ---- if (!read_int(db, "window.handle.width", &theme->handle_height) || ---- theme->handle_height < 0 || theme->handle_height > 100) ---- theme->handle_height = 6; ---- if (!read_int(db, "padding.width", &theme->paddingx) || ---- theme->paddingx < 0 || theme->paddingx > 100) ---- theme->paddingx = 3; ---- if (!read_int(db, "padding.height", &theme->paddingy) || ---- theme->paddingy < 0 || theme->paddingy > 100) ---- theme->paddingy = theme->paddingx; ---- if (!read_int(db, "border.width", &theme->fbwidth) || ---- theme->fbwidth < 0 || theme->fbwidth > 100) ---- theme->fbwidth = 1; ---- /* menu border width inherits from the frame border width */ ---- if (!read_int(db, "menu.border.width", &theme->mbwidth) || ---- theme->mbwidth < 0 || theme->mbwidth > 100) ---- theme->mbwidth = theme->fbwidth; ---- /* osd border width inherits from the frame border width */ ---- if (!read_int(db, "osd.border.width", &theme->obwidth) || ---- theme->obwidth < 0 || theme->obwidth > 100) ---- theme->obwidth = theme->fbwidth; ---- if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) || ---- theme->cbwidthx < 0 || theme->cbwidthx > 100) ---- theme->cbwidthx = theme->paddingx; ---- if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) || ---- theme->cbwidthy < 0 || theme->cbwidthy > 100) ---- theme->cbwidthy = theme->cbwidthx; ---- if (!read_int(db, "menu.separator.width", &theme->menu_sep_width) || ---- theme->menu_sep_width < 1 || theme->menu_sep_width > 100) ---- theme->menu_sep_width = 1; ---- if (!read_int(db, "menu.separator.padding.width", ---- &theme->menu_sep_paddingx) || ---- theme->menu_sep_paddingx < 0 || theme->menu_sep_paddingx > 100) ---- theme->menu_sep_paddingx = 6; ---- if (!read_int(db, "menu.separator.padding.height", ---- &theme->menu_sep_paddingy) || ---- theme->menu_sep_paddingy < 0 || theme->menu_sep_paddingy > 100) ---- theme->menu_sep_paddingy = 3; ---- ---- /* load colors */ ---- if (!read_color(db, inst, ---- "window.active.border.color", ---- &theme->frame_focused_border_color) && ---- !read_color(db, inst, ---- "border.color", ---- &theme->frame_focused_border_color)) ---- theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); ---- /* title separator focused color inherits from focused border color */ ---- if (!read_color(db, inst, ---- "window.active.title.separator.color", ---- &theme->title_separator_focused_color)) ---- theme->title_separator_focused_color = ---- RrColorNew(inst, ---- theme->frame_focused_border_color->r, ---- theme->frame_focused_border_color->g, ---- theme->frame_focused_border_color->b); ---- /* unfocused border color inherits from frame focused border color */ ---- if (!read_color(db, inst, ---- "window.inactive.border.color", ---- &theme->frame_unfocused_border_color)) ---- theme->frame_unfocused_border_color = ---- RrColorNew(inst, theme->frame_focused_border_color->r, ---- theme->frame_focused_border_color->g, ---- theme->frame_focused_border_color->b); ---- /* title separator unfocused color inherits from unfocused border color */ ---- if (!read_color(db, inst, ---- "window.inactive.title.separator.color", ---- &theme->title_separator_unfocused_color)) ---- theme->title_separator_unfocused_color = ---- RrColorNew(inst, ---- theme->frame_unfocused_border_color->r, ---- theme->frame_unfocused_border_color->g, ---- theme->frame_unfocused_border_color->b); ---- ---- /* menu border color inherits from frame focused border color */ ---- if (!read_color(db, inst, "menu.border.color", &theme->menu_border_color)) ---- theme->menu_border_color = ---- RrColorNew(inst, ---- theme->frame_focused_border_color->r, ---- theme->frame_focused_border_color->g, ---- theme->frame_focused_border_color->b); ---- /* osd border color inherits from frame focused border color */ ---- if (!read_color(db, inst, "osd.border.color", &theme->osd_border_color)) ---- theme->osd_border_color = ---- RrColorNew(inst, ---- theme->frame_focused_border_color->r, ---- theme->frame_focused_border_color->g, ---- theme->frame_focused_border_color->b); ---- if (!read_color(db, inst, ---- "window.active.client.color", ---- &theme->cb_focused_color)) ---- theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "window.inactive.client.color", ---- &theme->cb_unfocused_color)) ---- theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "window.active.label.text.color", ---- &theme->title_focused_color)) ---- theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); ---- if (!read_color(db, inst, "osd.label.text.color", &theme->osd_color)) ---- theme->osd_color = RrColorNew(inst, ---- theme->title_focused_color->r, ---- theme->title_focused_color->g, ---- theme->title_focused_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.label.text.color", ---- &theme->title_unfocused_color)) ---- theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "window.active.button.unpressed.image.color", ---- &theme->titlebut_focused_unpressed_color)) ---- theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ---- "window.inactive.button.unpressed.image.color", ---- &theme->titlebut_unfocused_unpressed_color)) ---- theme->titlebut_unfocused_unpressed_color = ---- RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "window.active.button.pressed.image.color", ---- &theme->titlebut_focused_pressed_color)) ---- theme->titlebut_focused_pressed_color = ---- RrColorNew(inst, ---- theme->titlebut_focused_unpressed_color->r, ---- theme->titlebut_focused_unpressed_color->g, ---- theme->titlebut_focused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.button.pressed.image.color", ---- &theme->titlebut_unfocused_pressed_color)) ---- theme->titlebut_unfocused_pressed_color = ---- RrColorNew(inst, ---- theme->titlebut_unfocused_unpressed_color->r, ---- theme->titlebut_unfocused_unpressed_color->g, ---- theme->titlebut_unfocused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.active.button.disabled.image.color", ---- &theme->titlebut_disabled_focused_color)) ---- theme->titlebut_disabled_focused_color = ---- RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "window.inactive.button.disabled.image.color", ---- &theme->titlebut_disabled_unfocused_color)) ---- theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ---- "window.active.button.hover.image.color", ---- &theme->titlebut_hover_focused_color)) ---- theme->titlebut_hover_focused_color = ---- RrColorNew(inst, ---- theme->titlebut_focused_unpressed_color->r, ---- theme->titlebut_focused_unpressed_color->g, ---- theme->titlebut_focused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.button.hover.image.color", ---- &theme->titlebut_hover_unfocused_color)) ---- theme->titlebut_hover_unfocused_color = ---- RrColorNew(inst, ---- theme->titlebut_unfocused_unpressed_color->r, ---- theme->titlebut_unfocused_unpressed_color->g, ---- theme->titlebut_unfocused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.active.button.toggled.unpressed.image.color", ---- &theme->titlebut_toggled_focused_unpressed_color) && ---- !read_color(db, inst, ---- "window.active.button.toggled.image.color", ---- &theme->titlebut_toggled_focused_unpressed_color)) ---- theme->titlebut_toggled_focused_unpressed_color = ---- RrColorNew(inst, ---- theme->titlebut_focused_pressed_color->r, ---- theme->titlebut_focused_pressed_color->g, ---- theme->titlebut_focused_pressed_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.button.toggled.unpressed.image.color", ---- &theme->titlebut_toggled_unfocused_unpressed_color) && ---- !read_color(db, inst, ---- "window.inactive.button.toggled.image.color", ---- &theme->titlebut_toggled_unfocused_unpressed_color)) ---- theme->titlebut_toggled_unfocused_unpressed_color = ---- RrColorNew(inst, ---- theme->titlebut_unfocused_pressed_color->r, ---- theme->titlebut_unfocused_pressed_color->g, ---- theme->titlebut_unfocused_pressed_color->b); ---- if (!read_color(db, inst, ---- "window.active.button.toggled.hover.image.color", ---- &theme->titlebut_toggled_hover_focused_color)) ---- theme->titlebut_toggled_hover_focused_color = ---- RrColorNew(inst, ---- theme->titlebut_toggled_focused_unpressed_color->r, ---- theme->titlebut_toggled_focused_unpressed_color->g, ---- theme->titlebut_toggled_focused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.button.toggled.hover.image.color", ---- &theme->titlebut_toggled_hover_unfocused_color)) ---- theme->titlebut_toggled_hover_unfocused_color = ---- RrColorNew(inst, ---- theme->titlebut_toggled_unfocused_unpressed_color->r, ---- theme->titlebut_toggled_unfocused_unpressed_color->g, ---- theme->titlebut_toggled_unfocused_unpressed_color->b); ---- if (!read_color(db, inst, ---- "window.active.button.toggled.pressed.image.color", ---- &theme->titlebut_toggled_focused_pressed_color)) ---- theme->titlebut_toggled_focused_pressed_color = ---- RrColorNew(inst, ---- theme->titlebut_focused_pressed_color->r, ---- theme->titlebut_focused_pressed_color->g, ---- theme->titlebut_focused_pressed_color->b); ---- if (!read_color(db, inst, ---- "window.inactive.button.toggled.pressed.image.color", ---- &theme->titlebut_toggled_unfocused_pressed_color)) ---- theme->titlebut_toggled_unfocused_pressed_color = ---- RrColorNew(inst, ---- theme->titlebut_unfocused_pressed_color->r, ---- theme->titlebut_unfocused_pressed_color->g, ---- theme->titlebut_unfocused_pressed_color->b); ---- if (!read_color(db, inst, ---- "menu.title.text.color", &theme->menu_title_color)) ---- theme->menu_title_color = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ---- "menu.items.text.color", &theme->menu_color)) ---- theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); ---- if (!read_color(db, inst, ---- "menu.items.disabled.text.color", ---- &theme->menu_disabled_color)) ---- theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ---- "menu.items.active.disabled.text.color", ---- &theme->menu_disabled_selected_color)) ---- theme->menu_disabled_selected_color = ---- RrColorNew(inst, ---- theme->menu_disabled_color->r, ---- theme->menu_disabled_color->g, ---- theme->menu_disabled_color->b); ---- if (!read_color(db, inst, ---- "menu.items.active.text.color", ---- &theme->menu_selected_color)) ---- theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ---- "menu.separator.color", &theme->menu_sep_color)) ---- theme->menu_sep_color = RrColorNew(inst, ---- theme->menu_color->r, ---- theme->menu_color->g, ---- theme->menu_color->b); ---- ---- /* load the image masks */ ---- ---- /* maximize button masks */ ---- userdef = TRUE; ---- if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { ---- guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; ---- theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- userdef = FALSE; ---- } ---- if (!read_mask(inst, path, theme, "max_toggled.xbm", ---- &theme->max_toggled_mask)) ---- { ---- if (userdef) ---- theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); ---- else { ---- guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; ---- theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); ---- } ---- } ---- if (!read_mask(inst, path, theme, "max_pressed.xbm", ---- &theme->max_pressed_mask)) ---- theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); ---- if (!read_mask(inst,path,theme,"max_disabled.xbm", ---- &theme->max_disabled_mask)) ---- theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); ---- if (!read_mask(inst, path, theme, "max_hover.xbm", &theme->max_hover_mask)) ---- theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); ---- if (!read_mask(inst, path, theme, "max_toggled_pressed.xbm", ---- &theme->max_toggled_pressed_mask)) ---- theme->max_toggled_pressed_mask = ---- RrPixmapMaskCopy(theme->max_toggled_mask); ---- if (!read_mask(inst, path, theme, "max_toggled_hover.xbm", ---- &theme->max_toggled_hover_mask)) ---- theme->max_toggled_hover_mask = ---- RrPixmapMaskCopy(theme->max_toggled_mask); ---- ---- /* iconify button masks */ ---- if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { ---- guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; ---- theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- } ---- if (!read_mask(inst, path, theme, "iconify_pressed.xbm", ---- &theme->iconify_pressed_mask)) ---- theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); ---- if (!read_mask(inst, path, theme, "iconify_disabled.xbm", ---- &theme->iconify_disabled_mask)) ---- theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); ---- if (!read_mask(inst, path, theme, "iconify_hover.xbm", ---- &theme->iconify_hover_mask)) ---- theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); ---- ---- /* all desktops button masks */ ---- userdef = TRUE; ---- if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { ---- guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; ---- theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- userdef = FALSE; ---- } ---- if (!read_mask(inst, path, theme, "desk_toggled.xbm", ---- &theme->desk_toggled_mask)) { ---- if (userdef) ---- theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); ---- else { ---- guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; ---- theme->desk_toggled_mask = ---- RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- } ---- } ---- if (!read_mask(inst, path, theme, "desk_pressed.xbm", ---- &theme->desk_pressed_mask)) ---- theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); ---- if (!read_mask(inst, path, theme, "desk_disabled.xbm", ---- &theme->desk_disabled_mask)) ---- theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); ---- if (!read_mask(inst, path, theme, "desk_hover.xbm", ---- &theme->desk_hover_mask)) ---- theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); ---- if (!read_mask(inst, path, theme, "desk_toggled_pressed.xbm", ---- &theme->desk_toggled_pressed_mask)) ---- theme->desk_toggled_pressed_mask = ---- RrPixmapMaskCopy(theme->desk_toggled_mask); ---- if (!read_mask(inst, path, theme, "desk_toggled_hover.xbm", ---- &theme->desk_toggled_hover_mask)) ---- theme->desk_toggled_hover_mask = ---- RrPixmapMaskCopy(theme->desk_toggled_mask); ---- ---- /* shade button masks */ ---- if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { ---- guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; ---- theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- } ---- if (!read_mask(inst, path, theme, "shade_toggled.xbm", ---- &theme->shade_toggled_mask)) ---- theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); ---- if (!read_mask(inst, path, theme, "shade_pressed.xbm", ---- &theme->shade_pressed_mask)) ---- theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); ---- if (!read_mask(inst, path, theme, "shade_disabled.xbm", ---- &theme->shade_disabled_mask)) ---- theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); ---- if (!read_mask(inst, path, theme, "shade_hover.xbm", ---- &theme->shade_hover_mask)) ---- theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); ---- if (!read_mask(inst, path, theme, "shade_toggled_pressed.xbm", ---- &theme->shade_toggled_pressed_mask)) ---- theme->shade_toggled_pressed_mask = ---- RrPixmapMaskCopy(theme->shade_toggled_mask); ---- if (!read_mask(inst, path, theme, "shade_toggled_hover.xbm", ---- &theme->shade_toggled_hover_mask)) ---- theme->shade_toggled_hover_mask = ---- RrPixmapMaskCopy(theme->shade_toggled_mask); ---- ---- /* close button masks */ ---- if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { ---- guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; ---- theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); ---- } ---- if (!read_mask(inst, path, theme, "close_pressed.xbm", ---- &theme->close_pressed_mask)) ---- theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); ---- if (!read_mask(inst, path, theme, "close_disabled.xbm", ---- &theme->close_disabled_mask)) ---- theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); ---- if (!read_mask(inst, path, theme, "close_hover.xbm", ---- &theme->close_hover_mask)) ---- theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); ---- ---- /* submenu bullet mask */ ---- if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) ---- { ---- guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; ---- theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); ---- } ---- ---- /* up and down arrows */ ---- { ---- guchar data[] = { 0xfe, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x10, 0x00 }; ---- theme->down_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); ---- } ---- { ---- guchar data[] = { 0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00 }; ---- theme->up_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); ---- } ---- ---- /* setup the default window icon */ ---- theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, ---- OB_DEFAULT_ICON_HEIGHT, ---- OB_DEFAULT_ICON_pixel_data); ---- theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; ---- theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; ---- ---- ---- /* read the decoration textures */ ---- if (!read_appearance(db, inst, ---- "window.active.title.bg", theme->a_focused_title, ---- FALSE)) ---- set_default_appearance(theme->a_focused_title); ---- if (!read_appearance(db, inst, ---- "window.inactive.title.bg", theme->a_unfocused_title, ---- FALSE)) ---- set_default_appearance(theme->a_unfocused_title); ---- if (!read_appearance(db, inst, ---- "window.active.label.bg", theme->a_focused_label, ---- TRUE)) ---- set_default_appearance(theme->a_focused_label); ---- if (!read_appearance(db, inst, ---- "window.inactive.label.bg", theme->a_unfocused_label, ---- TRUE)) ---- set_default_appearance(theme->a_unfocused_label); ---- if (!read_appearance(db, inst, ---- "window.active.handle.bg", theme->a_focused_handle, ---- FALSE)) ---- set_default_appearance(theme->a_focused_handle); ---- if (!read_appearance(db, inst, ---- "window.inactive.handle.bg",theme->a_unfocused_handle, ---- FALSE)) ---- set_default_appearance(theme->a_unfocused_handle); ---- if (!read_appearance(db, inst, ---- "window.active.grip.bg", theme->a_focused_grip, ---- TRUE)) ---- set_default_appearance(theme->a_focused_grip); ---- if (!read_appearance(db, inst, ---- "window.inactive.grip.bg", theme->a_unfocused_grip, ---- TRUE)) ---- set_default_appearance(theme->a_unfocused_grip); ---- if (!read_appearance(db, inst, ---- "menu.items.bg", theme->a_menu, ---- FALSE)) ---- set_default_appearance(theme->a_menu); ---- if (!read_appearance(db, inst, ---- "menu.title.bg", theme->a_menu_title, ---- TRUE)) ---- set_default_appearance(theme->a_menu_title); ---- if (!read_appearance(db, inst, ---- "menu.items.active.bg", theme->a_menu_selected, ---- TRUE)) ---- set_default_appearance(theme->a_menu_selected); ---- theme->a_menu_disabled_selected = ---- RrAppearanceCopy(theme->a_menu_selected); ---- ---- /* read appearances for non-decorations (on-screen-display) */ ---- if (!read_appearance(db, inst, "osd.bg", theme->osd_hilite_bg, FALSE)) { ---- RrAppearanceFree(theme->osd_hilite_bg); ---- theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); ---- } ---- if (!read_appearance(db, inst, "osd.label.bg", ---- theme->osd_hilite_label, TRUE)) { ---- RrAppearanceFree(theme->osd_hilite_label); ---- theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); ---- } ---- /* osd_hilite_fg can't be parentrel */ ---- if (!read_appearance(db, inst, "osd.hilight.bg", ---- theme->osd_hilite_fg, FALSE)) { ---- RrAppearanceFree(theme->osd_hilite_fg); ---- if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) ---- theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); ---- else ---- theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); ---- } ---- /* osd_unhilite_fg can't be parentrel either */ ---- if (!read_appearance(db, inst, "osd.unhilight.bg", ---- theme->osd_unhilite_fg, FALSE)) { ---- RrAppearanceFree(theme->osd_unhilite_fg); ---- if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) ---- theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_label); ---- else ---- theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_title); ---- } ---- ---- /* read buttons textures */ ---- if (!read_appearance(db, inst, ---- "window.active.button.disabled.bg", ---- theme->a_disabled_focused_max, ---- TRUE)) ---- set_default_appearance(theme->a_disabled_focused_max); ---- if (!read_appearance(db, inst, ---- "window.inactive.button.disabled.bg", ---- theme->a_disabled_unfocused_max, ---- TRUE)) ---- set_default_appearance(theme->a_disabled_unfocused_max); ---- if (!read_appearance(db, inst, ---- "window.active.button.pressed.bg", ---- theme->a_focused_pressed_max, ---- TRUE)) ---- set_default_appearance(theme->a_focused_pressed_max); ---- if (!read_appearance(db, inst, ---- "window.inactive.button.pressed.bg", ---- theme->a_unfocused_pressed_max, ---- TRUE)) ---- set_default_appearance(theme->a_unfocused_pressed_max); ---- if (!read_appearance(db, inst, ---- "window.active.button.toggled.unpressed.bg", ---- theme->a_toggled_focused_unpressed_max, ---- TRUE) && ---- !read_appearance(db, inst, ---- "window.active.button.toggled.bg", ---- theme->a_toggled_focused_unpressed_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_focused_unpressed_max); ---- theme->a_toggled_focused_unpressed_max = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.inactive.button.toggled.unpressed.bg", ---- theme->a_toggled_unfocused_unpressed_max, ---- TRUE) && ---- !read_appearance(db, inst, ---- "window.inactive.button.toggled.bg", ---- theme->a_toggled_unfocused_unpressed_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); ---- theme->a_toggled_unfocused_unpressed_max = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.active.button.toggled.hover.bg", ---- theme->a_toggled_hover_focused_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_hover_focused_max); ---- theme->a_toggled_hover_focused_max = ---- RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.inactive.button.toggled.hover.bg", ---- theme->a_toggled_hover_unfocused_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_hover_unfocused_max); ---- theme->a_toggled_hover_unfocused_max = ---- RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.active.button.toggled.pressed.bg", ---- theme->a_toggled_focused_pressed_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_focused_pressed_max); ---- theme->a_toggled_focused_pressed_max = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.inactive.button.toggled.pressed.bg", ---- theme->a_toggled_unfocused_pressed_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); ---- theme->a_toggled_unfocused_pressed_max = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.active.button.unpressed.bg", ---- theme->a_focused_unpressed_max, ---- TRUE)) ---- set_default_appearance(theme->a_focused_unpressed_max); ---- if (!read_appearance(db, inst, ---- "window.inactive.button.unpressed.bg", ---- theme->a_unfocused_unpressed_max, ---- TRUE)) ---- set_default_appearance(theme->a_unfocused_unpressed_max); ---- if (!read_appearance(db, inst, ---- "window.active.button.hover.bg", ---- theme->a_hover_focused_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_hover_focused_max); ---- theme->a_hover_focused_max = ---- RrAppearanceCopy(theme->a_focused_unpressed_max); ---- } ---- if (!read_appearance(db, inst, ---- "window.inactive.button.hover.bg", ---- theme->a_hover_unfocused_max, ---- TRUE)) ---- { ---- RrAppearanceFree(theme->a_hover_unfocused_max); ---- theme->a_hover_unfocused_max = ---- RrAppearanceCopy(theme->a_unfocused_unpressed_max); ---- } ---- ---- theme->a_disabled_focused_close = ---- RrAppearanceCopy(theme->a_disabled_focused_max); ---- theme->a_disabled_unfocused_close = ---- RrAppearanceCopy(theme->a_disabled_unfocused_max); ---- theme->a_hover_focused_close = ---- RrAppearanceCopy(theme->a_hover_focused_max); ---- theme->a_hover_unfocused_close = ---- RrAppearanceCopy(theme->a_hover_unfocused_max); ---- theme->a_unfocused_unpressed_close = ---- RrAppearanceCopy(theme->a_unfocused_unpressed_max); ---- theme->a_unfocused_pressed_close = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- theme->a_focused_unpressed_close = ---- RrAppearanceCopy(theme->a_focused_unpressed_max); ---- theme->a_focused_pressed_close = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- theme->a_disabled_focused_desk = ---- RrAppearanceCopy(theme->a_disabled_focused_max); ---- theme->a_disabled_unfocused_desk = ---- RrAppearanceCopy(theme->a_disabled_unfocused_max); ---- theme->a_hover_focused_desk = ---- RrAppearanceCopy(theme->a_hover_focused_max); ---- theme->a_hover_unfocused_desk = ---- RrAppearanceCopy(theme->a_hover_unfocused_max); ---- theme->a_toggled_hover_focused_desk = ---- RrAppearanceCopy(theme->a_toggled_hover_focused_max); ---- theme->a_toggled_hover_unfocused_desk = ---- RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); ---- theme->a_toggled_focused_unpressed_desk = ---- RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); ---- theme->a_toggled_unfocused_unpressed_desk = ---- RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); ---- theme->a_toggled_focused_pressed_desk = ---- RrAppearanceCopy(theme->a_toggled_focused_pressed_max); ---- theme->a_toggled_unfocused_pressed_desk = ---- RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); ---- theme->a_unfocused_unpressed_desk = ---- RrAppearanceCopy(theme->a_unfocused_unpressed_max); ---- theme->a_unfocused_pressed_desk = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- theme->a_focused_unpressed_desk = ---- RrAppearanceCopy(theme->a_focused_unpressed_max); ---- theme->a_focused_pressed_desk = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- theme->a_disabled_focused_shade = ---- RrAppearanceCopy(theme->a_disabled_focused_max); ---- theme->a_disabled_unfocused_shade = ---- RrAppearanceCopy(theme->a_disabled_unfocused_max); ---- theme->a_hover_focused_shade = ---- RrAppearanceCopy(theme->a_hover_focused_max); ---- theme->a_hover_unfocused_shade = ---- RrAppearanceCopy(theme->a_hover_unfocused_max); ---- theme->a_toggled_hover_focused_shade = ---- RrAppearanceCopy(theme->a_toggled_hover_focused_max); ---- theme->a_toggled_hover_unfocused_shade = ---- RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); ---- theme->a_toggled_focused_unpressed_shade = ---- RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); ---- theme->a_toggled_unfocused_unpressed_shade = ---- RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); ---- theme->a_toggled_focused_pressed_shade = ---- RrAppearanceCopy(theme->a_toggled_focused_pressed_max); ---- theme->a_toggled_unfocused_pressed_shade = ---- RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); ---- theme->a_unfocused_unpressed_shade = ---- RrAppearanceCopy(theme->a_unfocused_unpressed_max); ---- theme->a_unfocused_pressed_shade = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- theme->a_focused_unpressed_shade = ---- RrAppearanceCopy(theme->a_focused_unpressed_max); ---- theme->a_focused_pressed_shade = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- theme->a_disabled_focused_iconify = ---- RrAppearanceCopy(theme->a_disabled_focused_max); ---- theme->a_disabled_unfocused_iconify = ---- RrAppearanceCopy(theme->a_disabled_focused_max); ---- theme->a_hover_focused_iconify = ---- RrAppearanceCopy(theme->a_hover_focused_max); ---- theme->a_hover_unfocused_iconify = ---- RrAppearanceCopy(theme->a_hover_unfocused_max); ---- theme->a_unfocused_unpressed_iconify = ---- RrAppearanceCopy(theme->a_unfocused_unpressed_max); ---- theme->a_unfocused_pressed_iconify = ---- RrAppearanceCopy(theme->a_unfocused_pressed_max); ---- theme->a_focused_unpressed_iconify = ---- RrAppearanceCopy(theme->a_focused_unpressed_max); ---- theme->a_focused_pressed_iconify = ---- RrAppearanceCopy(theme->a_focused_pressed_max); ---- ---- theme->a_icon->surface.grad = ---- theme->a_clear->surface.grad = ---- theme->a_clear_tex->surface.grad = ---- theme->a_menu_text_title->surface.grad = ---- theme->a_menu_normal->surface.grad = ---- theme->a_menu_disabled->surface.grad = ---- theme->a_menu_text_normal->surface.grad = ---- theme->a_menu_text_selected->surface.grad = ---- theme->a_menu_text_disabled->surface.grad = ---- theme->a_menu_text_disabled_selected->surface.grad = ---- theme->a_menu_bullet_normal->surface.grad = ---- theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; ---- ---- /* set up the textures */ ---- theme->a_focused_label->texture[0].type = RR_TEXTURE_TEXT; ---- theme->a_focused_label->texture[0].data.text.justify = winjust; ---- theme->a_focused_label->texture[0].data.text.font=theme->win_font_focused; ---- theme->a_focused_label->texture[0].data.text.color = ---- theme->title_focused_color; ---- ---- if (read_string(db, "window.active.label.text.font", &str)) { ---- char *p; ---- gint i = 0; ---- gint j; ---- if (strstr(str, "shadow=y")) { ---- if ((p = strstr(str, "shadowoffset="))) ---- i = parse_inline_number(p + strlen("shadowoffset=")); ---- else ---- i = 1; ---- theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; ---- theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; ---- } ---- if ((p = strstr(str, "shadowtint="))) ---- { ---- i = parse_inline_number(p + strlen("shadowtint=")); ---- j = (i > 0 ? 0 : 255); ---- i = ABS(i*255/100); ---- ---- theme->title_focused_shadow_color = RrColorNew(inst, j, j, j); ---- theme->title_focused_shadow_alpha = i; ---- } else { ---- theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->title_focused_shadow_alpha = 50; ---- } ---- } ---- ---- theme->a_focused_label->texture[0].data.text.shadow_color = ---- theme->title_focused_shadow_color; ---- theme->a_focused_label->texture[0].data.text.shadow_alpha = ---- theme->title_focused_shadow_alpha; ---- ---- theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; ---- theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; ---- theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; ---- theme->osd_hilite_label->texture[0].data.text.color = theme->osd_color; ---- ---- if (read_string(db, "osd.label.text.font", &str)) { ---- char *p; ---- gint i = 0; ---- gint j; ---- if (strstr(str, "shadow=y")) { ---- if ((p = strstr(str, "shadowoffset="))) ---- i = parse_inline_number(p + strlen("shadowoffset=")); ---- else ---- i = 1; ---- theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; ---- theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; ---- theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = i; ---- theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = i; ---- } ---- if ((p = strstr(str, "shadowtint="))) ---- { ---- i = parse_inline_number(p + strlen("shadowtint=")); ---- j = (i > 0 ? 0 : 255); ---- i = ABS(i*255/100); ---- ---- theme->osd_shadow_color = RrColorNew(inst, j, j, j); ---- theme->osd_shadow_alpha = i; ---- } else { ---- theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->osd_shadow_alpha = 50; ---- } ---- } else { ---- /* inherit the font settings from the focused label */ ---- theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = ---- theme->a_focused_label->texture[0].data.text.shadow_offset_x; ---- theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = ---- theme->a_focused_label->texture[0].data.text.shadow_offset_y; ---- if (theme->title_focused_shadow_color) ---- theme->osd_shadow_color = ---- RrColorNew(inst, ---- theme->title_focused_shadow_color->r, ---- theme->title_focused_shadow_color->g, ---- theme->title_focused_shadow_color->b); ---- else ---- theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->osd_shadow_alpha = theme->title_focused_shadow_alpha; ---- } ---- ---- theme->osd_hilite_label->texture[0].data.text.shadow_color = ---- theme->osd_shadow_color; ---- theme->osd_hilite_label->texture[0].data.text.shadow_alpha = ---- theme->osd_shadow_alpha; ---- ---- theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; ---- theme->a_unfocused_label->texture[0].data.text.justify = winjust; ---- theme->a_unfocused_label->texture[0].data.text.font = ---- theme->win_font_unfocused; ---- theme->a_unfocused_label->texture[0].data.text.color = ---- theme->title_unfocused_color; ---- ---- if (read_string(db, "window.inactive.label.text.font", &str)) { ---- char *p; ---- gint i = 0; ---- gint j; ---- if (strstr(str, "shadow=y")) { ---- if ((p = strstr(str, "shadowoffset="))) ---- i = parse_inline_number(p + strlen("shadowoffset=")); ---- else ---- i = 1; ---- theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = i; ---- theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = i; ---- } ---- if ((p = strstr(str, "shadowtint="))) ---- { ---- i = parse_inline_number(p + strlen("shadowtint=")); ---- j = (i > 0 ? 0 : 255); ---- i = ABS(i*255/100); ---- ---- theme->title_unfocused_shadow_color = RrColorNew(inst, j, j, j); ---- theme->title_unfocused_shadow_alpha = i; ---- } else { ---- theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->title_unfocused_shadow_alpha = 50; ---- } ---- } ---- ---- theme->a_unfocused_label->texture[0].data.text.shadow_color = ---- theme->title_unfocused_shadow_color; ---- theme->a_unfocused_label->texture[0].data.text.shadow_alpha = ---- theme->title_unfocused_shadow_alpha; ---- ---- theme->a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT; ---- theme->a_menu_text_title->texture[0].data.text.justify = mtitlejust; ---- theme->a_menu_text_title->texture[0].data.text.font = ---- theme->menu_title_font; ---- theme->a_menu_text_title->texture[0].data.text.color = ---- theme->menu_title_color; ---- ---- if (read_string(db, "menu.title.text.font", &str)) { ---- char *p; ---- gint i = 0; ---- gint j; ---- if (strstr(str, "shadow=y")) { ---- if ((p = strstr(str, "shadowoffset="))) ---- i = parse_inline_number(p + strlen("shadowoffset=")); ---- else ---- i = 1; ---- theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = i; ---- theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = i; ---- } ---- if ((p = strstr(str, "shadowtint="))) ---- { ---- i = parse_inline_number(p + strlen("shadowtint=")); ---- j = (i > 0 ? 0 : 255); ---- i = ABS(i*255/100); ---- ---- theme->menu_title_shadow_color = RrColorNew(inst, j, j, j); ---- theme->menu_title_shadow_alpha = i; ---- } else { ---- theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->menu_title_shadow_alpha = 50; ---- } ---- } ---- ---- theme->a_menu_text_title->texture[0].data.text.shadow_color = ---- theme->menu_title_shadow_color; ---- theme->a_menu_text_title->texture[0].data.text.shadow_alpha = ---- theme->menu_title_shadow_alpha; ---- ---- theme->a_menu_text_normal->texture[0].type = ---- theme->a_menu_text_selected->texture[0].type = ---- theme->a_menu_text_disabled->texture[0].type = ---- theme->a_menu_text_disabled_selected->texture[0].type = ---- RR_TEXTURE_TEXT; ---- theme->a_menu_text_normal->texture[0].data.text.justify = ---- theme->a_menu_text_selected->texture[0].data.text.justify = ---- theme->a_menu_text_disabled->texture[0].data.text.justify = ---- theme->a_menu_text_disabled_selected->texture[0].data.text.justify = ---- RR_JUSTIFY_LEFT; ---- theme->a_menu_text_normal->texture[0].data.text.font = ---- theme->a_menu_text_selected->texture[0].data.text.font = ---- theme->a_menu_text_disabled->texture[0].data.text.font = ---- theme->a_menu_text_disabled_selected->texture[0].data.text.font = ---- theme->menu_font; ---- theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color; ---- theme->a_menu_text_selected->texture[0].data.text.color = ---- theme->menu_selected_color; ---- theme->a_menu_text_disabled->texture[0].data.text.color = ---- theme->menu_disabled_color; ---- theme->a_menu_text_disabled_selected->texture[0].data.text.color = ---- theme->menu_disabled_selected_color; ---- ---- if (read_string(db, "menu.items.font", &str)) { ---- char *p; ---- gint i = 0; ---- gint j; ---- if (strstr(str, "shadow=y")) { ---- if ((p = strstr(str, "shadowoffset="))) ---- i = parse_inline_number(p + strlen("shadowoffset=")); ---- else ---- i = 1; ---- theme->a_menu_text_normal-> ---- texture[0].data.text.shadow_offset_x = i; ---- theme->a_menu_text_normal-> ---- texture[0].data.text.shadow_offset_y = i; ---- theme->a_menu_text_selected-> ---- texture[0].data.text.shadow_offset_x = i; ---- theme->a_menu_text_selected-> ---- texture[0].data.text.shadow_offset_y = i; ---- theme->a_menu_text_disabled-> ---- texture[0].data.text.shadow_offset_x = i; ---- theme->a_menu_text_disabled-> ---- texture[0].data.text.shadow_offset_y = i; ---- theme->a_menu_text_disabled_selected-> ---- texture[0].data.text.shadow_offset_x = i; ---- theme->a_menu_text_disabled_selected-> ---- texture[0].data.text.shadow_offset_y = i; ---- } ---- if ((p = strstr(str, "shadowtint="))) ---- { ---- i = parse_inline_number(p + strlen("shadowtint=")); ---- j = (i > 0 ? 0 : 255); ---- i = ABS(i*255/100); ---- ---- theme->menu_text_normal_shadow_color = RrColorNew(inst, j, j, j); ---- theme->menu_text_selected_shadow_color = RrColorNew(inst, j, j, j); ---- theme->menu_text_disabled_shadow_color = RrColorNew(inst, j, j, j); ---- theme->menu_text_normal_shadow_alpha = i; ---- theme->menu_text_selected_shadow_alpha = i; ---- theme->menu_text_disabled_shadow_alpha = i; ---- theme->menu_text_disabled_selected_shadow_alpha = i; ---- } else { ---- theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->menu_text_disabled_shadow_color = RrColorNew(inst, 0, 0, 0); ---- theme->menu_text_normal_shadow_alpha = 50; ---- theme->menu_text_selected_shadow_alpha = 50; ---- theme->menu_text_disabled_selected_shadow_alpha = 50; ---- } ---- } ---- ---- theme->a_menu_text_normal->texture[0].data.text.shadow_color = ---- theme->menu_text_normal_shadow_color; ---- theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = ---- theme->menu_text_normal_shadow_alpha; ---- theme->a_menu_text_selected->texture[0].data.text.shadow_color = ---- theme->menu_text_selected_shadow_color; ---- theme->a_menu_text_selected->texture[0].data.text.shadow_alpha = ---- theme->menu_text_selected_shadow_alpha; ---- theme->a_menu_text_disabled->texture[0].data.text.shadow_color = ---- theme->menu_text_disabled_shadow_color; ---- theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = ---- theme->menu_text_disabled_shadow_alpha; ---- theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = ---- theme->menu_text_disabled_shadow_color; ---- theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = ---- theme->menu_text_disabled_shadow_alpha; ---- ---- theme->a_disabled_focused_max->texture[0].type = ---- theme->a_disabled_unfocused_max->texture[0].type = ---- theme->a_hover_focused_max->texture[0].type = ---- theme->a_hover_unfocused_max->texture[0].type = ---- theme->a_toggled_hover_focused_max->texture[0].type = ---- theme->a_toggled_hover_unfocused_max->texture[0].type = ---- theme->a_toggled_focused_unpressed_max->texture[0].type = ---- theme->a_toggled_unfocused_unpressed_max->texture[0].type = ---- theme->a_toggled_focused_pressed_max->texture[0].type = ---- theme->a_toggled_unfocused_pressed_max->texture[0].type = ---- theme->a_focused_unpressed_max->texture[0].type = ---- theme->a_focused_pressed_max->texture[0].type = ---- theme->a_unfocused_unpressed_max->texture[0].type = ---- theme->a_unfocused_pressed_max->texture[0].type = ---- theme->a_disabled_focused_close->texture[0].type = ---- theme->a_disabled_unfocused_close->texture[0].type = ---- theme->a_hover_focused_close->texture[0].type = ---- theme->a_hover_unfocused_close->texture[0].type = ---- theme->a_focused_unpressed_close->texture[0].type = ---- theme->a_focused_pressed_close->texture[0].type = ---- theme->a_unfocused_unpressed_close->texture[0].type = ---- theme->a_unfocused_pressed_close->texture[0].type = ---- theme->a_disabled_focused_desk->texture[0].type = ---- theme->a_disabled_unfocused_desk->texture[0].type = ---- theme->a_hover_focused_desk->texture[0].type = ---- theme->a_hover_unfocused_desk->texture[0].type = ---- theme->a_toggled_hover_focused_desk->texture[0].type = ---- theme->a_toggled_hover_unfocused_desk->texture[0].type = ---- theme->a_toggled_focused_unpressed_desk->texture[0].type = ---- theme->a_toggled_unfocused_unpressed_desk->texture[0].type = ---- theme->a_toggled_focused_pressed_desk->texture[0].type = ---- theme->a_toggled_unfocused_pressed_desk->texture[0].type = ---- theme->a_focused_unpressed_desk->texture[0].type = ---- theme->a_focused_pressed_desk->texture[0].type = ---- theme->a_unfocused_unpressed_desk->texture[0].type = ---- theme->a_unfocused_pressed_desk->texture[0].type = ---- theme->a_disabled_focused_shade->texture[0].type = ---- theme->a_disabled_unfocused_shade->texture[0].type = ---- theme->a_hover_focused_shade->texture[0].type = ---- theme->a_hover_unfocused_shade->texture[0].type = ---- theme->a_toggled_hover_focused_shade->texture[0].type = ---- theme->a_toggled_hover_unfocused_shade->texture[0].type = ---- theme->a_toggled_focused_unpressed_shade->texture[0].type = ---- theme->a_toggled_unfocused_unpressed_shade->texture[0].type = ---- theme->a_toggled_focused_pressed_shade->texture[0].type = ---- theme->a_toggled_unfocused_pressed_shade->texture[0].type = ---- theme->a_focused_unpressed_shade->texture[0].type = ---- theme->a_focused_pressed_shade->texture[0].type = ---- theme->a_unfocused_unpressed_shade->texture[0].type = ---- theme->a_unfocused_pressed_shade->texture[0].type = ---- theme->a_disabled_focused_iconify->texture[0].type = ---- theme->a_disabled_unfocused_iconify->texture[0].type = ---- theme->a_hover_focused_iconify->texture[0].type = ---- theme->a_hover_unfocused_iconify->texture[0].type = ---- theme->a_focused_unpressed_iconify->texture[0].type = ---- theme->a_focused_pressed_iconify->texture[0].type = ---- theme->a_unfocused_unpressed_iconify->texture[0].type = ---- theme->a_unfocused_pressed_iconify->texture[0].type = ---- theme->a_menu_bullet_normal->texture[0].type = ---- theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; ---- ---- theme->a_disabled_focused_max->texture[0].data.mask.mask = ---- theme->a_disabled_unfocused_max->texture[0].data.mask.mask = ---- theme->max_disabled_mask; ---- theme->a_hover_focused_max->texture[0].data.mask.mask = ---- theme->a_hover_unfocused_max->texture[0].data.mask.mask = ---- theme->max_hover_mask; ---- theme->a_focused_pressed_max->texture[0].data.mask.mask = ---- theme->a_unfocused_pressed_max->texture[0].data.mask.mask = ---- theme->max_pressed_mask; ---- theme->a_focused_unpressed_max->texture[0].data.mask.mask = ---- theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = ---- theme->max_mask; ---- theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = ---- theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = ---- theme->max_toggled_hover_mask; ---- theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = ---- theme->max_toggled_mask; ---- theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = ---- theme->max_toggled_pressed_mask; ---- theme->a_disabled_focused_close->texture[0].data.mask.mask = ---- theme->a_disabled_unfocused_close->texture[0].data.mask.mask = ---- theme->close_disabled_mask; ---- theme->a_hover_focused_close->texture[0].data.mask.mask = ---- theme->a_hover_unfocused_close->texture[0].data.mask.mask = ---- theme->close_hover_mask; ---- theme->a_focused_pressed_close->texture[0].data.mask.mask = ---- theme->a_unfocused_pressed_close->texture[0].data.mask.mask = ---- theme->close_pressed_mask; ---- theme->a_focused_unpressed_close->texture[0].data.mask.mask = ---- theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = ---- theme->close_mask; ---- theme->a_disabled_focused_desk->texture[0].data.mask.mask = ---- theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = ---- theme->desk_disabled_mask; ---- theme->a_hover_focused_desk->texture[0].data.mask.mask = ---- theme->a_hover_unfocused_desk->texture[0].data.mask.mask = ---- theme->desk_hover_mask; ---- theme->a_focused_pressed_desk->texture[0].data.mask.mask = ---- theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = ---- theme->desk_pressed_mask; ---- theme->a_focused_unpressed_desk->texture[0].data.mask.mask = ---- theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = ---- theme->desk_mask; ---- theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = ---- theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = ---- theme->desk_toggled_hover_mask; ---- theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = ---- theme->desk_toggled_mask; ---- theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = ---- theme->desk_toggled_pressed_mask; ---- theme->a_disabled_focused_shade->texture[0].data.mask.mask = ---- theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = ---- theme->shade_disabled_mask; ---- theme->a_hover_focused_shade->texture[0].data.mask.mask = ---- theme->a_hover_unfocused_shade->texture[0].data.mask.mask = ---- theme->shade_hover_mask; ---- theme->a_focused_pressed_shade->texture[0].data.mask.mask = ---- theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = ---- theme->shade_pressed_mask; ---- theme->a_focused_unpressed_shade->texture[0].data.mask.mask = ---- theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = ---- theme->shade_mask; ---- theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = ---- theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = ---- theme->shade_toggled_hover_mask; ---- theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = ---- theme->shade_toggled_mask; ---- theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = ---- theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = ---- theme->shade_toggled_pressed_mask; ---- theme->a_disabled_focused_iconify->texture[0].data.mask.mask = ---- theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = ---- theme->iconify_disabled_mask; ---- theme->a_hover_focused_iconify->texture[0].data.mask.mask = ---- theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = ---- theme->iconify_hover_mask; ---- theme->a_focused_pressed_iconify->texture[0].data.mask.mask = ---- theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = ---- theme->iconify_pressed_mask; ---- theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = ---- theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = ---- theme->iconify_mask; ---- theme->a_menu_bullet_normal->texture[0].data.mask.mask = ---- theme->a_menu_bullet_selected->texture[0].data.mask.mask = ---- theme->menu_bullet_mask; ---- theme->a_disabled_focused_max->texture[0].data.mask.color = ---- theme->a_disabled_focused_close->texture[0].data.mask.color = ---- theme->a_disabled_focused_desk->texture[0].data.mask.color = ---- theme->a_disabled_focused_shade->texture[0].data.mask.color = ---- theme->a_disabled_focused_iconify->texture[0].data.mask.color = ---- theme->titlebut_disabled_focused_color; ---- theme->a_disabled_unfocused_max->texture[0].data.mask.color = ---- theme->a_disabled_unfocused_close->texture[0].data.mask.color = ---- theme->a_disabled_unfocused_desk->texture[0].data.mask.color = ---- theme->a_disabled_unfocused_shade->texture[0].data.mask.color = ---- theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = ---- theme->titlebut_disabled_unfocused_color; ---- theme->a_hover_focused_max->texture[0].data.mask.color = ---- theme->a_hover_focused_close->texture[0].data.mask.color = ---- theme->a_hover_focused_desk->texture[0].data.mask.color = ---- theme->a_hover_focused_shade->texture[0].data.mask.color = ---- theme->a_hover_focused_iconify->texture[0].data.mask.color = ---- theme->titlebut_hover_focused_color; ---- theme->a_hover_unfocused_max->texture[0].data.mask.color = ---- theme->a_hover_unfocused_close->texture[0].data.mask.color = ---- theme->a_hover_unfocused_desk->texture[0].data.mask.color = ---- theme->a_hover_unfocused_shade->texture[0].data.mask.color = ---- theme->a_hover_unfocused_iconify->texture[0].data.mask.color = ---- theme->titlebut_hover_unfocused_color; ---- theme->a_toggled_hover_focused_max->texture[0].data.mask.color = ---- theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = ---- theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = ---- theme->titlebut_toggled_hover_focused_color; ---- theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = ---- theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = ---- theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = ---- theme->titlebut_toggled_hover_unfocused_color; ---- theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = ---- theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = ---- theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = ---- theme->titlebut_toggled_focused_unpressed_color; ---- theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = ---- theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color = ---- theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color= ---- theme->titlebut_toggled_unfocused_unpressed_color; ---- theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = ---- theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = ---- theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = ---- theme->titlebut_toggled_focused_pressed_color; ---- theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = ---- theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = ---- theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = ---- theme->titlebut_toggled_unfocused_pressed_color; ---- theme->a_focused_unpressed_max->texture[0].data.mask.color = ---- theme->a_focused_unpressed_close->texture[0].data.mask.color = ---- theme->a_focused_unpressed_desk->texture[0].data.mask.color = ---- theme->a_focused_unpressed_shade->texture[0].data.mask.color = ---- theme->a_focused_unpressed_iconify->texture[0].data.mask.color = ---- theme->titlebut_focused_unpressed_color; ---- theme->a_focused_pressed_max->texture[0].data.mask.color = ---- theme->a_focused_pressed_close->texture[0].data.mask.color = ---- theme->a_focused_pressed_desk->texture[0].data.mask.color = ---- theme->a_focused_pressed_shade->texture[0].data.mask.color = ---- theme->a_focused_pressed_iconify->texture[0].data.mask.color = ---- theme->titlebut_focused_pressed_color; ---- theme->a_unfocused_unpressed_max->texture[0].data.mask.color = ---- theme->a_unfocused_unpressed_close->texture[0].data.mask.color = ---- theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = ---- theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = ---- theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = ---- theme->titlebut_unfocused_unpressed_color; ---- theme->a_unfocused_pressed_max->texture[0].data.mask.color = ---- theme->a_unfocused_pressed_close->texture[0].data.mask.color = ---- theme->a_unfocused_pressed_desk->texture[0].data.mask.color = ---- theme->a_unfocused_pressed_shade->texture[0].data.mask.color = ---- theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = ---- theme->titlebut_unfocused_pressed_color; ---- theme->a_menu_bullet_normal->texture[0].data.mask.color = ---- theme->menu_color; ---- theme->a_menu_bullet_selected->texture[0].data.mask.color = ---- theme->menu_selected_color; ---- ---- g_free(path); ---- XrmDestroyDatabase(db); ---- ---- /* set the font heights */ ---- theme->win_font_height = RrFontHeight ---- (theme->win_font_focused, ---- theme->a_focused_label->texture[0].data.text.shadow_offset_y); ---- theme->win_font_height = ---- MAX(theme->win_font_height, ---- RrFontHeight ---- (theme->win_font_focused, ---- theme->a_unfocused_label->texture[0].data.text.shadow_offset_y)); ---- theme->menu_title_font_height = RrFontHeight ---- (theme->menu_title_font, ---- theme->a_menu_text_title->texture[0].data.text.shadow_offset_y); ---- theme->menu_font_height = RrFontHeight ---- (theme->menu_font, ---- theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y); ---- ---- /* calculate some last extents */ ---- { ---- gint ft, fb, fl, fr, ut, ub, ul, ur; ---- ---- RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); ---- RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); ---- theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub); --- theme->label_height += theme->label_height % 2; ---- ---- /* this would be nice I think, since padding.width can now be 0, ---- but it breaks frame.c horribly and I don't feel like fixing that ---- right now, so if anyone complains, here is how to keep text from ---- going over the title's bevel/border with a padding.width of 0 and a ---- bevelless/borderless label ---- RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb); ---- RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub); ---- theme->title_height = theme->label_height + ---- MAX(MAX(theme->padding * 2, ft + fb), ---- MAX(theme->padding * 2, ut + ub)); ---- */ ---- theme->title_height = theme->label_height + theme->paddingy * 2; ---- ---- RrMargins(theme->a_menu_title, &ul, &ut, &ur, &ub); ---- theme->menu_title_label_height = theme->menu_title_font_height+ut+ub; ---- theme->menu_title_height = theme->menu_title_label_height + ---- theme->paddingy * 2; ---- } ---- theme->button_size = theme->label_height - 2; ---- theme->grip_width = 25; ---- ---- return theme; ----} ---- ----void RrThemeFree(RrTheme *theme) ----{ ---- if (theme) { ---- g_free(theme->name); ---- ---- RrColorFree(theme->menu_border_color); ---- RrColorFree(theme->osd_border_color); ---- RrColorFree(theme->frame_focused_border_color); ---- RrColorFree(theme->frame_unfocused_border_color); ---- RrColorFree(theme->title_separator_focused_color); ---- RrColorFree(theme->title_separator_unfocused_color); ---- RrColorFree(theme->cb_unfocused_color); ---- RrColorFree(theme->cb_focused_color); ---- RrColorFree(theme->title_focused_color); ---- RrColorFree(theme->title_unfocused_color); ---- RrColorFree(theme->titlebut_disabled_focused_color); ---- RrColorFree(theme->titlebut_disabled_unfocused_color); ---- RrColorFree(theme->titlebut_hover_focused_color); ---- RrColorFree(theme->titlebut_hover_unfocused_color); ---- RrColorFree(theme->titlebut_toggled_hover_focused_color); ---- RrColorFree(theme->titlebut_toggled_hover_unfocused_color); ---- RrColorFree(theme->titlebut_toggled_focused_pressed_color); ---- RrColorFree(theme->titlebut_toggled_unfocused_pressed_color); ---- RrColorFree(theme->titlebut_toggled_focused_unpressed_color); ---- RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); ---- RrColorFree(theme->titlebut_focused_pressed_color); ---- RrColorFree(theme->titlebut_unfocused_pressed_color); ---- RrColorFree(theme->titlebut_focused_unpressed_color); ---- RrColorFree(theme->titlebut_unfocused_unpressed_color); ---- RrColorFree(theme->menu_title_color); ---- RrColorFree(theme->menu_sep_color); ---- RrColorFree(theme->menu_color); ---- RrColorFree(theme->menu_selected_color); ---- RrColorFree(theme->menu_disabled_color); ---- RrColorFree(theme->menu_disabled_selected_color); ---- RrColorFree(theme->title_focused_shadow_color); ---- RrColorFree(theme->title_unfocused_shadow_color); ---- RrColorFree(theme->osd_color); ---- RrColorFree(theme->osd_shadow_color); ---- RrColorFree(theme->menu_title_shadow_color); ---- RrColorFree(theme->menu_text_normal_shadow_color); ---- RrColorFree(theme->menu_text_selected_shadow_color); ---- RrColorFree(theme->menu_text_disabled_shadow_color); ---- RrColorFree(theme->menu_text_disabled_selected_shadow_color); ---- ---- g_free(theme->def_win_icon); ---- ---- RrPixmapMaskFree(theme->max_mask); ---- RrPixmapMaskFree(theme->max_toggled_mask); ---- RrPixmapMaskFree(theme->max_toggled_hover_mask); ---- RrPixmapMaskFree(theme->max_toggled_pressed_mask); ---- RrPixmapMaskFree(theme->max_disabled_mask); ---- RrPixmapMaskFree(theme->max_hover_mask); ---- RrPixmapMaskFree(theme->max_pressed_mask); ---- RrPixmapMaskFree(theme->desk_mask); ---- RrPixmapMaskFree(theme->desk_toggled_mask); ---- RrPixmapMaskFree(theme->desk_toggled_hover_mask); ---- RrPixmapMaskFree(theme->desk_toggled_pressed_mask); ---- RrPixmapMaskFree(theme->desk_disabled_mask); ---- RrPixmapMaskFree(theme->desk_hover_mask); ---- RrPixmapMaskFree(theme->desk_pressed_mask); ---- RrPixmapMaskFree(theme->shade_mask); ---- RrPixmapMaskFree(theme->shade_toggled_mask); ---- RrPixmapMaskFree(theme->shade_toggled_hover_mask); ---- RrPixmapMaskFree(theme->shade_toggled_pressed_mask); ---- RrPixmapMaskFree(theme->shade_disabled_mask); ---- RrPixmapMaskFree(theme->shade_hover_mask); ---- RrPixmapMaskFree(theme->shade_pressed_mask); ---- RrPixmapMaskFree(theme->iconify_mask); ---- RrPixmapMaskFree(theme->iconify_disabled_mask); ---- RrPixmapMaskFree(theme->iconify_hover_mask); ---- RrPixmapMaskFree(theme->iconify_pressed_mask); ---- RrPixmapMaskFree(theme->close_mask); ---- RrPixmapMaskFree(theme->close_disabled_mask); ---- RrPixmapMaskFree(theme->close_hover_mask); ---- RrPixmapMaskFree(theme->close_pressed_mask); ---- RrPixmapMaskFree(theme->menu_bullet_mask); ---- RrPixmapMaskFree(theme->down_arrow_mask); ---- RrPixmapMaskFree(theme->up_arrow_mask); ---- ---- RrFontClose(theme->win_font_focused); ---- RrFontClose(theme->win_font_unfocused); ---- RrFontClose(theme->menu_title_font); ---- RrFontClose(theme->menu_font); ---- RrFontClose(theme->osd_font); ---- ---- RrAppearanceFree(theme->a_disabled_focused_max); ---- RrAppearanceFree(theme->a_disabled_unfocused_max); ---- RrAppearanceFree(theme->a_hover_focused_max); ---- RrAppearanceFree(theme->a_hover_unfocused_max); ---- RrAppearanceFree(theme->a_toggled_hover_focused_max); ---- RrAppearanceFree(theme->a_toggled_hover_unfocused_max); ---- RrAppearanceFree(theme->a_toggled_focused_unpressed_max); ---- RrAppearanceFree(theme->a_toggled_focused_pressed_max); ---- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); ---- RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); ---- RrAppearanceFree(theme->a_focused_unpressed_max); ---- RrAppearanceFree(theme->a_focused_pressed_max); ---- RrAppearanceFree(theme->a_unfocused_unpressed_max); ---- RrAppearanceFree(theme->a_unfocused_pressed_max); ---- RrAppearanceFree(theme->a_disabled_focused_close); ---- RrAppearanceFree(theme->a_disabled_unfocused_close); ---- RrAppearanceFree(theme->a_hover_focused_close); ---- RrAppearanceFree(theme->a_hover_unfocused_close); ---- RrAppearanceFree(theme->a_focused_unpressed_close); ---- RrAppearanceFree(theme->a_focused_pressed_close); ---- RrAppearanceFree(theme->a_unfocused_unpressed_close); ---- RrAppearanceFree(theme->a_unfocused_pressed_close); ---- RrAppearanceFree(theme->a_disabled_focused_desk); ---- RrAppearanceFree(theme->a_disabled_unfocused_desk); ---- RrAppearanceFree(theme->a_hover_focused_desk); ---- RrAppearanceFree(theme->a_hover_unfocused_desk); ---- RrAppearanceFree(theme->a_toggled_hover_focused_desk); ---- RrAppearanceFree(theme->a_toggled_hover_unfocused_desk); ---- RrAppearanceFree(theme->a_toggled_focused_unpressed_desk); ---- RrAppearanceFree(theme->a_toggled_focused_pressed_desk); ---- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk); ---- RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk); ---- RrAppearanceFree(theme->a_focused_unpressed_desk); ---- RrAppearanceFree(theme->a_focused_pressed_desk); ---- RrAppearanceFree(theme->a_unfocused_unpressed_desk); ---- RrAppearanceFree(theme->a_unfocused_pressed_desk); ---- RrAppearanceFree(theme->a_disabled_focused_shade); ---- RrAppearanceFree(theme->a_disabled_unfocused_shade); ---- RrAppearanceFree(theme->a_hover_focused_shade); ---- RrAppearanceFree(theme->a_hover_unfocused_shade); ---- RrAppearanceFree(theme->a_toggled_hover_focused_shade); ---- RrAppearanceFree(theme->a_toggled_hover_unfocused_shade); ---- RrAppearanceFree(theme->a_toggled_focused_unpressed_shade); ---- RrAppearanceFree(theme->a_toggled_focused_pressed_shade); ---- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade); ---- RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade); ---- RrAppearanceFree(theme->a_focused_unpressed_shade); ---- RrAppearanceFree(theme->a_focused_pressed_shade); ---- RrAppearanceFree(theme->a_unfocused_unpressed_shade); ---- RrAppearanceFree(theme->a_unfocused_pressed_shade); ---- RrAppearanceFree(theme->a_disabled_focused_iconify); ---- RrAppearanceFree(theme->a_disabled_unfocused_iconify); ---- RrAppearanceFree(theme->a_hover_focused_iconify); ---- RrAppearanceFree(theme->a_hover_unfocused_iconify); ---- RrAppearanceFree(theme->a_focused_unpressed_iconify); ---- RrAppearanceFree(theme->a_focused_pressed_iconify); ---- RrAppearanceFree(theme->a_unfocused_unpressed_iconify); ---- RrAppearanceFree(theme->a_unfocused_pressed_iconify); ---- RrAppearanceFree(theme->a_focused_grip); ---- RrAppearanceFree(theme->a_unfocused_grip); ---- RrAppearanceFree(theme->a_focused_title); ---- RrAppearanceFree(theme->a_unfocused_title); ---- RrAppearanceFree(theme->a_focused_label); ---- RrAppearanceFree(theme->a_unfocused_label); ---- RrAppearanceFree(theme->a_icon); ---- RrAppearanceFree(theme->a_focused_handle); ---- RrAppearanceFree(theme->a_unfocused_handle); ---- RrAppearanceFree(theme->a_menu); ---- RrAppearanceFree(theme->a_menu_title); ---- RrAppearanceFree(theme->a_menu_text_title); ---- RrAppearanceFree(theme->a_menu_normal); ---- RrAppearanceFree(theme->a_menu_selected); ---- RrAppearanceFree(theme->a_menu_disabled); ---- RrAppearanceFree(theme->a_menu_disabled_selected); ---- RrAppearanceFree(theme->a_menu_text_normal); ---- RrAppearanceFree(theme->a_menu_text_selected); ---- RrAppearanceFree(theme->a_menu_text_disabled); ---- RrAppearanceFree(theme->a_menu_text_disabled_selected); ---- RrAppearanceFree(theme->a_menu_bullet_normal); ---- RrAppearanceFree(theme->a_menu_bullet_selected); ---- RrAppearanceFree(theme->a_clear); ---- RrAppearanceFree(theme->a_clear_tex); ---- RrAppearanceFree(theme->osd_hilite_bg); ---- RrAppearanceFree(theme->osd_hilite_fg); ---- RrAppearanceFree(theme->osd_hilite_label); ---- RrAppearanceFree(theme->osd_unhilite_fg); ---- ---- g_free(theme); ---- } ----} ---- ----static XrmDatabase loaddb(const gchar *name, gchar **path) ----{ ---- GSList *it; ---- XrmDatabase db = NULL; ---- gchar *s; ---- ---- if (name[0] == '/') { ---- s = g_build_filename(name, "openbox-3", "themerc", NULL); ---- if ((db = XrmGetFileDatabase(s))) ---- *path = g_path_get_dirname(s); ---- g_free(s); ---- } else { ---- ObtPaths *p; ---- ---- p = obt_paths_new(); ---- ---- /* XXX backwards compatibility, remove me sometime later */ ---- s = g_build_filename(g_get_home_dir(), ".themes", name, ---- "openbox-3", "themerc", NULL); ---- if ((db = XrmGetFileDatabase(s))) ---- *path = g_path_get_dirname(s); ---- g_free(s); ---- ---- for (it = obt_paths_data_dirs(p); !db && it; it = g_slist_next(it)) ---- { ---- s = g_build_filename(it->data, "themes", name, ---- "openbox-3", "themerc", NULL); ---- if ((db = XrmGetFileDatabase(s))) ---- *path = g_path_get_dirname(s); ---- g_free(s); ---- } ---- ---- obt_paths_unref(p); ---- } ---- ---- if (db == NULL) { ---- s = g_build_filename(name, "themerc", NULL); ---- if ((db = XrmGetFileDatabase(s))) ---- *path = g_path_get_dirname(s); ---- g_free(s); ---- } ---- ---- return db; ----} ---- ----static gchar *create_class_name(const gchar *rname) ----{ ---- gchar *rclass = g_strdup(rname); ---- gchar *p = rclass; ---- ---- while (TRUE) { ---- *p = toupper(*p); ---- p = strchr(p+1, '.'); ---- if (p == NULL) break; ---- ++p; ---- if (*p == '\0') break; ---- } ---- return rclass; ----} ---- ----static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value) ----{ ---- gboolean ret = FALSE; ---- gchar *rclass = create_class_name(rname); ---- gchar *rettype, *end; ---- XrmValue retvalue; ---- ---- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && ---- retvalue.addr != NULL) { ---- *value = (gint)strtol(retvalue.addr, &end, 10); ---- if (end != retvalue.addr) ---- ret = TRUE; ---- } ---- ---- g_free(rclass); ---- return ret; ----} ---- ----static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) ----{ ---- gboolean ret = FALSE; ---- gchar *rclass = create_class_name(rname); ---- gchar *rettype; ---- XrmValue retvalue; ---- ---- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && ---- retvalue.addr != NULL) { ---- *value = retvalue.addr; ---- ret = TRUE; ---- } ---- ---- g_free(rclass); ---- return ret; ----} ---- ----static gboolean read_color(XrmDatabase db, const RrInstance *inst, ---- const gchar *rname, RrColor **value) ----{ ---- gboolean ret = FALSE; ---- gchar *rclass = create_class_name(rname); ---- gchar *rettype; ---- XrmValue retvalue; ---- ---- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && ---- retvalue.addr != NULL) { ---- RrColor *c = RrColorParse(inst, retvalue.addr); ---- if (c != NULL) { ---- *value = c; ---- ret = TRUE; ---- } ---- } ---- ---- g_free(rclass); ---- return ret; ----} ---- ----static gboolean read_mask(const RrInstance *inst, const gchar *path, ---- RrTheme *theme, const gchar *maskname, ---- RrPixmapMask **value) ----{ ---- gboolean ret = FALSE; ---- gchar *s; ---- gint hx, hy; /* ignored */ ---- guint w, h; ---- guchar *b; ---- ---- s = g_build_filename(path, maskname, NULL); ---- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { ---- ret = TRUE; ---- *value = RrPixmapMaskNew(inst, w, h, (gchar*)b); ---- XFree(b); ---- } ---- g_free(s); ---- ---- return ret; ----} ---- ----static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, ---- RrReliefType *relief, RrBevelType *bevel, ---- gboolean *interlaced, gboolean *border, ---- gboolean allow_trans) ----{ ---- gchar *t; ---- ---- /* convert to all lowercase */ ---- for (t = tex; *t != '\0'; ++t) ---- *t = g_ascii_tolower(*t); ---- ---- if (allow_trans && strstr(tex, "parentrelative") != NULL) { ---- *grad = RR_SURFACE_PARENTREL; ---- } else { ---- if (strstr(tex, "gradient") != NULL) { ---- if (strstr(tex, "crossdiagonal") != NULL) ---- *grad = RR_SURFACE_CROSS_DIAGONAL; ---- else if (strstr(tex, "pyramid") != NULL) ---- *grad = RR_SURFACE_PYRAMID; ---- else if (strstr(tex, "mirrorhorizontal") != NULL) ---- *grad = RR_SURFACE_MIRROR_HORIZONTAL; ---- else if (strstr(tex, "horizontal") != NULL) ---- *grad = RR_SURFACE_HORIZONTAL; ---- else if (strstr(tex, "splitvertical") != NULL) ---- *grad = RR_SURFACE_SPLIT_VERTICAL; ---- else if (strstr(tex, "vertical") != NULL) ---- *grad = RR_SURFACE_VERTICAL; ---- else ---- *grad = RR_SURFACE_DIAGONAL; ---- } else { ---- *grad = RR_SURFACE_SOLID; ---- } ---- } ---- ---- if (strstr(tex, "sunken") != NULL) ---- *relief = RR_RELIEF_SUNKEN; ---- else if (strstr(tex, "flat") != NULL) ---- *relief = RR_RELIEF_FLAT; ---- else if (strstr(tex, "raised") != NULL) ---- *relief = RR_RELIEF_RAISED; ---- else ---- *relief = (*grad == RR_SURFACE_PARENTREL) ? ---- RR_RELIEF_FLAT : RR_RELIEF_RAISED; ---- ---- *border = FALSE; ---- if (*relief == RR_RELIEF_FLAT) { ---- if (strstr(tex, "border") != NULL) ---- *border = TRUE; ---- } else { ---- if (strstr(tex, "bevel2") != NULL) ---- *bevel = RR_BEVEL_2; ---- else ---- *bevel = RR_BEVEL_1; ---- } ---- ---- if (strstr(tex, "interlaced") != NULL) ---- *interlaced = TRUE; ---- else ---- *interlaced = FALSE; ----} ---- ---- ----static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, ---- const gchar *rname, RrAppearance *value, ---- gboolean allow_trans) ----{ ---- gboolean ret = FALSE; ---- gchar *rclass = create_class_name(rname); ---- gchar *cname, *ctoname, *bcname, *icname, *hname, *sname; ---- gchar *csplitname, *ctosplitname; ---- gchar *rettype; ---- XrmValue retvalue; ---- gint i; ---- ---- cname = g_strconcat(rname, ".color", NULL); ---- ctoname = g_strconcat(rname, ".colorTo", NULL); ---- bcname = g_strconcat(rname, ".border.color", NULL); ---- icname = g_strconcat(rname, ".interlace.color", NULL); ---- hname = g_strconcat(rname, ".highlight", NULL); ---- sname = g_strconcat(rname, ".shadow", NULL); ---- csplitname = g_strconcat(rname, ".color.splitTo", NULL); ---- ctosplitname = g_strconcat(rname, ".colorTo.splitTo", NULL); ---- ---- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && ---- retvalue.addr != NULL) { ---- parse_appearance(retvalue.addr, ---- &value->surface.grad, ---- &value->surface.relief, ---- &value->surface.bevel, ---- &value->surface.interlaced, ---- &value->surface.border, ---- allow_trans); ---- if (!read_color(db, inst, cname, &value->surface.primary)) ---- value->surface.primary = RrColorNew(inst, 0, 0, 0); ---- if (!read_color(db, inst, ctoname, &value->surface.secondary)) ---- value->surface.secondary = RrColorNew(inst, 0, 0, 0); ---- if (value->surface.border) ---- if (!read_color(db, inst, bcname, ---- &value->surface.border_color)) ---- value->surface.border_color = RrColorNew(inst, 0, 0, 0); ---- if (value->surface.interlaced) ---- if (!read_color(db, inst, icname, ---- &value->surface.interlace_color)) ---- value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); ---- if (read_int(db, hname, &i) && i >= 0) ---- value->surface.bevel_light_adjust = i; ---- if (read_int(db, sname, &i) && i >= 0 && i <= 256) ---- value->surface.bevel_dark_adjust = i; ---- ---- if (value->surface.grad == RR_SURFACE_SPLIT_VERTICAL) { ---- gint r, g, b; ---- ---- if (!read_color(db, inst, csplitname, ---- &value->surface.split_primary)) ---- { ---- r = value->surface.primary->r; ---- r += r >> 2; ---- g = value->surface.primary->g; ---- g += g >> 2; ---- b = value->surface.primary->b; ---- b += b >> 2; ---- if (r > 0xFF) r = 0xFF; ---- if (g > 0xFF) g = 0xFF; ---- if (b > 0xFF) b = 0xFF; ---- value->surface.split_primary = RrColorNew(inst, r, g, b); ---- } ---- ---- if (!read_color(db, inst, ctosplitname, ---- &value->surface.split_secondary)) ---- { ---- r = value->surface.secondary->r; ---- r += r >> 4; ---- g = value->surface.secondary->g; ---- g += g >> 4; ---- b = value->surface.secondary->b; ---- b += b >> 4; ---- if (r > 0xFF) r = 0xFF; ---- if (g > 0xFF) g = 0xFF; ---- if (b > 0xFF) b = 0xFF; ---- value->surface.split_secondary = RrColorNew(inst, r, g, b); ---- } ---- } ---- ---- ret = TRUE; ---- } ---- ---- g_free(ctosplitname); ---- g_free(csplitname); ---- g_free(sname); ---- g_free(hname); ---- g_free(icname); ---- g_free(bcname); ---- g_free(ctoname); ---- g_free(cname); ---- g_free(rclass); ---- return ret; ----} ---- ----static int parse_inline_number(const char *p) ----{ ---- int neg = 1; ---- int res = 0; ---- if (*p == '-') { ---- neg = -1; ---- ++p; ---- } ---- for (; isdigit(*p); ++p) ---- res = res * 10 + *p - '0'; ---- res *= neg; ---- return res; ----} ---- ----static void set_default_appearance(RrAppearance *a) ----{ ---- a->surface.grad = RR_SURFACE_SOLID; ---- a->surface.relief = RR_RELIEF_FLAT; ---- a->surface.bevel = RR_BEVEL_1; ---- a->surface.interlaced = FALSE; ---- a->surface.border = FALSE; ---- a->surface.primary = RrColorNew(a->inst, 0, 0, 0); ---- a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); ----} ---- ----/* Reads the output from gimp's C-Source file format into valid RGBA data for ---- an RrTextureRGBA. */ ----static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) ----{ ---- RrPixel32 *im, *p; ---- gint i; ---- ---- p = im = g_memdup(data, width * height * sizeof(RrPixel32)); ---- ---- for (i = 0; i < width * height; ++i) { ---- guchar a = ((*p >> 24) & 0xff); ---- guchar b = ((*p >> 16) & 0xff); ---- guchar g = ((*p >> 8) & 0xff); ---- guchar r = ((*p >> 0) & 0xff); ---- ---- *p = ((r << RrDefaultRedOffset) + ---- (g << RrDefaultGreenOffset) + ---- (b << RrDefaultBlueOffset) + ---- (a << RrDefaultAlphaOffset)); ---- p++; ---- } ---- ---- return im; ----} diff --cc render/theme.h index da8e80d3,da8e80d3,da8e80d3,da8e80d3..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/theme.h +++ /dev/null @@@@@ -1,261 -1,261 -1,261 -1,261 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- theme.h for the Openbox window manager ---- Copyright (c) 2006 Mikael Magnusson ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#ifndef __theme_h ----#define __theme_h ---- ----#include "render.h" ---- ----G_BEGIN_DECLS ---- ----typedef struct _RrTheme RrTheme; ---- ----struct _RrTheme { ---- const RrInstance *inst; ---- ---- /* style settings - fonts */ ---- RrFont *win_font_focused; ---- RrFont *win_font_unfocused; ---- RrFont *menu_title_font; ---- RrFont *menu_font; ---- RrFont *osd_font; ---- ---- /* style settings - geometry */ ---- gint paddingx; ---- gint paddingy; ---- gint handle_height; ---- gint fbwidth; /*!< frame border width */ ---- gint mbwidth; /*!< menu border width */ ---- gint obwidth; /*!< osd border width */ ---- gint cbwidthx; ---- gint cbwidthy; ---- gint menu_overlap_x; ---- gint menu_overlap_y; ---- gint menu_sep_width; ---- gint menu_sep_paddingx; ---- gint menu_sep_paddingy; ---- /* these ones are calculated, not set directly by the theme file */ ---- gint win_font_height; ---- gint menu_title_font_height; ---- gint menu_font_height; ---- gint label_height; ---- gint title_height; ---- gint button_size; ---- gint grip_width; ---- gint menu_title_label_height; ---- gint menu_title_height; ---- ---- /* style settings - colors */ ---- RrColor *menu_border_color; ---- RrColor *osd_border_color; ---- RrColor *frame_focused_border_color; ---- RrColor *frame_unfocused_border_color; ---- RrColor *title_separator_focused_color; ---- RrColor *title_separator_unfocused_color; ---- RrColor *cb_focused_color; ---- RrColor *cb_unfocused_color; ---- RrColor *title_focused_color; ---- RrColor *title_unfocused_color; ---- RrColor *titlebut_disabled_focused_color; ---- RrColor *titlebut_disabled_unfocused_color; ---- RrColor *titlebut_hover_focused_color; ---- RrColor *titlebut_hover_unfocused_color; ---- RrColor *titlebut_toggled_hover_focused_color; ---- RrColor *titlebut_toggled_hover_unfocused_color; ---- RrColor *titlebut_toggled_focused_pressed_color; ---- RrColor *titlebut_toggled_unfocused_pressed_color; ---- RrColor *titlebut_toggled_focused_unpressed_color; ---- RrColor *titlebut_toggled_unfocused_unpressed_color; ---- RrColor *titlebut_focused_pressed_color; ---- RrColor *titlebut_unfocused_pressed_color; ---- RrColor *titlebut_focused_unpressed_color; ---- RrColor *titlebut_unfocused_unpressed_color; ---- RrColor *menu_title_color; ---- RrColor *menu_sep_color; ---- RrColor *menu_color; ---- RrColor *menu_selected_color; ---- RrColor *menu_disabled_color; ---- RrColor *menu_disabled_selected_color; ---- RrColor *title_focused_shadow_color; ---- gchar title_focused_shadow_alpha; ---- RrColor *title_unfocused_shadow_color; ---- gchar title_unfocused_shadow_alpha; ---- RrColor *osd_color; ---- RrColor *osd_shadow_color; ---- gchar osd_shadow_alpha; ---- RrColor *menu_title_shadow_color; ---- gchar menu_title_shadow_alpha; ---- RrColor *menu_text_normal_shadow_color; ---- gchar menu_text_normal_shadow_alpha; ---- RrColor *menu_text_selected_shadow_color; ---- gchar menu_text_selected_shadow_alpha; ---- RrColor *menu_text_disabled_shadow_color; ---- gchar menu_text_disabled_shadow_alpha; ---- RrColor *menu_text_disabled_selected_shadow_color; ---- gchar menu_text_disabled_selected_shadow_alpha; ---- ---- /* style settings - pics */ ---- RrPixel32 *def_win_icon; /* RGBA */ ---- gint def_win_icon_w; ---- gint def_win_icon_h; ---- ---- /* style settings - masks */ ---- RrPixmapMask *max_mask; ---- RrPixmapMask *max_hover_mask; ---- RrPixmapMask *max_pressed_mask; ---- RrPixmapMask *max_toggled_mask; ---- RrPixmapMask *max_toggled_hover_mask; ---- RrPixmapMask *max_toggled_pressed_mask; ---- RrPixmapMask *max_disabled_mask; ---- RrPixmapMask *iconify_mask; ---- RrPixmapMask *iconify_hover_mask; ---- RrPixmapMask *iconify_pressed_mask; ---- RrPixmapMask *iconify_disabled_mask; ---- RrPixmapMask *desk_mask; ---- RrPixmapMask *desk_hover_mask; ---- RrPixmapMask *desk_pressed_mask; ---- RrPixmapMask *desk_toggled_mask; ---- RrPixmapMask *desk_toggled_hover_mask; ---- RrPixmapMask *desk_toggled_pressed_mask; ---- RrPixmapMask *desk_disabled_mask; ---- RrPixmapMask *shade_mask; ---- RrPixmapMask *shade_hover_mask; ---- RrPixmapMask *shade_pressed_mask; ---- RrPixmapMask *shade_toggled_mask; ---- RrPixmapMask *shade_toggled_hover_mask; ---- RrPixmapMask *shade_toggled_pressed_mask; ---- RrPixmapMask *shade_disabled_mask; ---- RrPixmapMask *close_mask; ---- RrPixmapMask *close_hover_mask; ---- RrPixmapMask *close_disabled_mask; ---- RrPixmapMask *close_pressed_mask; ---- ---- RrPixmapMask *menu_bullet_mask; /* submenu pointer */ ----#if 0 ---- RrPixmapMask *menu_toggle_mask; /* menu boolean */ ----#endif ---- ---- RrPixmapMask *down_arrow_mask; ---- RrPixmapMask *up_arrow_mask; ---- ---- /* global appearances */ ---- RrAppearance *a_disabled_focused_max; ---- RrAppearance *a_disabled_unfocused_max; ---- RrAppearance *a_hover_focused_max; ---- RrAppearance *a_hover_unfocused_max; ---- RrAppearance *a_focused_unpressed_max; ---- RrAppearance *a_focused_pressed_max; ---- RrAppearance *a_unfocused_unpressed_max; ---- RrAppearance *a_unfocused_pressed_max; ---- RrAppearance *a_toggled_hover_focused_max; ---- RrAppearance *a_toggled_hover_unfocused_max; ---- RrAppearance *a_toggled_focused_unpressed_max; ---- RrAppearance *a_toggled_focused_pressed_max; ---- RrAppearance *a_toggled_unfocused_unpressed_max; ---- RrAppearance *a_toggled_unfocused_pressed_max; ---- RrAppearance *a_disabled_focused_close; ---- RrAppearance *a_disabled_unfocused_close; ---- RrAppearance *a_hover_focused_close; ---- RrAppearance *a_hover_unfocused_close; ---- RrAppearance *a_focused_unpressed_close; ---- RrAppearance *a_focused_pressed_close; ---- RrAppearance *a_unfocused_unpressed_close; ---- RrAppearance *a_unfocused_pressed_close; ---- RrAppearance *a_disabled_focused_desk; ---- RrAppearance *a_disabled_unfocused_desk; ---- RrAppearance *a_hover_focused_desk; ---- RrAppearance *a_hover_unfocused_desk; ---- RrAppearance *a_focused_unpressed_desk; ---- RrAppearance *a_focused_pressed_desk; ---- RrAppearance *a_unfocused_unpressed_desk; ---- RrAppearance *a_unfocused_pressed_desk; ---- RrAppearance *a_toggled_hover_focused_desk; ---- RrAppearance *a_toggled_hover_unfocused_desk; ---- RrAppearance *a_toggled_focused_unpressed_desk; ---- RrAppearance *a_toggled_focused_pressed_desk; ---- RrAppearance *a_toggled_unfocused_unpressed_desk; ---- RrAppearance *a_toggled_unfocused_pressed_desk; ---- RrAppearance *a_disabled_focused_shade; ---- RrAppearance *a_disabled_unfocused_shade; ---- RrAppearance *a_hover_focused_shade; ---- RrAppearance *a_hover_unfocused_shade; ---- RrAppearance *a_focused_unpressed_shade; ---- RrAppearance *a_focused_pressed_shade; ---- RrAppearance *a_unfocused_unpressed_shade; ---- RrAppearance *a_unfocused_pressed_shade; ---- RrAppearance *a_toggled_hover_focused_shade; ---- RrAppearance *a_toggled_hover_unfocused_shade; ---- RrAppearance *a_toggled_focused_unpressed_shade; ---- RrAppearance *a_toggled_focused_pressed_shade; ---- RrAppearance *a_toggled_unfocused_unpressed_shade; ---- RrAppearance *a_toggled_unfocused_pressed_shade; ---- RrAppearance *a_disabled_focused_iconify; ---- RrAppearance *a_disabled_unfocused_iconify; ---- RrAppearance *a_hover_focused_iconify; ---- RrAppearance *a_hover_unfocused_iconify; ---- RrAppearance *a_focused_unpressed_iconify; ---- RrAppearance *a_focused_pressed_iconify; ---- RrAppearance *a_unfocused_unpressed_iconify; ---- RrAppearance *a_unfocused_pressed_iconify; ---- RrAppearance *a_focused_grip; ---- RrAppearance *a_unfocused_grip; ---- RrAppearance *a_focused_title; ---- RrAppearance *a_unfocused_title; ---- RrAppearance *a_focused_label; ---- RrAppearance *a_unfocused_label; ---- /* always parentrelative, so no focused/unfocused */ ---- RrAppearance *a_icon; ---- RrAppearance *a_focused_handle; ---- RrAppearance *a_unfocused_handle; ---- RrAppearance *a_menu_text_title; ---- RrAppearance *a_menu_title; ---- RrAppearance *a_menu; ---- RrAppearance *a_menu_normal; ---- RrAppearance *a_menu_selected; ---- RrAppearance *a_menu_disabled; ---- RrAppearance *a_menu_disabled_selected; ---- RrAppearance *a_menu_text_normal; ---- RrAppearance *a_menu_text_disabled; ---- RrAppearance *a_menu_text_disabled_selected; ---- RrAppearance *a_menu_text_selected; ---- RrAppearance *a_menu_bullet_normal; ---- RrAppearance *a_menu_bullet_selected; ---- RrAppearance *a_clear; /* clear with no texture */ ---- RrAppearance *a_clear_tex; /* clear with a texture */ ---- ---- RrAppearance *osd_hilite_bg; /* can never be parent relative */ ---- RrAppearance *osd_hilite_fg; /* can never be parent relative */ ---- RrAppearance *osd_hilite_label; /* can be parent relative */ ---- RrAppearance *osd_unhilite_fg; /* can never be parent relative */ ---- ---- gchar *name; ----}; ---- ----/*! The font values are all optional. If a NULL is used for any of them, then ---- the default font will be used. */ ----RrTheme* RrThemeNew(const RrInstance *inst, const gchar *theme, ---- gboolean allow_fallback, ---- RrFont *active_window_font, RrFont *inactive_window_font, ---- RrFont *menu_title_font, RrFont *menu_item_font, ---- RrFont *osd_font); ----void RrThemeFree(RrTheme *theme); ---- ----G_END_DECLS ---- ----#endif diff --cc render/version.h.in index 0ff30b57,0ff30b57,0ff30b57,0ff30b57..00000000 deleted file mode 100644,100644,100644,100644 --- a/render/version.h.in +++ /dev/null @@@@@ -1,15 -1,15 -1,15 -1,15 +1,0 @@@@@ ----#ifndef rr__version_h ----#define rr__version_h ---- ----#define RR_MAJOR_VERSION @RR_MAJOR_VERSION@ ----#define RR_MINOR_VERSION @RR_MINOR_VERSION@ ----#define RR_MICRO_VERSION @RR_MICRO_VERSION@ ----#define RR_VERSION RR_MAJOR_VERSION.RR_MINOR_VERSION.RR_MICRO_VERSION ---- ----#define RR_CHECK_VERSION(major,minor,micro) \ ---- (RR_MAJOR_VERSION > (major) || \ ---- (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION > (minor)) || \ ---- (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION == (minor) && \ ---- RR_MICRO_VERSION >= (micro))) ---- ----#endif diff --cc tests/Makefile index 9fc5fe81,9fc5fe81,9fc5fe81,9fc5fe81..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/Makefile +++ /dev/null @@@@@ -1,6 -1,6 -1,6 -1,6 +1,0 @@@@@ ----files=$(wildcard *.c) ---- ----all: $(files:.c=) ---- ----%: %.c ---- $(CC) `pkg-config --cflags --libs glib-2.0` $(CFLAGS) -o $@ $^ -lX11 -lXext -L/usr/X11R6/lib -I/usr/X11R6/include diff --cc tests/aspect.c index 1ae3a859,1ae3a859,1ae3a859,1ae3a859..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/aspect.c +++ /dev/null @@@@@ -1,79 -1,79 -1,79 -1,79 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- aspect.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- XSetWindowAttributes xswa; ---- unsigned long xswamask; ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- XSizeHints size; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- xswa.win_gravity = StaticGravity; ---- xswamask = CWWinGravity; ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, xswamask, &xswa); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- size.flags = PAspect; ---- size.min_aspect.x = 3; ---- size.min_aspect.y = 3; ---- size.max_aspect.x = 3; ---- size.max_aspect.y = 3; ---- XSetWMNormalHints(display, win, &size); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/big.c index bc17c5a4,bc17c5a4,bc17c5a4,bc17c5a4..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/big.c +++ /dev/null @@@@@ -1,68 -1,68 -1,68 -1,68 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- big.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=10,y=10,h=2000,w=2000; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- sleep(2); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/borderchange.c index 56d55006,56d55006,56d55006,56d55006..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/borderchange.c +++ /dev/null @@@@@ -1,107 -1,107 -1,107 -1,107 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- borderchange.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=10,y=10,h=200,w=200; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- while (XPending(display)) { ---- XNextEvent(display, &report); ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- } ---- sleep(2); ---- ---- printf("setting border to 0\n"); ---- XSetWindowBorderWidth(display, win, 0); ---- XFlush(display); ---- ---- while (XPending(display)) { ---- XNextEvent(display, &report); ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- } ---- sleep(2); ---- ---- printf("setting border to 50\n"); ---- XSetWindowBorderWidth(display, win, 50); ---- XFlush(display); ---- ---- while (XPending(display)) { ---- XNextEvent(display, &report); ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 0; ----} diff --cc tests/confignotify.c index 4bb09f8a,4bb09f8a,4bb09f8a,4bb09f8a..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/confignotify.c +++ /dev/null @@@@@ -1,89 -1,89 -1,89 -1,89 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- confignotify.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=10,y=10,h=100,w=100; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 0, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XSelectInput(display, win, (ExposureMask | StructureNotifyMask | ---- GravityNotify)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- sleep(1); ---- XResizeWindow(display, win, w+5, h+5); ---- XMoveWindow(display, win, x, y); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case MapNotify: ---- printf("map notify\n"); ---- break; ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case GravityNotify: ---- printf("gravity notify event 0x%x window 0x%x x %d y %d\n", ---- report.xgravity.event, report.xgravity.window, ---- report.xgravity.x, report.xgravity.y); ---- break; ---- case ConfigureNotify: { ---- int se = report.xconfigure.send_event; ---- int event = report.xconfigure.event; ---- int window = report.xconfigure.window; ---- int x = report.xconfigure.x; ---- int y = report.xconfigure.y; ---- int w = report.xconfigure.width; ---- int h = report.xconfigure.height; ---- int bw = report.xconfigure.border_width; ---- int above = report.xconfigure.above; ---- int or = report.xconfigure.override_redirect; ---- printf("confignotify send %d ev 0x%x win 0x%x %i,%i-%ix%i bw %i\n" ---- " above 0x%x ovrd %d\n", ---- se,event,window,x,y,w,h,bw,above,or); ---- break; ---- } ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/confignotifymax.c index 0debf5ec,0debf5ec,0debf5ec,0debf5ec..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/confignotifymax.c +++ /dev/null @@@@@ -1,97 -1,97 -1,97 -1,97 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- confignotify.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- Atom _net_max[2],_net_state; ---- int x=10,y=10,h=100,w=100; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- _net_state = XInternAtom(display, "_NET_WM_STATE", False); ---- _net_max[0] = XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", False); ---- _net_max[1] = XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 0, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- XChangeProperty(display, win, _net_state, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&_net_max, 2); ---- ---- XSelectInput(display, win, (ExposureMask | StructureNotifyMask | ---- GravityNotify)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- //sleep(1); ---- //XResizeWindow(display, win, w+5, h+5); ---- //XMoveWindow(display, win, x, y); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case MapNotify: ---- printf("map notify\n"); ---- break; ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case GravityNotify: ---- printf("gravity notify event 0x%x window 0x%x x %d y %d\n", ---- report.xgravity.event, report.xgravity.window, ---- report.xgravity.x, report.xgravity.y); ---- break; ---- case ConfigureNotify: { ---- int se = report.xconfigure.send_event; ---- int event = report.xconfigure.event; ---- int window = report.xconfigure.window; ---- int x = report.xconfigure.x; ---- int y = report.xconfigure.y; ---- int w = report.xconfigure.width; ---- int h = report.xconfigure.height; ---- int bw = report.xconfigure.border_width; ---- int above = report.xconfigure.above; ---- int or = report.xconfigure.override_redirect; ---- printf("confignotify send %d ev 0x%x win 0x%x %i,%i-%ix%i bw %i\n" ---- " above 0x%x ovrd %d\n", ---- se,event,window,x,y,w,h,bw,above,or); ---- break; ---- } ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/duplicatesession.c index 5abe9956,5abe9956,5abe9956,5abe9956..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/duplicatesession.c +++ /dev/null @@@@@ -1,66 -1,66 -1,66 -1,66 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- duplicatesession.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main (int argc, char **argv) { ---- Display *display; ---- Window win1, win2; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- XSizeHints size; ---- XTextProperty name; ---- Atom sm_id, enc; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- sm_id = XInternAtom(display,"SM_CLIENT_ID",False); ---- enc = XInternAtom(display,"STRING",False); ---- ---- win1 = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- win2 = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win1,WhitePixel(display,0)); ---- XSetWindowBackground(display,win2,BlackPixel(display,0)); ---- ---- XChangeProperty(display, win1, sm_id, enc, 8, ---- PropModeAppend, "abcdefg", strlen("abcdefg")); ---- XChangeProperty(display, win2, sm_id, enc, 8, ---- PropModeAppend, "abcdefg", strlen("abcdefg")); ---- ---- XFlush(display); ---- XMapWindow(display, win1); ---- XMapWindow(display, win2); ---- ---- while (1) ---- XNextEvent(display, &report); ---- ---- return 1; ----} diff --cc tests/extentsrequest.c index 3fb0c7ac,3fb0c7ac,3fb0c7ac,3fb0c7ac..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/extentsrequest.c +++ /dev/null @@@@@ -1,131 -1,131 -1,131 -1,131 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- extentsrequest.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom _request, _extents, _type, _normal, _desktop; ---- XEvent msg; ---- int x=10,y=10,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- _type = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False); ---- _normal = XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False); ---- _desktop = XInternAtom(display, "_NET_WM_WINDOW_TYPE_DESKTOP", False); ---- _request = XInternAtom(display, "_NET_REQUEST_FRAME_EXTENTS", False); ---- _extents = XInternAtom(display, "_NET_FRAME_EXTENTS", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- XSelectInput(display, win, PropertyChangeMask); ---- ---- printf("requesting for type normal\n"); ---- XChangeProperty(display, win, _type, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&_normal, 1); ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _request; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 0l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = 0l; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("waiting for extents\n"); ---- while (1) { ---- XNextEvent(display, &report); ---- ---- if (report.type == PropertyNotify && ---- report.xproperty.atom == _extents) ---- { ---- Atom ret_type; ---- int ret_format; ---- unsigned long ret_items, ret_bytesleft; ---- unsigned long *prop_return; ---- XGetWindowProperty(display, win, _extents, 0, 4, ---- False, XA_CARDINAL, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return); ---- if (ret_type == XA_CARDINAL && ret_format == 32 && ret_items == 4) ---- printf("got new extents %d, %d, %d, %d\n", ---- prop_return[0], prop_return[1], prop_return[2], ---- prop_return[3]); ---- break; ---- } ---- } ---- ---- printf("requesting for type desktop\n"); ---- XChangeProperty(display, win, _type, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&_desktop, 1); ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _request; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 0l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = 0l; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("waiting for extents\n"); ---- while (1) { ---- XNextEvent(display, &report); ---- ---- if (report.type == PropertyNotify && ---- report.xproperty.atom == _extents) ---- { ---- Atom ret_type; ---- int ret_format; ---- unsigned long ret_items, ret_bytesleft; ---- unsigned long *prop_return; ---- XGetWindowProperty(display, win, _extents, 0, 4, ---- False, XA_CARDINAL, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return); ---- if (ret_type == XA_CARDINAL && ret_format == 32 && ret_items == 4) ---- printf("got new extents %d, %d, %d, %d\n", ---- prop_return[0], prop_return[1], prop_return[2], ---- prop_return[3]); ---- break; ---- } ---- } ---- ---- return 1; ----} diff --cc tests/fakeunmap.c index d30a917e,d30a917e,d30a917e,d30a917e..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/fakeunmap.c +++ /dev/null @@@@@ -1,60 -1,60 -1,60 -1,60 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- fakeunmap.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- usleep(10000); ---- ---- msg.type = UnmapNotify; ---- msg.xunmap.display = display; ---- msg.xunmap.event = RootWindow(display, DefaultScreen(display)); ---- msg.xunmap.window = win; ---- msg.xunmap.from_configure = False; ---- XSendEvent(display, RootWindow(display, DefaultScreen(display)), False, ---- SubstructureRedirectMask|SubstructureNotifyMask, &msg); ---- usleep(10000); ---- ---- XUnmapWindow(display, win); ---- XSync(display, False); ---- ---- return 1; ----} diff --cc tests/fallback.c index 721ed31e,721ed31e,721ed31e,721ed31e..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/fallback.c +++ /dev/null @@@@@ -1,64 -1,64 -1,64 -1,64 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- fallback.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window one, two; ---- XEvent report; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- one = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,200,200, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- two = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,150,150, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,one,WhitePixel(display,0)); ---- XSetWindowBackground(display,two,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, two, one); ---- ---- XMapWindow(display, one); ---- XFlush(display); ---- usleep(1000); ---- ---- XMapWindow(display, two); ---- XFlush(display); ---- usleep(1000); ---- ---- XDestroyWindow(display, two); ---- XFlush(display); ---- usleep(1000); ---- ---- XDestroyWindow(display, one); ---- XSync(display, False); ---- ---- return 1; ----} diff --cc tests/focusout.c index 03ba56f6,03ba56f6,03ba56f6,03ba56f6..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/focusout.c +++ /dev/null @@@@@ -1,224 -1,224 -1,224 -1,224 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- focusout.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win, child; ---- XEvent report; ---- Atom _net_fs, _net_state; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- XWMHints hint; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- child = XCreateWindow(display, win, ---- 10, 10, w-20, h-20, 0, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- XSetWindowBackground(display,child,BlackPixel(display,0)); ---- ---- XSelectInput(display, win, ---- FocusChangeMask|EnterWindowMask|LeaveWindowMask); ---- XMapWindow(display, win); ---- XMapWindow(display, child); ---- ---- while (1) { ---- const char *mode, *detail; ---- ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case ButtonPress: ---- printf("button press\n"); ---- printf("type : %d\n", report.xbutton.type); ---- printf("serial : %d\n", report.xbutton.serial); ---- printf("send_event : %d\n", report.xbutton.send_event); ---- printf("display : 0x%x\n", report.xbutton.display); ---- printf("window : 0x%x\n", report.xbutton.window); ---- printf("root : 0x%x\n", report.xbutton.root); ---- printf("subwindow : 0x%x\n", report.xbutton.subwindow); ---- printf("time : %d\n", report.xbutton.time); ---- printf("x, y : %d, %d\n", report.xbutton.x, ---- report.xbutton.y); ---- printf("rootx, rooty: %d, %d\n", report.xbutton.x_root, ---- report.xbutton.y_root); ---- printf("state : 0x%x\n", report.xbutton.state); ---- printf("button : %d\n", report.xbutton.button); ---- printf("same_screen : %d\n", report.xbutton.same_screen); ---- printf("---\n"); ---- break; ---- case MotionNotify: ---- printf("motion\n"); ---- printf("type : %d\n", report.xmotion.type); ---- printf("serial : %d\n", report.xmotion.serial); ---- printf("send_event : %d\n", report.xmotion.send_event); ---- printf("display : 0x%x\n", report.xmotion.display); ---- printf("window : 0x%x\n", report.xmotion.window); ---- printf("root : 0x%x\n", report.xmotion.root); ---- printf("subwindow : 0x%x\n", report.xmotion.subwindow); ---- printf("time : %d\n", report.xmotion.time); ---- printf("x, y : %d, %d\n", report.xmotion.x, ---- report.xmotion.y); ---- printf("rootx, rooty: %d, %d\n", report.xmotion.x_root, ---- report.xmotion.y_root); ---- printf("state : 0x%x\n", report.xmotion.state); ---- printf("is_hint : %d\n", report.xmotion.is_hint); ---- printf("same_screen : %d\n", report.xmotion.same_screen); ---- printf("---\n"); ---- if (XGrabPointer(display, win, False, ButtonReleaseMask, ---- GrabModeAsync, GrabModeAsync, None, None, ---- report.xmotion.time) == GrabSuccess) ---- printf("GrabSuccess\n"); ---- else ---- printf("GrabFail\n"); ---- break; ---- case ButtonRelease: ---- XUngrabPointer(display, report.xbutton.time); ---- break; ---- case FocusIn: ---- switch (report.xfocus.mode) { ---- case NotifyNormal: mode = "NotifyNormal"; break; ---- case NotifyGrab: mode = "NotifyGrab"; break; ---- case NotifyUngrab: mode = "NotifyUngrab"; break; ---- } ---- ---- switch (report.xfocus.detail) { ---- case NotifyAncestor: detail = "NotifyAncestor"; break; ---- case NotifyVirtual: detail = "NotifyVirtual"; break; ---- case NotifyInferior: detail = "NotifyInferior"; break; ---- case NotifyNonlinear: detail = "NotifyNonlinear"; break; ---- case NotifyNonlinearVirtual: ---- detail = "NotifyNonlinearVirtual"; break; ---- case NotifyPointer: detail = "NotifyPointer"; break; ---- case NotifyPointerRoot: detail = "NotifyPointerRoot"; break; ---- case NotifyDetailNone: detail = "NotifyDetailNone"; break; ---- } ---- printf("focusin\n"); ---- printf("type : %d\n", report.xfocus.type); ---- printf("serial : %d\n", report.xfocus.serial); ---- printf("send_event: %d\n", report.xfocus.send_event); ---- printf("display : 0x%x\n", report.xfocus.display); ---- printf("window : 0x%x\n", report.xfocus.window); ---- printf("mode : %s\n", mode); ---- printf("detail : %s\n", detail); ---- printf("---\n"); ---- break; ---- case FocusOut: ---- switch (report.xfocus.mode) { ---- case NotifyNormal: mode = "NotifyNormal"; break; ---- case NotifyGrab: mode = "NotifyGrab"; break; ---- case NotifyUngrab: mode = "NotifyUngrab"; break; ---- } ---- ---- switch (report.xfocus.detail) { ---- case NotifyAncestor: detail = "NotifyAncestor"; break; ---- case NotifyVirtual: detail = "NotifyVirtual"; break; ---- case NotifyInferior: detail = "NotifyInferior"; break; ---- case NotifyNonlinear: detail = "NotifyNonlinear"; break; ---- case NotifyNonlinearVirtual: ---- detail = "NotifyNonlinearVirtual"; break; ---- case NotifyPointer: detail = "NotifyPointer"; break; ---- case NotifyPointerRoot: detail = "NotifyPointerRoot"; break; ---- case NotifyDetailNone: detail = "NotifyDetailNone"; break; ---- } ---- printf("focusout\n"); ---- printf("type : %d\n", report.xfocus.type); ---- printf("serial : %d\n", report.xfocus.serial); ---- printf("send_event: %d\n", report.xfocus.send_event); ---- printf("display : 0x%x\n", report.xfocus.display); ---- printf("window : 0x%x\n", report.xfocus.window); ---- printf("mode : %s\n", mode); ---- printf("detail : %s\n", detail); ---- printf("---\n"); ---- break; ---- case EnterNotify: ---- switch (report.xcrossing.mode) { ---- case NotifyNormal: mode = "NotifyNormal"; break; ---- case NotifyGrab: mode = "NotifyGrab"; break; ---- case NotifyUngrab: mode = "NotifyUngrab"; break; ---- } ---- ---- switch (report.xcrossing.detail) { ---- case NotifyAncestor: detail = "NotifyAncestor"; break; ---- case NotifyVirtual: detail = "NotifyVirtual"; break; ---- case NotifyInferior: detail = "NotifyInferior"; break; ---- case NotifyNonlinear: detail = "NotifyNonlinear"; break; ---- case NotifyNonlinearVirtual: ---- detail = "NotifyNonlinearVirtual"; break; ---- case NotifyPointer: detail = "NotifyPointer"; break; ---- case NotifyPointerRoot: detail = "NotifyPointerRoot"; break; ---- case NotifyDetailNone: detail = "NotifyDetailNone"; break; ---- } ---- printf("enternotify\n"); ---- printf("type : %d\n", report.xcrossing.type); ---- printf("serial : %d\n", report.xcrossing.serial); ---- printf("send_event: %d\n", report.xcrossing.send_event); ---- printf("display : 0x%x\n", report.xcrossing.display); ---- printf("window : 0x%x\n", report.xcrossing.window); ---- printf("mode : %s\n", mode); ---- printf("detail : %s\n", detail); ---- printf("---\n"); ---- break; ---- case LeaveNotify: ---- switch (report.xcrossing.mode) { ---- case NotifyNormal: mode = "NotifyNormal"; break; ---- case NotifyGrab: mode = "NotifyGrab"; break; ---- case NotifyUngrab: mode = "NotifyUngrab"; break; ---- } ---- ---- switch (report.xcrossing.detail) { ---- case NotifyAncestor: detail = "NotifyAncestor"; break; ---- case NotifyVirtual: detail = "NotifyVirtual"; break; ---- case NotifyInferior: detail = "NotifyInferior"; break; ---- case NotifyNonlinear: detail = "NotifyNonlinear"; break; ---- case NotifyNonlinearVirtual: ---- detail = "NotifyNonlinearVirtual"; break; ---- case NotifyPointer: detail = "NotifyPointer"; break; ---- case NotifyPointerRoot: detail = "NotifyPointerRoot"; break; ---- case NotifyDetailNone: detail = "NotifyDetailNone"; break; ---- } ---- printf("leavenotify\n"); ---- printf("type : %d\n", report.xcrossing.type); ---- printf("serial : %d\n", report.xcrossing.serial); ---- printf("send_event: %d\n", report.xcrossing.send_event); ---- printf("display : 0x%x\n", report.xcrossing.display); ---- printf("window : 0x%x\n", report.xcrossing.window); ---- printf("mode : %s\n", mode); ---- printf("detail : %s\n", detail); ---- printf("---\n"); ---- break; ---- } ---- } ---- ---- return 1; ----} diff --cc tests/fullscreen.c index 6907cab5,6907cab5,6907cab5,6907cab5..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/fullscreen.c +++ /dev/null @@@@@ -1,102 -1,102 -1,102 -1,102 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- fullscreen.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom _net_fs, _net_state; ---- XEvent msg; ---- int x=10,y=10,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- _net_state = XInternAtom(display, "_NET_WM_STATE", False); ---- _net_fs = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- sleep(2); ---- ---- printf("fullscreen\n"); ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _net_state; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2; // toggle ---- msg.xclient.data.l[1] = _net_fs; ---- msg.xclient.data.l[2] = 0l; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- sleep(2); ---- ---- printf("restore\n"); ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _net_state; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2; // toggle ---- msg.xclient.data.l[1] = _net_fs; ---- msg.xclient.data.l[2] = 0l; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/grav.c index 772fec2b,772fec2b,772fec2b,772fec2b..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/grav.c +++ /dev/null @@@@@ -1,80 -1,80 -1,80 -1,80 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grav.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400,b=10; ---- XSizeHints *hints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, b, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- hints = XAllocSizeHints(); ---- hints->flags = PWinGravity; ---- hints->win_gravity = SouthEastGravity; ---- XSetWMNormalHints(display, win, hints); ---- XFree(hints); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- w = 600; ---- h = 160; ---- XMoveResizeWindow(display, win, 1172-w-b*2, 668-h-b*2, w, h); ---- XFlush(display); ---- sleep(1); ---- XResizeWindow(display, win, 900, 275); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/groupmodal.c index 12057eb9,12057eb9,12057eb9,12057eb9..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/groupmodal.c +++ /dev/null @@@@@ -1,80 -1,80 -1,80 -1,80 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grouptran.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window one, two, group; ---- XEvent report; ---- XWMHints *wmhints; ---- Atom state, modal; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- modal = XInternAtom(display, "_NET_WM_STATE_MODAL", True); ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,1,1, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- one = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,300,300, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- two = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,one,WhitePixel(display,0)); ---- XSetWindowBackground(display,two,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, two, RootWindow(display,0)); ---- XChangeProperty(display, two, state, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&modal, 1); ---- ---- wmhints = XAllocWMHints(); ---- ---- wmhints->flags = WindowGroupHint; ---- wmhints->window_group = group; ---- ---- XSetWMHints(display, one, wmhints); ---- XSetWMHints(display, two, wmhints); ---- ---- XFree(wmhints); ---- ---- XMapWindow(display, one); ---- XFlush(display); ---- sleep(1); ---- XMapWindow(display, two); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/grouptran.c index 320da2f6,320da2f6,320da2f6,320da2f6..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/grouptran.c +++ /dev/null @@@@@ -1,72 -1,72 -1,72 -1,72 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grouptran.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window one, two, group; ---- XEvent report; ---- XWMHints *wmhints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,1,1, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- one = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- two = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,one,WhitePixel(display,0)); ---- XSetWindowBackground(display,two,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, two, RootWindow(display,0)); ---- ---- wmhints = XAllocWMHints(); ---- ---- wmhints->flags = WindowGroupHint; ---- wmhints->window_group = group; ---- ---- XSetWMHints(display, one, wmhints); ---- XSetWMHints(display, two, wmhints); ---- ---- XFree(wmhints); ---- ---- XMapWindow(display, one); ---- XMapWindow(display, two); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/grouptran2.c index 4cd6c588,4cd6c588,4cd6c588,4cd6c588..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/grouptran2.c +++ /dev/null @@@@@ -1,79 -1,79 -1,79 -1,79 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grouptran2.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window main, grouptran, child, group; ---- XEvent report; ---- XWMHints *wmhints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,1,1, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- main = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- grouptran = XCreateWindow(display, RootWindow(display, 0), ---- 10,10,80,180, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child = XCreateWindow(display, RootWindow(display, 0), ---- 20,20,60,60, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,main,WhitePixel(display,0)); ---- XSetWindowBackground(display,grouptran,BlackPixel(display,0)); ---- XSetWindowBackground(display,child,WhitePixel(display,0)); ---- ---- XSetTransientForHint(display, grouptran, RootWindow(display,0)); ---- XSetTransientForHint(display, child, grouptran); ---- ---- wmhints = XAllocWMHints(); ---- ---- wmhints->flags = WindowGroupHint; ---- wmhints->window_group = group; ---- ---- XSetWMHints(display, main, wmhints); ---- XSetWMHints(display, grouptran, wmhints); ---- XSetWMHints(display, child, wmhints); ---- ---- XFree(wmhints); ---- ---- XMapWindow(display, main); ---- XMapWindow(display, grouptran); ---- XMapWindow(display, child); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/grouptrancircular.c index 3853aefb,3853aefb,3853aefb,3853aefb..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/grouptrancircular.c +++ /dev/null @@@@@ -1,73 -1,73 -1,73 -1,73 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grouptrancircular.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window one, two, group; ---- XEvent report; ---- XWMHints *wmhints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,1,1, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- one = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- two = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,one,WhitePixel(display,0)); ---- XSetWindowBackground(display,two,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, one, RootWindow(display,0)); ---- XSetTransientForHint(display, two, RootWindow(display,0)); ---- ---- wmhints = XAllocWMHints(); ---- ---- wmhints->flags = WindowGroupHint; ---- wmhints->window_group = group; ---- ---- XSetWMHints(display, one, wmhints); ---- XSetWMHints(display, two, wmhints); ---- ---- XFree(wmhints); ---- ---- XMapWindow(display, one); ---- XMapWindow(display, two); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/grouptrancircular2.c index 1956c8ff,1956c8ff,1956c8ff,1956c8ff..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/grouptrancircular2.c +++ /dev/null @@@@@ -1,79 -1,79 -1,79 -1,79 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- grouptrancircular.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window one, two, three, group; ---- XEvent report; ---- XWMHints *wmhints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,1,1, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- one = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- two = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- three = XCreateWindow(display, RootWindow(display, 0), ---- 0,0,100,100, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,one,WhitePixel(display,0)); ---- XSetWindowBackground(display,two,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, one, RootWindow(display,0)); ---- XSetTransientForHint(display, two, one); ---- XSetTransientForHint(display, three, two); ---- ---- wmhints = XAllocWMHints(); ---- ---- wmhints->flags = WindowGroupHint; ---- wmhints->window_group = group; ---- ---- XSetWMHints(display, one, wmhints); ---- XSetWMHints(display, two, wmhints); ---- XSetWMHints(display, three, wmhints); ---- ---- XFree(wmhints); ---- ---- XMapWindow(display, one); ---- XMapWindow(display, two); ---- XMapWindow(display, three); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/hideshow.py index 2e7fc3ae,2e7fc3ae,2e7fc3ae,2e7fc3ae..00000000 deleted file mode 100755,100755,100755,100755 --- a/tests/hideshow.py +++ /dev/null @@@@@ -1,78 -1,78 -1,78 -1,78 +1,0 @@@@@ ----#!/usr/bin/env python ---- ----import pygtk ----import gtk ----import gobject ----pygtk.require('2.0') ---- ----class FolderSelector(gtk.Window): ---- def __init__(self, jules): ---- gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) ---- print "init folder selector", self, jules ---- self.set_title("Select Folder") ---- self.jules = jules ---- ---- self.set_size_request(140, 200) ---- ---- self.list_model = gtk.ListStore(gobject.TYPE_STRING) ---- self.tree = gtk.TreeView(self.list_model) ---- self.folder_column = gtk.TreeViewColumn('Folder') ---- self.tree.append_column(self.folder_column) ---- ---- self.folder_cell = gtk.CellRendererText() ---- self.folder_column.pack_start(self.folder_cell, True) ---- self.folder_column.add_attribute(self.folder_cell, 'text', 0) ---- ---- self.tree.set_search_column(0) ---- ---- self.icon_theme = gtk.icon_theme_get_default() ---- ---- self.add(self.tree) ---- self.show_all() ---- self.tree.columns_autosize() ---- print "done init" ---- ----class Jules(gtk.Window): ---- def __init__(self): ---- gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) ---- self.set_title("Jules") ---- self.set_size_request(150, 320) ---- self.connect("delete_event", self.on_delete_event) ---- self.connect("destroy", self.on_destroy) ---- self.scroll = gtk.ScrolledWindow() ---- ---- self.tree_model = gtk.TreeStore(gobject.TYPE_STRING, ---- gobject.TYPE_STRING) ---- self.tree = gtk.TreeView(self.tree_model) ---- self.file_column = gtk.TreeViewColumn('name', gtk.CellRendererText(), ---- markup=0) ---- self.file_column.set_sort_indicator(True) ---- self.file_column.set_clickable(True) ---- self.file_column.set_sort_column_id(1) ---- self.tree.append_column(self.file_column) ---- self.tree.set_headers_clickable(True) ---- self.tree.set_search_column(0) ---- ---- self.scroll.add(self.tree) ---- self.add(self.scroll) ---- self.show_all() ---- ---- self.project_selector = FolderSelector(self) ---- self.project_selector.hide() ---- self.project_selector.hide() ---- ---- self.project_selector.show() ---- ---- def on_delete_event(self, widget, event): ---- return False ---- ---- def on_destroy(self, widget): ---- gtk.main_quit() ---- ---- def run(self): ---- gtk.main() ---- ---- ----if __name__ == "__main__": ---- jules = Jules() ---- jules.run() diff --cc tests/icons.c index af13e0b5,db3ae6cc,af13e0b5,af13e0b5..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/icons.c +++ /dev/null @@@@@ -1,250 -1,257 -1,250 -1,250 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- icons.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ----#include ----#include ----#include ----#include - #include - #include - #include ---- ----Window findClient(Display *d, Window win) ----{ ---- Window r, *children; ---- unsigned int n, i; ---- Atom state = XInternAtom(d, "WM_STATE", True); ---- Atom ret_type; ---- int ret_format; ---- unsigned long ret_items, ret_bytesleft; ---- unsigned long *prop_return; ---- ---- XQueryTree(d, win, &r, &r, &children, &n); ---- for (i = 0; i < n; ++i) { ---- Window w = findClient(d, children[i]); ---- if (w) return w; ---- } ---- ---- // try me ---- XGetWindowProperty(d, win, state, 0, 1, ---- False, state, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return); ---- if (ret_type == None || ret_items < 1) ---- return None; ---- return win; // found it! ----} ---- ----int main(int argc, char **argv) ----{ ---- Display *d = XOpenDisplay(NULL); ---- int s = DefaultScreen(d); ---- Atom net_wm_icon = XInternAtom(d, "_NET_WM_ICON", True); ---- Atom ret_type; ---- unsigned int winw = 0, winh = 0; ---- int ret_format; ---- unsigned long ret_items, ret_bytesleft; ---- const int MAX_IMAGES = 10; ---- unsigned long *prop_return[MAX_IMAGES]; ---- XImage *i[MAX_IMAGES]; ---- long offset = 0; ---- unsigned int image = 0; ---- unsigned int j; // loop counter ---- Window id, win; ---- Pixmap p; ---- Cursor cur; ---- XEvent ev; ---- ---- printf("Click on a window with an icon...\n"); ---- ---- //int id = strtol(argv[1], NULL, 16); ---- XUngrabPointer(d, CurrentTime); ---- cur = XCreateFontCursor(d, XC_crosshair); ---- XGrabPointer(d, RootWindow(d, s), False, ButtonPressMask, GrabModeAsync, ---- GrabModeAsync, None, cur, CurrentTime); ---- while (1) { ---- XNextEvent(d, &ev); ---- if (ev.type == ButtonPress) { ---- XUngrabPointer(d, CurrentTime); ---- id = findClient(d, ev.xbutton.subwindow); ---- break; ---- } ---- } ---- ---- printf("Using window 0x%lx\n", id); ---- ---- do { ---- unsigned int w, h; ---- ---- XGetWindowProperty(d, id, net_wm_icon, offset++, 1, ---- False, XA_CARDINAL, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return[image]); ---- if (ret_type == None || ret_items < 1) { ---- printf("No icon found\n"); ---- return 1; ---- } ---- w = prop_return[image][0]; ---- XFree(prop_return[image]); ---- ---- XGetWindowProperty(d, id, net_wm_icon, offset++, 1, ---- False, XA_CARDINAL, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return[image]); ---- if (ret_type == None || ret_items < 1) { ---- printf("Failed to get height\n"); ---- return 1; ---- } ---- h = prop_return[image][0]; ---- XFree(prop_return[image]); ---- ---- XGetWindowProperty(d, id, net_wm_icon, offset, w*h, ---- False, XA_CARDINAL, &ret_type, &ret_format, ---- &ret_items, &ret_bytesleft, ---- (unsigned char**) &prop_return[image]); ---- if (ret_type == None || ret_items < w*h) { ---- printf("Failed to get image data\n"); ---- return 1; ---- } ---- offset += w*h; ---- ---- printf("Found icon with size %dx%d\n", w, h); ---- ---- i[image] = XCreateImage(d, DefaultVisual(d, s), DefaultDepth(d, s), ---- ZPixmap, 0, NULL, w, h, 32, 0); ---- assert(i[image]); ---- i[image]->byte_order = LSBFirst; ---- i[image]->data = (char*)prop_return[image]; ---- for (j = 0; j < w*h; j++) { ---- unsigned char alpha = (unsigned char)i[image]->data[j*4+3]; ---- unsigned char r = (unsigned char) i[image]->data[j*4+0]; ---- unsigned char g = (unsigned char) i[image]->data[j*4+1]; ---- unsigned char b = (unsigned char) i[image]->data[j*4+2]; ---- ---- // background color ---- unsigned char bgr = 0; ---- unsigned char bgg = 0; ---- unsigned char bgb = 0; ---- ---- r = bgr + (r - bgr) * alpha / 256; ---- g = bgg + (g - bgg) * alpha / 256; ---- b = bgb + (b - bgb) * alpha / 256; ---- ---- i[image]->data[j*4+0] = (char) r; ---- i[image]->data[j*4+1] = (char) g; ---- i[image]->data[j*4+2] = (char) b; ---- } ---- ---- winw += w; ---- if (h > winh) winh = h; ---- ---- ++image; ---- } while (ret_bytesleft > 0 && image < MAX_IMAGES); ---- ----#define hashsize(n) ((guint32)1<<(n)) ----#define hashmask(n) (hashsize(n)-1) ----#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) ---- ----#define mix(a,b,c) \ ----{ \ ---- a -= c; a ^= rot(c, 4); c += b; \ ---- b -= a; b ^= rot(a, 6); a += c; \ ---- c -= b; c ^= rot(b, 8); b += a; \ ---- a -= c; a ^= rot(c,16); c += b; \ ---- b -= a; b ^= rot(a,19); a += c; \ ---- c -= b; c ^= rot(b, 4); b += a; \ ----} ---- ----#define final(a,b,c) \ ----{ \ ---- c ^= b; c -= rot(b,14); \ ---- a ^= c; a -= rot(c,11); \ ---- b ^= a; b -= rot(a,25); \ ---- c ^= b; c -= rot(b,16); \ ---- a ^= c; a -= rot(c,4); \ ---- b ^= a; b -= rot(a,14); \ ---- c ^= b; c -= rot(b,24); \ ----} ---- ---- /* hash the images */ ---- for (j = 0; j < image; ++j) { ---- unsigned int w, h, length; ---- guint32 a,b,c; ---- guint32 initval = 0xf00d; ---- const guint32 *k = (guint32*)i[j]->data; ---- ---- w = i[j]->width; ---- h = i[j]->height; ---- length = w * h; ---- ---- /* Set up the internal state */ ---- a = b = c = 0xdeadbeef + (((guint32)length)<<2) + initval; ---- ---- /*---------------------------------------- handle most of the key */ ---- while (length > 3) ---- { ---- a += k[0]; ---- b += k[1]; ---- c += k[2]; ---- mix(a,b,c); ---- length -= 3; ---- k += 3; ---- } ---- ---- /*--------------------------------- handle the last 3 uint32_t's */ ---- switch(length) /* all the case statements fall through */ ---- { ---- case 3 : c+=k[2]; ---- case 2 : b+=k[1]; ---- case 1 : a+=k[0]; ---- final(a,b,c); ---- case 0: /* case 0: nothing left to add */ ---- break; ---- } ---- /*------------------------------------ report the result */ ---- printf("image[%d] %ux%u %lu\n", j, w, h, c); ---- } ---- ---- win = XCreateSimpleWindow(d, RootWindow(d, s), 0, 0, winw, winh, ---- 0, 0, 0); ---- assert(win); ---- XMapWindow(d, win); ---- ---- p = XCreatePixmap(d, win, winw, winh, DefaultDepth(d, s)); ---- XFillRectangle(d, p, DefaultGC(d, s), 0, 0, winw, winh); ---- ---- for (j = 0; j < image; ++j) { ---- static unsigned int x = 0; ---- ---- XPutImage(d, p, DefaultGC(d, s), i[j], 0, 0, x, 0, ---- i[j]->width, i[j]->height); ---- x += i[j]->width; - char *filename; - asprintf(&filename, "icon%i.raw", j); - int fd = open(filename, O_CREAT | O_RDWR); - write(fd, i[j]->data, i[j]->width * i[j]->height * i[j]->depth); ---- XDestroyImage(i[j]); ---- } ---- ---- XSetWindowBackgroundPixmap(d, win, p); ---- XClearWindow(d, win); ---- ---- XFlush(d); ---- ---- getchar(); ---- ---- XFreePixmap(d, p); ---- XCloseDisplay(d); ----} diff --cc tests/mapiconic.c index 76455a06,76455a06,76455a06,76455a06..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/mapiconic.c +++ /dev/null @@@@@ -1,80 -1,80 -1,80 -1,80 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- urgent.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom wm_state; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- unsigned long state[2]; ---- XWMHints *hints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state[0] = IconicState; ---- state[1] = None; ---- ---- wm_state = XInternAtom(display, "WM_STATE", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- hints = XAllocWMHints(); ---- hints->flags = StateHint; ---- hints->initial_state = IconicState; ---- XSetWMHints(display, win, hints); ---- XFree(hints); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/modal.c index edbd5cc0,edbd5cc0,edbd5cc0,edbd5cc0..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/modal.c +++ /dev/null @@@@@ -1,64 -1,64 -1,64 -1,64 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- modal.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window parent, child; ---- XEvent report; ---- Atom state, modal; ---- int x=10,y=10,h=400,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- modal = XInternAtom(display, "_NET_WM_STATE_MODAL", True); ---- ---- parent = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,parent,WhitePixel(display,0)); ---- XSetWindowBackground(display,child,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, child, parent); ---- XChangeProperty(display, child, state, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&modal, 1); ---- ---- XMapWindow(display, parent); ---- XMapWindow(display, child); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/modal2.c index e7afb9b0,e7afb9b0,e7afb9b0,e7afb9b0..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/modal2.c +++ /dev/null @@@@@ -1,74 -1,74 -1,74 -1,74 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- modal2.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window parent, child; ---- XEvent report; ---- Atom state, modal; ---- int x=10,y=10,h=400,w=400; ---- XEvent ce; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- modal = XInternAtom(display, "_NET_WM_STATE_MODAL", True); ---- ---- parent = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,parent,WhitePixel(display,0)); ---- XSetWindowBackground(display,child,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, child, parent); ---- ---- XMapWindow(display, parent); ---- XMapWindow(display, child); ---- XFlush(display); ---- ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = state; ---- ce.xclient.display = display; ---- ce.xclient.window = child; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = 1; ---- ce.xclient.data.l[1] = modal; ---- ce.xclient.data.l[2] = 0; ---- XSendEvent(display, RootWindow(display, DefaultScreen(display)), ---- False, SubstructureNotifyMask | SubstructureRedirectMask, &ce); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/modal3.c index 76c82196,76c82196,76c82196,76c82196..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/modal3.c +++ /dev/null @@@@@ -1,78 -1,78 -1,78 -1,78 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- modal3.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window parent, child; ---- XEvent report; ---- Atom state, modal; ---- int x=10,y=10,h=400,w=400; ---- XEvent ce; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- modal = XInternAtom(display, "_NET_WM_STATE_MODAL", True); ---- ---- parent = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,parent,WhitePixel(display,0)); ---- XSetWindowBackground(display,child,BlackPixel(display,0)); ---- ---- XSetTransientForHint(display, child, parent); ---- ---- XMapWindow(display, parent); ---- XMapWindow(display, child); ---- XFlush(display); ---- ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = state; ---- ce.xclient.display = display; ---- ce.xclient.window = child; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = 1; ---- ce.xclient.data.l[1] = modal; ---- ce.xclient.data.l[2] = 0; ---- XSendEvent(display, RootWindow(display, DefaultScreen(display)), ---- False, SubstructureNotifyMask | SubstructureRedirectMask, &ce); ---- ---- ce.xclient.data.l[0] = 0; ---- XSendEvent(display, RootWindow(display, DefaultScreen(display)), ---- False, SubstructureNotifyMask | SubstructureRedirectMask, &ce); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/noresize.c index c98295bd,c98295bd,c98295bd,c98295bd..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/noresize.c +++ /dev/null @@@@@ -1,82 -1,82 -1,82 -1,82 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- noresize.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- XSetWindowAttributes xswa; ---- unsigned long xswamask; ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- XSizeHints size; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- xswa.win_gravity = StaticGravity; ---- xswamask = CWWinGravity; ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 0, CopyFromParent, CopyFromParent, ---- CopyFromParent, xswamask, &xswa); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- size.flags = PMinSize | PMaxSize; ---- size.max_width = 0; ---- size.min_width = w; ---- size.max_height = 0; ---- size.min_height = h; ---- XSetWMNormalHints(display, win, &size); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- XMoveWindow(display, win, 10, 10); ---- XMoveWindow(display, win, 10, 10); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/override.c index 44c3a003,44c3a003,44c3a003,44c3a003..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/override.c +++ /dev/null @@@@@ -1,76 -1,76 -1,76 -1,76 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- override.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ---- ----int main () { ---- XSetWindowAttributes xswa; ---- unsigned long xswamask; ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- xswa.override_redirect = True; ---- xswamask = CWOverrideRedirect; ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, xswamask, &xswa); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- sleep(1); ---- XUnmapWindow(display, win); ---- XFlush(display); ---- sleep(1); ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/overrideinputonly.c index 0c13ac34,0c13ac34,0c13ac34,0c13ac34..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/overrideinputonly.c +++ /dev/null @@@@@ -1,58 -1,58 -1,58 -1,58 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- override.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ---- ----int main (int argc, char *argv[]) { ---- XSetWindowAttributes xswa; ---- unsigned long xswamask; ---- Display *display; ---- Window win; ---- XEvent report; ---- int i,x=0,y=0,h=1,w=1; ---- ---- for (i=0; i < argc; i++) { ---- if (!strcmp(argv[i], "-g") || !strcmp(argv[i], "-geometry")) { ---- XParseGeometry(argv[++i], &x, &y, &w, &h); ---- } ---- } ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- xswa.override_redirect = True; ---- xswamask = CWOverrideRedirect; ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 0, 0, InputOnly, ---- CopyFromParent, xswamask, &xswa); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/positioned.c index 26f835d6,26f835d6,26f835d6,26f835d6..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/positioned.c +++ /dev/null @@@@@ -1,73 -1,73 -1,73 -1,73 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- positioned.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main (int argc, char **argv) { ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=200,y=200,h=100,w=400,s; ---- XSizeHints *size; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 0, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- size = XAllocSizeHints(); ---- size->flags = PPosition; ---- XSetWMNormalHints(display,win,size); ---- XFree(size); ---- ---- XFlush(display); ---- XMapWindow(display, win); ---- ---- XSelectInput(display, win, StructureNotifyMask | ButtonPressMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case ButtonPress: ---- XUnmapWindow(display, win); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- s = report.xconfigure.send_event; ---- printf("confignotify %i,%i-%ix%i (send: %d)\n",x,y,w,h,s); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/resize.c index e3a84bb8,e3a84bb8,e3a84bb8,e3a84bb8..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/resize.c +++ /dev/null @@@@@ -1,69 -1,69 -1,69 -1,69 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- resize.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- sleep(5); ---- XResizeWindow(display, win, 600, 150); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/restack.c index fe1bcdb6,fe1bcdb6,fe1bcdb6,fe1bcdb6..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/restack.c +++ /dev/null @@@@@ -1,139 -1,139 -1,139 -1,139 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- extentsrequest.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom _restack; ---- XEvent msg; ---- int x=10,y=10,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- _restack = XInternAtom(display, "_NET_RESTACK_WINDOW", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- printf("requesting bottom in 3\n"); ---- sleep(3); ---- ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _restack; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = Below; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("requesting top in 3\n"); ---- sleep(3); ---- ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _restack; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = Above; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("requesting bottomif in 3\n"); ---- sleep(3); ---- ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _restack; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = BottomIf; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("requesting topif in 3\n"); ---- sleep(3); ---- ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _restack; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = TopIf; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- printf("requesting opposite in 3\n"); ---- sleep(3); ---- ---- msg.xclient.type = ClientMessage; ---- msg.xclient.message_type = _restack; ---- msg.xclient.display = display; ---- msg.xclient.window = win; ---- msg.xclient.format = 32; ---- msg.xclient.data.l[0] = 2l; ---- msg.xclient.data.l[1] = 0l; ---- msg.xclient.data.l[2] = Opposite; ---- msg.xclient.data.l[3] = 0l; ---- msg.xclient.data.l[4] = 0l; ---- XSendEvent(display, RootWindow(display, 0), False, ---- SubstructureNotifyMask | SubstructureRedirectMask, &msg); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/shape.c index c3de7da3,c3de7da3,c3de7da3,c3de7da3..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/shape.c +++ /dev/null @@@@@ -1,77 -1,77 -1,77 -1,77 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- shape.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ----#include ---- ----int main () { ---- ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- XWMHints hint; ---- XRectangle xrect; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- xrect.x = 10; ---- xrect.y = 10; ---- xrect.width = w - 20; ---- xrect.height = h - 20; ---- XShapeCombineRectangles(display, win, ---- ShapeBounding, 0, 0, &xrect, 1, ---- ShapeSet, Unsorted); ---- ---- XSetWindowBackground(display,win,BlackPixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/showhide.c index d1a63e2f,133a89ad,d1a63e2f,d1a63e2f..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/showhide.c +++ /dev/null @@@@@ -1,54 -1,54 -1,54 -1,54 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- showhide.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- while (1) { ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- XMapWindow(display, win); ---- XFlush(display); ---- usleep(1000); ---- XDestroyWindow(display, win); ---- XSync(display, False); ---- - -- break; - -- sleep(2); - //break; - usleep(200000); ---- } ---- ---- return 1; ----} diff --cc tests/skiptaskbar.c index 1b246160,1b246160,1b246160,1b246160..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/skiptaskbar.c +++ /dev/null @@@@@ -1,58 -1,58 -1,58 -1,58 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- skiptaskbar.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom state, skip; ---- int x=10,y=10,h=400,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- skip = XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", True); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XChangeProperty(display, win, state, XA_ATOM, 32, ---- PropModeReplace, (unsigned char*)&skip, 1); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/skiptaskbar2.c index 3fb22315,3fb22315,3fb22315,3fb22315..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/skiptaskbar2.c +++ /dev/null @@@@@ -1,68 -1,68 -1,68 -1,68 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- skiptaskbar2.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report, ce; ---- Atom state, skip; ---- int x=10,y=10,h=400,w=400; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- state = XInternAtom(display, "_NET_WM_STATE", True); ---- skip = XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", True); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- sleep(1); ---- ---- ce.xclient.type = ClientMessage; ---- ce.xclient.message_type = state; ---- ce.xclient.display = display; ---- ce.xclient.window = win; ---- ce.xclient.format = 32; ---- ce.xclient.data.l[0] = 1; ---- ce.xclient.data.l[1] = skip; ---- ce.xclient.data.l[2] = 0; ---- XSendEvent(display, RootWindow(display, DefaultScreen(display)), ---- False, SubstructureNotifyMask | SubstructureRedirectMask, &ce); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/stacking.c index 4d2bda95,4d2bda95,4d2bda95,4d2bda95..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/stacking.c +++ /dev/null @@@@@ -1,80 -1,80 -1,80 -1,80 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- stacking.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window parent, child1, child2, group; ---- XEvent report; ---- int x=10,y=10,h=400,w=400; ---- XWMHints *hints; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- group = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- parent = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child1 = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- child2 = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,parent,WhitePixel(display,0)); ---- XSetWindowBackground(display,child1,BlackPixel(display,0)); ---- XSetWindowBackground(display,child2,WhitePixel(display,0)); ---- ---- hints = XAllocWMHints(); ---- hints->flags = WindowGroupHint; ---- hints->window_group = group; ---- XSetWMHints(display, parent, hints); ---- XSetWMHints(display, child1, hints); ---- XSetWMHints(display, child2, hints); ---- XFree(hints); ---- ---- XSetTransientForHint(display, child1, ---- RootWindow(display, DefaultScreen(display))); ---- XSetTransientForHint(display, child2, parent); ---- ---- XMapWindow(display, parent); ---- XFlush(display); ---- sleep(3); ---- XMapWindow(display, child1); ---- XFlush(display); ---- sleep(3); ---- XMapWindow(display, child2); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc tests/strut.c index 15a48607,15a48607,15a48607,15a48607..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/strut.c +++ /dev/null @@@@@ -1,84 -1,84 -1,84 -1,84 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- strut.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; ---- Atom _net_strut; ---- XEvent msg; ---- int x=10,y=10,h=100,w=400; ---- int s[4]; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- _net_strut = XInternAtom(display, "_NET_WM_STRUT", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- sleep(2); ---- ---- printf("top\n"); ---- s[0] = 0; s[1] = 0; s[2] = 20; s[3] = 0; ---- XChangeProperty(display, win, _net_strut, XA_CARDINAL, 32, ---- PropModeReplace, (unsigned char*) s, 4); ---- XFlush(display); ---- sleep(2); ---- ---- printf("none\n"); ---- XDeleteProperty(display, win, _net_strut); ---- XFlush(display); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/title.c index 799bdf54,799bdf54,799bdf54,799bdf54..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/title.c +++ /dev/null @@@@@ -1,86 -1,86 -1,86 -1,86 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- title.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main (int argc, char **argv) { ---- Display *display; ---- Window win; ---- XEvent report; ---- int x=10,y=10,h=100,w=400; ---- XSizeHints size; ---- XTextProperty name; ---- Atom nameprop,nameenc; ---- ---- if (argc < 2) return 1; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- if (argc > 2) ---- nameprop = XInternAtom(display,argv[2],False); ---- else ---- nameprop = XInternAtom(display,"WM_NAME",False); ---- if (argc > 3) ---- nameenc = XInternAtom(display,argv[3],False); ---- else ---- nameenc = XInternAtom(display,"STRING",False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ----// XStringListToTextProperty(&argv[1], 1, &name); ----// XSetWMName(display, win, &name); ---- XChangeProperty(display, win, nameprop, nameenc, 8, ---- PropModeAppend, argv[1], strlen(argv[1])); ---- ---- XFlush(display); ---- XMapWindow(display, win); ---- ---- XSelectInput(display, win, ExposureMask | StructureNotifyMask); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/urgent.c index c29e3005,37b533ef,c29e3005,c29e3005..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/urgent.c +++ /dev/null @@@@@ -1,77 -1,73 -1,77 -1,77 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- urgent.c for the Openbox window manager ---- Copyright (c) 2003-2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win; ---- XEvent report; - -- Atom _net_fs, _net_state; ---- XEvent msg; ---- int x=50,y=50,h=100,w=400; ---- XWMHints hint; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } - -- - -- _net_state = XInternAtom(display, "_NET_WM_STATE", False); - -- _net_fs = XInternAtom(display, "_NET_WM_STATE_FULLSCREEN", False); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, NULL); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- sleep(1); ---- ---- printf("urgent on\n"); ---- hint.flags = XUrgencyHint; ---- XSetWMHints(display, win, &hint); ---- XFlush(display); ---- ---- while (1) { ---- XNextEvent(display, &report); ---- ---- switch (report.type) { ---- case Expose: ---- printf("exposed\n"); ---- break; ---- case ConfigureNotify: ---- x = report.xconfigure.x; ---- y = report.xconfigure.y; ---- w = report.xconfigure.width; ---- h = report.xconfigure.height; ---- printf("confignotify %i,%i-%ix%i\n",x,y,w,h); ---- break; ---- } ---- ---- } ---- ---- return 1; ----} diff --cc tests/usertimewin.c index 7ef934f2,7ef934f2,7ef934f2,7ef934f2..00000000 deleted file mode 100644,100644,100644,100644 --- a/tests/usertimewin.c +++ /dev/null @@@@@ -1,75 -1,75 -1,75 -1,75 +1,0 @@@@@ ----/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- ---- ---- usertimewin.c for the Openbox window manager ---- Copyright (c) 2007 Dana Jansens ---- ---- 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. ---- ---- See the COPYING file for a copy of the GNU General Public License. ----*/ ---- ----#include ----#include ----#include ----#include ---- ----int main () { ---- Display *display; ---- Window win, twin; ---- XEvent report; ---- Atom atime, atimewin; ---- int x=10,y=10,h=400,w=400; ---- Time num; ---- ---- display = XOpenDisplay(NULL); ---- ---- if (display == NULL) { ---- fprintf(stderr, "couldn't connect to X server :0\n"); ---- return 0; ---- } ---- ---- atime = XInternAtom(display, "_NET_WM_USER_TIME", True); ---- atimewin = XInternAtom(display, "_NET_WM_USER_TIME_WINDOW", True); ---- ---- win = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w, h, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- twin = XCreateWindow(display, RootWindow(display, 0), ---- x, y, w/2, h/2, 10, CopyFromParent, CopyFromParent, ---- CopyFromParent, 0, 0); ---- ---- XSetWindowBackground(display,win,WhitePixel(display,0)); ---- ---- XMapWindow(display, win); ---- XFlush(display); ---- ---- sleep(2); ---- ---- printf("Setting time window\n"); ---- XChangeProperty(display, win, atimewin, XA_WINDOW, 32, ---- PropModeReplace, (unsigned char*)&twin, 1); ---- XFlush(display); ---- ---- sleep(1); ---- ---- num = 100; ---- printf("Setting time stamp on time window\n"); ---- XChangeProperty(display, twin, atime, XA_CARDINAL, 32, ---- PropModeReplace, (unsigned char*)&num, 1); ---- XFlush(display); ---- ---- ---- while (1) { ---- XNextEvent(display, &report); ---- } ---- ---- return 1; ----} diff --cc themes/Artwiz-boxed/openbox-3/themerc index 890c98d7,890c98d7,890c98d7,890c98d7..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Artwiz-boxed/openbox-3/themerc +++ /dev/null @@@@@ -1,102 -1,102 -1,102 -1,102 +1,0 @@@@@ ----menu.title.bg: raised gradient diagonal ----menu.title.bg.color: rgb:90/94/98 ----menu.title.bg.colorTo: rgb:20/24/28 ----menu.title.text.color: white ----menu.title.text.justify: center ---- ----menu.items.bg: sunken gradient diagonal ----menu.items.bg.color: rgb:10/20/30 ----menu.items.bg.colorTo: rgb:70/80/90 ----menu.items.text.color: rgb:90/a0/b0 ----menu.items.justify: center ---- ----menu.items.active.bg: raised gradient diagonal ----menu.items.active.bg.color: rgb:90/94/98 ----menu.items.active.bg.colorTo: rgb:20/24/28 ----menu.items.active.text.color: white ----menu.bullet.image.color: rgb:90/a0/b0 ----menu.bullet.selected.image.color: #ffffff ---- ----window.active.title.bg: raised gradient vertical ----window.active.title.bg.color: rgb:80/84/88 ----window.active.title.bg.colorTo: rgb:30/34/38 ----window.inactive.title.bg: raised vertical gradient ----window.inactive.title.bg.color: rgb:50/54/58 ----window.inactive.title.bg.colorTo: black ---- ----window.active.label.bg: sunken diagonal gradient ----window.active.label.bg.color: rgb:10/20/30 ----window.active.label.bg.colorTo: rgb:70/80/90 ----window.active.label.text.color: white ----window.inactive.label.bg: sunken gradient diagonal ----window.inactive.label.bg.color: black ----window.inactive.label.bg.colorTo: rgb:40/50/60 ----window.inactive.label.text.color: rgb:60/64/68 ----window.label.text.justify: center ---- ----window.active.button.unpressed.bg: raised gradient diagonal ----window.active.button.unpressed.bg.color: rgb:90/94/98 ----window.active.button.unpressed.bg.colorTo: rgb:20/24/28 ----window.active.button.unpressed.image.color: white ---- ----window.inactive.button.unpressed.bg: raised gradient diagonal ----window.inactive.button.unpressed.bg.color: rgb:50/54/58 ----window.inactive.button.unpressed.bg.colorTo: black ----window.inactive.button.unpressed.image.color: rgb:70/74/78 ---- ----window.active.button.pressed.bg: sunken gradient diagonal ----window.active.button.pressed.bg.color: rgb:20/40/50 ----window.active.button.pressed.bg.colorTo: rgb:60/70/80 ---- ----window.inactive.button.pressed.bg: sunken gradient diagonal ----window.inactive.button.pressed.bg.color: rgb:50/54/58 ----window.inactive.button.pressed.bg.colorTo: black ----window.inactive.button.pressed.image.color: rgb:70/74/78 ---- ----window.active.client.color: rgb:40/44/48 ----window.inactive.client.color: rgb:20/24/28 ---- ----window.active.handle.bg: raised gradient diagonal ----window.active.handle.bg.color: rgb:70/74/78 ----window.active.handle.bg.colorTo: rgb:40/44/48 ---- ----window.inactive.handle.bg: raised gradient diagonal ----window.inactive.handle.bg.color: rgb:50/54/58 ----window.inactive.handle.bg.colorTo: black ---- ----window.active.grip.bg: sunken diagonal gradient ----window.active.grip.bg.color: rgb:20/30/40 ----window.active.grip.bg.colorTo: rgb:60/70/80 ---- ----window.inactive.grip.bg: sunken diagonal gradient ----window.inactive.grip.bg.color: black ----window.inactive.grip.bg.colorTo: rgb:30/40/50 ---- ----window.active.button.toggled.bg: raised gradient diagonal ----window.active.button.toggled.bg.color: rgb:90/94/98 ----window.active.button.toggled.bg.colorTo: rgb:20/24/28 ----window.active.button.toggled.image.color: white ---- ----window.inactive.button.toggled.bg: raised gradient diagonal ----window.inactive.button.toggled.bg.color: rgb:50/54/58 ----window.inactive.button.toggled.bg.colorTo: black ----window.inactive.button.toggled.image.color: rgb:70/74/78 ---- ----window.active.button.disabled.bg: raised gradient diagonal ----window.active.button.disabled.bg.color: rgb:90/94/98 ----window.active.button.disabled.bg.colorTo: rgb:20/24/28 ----window.active.button.disabled.image.color: grey ---- ----window.inactive.button.disabled.bg: raised gradient diagonal ----window.inactive.button.disabled.bg.color: rgb:50/54/58 ----window.inactive.button.disabled.bg.colorTo: black ----window.inactive.button.disabled.image.color: rgb:70/74/78 ---- ----border.color: black ----padding.width: 1 ----borderWidth: 1 ----window.handle.width: 4 ---- ----window.active.label.text.font: ----menu.title.text.font: ----menu.items.font: diff --cc themes/Bear2/openbox-3/close.xbm index ab7ff800,ab7ff800,ab7ff800,ab7ff800..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/close.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define close_width 8 ----#define close_height 8 ----static unsigned char close_bits[] = { ---- 0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3 }; diff --cc themes/Bear2/openbox-3/close_pressed.xbm index 663c4589,663c4589,663c4589,663c4589..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/close_pressed.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define close_pressed_width 10 ----#define close_pressed_height 10 ----static unsigned char close_pressed_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x9c, 0x03, 0xf8, 0x01, 0xf0, 0x00, ---- 0xf0, 0x00, 0xf8, 0x01, 0x9c, 0x03, 0x0c, 0x03 }; diff --cc themes/Bear2/openbox-3/desk.xbm index f6e24ce6,f6e24ce6,f6e24ce6,f6e24ce6..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/desk.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_width 8 ----#define desk_height 8 ----static unsigned char desk_bits[] = { ---- 0x00, 0x00, 0x48, 0x78, 0x7f, 0x78, 0x48, 0x00 }; diff --cc themes/Bear2/openbox-3/desk_toggled.xbm index d89d4bb7,d89d4bb7,d89d4bb7,d89d4bb7..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/desk_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_toggled_width 8 ----#define desk_toggled_height 8 ----static unsigned char desk_toggled_bits[] = { ---- 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00 }; diff --cc themes/Bear2/openbox-3/iconify.xbm index 0f415e05,0f415e05,0f415e05,0f415e05..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/iconify.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_width 8 ----#define iconify_height 8 ----static unsigned char iconify_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; diff --cc themes/Bear2/openbox-3/iconify_pressed.xbm index 28a9cab6,28a9cab6,28a9cab6,28a9cab6..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/iconify_pressed.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define iconify_pressed_width 10 ----#define iconify_pressed_height 10 ----static unsigned char iconify_pressed_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ---- 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0xfc, 0x03 }; diff --cc themes/Bear2/openbox-3/max.xbm index 3a130890,3a130890,3a130890,3a130890..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/max.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 8 ----#define max_height 8 ----static unsigned char max_bits[] = { ---- 0xff, 0xff, 0x81, 0x81, 0x81, 0x81, 0x81, 0xff }; diff --cc themes/Bear2/openbox-3/max_pressed.xbm index 5116ae31,5116ae31,5116ae31,5116ae31..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/max_pressed.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define max_pressed_width 10 ----#define max_pressed_height 10 ----static unsigned char max_pressed_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0x04, 0x02, 0x04, 0x02, ---- 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xfc, 0x03 }; diff --cc themes/Bear2/openbox-3/max_toggled.xbm index ff1c954a,ff1c954a,ff1c954a,ff1c954a..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/max_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_toggled_width 8 ----#define max_toggled_height 8 ----static unsigned char max_toggled_bits[] = { ---- 0xfc, 0xfc, 0x84, 0x9f, 0x91, 0xf1, 0x11, 0x1f }; diff --cc themes/Bear2/openbox-3/shade.xbm index ff774f89,ff774f89,ff774f89,ff774f89..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/shade.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define shade_width 8 ----#define shade_height 8 ----static unsigned char shade_bits[] = { ---- 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --cc themes/Bear2/openbox-3/shade_pressed.xbm index d65fe7ae,d65fe7ae,d65fe7ae,d65fe7ae..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/shade_pressed.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define shade_pressed_width 10 ----#define shade_pressed_height 10 ----static unsigned char shade_pressed_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, ---- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --cc themes/Bear2/openbox-3/themerc index b0db53e8,b0db53e8,b0db53e8,b0db53e8..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Bear2/openbox-3/themerc +++ /dev/null @@@@@ -1,83 -1,83 -1,83 -1,83 +1,0 @@@@@ ----!! Bear2 by David Barr ----!! http://david.chalkskeletons.com ----!! another blue theme ---- ----!!General ---- ----window.handle.width: 4 ----window.client.padding.width: 0 ----window.client.padding.height: 0 ----border.Width: 1 ----padding.width: 3 ----menu.overlap: 2 ----border.color: #4e4e4e ----window.frameColor: #eeeeec ----window.*.client.color: #eeeeec ----*.text.justify: center ---- ----!!Fonts ---- ----window.active.label.text.font: shadow=y:shadowoffset=1:shadowtint=3 ----window.inactive.label.text.font: shadow=y:shadowoffset=1:shadowtint=0 ----menu.items.font: ----menu.title.text.font: shadow=y:shadowoffset=1:shadowtint=30 ---- ----!!Menu ----menu.border.color: #9d9d9d ----menu.title.bg: flat border vertical gradient ----menu.title.bg.color: #3465A4 ----menu.title.bg.colorTo: #407CCA ----menu.title.bg.border.color: #729fcf ----menu.title.text.color: #ffffff ---- ----menu.items.bg: flat border solid ----menu.items.bg.color: #eeeeec ----menu.items.bg.border.color: #EFEBE7 ---- ----menu.items.text.color: #444444 ----menu.items.disabled.text.color: #babdb6 ---- ----menu.items.active.bg: flat solid ----menu.items.active.bg.color: #4481c0 ----menu.items.active.bg.colorTo: #4175aa ----menu.items.active.text.color: #f6f8fb ----menu.items.active.bg.border.color: #416c98 ---- ----!!Active ---- ----window.active.title.bg: flat border gradient osx ----window.active.title.bg.color: #3465A4 ----window.active.title.bg.colorTo: #407CCA ----window.active.title.bg.border.color: #699acd ---- ----window.active.label.bg: parentrelative ----window.active.label.text.color: #ffffff ---- ----window.active.button.*.bg: parentrelative ----window.active.button.*.image.color: #efefef ----window.active.button.hover.bg.color: #729fcf ----window.active.button.hover.image.color: #ffffff ----window.active.button.pressed.bg.color: #a7cef2 ----window.active.button.disabled.image.color: #6d8fbc ---- ----window.active.handle.bg: raised solid ----window.active.handle.bg.color: #E7e7e7 ----window.*.grip.bg: parentrelative ---- ----!!Inactive ---- ----window.inactive.title.bg: flat border gradient osx ----window.inactive.title.bg.color: #dcdcdc ----window.inactive.title.bg.colorTo: #eeeeec ----window.inactive.title.bg.border.color: #efefef ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #888a85 ---- ----window.inactive.button.*.bg: parentrelative ----window.inactive.button.*.image.color: #888a85 ----window.inactive.button.pressed.bg.color: #d3d7cf ----window.inactive.button.pressed.bg.color: #4f5051 ----window.inactive.button.disabled.image.color: #d0d0d0 ---- ----window.inactive.handle.bg: raised solid ----window.inactive.handle.bg.color: #E7e7e7 diff --cc themes/Clearlooks-3.4/openbox-3/themerc index 05e89229,05e89229,05e89229,05e89229..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Clearlooks-3.4/openbox-3/themerc +++ /dev/null @@@@@ -1,126 -1,126 -1,126 -1,126 +1,0 @@@@@ ----# Name: Clearlooks ----# Author: John McKnight ----# Note: This is a port of the Clearlooks metacity theme to Openbox. ---- ----### Menu ----#menu.border.color: #b5aa99 ---- ----menu.title.bg: Flat Border Gradient Vertical ----menu.title.bg.color: #589bda ----menu.title.bg.colorTo: #3c7cb7 ----menu.title.bg.border.color: #7cb6ec ----menu.title.text.color: #ffffff ----menu.title.text.justify: Center ---- ----menu.items.bg: Flat Solid ----menu.items.bg.color: #fcfbfa ----menu.items.text.color: #000000 ----menu.items.disable.text.color: #b5b3ac ---- ----menu.items.active.bg: Flat Gradient Vertical ----menu.items.active.bg.color: #5c9edb ----menu.items.active.bg.colorTo: #4489ca ----menu.items.active.text.color: #ffffff ---- ---- ----### Window active ----window.active.title.bg: Flat Border Gradient Vertical ----window.active.title.bg.color: #589bda ----window.active.title.bg.colorTo: #3c7cb7 ----window.active.title.bg.border.color: #7cb6ec ----window.active.title.separator.color: #334c62 ---- ----window.active.label.bg: Parentrelative ----window.active.label.text.color: #ffffff ---- ----window.active.handle.bg: Flat Border Solid ----window.active.handle.bg.color: #3c7cb7 ----window.active.handle.bg.border.color: #7cb6ec ---- ----window.active.grip.bg: Flat Border Solid ----window.active.grip.bg.color: #3c7cb7 ----window.active.grip.bg.border.color: #7cb6ec ---- ----window.active.button.unpressed.bg: Flat Border Gradient Vertical ----window.active.button.unpressed.bg.color: #5ea0dd ----window.active.button.unpressed.bg.colorTo: #3f85c5 ----window.active.button.unpressed.bg.border.color: #36536f ----window.active.button.unpressed.image.color: #ffffff ---- ----window.active.button.pressed.bg: Flat Border Gradient Vertical ----window.active.button.pressed.bg.color: #3c82c3 ----window.active.button.pressed.bg.colorTo: #3c7ab5 ----window.active.button.pressed.bg.border.color: #36536f ----window.active.button.pressed.image.color: #ffffff ---- ----window.active.button.disabled.bg: Flat Border Gradient Vertical ----window.active.button.disabled.bg.color: #3c82c3 ----window.active.button.disabled.bg.colorTo: #3c7ab5 ----window.active.button.disabled.bg.border.color: #36536f ----window.active.button.disabled.image.color: #36536f ---- ----window.active.button.toggled.bg: Flat Border Gradient Vertical ----window.active.button.toggled.bg.color: #5ea0dd ----window.active.button.toggled.bg.colorTo: #3f85c5 ----window.active.button.toggled.bg.border.color: #36536f ----window.active.button.toggled.image.color: #dcd4c9 ---- ---- ----### Window inactive ----window.inactive.border.color: #3d3a37 ---- ----window.inactive.title.bg: Flat Border Gradient Vertical ----window.inactive.title.bg.color: #efece6 ----window.inactive.title.bg.colorTo: #d9d2c7 ----window.inactive.title.bg.border.color: #ffffff ----window.inactive.title.separator.color: #9a8e7c ---- ----window.inactive.label.bg: Parentrelative ----window.inactive.label.text.color: #000000 ---- ----window.inactive.handle.bg: Flat Border Solid ----window.inactive.handle.bg.color: #d9d2c7 ----window.inactive.handle.bg.border.color: #ffffff ---- ----window.inactive.grip.bg: Flat Border Solid ----window.inactive.grip.bg.color: #d9d2c7 ----window.inactive.grip.bg.border.color: #ffffff ---- ----window.inactive.button.unpressed.bg: Flat Border Gradient Vertical ----window.inactive.button.unpressed.bg.color: #ede9e3 ----window.inactive.button.unpressed.bg.colorTo: #dbd5ca ----window.inactive.button.unpressed.bg.border.color: #8f8370 ----window.inactive.button.unpressed.image.color: #000000 ---- ----window.inactive.button.pressed.bg: Flat Border Gradient Vertical ----window.inactive.button.pressed.bg.color: #ede9e3 ----window.inactive.button.pressed.bg.colorTo: #dbd5ca ----window.inactive.button.pressed.bg.border.color: #8f8370 ----window.inactive.button.pressed.image.color: #000000 ---- ----window.inactive.button.disabled.bg: Flat Border Gradient Vertical ----window.inactive.button.disabled.bg.color: #ede9e3 ----window.inactive.button.disabled.bg.colorTo: #dbd5ca ----window.inactive.button.disabled.bg.border.color: #8f8370 ----window.inactive.button.disabled.image.color: #000000 ---- ----window.inactive.button.toggled.bg: Flat Border Gradient Vertical ----window.inactive.button.toggled.bg.color: #ede9e3 ----window.inactive.button.toggled.bg.colorTo: #dbd5ca ----window.inactive.button.toggled.bg.border.color: #8f8370 ----window.inactive.button.toggled.image.color: #000000 ---- ---- ----### Everything else ----border.width: 1 ----padding.width: 2 ----window.handle.width: 4 ----window.client.padding.width: 0 ----border.color: #1f252b ----menu.overlap: 0 ---- ----### Fonts ----window.active.label.text.font: ----window.inactive.label.text.font: ----menu.items.font: ----menu.title.text.font: diff --cc themes/Clearlooks-Olive/openbox-3/themerc index 249f0e61,249f0e61,249f0e61,249f0e61..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Clearlooks-Olive/openbox-3/themerc +++ /dev/null @@@@@ -1,121 -1,121 -1,121 -1,121 +1,0 @@@@@ ----# Name: Clearlooks-Olive ----# Author: John McKnight ----# Note: This is a port of the Clearlooks-Olive metacity theme to Openbox. ---- ----# Menu settings ----menu.title.bg: Raised Gradient Vertical ----menu.title.bg.color: #95ad70 ----menu.title.bg.colorTo: #7d925d ----menu.title.text.color: #ffffff ----menu.title.text.justify: Left ---- ----menu.items.bg: Flat Solid ----menu.items.bg.color: #f1eee0 ----menu.items.text.color: #444444 ----menu.items.disabled.text.color: #aaaaaa ----menu.items.active.disabled.text.color: #969696 ---- ----menu.items.active.bg: Flat Gradient Vertical Border ----menu.items.active.bg.color: #b4c994 ----menu.items.active.bg.colorTo: #92aa6d ----menu.items.active.bg.border.color: #92aa6d ----menu.items.active.text.color: #ffffff ---- ---- ----# Window settings (focused) ----window.active.title.bg: Raised Gradient Vertical ----window.active.title.bg.color: #95ad70 ----window.active.title.bg.colorTo: #7d925d ---- ----window.active.label.bg: Parentrelative ----window.active.label.text.color: #ffffff ---- ----window.active.handle.bg: Raised Gradient Vertical ----window.active.handle.bg.color: #95ad70 ----window.active.handle.bg.colorTo: #7d925d ---- ----window.active.grip.bg: Raised Gradient Vertical ----window.active.grip.bg.color: #95ad70 ----window.active.grip.bg.colorTo: #7d925d ---- ----window.active.button.unpressed.bg: Flat Gradient Vertical Border ----window.active.button.unpressed.bg.color: #65744e ----window.active.button.unpressed.bg.colorTo: #5b6846 ----window.active.button.unpressed.bg.border.color: #abbc91 ----window.active.button.unpressed.image.color: #ffffff ---- ----window.active.button.pressed.bg: Flat Gradient Vertical Border ----window.active.button.pressed.bg.color: #373d2b ----window.active.button.pressed.bg.colorTo: #333828 ----window.active.button.pressed.bg.border.color: #abbc91 ----window.active.button.pressed.image.color: #ffffff ---- ----window.active.button.disabled.bg: Flat Gradient Vertical Border ----window.active.button.disabled.bg.color: #373d2b ----window.active.button.disabled.bg.colorTo: #333828 ----window.active.button.disabled.bg.border.color: #abbc91 ----window.active.button.disabled.image.color: #abbc91 ---- ----window.active.button.toggled.bg: Flat Gradient Vertical Border ----window.active.button.toggled.bg.color: #65744e ----window.active.button.toggled.bg.colorTo: #5b6846 ----window.active.button.toggled.bg.border.color: #abbc91 ----window.active.button.toggled.image.color: #b9b7a7 ---- ---- ----# Window settings (unfocused) ----window.inactive.title.bg: Raised Gradient Vertical ----window.inactive.title.bg.color: #f1eeea ----window.inactive.title.bg.colorTo: #d8cfc7 ---- ----window.inactive.label.bg: Parentrelative ----window.inactive.label.text.color: #000000 ---- ----window.inactive.handle.bg: Raised Gradient Vertical ----window.inactive.handle.bg.color: #f1eeea ----window.inactive.handle.bg.colorTo: #d8cfc7 ---- ----window.inactive.grip.bg: Raised Gradient Vertical ----window.inactive.grip.bg.color: #f1eeea ----window.inactive.grip.bg.colorTo: #d8cfc7 ---- ----window.inactive.button.unpressed.bg: Flat Gradient Vertical Border ----window.inactive.button.unpressed.bg.color: #efebe7 ----window.inactive.button.unpressed.bg.colorTo: #ddd6ce ----window.inactive.button.unpressed.bg.border.color: #8f8173 ----window.inactive.button.unpressed.image.color: #000000 ---- ----window.inactive.button.pressed.bg: Flat Gradient Vertical Border ----window.inactive.button.pressed.bg.color: #efebe7 ----window.inactive.button.pressed.bg.colorTo: #ddd6ce ----window.inactive.button.pressed.bg.border.color: #8f8173 ----window.inactive.button.pressed.image.color: #000000 ---- ----window.inactive.button.disabled.bg: Flat Gradient Vertical Border ----window.inactive.button.disabled.bg.color: #efebe7 ----window.inactive.button.disabled.bg.colorTo: #ddd6ce ----window.inactive.button.disabled.bg.border.color: #8f8173 ----window.inactive.button.disabled.image.color: #8f8173 ---- ----window.inactive.button.toggled.bg: Flat Gradient Vertical Border ----window.inactive.button.toggled.bg.color: #efebe7 ----window.inactive.button.toggled.bg.colorTo: #ddd6ce ----window.inactive.button.toggled.bg.border.color: #8f8173 ----window.inactive.button.toggled.image.color: #000000 ---- ---- ----### Everything else ----border.width: 1 ----padding.width: 2 ----window.handle.width: 3 ----window.client.padding.width: 0 ----window.client.padding.height: 0 ----border.color: #000000 ----menu.overlap: 0 ---- ---- ----### Fonts ----window.active.label.text.font:shadow=y:shadowtint=70:shadowoffset=1 ----window.inactive.label.text.font:shadow=y:shadowtint=20:shadowoffset=1 ----menu.items.font: ----menu.title.text.font:shadow=y:shadowtint=70 diff --cc themes/Clearlooks/openbox-3/themerc index 1dde5fba,1dde5fba,1dde5fba,1dde5fba..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Clearlooks/openbox-3/themerc +++ /dev/null @@@@@ -1,159 -1,159 -1,159 -1,159 +1,0 @@@@@ ----!# Clearlooks-Evolving ----!# Clearlooks as it evolves in gnome-svn... ----!# Last updated 19/01/08 ---- ----# Fonts ----# these are really halos, but who cares? ---- ----*.font: shadow=n ----window.active.label.text.font:shadow=y:shadowtint=25:shadowoffset=1 ----window.inactive.label.text.font:shadow=y:shadowtint=00:shadowoffset=0 ----menu.items.font:shadow=y:shadowtint=0:shadowoffset=1 ---- ----!# general stuff ---- ----border.width: 1 ----padding.width: 3 ----padding.height: 2 ----window.handle.width: 3 ----window.client.padding.width: 0 ----menu.overlap: 2 ----*.justify: center ---- ----!# lets set our damn shadows here, eh? ---- ----*.bg.highlight: 50 ----*.bg.shadow: 05 ---- ----window.active.title.bg.highlight: 40 ----window.active.title.bg.shadow: 00 ---- ----window.inactive.title.bg.highlight: 30 ----window.inactive.title.bg.shadow: 00 ---- ----window.*.grip.bg.highlight: 50 ----window.*.grip.bg.shadow: 30 ---- ----window.*.handle.bg.highlight: 50 ----window.*.handle.bg.shadow: 30 ---- ----!# Menu settings ---- ----menu.border.color: #aaaaaa ----menu.border.width: 1 ---- ----menu.title.bg: solid flat ----menu.title.bg.color: #E6E7E6 ----menu.title.text.color: #111111 ---- ----menu.items.bg: Flat Solid ----menu.items.bg.color: #ffffff ----menu.items.text.color: #111111 ----menu.items.disabled.text.color: #aaaaaa ---- ----menu.items.active.bg: Flat Gradient splitvertical border ---- ----menu.items.active.bg.color: #97b8e2 ----menu.items.active.bg.color.splitTo: #a8c5e9 ---- ----menu.items.active.bg.colorTo: #91b3de ----menu.items.active.bg.colorTo.splitTo: #80a7d6 ----menu.items.active.bg.border.color: #4b6e99 ----menu.items.active.text.color: #ffffff ---- ----!# set handles here and only the once? ---- ----window.*.handle.bg: Raised solid ----window.*.handle.bg.color: #eaebec ---- ----window.*.grip.bg: Raised solid ----window.*.grip.bg.color: #eaebec ---- ----!# Active ---- ----!# no handles - kind of closer to the clearlooks border, maybe? ----!#window.active.border.color: #455d7c ---- ----window.*.border.color: #585a5d ---- ----window.active.title.separator.color: #4e76a8 ---- ----*.title.bg: Raised Gradient splitvertical ----*.title.bg.color: #8CB0DC ----*.title.bg.color.splitTo: #99BAE3 ----*.title.bg.colorTo: #86ABD9 ----*.title.bg.colorTo.splitTo: #7AA1D1 ---- ----window.active.label.bg: Parentrelative ----window.active.label.text.color: #ffffff ---- ----window.active.button.*.bg: Flat Gradient splitvertical Border ---- ----window.active.button.*.bg.color: #92B4DF ----window.active.button.*.bg.color.splitTo: #B0CAEB ----window.active.button.*.bg.colorTo: #86ABD9 ----window.active.button.*.bg.colorTo.splitTo: #769FD0 ---- ----window.active.button.*.bg.border.color: #49678B ----window.active.button.*.image.color: #F4F5F6 ---- ----window.active.button.hover.bg.color: #b5d3ef ----window.active.button.hover.bg.color.splitTo: #b5d3ef ----window.active.button.hover.bg.colorTo: #9cbae7 ----window.active.button.hover.bg.colorTo.splitTo: #8caede ----window.active.button.hover.bg.border.color: #4A658C ----window.active.button.hover.image.color: #ffffff ---- ----window.active.button.pressed.bg: Flat solid Border ----window.active.button.pressed.bg.color: #7aa1d2 ---- ----window.active.button.hover.bg.border.color: #4A658C ---- ----!# inactive ---- ----!#window.inactive.border.color: #7e8285 ----window.inactive.title.separator.color: #96999d ---- ----window.inactive.title.bg: Raised Gradient splitvertical ----window.inactive.title.bg.color: #E3E2E0 ----window.inactive.title.bg.color.splitTo: #EBEAE9 ----window.inactive.title.bg.colorTo: #DEDCDA ----window.inactive.title.bg.colorTo.splitTo: #D5D3D1 ---- ----window.inactive.label.bg: Parentrelative ----window.inactive.label.text.color: #70747d ---- ----window.inactive.button.*.bg: Flat Gradient splitVertical Border ----window.inactive.button.*.bg.color: #ffffff ----window.inactive.button.*.bg.color.splitto: #ffffff ----window.inactive.button.*.bg.colorTo: #F9F8F8 ----window.inactive.button.*.bg.colorTo.splitto: #E9E7E6 ----window.inactive.button.*.bg.border.color: #928F8B ----window.inactive.button.*.image.color: #6D6C6C ---- ---- ----!# osd (pop ups and what not, dock?) ---- ----osd.border.width: 1 ----osd.border.color: #999 ---- ----osd.bg: flat border gradient splitvertical ----osd.bg.color: #F0EFEE ----osd.bg.color.splitto: #f5f5f4 ----osd.bg.colorTo: #EAEBEC ----osd.bg.colorTo.splitto: #E7E5E4 ---- ----osd.bg.border.color: #ffffff ---- ----osd.label.bg: parentrelative ----osd.label.bg.color: #efefef ----osd.label.bg.border.color: #9c9e9c ---- ----osd.label.text.color: #444 ----!# yeah whatever, this is fine anyhoo? ----osd.hilight.bg: flat vertical gradient ----osd.hilight.bg.color: #9ebde5 ----osd.hilight.bg.colorTo: #749dcf ----osd.unhilight.bg: flat vertical gradient ----osd.unhilight.bg.color: #BABDB6 ----osd.unhilight.bg.colorTo: #efefef diff --cc themes/Makefile index b90edacf,b90edacf,b90edacf,b90edacf..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C .. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc themes/Mikachu/openbox-3/bullet.xbm index 88481ec8,88481ec8,88481ec8,88481ec8..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/bullet.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define bullet_width 4 ----#define bullet_height 7 ----static unsigned char bullet_bits[] = { ---- 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; diff --cc themes/Mikachu/openbox-3/close.xbm index aea54882,aea54882,aea54882,aea54882..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/close.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----/* Created with The GIMP */ ----#define close_width 8 ----#define close_height 8 ----static unsigned char close_bits[] = { ---- 0x00, 0xc3, 0x66, 0x3c, 0x3c, 0x66, 0xc3, 0x00 }; diff --cc themes/Mikachu/openbox-3/desk.xbm index 4345dfab,4345dfab,4345dfab,4345dfab..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/desk.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----/* Created with The GIMP */ ----#define stick_width 8 ----#define stick_height 8 ----static unsigned char stick_bits[] = { ---- 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00 }; diff --cc themes/Mikachu/openbox-3/iconify.xbm index 1cd40fcd,1cd40fcd,1cd40fcd,1cd40fcd..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/iconify.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----/* Created with The GIMP */ ----#define icon_width 8 ----#define icon_height 8 ----static unsigned char icon_bits[] = { ---- 0x00, 0x00, 0x42, 0x66, 0x3c, 0x18, 0x00, 0x00 }; diff --cc themes/Mikachu/openbox-3/max.xbm index 2cd94e84,2cd94e84,2cd94e84,2cd94e84..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/max.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----/* Created with The GIMP */ ----#define max_width 8 ----#define max_height 8 ----static unsigned char max_bits[] = { ---- 0x00, 0x00, 0x18, 0x3c, 0x66, 0x42, 0x00, 0x00 }; diff --cc themes/Mikachu/openbox-3/themerc index ae7e56bc,ae7e56bc,ae7e56bc,ae7e56bc..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Mikachu/openbox-3/themerc +++ /dev/null @@@@@ -1,174 -1,174 -1,174 -1,174 +1,0 @@@@@ ----!! Menu settings ---- ----menu.title.bg: raised gradient crossdiagonal bevel1 ----menu.title.bg.color: #6699CC ----menu.title.bg.colorTo: #334866 ----menu.title.bg.border.color: #000000 ----menu.title.text.color: #CCCCFF ----menu.title.text.justify: center ---- ----menu.items.bg: flat gradient vertical bevel1 ----menu.items.bg.color: #B8B8D8 ----menu.items.bg.colorTo: #A0A0BA ----menu.items.bg.border.color: #000000 ----menu.items.text.color: #000022 ----menu.items.disabled.text.color: #711 ---- ----menu.items.active.bg: raised gradient mirrorhorizontal ----menu.items.active.bg.color: #555577 ----menu.items.active.bg.colorTo: #6699CC ----menu.items.active.bg.border.color: #000000 ----menu.items.active.text.color: #CCCCFF ---- ----menu.frame.justify: left ---- ----!! General window settings ----window.label.text.justify: left ---- ----!! focused window settings ----window.active.client.color: #8080A0 ---- ----window.active.title.bg: raised gradient crossdiagonal bevel1 ----window.active.title.bg.color: #6699CC ----window.active.title.bg.colorTo: #334866 ----window.active.title.bg.border.color: #000000 ---- ----window.active.handle.bg: flat gradient crossdiagonal bevel1 ----window.active.handle.bg.color: #6699CC ----window.active.handle.bg.colorTo: #334866 ----window.active.handle.bg.border.color: #000000 ---- ----window.active.grip.bg: parentrelative ----window.active.grip.bg.color: #000000 ----window.active.grip.bg.colorTo: #000000 ----window.active.grip.bg.border.color: #000000 ---- ----window.active.label.bg: parentrelative ----window.active.label.bg.color: #000000 ----window.active.label.bg.colorTo: #000000 ----window.active.label.bg.border.color: #000000 ----window.active.label.text.color: #BFE9FF ---- ----window.active.button.unpressed.bg: parentrelative ----window.active.button.unpressed.bg.color: #000000 ----window.active.button.unpressed.bg.colorTo: #000000 ----window.active.button.unpressed.bg.border.color: #000000 ----window.active.button.unpressed.image.color: grey85 ---- ----window.active.button.pressed.bg: sunken parentrelative bevel1 ----window.active.button.pressed.bg.color: #6699CC ----window.active.button.pressed.bg.colorTo: #334866 ----window.active.button.pressed.bg.border.color: #000000 ----window.active.button.pressed.image.color: green ---- ----window.active.button.toggled.bg: sunken parentrelative bevel2 ----window.active.button.toggled.bg.color: #6699CC ----window.active.button.toggled.bg.colorTo: #334866 ----window.active.button.toggled.bg.border.color: #000000 ----window.active.button.toggled.image.color: grey85 ---- ----window.active.button.toggled.hover.bg: sunken parentrelative bevel2 ----window.active.button.toggled.hover.bg.color: #6699CC ----window.active.button.toggled.hover.bg.colorTo: #334866 ----window.active.button.toggled.hover.bg.border.color: #000000 ----window.active.button.toggled.hover.image.color: #00FF00 ---- ----window.active.button.disabled.bg: parentrelative ----window.active.button.disabled.bg.color: #000000 ----window.active.button.disabled.bg.colorTo: #000000 ----window.active.button.disabled.image.color: #000000 ----window.active.button.disabled.bg.border.color: #000000 ---- ----window.active.button.hover.bg: parentrelative ----window.active.button.hover.image.color: #00FF00 ----window.active.button.hover.bg.color: #000000 ----window.active.button.hover.bg.colorTo: #000000 ----window.active.button.hover.bg.border.color: #000000 ---- ----!window.active.button.hover.bg: raised gradient crossdiagonal bevel1 ----!window.active.button.hover.image.color: #00FF00 ----!window.active.button.hover.bg.color: #334866 ----!window.active.button.hover.bg.colorTo: #6699CC ----!window.active.button.hover.bg.border.color: #000000 ---- ----!! unfocused window settings ----window.inactive.client.color: grey50 ---- ----window.inactive.title.bg: flat gradient diagonal bevel1 ----window.inactive.title.bg.color: #7F7FA0 ----window.inactive.title.bg.colorTo: #333350 ----window.inactive.title.bg.border.color: #000000 ---- ----window.inactive.handle.bg: flat gradient diagonal bevel1 ----window.inactive.handle.bg.color: grey50 ----window.inactive.handle.bg.colorTo: grey20 ----window.inactive.handle.bg.border.color: #000000 ---- ----window.inactive.grip.bg: parentrelative ----window.inactive.grip.bg.color: #000000 ----window.inactive.grip.bg.colorTo: #000000 ----window.inactive.grip.bg.border.color: #000000 ---- ----window.inactive.label.bg: parentrelative ----window.inactive.label.bg.color: #000000 ----window.inactive.label.bg.colorTo: #000000 ----window.inactive.label.bg.border.color: #000000 ----window.inactive.label.text.color: #C3C3E0 ---- ----window.inactive.button.unpressed.bg: parentrelative ----window.inactive.button.unpressed.bg.color: #000000 ----window.inactive.button.unpressed.bg.colorTo: #000000 ----window.inactive.button.unpressed.bg.border.color: #000000 ----window.inactive.button.unpressed.image.color: grey60 ---- ----window.inactive.button.pressed.bg: sunken parentrelative bevel1 ----window.inactive.button.pressed.bg.color: grey60 ----window.inactive.button.pressed.bg.colorTo: grey20 ----window.inactive.button.pressed.bg.border.color: #000000 ----window.inactive.button.pressed.image.color: #00CC00 ---- ----window.inactive.button.disabled.bg: parentrelative ----window.inactive.button.disabled.bg.color: #000000 ----window.inactive.button.disabled.bg.colorTo: #000000 ----window.inactive.button.disabled.bg.border.color: #000000 ----window.inactive.button.disabled.image.color: #000000 ---- ----window.inactive.button.toggled.bg: sunken parentrelative bevel2 ----window.inactive.button.toggled.bg.color: grey60 ----window.inactive.button.toggled.bg.colorTo: grey20 ----window.inactive.button.toggled.bg.border.color: #000000 ----window.inactive.button.toggled.image.color: grey60 ---- ----window.inactive.button.toggled.hover.bg: sunken parentrelative bevel2 ----window.inactive.button.toggled.hover.bg.color: grey60 ----window.inactive.button.toggled.hover.bg.colorTo: grey20 ----window.inactive.button.toggled.hover.bg.border.color: #000000 ----window.inactive.button.toggled.hover.image.color: #00CC00 ---- ----window.inactive.button.hover.bg: parentrelative ----window.inactive.button.hover.bg.color: #000000 ----window.inactive.button.hover.bg.colorTo: #000000 ----window.inactive.button.hover.image.color: #00CC00 ----window.inactive.button.hover.bg.border.color: #000000 ---- ----osd.label.bg: parentrelative sunken ---- ----!! Global width settings ----border.width: 1 ----padding.width: 1 ----window.handle.width: 0 ----window.client.padding.width: 0 ----window.client.padding.height: 0 ----focus.inner.color: #A6CAF3 ----focus.outer.color: #0000A0 ---- ----!! Miscellaneous settings ----border.color: #223344 ---- ----!! Font stuff (not used anymore) ----window.active.label.text.font: Candara,sans:size=10:shadow=y:shadowoffset=2:shadowtint=32:weight=0 ----window.inactive.label.text.font: Candara,sans:size=10:shadowoffset=3:shadowtint=32:shadow=y:weight=0 ----menu.title.text.font: Technical,sans:size=20:shadowoffset=2:shadowtint=35:shadow=y ----menu.items.font: Technical,sans:size=10:shadowoffset=2:shadowtint=15:shadow=y ---- ----menu.overlap: -3 diff --cc themes/Natura/openbox-3/close.xbm index ab7ff800,ab7ff800,ab7ff800,ab7ff800..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/close.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define close_width 8 ----#define close_height 8 ----static unsigned char close_bits[] = { ---- 0xc3, 0xe7, 0x7e, 0x3c, 0x3c, 0x7e, 0xe7, 0xc3 }; diff --cc themes/Natura/openbox-3/close_hover.xbm index 94ce59f7,94ce59f7,94ce59f7,94ce59f7..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/close_hover.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define close_hover_width 10 ----#define close_hover_height 10 ----static unsigned char close_hover_bits[] = { ---- 0x03, 0x03, 0x87, 0x03, 0xce, 0x01, 0xfc, 0x00, 0x78, 0x00, 0x78, 0x00, ---- 0xfc, 0x00, 0xce, 0x01, 0x87, 0x03, 0x03, 0x03 }; diff --cc themes/Natura/openbox-3/desk.xbm index 6cdbbf11,6cdbbf11,6cdbbf11,6cdbbf11..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/desk.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_width 8 ----#define desk_height 8 ----static unsigned char desk_bits[] = { ---- 0x00, 0x00, 0x48, 0x78, 0x7e, 0x78, 0x48, 0x00 }; diff --cc themes/Natura/openbox-3/desk_hover.xbm index 5e385d66,5e385d66,5e385d66,5e385d66..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/desk_hover.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_hover_width 8 ----#define desk_hover_height 8 ----static unsigned char desk_hover_bits[] = { ---- 0x00, 0x88, 0x88, 0xf8, 0xff, 0xf8, 0x88, 0x88 }; diff --cc themes/Natura/openbox-3/desk_toggled.xbm index d89d4bb7,d89d4bb7,d89d4bb7,d89d4bb7..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/desk_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define desk_toggled_width 8 ----#define desk_toggled_height 8 ----static unsigned char desk_toggled_bits[] = { ---- 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00 }; diff --cc themes/Natura/openbox-3/iconify.xbm index 424cc679,424cc679,424cc679,424cc679..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/iconify.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_width 8 ----#define iconify_height 8 ----static unsigned char iconify_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e }; diff --cc themes/Natura/openbox-3/iconify_hover.xbm index 0f566027,0f566027,0f566027,0f566027..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/iconify_hover.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define iconify_hover_width 8 ----#define iconify_hover_height 8 ----static unsigned char iconify_hover_bits[] = { ---- 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff }; diff --cc themes/Natura/openbox-3/max.xbm index 3a130890,3a130890,3a130890,3a130890..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/max.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 8 ----#define max_height 8 ----static unsigned char max_bits[] = { ---- 0xff, 0xff, 0x81, 0x81, 0x81, 0x81, 0x81, 0xff }; diff --cc themes/Natura/openbox-3/max_hover.xbm index 247c4929,247c4929,247c4929,247c4929..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/max_hover.xbm +++ /dev/null @@@@@ -1,5 -1,5 -1,5 -1,5 +1,0 @@@@@ ----#define max_hover_width 10 ----#define max_hover_height 10 ----static unsigned char max_hover_bits[] = { ---- 0xff, 0x03, 0xff, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, ---- 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xff, 0x03 }; diff --cc themes/Natura/openbox-3/max_toggled.xbm index ff1c954a,ff1c954a,ff1c954a,ff1c954a..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/max_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_toggled_width 8 ----#define max_toggled_height 8 ----static unsigned char max_toggled_bits[] = { ---- 0xfc, 0xfc, 0x84, 0x9f, 0x91, 0xf1, 0x11, 0x1f }; diff --cc themes/Natura/openbox-3/shade.xbm index aaf1ec76,aaf1ec76,aaf1ec76,aaf1ec76..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/shade.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define shade_width 8 ----#define shade_height 8 ----static unsigned char shade_bits[] = { ---- 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --cc themes/Natura/openbox-3/shade_hover.xbm index 756842af,756842af,756842af,756842af..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/shade_hover.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define shade_hover_width 8 ----#define shade_hover_height 8 ----static unsigned char shade_hover_bits[] = { ---- 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --cc themes/Natura/openbox-3/themerc index fff16313,fff16313,fff16313,fff16313..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Natura/openbox-3/themerc +++ /dev/null @@@@@ -1,99 -1,99 -1,99 -1,99 +1,0 @@@@@ ----!! Natura by quandar (http://deletefactory.net/quandar) ---- ----!! Global Width ----window.handle.width: 2 ---- ----window.client.padding.width: 0 ----window.client.padding.height: 0 ----border.Width: 1 ----padding.width: 2 ---- ----window.active.border.color: #000000 ----window.inactive.border.color: #000000 ----menu.border.color: #000000 ----menu.overlap: 0 ----window.frameColor: #eeeeee ----window.*.client.color: #eeeeee ----*.text.justify: left ---- ----!! Menu ----menu.title.bg: flat gradient split ----menu.title.bg.color: #5c4e45 ----menu.title.bg.colorTo: #51443e ----menu.title.text.color: #ffffff ---- ----menu.items.bg: flat solid ----menu.items.bg.color: #f9f2ee ---- ----menu.items.text.color: #000000 ----menu.items.disabled.text.color: #737573 ---- ----menu.items.active.bg: flat gradient split ----menu.items.active.bg.color: #5c4e45 ----menu.items.active.bg.colorTo:#51443e ----menu.items.active.text.color: #f9f2ee ---- ----!! Active Windows ----window.active.title.bg: flat gradient split ----window.active.title.bg.color: #5c4e45 ----window.active.title.bg.colorTo: #51443e ----window.active.*.bg.border.color: #000000 ---- ----window.active.label.bg: parentrelative ----window.active.label.text.color: #f9f2ee ---- ----window.active.button.*.bg: parentrelative ----window.active.button.*.image.color: #f9f2ee ----window.active.button.*.bg.border.color: #4e5860 ---- ----window.active.button.hover.bg.color: #576773 ----window.active.button.hover.bg.border.color: #9aabb9 ----window.active.button.pressed.bg.color: #343b40 ----window.active.button.pressed.bg.colorTo: #000000 ----window.active.button.pressed.image.color: #b6b6b6 ----window.active.button.pressed.bg.border.color: #b1a19e ---- ----window.active.button.disabled.bg: parentrelative ----window.active.button.disabled.image.color: #725e51 ---- ----window.active.handle.bg: flat solid ----window.active.handle.bg.color:#51443e ---- ----window.*.grip.bg: flat solid ----window.*.grip.bg.color: #51443e ---- ----window.handle.width: 2 ---- ----!! Inactive Windows ----window.inactive.title.bg: flat gradient vertical ----window.inactive.title.bg.color: #f0ece3 ----window.inactive.title.bg.colorTo: #f8f7f2 ----window.inactive.*.border.color: #bfbfbf ---- ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #919191 ---- ----window.inactive.button.*.bg: parentrelative ----window.inactive.button.*.bg.color: #eeeeee ----window.inactive.button.*.image.color: #b6b6b6 ----window.inactive.button.*.bg.border.color: #c9c9c9 ---- ----window.inactive.button.pressed.bg.color: #c5c2c5 ----window.inactive.button.pressed.bg.border.color: #7b7d7b ----window.inactive.button.pressed.image.color: #999999 ---- ----window.inactive.button.hover.bg.color: #afb1b2 ----window.inactive.button.hover.bg.border.color: #d9dfe4 ----window.inactive.button.hover.image.color: #a0a0a0 ----window.inactive.button.disabled.bg: parentrelative ----window.inactive.button.disabled.image.color: #dddddd ---- ----window.inactive.handle.bg: flat solid ----window.inactive.handle.bg.color: #f9f7f3 ----window.inactive.grip.bg: parentrelative ---- ----!! Fonts ----window.active.label.text.font: shadow=y:shadowoffset=1:shadowtint=75 ----window.inactive.label.text.font: shadow=y:shadowoffset=1:shadowtint=0 ----menu.items.font: ----menu.title.text.font: shadow=y:shadowoffset=1:shadowtint=75 diff --cc themes/Onyx-Citrus/openbox-3/themerc index a849342a,a849342a,a849342a,a849342a..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Onyx-Citrus/openbox-3/themerc +++ /dev/null @@@@@ -1,85 -1,85 -1,85 -1,85 +1,0 @@@@@ ----!! Onyx-Citrus by Dana Jansens ----!! inspired by "Carbon" by p0ng, and the ever so popular Vista glass look ---- ----!! Menu background ----menu.items.bg: flat gradient vertical ----menu.items.bg.color: #303030 ----menu.items.bg.colorTo: #080808 ---- ----!! Menu text ----menu.items.text.color: #b8b8b8 ----menu.items.justify: left ----menu.items.disabled.text.color: #606060 ---- ----!! Menu headers ----menu.title.bg: raised splitvertical gradient ----menu.title.bg.color: #303030 ----menu.title.bg.colorTo: #181818 ----menu.title.text.color: white ----menu.title.text.justify: center ---- ----!! Selected menu item ----menu.items.active.bg: raised splitvertical gradient ----menu.items.active.bg.color: #e18a51 ----menu.items.active.bg.colorTo: #e1621d ----menu.items.active.text.color: white ---- ----!! Titlebar ----window.active.title.bg: raised splitvertical gradient ----window.active.title.bg.color: #414141 ----window.active.title.bg.colorTo: #202020 ----window.inactive.title.bg: gradient splitvertical gradient flat ----window.inactive.title.bg.color: #DEE0D8 ----window.inactive.title.bg.colorTo: #E0E0D8 ---- ----!! Titlebar text ----window.label.text.justify: center ----window.active.label.bg: parentrelative ----window.active.label.text.color: #f8f8f8 ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #747474 ---- ----!! Window buttons ----window.*.button.*.bg: parentrelative ----window.active.button.*.hover.bg: flat splitvertical gradient border ----window.inactive.button.*.hover.bg: parentrelative ----window.*.button.*.pressed.bg: flat splitvertical gradient border ---- ----window.active.button.*.hover.bg.color: #e18a51 ----window.active.button.*.hover.bg.colorTo: #e1621d ----window.active.button.*.hover.bg.border.color: #ab5d20 ---- ----window.active.button.*.pressed.bg.color: #99663c ----window.active.button.*.pressed.bg.colorTo: #99663c ----window.active.button.*.pressed.image.color: #888888 ----window.active.button.*.pressed.bg.border.color: #683913 ----window.inactive.button.*.pressed.bg.color: #ffaa64 ----window.inactive.button.*.pressed.bg.colorTo: #ffaa64 ----window.inactive.button.*.pressed.image.color: #fdceb7 ----window.inactive.button.*.pressed.bg.border.color: #f0832c ---- ----window.active.button.*.image.color: #e0e0e0 ----window.active.button.disabled.image.color: #707070 ----window.inactive.button.*.image.color: #747474 ----window.inactive.button.disabled.image.color: #c0c0c0 ---- ----!! Borders ----window.active.border.color: #181818 ----window.inactive.border.color: #404040 ----window.inactive.title.separator.color: #eeeee6 ----border.width: 1 ----padding.width: 2 ----window.handle.width: 0 ----window.active.client.color: #181818 ----window.inactive.client.color: #CACAB6 ----window.client.padding.width: 1 ----window.client.padding.height: 1 ----menu.overlap: 0 ---- ----!! Font shadows ----menu.items.font:shadow=y:shadowtint=30 ---- ----!! On-screen displays ----osd.bg: gradient vertical flat ----osd.bg.color: #303030 ----osd.bg.colorTo: #080808 diff --cc themes/Onyx/openbox-3/themerc index 8de9d064,8de9d064,8de9d064,8de9d064..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Onyx/openbox-3/themerc +++ /dev/null @@@@@ -1,85 -1,85 -1,85 -1,85 +1,0 @@@@@ ----!! Onyx by Dana Jansens ----!! inspired by "Carbon" by p0ng, and the ever so popular Vista glass look ---- ----!! Menu background ----menu.items.bg: flat gradient vertical ----menu.items.bg.color: #303030 ----menu.items.bg.colorTo: #080808 ---- ----!! Menu text ----menu.items.text.color: #b8b8b8 ----menu.items.justify: left ----menu.items.disabled.text.color: #606060 ---- ----!! Menu headers ----menu.title.bg: raised splitvertical gradient ----menu.title.bg.color: #303030 ----menu.title.bg.colorTo: #181818 ----menu.title.text.color: white ----menu.title.text.justify: center ---- ----!! Selected menu item ----menu.items.active.bg: raised splitvertical gradient ----menu.items.active.bg.color: #6d95de ----menu.items.active.bg.colorTo: #2b829d ----menu.items.active.text.color: #f8f8f8 ---- ----!! Titlebar ----window.active.title.bg: raised splitvertical gradient ----window.active.title.bg.color: #414141 ----window.active.title.bg.colorTo: #202020 ----window.inactive.title.bg: gradient splitvertical gradient flat ----window.inactive.title.bg.color: #DEE0D8 ----window.inactive.title.bg.colorTo: #E0E0D8 ---- ----!! Titlebar text ----window.label.text.justify: center ----window.active.label.bg: parentrelative ----window.active.label.text.color: #f8f8f8 ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #747474 ---- ----!! Window buttons ----window.*.button.*.bg: parentrelative ----window.active.button.*.hover.bg: flat splitvertical gradient border ----window.inactive.button.*.hover.bg: parentrelative ----window.*.button.*.pressed.bg: flat splitvertical gradient border ---- ----window.active.button.*.hover.bg.color: #398dc6 ----window.active.button.*.hover.bg.colorTo: #236d83 ----window.active.button.*.hover.bg.border.color: #236d83 ---- ----window.active.button.*.pressed.bg.color: #235679 ----window.active.button.*.pressed.bg.colorTo: #154350 ----window.active.button.*.pressed.image.color: #898989 ----window.active.button.*.pressed.bg.border.color: #154350 ----window.inactive.button.*.pressed.bg.color: #4ab5ff ----window.inactive.button.*.pressed.bg.colorTo: #38b3d6 ----window.inactive.button.*.pressed.image.color: #b7fdef ----window.inactive.button.*.pressed.bg.border.color: #38b3d6 ---- ----window.active.button.*.image.color: #e0e0e0 ----window.active.button.disabled.image.color: #707070 ----window.inactive.button.*.image.color: #747474 ----window.inactive.button.disabled.image.color: #c0c0c0 ---- ----!! Borders ----window.active.border.color: #181818 ----window.inactive.border.color: #404040 ----window.inactive.title.separator.color: #eeeee6 ----border.width: 1 ----padding.width: 2 ----window.handle.width: 0 ----window.active.client.color: #181818 ----window.inactive.client.color: #CACAB6 ----window.client.padding.width: 1 ----window.client.padding.height: 1 ----menu.overlap: 0 ---- ----!! Font shadows ----menu.items.font:shadow=y:shadowtint=30 ---- ----!! On-screen displays ----osd.bg: gradient vertical flat ----osd.bg.color: #303030 ----osd.bg.colorTo: #080808 diff --cc themes/Orang/openbox-3/themerc index ee444c59,ee444c59,ee444c59,ee444c59..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Orang/openbox-3/themerc +++ /dev/null @@@@@ -1,100 -1,100 -1,100 -1,100 +1,0 @@@@@ ----!! i be a mess ---- ----menu.title.bg: flat solid border ----menu.title.bg.color: #ce5c00 ----menu.title.bg.border.color: #fcaf3e ----menu.title.text.color: #ffffff ---- ----menu.items.bg: flat solid ----#menu.items.bg.color: #ffffff ----menu.items.bg.color: #d3d7cf ----menu.items.text.color: #000000 ----menu.items.disabled.text.color: #737573 ---- ----menu.items.active.bg: flat solid ----menu.items.active.bg.color: #ce5c00 ----menu.items.active.text.color: #ffffff ---- ----!! General window settings ----*.justify: left ---- ----!! focused window settings ----window.active.client.color: #f7f7f7 ---- ----window.active.title.bg: flat border solid ----window.active.title.bg.color: #ce5c00 ----window.active.title.bg.border.color: #fcaf3e ---- ----window.active.handle.bg: flat solid border ----window.active.handle.bg.color: #d3d7cf ----window.active.handle.bg.border.color: #eeeeec ----!window.active.handle.bg.color: #969494 ----window.active.grip.bg: parentrelative ---- ----window.active.label.bg: parentrelative ----window.active.label.text.color: #ffffff ---- ----window.active.button.*.bg: parentrelative ----window.active.button.*.image.color: #ffffff ---- ----window.active.button.pressed.bg: flat solid bevel1 ----!window.active.button.pressed.bg.color: #888888 ----window.active.button.pressed.bg.color: #f57900 ----window.active.button.pressed.image.color: #d3d7cf ---- ----!#hover ----window.active.button.hover.bg: flat solid ----window.active.button.hover.image.color: #ffffff ----window.active.button.hover.bg.color: #fcaf3e ---- ----window.active.button.disabled.bg: flat solid ----window.active.button.disabled.bg.color: #dfb454 ----window.active.button.disabled.image.color: #ffffff ---- ---- ----!! unfocused window settings ----window.inactive.client.color: #f7f7f7 ---- ----window.inactive.title.bg: flat solid border ----window.inactive.title.bg.color: #d3d7cf ----window.inactive.title.bg.border.color: #dfe3db ---- ----window.inactive.handle.bg: flat solid ----window.inactive.handle.bg.color: #d3d7cf ---- ----window.inactive.grip.bg: parentrelative ---- ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #888a85 ---- ----window.inactive.button.*.bg: parentrelative ----window.inactive.button.unpressed.image.color: #555555 ---- ----window.inactive.button.pressed.bg: flat border solid ----window.inactive.button.pressed.bg.color: #aaaaaa ----window.inactive.button.pressed.bg.border.color: #e5e5e5 ---- ----window.inactive.button.hover.bg: flat solid ----window.inactive.button.hover.bg.color: #e3e3e3 ---- ----window.inactive.button.disabled.bg:flat solid ----window.inactive.button.disabled.bg.color: #e3e3e3 ---- ---- ----!! Global width settings ----border.Width: 1 ----padding.width: 1 ----window.handle.width: 3 ----window.client.padding.width: 0 ----window.client.padding.height: 0 ----menu.overlap: 2 ---- ----!! Miscellaneous settings ----border.color: #000000 ---- ----!! font me! ----window.active.label.text.font: ----window.inactive.label.text.font: ----menu.title.text.font: ----menu.items.font: ---- diff --cc themes/Syscrash/openbox-3/max.xbm index 44c7cefc,44c7cefc,44c7cefc,44c7cefc..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Syscrash/openbox-3/max.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 6 ----#define max_height 6 ----static unsigned char max_bits[] = { ---- 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; diff --cc themes/Syscrash/openbox-3/max_disabled.xbm index 6d030af4,6d030af4,6d030af4,6d030af4..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Syscrash/openbox-3/max_disabled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 6 ----#define max_height 6 ----static unsigned char max_bits[] = { ---- 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --cc themes/Syscrash/openbox-3/max_pressed.xbm index 6d030af4,6d030af4,6d030af4,6d030af4..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Syscrash/openbox-3/max_pressed.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_width 6 ----#define max_height 6 ----static unsigned char max_bits[] = { ---- 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; diff --cc themes/Syscrash/openbox-3/max_toggled.xbm index 020f779d,020f779d,020f779d,020f779d..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Syscrash/openbox-3/max_toggled.xbm +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----#define max_toggled_width 6 ----#define max_toggled_height 6 ----static unsigned char max_toggled_bits[] = { ---- 0x3c, 0x27, 0x25, 0x3d, 0x11, 0x1f }; diff --cc themes/Syscrash/openbox-3/themerc index 65666d91,65666d91,65666d91,65666d91..00000000 deleted file mode 100644,100644,100644,100644 --- a/themes/Syscrash/openbox-3/themerc +++ /dev/null @@@@@ -1,114 -1,114 -1,114 -1,114 +1,0 @@@@@ ----!! syscrash's theme, based off nightm4re's flax or something ---- ----!!--------------------------------------------------------------------------- ----!! Dimensions ---- ----border.width: 1 ----border.color: #6d6d6d ---- ----padding.width: 1 ----window.handle.width: 0 ----window.client.padding.width: 0 ----window.client.padding.height: 0 ---- ----menu.overlap: 0 ---- ----!!--------------------------------------------------------------------------- ----!! Fonts ---- ----window.active.label.text.font: shadow=y ----window.label.text.justify: left ---- ----menu.title.text.font: shadow=y ----menu.title.text.justify: left ---- ----menu.items.font: ---- ----!!--------------------------------------------------------------------------- ----!! Menu Settings ---- ----menu.title.bg: flat gradient vertical ----menu.title.bg.color: #4c4c4c ----menu.title.bg.colorTo: #707070 ----menu.title.text.color: white ---- ----menu.items.bg: flat solid ----menu.items.bg.color: #e6e6e0 ----menu.items.text.color: #22221c ---- ----menu.items.active.bg: flat solid ----menu.items.active.bg.color: #4c4c4c ----menu.items.active.text.color: #ffffff ---- ----menu.items.disabled.text.color: #8c8c75 ---- ----!!--------------------------------------------------------------------------- ----!! Window Settings ---- ----window.active.padding.width: 10 ----window.active.title.bg: flat solid ----window.active.title.bg.color: #9b9b9b ---- ----window.active.label.bg: flat gradient vertical border ----window.active.label.bg.color: #4c4c4c ----window.active.label.bg.colorTo: #707070 ----window.active.label.text.color: white ---- ----window.active.handle.bg: flat gradient crossdiagonal ----window.active.handle.bg.color: #d3deda ----window.active.handle.bg.colorTo: #9fbfc1 ---- ----window.active.grip.bg: flat solid ----window.active.grip.bg.color: #9fbfc1 ---- ----window.active.client.color: #4c4c4c ----window.inactive.client.color: #707070 ---- ----window.inactive.title.bg: flat solid ----window.inactive.title.bg.color: #9b9b9b ---- ----window.inactive.label.bg: parentrelative ----window.inactive.label.text.color: #4c4c4c ---- ----window.inactive.handle.bg: flat solid ----window.inactive.handle.bg.color: #e6e6e0 ---- ----window.inactive.grip.bg: flat solid ----window.inactive.grip.bg.color: #e6e6e0 ---- ----!!--------------------------------------------------------------------------- ----!! Button Settings ---- ----window.active.button.unpressed.bg: flat gradient vertical border ----window.active.button.unpressed.bg.color: #515151 ----window.active.button.unpressed.bg.colorTo: #676767 ----window.active.button.unpressed.image.color: white ---- ----window.active.button.pressed.bg: flat gradient crossdiagonal border ----window.active.button.pressed.bg.color: #d3deda ----window.active.button.pressed.bg.colorTo: #9fbfc1 ---- ----window.active.button.hover.bg: flat solid border ----window.active.button.hover.bg.color: #e6e6e0 ---- ----window.active.button.disabled.bg: parentrelative ----window.active.button.disabled.image.color: #8c8c75 ---- ----!! without this it looks right ----!!window.active.button.toggled.bg: flat solid ----!!window.active.button.toggled.bg.color: #9fbfc1 ---- ----window.inactive.button.unpressed.bg: parentrelative ----window.inactive.button.unpressed.image.color: #4c4c4c ---- ----window.inactive.button.hover.bg: flat solid border ----window.inactive.button.hover.bg.color: #e6e6e0 ----window.inactive.button.pressed.bg: flat gradient crossdiagonal border ----window.inactive.button.pressed.bg.color: #d3deda ----window.inactive.button.pressed.bg.colorTo: #9fbfc1 ---- ----window.inactive.button.disabled.bg: parentrelative ----window.inactive.button.disabled.image.color: #8c8c75 ---- ----!! window.inactive.button.toggled.bg: flat solid ----!! window.inactive.button.toggled.bg.color: #444438 diff --cc tools/gnome-panel-control/Makefile index cfc46539,cfc46539,cfc46539,cfc46539..00000000 deleted file mode 100644,100644,100644,100644 --- a/tools/gnome-panel-control/Makefile +++ /dev/null @@@@@ -1,4 -1,4 -1,4 -1,4 +1,0 @@@@@ ----all clean install: ---- $(MAKE) -C ../.. -$(MAKEFLAGS) $@ ---- ----.PHONY: all clean install diff --cc tools/gnome-panel-control/gnome-panel-control.c index 67aa0393,67aa0393,67aa0393,67aa0393..00000000 deleted file mode 100644,100644,100644,100644 --- a/tools/gnome-panel-control/gnome-panel-control.c +++ /dev/null @@@@@ -1,100 -1,100 -1,100 -1,100 +1,0 @@@@@ ----#include ----#include ----#include ----#include ---- ----typedef enum ----{ ---- NONE, ---- MAIN_MENU, ---- RUN_DIALOG ----} Action; ---- ----int main(int argc, char **argv) ----{ ---- int i; ---- Action a = NONE; ---- ---- for (i = 1; i < argc; ++i) { ---- if (!strcmp(argv[i], "--help")) { ---- a = NONE; ---- break; ---- } ---- if (!strcmp(argv[i], "--main-menu")) { ---- a = MAIN_MENU; ---- break; ---- } ---- if (!strcmp(argv[i], "--run-dialog")) { ---- a = RUN_DIALOG; ---- break; ---- } ---- } ---- ---- if (!a) { ---- printf("Usage: gnome-panel-control ACTION\n\n"); ---- printf("Actions:\n"); ---- printf(" --help Display this help and exit\n"); ---- printf(" --main-menu Show the main menu\n"); ---- printf(" --run-dialog Show the run dialog\n\n"); ---- return 0; ---- } ---- ---- { ---- Display *d; ---- Window root; ---- XClientMessageEvent ce; ---- Atom act_atom; ---- Time timestamp; ---- ---- d = XOpenDisplay(NULL); ---- if (!d) { ---- fprintf(stderr, ---- "Unable to open the X display specified by the DISPLAY " ---- "environment variable. Ensure you have permission to " ---- "connect to the display."); ---- return 1; ---- } ---- root = RootWindowOfScreen(DefaultScreenOfDisplay(d)); ---- ---- switch (a) { ---- case MAIN_MENU: ---- act_atom = XInternAtom(d, "_GNOME_PANEL_ACTION_MAIN_MENU", False); ---- break; ---- case RUN_DIALOG: ---- act_atom = XInternAtom(d, "_GNOME_PANEL_ACTION_RUN_DIALOG", False); ---- break; ---- default: ---- assert(0); ---- } ---- ---- /* Generate a timestamp */ ---- { ---- XEvent event; ---- Window win; ---- ---- win = XCreateSimpleWindow(d, root, 0, 0, 1, 1, 0, 0, 0); ---- ---- XSelectInput(d, win, PropertyChangeMask); ---- ---- XChangeProperty(d, win, act_atom, act_atom, 8, ---- PropModeAppend, NULL, 0); ---- XWindowEvent(d, win, PropertyChangeMask, &event); ---- ---- XDestroyWindow(d, win); ---- ---- timestamp = event.xproperty.time; ---- } ---- ---- ce.type = ClientMessage; ---- ce.window = root; ---- ce.message_type = XInternAtom(d, "_GNOME_PANEL_ACTION", False); ---- ce.format = 32; ---- ce.data.l[0] = act_atom; ---- ce.data.l[1] = timestamp; ---- XSendEvent(d, root, False, StructureNotifyMask, (XEvent*) &ce); ---- ---- XCloseDisplay(d); ---- } ---- ---- return 0; ----} diff --cc tools/themeupdate/themeupdate.py index c2ad6a75,c2ad6a75,c2ad6a75,c2ad6a75..00000000 deleted file mode 100755,100755,100755,100755 --- a/tools/themeupdate/themeupdate.py +++ /dev/null @@@@@ -1,410 -1,410 -1,410 -1,410 +1,0 @@@@@ ----#! /usr/bin/python ---- ----# themeupdate.py for the Openbox window manager ----# This utility is for updating old themes from Blackbox, Fluxbox, and Openbox2 ----# to Openbox3 ----# ----# Copyright (c) 2003-2007 Dana Jansens ----# ----# 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. ----# ----# See the COPYING file for a copy of the GNU General Public License. ---- ----import sys ---- ----data = [] ----valid = True ---- ----def out(str): ---- sys.stderr.write(str) ---- sys.stderr.flush() ---- ----def read_bool(): ---- while True: ---- inp = sys.stdin.readline(1).strip() ---- if inp == 'y' or inp == '': return True ---- if inp == 'n': return False ---- ----def getkeyval(line): ---- key = line[:line.find(':')].strip() ---- value = line[line.find(':') + 1:].strip() ---- if not (key and value): ---- key = value = None ---- return key, value ---- ----def find_key(data, keysubstr, exact = False): ---- i = 0 ---- n = len(data) ---- while i < n: ---- l = data[i] ---- key, value = getkeyval(l) ---- if key and value: ---- if (exact and key == keysubstr) or \ ---- (not exact and key.find(keysubstr) != -1): ---- return i, key, value ---- i += 1 ---- return -1, None, None ---- ----def simple_replace(data): ---- pairs = {} ---- pairs['.picColor'] = '.imageColor' ---- pairs['menu.frame'] = 'menu.items' ---- pairs['menu.hilite'] = 'menu.selected' ---- pairs['borderColor'] = 'border.color' ---- pairs['imageColor'] = 'image.color' ---- pairs['textColor'] = 'text.color' ---- pairs['interlaceColor'] = 'interlace.color' ---- ---- for k in pairs.keys(): ---- while 1: ---- i, key, nul = find_key(data, k); ---- if i >= 0: ---- newl = data[i].replace(k, pairs[k]) ---- out('Updating "' + key + ---- '" to "' + key.replace(k, pairs[k]) + '"\n') ---- data[i] = newl ---- else: ---- break ---- ---- pairs = {} ---- pairs['window.focus.font'] = 'window.active.label.text.font' ---- pairs['window.unfocus.font'] = 'window.inactive.label.text.font' ---- pairs['window.justify'] = 'window.label.justify' ---- pairs['menu.frame.disableColor'] = 'menu.disabled.textColor' ---- pairs['window.label.focus.font'] = 'window.active.label.text.font' ---- pairs['window.label.unfocus.font'] = 'window.inactive.label.text.font' ---- pairs['window.label.justify'] = 'window.label.text.justify' ---- pairs['menu.title.font'] = 'menu.title.text.font' ---- pairs['menu.title.justify'] = 'menu.title.text.justify' ---- pairs['menuOverlap'] = 'menu.overlap' ---- pairs['handleWidth'] = 'window.handle.width' ---- pairs['borderWidth'] = 'border.width' ---- pairs['bevelWidth'] = 'padding.width' ---- pairs['frameWidth'] = 'window.client.padding.width' ---- pairs['window.frame.focusColor'] = 'window.active.client.color' ---- pairs['window.frame.unfocusColor'] = 'window.inactive.client.color' ---- pairs['window.title.focus'] = 'window.active.title.bg' ---- pairs['window.title.unfocus'] = 'window.inactive.title.bg' ---- pairs['window.label.focus'] = 'window.active.label.bg' ---- pairs['window.label.unfocus'] = 'window.inactive.label.bg' ---- pairs['window.handle.focus'] = 'window.active.handle.bg' ---- pairs['window.handle.unfocus'] = 'window.inactive.handle.bg' ---- pairs['window.grip.focus'] = 'window.active.grip.bg' ---- pairs['window.grip.unfocus'] = 'window.inactive.grip.bg' ---- pairs['menu.items'] = 'menu.items.bg' ---- pairs['menu.title'] = 'menu.title.bg' ---- pairs['menu.selected'] = 'menu.items.active.bg' ---- pairs['window.title.focus'] = 'window.active.title.bg' ---- pairs['window.label.focus'] = 'window.active.label.bg' ---- pairs['window.title.unfocus'] = 'window.inactive.title.bg' ---- pairs['window.label.unfocus'] = 'window.inactive.label.bg' ---- pairs['window.button.disabled.focus'] = 'window.active.button.disabled.bg' ---- pairs['window.button.disabled.unfocus'] = \ ---- 'window.inactive.button.disabled.bg' ---- pairs['window.button.pressed.focus'] = 'window.active.button.pressed.bg' ---- pairs['window.button.pressed.unfocus'] = \ ---- 'window.inactive.button.pressed.bg' ---- pairs['window.button.toggled.focus'] = 'window.active.button.toggled.bg' ---- pairs['window.button.toggled.unfocus'] = \ ---- 'window.inactive.button.toggled.bg' ---- pairs['window.button.focus'] = 'window.active.button.unpressed.bg' ---- pairs['window.button.unfocus'] = 'window.inactive.button.unpressed.bg' ---- pairs['window.button.hover.focus'] = 'window.active.button.hover.bg' ---- pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover.bg' ---- ---- for k in pairs.keys(): ---- while 1: ---- i, key, nul = find_key(data, k, True); ---- if i >= 0: ---- newl = data[i].replace(k, pairs[k]) ---- out('Updating "' + key + ---- '" to "' + key.replace(k, pairs[k]) + '"\n') ---- data[i] = newl ---- else: ---- break ---- ---- pairs = {} ---- pairs['window.title.focus'] = 'window.active.title' ---- pairs['window.title.unfocus'] = 'window.inactive.title' ---- pairs['window.label.focus'] = 'window.active.label' ---- pairs['window.label.unfocus'] = 'window.inactive.label' ---- pairs['window.handle.focus'] = 'window.active.handle' ---- pairs['window.handle.unfocus'] = 'window.inactive.handle' ---- pairs['window.grip.focus'] = 'window.active.grip' ---- pairs['window.grip.unfocus'] = 'window.inactive.grip' ---- pairs['menu.selected'] = 'menu.items.active' ---- pairs['window.title.focus'] = 'window.active.title' ---- pairs['window.label.focus'] = 'window.active.label' ---- pairs['window.title.unfocus'] = 'window.inactive.title' ---- pairs['window.label.unfocus'] = 'window.inactive.label' ---- pairs['window.button.disabled.focus'] = 'window.active.button.disabled' ---- pairs['window.button.disabled.unfocus'] = \ ---- 'window.inactive.button.disabled' ---- pairs['window.button.pressed.focus'] = 'window.active.button.pressed' ---- pairs['window.button.pressed.unfocus'] = \ ---- 'window.inactive.button.pressed' ---- pairs['window.button.toggled.focus'] = 'window.active.button.toggled' ---- pairs['window.button.toggled.unfocus'] = \ ---- 'window.inactive.button.toggled' ---- pairs['window.button.focus'] = 'window.active.button' ---- pairs['window.button.unfocus'] = 'window.inactive.button' ---- pairs['window.button.hover.focus'] = 'window.active.button.hover' ---- pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover' ---- pairs['window.label.unfocus'] = 'window.inactive.label' ---- pairs['window.label.focus'] = 'window.active.label' ---- pairs['window.button.focus'] = 'window.active.button.unpressed' ---- pairs['menu.disabled'] = 'menu.items.disabled' ---- pairs['menu.selected'] = 'menu.items.active' ---- pairs['window.button.unfocus'] = 'window.inactive.button.unpressed' ---- pairs['window.button.pressed.focus'] = 'window.active.button.pressed' ---- pairs['window.button.pressed.unfocus'] = 'window.inactive.button.pressed' ---- pairs['window.button.disabled.focus'] = 'window.active.button.disabled' ---- pairs['window.button.disabled.unfocus'] = 'window.inactive.button.disabled' ---- pairs['window.button.hover.focus'] = 'window.active.button.hover' ---- pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover' ---- pairs['window.button.toggled.focus'] = 'window.active.button.toggled' ---- pairs['window.button.toggled.unfocus'] = 'window.inactive.button.toggled' ---- ---- for k in pairs.keys(): ---- while 1: ---- i, key, nul = find_key(data, k); ---- if i >= 0: ---- newl = data[i].replace(k, pairs[k]) ---- out('Updating "' + key + ---- '" to "' + key.replace(k, pairs[k]) + '"\n') ---- data[i] = newl ---- else: ---- break ---- ----def replace_colors(data): ---- i = 0 ---- n = len(data) ---- while i < n: ---- l = data[i] ---- key, value = getkeyval(l) ---- if key and value: ---- if key.find('.color') != -1: ---- if key.find('client.color') == -1 \ ---- and key.find('image.color') == -1 \ ---- and key.find('bg.color') == -1 \ ---- and key.find('border.color') == -1 \ ---- and key.find('interlace.color') == -1 \ ---- and key.find('text.color') == -1: ---- newl = data[i].replace('.color', '.bg.color') ---- out('Updating "' + key + ---- '" to "' + key.replace('.color', '.bg.color') + '"\n') ---- data[i] = newl ---- if key.find('.border.color') != -1 \ ---- and key.find('bg.border.color') == -1: ---- newl = data[i].replace('.border.color', '.bg.border.color') ---- out('Updating "' + key + ---- '" to "' + key.replace('.border.color', ---- '.bg.border.color') + '"\n') ---- data[i] = newl ---- if key.find('.interlace.color') != -1 \ ---- and key.find('bg.interlace.color') == -1: ---- newl = data[i].replace('.interlace.color', ---- '.bg.interlace.color') ---- out('Updating "' + key + ---- '" to "' + key.replace('.interlace.color', ---- '.bg.interlace.color') + '"\n') ---- data[i] = newl ---- i += 1 ---- ----def remove(data): ---- invalid = [] ---- invalid.append('toolbar') ---- for inv in invalid: ---- while 1: ---- i, key, nul = find_key(data, inv) ---- if i >= 0: ---- out(key + ' is no longer supported.\nRemove (Y/n)? ') ---- if read_bool(): ---- out('Removing "' + key + '"\n') ---- data.pop(i) ---- else: ---- break ---- invalid.append('rootCommand') ---- invalid.append('menu.bullet') ---- invalid.append('menu.bullet.image.color') ---- invalid.append('menu.bullet.selected.image.color') ---- invalid.append('menu.frame.justify') ---- for inv in invalid: ---- while 1: ---- i, key, nul = find_key(data, inv, True) ---- if i >= 0: ---- out(key + ' is no longer supported.\nRemove (Y/n)? ') ---- if read_bool(): ---- out('Removing "' + key + '"\n') ---- data.pop(i) ---- else: ---- break ---- ----def pressed(data): ---- i, nul, nul = find_key(data, 'window.button.pressed', True) ---- if i >= 0: ---- out('The window.button.pressed option has been replaced by ' + ---- 'window.button.pressed.focus and ' + ---- 'window.button.pressed.unfocus.\nUpdate (Y/n)? ') ---- if read_bool(): ---- l = data[i] ---- out('Removing "window.button.pressed"\n') ---- data.pop(i) ---- out('Adding "window.button.pressed.unfocus"\n') ---- data.insert(i, l.replace('window.button.pressed', ---- 'window.button.pressed.unfocus')) ---- out('Adding "window.button.pressed.focus"\n') ---- data.insert(i, l.replace('window.button.pressed', ---- 'window.button.pressed.focus')) ---- ----def x_fonts(data): ---- i, nul, nul = find_key(data, 'window.font') ---- if i >= 0: ---- out('You appear to specify fonts using the old X fonts ' + ---- 'syntax.\nShall I remove all fonts from the theme (Y/n)? ') ---- if not read_bool(): ---- return ---- else: return ---- while 1: ---- i, key, nul = find_key(data, '.font') ---- if i < 0: ---- break ---- out('Removing "' + key + '"\n') ---- data.pop(i) ---- ----def xft_fonts(data): ---- i, nul, nul = find_key(data, '.xft.') ---- if i >= 0: ---- out('You appear to specify fonts using the old Xft fonts ' + ---- 'syntax.\nShall I update these to the new syntax (Y/n)? ') ---- if not read_bool(): ---- return ---- else: return ---- fonts = {} ---- fonts['window'] = 'window.label.focus.font' ---- fonts['menu.items'] = 'menu.items.font' ---- fonts['menu.title'] = 'menu.title.font' ---- for f in fonts.keys(): ---- li, nul, flags = find_key(data, f + '.xft.flags') ---- if li < 0: ---- li, nul, flags = find_key(data, '*.xft.flags') ---- else: ---- out('Removing ' + f + '.xft.flags\n') ---- data.pop(li) ---- oi, nul, offset = find_key(data, f + '.xft.shadow.offset') ---- if oi < 0: ---- oi, nul, offset = find_key(data, '*.xft.shadow.offset') ---- else: ---- out('Removing ' + f + '.xft.shadow.offset\n') ---- data.pop(oi) ---- ti, nul, tint = find_key(data, f + '.xft.shadow.tint') ---- if ti < 0: ---- ti, nul, tint = find_key(data, '*.xft.shadow.tint') ---- else: ---- out('Removing ' + f + '.xft.shadow.tint\n') ---- data.pop(ti) ---- fi, nul, face = find_key(data, f + '.xft.font') ---- if fi < 0: ---- fi, nul, face = find_key(data, '*.xft.font') ---- if fi >= 0: fi = len(data) - 1 ---- else: ---- out('Removing ' + f + '.xft.font\n') ---- data.pop(fi) ---- ---- if fi >= 0: ---- s = face ---- if li >= 0: ---- if flags.find('bold'): ---- s = s + ':bold' ---- if flags.find('shadow'): ---- s = s + ':shadow=y' ---- if oi >= 0: ---- s = s + ':shadowoffset=' + offset ---- if ti >= 0: ---- s = s + ':shadowtint=' + tint ---- out('Adding ' + fonts[f] + '\n') ---- data.insert(fi, fonts[f] + ': ' + s) ---- ---- for stars in ('*.xft.flags', '*.xft.shadow.offset' , ---- '*.xft.shadow.tint', '*.xft.font'): ---- i, key, nul = find_key(data, stars) ---- if i >= 0: ---- out('Removing ' + key + '\n') ---- data.pop(i) ---- ----def pixelsize(data): ---- fonts = ('window.label.focus.font', ---- 'menu.items.font', ---- 'menu.title.font') ---- for f in fonts: ---- i, key, value = find_key(data, f, True) ---- if value: ---- if value.find('pixelsize') == -1: ---- out('*** ERROR *** The ' + key + ' font size is not being ' ---- 'specified by pixelsize. It is recommended that you use ' ---- 'pixelsize instead of pointsize for specifying theme ' ---- 'fonts. e.g. "sans:pixelsize=12"\n') ---- global valid ---- valid = False ---- ----def warn_missing(data): ---- need = ('window.active.button.hover', 'window.inactive.button.hover', ---- 'menu.overlap') ---- for n in need: ---- i, nul, nul = find_key(data, n) ---- if i < 0: ---- out('The ' + n + ' value was not found in the theme, but it ' ---- 'can optionally be set.\n') ---- ----def err_missing(data): ---- need = ('window.active.button.disabled', ---- 'window.inactive.button.disabled', ---- 'window.active.client.color', ---- 'window.inactive.client.color') ---- for n in need: ---- i, nul, nul = find_key(data, n) ---- if i < 0: ---- out('*** ERROR *** The ' + n + ' value was not found in the ' ---- 'theme, but it is required to be set.\n') ---- global valid ---- valid = False ---- ---- ----def usage(): ---- out('Usage: themupdate.py /path/to/themerc > newthemerc\n\n') ---- sys.exit() ---- ----try: ---- file = open(sys.argv[1]) ----except IndexError: ---- usage() ----except IOError: ---- out('Unable to open file "' + sys.argv[1] + '"\n\n') ---- usage() ---- ----data = file.readlines() ----for i in range(len(data)): ---- data[i] = data[i].strip() ---- ----simple_replace(data) ----replace_colors(data) ----remove(data) ----pressed(data) ----x_fonts(data) ----xft_fonts(data) ----pixelsize(data) ----warn_missing(data) ----err_missing(data) ---- ----for l in data: ---- print l ---- ----sys.exit(not valid) diff --cc tools/xdg-autostart/xdg-autostart index 95ee5f51,95ee5f51,95ee5f51,95ee5f51..00000000 deleted file mode 100755,100755,100755,100755 --- a/tools/xdg-autostart/xdg-autostart +++ /dev/null @@@@@ -1,198 -1,198 -1,198 -1,198 +1,0 @@@@@ ----#!/usr/bin/env python ---- ----# xdg-autostart runs things based on the XDG autostart specification ----# Copyright (C) 2008 Dana Jansens ----# ----# XDG autostart specification can be found here: ----# http://standards.freedesktop.org/autostart-spec/ ----# ----# ----# ----# LICENSE: ----# 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. ---- ----ME="xdg-autostart" ----VERSION="1.0" ---- ----import os, glob, sys ----try: ---- from xdg import BaseDirectory ---- from xdg.DesktopEntry import DesktopEntry ---- from xdg.Exceptions import ParsingError ----except ImportError: ---- print ---- print "ERROR:", ME, "requires PyXDG to be installed" ---- print ---- sys.exit(1) ---- ----def main(argv=sys.argv): ---- if "--help" in argv[1:]: ---- show_help() ---- return 0 ---- if "--version" in argv[1:]: ---- show_version() ---- return 0 ---- ---- # get the autostart directories ---- autodirs = BaseDirectory.load_config_paths("autostart") ---- ---- # find all the autostart files ---- files = [] ---- for dir in autodirs: ---- for path in glob.glob(os.path.join(dir, '*.desktop')): ---- try: ---- autofile = AutostartFile(path) ---- except ParsingError: ---- print "Invalid .desktop file: " + path ---- else: ---- if not autofile in files: ---- files.append(autofile) ---- ---- list = False ---- if "--list" in argv[1:]: ---- list = True ---- argv.remove("--list") ---- ---- # run them ! ---- environments = argv[1:] ---- for autofile in files: ---- if list: autofile.list(environments) ---- else: autofile.run(environments) ---- ----class AutostartFile: ---- def __init__(self, path): ---- self.path = path ---- self.filename = os.path.basename(path) ---- self.dirname = os.path.dirname(path) ---- self.de = DesktopEntry(path) ---- ---- def __eq__(self, other): ---- return self.filename == other.filename ---- ---- def __str__(self): ---- return self.path + " : " + self.de.getName() ---- ---- def isexecfile(path): ---- return os.access(path, os.X_OK) ---- ---- def findFile(self, path, search, match_func): ---- # check empty path ---- if not path: return None ---- # check absolute path ---- if path[0] == '/': ---- if match_func(path): return path ---- else: return None ---- # check relative path ---- for dirname in search.split(os.pathsep): ---- if dirname != "": ---- candidate = os.path.join(dirname, path) ---- if (match_func(candidate)): return candidate ---- ---- def alert(self, str, info=False): ---- if info: ---- print "\t ", str ---- else: ---- print "\t*", str ---- ---- def showInEnvironment(self, envs, verbose=False): ---- default = not self.de.getOnlyShowIn() ---- noshow = False ---- force = False ---- for i in self.de.getOnlyShowIn(): ---- if i in envs: force = True ---- for i in self.de.getNotShowIn(): ---- if i in envs: noshow = True ---- ---- if verbose: ---- if not default and not force: ---- s = "" ---- for i in self.de.getOnlyShowIn(): ---- if s: s += ", " ---- s += i ---- self.alert("Excluded by: OnlyShowIn (" + s + ")") ---- if default and noshow and not force: ---- s = "" ---- for i in self.de.getOnlyShowIn(): ---- if s: s += ", " ---- s += i ---- self.alert("Excluded by: NotShowIn (" + s + ")") ---- return (default and not noshow) or force ---- ---- def shouldRun(self, envs, verbose=False): ---- if not self.de.getExec(): ---- if verbose: self.alert("Excluded by: Missing Exec field") ---- return False ---- if self.de.getHidden(): ---- if verbose: self.alert("Excluded by: Hidden") ---- return False ---- if self.de.getTryExec(): ---- if not self.findFile(self.de.getTryExec(), os.getenv("PATH"), ---- self.isexecfile): ---- if verbose: self.alert("Excluded by: TryExec (" + ---- self.de.getTryExec() + ")") ---- return False ---- if not self.showInEnvironment(envs, verbose): ---- return False ---- return True ---- ---- def list(self, envs): ---- running = False ---- if self.shouldRun(envs): ---- print "[*] " + self.de.getName() ---- else: ---- print "[ ] " + self.de.getName() ---- self.alert("File: " + self.path, info=True) ---- if self.de.getExec(): ---- self.alert("Executes: " + self.de.getExec(), info=True) ---- self.shouldRun(envs, True) ---- print ---- ---- def run(self, envs): ---- here = os.getcwd() ---- if self.de.getPath(): ---- os.chdir(self.de.getPath()) ---- if self.shouldRun(envs): ---- args = ["/bin/sh", "-c", "exec " + self.de.getExec()] ---- os.spawnv(os.P_NOWAIT, args[0], args); ---- os.chdir(here) ---- ----def show_help(): ---- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." ---- print ---- print "This tool will run xdg autostart .desktop files" ---- print ---- print "OPTIONS" ---- print " --list Show a list of the files which would be run" ---- print " Files which would be run are marked with an asterix" ---- print " symbol [*]. For files which would not be run," ---- print " information is given for why they are excluded" ---- print " --help Show this help and exit" ---- print " --version Show version and copyright information" ---- print ---- print "ENVIRONMENT specifies a list of environments for which to run autostart" ---- print "applications. If none are specified, only applications which do not " ---- print "limit themselves to certain environments will be run." ---- print ---- print "ENVIRONMENT can be one or more of:" ---- print " GNOME Gnome Desktop" ---- print " KDE KDE Desktop" ---- print " ROX ROX Desktop" ---- print " XFCE XFCE Desktop" ---- print " Old Legacy systems" ---- print ---- ----def show_version(): ---- print ME, VERSION ---- print "Copyright (c) 2008 Dana Jansens" ---- print ---- ----if __name__ == "__main__": ---- sys.exit(main())