Compare commits
	
		
			2 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | c7b8f26cad | ||
|   | 8747b97ba3 | 
							
								
								
									
										35
									
								
								.cvsignore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								.cvsignore
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | ||||
| Makefile | ||||
| Makefile.in | ||||
| aclocal.m4 | ||||
| confdefs.h | ||||
| config.cache | ||||
| config.guess | ||||
| config.h | ||||
| config.log | ||||
| config.status | ||||
| config.sub | ||||
| configure | ||||
| configure.scan | ||||
| libtool | ||||
| ltconfig | ||||
| ltmain.sh | ||||
| stamp-h | ||||
| stamp-h.in | ||||
| stamp-h1 | ||||
| stamp.h | ||||
| version.h | ||||
| config.h.in | ||||
| install-sh | ||||
| missing | ||||
| mkinstalldirs | ||||
| INSTALL | ||||
| intl | ||||
| ABOUT-NLS | ||||
| COPYING | ||||
| intltool-* | ||||
| metacity.spec | ||||
| autom4te.cache | ||||
| compile | ||||
| depcomp | ||||
| omf.make | ||||
| xmldocs.make | ||||
							
								
								
									
										56
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										56
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -3,7 +3,6 @@ Makefile.in | ||||
| Makefile.in.in | ||||
| aclocal.m4 | ||||
| autom4te.cache | ||||
| build-aux | ||||
| compile | ||||
| config.guess | ||||
| config.h | ||||
| @@ -20,11 +19,11 @@ libtool | ||||
| ltmain.sh | ||||
| missing | ||||
| .deps | ||||
| 50-mutter-navigation.xml | ||||
| 50-mutter-system.xml | ||||
| 50-mutter-windows.xml | ||||
| mutter.desktop | ||||
| mutter-wayland.desktop | ||||
| src/50-mutter-navigation.xml | ||||
| src/50-mutter-system.xml | ||||
| src/50-mutter-windows.xml | ||||
| src/mutter-wm.desktop | ||||
| src/mutter.desktop | ||||
| *.o | ||||
| *.a | ||||
| *.lo | ||||
| @@ -33,6 +32,10 @@ mutter-wayland.desktop | ||||
| *.swp | ||||
| *.gir | ||||
| *.typelib | ||||
| tidy-enum-types.[ch] | ||||
| tidy-marshal.[ch] | ||||
| stamp-tidy-enum-types.h | ||||
| stamp-tidy-marshal.h | ||||
| stamp-h1 | ||||
| *.gmo | ||||
| *.make | ||||
| @@ -41,33 +44,38 @@ stamp-it | ||||
| .intltool-merge-cache | ||||
| POTFILES | ||||
| po/*.pot | ||||
| 50-metacity-desktop-key.xml | ||||
| 50-metacity-key.xml | ||||
| inlinepixbufs.h | ||||
| libmutter.pc | ||||
| mutter | ||||
| mutter-restart-helper | ||||
| mutter-theme-viewer | ||||
| mutter.desktop | ||||
| org.gnome.mutter.gschema.valid | ||||
| org.gnome.mutter.gschema.xml | ||||
| org.gnome.mutter.wayland.gschema.valid | ||||
| org.gnome.mutter.wayland.gschema.xml | ||||
| testasyncgetprop | ||||
| testboxes | ||||
| testgradient | ||||
| m4/* | ||||
| mutter-grayscale | ||||
| mutter-mag | ||||
| mutter-message | ||||
| mutter-window-demo | ||||
| focus-window | ||||
| test-attached | ||||
| test-focus | ||||
| test-gravity | ||||
| test-resizing | ||||
| test-size-hints | ||||
| # We can't say just "wm-tester" here or it will ignore the directory | ||||
| # rather than the binary | ||||
| src/wm-tester/wm-tester | ||||
| INSTALL | ||||
| mkinstalldirs | ||||
| src/mutter-enum-types.[ch] | ||||
| src/stamp-mutter-enum-types.h | ||||
| src/mutter-marshal.[ch] | ||||
| src/stamp-mutter-marshal.h | ||||
| src/meta-dbus-display-config.[ch] | ||||
| src/meta-dbus-idle-monitor.[ch] | ||||
| src/meta-dbus-login1.[ch] | ||||
| src/gtk-shell-protocol.c | ||||
| src/gtk-shell-server-protocol.h | ||||
| src/xdg-shell-protocol.c | ||||
| src/xdg-shell-server-protocol.h | ||||
| src/xserver-protocol.c | ||||
| src/xserver-server-protocol.h | ||||
| src/meta/meta-version.h | ||||
| src/mutter-plugins.pc | ||||
| doc/reference/*.args | ||||
| doc/reference/*.bak | ||||
| doc/reference/*.hierarchy | ||||
| @@ -85,11 +93,3 @@ doc/reference/meta-undocumented.txt | ||||
| doc/reference/meta-unused.txt | ||||
| doc/reference/meta-docs.sgml | ||||
| doc/reference/meta.types | ||||
| gtk-doc.m4 | ||||
| intltool.m4 | ||||
| libtool.m4 | ||||
| ltoptions.m4 | ||||
| ltsugar.m4 | ||||
| ltversion.m4 | ||||
| lt~obsolete.m4 | ||||
| .dirstamp | ||||
|   | ||||
							
								
								
									
										159
									
								
								COMPLIANCE
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										159
									
								
								COMPLIANCE
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,159 @@ | ||||
| Metacity Standards Compliance | ||||
| ============================= | ||||
| $Id$ | ||||
|  | ||||
| 1) Introduction | ||||
| 2) EWMH Compliance | ||||
|   a. Root Window Properties | ||||
|   b. Root Window Messages | ||||
|   c. Application Window Properties | ||||
|   d. Window Manager Protocols | ||||
| 3) ICCCM Compliance | ||||
|  | ||||
| 1) Introduction | ||||
| --------------- | ||||
|  | ||||
| This document details metacity compliance with the relevent standards. | ||||
| The format of this document is as follows: | ||||
|  | ||||
| [-/+?] Hint Name/Feature Name (Version number) | ||||
|        Errata/Comments | ||||
|  | ||||
| The first character indicates the level of compliance as follows: | ||||
|     -   none | ||||
|     /   partial | ||||
|     +   complete | ||||
|     ?   unknown | ||||
|  | ||||
| The title indicates a feature or a hint in the specification, and the | ||||
| version number indicates the minimum version of the specification | ||||
| supported by metacity.  Later versions may be supported if no | ||||
| incompatible changes have been made in the specification. | ||||
|  | ||||
| 2) EWMH Compliance | ||||
| ------------------ | ||||
|  | ||||
| The EWMH, or Extended Window Manager Hints is a freedesktop.org- | ||||
| developed standard to support a number of conventions for | ||||
| communication between the window manager and clients.  It builds on | ||||
| and extends the ICCCM (See Section 3).  A copy of the current EWMH | ||||
| standard is available at http://freedesktop.org/Standards/wm-spec/ | ||||
|  | ||||
|   a. Root Window Properties | ||||
|   ------------------------- | ||||
|  | ||||
| + _NET_SUPPORTED (1.3) | ||||
|  | ||||
| + _NET_CLIENT_LIST (1.3) | ||||
|  | ||||
| + _NET_NUMBER_OF_DESKTOPS (1.3) | ||||
|  | ||||
| + _NET_DESKTOP_GEOMETRY (1.3) | ||||
|   Metacity does not implement large desktops, so this is kept set to | ||||
|   the screen size. | ||||
|  | ||||
| + _NET_DESKTOP_VIEWPORT (1.3) | ||||
|   Metacity does not implement viewports, so this is a constant (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) | ||||
|   Metacity does not read or set this property, but it does not use | ||||
|   virtual roots to implement virtual desktops, so it complies with the | ||||
|   specification. | ||||
|  | ||||
| + _NET_DESKTOP_LAYOUT (1.3) | ||||
|  | ||||
| + _NET_SHOWING_DESKTOP (1.3) | ||||
|  | ||||
|   b. Root Window Messages | ||||
|   ----------------------- | ||||
|  | ||||
| + _NET_CLOSE_WINDOW (1.3) | ||||
|  | ||||
| - _NET_MOVERESIZE_WINDOW (1.3) | ||||
|   Metacity supports this message, but the specification is unclear on | ||||
|   the layout of the detail value, and as such it is #if 0'd in the code | ||||
|  | ||||
| + _NET_WM_MOVERESIZE (1.3) | ||||
|  | ||||
| - _NET_RESTACK_WINDOW (1.3) | ||||
|   Metacity will raise or lower windows in response to this message, | ||||
|   but the sibling restack modes are not supported, and it is currently | ||||
|   #if 0'd in the code. | ||||
|  | ||||
| + _NET_REQUEST_FRAME_EXTENTS (1.3)   | ||||
|  | ||||
|   c. Application Window Properties | ||||
|   -------------------------------- | ||||
|  | ||||
| + _NET_WM_NAME (1.3) | ||||
|  | ||||
| + _NET_WM_VISIBLE_NAME (1.3) | ||||
|   Metacity does not set this property, but metacity will never display | ||||
|   a name different from _NET_WM_NAME | ||||
|  | ||||
| + _NET_WM_ICON_NAME (1.3) | ||||
|  | ||||
| + _NET_WM_VISIBLE_ICON_NAME (1.3) | ||||
|   Metacity does not set this property, but metacity will never display | ||||
|   a name different from _NET_WM_NAME | ||||
|  | ||||
| + _NET_WM_DESKTOP (1.3) | ||||
|  | ||||
| + _NET_WM_WINDOW_TYPE (1.3) | ||||
|  | ||||
| / _NET_WM_STATE (1.3) | ||||
|   This property is read and updated according to the specification, | ||||
|   but see caveat below. | ||||
|   Metacity does not recognize separate vertical and horizontal | ||||
|   maximization states.  Currently metacity will do a two-dimensional | ||||
|   maximization if either property is set. | ||||
|   See: http://bugzilla.gnome.org/show_bug.cgi?id=113601 | ||||
|   Metacity doesn't implement viewports so _NET_WM_STATE_STICKY is | ||||
|   unimplemented. | ||||
|  | ||||
| + _NET_WM_ALLOWED_ACTIONS (1.3) | ||||
|   Metacity keeps this hint up to date.  The code is somewhat crufty | ||||
|   and should be rewritten, though it is functional. | ||||
|   See: http://bugzilla.gnome.org/show_bug.cgi?id=90420 | ||||
|  | ||||
| + _NET_WM_STRUT (1.3) | ||||
|  | ||||
| + _NET_WM_STRUT_PARTIAL (1.3) | ||||
|  | ||||
| + _NET_WM_ICON_GEOMETRY (1.3) | ||||
|   Metacity uses this property to draw minimize/restore animations | ||||
|  | ||||
| + _NET_WM_ICON (1.3) | ||||
|  | ||||
| + _NET_WM_PID (1.3) | ||||
|  | ||||
| + _NET_WM_HANDLED_ICONS (1.3) | ||||
|   Metacity does not read or set this property.  However, metacity | ||||
|   never manages iconified windows, and so has no need to do so. | ||||
|  | ||||
| + _NET_WM_USER_TIME (1.3) | ||||
|   Metacity uses this property to prevent applications from stealing | ||||
|   focus if supported by the toolkit. | ||||
|  | ||||
| + _NET_FRAME_EXTENTS (1.3) | ||||
|   If set in response to a _NET_REQUEST_FRAME_EXTENTS message received | ||||
|   prior to the window being mapped, this may be an estimate.  This is, | ||||
|   however, expressly allowed by the specification. | ||||
|  | ||||
|   d. Window Manager Protocols | ||||
|   --------------------------- | ||||
| + _NET_WM_PING (1.3) | ||||
|  | ||||
| 3) ICCCM Compliance | ||||
| ------------------- | ||||
| TODO | ||||
							
								
								
									
										41
									
								
								COPYING
									
									
									
									
									
								
							
							
						
						
									
										41
									
								
								COPYING
									
									
									
									
									
								
							| @@ -1,12 +1,12 @@ | ||||
|                     GNU GENERAL PUBLIC LICENSE | ||||
|                        Version 2, June 1991 | ||||
| 		    GNU GENERAL PUBLIC LICENSE | ||||
| 		       Version 2, June 1991 | ||||
|  | ||||
|  Copyright (C) 1989, 1991 Free Software Foundation, Inc., | ||||
|  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
|  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 | ||||
| 			    Preamble | ||||
|  | ||||
|   The licenses for most software are designed to take away your | ||||
| freedom to share and change it.  By contrast, the GNU General Public | ||||
| @@ -15,7 +15,7 @@ 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 Lesser General Public License instead.)  You can apply it to | ||||
| 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 | ||||
| @@ -55,8 +55,8 @@ 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 | ||||
|  | ||||
| 		    GNU GENERAL PUBLIC LICENSE | ||||
|    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||||
|  | ||||
|   0. This License applies to any program or other work which contains | ||||
| @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: | ||||
|     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 | ||||
| @@ -168,7 +168,7 @@ 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 | ||||
| @@ -225,7 +225,7 @@ 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 | ||||
| @@ -255,7 +255,7 @@ 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 | ||||
| 			    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 | ||||
| @@ -277,9 +277,9 @@ 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 | ||||
| 		     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 | ||||
| @@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found. | ||||
|     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., | ||||
|     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||||
|     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 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. | ||||
| @@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names: | ||||
| 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 Lesser General | ||||
| library.  If this is what you want to do, use the GNU Library General | ||||
| Public License instead of this License. | ||||
|   | ||||
							
								
								
									
										298
									
								
								HACKING
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										298
									
								
								HACKING
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,298 @@ | ||||
| Intro... | ||||
|  | ||||
| Window managers have a few ways in which they are significantly different | ||||
| from other applications.  This file, combined with the code overview in | ||||
| doc/code-overview.txt, should hopefully provide a series of relatively | ||||
| quick pointers (hopefully only a few minutes each) to some of the places | ||||
| one can look to orient themselves and get started.  Some of this will be | ||||
| general to window managers on X, much will be specific to Metacity, and | ||||
| there's probably some information that's common to programs in general but | ||||
| is nonetheless useful. | ||||
|  | ||||
| Overview | ||||
|   Administrative issues | ||||
|   Minimal Building/Testing Environment | ||||
|   Relevant standards and X properties | ||||
|   Debugging and testing | ||||
|     Debugging logs | ||||
|     Adding information to the log | ||||
|     Valgrind | ||||
|     Testing Utilities | ||||
|   Technical gotchas to keep in mind | ||||
|   Other important reading | ||||
|     Extra reading | ||||
|     Ideas for tasks to work on | ||||
|  | ||||
|  | ||||
| Administrative issues | ||||
|   Don't commit substantive code in here without asking hp@redhat.com. | ||||
|   Adding translations, no-brainer typo fixes, etc. is fine. | ||||
|  | ||||
|   The code could use cleanup in a lot of places, feel free to do so. | ||||
|  | ||||
|   See http://developer.gnome.org/dotplan/for_maintainers.html for | ||||
|   information on how to make a release.  The only difference from those | ||||
|   instructions is that the minor version number of a Metacity release | ||||
|   should always be a number from the Fibonacci sequence. | ||||
|  | ||||
| Minimal Building/Testing Environment | ||||
|   You do not need to _install_ a development version of Metacity to | ||||
|   build, run and test it; you can run it from some temporary | ||||
|   directory.  Also, you do not need to build all of Gnome in order to | ||||
|   build a development version of Metacity -- odds are, you may be able | ||||
|   to build metacity from CVS without building any other modules. | ||||
|  | ||||
|   As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro | ||||
|   (gtk+ >= 2.6 if you manually revert the change from bug 348633), you | ||||
|   should be able to install your distro's development packages | ||||
|   (e.g. gtk2-devel, glib-devel, startup-notification-devel on | ||||
|   Fedora; also, remember to install the gnome-common package which is | ||||
|   needed for building cvs versions of Gnome modules like Metacity) as | ||||
|   well as the standard development tools (gcc, autoconf, automake, | ||||
|   pkg-config, intltool, and libtool) and be ready to build and test | ||||
|   Metacity.  Steps to do so: | ||||
|  | ||||
|   $ svn checkout http://svn.gnome.org/svn/metacity/trunk metacity | ||||
|   $ cd metacity | ||||
|   $ ./autogen.sh --prefix /usr | ||||
|   $ make | ||||
|   $ ./src/metacity --replace | ||||
|  | ||||
|   Again, note that you do not need to run 'make install'. | ||||
|  | ||||
| Relevant standards and X properties | ||||
|   There are two documents that describe some basics about how window | ||||
|   managers should behave: the ICCCM (Inter-Client Communication Conventions | ||||
|   Manual) and EWMH (Extended Window Manager Hints).  You can find these at | ||||
|   the following locations: | ||||
|     ICCCM - http://tronche.com/gui/x/icccm/ | ||||
|     EWMH  - :pserver:anoncvs@pdx.freedesktop.org:/cvs | ||||
|   The ICCCM is usually available in RPM or DEB format as well.  There is | ||||
|   actually an online version of the EWMH, but it is almost always woefully | ||||
|   out of date.  Just get it from cvs with these commands (the backslash | ||||
|   means include the stuff from the next line): | ||||
|     cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions login | ||||
|     cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions \ | ||||
|       checkout wm-spec | ||||
|  | ||||
|   DO NOT GO AND READ THOSE THINGS.  THEY ARE REALLY, REALLY BORING. | ||||
|  | ||||
|   If you do, you'll probably end up catching up on your sleep instead of | ||||
|   hacking on Metacity. ;-)  Instead, just look at the table of contents and | ||||
|   glance at a page or two to get an idea of what's in there.  Then only | ||||
|   refer to it if you see something weird in the code and you don't know | ||||
|   what it is but has some funny looking name like you see in one of those | ||||
|   two documents. | ||||
|  | ||||
|   You can refer to the COMPLIANCE file for additional information on these | ||||
|   specifications and Metacity's compliance therewith. | ||||
|  | ||||
|   One of the major things those documents cover that are useful to learn | ||||
|   about immediately are X properties.  The right way to learn about those, | ||||
|   though, is through hand on experimentation with the xprop command (and | ||||
|   then look up things you find from xprop in those two manuals if you're | ||||
|   curious enough).  First, try running | ||||
|     xprop | ||||
|   in a terminal and click on one of the windows on your screen.  That gives | ||||
|   you the x properties for that window.  Look through them and get a basic | ||||
|   idea of what's there for kicks.  Note that you can get rid of some of the | ||||
|   verboseness by grepping out the _NET_WM_ICON stuff, i.e. | ||||
|     xprop | grep -v _NET_WM_ICON | ||||
|   Next, try running | ||||
|     xprop -root | ||||
|   in a terminal.  There's all the properties of the root window (which you | ||||
|   can think of as the "main" Xserver window).  You can also manually | ||||
|   specify individual windows that you want the properties of with | ||||
|     xprop -id <id> | ||||
|   if you know the id of the window in question.  You can get the id of a | ||||
|   given window by either running xwininfo, e.g. | ||||
|     xwininfo | grep "Window id" | cut -f 4 -d ' ' | ||||
|   or by looking at the _NET_CLIENT_STACKING property of the root | ||||
|   window.  Finally, it can also be useful to add "-spy" (without the | ||||
|   quotes) to the xprop command to get it to continually monitor that | ||||
|   window and report any changes to you. | ||||
|  | ||||
| Debugging information | ||||
|   Trying to run a window manager under a typical debugger, such as gdb, | ||||
|   unfortunately just doesn't work very well.  So, we have to resort to | ||||
|   other methods. | ||||
|  | ||||
|   Debugging logs | ||||
|  | ||||
|   First, note that you can start a new version of metacity to replace the | ||||
|   existing one by running | ||||
|     metacity --replace | ||||
|   (which also comes in handy in the form "./src/metacity --replace" when | ||||
|   trying to quickly test a small change while hacking on metacity without | ||||
|   doing a full "make install", though I'm going off topic...)  This will | ||||
|   allow you to see any warnings printed at the terminal.  Sometimes it's | ||||
|   useful to have these directed to a logfile instead, which you can do by | ||||
|   running | ||||
|     METACITY_USE_LOGFILE=1 metacity --replace | ||||
|   The logfile it uses will be printed in the terminal.  Sometimes, it's | ||||
|   useful to get more information than just warnings.  You can set | ||||
|   METACITY_VERBOSE to do that, like so: | ||||
|     METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 metacity --replace | ||||
|   (note that METACITY_VERBOSE=1 can be problematic without | ||||
|   METACITY_USE_LOGFILE=1; avoid it unless running in from something that | ||||
|   won't be managed by the new Metacity--see bug 305091 for more details). | ||||
|   There are also other flags, such as METACITY_DEBUG, most of which I | ||||
|   haven't tried and don't know what they do.  Go to the source code | ||||
|   directory and run | ||||
|     grep "METACITY_" * | grep getenv | ||||
|   to find out what the other ones are. | ||||
|  | ||||
|   Adding information to the log | ||||
|  | ||||
|   Since we can't single step with a debugger, we often have to fall back to | ||||
|   the primitive method of getting information we want to know: adding | ||||
|   "print" statements.  Metacity has a fairly structured way to do this, | ||||
|   using the functions meta_warning, meta_topic, and meta_verbose.  All | ||||
|   three have the same basic format as printf, except that meta_topic also | ||||
|   takes a leading enumeration parameter to specify the type of message | ||||
|   being shown (makes it easier for grepping in a verbose log).  You'll find | ||||
|   tons of examples in the source code if you need them; just do a quick | ||||
|   grep or look in most any file.  Note that meta_topic and meta_verbose | ||||
|   messages only appear if verbosity is turned on.  I tend to frequently add | ||||
|   temporary meta_warning statements (or switch meta_topic or meta_verbose | ||||
|   ones to meta_warning ones) and then undo the changes once I've learned | ||||
|   the info that I needed. | ||||
|  | ||||
|   There is also a meta_print_backtrace (which again is only active if | ||||
|   verbosity is turned on) that can also be useful if you want to learn how | ||||
|   a particular line of code gets called.  And, of course, there's always | ||||
|   g_assert if you want to make sure some section isn't executed (or isn't | ||||
|   executed under certain conditions). | ||||
|  | ||||
|   Valgrind | ||||
|  | ||||
|   Valgrind is awesome for finding memory leaks or corruption and | ||||
|   uninitialized variables.  But I also tend to use it in a non-traditional | ||||
|   way as a partial substitute for a normal debugger: it can provide me with | ||||
|   a stack trace of where metacity is crashing if I made a change that | ||||
|   caused it to do so, which is one of the major uses of debuggers.  (And, | ||||
|   what makes it cooler than a debugger is that there will also often be | ||||
|   warnings pinpointing the cause of the crash from either some kind of | ||||
|   simple memory corruption or an uninitialized variable).  Sometimes, when | ||||
|   I merely want to know what is calling a particular function I'll just | ||||
|   throw in an "int i; printf("%d\n", i);" just because valgrind will give | ||||
|   me a full stacktrace whenever it sees that uninitialized variable being | ||||
|   used (yes, I could use meta_print_backtrace, but that means I have to | ||||
|   turn verbosity on). | ||||
|  | ||||
|   To run metacity under valgrind, use options typical for any Gnome | ||||
|   program, such as | ||||
|     valgrind --log-file=metacity.log --tool=memcheck --num-callers=48 \ | ||||
|     --leak-check=yes --leak-resolution=high --show-reachable=yes     \ | ||||
|     ./src/metacity --replace | ||||
|   where, again, the backslashes mean to join all the stuff on the following | ||||
|   line with the previous one. | ||||
|  | ||||
|   However, there is a downside.  Things run a little bit slowly, and it | ||||
|   appears that you'll need about 1.5GB of ram, which unfortunately prevents | ||||
|   most people from trying this. | ||||
|  | ||||
|   Testing Utilities | ||||
|  | ||||
|   src/run-metacity.sh | ||||
|     The script src/run-metacity.sh is useful to hack on the window manager.  | ||||
|     It runs metacity in an Xnest. e.g.: | ||||
|       CLIENTS=3 ./run-metacity.sh | ||||
|     or  | ||||
|       DEBUG=memprof ./run-metacity.sh | ||||
|     or | ||||
|       DEBUG_TEST=1 ./run-metacity-sh | ||||
|     or whatever. | ||||
|  | ||||
|   metacity-message | ||||
|     The tool metacity-message can be used as follows: | ||||
|       metacity-message reload-theme | ||||
|       metacity-message restart | ||||
|       metacity-message enable-keybindings | ||||
|       metacity-message disable-keybindings | ||||
|     The first of these is useful for testing themes, the second is just | ||||
|     another way (besides the --restart flag to metacity itself) of | ||||
|     restarting metacity, and the third is useful for testing Metacity when | ||||
|     running it under an Xnest (typically, the Metacity under the Xnest | ||||
|     wouldn't get keybinding notifications--making keyboard navigation not | ||||
|     work--but if you disable the keybindings for the global Metacity then | ||||
|     the Metacity under the Xnest can then get those keybinding notifications). | ||||
|  | ||||
|   metacity-window-demo | ||||
|     metacity-window-demo is good for trying behavior of various kinds | ||||
|     of window without launching a full desktop. | ||||
|  | ||||
| Technical gotchas to keep in mind | ||||
|   Files that include gdk.h or gtk.h are not supposed to include | ||||
|   display.h or window.h or other core files.  Files in the core | ||||
|   (display.[hc], window.[hc]) are not supposed to include gdk.h or | ||||
|   gtk.h.  Reasons: | ||||
|  | ||||
|     "Basically you don't want GDK most of the time. It adds | ||||
|     abstractions that cause problems, because they aren't designed to | ||||
|     be used in a WM where we do weird stuff (display grabs, and just | ||||
|     being the WM). At best GDK adds inefficiency, at worst it breaks | ||||
|     things in weird ways where you have to be a GDK guru to figure | ||||
|     them out. Owen also told me that they didn't want to start adding | ||||
|     a lot of hacks to GDK to let a WM use it; we both agreed back in | ||||
|     the mists of time that metacity would only use it for the "UI" | ||||
|     bits as it does. | ||||
|  | ||||
|     Having the split in the source code contains and makes very clear | ||||
|     the interface between the WM and GDK/GTK. This keeps people from | ||||
|     introducing extra GDK/GTK usage when it isn't needed or | ||||
|     appropriate. Also, it speeds up the compilation a bit, though this | ||||
|     was perhaps more relevant 5 years ago than it is now. | ||||
|  | ||||
|     There was also a very old worry that the GDK stuff might have to | ||||
|     be in a separate process to work right; that turned out to be | ||||
|     untrue. Though who knows what issues the CM will introduce." | ||||
|  | ||||
|   Remember that strings stored in X properties are not in UTF-8, and they | ||||
|   have to end up in UTF-8 before we try putting them through Pango. | ||||
|  | ||||
|   If you make any X request involving a client window, you have to | ||||
|   meta_error_trap_push() around the call; this is not necessary for X | ||||
|   requests on the frame windows. | ||||
|  | ||||
|   Remember that not all windows have frames, and window->frame can be NULL. | ||||
|  | ||||
| Other important reading & where to get started | ||||
|   Extra reading | ||||
|  | ||||
|   There are some other important things to read to get oriented as well. | ||||
|   These are: | ||||
|     http://pobox.com/~hp/features.html | ||||
|     rationales.txt | ||||
|     doc/code-overview.txt | ||||
|  | ||||
|   It pays to read http://pobox.com/~hp/features.html in order | ||||
|   to understand the philosophy of Metacity. | ||||
|  | ||||
|   The rationales.txt file has two things: (1) a list of design choices with | ||||
|   links in the form of bugzilla bugs that discuss the issue, and (2) a list | ||||
|   outstanding bug categories, each of which is tracked by a particular | ||||
|   tracker bug in bugzilla from which you can find several closely related | ||||
|   bug reports. | ||||
|  | ||||
|   doc/code-overview.txt provides a fairly good overview of the code, | ||||
|   including coverage of the function of the various files, the main | ||||
|   structures and their relationships, and places to start looking in the | ||||
|   code tailored to general categories of tasks. | ||||
|  | ||||
|   Ideas for tasks to work on | ||||
|  | ||||
|   There are a variety of things you could work on in the code.  You may | ||||
|   have ideas of your own, but in case you don't, let me provide a list of | ||||
|   ideas you could choose from: | ||||
|  | ||||
|   If you're ambitious, there's a list of things Havoc made that he'd really | ||||
|   like to see tackled, which you can find at | ||||
|   http://log.ometer.com/2004-05.html.  Be sure to double check with someone | ||||
|   to make sure the item is still relevant if you're interested in one of | ||||
|   these.  Another place to look for ideas, of course, is bugzilla.  One can | ||||
|   just do queries and look for things that look fixable. | ||||
|  | ||||
|   However, perhaps the best way of getting ideas of related tasks to work | ||||
|   on, is to look at the second half of the rationales.txt file, which tries | ||||
|   to group bugs by type. | ||||
							
								
								
									
										8
									
								
								MAINTAINERS
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								MAINTAINERS
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| Tomas Frydrych | ||||
| Email: tf linux intel com | ||||
| Userid: tomasf | ||||
|  | ||||
| Owen Taylor | ||||
| Email: otaylor redhat com | ||||
| Userid: otaylor | ||||
|  | ||||
							
								
								
									
										43
									
								
								METACITY_MAINTAINERS
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								METACITY_MAINTAINERS
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,43 @@ | ||||
| Currently active maintainers | ||||
| -------------------------------- | ||||
|  | ||||
| Elijah Newren | ||||
| Email: newren gmail com | ||||
| Userid: newren | ||||
|  | ||||
|   - Usually won't touch the theme bugs (isn't interested) or the | ||||
|     compositor (until open source nvidia drivers are up to snuff). | ||||
|     Tends to be most interested in libwnck/gtk interactions, focus | ||||
|     issues, constraints problems, and raising/stacking, but works on | ||||
|     just about anything other than themes and the compositor. | ||||
|  | ||||
| Thomas Thurman | ||||
| Email: thomas thurman org uk | ||||
| Userid: tthurman | ||||
|  | ||||
|   - Responsible for all theme bugs and the compositor (thank goodness | ||||
|     Thomas got involved, eh?).  I'm sure he'll replace this sentence | ||||
|     with his interests when he reads it.  ;-) | ||||
|  | ||||
|  | ||||
| Semi-active maintainers | ||||
| -------------------------------- | ||||
|  | ||||
| Havoc Pennington | ||||
| Email: hp  redhat com | ||||
| Userid: hp | ||||
|   - Original author.  Doesn't patch metacity anymore, but is active in | ||||
|     answering questions, responding to bugs, providing very helpful | ||||
|     suggestions and insight, and even assisting with debugging. | ||||
|  | ||||
|  | ||||
| Important historical figureheads | ||||
| -------------------------------- | ||||
|  | ||||
| Rob Adams (readams  readams net) | ||||
|   - Was the main maintainer of metacity for a while; particular areas | ||||
|     of focus included xinerama, placement, and an older version of the | ||||
|     constraints code.  Still responds to bugs every once in a while. | ||||
|  | ||||
| Søren Sandmann (sandmann  redhat com) | ||||
|   - Wrote most of the current compositing manager code + libcm | ||||
							
								
								
									
										11
									
								
								Makefile.am
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								Makefile.am
									
									
									
									
									
								
							| @@ -1,13 +1,8 @@ | ||||
|  | ||||
| SUBDIRS = data src po doc | ||||
| SUBDIRS=src po doc | ||||
|  | ||||
| ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||||
| EXTRA_DIST = HACKING MAINTAINERS rationales.txt | ||||
|  | ||||
| DISTCLEANFILES = \ | ||||
| 	intltool-extract \ | ||||
| 	intltool-merge \ | ||||
| 	intltool-update \ | ||||
| 	po/stamp-it \ | ||||
| 	po/.intltool-merge-cache | ||||
| DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache | ||||
|  | ||||
| DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc | ||||
|   | ||||
							
								
								
									
										380
									
								
								NEWS
									
									
									
									
									
								
							
							
						
						
									
										380
									
								
								NEWS
									
									
									
									
									
								
							| @@ -1,383 +1,3 @@ | ||||
| 3.13.91 | ||||
| ======= | ||||
| * Misc. bug fixes [Carlos; #735452] | ||||
|  | ||||
| Contributors: | ||||
|   Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre, | ||||
|   Rico Tzschichholz | ||||
|  | ||||
| Translations: | ||||
|   Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR], | ||||
|   Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he], | ||||
|   Maria  Mavridou [el], Claude Paroz [fr] | ||||
|  | ||||
| 3.13.90 | ||||
| ======= | ||||
| * Only call XSync() once per frame [Rui; #728464] | ||||
| * Update capabilities on device list changes [Carlos; #733563] | ||||
| * Make use of GLSL optional [Adel; #733623] | ||||
| * Handle gestures and touch events on wayland [Carlos; #733631] | ||||
| * Add support for unminimize compositor effects [Cosimo; #733789] | ||||
| * Always set the frame background to None [Giovanni; #734054] | ||||
| * Add backend methods to handle keymaps [Rui; #734301] | ||||
| * Actually mark revalidated MetaTextureTower levels as valid [Owen; #734400] | ||||
| * Rely on explicit -backward switcher keybindings instead of <shift>-magic | ||||
|   [Christophe; #732295, #732385] | ||||
| * Misc. bug fixes and cleanups [Rui, Adel, Christophe; #727178, #734852, | ||||
|   #734960] | ||||
|  | ||||
| Contributors: | ||||
|   Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Piotr Drąg, | ||||
|   Christophe Fergeau, Adel Gadllah, Carlos Garnacho, Rui Matos, | ||||
|   Florian Müllner, Jasper St. Pierre, Rico Tzschichholz, Olav Vitters, | ||||
|   Owen W. Taylor | ||||
|  | ||||
| Translations: | ||||
|   Kjartan Maraas [nb], Inaki Larranaga Murgoitio [eu], Lasse Liehu [fi], | ||||
|   ngoswami [as], Daniel Mustieles [es] | ||||
|  | ||||
| 3.13.4 | ||||
| ====== | ||||
| * Fix move/resize operations for wayland clients [Marek; #731237] | ||||
| * Add ::first-frame signal to MetaWindowActor [Owen; #732343] | ||||
| * Handle keysyms without the XF86 prefix [Owen; #727993] | ||||
| * Add touch gesture support [Carlos] | ||||
| * Fix a deadlock when exiting [Owen; #733068] | ||||
| * Add framework for restarting the compositor with nice visuals | ||||
|   [Owen; #733026] | ||||
| * Toggle seat capabilities on VT switch [Carlos; #733563] | ||||
| * Misc bug fixes [Florian, Owen; #732695, #732350] | ||||
|  | ||||
| Contributors: | ||||
|   Tom Beckmann, Giovanni Campagna, Marek Chalupa, Adel Gadllah, | ||||
|   Carlos Garnacho, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz, | ||||
|   Owen W. Taylor | ||||
|  | ||||
| Translations: | ||||
|   Yuri Myasoedov [ru], Fran Diéguez [gl], Aurimas Černius [lt], MarMav [el], | ||||
|   Enrico Nicoletto [pt_BR] | ||||
|  | ||||
| 3.13.3 | ||||
| ====== | ||||
| * Improve behavior of window buttons with compositor menus [Florian; #731058] | ||||
| * Implement touch support on wayland [Carlos; #724442] | ||||
| * Update window shadows [Nikita; #731866] | ||||
| * Keep windows on the preferred output [Florian; #731760] | ||||
| * Misc bug fixes [Jonas, Florian, Jasper; #729601, #730681, #731353, #731332, | ||||
|   #730527, #662962] | ||||
|  | ||||
| Contributors: | ||||
|   Jonas Ådahl, Nikita Churaev, Carlos Garnacho, Florian Müllner, | ||||
|   Jasper St. Pierre, Rico Tzschichholz | ||||
|  | ||||
| 3.13.2 | ||||
| ====== | ||||
| * Add basic HiDPI support on wayland [Adel; #728902] | ||||
| * Fix crash when monitors change during suspend [Giovanni; #725637] | ||||
| * Replace mutter-launch with logind integration [Jasper; #724604] | ||||
| * Move window menu into the compositor [Jasper; #726352] | ||||
| * Fix delayed focus-follows-mouse support [Florian; #730541] | ||||
| * Support fallback app menu in window decorations [Florian; #730752] | ||||
| * Misc. bug fixes and cleanups [Giovanni, Jonas, Jasper; #729732, #729602, | ||||
|   #726714] | ||||
|  | ||||
| Contributors: | ||||
|   Jonas Ådahl, Giovanni Campagna, Adel Gadllah, Florian Müllner, | ||||
|   Jasper St. Pierre, Rico Tzschichholz | ||||
|  | ||||
| Translations: | ||||
|   Pau Iranzo [ca], Daniel Mustieles [es] | ||||
|  | ||||
| 3.13.1 | ||||
| ====== | ||||
| * Fix opacity values from _NET_WM_WINDOW_OPACITY [Nirbheek; #727874] | ||||
| * Merge wayland branch [Jasper, Giovanni, Robert B., Neil, Adel, Rui, Jonas, | ||||
|   Lionel, Tim, Owen, Florian, Colin W., Cosimo, Ray, Kalev, Pavel, Robert A., | ||||
|   Magdalen, Marek, Matthias, Alban, Seán, Daniel, Stefano, Carlos, Colin G., | ||||
|   Andreas, Alexander, Ryan, Marc-André, Asad, Alberto, Bastien, Hans, | ||||
|   Debarshi, Sindhu, Andika, Rico, Olav] | ||||
| * Don't prevent workspace switches for present_with_time() [Florian; #728018] | ||||
| * Add shortcuts for switching to the last workspace [Elad; #659288] | ||||
| * Make move/resize menu items behave like the keybindings [Jasper; #728617] | ||||
| * Misc. bug fixes and cleanups  [Jasper, Bastien, Florian, Adel; #720631, | ||||
|   #727979, #728423, #728395, #729044] | ||||
|  | ||||
| Contributors: | ||||
|   Jonas Ådahl, Elad Alfassa, Robert Ancell, Magdalen Berns, Robert Bragg, | ||||
|   Giovanni Campagna, Cosimo Cecchi, Marek Chalupa, Nirbheek Chauhan, | ||||
|   Matthias Clasen, Alban Crequy, Seán de Búrca, Daniel Drake, Jason Ekstrand, | ||||
|   Stefano Facchini, Adel Gadllah, Carlos Garnacho, Colin Guthrie, | ||||
|   Andreas Heider, Lionel Landwerlin, Alexander Larsson, Kalev Lember, | ||||
|   Ryan Lortie, Tim Lunn, Marc-André Lureau, Rui Matos, Asad Mehmood, | ||||
|   Alberto Milone, Florian Müllner, Bastien Nocera, Hans Petter Jansson, | ||||
|   Debarshi Ray, Neil Roberts, Sindhu S, Jasper St. Pierre, Ray Strode, | ||||
|   Andika Triwidada, Rico Tzschichholz, Pavel Vasin, Olav Vitters, | ||||
|   Colin Walters, A. Walton, Owen W. Taylor | ||||
|  | ||||
| Translations: | ||||
|   Inaki Larranaga Murgoitio [eu], marablack3 [el], Daniel Mustieles [es], | ||||
|   Fran Diéguez [gl], Yosef Or Boczko [he], Dirgita [id] | ||||
|  | ||||
| 3.12.0 | ||||
| ====== | ||||
| * Fix grab issue with SSD xwayland windows [Rui; #726123] | ||||
| * Misc. bug fixes [Jasper, Ray, Rui, Florian; #727011] | ||||
|  | ||||
| Contributors: | ||||
|   Rui Matos, Florian Müllner, Jasper St. Pierre, Ray Strode | ||||
|  | ||||
| 3.11.92 | ||||
| ======= | ||||
| * Fix identification of CSD windows [Owen; #723029] | ||||
| * Update keyboard state unconditionally [Rui; #722847] | ||||
| * Misc bug fixes and cleanups [Owen, Rui, Giovanni, Matthias, Adel, Ryan, | ||||
|   Jasper, Marek, Florian; #723580, #726123, #726683] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Marek Chalupa, Matthias Clasen, Adel Gadllah, Ryan Lortie, | ||||
|   Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor | ||||
|  | ||||
| 3.11.91 | ||||
| ======= | ||||
| * Don't use keysym to match keybindings [Rui; #678001] | ||||
| * Fix message tray icons showing up blank (again) [Adel; #725180] | ||||
| * Improve keybinding lookups [Rui; #725588] | ||||
| * Fix dynamic updates of titlebar style properties [Owen; #725751] | ||||
| * Fix positioning of manually positioned windows [Owen; #724049] | ||||
| * Misc bug fixes and cleanups [Jasper, Carlos, Adel, Giovanni, Florian; #720631, | ||||
|   #724969, #725216, #724402, #722266, #725338, #725525] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner, | ||||
|   Jasper St. Pierre, Owen W. Taylor | ||||
|  | ||||
| 3.11.90 | ||||
| ======= | ||||
| * Fix double-scaling on high DPI resolutions [Adel; #723931] | ||||
| * Make tile previews a compositor effect [Stefano, Florian; #665758] | ||||
| * Misc. bug fixes and cleanups [Ryan, Giovanni, Jasper, Adel; #722530, #724257, | ||||
|   #724258, #720631, #724364, #724472] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Marek Chalupa, Stefano Facchini, Adel Gadllah, | ||||
|   Ryan Lortie, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz | ||||
|  | ||||
| 3.11.5 | ||||
| ====== | ||||
| * Fix CSD titlebars being placed off-screen [Jasper; #719772] | ||||
| * Add support for subsurfaces [Jonas; #705502] | ||||
| * Expose MetaWindow:skip-taskbar property [Florian; #723307] | ||||
| * Fix legacy tray icons showing up blank [Adel; #721596] | ||||
| * Fix configuration of cloned monitors [Adel; #710610] | ||||
| * Misc bug fixes and cleanups [Jasper, Adel, Marek, Jonas; #720631, #723468, | ||||
|   #720818, #723563, #723564] | ||||
|  | ||||
| Contributors: | ||||
|   Jonas Ådahl, Marek Ch, Adel Gadllah, Florian Müllner, Jasper St. Pierre | ||||
|  | ||||
| 3.11.4 | ||||
| ====== | ||||
| * Don't leave focus on windows that are being unmanaged [Owen; #711618] | ||||
| * Reduce server grabs [Daniel Drake; #721345, #721709] | ||||
| * Improve heuristic to determine display output name [Cosimo Cecchi; #721674] | ||||
| * Atomically unmaximize both directions [Jasper; #722108] | ||||
| * Misc bug fixes [Debarshi, Andika, Florian; #721517, #721674, #722347] | ||||
|  | ||||
| Contributors: | ||||
|   Cosimo Cecchi, Daniel Drake, Florian Müllner, Debarshi Ray, Jasper St. Pierre, | ||||
|   Andika Triwidada, Owen W. Taylor | ||||
|  | ||||
| 3.11.3 | ||||
| ====== | ||||
| * Fix focus issues with external OSKs[Jasper; #715030] | ||||
| * Add a MetaCullable interface [Jasper; #714706] | ||||
| * Fix window keybindings [Rui; #719724] | ||||
| * Fix settings keyboard/pointer focus for new clients [Rui; #719725] | ||||
| * Fix window group paint volume [Owen; #719669] | ||||
| * Fix frame extents problems [Owen; #714707] | ||||
| * Add shortcut to move windows between monitors [Florian; #671054] | ||||
| * Fix problems with focus tracking [Owen; #720558] | ||||
| * Misc. bug fixes and cleanups: [Rui, Colin, Lionel, Jasper, Owen; #712833, | ||||
|   #719557, #719695, #719833, #678989, #720417, #720630] | ||||
|  | ||||
| Contributors: | ||||
|   Lionel Landwerlin, Rui Matos, Alberto Milone, Florian Müllner, | ||||
|   Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor, Colin Walters | ||||
|  | ||||
| 3.11.2 | ||||
| ====== | ||||
| * Support setting a NULL opaque region [Andreas; #711518] | ||||
| * Sync keymap from X to wayland [Giovanni; #707446] | ||||
| * Implement support for subsurfaces [Jonas; #705502] | ||||
| * Don't focus the no-focus-window for globally active windows [Jasper; #710296] | ||||
| * Support "hotplug_mode_update" property [Marc-André; #711216] | ||||
| * Fix resize operations using mouse-button-modifier [Lionel; #710251] | ||||
| * Fix position of attached modals for CSD windows [Giovanni, Owen; #707194] | ||||
| * Misc. bug fixes [Rui, Jasper, Neil, Florian; #712247, #711731] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Andreas Heider, Lionel Landwerlin, Marc-André Lureau, | ||||
|   Rui Matos, Florian Müllner, Neil Roberts, Sindhu S, Jasper St. Pierre, | ||||
|   Rico Tzschichholz, Owen W. Taylor, Jonas Ådahl | ||||
|  | ||||
| 3.11.1 | ||||
| ====== | ||||
| * Fix tile previews getting stuck on right click during drags [Lionel; #704759] | ||||
| * Use new UPower API [Bastien] | ||||
| * Set hot spot when cursor set from wl_buffer [Jonas; #709593] | ||||
| * Expose min-backlight-step [Asad; #710380] | ||||
| * Misc. bug fixes and cleanups [Jasper, Olav, Magdalen; #709776] | ||||
|  | ||||
| Contributors: | ||||
|   Magdalen Berns, Lionel Landwerlin, Asad Mehmood, Bastien Nocera, | ||||
|   Jasper St. Pierre, Olav Vitters, Jonas Ådahl | ||||
|  | ||||
| 3.10.1 | ||||
| ====== | ||||
| * Don't apply fullscreen workarounds to CSD windows [Giovanni; #708718] | ||||
| * Fix hangs during DND operations [Adel; #709340] | ||||
| * Misc bug fixes [Dan, Giovanni, Jasper; #708813, #708420] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Adel Gadllah, Dan Horák, Hans Petter Jansson, | ||||
|   Jasper St. Pierre | ||||
|  | ||||
| 3.10.0.1 | ||||
| ======== | ||||
| * Fix bug when a window changed size twice in a single frame - this | ||||
|   can happen with GTK+ client-side decorations [Giovanni, Owen; #708367] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Owen Taylor | ||||
|  | ||||
| 3.10.0 | ||||
| ====== | ||||
| * Update dependencies [Giovanni; #708210] | ||||
|  | ||||
| 3.9.92 | ||||
| ====== | ||||
| * Constrain the pointer position onto visible monitors [Giovanni; #706655] | ||||
| * Fix keyboard state handling in face of event compression [Giovanni; #706963] | ||||
| * Extend the MetaCursorTracker API with query pointer and cursor visibility [Giovanni; #707474] | ||||
| * Be stricter in checking and exposing the wayland protocol version [#707851] | ||||
| * Don't require plugins to pass event to Clutter [Giovanni; #707482] | ||||
| * Move the --wayland option from the binary to the library [Giovanni; #707897] | ||||
| * Implement running from gnome-session (environment variable setting, process group | ||||
|   handling, Clutter backend variables) [Giovanni; #706421] | ||||
| * Add support for more cursor types [Giovanni; #707919] | ||||
| * Drop man pages for removed utilities [Kalev; #706579] | ||||
| * Implement monitor configuration on KMS [Giovanni; #706308] | ||||
| * Implement HW cursors [Giovanni; #707573] | ||||
| * Implement minimal support for resizing and maximizing wayland clients [Giovanni; #707401] | ||||
| * Implement transient hints for wayland clients [Giovanni; #707401] | ||||
| * Implement popup menu surfaces and grabs [Giovanni; #707863] | ||||
| * Immediately fire idle watches that are already expired [Giovanni; #707302] | ||||
| * Remove holes generated by disabling the laptop lid [Giovanni; #707473] | ||||
| * Misc bug fixes [Giovanni, Pavel, Adel; #707649, #706124, #707584, #707851, #707929, | ||||
|   #708070] | ||||
|  | ||||
| Contributors: | ||||
|   Adel Gadllah, Giovanni Campagna, Kalev Lember, Pavel Vasin | ||||
|  | ||||
| Translations: | ||||
|   Мирослав Николић po/sr, sr@latin.po, Мирослав Николић [sr, sr@latin], | ||||
|   Chao-Hsiung Liao [zh_HK, zh_TW], Yuri Myasoedov [ru], | ||||
|   Ville-Pekka Vainio [fi], Changwoo Ryu [ko], A S Alam [pa], | ||||
|   Mattias Põldaru [et], Rūdolfs Mazurs [lv], Ihar Hrachyshka [be], | ||||
|   Nilamdyuti Goswami [as], Andika Triwidada [id], Baurzhan Muftakhidinov [kk], | ||||
|   Benjamin Steinwender [de] | ||||
|  | ||||
| 3.9.91 | ||||
| ====== | ||||
| * Drop man pages for removed utilities [Kalev; #706579] | ||||
| * Add support for idle tracking [Giovanni, Cosimo; #706005, #707250] | ||||
| * Skip CRTC reconfigurations that have no effect [Giovanni; #706672] | ||||
| * Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399] | ||||
| * Don't save pixbuf data in user data [Tim; #706777] | ||||
| * Don't queue redraws for obscured regions [Adel; #703332] | ||||
| * Suppor the opaque region hints for wayland clients [Jasper; #707019] | ||||
| * Turn blending off when drawing entirely opaque regions [Jasper; #707019] | ||||
| * Check event timestamps before reconfiguring [Giovanni; #706735] | ||||
| * Merge the DBus API for display configuration in the wayland branch [Giovanni] | ||||
| * Install an X IO error handler for XWayland [Giovanni; #706962] | ||||
| * Use the clutter xkbcommon integration for the wayland keyboard [Giovanni; #705862] | ||||
| * Add a setuid helper for running on KMS+evdev [Giovanni, Colin; #705861] | ||||
| * Add keybindings for switching VT [Giovanni; #705861] | ||||
| * Implement plugin modality when running as a wayland compositor [Giovanni; #705917] | ||||
| * Add support for the application menu for wayland clients [Giovanni; #707128] | ||||
| * Several Coverity spotted fixes [Jasper] | ||||
| * Don't create a dummy texture for the texture template [Neil; #707458] | ||||
| * Use a more conservative paint volume for obscured windows [Adel] | ||||
| * Misc bug fixes [Giovanni, Colin, Seán, Jasper, Cosimo; #706582, #706598, | ||||
|   #706787, #706729, #706825, #707081, #707090, #707267, #706982, #706289] | ||||
|  | ||||
| Contributors: | ||||
|   Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Colin Guthrie, Kalev Lember, | ||||
|   Tim Lunn, Jasper St. Pierre, Neil Roberts, Rico Tzschichholz, Seán de Búrca | ||||
|  | ||||
| Translations: | ||||
|   Piotr Drąg [pl], Alexandre Franke [fr], Kjartan Maraas [nb], | ||||
|   Milo Casagrande [it], Balázs Úr [hu], Seán de Búrca [ga], Fran Diéguez [gl], | ||||
|   Daniel Mustieles [es], Aurimas Černius [lt], Gil Forcada [ca] | ||||
|  | ||||
| 3.9.90 | ||||
| ====== | ||||
| * First release from the wayland branch, includes basic support for running | ||||
|   as a wayland compositor [Robert, Neil, Giovanni] | ||||
| * Add support for _GTK_FRAME_EXTENTS [Jasper; #705766] | ||||
| * Fix quick consecutive <super> presses breaking keyboard input [Alban; #666101] | ||||
| * Work towards running as wayland compositor [Giovanni] | ||||
|  - Add DBus API for display configuration | ||||
|    [#705670, #706231, #706233, #706322, #706382] | ||||
|  - Add abstraction layer for cursor tracking [#705911] | ||||
|  - Add support for plugin modality under wayland [#705917] | ||||
| * Disable GTK+ scaling [Alexander; #706388] | ||||
| * Disable blending while updating tower [Robert] | ||||
| * Misc bug fixes and cleanups [Adel, Jasper, Giovanni, Colin, Rico, Florian; | ||||
|   #703332, #704437, #706207] | ||||
|  | ||||
| Contributors: | ||||
|   Robert Bragg, Giovanni Campagna, Alban Crequy, Adel Gadllah, | ||||
|   Alexander Larsson, Florian Müllner, Jasper St. Pierre, Neil Roberts, | ||||
|   Rico Tzschichholz, Colin Walters | ||||
|  | ||||
| Translations: | ||||
|   Jiro Matsuzawa [ja], Kjartan Maraas [nb], Matej Urbančič [sl], | ||||
|   Marek Černocký [cs], Daniel Mustieles [es], Rafael Ferreira [pt_BR], | ||||
|   Yaron Shahrabani [he], Ján Kyselica [sk] | ||||
|  | ||||
| 3.9.5 | ||||
| ===== | ||||
| * Don't select for touch events on the stage [Jasper; #697192] | ||||
| * Don't queue redraws for obscured regions [Adel; #703332] | ||||
| * Export timestamp of global keybinding events [Bastien; #704858] | ||||
| * Misc bug fixes and cleanups [Jasper, Rico; #703970] | ||||
|  | ||||
| Contributors: | ||||
|   Adel Gadllah, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz | ||||
|  | ||||
| 3.9.4 | ||||
| ===== | ||||
| * Tweak window shadows [Allan; #702141] | ||||
| * Ignore our own focus events for focus prediction [Jasper; #701017] | ||||
| * Add API to query if the stage is focused [Jasper; #700735] | ||||
| * Add API to query the monitor for a given position [Adel] | ||||
| * Don't force attached dialogs to be border-only [Florian; #702764] | ||||
| * Allow slicing of backgrounds to avoid texture size limits [Ray; #702283] | ||||
| * Miscellaneous bug fixes and cleanups [Adel; #701224, #702564] | ||||
|  | ||||
| Contributors: | ||||
|   Allan Day, Adel Gadllah, Florian Müllner, Jasper St. Pierre, Ray Strode | ||||
|  | ||||
| 3.9.3 | ||||
| ===== | ||||
| * Ensure events are always reported to the grab window [Rui; #701219] | ||||
| * Use new clutter_stage_set_paint_callback() function to prevent dropping | ||||
|   frames with frame synced toolkits [Owen; #698794] | ||||
|  | ||||
| Contributors: | ||||
|   Rui Matos, Owen W. Taylor | ||||
|  | ||||
| 3.9.2 | ||||
| ===== | ||||
| * Add meta_window_can_close() function [Jasper; #699269] | ||||
|   | ||||
							
								
								
									
										416
									
								
								README
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										416
									
								
								README
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,416 @@ | ||||
| The original codebase named "Metacity" is not a meta-City as in an | ||||
| urban center, but rather Meta-ness as in the state of being | ||||
| meta. i.e. metacity : meta as opacity : opaque. Also it may have | ||||
| something to do with the Meta key on UNIX keyboards. | ||||
|  | ||||
| Since then, it has been renamed mutter after a rebase on top of | ||||
| clutter as a compositing manager. | ||||
|  | ||||
| COMPILING MUTTER | ||||
| === | ||||
|  | ||||
| You need GTK+ 2.2.  For startup notification to work you need | ||||
| libstartup-notification at | ||||
| http://www.freedesktop.org/software/startup-notification/ or on the | ||||
| GNOME ftp site. | ||||
| You need Clutter 1.0. You need gobject-introspection 0.6.3. | ||||
|  | ||||
| REPORTING BUGS AND SUBMITTING PATCHES | ||||
| === | ||||
|  | ||||
| Report new bugs on http://bugzilla.gnome.org. Please check for | ||||
| duplicates, *especially* if you are reporting a feature request.  | ||||
|  | ||||
| Please do *not* add "me too!" or "yes I really want this!" comments to | ||||
| feature requests in bugzilla. Please read | ||||
| http://pobox.com/~hp/features.html prior to adding any kind of flame | ||||
| about missing features or misfeatures. | ||||
|  | ||||
| Feel free to send patches too; Metacity is relatively small and | ||||
| simple, so if you find a bug or want to add a feature it should be | ||||
| pretty easy.  Send me mail, or put the patch in bugzilla. | ||||
|  | ||||
| See the HACKING file for some notes on hacking Mutter. | ||||
|  | ||||
| MUTTER FEATURES | ||||
| === | ||||
|  | ||||
|  - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts,  | ||||
|    etc. come from GTK+ theme. | ||||
|  | ||||
|  - Does not expose the concept of "window manager" to the user.  Some | ||||
|    of the features in the GNOME control panel and other parts of the | ||||
|    desktop happen to be implemented in metacity, such as changing your | ||||
|    window border theme, or changing your window navigation shortcuts, | ||||
|    but the user doesn't need to know this. | ||||
|  | ||||
|  - Includes only the window manager; does not try to be a desktop | ||||
|    environment. The pager, configuration, etc. are all separate and | ||||
|    modular. The "libwnck" library (which I also wrote) is available | ||||
|    for writing metacity extensions, pagers, and so on. (But libwnck | ||||
|    isn't metacity specific, or GNOME-dependent; it requires only GTK, | ||||
|    and should work with KWin, fvwm2, and other EWMH-compliant WMs.) | ||||
|  | ||||
|  - Has a simple theme system and a couple of extra themes come with it. | ||||
|    Change themes via gsettings: | ||||
|      gsettings set org.gnome.desktop.wm.preferences theme Crux | ||||
|      gsettings set org.gnome.desktop.wm.preferences theme Gorilla | ||||
|      gsettings set org.gnome.desktop.wm.preferences theme Atlanta | ||||
|      gsettings set org.gnome.desktop.wm.preferences theme Bright | ||||
|  | ||||
|    See theme-format.txt for docs on the theme format. Use  | ||||
|    metacity-theme-viewer to preview themes. | ||||
|  | ||||
|  - Change number of workspaces via gsettings: | ||||
|      gsettings set org.gnome.desktop.wm.preferences num-workspaces 5 | ||||
|  | ||||
|    Can also change workspaces from GNOME 2 pager. | ||||
|  | ||||
|  - Change focus mode: | ||||
|      gsettings set org.gnome.desktop.wm.preferences focus-mode mouse | ||||
|      gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy | ||||
|      gsettings set org.gnome.desktop.wm.preferences focus-mode click | ||||
|  | ||||
|  - Global keybinding defaults include:    | ||||
|  | ||||
|     Alt-Tab                forward cycle window focus | ||||
|     Alt-Shift-Tab          backward cycle focus | ||||
|     Alt-Ctrl-Tab           forward cycle focus among panels | ||||
|     Alt-Ctrl-Shift-Tab     backward cycle focus among panels | ||||
|     Alt-Escape             cycle window focus without a popup thingy | ||||
|     Ctrl-Alt-Left Arrow    previous workspace | ||||
|     Ctrl-Alt-Right Arrow   next workspace | ||||
|     Ctrl-Alt-D             minimize/unminimize all, to show desktop | ||||
|  | ||||
|    Change keybindings for example: | ||||
|  | ||||
|      gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 '[<Alt>F1]' | ||||
|     | ||||
|    Also try the GNOME keyboard shortcuts control panel. | ||||
|  | ||||
|  - Window keybindings: | ||||
|  | ||||
|     Alt-space         window menu | ||||
|  | ||||
|     Mnemonics work in the menu. That is, Alt-space then underlined | ||||
|     letter in the menu item works. | ||||
|  | ||||
|     Choose Move from menu, and arrow keys to move the window. | ||||
|  | ||||
|     While moving, hold down Control to move slower, and  | ||||
|       Shift to snap to edges. | ||||
|  | ||||
|     Choose Resize from menu, and nothing happens yet, but  | ||||
|       eventually I might implement something. | ||||
|  | ||||
|     Keybindings for things like maximize window, vertical maximize, | ||||
|     etc. can be bound, but may not all exist by default. See | ||||
|     metacity.schemas. | ||||
|  | ||||
|  - Window mouse bindings: | ||||
|  | ||||
|     Clicking anywhere on frame with button 1 will raise/focus window | ||||
|      | ||||
|     If you click a window control, such as the close button, then the  | ||||
|      control will activate on button release if you are still over it | ||||
|      on release (as with most GUI toolkits) | ||||
|  | ||||
|     If you click and drag borders with button 1 it resizes the window | ||||
|      | ||||
|     If you click and drag the titlebar with button 1 it moves the  | ||||
|      window. | ||||
|  | ||||
|     If you click anywhere on the frame with button 2 it lowers the  | ||||
|      window. | ||||
|  | ||||
|     If you click anywhere on the frame with button 3 it shows the  | ||||
|      window menu. | ||||
|  | ||||
|     If you hold down Super (windows key) and click inside a window, it | ||||
|      will move the window (buttons 1 and 2) or show menu (button 3). | ||||
|      Or you can configure a different modifier for this. | ||||
|  | ||||
|     If you pick up a window with button 1 and then switch workspaces | ||||
|      the window will come with you to the new workspace, this is  | ||||
|      a feature copied from Enlightenment. | ||||
|  | ||||
|     If you hold down Shift while moving a window, the window snaps | ||||
|      to edges of other windows and the screen. | ||||
|  | ||||
|  - Session management: | ||||
|  | ||||
|     Mutter connects to the session manager and will set itself up to | ||||
|      be respawned. It theoretically restores sizes/positions/workspace | ||||
|      for session-aware applications. | ||||
|  | ||||
|  - Mutter implements much of the EWMH window manager specification | ||||
|    from freedesktop.org, as well as the older ICCCM.  Please refer to | ||||
|    the COMPLIANCE file for information on mutter compliance with | ||||
|    these standards. | ||||
|  | ||||
|  - Uses Pango to render text, so has cool i18n capabilities.  | ||||
|    Supports UTF-8 window titles and such. | ||||
|  | ||||
|  - There are simple animations for actions such as minimization,  | ||||
|    to help users see what is happening. Should probably  | ||||
|    have a few more of these and make them nicer. | ||||
|  | ||||
|  - if you have the proper X setup, set the GDK_USE_XFT=1  | ||||
|    environment variable to get antialiased window titles. | ||||
|  | ||||
|  - considers the panel when placing windows and maximizing | ||||
|    them. | ||||
|  | ||||
|  - handles the window manager selection from the ICCCM. Will exit if | ||||
|    another WM claims it, and can claim it from another WM if you pass | ||||
|    the --replace argument. So if you're running another | ||||
|    ICCCM-compliant WM, you can run "mutter --replace" to replace it | ||||
|    with Metacity. | ||||
|  | ||||
|  - does basic colormap handling | ||||
|  | ||||
|  - and much more! well, maybe not a lot more. | ||||
|  | ||||
| HOW TO ADD EXTERNAL FEATURES | ||||
| === | ||||
|  | ||||
| You can write a mutter "plugin" such as a pager, window list, icon | ||||
| box, task menu, or even things like "window matching" using the | ||||
| Extended Window Manager Hints. See http://www.freedesktop.org for the | ||||
| EWMH specification. An easy-to-use library called "libwnck" is | ||||
| available that uses the EWMH and is specifically designed for writing | ||||
| WM accessories. | ||||
|  | ||||
| You might be interested in existing accessories such as "Devil's Pie" | ||||
| by Ross Burton, which add features to Mutter (or other | ||||
| EWMH-compliant WMs). | ||||
|  | ||||
| MUTTER BUGS, NON-FEATURES, AND CAVEATS | ||||
| === | ||||
|  | ||||
| See bugzilla: http://bugzilla.gnome.org/query.cgi | ||||
|  | ||||
| FAQ | ||||
| === | ||||
|  | ||||
| Q: Will you add my feature? | ||||
|  | ||||
| A: If it makes sense to turn on unconditionally, or is genuinely a | ||||
|    harmless preference that I would not be embarrassed to put in a | ||||
|    simple, uncluttered, user-friendly configuration dialog. | ||||
|  | ||||
|    If the only rationale for your feature is that other window | ||||
|    managers have it, or that you are personally used to it, or | ||||
|    something like that, then I will not be impressed. Metacity is | ||||
|    firmly in the "choose good defaults" camp rather than the "offer 6 | ||||
|    equally broken ways to do it, and let the user pick one" camp. | ||||
|  | ||||
|    This is part of a "no crackrock" policy, despite some exceptions | ||||
|    I'm mildly embarrassed about. For example, multiple workspaces | ||||
|    probably constitute crackrock, they confuse most users and really | ||||
|    are not that useful if you have a decent tasklist and so on. But I | ||||
|    am too used to them to turn them off.  Or alternatively | ||||
|    iconification/tasklist is crack, and workspaces/pager are good. But | ||||
|    having both is certainly a bit wrong.  Sloppy focus is probably | ||||
|    crackrock too. | ||||
|  | ||||
|    But don't think unlimited crack is OK just because I slipped up a | ||||
|    little. No slippery slope here. | ||||
|  | ||||
|    Don't let this discourage patches and fixes - I love those. ;-) | ||||
|    Just be prepared to hear the above objections if your patch adds | ||||
|    some crack-ridden configuration option. | ||||
|  | ||||
|    http://pobox.com/~hp/free-software-ui.html | ||||
|    http://pobox.com/~hp/features.html    | ||||
|  | ||||
| Q: Will Mutter be part of GNOME? | ||||
|  | ||||
| A: It is not officially part of GNOME as of GNOME 2.27. We are | ||||
|    hoping to have mutter officially included as of GNOME 2.28.  | ||||
|  | ||||
| Q: Why does Mutter remember the workspace/position of some apps  | ||||
|    but not others across logout/login? | ||||
|  | ||||
| A: Mutter only stores sizes/positions for apps that are session | ||||
|    managed. As far as I can determine, there is no way to attempt to | ||||
|    remember workspace/position for non-session-aware apps without | ||||
|    causing a lot of weird effects. | ||||
|  | ||||
|    The reason is that you don't know which non-SM-aware apps were | ||||
|    launched by the session. When you initially log in, Metacity sees a | ||||
|    bunch of new windows appear. But it can't distinguish between | ||||
|    windows that were stored in your session, or windows you just | ||||
|    launched after logging in. If Metacity tried to guess that a window | ||||
|    was from the session, it could e.g. end up maximizing a dialog, or | ||||
|    put a window you just launched on another desktop or in a weird | ||||
|    place. And in fact I see a lot of bugs like this in window managers | ||||
|    that try to handle non-session-aware apps. | ||||
|  | ||||
|    However, for session-aware apps, Mutter can tell that the | ||||
|    application instance is from the session and thus restore it | ||||
|    reliably, assuming the app properly restores the windows it had  | ||||
|    open on session save. | ||||
|     | ||||
|    So the correct way to fix the situation is to make apps | ||||
|    session-aware. libSM has come with X for years, it's very | ||||
|    standardized, it's shared by GNOME and KDE - even twm is | ||||
|    session-aware. So anyone who won't take a patch to add SM is more | ||||
|    archaic than twm - and you should flame them. ;-) | ||||
|  | ||||
|    Docs on session management: | ||||
|     http://www.fifi.org/doc/xspecs/xsmp.txt.gz | ||||
|     http://www.fifi.org/doc/xspecs/SMlib.txt.gz | ||||
|  | ||||
|    See also the ICCCM section on SM. For GNOME apps, use the | ||||
|    GnomeClient object. For a simple example of using libSM directly, | ||||
|    twm/session.c in the twm source code is pretty easy to understand. | ||||
|  | ||||
| Q: How about adding viewports in addition to workspaces? | ||||
|  | ||||
| A: I could conceivably be convinced to use viewports _instead_ of | ||||
|    workspaces, though currently I'm not thinking that. But I don't | ||||
|    think it makes any sense to have both; it's just confusing. They | ||||
|    are functionally equivalent. | ||||
|  | ||||
|    You may think this means that you won't have certain keybindings,  | ||||
|    or something like that. This is a misconception. The only  | ||||
|    _fundamental_ difference between viewports and workspaces is that  | ||||
|    with viewports, windows can "overlap" and appear partially on  | ||||
|    one and partially on another. All other differences that | ||||
|    traditionally exist in other window managers are accidental -  | ||||
|    the features commonly associated with viewports can be implemented | ||||
|    for workspaces, and vice versa. | ||||
|  | ||||
|    So I don't want to have two kinds of | ||||
|    workspace/desktop/viewport/whatever, but I'm willing to add | ||||
|    features traditionally associated with either kind if those | ||||
|    features make sense. | ||||
|  | ||||
| Q: Why is the panel always on top? | ||||
|  | ||||
| A: Because it's a better user interface, and until we made this not | ||||
|    configurable a bunch of apps were not getting fixed (the app | ||||
|    authors were just saying "put your panel on the bottom" instead of | ||||
|    properly supporting fullscreen mode, and such). | ||||
|  | ||||
|    rationales.txt has the bugzilla URL for some flamefesting on this, | ||||
|    if you want to go back and relive the glory. | ||||
|    Read these and the bugzilla stuff before asking/commenting: | ||||
|      http://pobox.com/~hp/free-software-ui.html | ||||
|      http://pobox.com/~hp/features.html    | ||||
|  | ||||
| Q: Why is there no edge flipping? | ||||
|  | ||||
| A: This one is also in rationales.txt. Because "ouija board" UI, where | ||||
|    you just move the mouse around and the computer guesses what you | ||||
|    mean, has a lot of issues. This includes mouse focus, shade-hover | ||||
|    mode, edge flipping, autoraise, etc. Metacity has mouse focus and | ||||
|    autoraise as a compromise, but these features are all confusing for | ||||
|    many users, and cause problems with accessibility, fitt's law, and | ||||
|    so on. | ||||
|  | ||||
|    Read these and the bugzilla stuff before asking/commenting: | ||||
|      http://pobox.com/~hp/free-software-ui.html | ||||
|      http://pobox.com/~hp/features.html    | ||||
|  | ||||
| Q: Why does wireframe move/resize suck? | ||||
|  | ||||
| A: You can turn it on with the reduced_resources setting. | ||||
|  | ||||
|    But: it has low usability, and is a pain | ||||
|    to implement, and there's no reason opaque move/resize should be a | ||||
|    problem on any setup that can run a modern desktop worth a darn to | ||||
|    begin with. | ||||
|  | ||||
|    Read these and the bugzilla stuff before asking/commenting: | ||||
|      http://pobox.com/~hp/free-software-ui.html | ||||
|      http://pobox.com/~hp/features.html    | ||||
|  | ||||
|    The reason we had to add wireframe anyway was broken  | ||||
|    proprietary apps that can't handle lots of resize events. | ||||
|  | ||||
| Q: Why no XYZ? | ||||
|  | ||||
| A: You are probably getting the idea by now - check rationales.txt, | ||||
|    query/search bugzilla, and read http://pobox.com/~hp/features.html | ||||
|    and http://pobox.com/~hp/free-software-ui.html | ||||
|  | ||||
|    Then sit down and answer the question for yourself.  Is the feature | ||||
|    good? What's the rationale for it? Answer "why" not just "why not." | ||||
|    Justify in terms of users as a whole, not just users like | ||||
|    yourself. How else can you solve the same problem? etc. If that | ||||
|    leads you to a strong opinion, then please, post the rationale for | ||||
|    discussion to an appropriate bugzilla bug, or to | ||||
|    usability@gnome.org. | ||||
|  | ||||
|    Please don't just "me too!" on bugzilla bugs, please don't think | ||||
|    flames will get you anywhere, and please don't repeat rationale | ||||
|    that's already been offered. | ||||
|  | ||||
| Q: Your dumb web pages you made me read talk about solving problems in | ||||
|    fundamental ways instead of adding preferences or workarounds. | ||||
|    What are some examples where metacity has done this? | ||||
|  | ||||
| A: There are quite a few, though many opportunities remain.  Sometimes | ||||
|    the real fix involves application changes. The metacity approach is | ||||
|    that it's OK to require apps to change, though there are also | ||||
|    plenty of workarounds in metacity for battles considered too hard | ||||
|    to fight. | ||||
|  | ||||
|    Here are some examples: | ||||
|  | ||||
|    - fullscreen mode was introduced to allow position constraints, | ||||
|      panel-on-top, and other such things to apply to normal windows | ||||
|      while still allowing video players etc. to "just work" | ||||
|  | ||||
|    - "whether to include minimized windows in Alt+Tab" was solved  | ||||
|      by putting minimized windows at the *end* of the tab order.  | ||||
|  | ||||
|    - Whether to pop up a feedback display during Alt+Tab was solved by | ||||
|      having both Alt+Tab and Alt+Esc | ||||
|  | ||||
|    - Whether to have a "kill" feature was solved by automatically | ||||
|      detecting and offering to kill stuck apps. Better, metacity | ||||
|      actually does "kill -9" on the process, it doesn't just | ||||
|      disconnect the process from the X server. You'll appreciate this | ||||
|      if you ever did a "kill" on Netscape 4, and watched it keep | ||||
|      eating 100% CPU even though the X server had booted it. | ||||
|  | ||||
|    - The workspaces vs. viewports mess was avoided by adding | ||||
|      directional navigation and such to workspaces, see discussion | ||||
|      earlier in this file. | ||||
|  | ||||
|    - Instead of configurable placement algorithms, there's just one  | ||||
|      that works fairly well most of the time. | ||||
|  | ||||
|    - To avoid excess CPU use during opaque move/resize, we rate limit | ||||
|      the updates to the application window's size. | ||||
|  | ||||
|    - Instead of configurable "show size of window while resizing," | ||||
|      it's only shown for windows where it matters, such as terminals. | ||||
|      (Only use-case given for all windows is for web designers | ||||
|      choosing their web browser size, but there are web sites and | ||||
|      desktop backgrounds that do this for you.) | ||||
|  | ||||
|    - Using startup notification, applications open on the workspace | ||||
|      where you launched them, not the active workspace when their | ||||
|      window is opened. | ||||
|  | ||||
|    - and much more. | ||||
|  | ||||
| Q: I think mutter sucks. | ||||
|  | ||||
| A: Feel free to use any WM you like. The reason metacity follows the | ||||
|    ICCCM and EWMH specifications is that it makes metacity a modular, | ||||
|    interchangeable part in the desktop. libwnck-based apps such as the | ||||
|    GNOME window list will work just fine with any EWMH-compliant WM. | ||||
|  | ||||
| Q: Did you spend a lot of time on this? | ||||
|  | ||||
| A: Originally the answer was no. Sadly the answer is now yes. | ||||
|  | ||||
| Q: How can you claim that you are anti-crack, while still  | ||||
|    writing a window manager? | ||||
|  | ||||
| A: I have no comment on that. | ||||
| @@ -1,11 +1,11 @@ | ||||
| #!/bin/sh | ||||
| #!/bin/bash | ||||
| # Run this to generate all the initial makefiles, etc. | ||||
|  | ||||
| srcdir=`dirname $0` | ||||
| test -z "$srcdir" && srcdir=. | ||||
|  | ||||
| PKG_NAME="mutter" | ||||
| REQUIRED_AUTOMAKE_VERSION=1.11 | ||||
| REQUIRED_AUTOMAKE_VERSION=1.10 | ||||
|  | ||||
| (test -f $srcdir/configure.ac \ | ||||
|   && test -d $srcdir/src) || { | ||||
|   | ||||
							
								
								
									
										180
									
								
								configure.ac
									
									
									
									
									
								
							
							
						
						
									
										180
									
								
								configure.ac
									
									
									
									
									
								
							| @@ -1,8 +1,8 @@ | ||||
| AC_PREREQ(2.62) | ||||
| AC_PREREQ(2.50) | ||||
|  | ||||
| m4_define([mutter_major_version], [3]) | ||||
| m4_define([mutter_minor_version], [13]) | ||||
| m4_define([mutter_micro_version], [91]) | ||||
| m4_define([mutter_minor_version], [9]) | ||||
| m4_define([mutter_micro_version], [2]) | ||||
|  | ||||
| m4_define([mutter_version], | ||||
|           [mutter_major_version.mutter_minor_version.mutter_micro_version]) | ||||
| @@ -12,12 +12,10 @@ m4_define([mutter_plugin_api_version], [3]) | ||||
| AC_INIT([mutter], [mutter_version], | ||||
|         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter]) | ||||
|  | ||||
| AC_CONFIG_MACRO_DIR([m4]) | ||||
| AC_CONFIG_AUX_DIR([build-aux]) | ||||
| AC_CONFIG_SRCDIR(src/core/display.c) | ||||
| AC_CONFIG_HEADERS(config.h) | ||||
|  | ||||
| AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects]) | ||||
| AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) | ||||
| m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) | ||||
| AM_MAINTAINER_MODE([enable]) | ||||
|  | ||||
| @@ -40,14 +38,12 @@ GETTEXT_PACKAGE=mutter | ||||
| AC_SUBST(GETTEXT_PACKAGE) | ||||
| AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain]) | ||||
|  | ||||
| LT_PREREQ([2.2.6]) | ||||
| LT_INIT([disable-static]) | ||||
| IT_PROG_INTLTOOL([0.41]) | ||||
| IT_PROG_INTLTOOL([0.34.90]) | ||||
| AC_PROG_CC | ||||
| AC_PROG_CC_C_O | ||||
| AC_PROG_INSTALL | ||||
| AC_ISC_POSIX | ||||
| AC_HEADER_STDC | ||||
| PKG_PROG_PKG_CONFIG([0.21]) | ||||
| AC_LIBTOOL_WIN32_DLL | ||||
| AM_PROG_LIBTOOL | ||||
|  | ||||
| # Sets GLIB_GENMARSHAL and GLIB_MKENUMS | ||||
| AM_PATH_GLIB_2_0() | ||||
| @@ -71,29 +67,14 @@ CANBERRA_GTK_VERSION=0.26 | ||||
| CLUTTER_PACKAGE=clutter-1.0 | ||||
|  | ||||
| MUTTER_PC_MODULES=" | ||||
|    gtk+-3.0 >= 3.9.11 | ||||
|    gio-unix-2.0 >= 2.25.10 | ||||
|    gtk+-3.0 >= 3.3.7 | ||||
|    gio-2.0 >= 2.25.10 | ||||
|    pango >= 1.2.0 | ||||
|    cairo >= 1.10.0 | ||||
|    gsettings-desktop-schemas >= 3.7.3 | ||||
|    $CLUTTER_PACKAGE >= 1.19.5 | ||||
|    clutter-egl-1.0 | ||||
|    cogl-1.0 >= 1.17.1 | ||||
|    gbm | ||||
|    upower-glib >= 0.99.0 | ||||
|    gnome-desktop-3.0 | ||||
|    xcomposite >= 0.2 | ||||
|    xcursor | ||||
|    xdamage | ||||
|    xext | ||||
|    xfixes | ||||
|    xi >= 1.6.0 | ||||
|    xkbfile | ||||
|    xkeyboard-config | ||||
|    xkbcommon >= 0.4.3 | ||||
|    xkbcommon-x11 | ||||
|    x11-xcb | ||||
|    xcb-randr | ||||
|    xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 | ||||
|    $CLUTTER_PACKAGE >= 1.13.5 | ||||
|    cogl-1.0 >= 1.13.3 | ||||
| " | ||||
|  | ||||
| GLIB_GSETTINGS | ||||
| @@ -122,12 +103,24 @@ AC_ARG_WITH(libcanberra, | ||||
|                  [disable the use of libcanberra for playing sounds]),, | ||||
|   with_libcanberra=auto) | ||||
|  | ||||
| AC_ARG_WITH([xwayland-path], | ||||
|             [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])], | ||||
|             [XWAYLAND_PATH="$withval"], | ||||
|             [XWAYLAND_PATH="$bindir/Xwayland"]) | ||||
| AC_ARG_ENABLE(xsync, | ||||
|   AC_HELP_STRING([--disable-xsync], | ||||
|                  [disable mutter's use of the XSync extension]),, | ||||
|   enable_xsync=auto) | ||||
|  | ||||
| AC_ARG_ENABLE(shape, | ||||
|   AC_HELP_STRING([--disable-shape], | ||||
|                  [disable mutter's use of the shaped window extension]),, | ||||
|   enable_shape=auto) | ||||
|  | ||||
| AM_GLIB_GNU_GETTEXT | ||||
|  | ||||
| ## here we get the flags we'll actually use | ||||
| # GRegex requires Glib-2.14.0 | ||||
| PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0) | ||||
| # gtk_window_set_icon_name requires gtk2+-2.6.0 | ||||
| PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0) | ||||
| PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0) | ||||
|  | ||||
| # Unconditionally use this dir to avoid a circular dep with gnomecc | ||||
| GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings" | ||||
| @@ -192,27 +185,22 @@ if test x$found_introspection != xno; then | ||||
|   AC_SUBST(META_GIR) | ||||
| fi | ||||
|  | ||||
| AC_SUBST(XWAYLAND_PATH) | ||||
| AC_MSG_CHECKING([Xcursor]) | ||||
| if $PKG_CONFIG xcursor; then | ||||
|      have_xcursor=yes | ||||
|   else | ||||
|      have_xcursor=no | ||||
|   fi | ||||
|   AC_MSG_RESULT($have_xcursor) | ||||
|  | ||||
| if test x$have_xcursor = xyes; then | ||||
|   echo "Building with Xcursor" | ||||
|   MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor" | ||||
|   AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) | ||||
| fi | ||||
|  | ||||
| PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES) | ||||
|  | ||||
| PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [libdrm libsystemd libinput], [have_native_backend=yes], [have_native_backend=no]) | ||||
| if test $have_native_backend = yes; then | ||||
|    AC_DEFINE([HAVE_NATIVE_BACKEND],[1],[Define if you want to enable the native (KMS) backend based on systemd]) | ||||
| fi | ||||
| AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes]) | ||||
|  | ||||
| PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes], [have_wayland=no]) | ||||
| if test $have_wayland = yes; then | ||||
|    AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no]) | ||||
|    AS_IF([test $WAYLAND_SCANNER = "no"], | ||||
|      AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])) | ||||
|    AC_SUBST([WAYLAND_SCANNER]) | ||||
|  | ||||
|    AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support]) | ||||
| fi | ||||
| AM_CONDITIONAL([HAVE_WAYLAND],[test $have_wayland = yes]) | ||||
|  | ||||
| PKG_CHECK_EXISTS([xi >= 1.6.99.1], | ||||
|                  AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater])) | ||||
|  | ||||
| @@ -249,8 +237,38 @@ if test x$have_xinerama = xno; then | ||||
|    AC_MSG_ERROR([Xinerama extension was not found]) | ||||
| fi | ||||
|  | ||||
| AC_DEFINE_UNQUOTED([XKB_BASE], ["`$PKG_CONFIG --variable xkb_base xkeyboard-config`"], | ||||
|                                [XKB base dir]) | ||||
| SHAPE_LIBS= | ||||
| found_shape=no | ||||
| AC_CHECK_LIB(Xext, XShapeQueryExtension, | ||||
|                [AC_CHECK_HEADER(X11/extensions/shape.h, | ||||
|                                 SHAPE_LIBS=-lXext found_shape=yes)], | ||||
|                , $ALL_X_LIBS) | ||||
|  | ||||
| if test x$enable_shape = xno; then | ||||
|    found_shape=no | ||||
| fi | ||||
|  | ||||
| if test x$enable_shape = xyes; then | ||||
|    if test "$found_shape" = "no"; then | ||||
|       AC_MSG_ERROR([--enable-shape forced and Shape not found]) | ||||
|       exit 1 | ||||
|    fi | ||||
| fi | ||||
|  | ||||
| if test "x$found_shape" = "xyes"; then | ||||
|    AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library]) | ||||
| fi | ||||
|  | ||||
| found_xkb=no | ||||
| AC_CHECK_LIB(X11, XkbQueryExtension, | ||||
|                [AC_CHECK_HEADER(X11/XKBlib.h, | ||||
|                                 found_xkb=yes)], | ||||
| 	, $ALL_X_LIBS) | ||||
|  | ||||
| if test "x$found_xkb" = "xyes"; then | ||||
|    AC_DEFINE(HAVE_XKB, , [Have keyboard extension library]) | ||||
| fi | ||||
|  | ||||
|  | ||||
| RANDR_LIBS= | ||||
| found_randr=no | ||||
| @@ -258,13 +276,40 @@ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, | ||||
|                [AC_CHECK_HEADER(X11/extensions/Xrandr.h, | ||||
|                                 RANDR_LIBS=-lXrandr found_randr=yes,, | ||||
| 				[#include <X11/Xlib.h>])], | ||||
|                , -lXext $ALL_X_LIBS) | ||||
|                , -lXrender -lXext $ALL_X_LIBS) | ||||
|  | ||||
| if test "x$found_randr" = "xyes"; then | ||||
|    AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library]) | ||||
| fi | ||||
|  | ||||
| MUTTER_LIBS="$MUTTER_LIBS $RANDR_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" | ||||
| XSYNC_LIBS= | ||||
| found_xsync=no | ||||
| AC_CHECK_LIB(Xext, XSyncQueryExtension, | ||||
|                [AC_CHECK_HEADER(X11/extensions/sync.h, | ||||
|                                 found_xsync=yes,, | ||||
| 				[#include <X11/Xlib.h>])], | ||||
|                , $ALL_X_LIBS) | ||||
|  | ||||
| if test x$enable_xsync = xno; then | ||||
|    found_xsync=no | ||||
| fi | ||||
|  | ||||
| if test x$enable_xsync = xyes; then | ||||
|    if test "$found_xsync" = "no"; then | ||||
|       AC_MSG_ERROR([--enable-xsync forced and XSync not found]) | ||||
|       exit 1 | ||||
|    fi | ||||
| fi | ||||
|  | ||||
| if test "x$found_xsync" = "xyes"; then | ||||
|    XSYNC_LIBS=-lXext | ||||
|    AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library]) | ||||
| fi | ||||
|  | ||||
| MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" | ||||
| MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" | ||||
| MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" | ||||
| MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" | ||||
|  | ||||
| found_sm=no | ||||
| case "$MUTTER_LIBS" in | ||||
| @@ -296,6 +341,17 @@ fi | ||||
|  | ||||
| AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") | ||||
|  | ||||
| HOST_ALIAS=$host_alias | ||||
| AC_SUBST(HOST_ALIAS) | ||||
|  | ||||
| AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) | ||||
|  | ||||
| if test x"$GDK_PIXBUF_CSOURCE" = xno; then | ||||
|   AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK]) | ||||
| fi | ||||
|  | ||||
| AC_SUBST(GDK_PIXBUF_CSOURCE) | ||||
|  | ||||
| AC_PATH_PROG(ZENITY, zenity, no) | ||||
| if test x"$ZENITY" = xno; then | ||||
|   AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) | ||||
| @@ -378,15 +434,16 @@ changequote([,])dnl | ||||
|  | ||||
| AC_CONFIG_FILES([ | ||||
| Makefile | ||||
| data/Makefile | ||||
| doc/Makefile | ||||
| doc/man/Makefile | ||||
| doc/reference/Makefile | ||||
| doc/reference/meta-docs.sgml | ||||
| src/Makefile | ||||
| src/wm-tester/Makefile | ||||
| src/libmutter.pc | ||||
| src/mutter-plugins.pc | ||||
| src/tools/Makefile | ||||
| src/compositor/plugins/Makefile | ||||
| src/meta/meta-version.h | ||||
| po/Makefile.in | ||||
| ]) | ||||
|  | ||||
| @@ -412,6 +469,9 @@ mutter-$VERSION | ||||
| 	libcanberra:              ${have_libcanberra} | ||||
| 	Introspection:            ${found_introspection} | ||||
| 	Session management:       ${found_sm} | ||||
| 	Shape extension:          ${found_shape} | ||||
| 	Xsync:                    ${found_xsync} | ||||
| 	Xcursor:                  ${have_xcursor} | ||||
| " | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -1,36 +0,0 @@ | ||||
| desktopfiles_in_files = \ | ||||
| 	mutter.desktop.in \ | ||||
| 	mutter-wayland.desktop.in | ||||
| desktopfilesdir = $(datadir)/applications | ||||
| desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop) | ||||
|  | ||||
| @INTLTOOL_DESKTOP_RULE@ | ||||
|  | ||||
| xml_in_files = \ | ||||
|         50-mutter-navigation.xml.in \ | ||||
|         50-mutter-system.xml.in \ | ||||
|         50-mutter-windows.xml.in | ||||
| xmldir = $(GNOME_KEYBINDINGS_KEYSDIR) | ||||
| xml_DATA = $(xml_in_files:.xml.in=.xml) | ||||
|  | ||||
| gschema_in_files = \ | ||||
| 	org.gnome.mutter.gschema.xml.in	\ | ||||
| 	org.gnome.mutter.wayland.gschema.xml.in | ||||
| gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) | ||||
|  | ||||
| @INTLTOOL_XML_NOMERGE_RULE@ | ||||
| @GSETTINGS_RULES@ | ||||
|  | ||||
| convertdir = $(datadir)/GConf/gsettings | ||||
| convert_DATA = mutter-schemas.convert | ||||
|  | ||||
| CLEANFILES = \ | ||||
| 	$(desktopfiles_DATA) \ | ||||
| 	$(gsettings_SCHEMAS) \ | ||||
| 	$(xml_DATA) | ||||
|  | ||||
| EXTRA_DIST = \ | ||||
| 	$(convert_DATA) \ | ||||
| 	$(desktopfiles_in_files) \ | ||||
| 	$(gschema_in_files) \ | ||||
| 	$(xml_in_files) | ||||
| @@ -1,33 +0,0 @@ | ||||
| <schemalist> | ||||
|   <schema id="org.gnome.mutter.wayland.keybindings" path="/org/gnome/mutter/wayland/keybindings/" | ||||
| 	  gettext-domain="@GETTEXT_DOMAIN@"> | ||||
|     <key name="switch-to-session-1" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F1']]]></default> | ||||
|       <_summary>Switch to VT 1</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-2" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F2']]]></default> | ||||
|       <_summary>Switch to VT 2</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-3" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F3']]]></default> | ||||
|       <_summary>Switch to VT 3</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-4" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F4']]]></default> | ||||
|       <_summary>Switch to VT 4</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-5" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F5']]]></default> | ||||
|       <_summary>Switch to VT 5</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-6" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F6']]]></default> | ||||
|       <_summary>Switch to VT 6</_summary> | ||||
|     </key> | ||||
|     <key name="switch-to-session-7" type="as"> | ||||
|       <default><![CDATA[['<Primary><Alt>F7']]]></default> | ||||
|       <_summary>Switch to VT 7</_summary> | ||||
|     </key> | ||||
|   </schema> | ||||
| </schemalist> | ||||
| @@ -1,4 +1,4 @@ | ||||
| SUBDIRS = man reference | ||||
|  | ||||
| EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \ | ||||
| 	how-to-get-focus-right.txt rationales.txt | ||||
| 	how-to-get-focus-right.txt | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| man_MANS = mutter.1 | ||||
| man_MANS = mutter.1 mutter-theme-viewer.1 \ | ||||
| 	   mutter-window-demo.1 mutter-message.1 | ||||
|  | ||||
| EXTRA_DIST = $(man_MANS) | ||||
|   | ||||
							
								
								
									
										60
									
								
								doc/man/mutter-message.1
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								doc/man/mutter-message.1
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | ||||
| .\"                                      Hey, EMACS: -*- nroff -*- | ||||
| .\" First parameter, NAME, should be all caps | ||||
| .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection | ||||
| .\" other parameters are allowed: see man(7), man(1) | ||||
| .\" ----- | ||||
| .\" This file was confirmed to be licenced under the GPL | ||||
| .\" by its author and copyright holder, Akira TAGOH, on June 1st 2008: | ||||
| .\" | ||||
| .\" > I'm comfortable with DFSG-free. that sounds great if you think it's | ||||
| .\" > useful and worth containing it in upstream. | ||||
| .\" ... | ||||
| .\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever, | ||||
| .\" > since I have contributed that for Debian. so GPL is no problem for me. | ||||
| .\" ----- | ||||
| .TH MUTTER\-MESSAGE 1 "28 August 2002" | ||||
| .\" Please adjust this date whenever revising the manpage. | ||||
| .\" | ||||
| .\" Some roff macros, for reference: | ||||
| .\" .nh        disable hyphenation | ||||
| .\" .hy        enable hyphenation | ||||
| .\" .ad l      left justify | ||||
| .\" .ad b      justify to both left and right margins | ||||
| .\" .nf        disable filling | ||||
| .\" .fi        enable filling | ||||
| .\" .br        insert line break | ||||
| .\" .sp <n>    insert n+1 empty lines | ||||
| .\" for manpage-specific macros, see man(7) | ||||
| .SH NAME | ||||
| MUTTER\-MESSAGE \- a command to send a message to Mutter | ||||
| .SH SYNOPSIS | ||||
| .B MUTTER\-MESSAGE | ||||
| [restart|reload\-theme|enable\-keybindings|disable\-keybindings] | ||||
| .SH DESCRIPTION | ||||
| This manual page documents briefly the | ||||
| .B mutter\-message\fP. | ||||
| This manual page was written for the Debian distribution | ||||
| because the original program does not have a manual page. | ||||
| .PP | ||||
| .\" TeX users may be more comfortable with the \fB<whatever>\fP and | ||||
| .\" \fI<whatever>\fP escape sequences to invode bold face and italics,  | ||||
| .\" respectively. | ||||
| \fBmutter\-message\fP send a specified message to \fBmutter\fP(1). | ||||
| .SH OPTIONS | ||||
| .TP | ||||
| .B restart | ||||
| Restart \fBmutter\fP(1) which is running. | ||||
| .TP | ||||
| .B reload-theme | ||||
| Reload a theme which is specified on gsettings database. | ||||
| .TP | ||||
| .B enable-keybindings | ||||
| Enable all of keybindings which is specified on gsettings database. | ||||
| .TP | ||||
| .B disable-keybindings | ||||
| Disable all of keybindings which is specified on gsettings database. | ||||
| .SH SEE ALSO | ||||
| .BR mutter (1) | ||||
| .SH AUTHOR | ||||
| This manual page was written by Akira TAGOH <tagoh@debian.org>, | ||||
| for the Debian GNU/Linux system (but may be used by others). | ||||
							
								
								
									
										43
									
								
								doc/man/mutter-theme-viewer.1
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								doc/man/mutter-theme-viewer.1
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,43 @@ | ||||
| .\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection | ||||
| .\" other parms are allowed: see man(7), man(1) | ||||
| .\" | ||||
| .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>. | ||||
| .\"  | ||||
| .TH MUTTER-THEME-VIEWER 1 "1 June 2004"  | ||||
| .SH NAME | ||||
| mutter-theme-viewer \- view mutter themes | ||||
| .SH SYNOPSIS | ||||
| .B mutter-theme-viewer | ||||
| [ | ||||
| .I THEMENAME | ||||
| ] | ||||
| .SH DESCRIPTION | ||||
| .\" Putting a newline after each sentence can generate better output. | ||||
| .B mutter-theme-viewer | ||||
| allows you to preview any installed Mutter theme. | ||||
| .PP | ||||
| When designing a new Mutter theme, you can use | ||||
| .B mutter-theme-viewer | ||||
| to measure the performance of a window frame option, and to preview | ||||
| the option. | ||||
| .SH OPTIONS | ||||
| .TP | ||||
| .I THEMENAME | ||||
| Name of the theme to be shown (\fIAtlanta\fR by default). | ||||
| It is case-sensitive. | ||||
| .SH FILES | ||||
| .br | ||||
| .nf | ||||
| .TP | ||||
| .I /usr/share/themes | ||||
| system themes directory | ||||
| .TP | ||||
| .I /usr/share/themes/*/mutter-1/mutter-theme-1.xml | ||||
| theme specification file | ||||
| .SH AUTHOR | ||||
| This manual page was written by Jose M. Moya <josem@die.upm.es>, for | ||||
| the Debian  GNU/Linux system (but may be used by others). | ||||
| .SH "SEE ALSO" | ||||
| .\" Always quote multiple words for .SH | ||||
| .BR mutter (1), | ||||
| .BR mutter-window-demo (1). | ||||
							
								
								
									
										25
									
								
								doc/man/mutter-window-demo.1
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								doc/man/mutter-window-demo.1
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | ||||
| .\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection | ||||
| .\" other parms are allowed: see man(7), man(1) | ||||
| .\" | ||||
| .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>. | ||||
| .\"  | ||||
| .TH MUTTER-WINDOW-DEMO 1 "1 June 2004"  | ||||
| .SH NAME | ||||
| mutter-window-demo \- demo of window features | ||||
| .SH SYNOPSIS | ||||
| .B mutter-window-demo | ||||
| .SH DESCRIPTION | ||||
| .\" Putting a newline after each sentence can generate better output. | ||||
| This program demonstrates various kinds of windows that window | ||||
| managers and window manager themes should handle. | ||||
| .PP | ||||
| Be sure to tear off the menu and toolbar, those are also a special | ||||
| kind of window. | ||||
| .SH AUTHOR | ||||
| This manual page was written by Jose M. Moya <josem@die.upm.es>, for | ||||
| the Debian  GNU/Linux system (but may be used by others). | ||||
| .SH "SEE ALSO" | ||||
| .\" Always quote multiple words for .SH | ||||
| .BR x-window-manager (1), | ||||
| .BR mutter (1), | ||||
| .BR mutter-theme-viewer (1). | ||||
| @@ -49,8 +49,8 @@ FIXXREF_OPTIONS= | ||||
| # Used for dependencies. The docs will be rebuilt if any of these change. | ||||
| # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h | ||||
| # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c | ||||
| HFILE_GLOB=$(top_srcdir)/src/*/*.h | ||||
| CFILE_GLOB=$(top_srcdir)/src/*/*.c | ||||
| HFILE_GLOB=$(top_srcdir)/src/*.h | ||||
| CFILE_GLOB=$(top_srcdir)/src/*.c | ||||
|  | ||||
| # Extra header to include when scanning, which are not under DOC_SOURCE_DIR | ||||
| # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h | ||||
| @@ -79,6 +79,8 @@ IGNORE_HFILES= \ | ||||
| 	iconcache.h \ | ||||
| 	inlinepixbufs.h \ | ||||
| 	keybindings-private.h \ | ||||
| 	menu.h \ | ||||
| 	metaaccellabel.h \ | ||||
| 	meta-background-actor-private.h \ | ||||
| 	meta-background-group-private.h \ | ||||
| 	meta-module.h \ | ||||
|   | ||||
| @@ -96,6 +96,8 @@ meta_compositor_hide_window | ||||
| meta_compositor_switch_workspace | ||||
| meta_compositor_maximize_window | ||||
| meta_compositor_unmaximize_window | ||||
| meta_compositor_window_mapped | ||||
| meta_compositor_window_unmapped | ||||
| meta_compositor_sync_window_geometry | ||||
| meta_compositor_set_updates_frozen | ||||
| meta_compositor_queue_frame_drawn | ||||
| @@ -205,6 +207,7 @@ meta_key_binding_get_modifiers | ||||
| meta_key_binding_get_mask | ||||
| meta_key_binding_is_builtin | ||||
| meta_keybindings_set_custom_handler | ||||
| meta_keybindings_switch_window | ||||
| meta_screen_ungrab_all_keys | ||||
| meta_screen_grab_all_keys | ||||
| </SECTION> | ||||
| @@ -300,7 +303,6 @@ MetaPluginVersion | ||||
| META_PLUGIN_DECLARE | ||||
| meta_plugin_switch_workspace_completed | ||||
| meta_plugin_minimize_completed | ||||
| meta_plugin_unminimize_completed | ||||
| meta_plugin_maximize_completed | ||||
| meta_plugin_unmaximize_completed | ||||
| meta_plugin_map_completed | ||||
| @@ -387,23 +389,6 @@ MetaWindowActorPrivate | ||||
| meta_window_actor_get_type | ||||
| </SECTION> | ||||
|  | ||||
| <SECTION> | ||||
| <FILE>meta-cullable</FILE> | ||||
| <TITLE>MetaCullable</TITLE> | ||||
| MetaCullable | ||||
| MetaCullableInterface | ||||
| meta_cullable_cull_out | ||||
| meta_cullable_reset_culling | ||||
| meta_cullable_cull_out_children | ||||
| meta_cullable_reset_culling_children | ||||
| <SUBSECTION Standard> | ||||
| META_TYPE_CULLABLE | ||||
| META_CULLABLE | ||||
| META_IS_CULLABLE | ||||
| META_CULLABLE_GET_IFACE | ||||
| meta_cullable_get_type | ||||
| </SECTION> | ||||
|  | ||||
| <SECTION> | ||||
| <FILE>prefs</FILE> | ||||
| MetaPreference | ||||
| @@ -424,6 +409,7 @@ meta_prefs_get_theme | ||||
| meta_prefs_get_titlebar_font | ||||
| meta_prefs_get_num_workspaces | ||||
| meta_prefs_get_dynamic_workspaces | ||||
| meta_prefs_get_application_based | ||||
| meta_prefs_get_disable_workarounds | ||||
| meta_prefs_get_auto_raise | ||||
| meta_prefs_get_auto_raise_delay | ||||
| @@ -556,11 +542,8 @@ meta_window_is_monitor_sized | ||||
| meta_window_is_override_redirect | ||||
| meta_window_is_skip_taskbar | ||||
| meta_window_get_rect | ||||
| meta_window_get_buffer_rect | ||||
| meta_window_get_frame_rect | ||||
| meta_window_get_input_rect | ||||
| meta_window_get_outer_rect | ||||
| meta_window_client_rect_to_frame_rect | ||||
| meta_window_frame_rect_to_client_rect | ||||
| meta_window_get_screen | ||||
| meta_window_get_display | ||||
| meta_window_get_xwindow | ||||
|   | ||||
| @@ -23,8 +23,7 @@ environment.</description> | ||||
|   <download-page rdf:resource="http://download.gnome.org/sources/mutter/" /> | ||||
|   <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" /> | ||||
|  | ||||
|   <category rdf:resource="http://api.gnome.org/doap-extensions#core" /> | ||||
|   <programming-language>C</programming-language> | ||||
|   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" /> | ||||
|  | ||||
|   <maintainer> | ||||
|     <foaf:Person> | ||||
|   | ||||
| @@ -44,7 +44,6 @@ is | ||||
| it | ||||
| ja | ||||
| ka | ||||
| kk | ||||
| kn | ||||
| ko | ||||
| ku | ||||
|   | ||||
| @@ -1,12 +1,8 @@ | ||||
| # List of source files containing translatable strings. | ||||
| # Please keep this file sorted alphabetically. | ||||
| data/50-mutter-navigation.xml.in | ||||
| data/50-mutter-system.xml.in | ||||
| data/50-mutter-windows.xml.in | ||||
| data/mutter.desktop.in | ||||
| data/org.gnome.mutter.gschema.xml.in | ||||
| data/org.gnome.mutter.wayland.gschema.xml.in | ||||
| src/backends/meta-monitor-manager.c | ||||
| src/50-mutter-navigation.xml.in | ||||
| src/50-mutter-system.xml.in | ||||
| src/50-mutter-windows.xml.in | ||||
| src/compositor/compositor.c | ||||
| src/compositor/meta-background.c | ||||
| src/core/bell.c | ||||
| @@ -19,12 +15,20 @@ src/core/main.c | ||||
| src/core/mutter.c | ||||
| src/core/prefs.c | ||||
| src/core/screen.c | ||||
| src/core/session.c | ||||
| src/core/util.c | ||||
| src/core/window.c | ||||
| src/core/window-props.c | ||||
| src/core/xprops.c | ||||
| src/mutter.desktop.in | ||||
| src/mutter-wm.desktop.in | ||||
| src/org.gnome.mutter.gschema.xml.in | ||||
| src/tools/mutter-message.c | ||||
| src/ui/frames.c | ||||
| src/ui/menu.c | ||||
| src/ui/metaaccellabel.c | ||||
| src/ui/resizepopup.c | ||||
| src/ui/theme.c | ||||
| src/ui/theme-parser.c | ||||
| src/x11/session.c | ||||
| src/x11/window-props.c | ||||
| src/x11/xprops.c | ||||
| src/ui/theme-viewer.c | ||||
|  | ||||
|   | ||||
| @@ -1 +1,2 @@ | ||||
| data/mutter-wayland.desktop.in | ||||
| src/metacity.schemas.in | ||||
|  | ||||
|   | ||||
							
								
								
									
										441
									
								
								po/be.po
									
									
									
									
									
								
							
							
						
						
									
										441
									
								
								po/be.po
									
									
									
									
									
								
							| @@ -1,10 +1,10 @@ | ||||
| # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011, 2013. | ||||
| # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011. | ||||
| msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: mutter.master\n" | ||||
| "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" | ||||
| "product=mutter&keywords=I18N+L10N&component=general\n" | ||||
| "POT-Creation-Date: 2013-08-18 20:03+0000\n" | ||||
| "POT-Creation-Date: 2013-03-01 15:50+0000\n" | ||||
| "PO-Revision-Date: 2012-10-13 17:44+0300\n" | ||||
| "Last-Translator: Ігар Грачышка <ihar.hrachyshka@gmail.com>\n" | ||||
| "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n" | ||||
| @@ -206,7 +206,7 @@ msgstr "Падзяліць прагляд справа" | ||||
|  | ||||
| #. This probably means that a non-WM compositor like xcompmgr is running; | ||||
| #. * we have no way to get it to exit | ||||
| #: ../src/compositor/compositor.c:589 | ||||
| #: ../src/compositor/compositor.c:507 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Another compositing manager is already running on screen %i on display \"%s" | ||||
| @@ -214,11 +214,11 @@ msgid "" | ||||
| msgstr "" | ||||
| "Іншы кампазітны кіраўнік вокнаў ужо абслугоўвае экран %i дысплея \"%s\"." | ||||
|  | ||||
| #: ../src/compositor/meta-background.c:1076 | ||||
| #: ../src/compositor/meta-background.c:1111 | ||||
| msgid "background texture could not be created from file" | ||||
| msgstr "не ўдалося стварыць фонавую тэкстуру з файла" | ||||
|  | ||||
| #: ../src/core/bell.c:322 | ||||
| #: ../src/core/bell.c:320 | ||||
| msgid "Bell event" | ||||
| msgstr "Падзея з сігналам" | ||||
|  | ||||
| @@ -251,18 +251,18 @@ msgstr "_Пачакаць" | ||||
| msgid "_Force Quit" | ||||
| msgstr "_Змусіць да выхаду" | ||||
|  | ||||
| #: ../src/core/display.c:421 | ||||
| #: ../src/core/display.c:401 | ||||
| #, c-format | ||||
| msgid "Missing %s extension required for compositing" | ||||
| msgstr "" | ||||
| "Адсутнічае пашырэнне \"%s\", патрэбнае для ажыццяўлення кампазітнага вываду" | ||||
|  | ||||
| #: ../src/core/display.c:513 | ||||
| #: ../src/core/display.c:493 | ||||
| #, c-format | ||||
| msgid "Failed to open X Window System display '%s'\n" | ||||
| msgstr "Не ўдалося адкрыць X-дысплей аконнай сістэмы \"%s\"\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1136 | ||||
| #: ../src/core/keybindings.c:929 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Some other program is already using the key %s with modifiers %x as a " | ||||
| @@ -271,41 +271,41 @@ msgstr "" | ||||
| "Нейкая іншая праграма ўжо выкарыстоўвае як скарот клавішу %s з " | ||||
| "мадыфікатарамі %x\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1333 | ||||
| #: ../src/core/keybindings.c:1129 | ||||
| #, c-format | ||||
| msgid "\"%s\" is not a valid accelerator\n" | ||||
| msgstr "\"%s\" - гэта хібны клавіятурны скарот\n" | ||||
|  | ||||
| #: ../src/core/main.c:197 | ||||
| #: ../src/core/main.c:196 | ||||
| msgid "Disable connection to session manager" | ||||
| msgstr "Выключыць злучэнне з кіраўніком сеансаў" | ||||
|  | ||||
| #: ../src/core/main.c:203 | ||||
| #: ../src/core/main.c:202 | ||||
| msgid "Replace the running window manager" | ||||
| msgstr "Замяніць дзейнага кіраўніка вокнаў" | ||||
|  | ||||
| #: ../src/core/main.c:209 | ||||
| #: ../src/core/main.c:208 | ||||
| msgid "Specify session management ID" | ||||
| msgstr "Вызначыць ідэнтыфікатар для кіравання сеансам" | ||||
|  | ||||
| #: ../src/core/main.c:214 | ||||
| #: ../src/core/main.c:213 | ||||
| msgid "X Display to use" | ||||
| msgstr "Патрэбны X-дысплей" | ||||
|  | ||||
| #: ../src/core/main.c:220 | ||||
| #: ../src/core/main.c:219 | ||||
| msgid "Initialize session from savefile" | ||||
| msgstr "Ініцыяваць сеанс з файла" | ||||
|  | ||||
| #: ../src/core/main.c:226 | ||||
| #: ../src/core/main.c:225 | ||||
| msgid "Make X calls synchronous" | ||||
| msgstr "Сінхронна выконваць выклікі X-сістэмы" | ||||
|  | ||||
| #: ../src/core/main.c:534 | ||||
| #: ../src/core/main.c:494 | ||||
| #, c-format | ||||
| msgid "Failed to scan themes directory: %s\n" | ||||
| msgstr "Не ўдалося праглядзець каталог з матывамі аздаблення: %s\n" | ||||
|  | ||||
| #: ../src/core/main.c:550 | ||||
| #: ../src/core/main.c:510 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Could not find a theme! Be sure %s exists and contains the usual themes.\n" | ||||
| @@ -313,19 +313,6 @@ msgstr "" | ||||
| "Не ўдалося адшукаць матыў аздаблення! Праверце, каб каталог %s існаваў і " | ||||
| "змяшчаў звычайныя матывы.\n" | ||||
|  | ||||
| #: ../src/core/monitor.c:711 | ||||
| msgid "Built-in display" | ||||
| msgstr "Убудаваны дысплей" | ||||
|  | ||||
| #. TRANSLATORS: this is a monitor name (in case we don't know | ||||
| #. the vendor), it's Unknown followed by a size in inches, | ||||
| #. like 'Unknown 15"' | ||||
| #. | ||||
| #: ../src/core/monitor.c:739 | ||||
| #, c-format | ||||
| msgid "Unknown %s" | ||||
| msgstr "Невядомы %s" | ||||
|  | ||||
| #: ../src/core/mutter.c:40 | ||||
| #, c-format | ||||
| msgid "" | ||||
| @@ -350,7 +337,7 @@ msgstr "Вывесці нумар версіі праграмы" | ||||
| msgid "Mutter plugin to use" | ||||
| msgstr "Патрэбны плугін Mutter" | ||||
|  | ||||
| #: ../src/core/prefs.c:1202 | ||||
| #: ../src/core/prefs.c:1087 | ||||
| msgid "" | ||||
| "Workarounds for broken applications disabled. Some applications may not " | ||||
| "behave properly.\n" | ||||
| @@ -358,12 +345,12 @@ msgstr "" | ||||
| "Асаблівыя паводзіны для некаторых хібных праграм выключаныя. Некаторыя " | ||||
| "праграмы могуць перастаць працаваць, як мае быць.\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1277 | ||||
| #: ../src/core/prefs.c:1162 | ||||
| #, c-format | ||||
| msgid "Could not parse font description \"%s\" from GSettings key %s\n" | ||||
| msgstr "Не ўдалося разабраць азначэнне шрыфту \"%s\" з GSettings-ключа %s\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1343 | ||||
| #: ../src/core/prefs.c:1228 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "\"%s\" found in configuration database is not a valid value for mouse button " | ||||
| @@ -372,7 +359,7 @@ msgstr "" | ||||
| "Значэнне \"%s\", знойдзенае ў базе канфігурацыйных даных, не азначае " | ||||
| "мадыфікатар мышынай кнопкі\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1909 | ||||
| #: ../src/core/prefs.c:1780 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "\"%s\" found in configuration database is not a valid value for keybinding " | ||||
| @@ -381,17 +368,17 @@ msgstr "" | ||||
| "Значэнне \"%s\", знойдзенае ў базе канфігурацыйных даных, не азначае " | ||||
| "клавіятурны скарот \"%s\"\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1999 | ||||
| #: ../src/core/prefs.c:1879 | ||||
| #, c-format | ||||
| msgid "Workspace %d" | ||||
| msgstr "Прастора працы %d" | ||||
|  | ||||
| #: ../src/core/screen.c:534 | ||||
| #: ../src/core/screen.c:673 | ||||
| #, c-format | ||||
| msgid "Screen %d on display '%s' is invalid\n" | ||||
| msgstr "Экран %d на дысплеі \"%s\" хібны\n" | ||||
|  | ||||
| #: ../src/core/screen.c:550 | ||||
| #: ../src/core/screen.c:689 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Screen %d on display \"%s\" already has a window manager; try using the --" | ||||
| @@ -400,19 +387,19 @@ msgstr "" | ||||
| "Экран %d на дысплеі \"%s\" ужо мае аконнага кіраўніка. Каб замяніць яго " | ||||
| "новым, дадайце опцыю --replace.\n" | ||||
|  | ||||
| #: ../src/core/screen.c:577 | ||||
| #: ../src/core/screen.c:716 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Could not acquire window manager selection on screen %d display \"%s\"\n" | ||||
| msgstr "" | ||||
| "Не ўдалося пераняць вылучэнне кіраўніка вокнаў для экрана %d дысплея \"%s\"\n" | ||||
|  | ||||
| #: ../src/core/screen.c:655 | ||||
| #: ../src/core/screen.c:794 | ||||
| #, c-format | ||||
| msgid "Screen %d on display \"%s\" already has a window manager\n" | ||||
| msgstr "Экран %d на дысплеі \"%s\" ужо мае кіраўніка вокнаў\n" | ||||
|  | ||||
| #: ../src/core/screen.c:846 | ||||
| #: ../src/core/screen.c:979 | ||||
| #, c-format | ||||
| msgid "Could not release screen %d on display \"%s\"\n" | ||||
| msgstr "Не ўдалося вызваліць экран %d на дысплеі \"%s\"\n" | ||||
| @@ -473,45 +460,46 @@ msgstr "" | ||||
| "Гэтыя вокны не падтрымліваюць функцыі захавання дзейнага ладу працы, і таму " | ||||
| "іх прыйдзецца запусціць уручную пасля наступнага ўваходу ў сістэму." | ||||
|  | ||||
| #: ../src/core/util.c:84 | ||||
| #: ../src/core/util.c:80 | ||||
| #, c-format | ||||
| msgid "Failed to open debug log: %s\n" | ||||
| msgstr "Не ўдалося адкрыць адладачны журнал: %s\n" | ||||
|  | ||||
| #: ../src/core/util.c:94 | ||||
| #: ../src/core/util.c:90 | ||||
| #, c-format | ||||
| msgid "Failed to fdopen() log file %s: %s\n" | ||||
| msgstr "Не ўдалося выканаць fdopen() для журнальнага файла %s: %s\n" | ||||
|  | ||||
| #: ../src/core/util.c:100 | ||||
| #: ../src/core/util.c:96 | ||||
| #, c-format | ||||
| msgid "Opened log file %s\n" | ||||
| msgstr "Журнальны файл %s адкрыты\n" | ||||
|  | ||||
| #: ../src/core/util.c:119 | ||||
| #: ../src/core/util.c:115 ../src/tools/mutter-message.c:149 | ||||
| #, c-format | ||||
| msgid "Mutter was compiled without support for verbose mode\n" | ||||
| msgstr "" | ||||
| "Праграма \"Mutter\" была скампіляваная без падтрымкі падрабязнага " | ||||
| "пратакаліравання\n" | ||||
|  | ||||
| #: ../src/core/util.c:264 | ||||
| #: ../src/core/util.c:259 | ||||
| msgid "Window manager: " | ||||
| msgstr "Кіраўнік вокнаў: " | ||||
|  | ||||
| #: ../src/core/util.c:414 | ||||
| #: ../src/core/util.c:407 | ||||
| msgid "Bug in window manager: " | ||||
| msgstr "Хіба ў кіраўніку вокнаў: " | ||||
|  | ||||
| #: ../src/core/util.c:445 | ||||
| #: ../src/core/util.c:438 | ||||
| msgid "Window manager warning: " | ||||
| msgstr "Перасцярога ад кіраўніка вокнаў: " | ||||
|  | ||||
| #: ../src/core/util.c:473 | ||||
| #: ../src/core/util.c:466 | ||||
| msgid "Window manager error: " | ||||
| msgstr "Памылка кіраўніка вокнаў: " | ||||
|  | ||||
| #. first time through | ||||
| #: ../src/core/window.c:7533 | ||||
| #: ../src/core/window.c:7539 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER " | ||||
| @@ -527,7 +515,7 @@ msgstr "" | ||||
| #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain | ||||
| #. * about these apps but make them work. | ||||
| #. | ||||
| #: ../src/core/window.c:8257 | ||||
| #: ../src/core/window.c:8263 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Window %s sets an MWM hint indicating it isn't resizable, but sets min size " | ||||
| @@ -537,22 +525,22 @@ msgstr "" | ||||
| "памеру, але разам з гэтым прызначыла для сябе мінімальны памер %d x %d і " | ||||
| "максімальны памер %d x %d. Такія паводзіны не маюць сэнсу.\n" | ||||
|  | ||||
| #: ../src/core/window-props.c:347 | ||||
| #: ../src/core/window-props.c:318 | ||||
| #, c-format | ||||
| msgid "Application set a bogus _NET_WM_PID %lu\n" | ||||
| msgstr "Праграма прызначыла памылковае значэнне _NET_WM_PID %lu\n" | ||||
|  | ||||
| #: ../src/core/window-props.c:463 | ||||
| #: ../src/core/window-props.c:434 | ||||
| #, c-format | ||||
| msgid "%s (on %s)" | ||||
| msgstr "%s (на %s)" | ||||
|  | ||||
| #: ../src/core/window-props.c:1546 | ||||
| #: ../src/core/window-props.c:1517 | ||||
| #, c-format | ||||
| msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n" | ||||
| msgstr "Для %2$s вызначана хібнае акно WM_TRANSIENT_FOR 0x%1$lx.\n" | ||||
|  | ||||
| #: ../src/core/window-props.c:1557 | ||||
| #: ../src/core/window-props.c:1528 | ||||
| #, c-format | ||||
| msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n" | ||||
| msgstr "WM_TRANSIENT_FOR акно 0x%lx для %s стварыла б цыкл.\n" | ||||
| @@ -701,8 +689,7 @@ msgstr "" | ||||
|  | ||||
| #: ../src/org.gnome.mutter.gschema.xml.in.h:17 | ||||
| msgid "Auto maximize nearly monitor sized windows" | ||||
| msgstr "" | ||||
| "Аўтаматычна максімалізаваць вокны, якія расцягнутыя амаль на ўвесь экран" | ||||
| msgstr "Аўтаматычна максімалізаваць вокны, якія расцягнутыя амаль на ўвесь экран" | ||||
|  | ||||
| #: ../src/org.gnome.mutter.gschema.xml.in.h:18 | ||||
| msgid "" | ||||
| @@ -720,104 +707,109 @@ msgstr "Выбраць акно з выплыўнога акенца" | ||||
| msgid "Cancel tab popup" | ||||
| msgstr "Закрыць выплыўное акенца" | ||||
|  | ||||
| #: ../src/tools/mutter-message.c:123 | ||||
| #, c-format | ||||
| msgid "Usage: %s\n" | ||||
| msgstr "Правілы выкарыстання: %s\n" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:67 | ||||
| #: ../src/ui/menu.c:69 | ||||
| msgid "Mi_nimize" | ||||
| msgstr "_Мінімалізаваць" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:69 | ||||
| #: ../src/ui/menu.c:71 | ||||
| msgid "Ma_ximize" | ||||
| msgstr "Ма_ксімалізаваць" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:71 | ||||
| #: ../src/ui/menu.c:73 | ||||
| msgid "Unma_ximize" | ||||
| msgstr "Скасаваць ма_ксімалізацыю" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:73 | ||||
| #: ../src/ui/menu.c:75 | ||||
| msgid "Roll _Up" | ||||
| msgstr "_Скруціць акно ў загаловак" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:75 | ||||
| #: ../src/ui/menu.c:77 | ||||
| msgid "_Unroll" | ||||
| msgstr "Рас_круціць акно з загалоўка" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:77 | ||||
| #: ../src/ui/menu.c:79 | ||||
| msgid "_Move" | ||||
| msgstr "_Перамясціць акно" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:79 | ||||
| #: ../src/ui/menu.c:81 | ||||
| msgid "_Resize" | ||||
| msgstr "_Змяніць памер акна" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:81 | ||||
| #: ../src/ui/menu.c:83 | ||||
| msgid "Move Titlebar On_screen" | ||||
| msgstr "Перамясціць загаловак акна па _экране" | ||||
|  | ||||
| #. separator | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:84 ../src/ui/menu.c:86 | ||||
| #: ../src/ui/menu.c:86 ../src/ui/menu.c:88 | ||||
| msgid "Always on _Top" | ||||
| msgstr "Заўсёды _наверсе" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:88 | ||||
| #: ../src/ui/menu.c:90 | ||||
| msgid "_Always on Visible Workspace" | ||||
| msgstr "Заўсёды на _бачнай прасторы працы" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:90 | ||||
| #: ../src/ui/menu.c:92 | ||||
| msgid "_Only on This Workspace" | ||||
| msgstr "_Толькі на гэтай прасторы працы" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:92 | ||||
| #: ../src/ui/menu.c:94 | ||||
| msgid "Move to Workspace _Left" | ||||
| msgstr "Перамясціць на прастору працы з_лева" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:94 | ||||
| #: ../src/ui/menu.c:96 | ||||
| msgid "Move to Workspace R_ight" | ||||
| msgstr "Перамясціць на прастору працы с_права" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:96 | ||||
| #: ../src/ui/menu.c:98 | ||||
| msgid "Move to Workspace _Up" | ||||
| msgstr "Перамясціць на прастору працы з_верху" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:98 | ||||
| #: ../src/ui/menu.c:100 | ||||
| msgid "Move to Workspace _Down" | ||||
| msgstr "Перамясціць на прастору працы з_нізу" | ||||
|  | ||||
| #. separator | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:102 | ||||
| #: ../src/ui/menu.c:104 | ||||
| msgid "_Close" | ||||
| msgstr "_Закрыць акно" | ||||
|  | ||||
| #: ../src/ui/menu.c:202 | ||||
| #: ../src/ui/menu.c:204 | ||||
| #, c-format | ||||
| msgid "Workspace %d%n" | ||||
| msgstr "Прастора працы %d%n" | ||||
|  | ||||
| #: ../src/ui/menu.c:212 | ||||
| #: ../src/ui/menu.c:214 | ||||
| #, c-format | ||||
| msgid "Workspace 1_0" | ||||
| msgstr "Прастора працы 1_0" | ||||
|  | ||||
| #: ../src/ui/menu.c:214 | ||||
| #: ../src/ui/menu.c:216 | ||||
| #, c-format | ||||
| msgid "Workspace %s%d" | ||||
| msgstr "Прастора працы %s%d" | ||||
|  | ||||
| #: ../src/ui/menu.c:384 | ||||
| #: ../src/ui/menu.c:397 | ||||
| msgid "Move to Another _Workspace" | ||||
| msgstr "П_ерамясціць на іншую прастору працы" | ||||
|  | ||||
| @@ -919,49 +911,49 @@ msgstr "Mod5" | ||||
| msgid "%d x %d" | ||||
| msgstr "%d x %d" | ||||
|  | ||||
| #: ../src/ui/theme.c:236 | ||||
| #: ../src/ui/theme.c:235 | ||||
| msgid "top" | ||||
| msgstr "верхнюю" | ||||
|  | ||||
| #: ../src/ui/theme.c:238 | ||||
| #: ../src/ui/theme.c:237 | ||||
| msgid "bottom" | ||||
| msgstr "ніжнюю" | ||||
|  | ||||
| #: ../src/ui/theme.c:240 | ||||
| #: ../src/ui/theme.c:239 | ||||
| msgid "left" | ||||
| msgstr "левую" | ||||
|  | ||||
| #: ../src/ui/theme.c:242 | ||||
| #: ../src/ui/theme.c:241 | ||||
| msgid "right" | ||||
| msgstr "правую" | ||||
|  | ||||
| #: ../src/ui/theme.c:270 | ||||
| #: ../src/ui/theme.c:269 | ||||
| #, c-format | ||||
| msgid "frame geometry does not specify \"%s\" dimension" | ||||
| msgstr "апісанне геаметрыі рамкі акна не вызначае %s граніцу" | ||||
|  | ||||
| #: ../src/ui/theme.c:289 | ||||
| #: ../src/ui/theme.c:288 | ||||
| #, c-format | ||||
| msgid "frame geometry does not specify dimension \"%s\" for border \"%s\"" | ||||
| msgstr "" | ||||
| "апісанне геаметрыі рамкі акна не вызначае %s граніцу для аблямоўкі \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:326 | ||||
| #: ../src/ui/theme.c:325 | ||||
| #, c-format | ||||
| msgid "Button aspect ratio %g is not reasonable" | ||||
| msgstr "Прапорцыі кнопкі %g не маюць сэнсу" | ||||
|  | ||||
| #: ../src/ui/theme.c:338 | ||||
| #: ../src/ui/theme.c:337 | ||||
| #, c-format | ||||
| msgid "Frame geometry does not specify size of buttons" | ||||
| msgstr "Апісанне геаметрыі рамкі акна не вызначае памер кнопак" | ||||
|  | ||||
| #: ../src/ui/theme.c:1051 | ||||
| #: ../src/ui/theme.c:1050 | ||||
| #, c-format | ||||
| msgid "Gradients should have at least two colors" | ||||
| msgstr "Градыент мусіць мець прынамсі два колеры" | ||||
|  | ||||
| #: ../src/ui/theme.c:1203 | ||||
| #: ../src/ui/theme.c:1202 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "GTK custom color specification must have color name and fallback in " | ||||
| @@ -970,7 +962,7 @@ msgstr "" | ||||
| "Уласная спецыфікацыя колеру GTK мусіць змяшчаць назвы асноўнага і запаснога " | ||||
| "колераў у дужках, напрыклад, gtk:custom(foo,bar). Не ўдалося разабраць \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1219 | ||||
| #: ../src/ui/theme.c:1218 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-" | ||||
| @@ -979,7 +971,7 @@ msgstr "" | ||||
| "Хібны знак \"%c\" у параметры color_name спецыфікацыі gtk:custom, дазволеныя " | ||||
| "толькі A-Za-z0-9-_" | ||||
|  | ||||
| #: ../src/ui/theme.c:1233 | ||||
| #: ../src/ui/theme.c:1232 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not " | ||||
| @@ -988,7 +980,7 @@ msgstr "" | ||||
| "Фармат gtk:custom: \"gtk:custom(назва_колеру,запасны_колер)\"; \"%s\" не " | ||||
| "адпавядае фармату" | ||||
|  | ||||
| #: ../src/ui/theme.c:1278 | ||||
| #: ../src/ui/theme.c:1277 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] " | ||||
| @@ -997,7 +989,7 @@ msgstr "" | ||||
| "Спецыфікацыя колеру GTK мусіць мець стан у квадратных дужках, напрыклад, gtk:" | ||||
| "fg[NORMAL], дзе NORMAL - гэта стан. Не ўдалося разабраць \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1292 | ||||
| #: ../src/ui/theme.c:1291 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "GTK color specification must have a close bracket after the state, e.g. gtk:" | ||||
| @@ -1007,17 +999,17 @@ msgstr "" | ||||
| "напрыклад, gtk:fg[NORMAL], дзе NORMAL - гэта стан. Не ўдалося разабраць \"%s" | ||||
| "\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1303 | ||||
| #: ../src/ui/theme.c:1302 | ||||
| #, c-format | ||||
| msgid "Did not understand state \"%s\" in color specification" | ||||
| msgstr "Незразумелы стан \"%s\" у спецыфікацыі колеру" | ||||
|  | ||||
| #: ../src/ui/theme.c:1316 | ||||
| #: ../src/ui/theme.c:1315 | ||||
| #, c-format | ||||
| msgid "Did not understand color component \"%s\" in color specification" | ||||
| msgstr "Незразумелы складнік колеру \"%s\" у спецыфікацыі колеру" | ||||
|  | ||||
| #: ../src/ui/theme.c:1345 | ||||
| #: ../src/ui/theme.c:1344 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the " | ||||
| @@ -1026,58 +1018,58 @@ msgstr "" | ||||
| "Фармат змяшанага колеру - \"blend/bg_color/fg_color/alpha\". \"%s\" не " | ||||
| "адпавядае фармату." | ||||
|  | ||||
| #: ../src/ui/theme.c:1356 | ||||
| #: ../src/ui/theme.c:1355 | ||||
| #, c-format | ||||
| msgid "Could not parse alpha value \"%s\" in blended color" | ||||
| msgstr "Не ўдалося разабраць значэнне альфа \"%s\" ў змяшаным колеры" | ||||
|  | ||||
| #: ../src/ui/theme.c:1366 | ||||
| #: ../src/ui/theme.c:1365 | ||||
| #, c-format | ||||
| msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0" | ||||
| msgstr "" | ||||
| "Значэнне альфа \"%s\" у змяшаным колеры не ўваходзіць у дыяпазон ад 0.0 да " | ||||
| "1.0" | ||||
|  | ||||
| #: ../src/ui/theme.c:1413 | ||||
| #: ../src/ui/theme.c:1412 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format" | ||||
| msgstr "" | ||||
| "Фармат ценю - \"shade/base_color/factor\". \"%s\" не адпавядае фармату." | ||||
|  | ||||
| #: ../src/ui/theme.c:1424 | ||||
| #: ../src/ui/theme.c:1423 | ||||
| #, c-format | ||||
| msgid "Could not parse shade factor \"%s\" in shaded color" | ||||
| msgstr "Не ўдалося разабраць каэфіцыент ценю \"%s\" у зацененым колеры" | ||||
|  | ||||
| #: ../src/ui/theme.c:1434 | ||||
| #: ../src/ui/theme.c:1433 | ||||
| #, c-format | ||||
| msgid "Shade factor \"%s\" in shaded color is negative" | ||||
| msgstr "Каэфіцыент ценю \"%s\" у зацененым колеры адмоўны" | ||||
|  | ||||
| #: ../src/ui/theme.c:1463 | ||||
| #: ../src/ui/theme.c:1462 | ||||
| #, c-format | ||||
| msgid "Could not parse color \"%s\"" | ||||
| msgstr "Не ўдалося разабраць колер \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1780 | ||||
| #: ../src/ui/theme.c:1779 | ||||
| #, c-format | ||||
| msgid "Coordinate expression contains character '%s' which is not allowed" | ||||
| msgstr "Каардынатны выраз змяшчае забаронены знак \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1807 | ||||
| #: ../src/ui/theme.c:1806 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Coordinate expression contains floating point number '%s' which could not be " | ||||
| "parsed" | ||||
| msgstr "Каардынатны выраз змяшчае незразумелы лік з нефіксаванай коскай \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1821 | ||||
| #: ../src/ui/theme.c:1820 | ||||
| #, c-format | ||||
| msgid "Coordinate expression contains integer '%s' which could not be parsed" | ||||
| msgstr "Каардынатны выраз змяшчае незразумелы цэлы лік \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1942 | ||||
| #: ../src/ui/theme.c:1941 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Coordinate expression contained unknown operator at the start of this text: " | ||||
| @@ -1085,17 +1077,17 @@ msgid "" | ||||
| msgstr "" | ||||
| "Каардынатны выраз змяшчае невядомы аператар у пачатку гэтага тэксту: \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:1999 | ||||
| #: ../src/ui/theme.c:1998 | ||||
| #, c-format | ||||
| msgid "Coordinate expression was empty or not understood" | ||||
| msgstr "Каардынатны выраз пусты ці незразумелы" | ||||
|  | ||||
| #: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156 | ||||
| #: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155 | ||||
| #, c-format | ||||
| msgid "Coordinate expression results in division by zero" | ||||
| msgstr "Каардынатны выраз вымагае дзялення на нуль" | ||||
|  | ||||
| #: ../src/ui/theme.c:2164 | ||||
| #: ../src/ui/theme.c:2163 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Coordinate expression tries to use mod operator on a floating-point number" | ||||
| @@ -1103,24 +1095,24 @@ msgstr "" | ||||
| "Каардынатны выраз спрабуе ўжыць аператар дзялення па модулі для ліку з " | ||||
| "нефіксаванай коскай" | ||||
|  | ||||
| #: ../src/ui/theme.c:2220 | ||||
| #: ../src/ui/theme.c:2219 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Coordinate expression has an operator \"%s\" where an operand was expected" | ||||
| msgstr "" | ||||
| "У каардынатным выразе ўжыты аператар \"%s\" там, дзе мусіў быць аперанд" | ||||
|  | ||||
| #: ../src/ui/theme.c:2229 | ||||
| #: ../src/ui/theme.c:2228 | ||||
| #, c-format | ||||
| msgid "Coordinate expression had an operand where an operator was expected" | ||||
| msgstr "У каардынатным выразе ўжыты аперанд там, дзе мусіў быць аператар" | ||||
|  | ||||
| #: ../src/ui/theme.c:2237 | ||||
| #: ../src/ui/theme.c:2236 | ||||
| #, c-format | ||||
| msgid "Coordinate expression ended with an operator instead of an operand" | ||||
| msgstr "Каардынатны выраз заканчваецца аператарам, а не аперандам" | ||||
|  | ||||
| #: ../src/ui/theme.c:2247 | ||||
| #: ../src/ui/theme.c:2246 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Coordinate expression has operator \"%c\" following operator \"%c\" with no " | ||||
| @@ -1129,41 +1121,41 @@ msgstr "" | ||||
| "У каардынатным выразе за аператарам \"%c\" ідзе аператар \"%c\", але паміж " | ||||
| "імі няма аперанда" | ||||
|  | ||||
| #: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443 | ||||
| #: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442 | ||||
| #, c-format | ||||
| msgid "Coordinate expression had unknown variable or constant \"%s\"" | ||||
| msgstr "У каардынатным выразе невядомая зменная альбо канстанта \"%s\"" | ||||
|  | ||||
| #: ../src/ui/theme.c:2497 | ||||
| #: ../src/ui/theme.c:2496 | ||||
| #, c-format | ||||
| msgid "Coordinate expression parser overflowed its buffer." | ||||
| msgstr "Прылада для разбору каардынатных выразаў перапоўніла свой буфер." | ||||
|  | ||||
| #: ../src/ui/theme.c:2526 | ||||
| #: ../src/ui/theme.c:2525 | ||||
| #, c-format | ||||
| msgid "Coordinate expression had a close parenthesis with no open parenthesis" | ||||
| msgstr "" | ||||
| "У каардынатным выразе ўжытыя дужкі, якія закрываюцца, але няма тых, якія б " | ||||
| "адкрываліся" | ||||
|  | ||||
| #: ../src/ui/theme.c:2590 | ||||
| #: ../src/ui/theme.c:2589 | ||||
| #, c-format | ||||
| msgid "Coordinate expression had an open parenthesis with no close parenthesis" | ||||
| msgstr "" | ||||
| "У каардынатным выразе ўжытыя дужкі, якія адкрываюцца, але няма тых, якія б " | ||||
| "закрываліся" | ||||
|  | ||||
| #: ../src/ui/theme.c:2601 | ||||
| #: ../src/ui/theme.c:2600 | ||||
| #, c-format | ||||
| msgid "Coordinate expression doesn't seem to have any operators or operands" | ||||
| msgstr "У каардынатным выразе няма ні аператараў, ні аперандаў" | ||||
|  | ||||
| #: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854 | ||||
| #: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853 | ||||
| #, c-format | ||||
| msgid "Theme contained an expression that resulted in an error: %s\n" | ||||
| msgstr "Матыў аздаблення змяшчае выраз, які стаў прычынай памылкі: %s\n" | ||||
|  | ||||
| #: ../src/ui/theme.c:4500 | ||||
| #: ../src/ui/theme.c:4499 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be " | ||||
| @@ -1172,25 +1164,25 @@ msgstr "" | ||||
| "Для гэтага стылю рамкі трэба вызначыць <button function=\"%s\" state=\"%s\" " | ||||
| "draw_ops=\"whatever\"/>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036 | ||||
| #: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>" | ||||
| msgstr "" | ||||
| "Няма <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"што-небудзь\"/>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5082 | ||||
| #: ../src/ui/theme.c:5083 | ||||
| #, c-format | ||||
| msgid "Failed to load theme \"%s\": %s\n" | ||||
| msgstr "Не ўдалося загрузіць матыў аздаблення \"%s\": %s\n" | ||||
|  | ||||
| #: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232 | ||||
| #: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246 | ||||
| #: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233 | ||||
| #: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247 | ||||
| #, c-format | ||||
| msgid "No <%s> set for theme \"%s\"" | ||||
| msgstr "Для матыву аздаблення \"%2$s\" не прызначана <%1$s>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5254 | ||||
| #: ../src/ui/theme.c:5255 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "No frame style set for window type \"%s\" in theme \"%s\", add a <window " | ||||
| @@ -1199,7 +1191,7 @@ msgstr "" | ||||
| "Стыль рамкі не вызначаны для вокнаў тыпу \"%s\" для матыву аздаблення \"%s" | ||||
| "\". Дадайце <window type=\"%s\" style_set=\"штосьці\"/>." | ||||
|  | ||||
| #: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786 | ||||
| #: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "User-defined constants must begin with a capital letter; \"%s\" does not" | ||||
| @@ -1207,7 +1199,7 @@ msgstr "" | ||||
| "Назвы канстантаў, вызначаных карыстальнікам, мусяць пачынацца з вялікай " | ||||
| "літары. \"%s\" не адпавядае гэтаму патрабаванню." | ||||
|  | ||||
| #: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794 | ||||
| #: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795 | ||||
| #, c-format | ||||
| msgid "Constant \"%s\" has already been defined" | ||||
| msgstr "Канстанта \"%s\" ужо азначана" | ||||
| @@ -1593,8 +1585,207 @@ msgstr "Выкарыстанне тэксту ўнутры элемента <%s> | ||||
| msgid "<%s> specified twice for this theme" | ||||
| msgstr "<%s> двойчы вызначаны для гэтага матыву аздаблення" | ||||
|  | ||||
| #: ../src/ui/theme-parser.c:4336 | ||||
| #: ../src/ui/theme-parser.c:4334 | ||||
| #, c-format | ||||
| msgid "Failed to find a valid file for theme %s\n" | ||||
| msgstr "Памылка пошуку правільнага файла для матыву аздаблення %s\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:99 | ||||
| msgid "_Windows" | ||||
| msgstr "_Вокны" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:100 | ||||
| msgid "_Dialog" | ||||
| msgstr "_Дыялогавае акенца" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:101 | ||||
| msgid "_Modal dialog" | ||||
| msgstr "_Мадальнае дыялогавае акенца" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:102 | ||||
| msgid "_Utility" | ||||
| msgstr "_Дапаможная праграма" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:103 | ||||
| msgid "_Splashscreen" | ||||
| msgstr "_Экранная застаўка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:104 | ||||
| msgid "_Top dock" | ||||
| msgstr "_Верхняя ўбудова" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:105 | ||||
| msgid "_Bottom dock" | ||||
| msgstr "_Ніжняя ўбудова" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:106 | ||||
| msgid "_Left dock" | ||||
| msgstr "_Левая ўбудова" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:107 | ||||
| msgid "_Right dock" | ||||
| msgstr "_Правая ўбудова" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:108 | ||||
| msgid "_All docks" | ||||
| msgstr "_Усе ўбудовы" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:109 | ||||
| msgid "Des_ktop" | ||||
| msgstr "_Стол" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:115 | ||||
| msgid "Open another one of these windows" | ||||
| msgstr "Адкрыць чарговае з гэтых вокнаў" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:117 | ||||
| msgid "This is a demo button with an 'open' icon" | ||||
| msgstr "Гэта дэманстрацыйная кнопка са значком \"Адкрыць\"" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:119 | ||||
| msgid "This is a demo button with a 'quit' icon" | ||||
| msgstr "Гэта дэманстрацыйная кнопка са значком \"Выйсці\"" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:248 | ||||
| msgid "This is a sample message in a sample dialog" | ||||
| msgstr "Гэта ўзорнае паведамленне ва ўзорным дыялогавым акенцы" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:328 | ||||
| #, c-format | ||||
| msgid "Fake menu item %d\n" | ||||
| msgstr "Несапраўдны пункт меню %d\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:363 | ||||
| msgid "Border-only window" | ||||
| msgstr "Акно толькі з аблямоўкай" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:365 | ||||
| msgid "Bar" | ||||
| msgstr "Стужка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:382 | ||||
| msgid "Normal Application Window" | ||||
| msgstr "Звычайнае акно праграмы" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:386 | ||||
| msgid "Dialog Box" | ||||
| msgstr "Дыялогавае акенца" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:390 | ||||
| msgid "Modal Dialog Box" | ||||
| msgstr "Мадальнае дыялогавае акенца" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:394 | ||||
| msgid "Utility Palette" | ||||
| msgstr "Дапаможная палітра" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:398 | ||||
| msgid "Torn-off Menu" | ||||
| msgstr "Адчэпленае меню" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:402 | ||||
| msgid "Border" | ||||
| msgstr "Аблямоўка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:406 | ||||
| msgid "Attached Modal Dialog" | ||||
| msgstr "Прычапленае мадальнае дыялогавае акенца" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:737 | ||||
| #, c-format | ||||
| msgid "Button layout test %d" | ||||
| msgstr "Выпрабаванне размяшчэння кнопак %d" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:766 | ||||
| #, c-format | ||||
| msgid "%g milliseconds to draw one window frame" | ||||
| msgstr "%g мілісекунд, каб намаляваць адну рамку акна" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:811 | ||||
| #, c-format | ||||
| msgid "Usage: metacity-theme-viewer [THEMENAME]\n" | ||||
| msgstr "Правілы карыстання: metacity-theme-viewer [НАЗВА_МАТЫВУ]\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:818 | ||||
| #, c-format | ||||
| msgid "Error loading theme: %s\n" | ||||
| msgstr "Памылка загрузкі матыву аздаблення: %s\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:824 | ||||
| #, c-format | ||||
| msgid "Loaded theme \"%s\" in %g seconds\n" | ||||
| msgstr "Матыў аздаблення \"%s\" загружаны за %g секунд\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:869 | ||||
| msgid "Normal Title Font" | ||||
| msgstr "Звычайны шрыфт загалоўка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:875 | ||||
| msgid "Small Title Font" | ||||
| msgstr "Маленькі шрыфт загалоўка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:881 | ||||
| msgid "Large Title Font" | ||||
| msgstr "Вялікі шрыфт загалоўка" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:886 | ||||
| msgid "Button Layouts" | ||||
| msgstr "Размяшчэнне кнопак" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:891 | ||||
| msgid "Benchmark" | ||||
| msgstr "Выпрабаванне" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:947 | ||||
| msgid "Window Title Goes Here" | ||||
| msgstr "Месца для загалоўка акна" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1053 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g " | ||||
| "seconds wall clock time including X server resources (%g milliseconds per " | ||||
| "frame)\n" | ||||
| msgstr "" | ||||
| "Намалявана %d рамак цягам %g секунд кліенцкага часу (%g мілісекунд на рамку) " | ||||
| "і %g секунд каляндарнага часу, уключна з рэсурсамі X-сервера (%g мілісекунд " | ||||
| "на рамку)\n" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1273 | ||||
| msgid "position expression test returned TRUE but set error" | ||||
| msgstr "выпрабаванне выразу пазіцыі вярнула TRUE, але паведаміла аб памылцы" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1275 | ||||
| msgid "position expression test returned FALSE but didn't set error" | ||||
| msgstr "" | ||||
| "выпрабаванне выразу пазіцыі вярнула FALSE, але не паведаміла аб памылцы" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1279 | ||||
| msgid "Error was expected but none given" | ||||
| msgstr "Чакалася памылка, але звесткі не атрыманыя" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1281 | ||||
| #, c-format | ||||
| msgid "Error %d was expected but %d given" | ||||
| msgstr "Чакалася памылка %d, але атрымана %d" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1287 | ||||
| #, c-format | ||||
| msgid "Error not expected but one was returned: %s" | ||||
| msgstr "Атрымана нечаканая памылка: %s" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1291 | ||||
| #, c-format | ||||
| msgid "x value was %d, %d was expected" | ||||
| msgstr "X-значэнне было %d, а чакалася %d" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1294 | ||||
| #, c-format | ||||
| msgid "y value was %d, %d was expected" | ||||
| msgstr "Y-значэнне было %d, а чакалася %d" | ||||
|  | ||||
| #: ../src/ui/theme-viewer.c:1359 | ||||
| #, c-format | ||||
| msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n" | ||||
| msgstr "" | ||||
| "%d каардынатных выразаў разабраныя за %g секунд (у сярэднім %g секунд)\n" | ||||
|   | ||||
							
								
								
									
										2834
									
								
								po/ca@valencia.po
									
									
									
									
									
								
							
							
						
						
									
										2834
									
								
								po/ca@valencia.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										231
									
								
								po/et.po
									
									
									
									
									
								
							
							
						
						
									
										231
									
								
								po/et.po
									
									
									
									
									
								
							| @@ -14,8 +14,8 @@ msgstr "" | ||||
| "Project-Id-Version: mutter MASTER\n" | ||||
| "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" | ||||
| "product=mutter&keywords=I18N+L10N&component=general\n" | ||||
| "POT-Creation-Date: 2013-09-10 15:25+0000\n" | ||||
| "PO-Revision-Date: 2013-09-11 23:20+0300\n" | ||||
| "POT-Creation-Date: 2013-03-12 18:53+0000\n" | ||||
| "PO-Revision-Date: 2013-03-12 20:55+0300\n" | ||||
| "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n" | ||||
| "Language-Team: Estonian <>\n" | ||||
| "Language: et\n" | ||||
| @@ -23,7 +23,6 @@ msgstr "" | ||||
| "Content-Type: text/plain; charset=UTF-8\n" | ||||
| "Content-Transfer-Encoding: 8bit\n" | ||||
| "Plural-Forms: nplurals=2; plural=(n!=1);\n" | ||||
| "X-Generator: Poedit 1.5.4\n" | ||||
|  | ||||
| msgid "Navigation" | ||||
| msgstr "Navigeerimine" | ||||
| @@ -250,17 +249,6 @@ msgid "" | ||||
| msgstr "" | ||||
| "Teemat ei leitud! Veendu, et %s on olemas ja sisaldab harilikke teemasid.\n" | ||||
|  | ||||
| msgid "Built-in display" | ||||
| msgstr "Sisseehitatud kuva" | ||||
|  | ||||
| #. TRANSLATORS: this is a monitor name (in case we don't know | ||||
| #. the vendor), it's Unknown followed by a size in inches, | ||||
| #. like 'Unknown 15"' | ||||
| #. | ||||
| #, c-format | ||||
| msgid "Unknown %s" | ||||
| msgstr "Tundmatu %s" | ||||
|  | ||||
| #, c-format | ||||
| msgid "" | ||||
| "mutter %s\n" | ||||
| @@ -393,6 +381,7 @@ msgstr "Tõrge logifaili %s avamisel funktsiooniga fdopen(): %s\n" | ||||
| msgid "Opened log file %s\n" | ||||
| msgstr "Avati logifail %s\n" | ||||
|  | ||||
| #, c-format | ||||
| msgid "Mutter was compiled without support for verbose mode\n" | ||||
| msgstr "Mutter kompileeriti ilma jutuka režiimi toeta\n" | ||||
|  | ||||
| @@ -583,6 +572,10 @@ msgstr "Akna valimine tabulaatori hüpikaknalt" | ||||
| msgid "Cancel tab popup" | ||||
| msgstr "Tabulaatori hüpikakna katkestamine" | ||||
|  | ||||
| #, c-format | ||||
| msgid "Usage: %s\n" | ||||
| msgstr "Kasutamine: %s\n" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| msgid "Mi_nimize" | ||||
| msgstr "_Minimeeri" | ||||
| @@ -1288,151 +1281,159 @@ msgstr "Selle teema jaoks on <%s> määratud kaks korda" | ||||
| msgid "Failed to find a valid file for theme %s\n" | ||||
| msgstr "Tõrge %s teema jaoks korrektse faili leidmisel\n" | ||||
|  | ||||
| #~ msgid "Usage: %s\n" | ||||
| #~ msgstr "Kasutamine: %s\n" | ||||
| msgid "_Windows" | ||||
| msgstr "_Aknad" | ||||
|  | ||||
| #~ msgid "_Windows" | ||||
| #~ msgstr "_Aknad" | ||||
| msgid "_Dialog" | ||||
| msgstr "_Dialoog" | ||||
|  | ||||
| #~ msgid "_Dialog" | ||||
| #~ msgstr "_Dialoog" | ||||
| msgid "_Modal dialog" | ||||
| msgstr "_Modaaldialoog" | ||||
|  | ||||
| #~ msgid "_Modal dialog" | ||||
| #~ msgstr "_Modaaldialoog" | ||||
| msgid "_Utility" | ||||
| msgstr "_Utiliit" | ||||
|  | ||||
| #~ msgid "_Utility" | ||||
| #~ msgstr "_Utiliit" | ||||
| msgid "_Splashscreen" | ||||
| msgstr "_Käivitusekraan" | ||||
|  | ||||
| #~ msgid "_Splashscreen" | ||||
| #~ msgstr "_Käivitusekraan" | ||||
| msgid "_Top dock" | ||||
| msgstr "Ü_lemine dokk" | ||||
|  | ||||
| #~ msgid "_Top dock" | ||||
| #~ msgstr "Ü_lemine dokk" | ||||
| msgid "_Bottom dock" | ||||
| msgstr "_Alumine dokk" | ||||
|  | ||||
| #~ msgid "_Bottom dock" | ||||
| #~ msgstr "_Alumine dokk" | ||||
| msgid "_Left dock" | ||||
| msgstr "_Vasak dokk" | ||||
|  | ||||
| #~ msgid "_Left dock" | ||||
| #~ msgstr "_Vasak dokk" | ||||
| msgid "_Right dock" | ||||
| msgstr "_Parem dokk" | ||||
|  | ||||
| #~ msgid "_Right dock" | ||||
| #~ msgstr "_Parem dokk" | ||||
| msgid "_All docks" | ||||
| msgstr "_Kõik dokid" | ||||
|  | ||||
| #~ msgid "_All docks" | ||||
| #~ msgstr "_Kõik dokid" | ||||
| msgid "Des_ktop" | ||||
| msgstr "_Töölaud" | ||||
|  | ||||
| #~ msgid "Des_ktop" | ||||
| #~ msgstr "_Töölaud" | ||||
| msgid "Open another one of these windows" | ||||
| msgstr "Ava neist akendest järgmine" | ||||
|  | ||||
| #~ msgid "Open another one of these windows" | ||||
| #~ msgstr "Ava neist akendest järgmine" | ||||
| msgid "This is a demo button with an 'open' icon" | ||||
| msgstr "See on näidisnupp koos 'ava' ikooniga" | ||||
|  | ||||
| #~ msgid "This is a demo button with an 'open' icon" | ||||
| #~ msgstr "See on näidisnupp koos 'ava' ikooniga" | ||||
| msgid "This is a demo button with a 'quit' icon" | ||||
| msgstr "See on näidisnupp koos 'lõpeta' ikooniga" | ||||
|  | ||||
| #~ msgid "This is a demo button with a 'quit' icon" | ||||
| #~ msgstr "See on näidisnupp koos 'lõpeta' ikooniga" | ||||
| msgid "This is a sample message in a sample dialog" | ||||
| msgstr "See on näidisteade näidisdialoogis" | ||||
|  | ||||
| #~ msgid "This is a sample message in a sample dialog" | ||||
| #~ msgstr "See on näidisteade näidisdialoogis" | ||||
| #, c-format | ||||
| msgid "Fake menu item %d\n" | ||||
| msgstr "Võltsitud menüüpunkt %d\n" | ||||
|  | ||||
| #~ msgid "Fake menu item %d\n" | ||||
| #~ msgstr "Võltsitud menüüpunkt %d\n" | ||||
| msgid "Border-only window" | ||||
| msgstr "Ainult raamiga aken" | ||||
|  | ||||
| #~ msgid "Border-only window" | ||||
| #~ msgstr "Ainult raamiga aken" | ||||
| msgid "Bar" | ||||
| msgstr "Riba" | ||||
|  | ||||
| #~ msgid "Bar" | ||||
| #~ msgstr "Riba" | ||||
| msgid "Normal Application Window" | ||||
| msgstr "Tavaline rakenduseaken" | ||||
|  | ||||
| #~ msgid "Normal Application Window" | ||||
| #~ msgstr "Tavaline rakenduseaken" | ||||
| msgid "Dialog Box" | ||||
| msgstr "Dialoogikast" | ||||
|  | ||||
| #~ msgid "Dialog Box" | ||||
| #~ msgstr "Dialoogikast" | ||||
| msgid "Modal Dialog Box" | ||||
| msgstr "Modaalne dialoogikast" | ||||
|  | ||||
| #~ msgid "Modal Dialog Box" | ||||
| #~ msgstr "Modaalne dialoogikast" | ||||
| msgid "Utility Palette" | ||||
| msgstr "Rakendite palett" | ||||
|  | ||||
| #~ msgid "Utility Palette" | ||||
| #~ msgstr "Rakendite palett" | ||||
| msgid "Torn-off Menu" | ||||
| msgstr "Ärarebitav menüü" | ||||
|  | ||||
| #~ msgid "Torn-off Menu" | ||||
| #~ msgstr "Ärarebitav menüü" | ||||
| msgid "Border" | ||||
| msgstr "Raam" | ||||
|  | ||||
| #~ msgid "Border" | ||||
| #~ msgstr "Raam" | ||||
| msgid "Attached Modal Dialog" | ||||
| msgstr "Kinnistatud modaaldialoog" | ||||
|  | ||||
| #~ msgid "Attached Modal Dialog" | ||||
| #~ msgstr "Kinnistatud modaaldialoog" | ||||
| #, c-format | ||||
| msgid "Button layout test %d" | ||||
| msgstr "Nuppude paigutuse test %d" | ||||
|  | ||||
| #~ msgid "Button layout test %d" | ||||
| #~ msgstr "Nuppude paigutuse test %d" | ||||
| #, c-format | ||||
| msgid "%g milliseconds to draw one window frame" | ||||
| msgstr "%g millisekundit kulub ühe akna raami joonistamiseks" | ||||
|  | ||||
| #~ msgid "%g milliseconds to draw one window frame" | ||||
| #~ msgstr "%g millisekundit kulub ühe akna raami joonistamiseks" | ||||
| #, c-format | ||||
| msgid "Usage: metacity-theme-viewer [THEMENAME]\n" | ||||
| msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n" | ||||
|  | ||||
| #~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n" | ||||
| #~ msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n" | ||||
| #, c-format | ||||
| msgid "Error loading theme: %s\n" | ||||
| msgstr "Viga teema laadimisel: %s\n" | ||||
|  | ||||
| #~ msgid "Error loading theme: %s\n" | ||||
| #~ msgstr "Viga teema laadimisel: %s\n" | ||||
| #, c-format | ||||
| msgid "Loaded theme \"%s\" in %g seconds\n" | ||||
| msgstr "Teema \"%s\" laaditi %g sekundiga\n" | ||||
|  | ||||
| #~ msgid "Loaded theme \"%s\" in %g seconds\n" | ||||
| #~ msgstr "Teema \"%s\" laaditi %g sekundiga\n" | ||||
| msgid "Normal Title Font" | ||||
| msgstr "Tiitli tavasuurusega kirjatüüp" | ||||
|  | ||||
| #~ msgid "Normal Title Font" | ||||
| #~ msgstr "Tiitli tavasuurusega kirjatüüp" | ||||
| msgid "Small Title Font" | ||||
| msgstr "Tiitli väike kirjatüüp" | ||||
|  | ||||
| #~ msgid "Small Title Font" | ||||
| #~ msgstr "Tiitli väike kirjatüüp" | ||||
| msgid "Large Title Font" | ||||
| msgstr "Tiitli suur kirjatüüp" | ||||
|  | ||||
| #~ msgid "Large Title Font" | ||||
| #~ msgstr "Tiitli suur kirjatüüp" | ||||
| msgid "Button Layouts" | ||||
| msgstr "Nuppude paigutus" | ||||
|  | ||||
| #~ msgid "Button Layouts" | ||||
| #~ msgstr "Nuppude paigutus" | ||||
| msgid "Benchmark" | ||||
| msgstr "Jõudlus" | ||||
|  | ||||
| #~ msgid "Benchmark" | ||||
| #~ msgstr "Jõudlus" | ||||
| msgid "Window Title Goes Here" | ||||
| msgstr "Siia tuleb akna pealkiri" | ||||
|  | ||||
| #~ msgid "Window Title Goes Here" | ||||
| #~ msgstr "Siia tuleb akna pealkiri" | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g " | ||||
| "seconds wall clock time including X server resources (%g milliseconds per " | ||||
| "frame)\n" | ||||
| msgstr "" | ||||
| "Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit kaadrile) " | ||||
| "ja %g sekundiga seinakella järgi, millesse on kaasatud X-serveri " | ||||
| "ressursikasutus (%g millisekundit kaadrile)\n" | ||||
|  | ||||
| #~ msgid "" | ||||
| #~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and " | ||||
| #~ "%g seconds wall clock time including X server resources (%g milliseconds " | ||||
| #~ "per frame)\n" | ||||
| #~ msgstr "" | ||||
| #~ "Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit " | ||||
| #~ "kaadrile) ja %g sekundiga seinakella järgi, millesse on kaasatud X-" | ||||
| #~ "serveri ressursikasutus (%g millisekundit kaadrile)\n" | ||||
| msgid "position expression test returned TRUE but set error" | ||||
| msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea" | ||||
|  | ||||
| #~ msgid "position expression test returned TRUE but set error" | ||||
| #~ msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea" | ||||
| msgid "position expression test returned FALSE but didn't set error" | ||||
| msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga" | ||||
|  | ||||
| #~ msgid "position expression test returned FALSE but didn't set error" | ||||
| #~ msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga" | ||||
| msgid "Error was expected but none given" | ||||
| msgstr "Oodati viga, aga ühtegi ei edastatud" | ||||
|  | ||||
| #~ msgid "Error was expected but none given" | ||||
| #~ msgstr "Oodati viga, aga ühtegi ei edastatud" | ||||
| #, c-format | ||||
| msgid "Error %d was expected but %d given" | ||||
| msgstr "Oodati viga %d, aga edastati viga %d" | ||||
|  | ||||
| #~ msgid "Error %d was expected but %d given" | ||||
| #~ msgstr "Oodati viga %d, aga edastati viga %d" | ||||
| #, c-format | ||||
| msgid "Error not expected but one was returned: %s" | ||||
| msgstr "Viga ei oodatud, aga üks edastati: %s" | ||||
|  | ||||
| #~ msgid "Error not expected but one was returned: %s" | ||||
| #~ msgstr "Viga ei oodatud, aga üks edastati: %s" | ||||
| #, c-format | ||||
| msgid "x value was %d, %d was expected" | ||||
| msgstr "x väärtus oli %d, oodati väärtust %d" | ||||
|  | ||||
| #~ msgid "x value was %d, %d was expected" | ||||
| #~ msgstr "x väärtus oli %d, oodati väärtust %d" | ||||
| #, c-format | ||||
| msgid "y value was %d, %d was expected" | ||||
| msgstr "y väärtus oli %d, oodati väärtust %d" | ||||
|  | ||||
| #~ msgid "y value was %d, %d was expected" | ||||
| #~ msgstr "y väärtus oli %d, oodati väärtust %d" | ||||
|  | ||||
| #~ msgid "" | ||||
| #~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n" | ||||
| #~ msgstr "" | ||||
| #~ "%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n" | ||||
| #, c-format | ||||
| msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n" | ||||
| msgstr "" | ||||
| "%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n" | ||||
|  | ||||
| #~ msgid "Minimize window" | ||||
| #~ msgstr "Akna minimeerimine" | ||||
|   | ||||
							
								
								
									
										32
									
								
								po/ja.po
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								po/ja.po
									
									
									
									
									
								
							| @@ -12,8 +12,8 @@ msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: mutter master\n" | ||||
| "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n" | ||||
| "POT-Creation-Date: 2013-07-30 12:29+0000\n" | ||||
| "PO-Revision-Date: 2013-07-30 23:01+0900\n" | ||||
| "POT-Creation-Date: 2013-03-22 10:02+0000\n" | ||||
| "PO-Revision-Date: 2013-03-25 17:02+0000\n" | ||||
| "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n" | ||||
| "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n" | ||||
| "Language: ja\n" | ||||
| @@ -133,7 +133,7 @@ msgstr "コマンド実行プロンプトを表示する" | ||||
|  | ||||
| #: ../src/50-mutter-system.xml.in.h:3 | ||||
| msgid "Show the activities overview" | ||||
| msgstr "アクティビティ画面を表示する" | ||||
| msgstr "アクティビティを表示する" | ||||
|  | ||||
| #: ../src/50-mutter-windows.xml.in.h:1 | ||||
| msgid "Windows" | ||||
| @@ -213,12 +213,12 @@ msgstr "画面右半分に表示する" | ||||
|  | ||||
| #. This probably means that a non-WM compositor like xcompmgr is running; | ||||
| #. * we have no way to get it to exit | ||||
| #: ../src/compositor/compositor.c:589 | ||||
| #: ../src/compositor/compositor.c:568 | ||||
| #, c-format | ||||
| msgid "Another compositing manager is already running on screen %i on display \"%s\"." | ||||
| msgstr "既に別の合成マネージャーがディスプレイ \"%2$s\" 上のスクリーン %1$i で起動中です" | ||||
|  | ||||
| #: ../src/compositor/meta-background.c:1076 | ||||
| #: ../src/compositor/meta-background.c:1191 | ||||
| msgid "background texture could not be created from file" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -252,22 +252,22 @@ msgstr "待機する(_W)" | ||||
| msgid "_Force Quit" | ||||
| msgstr "強制終了する(_F)" | ||||
|  | ||||
| #: ../src/core/display.c:421 | ||||
| #: ../src/core/display.c:401 | ||||
| #, c-format | ||||
| msgid "Missing %s extension required for compositing" | ||||
| msgstr "ウィンドウの合成に必要な %s という拡張モジュールが存在しません" | ||||
|  | ||||
| #: ../src/core/display.c:513 | ||||
| #: ../src/core/display.c:493 | ||||
| #, c-format | ||||
| msgid "Failed to open X Window System display '%s'\n" | ||||
| msgstr "X Window System のディスプレイ '%s' のオープンに失敗しました\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1138 | ||||
| #: ../src/core/keybindings.c:935 | ||||
| #, c-format | ||||
| msgid "Some other program is already using the key %s with modifiers %x as a binding\n" | ||||
| msgstr "既にバインディングとして別のプログラムでキー %s (修飾キー %x) を使っています\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1335 | ||||
| #: ../src/core/keybindings.c:1135 | ||||
| #, fuzzy, c-format | ||||
| msgid "\"%s\" is not a valid accelerator\n" | ||||
| msgstr "\"%s\" はフォーカス属性のためには有効な値ではありません" | ||||
| @@ -328,26 +328,26 @@ msgstr "バージョンを表示する" | ||||
| msgid "Mutter plugin to use" | ||||
| msgstr "使用する Mutter のプラグイン" | ||||
|  | ||||
| #: ../src/core/prefs.c:1202 | ||||
| #: ../src/core/prefs.c:1095 | ||||
| msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n" | ||||
| msgstr "仕様に準拠していないアプリケーションに対する次善策は無効になっています。一部のアプリケーションは正常に動作しない可能性があります\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1277 | ||||
| #: ../src/core/prefs.c:1170 | ||||
| #, c-format | ||||
| msgid "Could not parse font description \"%s\" from GSettings key %s\n" | ||||
| msgstr "GSettings の %2$s キーからフォント名 \"%1$s\" を解析できませんでした\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1343 | ||||
| #: ../src/core/prefs.c:1236 | ||||
| #, c-format | ||||
| msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n" | ||||
| msgstr "設定データベース中の \"%s\" はマウスボタンの修飾キーとして妥当な値ではありません\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1909 | ||||
| #: ../src/core/prefs.c:1788 | ||||
| #, c-format | ||||
| msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n" | ||||
| msgstr "設定データベース中の \"%s\" はキーバインド \"%s\" に有効な値ではありません\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1999 | ||||
| #: ../src/core/prefs.c:1887 | ||||
| #, c-format | ||||
| msgid "Workspace %d" | ||||
| msgstr "ワークスペース %d" | ||||
| @@ -465,7 +465,7 @@ msgid "Window manager error: " | ||||
| msgstr "ウィンドウマネージャーのエラー: " | ||||
|  | ||||
| #. first time through | ||||
| #: ../src/core/window.c:7513 | ||||
| #: ../src/core/window.c:7596 | ||||
| #, c-format | ||||
| msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n" | ||||
| msgstr "ウィンドウ %s は ICCCM で指定されていたような WM_CLIENT_LEADER ウィンドウの代わりに自分自身で SM_CLIENT_ID を設定しています\n" | ||||
| @@ -477,7 +477,7 @@ msgstr "ウィンドウ %s は ICCCM で指定されていたような WM_CLIENT | ||||
| #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain | ||||
| #. * about these apps but make them work. | ||||
| #. | ||||
| #: ../src/core/window.c:8237 | ||||
| #: ../src/core/window.c:8320 | ||||
| #, c-format | ||||
| msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n" | ||||
| msgstr "ウィンドウ %s はリサイズ可能ではない MWM ヒント指示を設定していますが、最小サイズ %d x %d と最大サイズ %d x %dも設定しています。これはあまり意味がありません\n" | ||||
|   | ||||
							
								
								
									
										1859
									
								
								po/pt_BR.po
									
									
									
									
									
								
							
							
						
						
									
										1859
									
								
								po/pt_BR.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										417
									
								
								po/sk.po
									
									
									
									
									
								
							
							
						
						
									
										417
									
								
								po/sk.po
									
									
									
									
									
								
							| @@ -13,9 +13,9 @@ msgstr "" | ||||
| "Project-Id-Version: mutter\n" | ||||
| "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" | ||||
| "product=mutter&keywords=I18N+L10N&component=general\n" | ||||
| "POT-Creation-Date: 2013-08-21 17:41+0000\n" | ||||
| "PO-Revision-Date: 2013-08-02 14:46+0200\n" | ||||
| "Last-Translator: Ján Kyselica <kyselica.jan@gmail.com>\n" | ||||
| "POT-Creation-Date: 2013-05-24 21:44+0000\n" | ||||
| "PO-Revision-Date: 2013-05-18 16:53+0100\n" | ||||
| "Last-Translator: Jan Kyselica <kyselica.jan@gmail.com>\n" | ||||
| "Language-Team: Slovak <gnome-sk-list@gnome.org>\n" | ||||
| "Language: sk\n" | ||||
| "MIME-Version: 1.0\n" | ||||
| @@ -87,8 +87,9 @@ msgstr "Prepnúť okná aplikácie" | ||||
| # PK: zisti co to robi | ||||
| # description | ||||
| #: ../src/50-mutter-navigation.xml.in.h:13 | ||||
| #, fuzzy | ||||
| msgid "Switch system controls" | ||||
| msgstr "Prepnúť medzi ovládacími prvkami systému" | ||||
| msgstr "Prepnúť medzi systémovými ovládacími prvkami" | ||||
|  | ||||
| # description | ||||
| #: ../src/50-mutter-navigation.xml.in.h:14 | ||||
| @@ -103,8 +104,9 @@ msgstr "Prepnúť okná aplikácie priamo" | ||||
| # MČ: podobne ako vyššie: „cycle-panels“ | ||||
| # description | ||||
| #: ../src/50-mutter-navigation.xml.in.h:16 | ||||
| #, fuzzy | ||||
| msgid "Switch system controls directly" | ||||
| msgstr "Prepnúť medzi ovládacími prvkami systému priamo" | ||||
| msgstr "Prepnúť medzi systémovými ovládacími prvkami priamo" | ||||
|  | ||||
| # description | ||||
| #: ../src/50-mutter-navigation.xml.in.h:17 | ||||
| @@ -265,13 +267,13 @@ msgstr "Zobraziť rozdelenie napravo" | ||||
| # PK: je %i cislo obrazovky? ak ano tak "č. %i" | ||||
| #. This probably means that a non-WM compositor like xcompmgr is running; | ||||
| #. * we have no way to get it to exit | ||||
| #: ../src/compositor/compositor.c:596 | ||||
| #, c-format | ||||
| #: ../src/compositor/compositor.c:571 | ||||
| #, fuzzy, c-format | ||||
| msgid "" | ||||
| "Another compositing manager is already running on screen %i on display \"%s" | ||||
| "\"." | ||||
| msgstr "" | ||||
| "Pre obrazovku č. %i na displeji „%s“ je spustený už iný správca rozloženia." | ||||
| "Pre obrazovku %i na displeji „%s“ je spustený už iný správca rozloženia." | ||||
|  | ||||
| #: ../src/compositor/meta-background.c:1076 | ||||
| msgid "background texture could not be created from file" | ||||
| @@ -311,18 +313,18 @@ msgstr "_Počkať" | ||||
| msgid "_Force Quit" | ||||
| msgstr "_Vynútiť ukončenie" | ||||
|  | ||||
| #: ../src/core/display.c:421 | ||||
| #: ../src/core/display.c:401 | ||||
| #, c-format | ||||
| msgid "Missing %s extension required for compositing" | ||||
| msgstr "Rozšírenie %s, potrebné pre kompozitné prostredie, chýba" | ||||
|  | ||||
| # X window system preloz, napr. system na spravu okien X | ||||
| #: ../src/core/display.c:513 | ||||
| #: ../src/core/display.c:493 | ||||
| #, c-format | ||||
| msgid "Failed to open X Window System display '%s'\n" | ||||
| msgstr "Zlyhalo otvorenie displeja systému na správu okien X „%s“\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1136 | ||||
| #: ../src/core/keybindings.c:970 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Some other program is already using the key %s with modifiers %x as a " | ||||
| @@ -330,7 +332,7 @@ msgid "" | ||||
| msgstr "" | ||||
| "Iný program už používa kláves %s s modifikátormi %x ako klávesovú skratku\n" | ||||
|  | ||||
| #: ../src/core/keybindings.c:1333 | ||||
| #: ../src/core/keybindings.c:1151 | ||||
| #, c-format | ||||
| msgid "\"%s\" is not a valid accelerator\n" | ||||
| msgstr "„%s“ nie je platný akcelerátor\n" | ||||
| @@ -376,20 +378,6 @@ msgid "" | ||||
| msgstr "" | ||||
| "Nepodarilo sa nájsť tému! Overte, že %s existuje a obsahuje obvyklé témy.\n" | ||||
|  | ||||
| #: ../src/core/monitor.c:702 | ||||
| msgid "Built-in display" | ||||
| msgstr "Vstavaný displej" | ||||
|  | ||||
| #. TRANSLATORS: this is a monitor name (in case we don't know | ||||
| #. the vendor), it's Unknown followed by a size in inches, | ||||
| #. like 'Unknown 15"' | ||||
| #. | ||||
| #: ../src/core/monitor.c:730 | ||||
| #, c-format | ||||
| #| msgid "Unknown element %s" | ||||
| msgid "Unknown %s" | ||||
| msgstr "Neznámy %s" | ||||
|  | ||||
| #: ../src/core/mutter.c:40 | ||||
| #, c-format | ||||
| msgid "" | ||||
| @@ -415,7 +403,7 @@ msgstr "Zobrazí verziu" | ||||
| msgid "Mutter plugin to use" | ||||
| msgstr "Použije zásuvný modul Mutter" | ||||
|  | ||||
| #: ../src/core/prefs.c:1202 | ||||
| #: ../src/core/prefs.c:1193 | ||||
| msgid "" | ||||
| "Workarounds for broken applications disabled. Some applications may not " | ||||
| "behave properly.\n" | ||||
| @@ -423,12 +411,12 @@ msgstr "" | ||||
| "Náhradné riešenia pre chybné aplikácie nie sú povolené. Niektoré aplikácie " | ||||
| "sa nemusia správať správne.\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1277 | ||||
| #: ../src/core/prefs.c:1268 | ||||
| #, c-format | ||||
| msgid "Could not parse font description \"%s\" from GSettings key %s\n" | ||||
| msgstr "Nepodarilo sa spracovať popis písma „%s“ z kľúča GSettings %s\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1343 | ||||
| #: ../src/core/prefs.c:1334 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "\"%s\" found in configuration database is not a valid value for mouse button " | ||||
| @@ -437,7 +425,7 @@ msgstr "" | ||||
| "V konfiguračnej databáze sa našlo „%s“, čo nie je platná hodnota pre " | ||||
| "modifikátor tlačidla myši\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1909 | ||||
| #: ../src/core/prefs.c:1881 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "\"%s\" found in configuration database is not a valid value for keybinding " | ||||
| @@ -446,17 +434,17 @@ msgstr "" | ||||
| "V konfiguračnej databáze sa našlo „%s“, čo nie je platná hodnota pre " | ||||
| "klávesovú skratku „%s“\n" | ||||
|  | ||||
| #: ../src/core/prefs.c:1999 | ||||
| #: ../src/core/prefs.c:1945 | ||||
| #, c-format | ||||
| msgid "Workspace %d" | ||||
| msgstr "Pracovný priestor č. %d" | ||||
|  | ||||
| #: ../src/core/screen.c:537 | ||||
| #: ../src/core/screen.c:691 | ||||
| #, c-format | ||||
| msgid "Screen %d on display '%s' is invalid\n" | ||||
| msgstr "Obrazovka č. %d na displeji „%s“ nie je platná\n" | ||||
|  | ||||
| #: ../src/core/screen.c:553 | ||||
| #: ../src/core/screen.c:707 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Screen %d on display \"%s\" already has a window manager; try using the --" | ||||
| @@ -465,7 +453,7 @@ msgstr "" | ||||
| "Obrazovka č. %d na displeji „%s“ už má správcu okien. Skúste použiť prepínač " | ||||
| "--replace, aby sa aktuálny správca nahradil.\n" | ||||
|  | ||||
| #: ../src/core/screen.c:580 | ||||
| #: ../src/core/screen.c:734 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Could not acquire window manager selection on screen %d display \"%s\"\n" | ||||
| @@ -473,12 +461,12 @@ msgstr "" | ||||
| "Nepodarilo sa získať výber správcu okien pre obrazovku č. %d na displeji " | ||||
| "„%s“\n" | ||||
|  | ||||
| #: ../src/core/screen.c:658 | ||||
| #: ../src/core/screen.c:812 | ||||
| #, c-format | ||||
| msgid "Screen %d on display \"%s\" already has a window manager\n" | ||||
| msgstr "Obrazovka č. %d na displeji „%s“ už má správcu okien\n" | ||||
|  | ||||
| #: ../src/core/screen.c:850 | ||||
| #: ../src/core/screen.c:998 | ||||
| #, c-format | ||||
| msgid "Could not release screen %d on display \"%s\"\n" | ||||
| msgstr "Nepodarilo sa uvoľniť obrazovku č. %d na displeji „%s“\n" | ||||
| @@ -554,7 +542,8 @@ msgstr "Zlyhalo otvorenie súboru so záznamom pomocou fdopen() %s: %s\n" | ||||
| msgid "Opened log file %s\n" | ||||
| msgstr "Otvorený súbor so záznamom %s\n" | ||||
|  | ||||
| #: ../src/core/util.c:119 | ||||
| #: ../src/core/util.c:119 ../src/tools/mutter-message.c:149 | ||||
| #, c-format | ||||
| msgid "Mutter was compiled without support for verbose mode\n" | ||||
| msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n" | ||||
|  | ||||
| @@ -562,20 +551,20 @@ msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n" | ||||
| msgid "Window manager: " | ||||
| msgstr "Správca okien: " | ||||
|  | ||||
| #: ../src/core/util.c:414 | ||||
| #: ../src/core/util.c:412 | ||||
| msgid "Bug in window manager: " | ||||
| msgstr "Chyba v správcovi okien: " | ||||
|  | ||||
| #: ../src/core/util.c:445 | ||||
| #: ../src/core/util.c:443 | ||||
| msgid "Window manager warning: " | ||||
| msgstr "Varovanie správcu okien: " | ||||
|  | ||||
| #: ../src/core/util.c:473 | ||||
| #: ../src/core/util.c:471 | ||||
| msgid "Window manager error: " | ||||
| msgstr "Chyba správcu okien: " | ||||
|  | ||||
| #. first time through | ||||
| #: ../src/core/window.c:7533 | ||||
| #: ../src/core/window.c:7505 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER " | ||||
| @@ -591,7 +580,7 @@ msgstr "" | ||||
| #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain | ||||
| #. * about these apps but make them work. | ||||
| #. | ||||
| #: ../src/core/window.c:8257 | ||||
| #: ../src/core/window.c:8229 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "Window %s sets an MWM hint indicating it isn't resizable, but sets min size " | ||||
| @@ -601,7 +590,7 @@ msgstr "" | ||||
| "nastavuje minimálnu veľkosť %d x %d a maximálnu veľkosť %d x %d. To nedáva " | ||||
| "zmysel.\n" | ||||
|  | ||||
| #: ../src/core/window-props.c:347 | ||||
| #: ../src/core/window-props.c:318 | ||||
| #, c-format | ||||
| msgid "Application set a bogus _NET_WM_PID %lu\n" | ||||
| msgstr "Aplikácia nastavila neplatné _NET_WM_PID %lu\n" | ||||
| @@ -609,18 +598,18 @@ msgstr "Aplikácia nastavila neplatné _NET_WM_PID %lu\n" | ||||
| # PK: co je toto? | ||||
| # JK: nedokazem zistit | ||||
| # PM: vyžiadaj komentár od vývojárov, pomožeme aj ostatným prekladateľom | ||||
| #: ../src/core/window-props.c:463 | ||||
| #: ../src/core/window-props.c:434 | ||||
| #, fuzzy, c-format | ||||
| msgid "%s (on %s)" | ||||
| msgstr "%s (na %s)" | ||||
|  | ||||
| #: ../src/core/window-props.c:1546 | ||||
| #: ../src/core/window-props.c:1517 | ||||
| #, c-format | ||||
| msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n" | ||||
| msgstr "Neplatné WM_TRANSIENT_FOR okno 0x%lx nastavené pre %s.\n" | ||||
|  | ||||
| # MČ: zacykliť sa, alebo vytvoriť slučku. | ||||
| #: ../src/core/window-props.c:1557 | ||||
| #: ../src/core/window-props.c:1528 | ||||
| #, c-format | ||||
| msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n" | ||||
| msgstr "WM_TRANSIENT_FOR okno 0x%lx  pre %s môže vytvoriť slučku.\n" | ||||
| @@ -708,9 +697,9 @@ msgid "" | ||||
| "vertically and resizes them horizontally to cover half of the available " | ||||
| "area. Dropping windows on the top screen edge maximizes them completely." | ||||
| msgstr "" | ||||
| "Ak je povolené, upustenie okien pri zvislých okrajoch obrazovky ich zvislo " | ||||
| "maximalizuje a vodorovná veľkosť sa zmení na polovicu dostupnej plochy. " | ||||
| "Upustenie okien pri vrchnom okraji obrazovky ich maximalizuje úplne." | ||||
| "Ak je povolené, upustenie okien pri zvislých okrajoch obrazovky ich " | ||||
| "zvislo maximalizuje a vodorovná veľkosť sa zmení na polovicu dostupnej " | ||||
| "plochy. Upustenie okien pri vrchnom okraji obrazovky ich maximalizuje úplne." | ||||
|  | ||||
| # summary | ||||
| #: ../src/org.gnome.mutter.gschema.xml.in.h:7 | ||||
| @@ -746,8 +735,9 @@ msgstr "" | ||||
| # PM: ja by som dal Bez vyvovlávania tabulátorom | ||||
| # summary | ||||
| #: ../src/org.gnome.mutter.gschema.xml.in.h:11 | ||||
| #, fuzzy | ||||
| msgid "No tab popup" | ||||
| msgstr "Bez vyvolávania tabulátorom" | ||||
| msgstr "Nepoužívať prekryvnú ponuku tabulátora" | ||||
|  | ||||
| # MČ: Neviem, čo to presne má robiť, ale popis som pochopil inak. „…či sa má používať rozbaľovacia ponuka a zvýraznenie rámikom sa má vypnúť…“ | ||||
| # description | ||||
| @@ -816,104 +806,109 @@ msgstr "Vybrať okno z rozbaľovacej ponuky tabulátoru" | ||||
| msgid "Cancel tab popup" | ||||
| msgstr "Zrušit rozbaľovaciu ponuku tabulátoru" | ||||
|  | ||||
| #: ../src/tools/mutter-message.c:123 | ||||
| #, c-format | ||||
| msgid "Usage: %s\n" | ||||
| msgstr "Použitie: %s\n" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:67 | ||||
| #: ../src/ui/menu.c:69 | ||||
| msgid "Mi_nimize" | ||||
| msgstr "Mi_nimalizovať" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:69 | ||||
| #: ../src/ui/menu.c:71 | ||||
| msgid "Ma_ximize" | ||||
| msgstr "Ma_ximalizovať" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:71 | ||||
| #: ../src/ui/menu.c:73 | ||||
| msgid "Unma_ximize" | ||||
| msgstr "Zrušiť ma_ximalizáciu" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:73 | ||||
| #: ../src/ui/menu.c:75 | ||||
| msgid "Roll _Up" | ||||
| msgstr "_Zabaliť" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:75 | ||||
| #: ../src/ui/menu.c:77 | ||||
| msgid "_Unroll" | ||||
| msgstr "_Rozbaliť" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:77 | ||||
| #: ../src/ui/menu.c:79 | ||||
| msgid "_Move" | ||||
| msgstr "Pre_miestniť" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:79 | ||||
| #: ../src/ui/menu.c:81 | ||||
| msgid "_Resize" | ||||
| msgstr "Zmeniť veľko_sť" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:81 | ||||
| #: ../src/ui/menu.c:83 | ||||
| msgid "Move Titlebar On_screen" | ||||
| msgstr "Presunúť titulok na _obrazovku" | ||||
|  | ||||
| #. separator | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:84 ../src/ui/menu.c:86 | ||||
| #: ../src/ui/menu.c:86 ../src/ui/menu.c:88 | ||||
| msgid "Always on _Top" | ||||
| msgstr "Vždy na_vrchu" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:88 | ||||
| #: ../src/ui/menu.c:90 | ||||
| msgid "_Always on Visible Workspace" | ||||
| msgstr "Vž_dy na viditeľnom pracovnom priestore" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:90 | ||||
| #: ../src/ui/menu.c:92 | ||||
| msgid "_Only on This Workspace" | ||||
| msgstr "_Len na tomto pracovnom priestore" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:92 | ||||
| #: ../src/ui/menu.c:94 | ||||
| msgid "Move to Workspace _Left" | ||||
| msgstr "Presunúť na pracovný priestor vľav_o" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:94 | ||||
| #: ../src/ui/menu.c:96 | ||||
| msgid "Move to Workspace R_ight" | ||||
| msgstr "Presunúť na pracovný priestor v_pravo" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:96 | ||||
| #: ../src/ui/menu.c:98 | ||||
| msgid "Move to Workspace _Up" | ||||
| msgstr "Presunúť na pracovný priestor _hore" | ||||
|  | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:98 | ||||
| #: ../src/ui/menu.c:100 | ||||
| msgid "Move to Workspace _Down" | ||||
| msgstr "Presunúť na pracovný priestor _dole" | ||||
|  | ||||
| #. separator | ||||
| #. Translators: Translate this string the same way as you do in libwnck! | ||||
| #: ../src/ui/menu.c:102 | ||||
| #: ../src/ui/menu.c:104 | ||||
| msgid "_Close" | ||||
| msgstr "_Zavrieť" | ||||
|  | ||||
| #: ../src/ui/menu.c:202 | ||||
| #: ../src/ui/menu.c:204 | ||||
| #, c-format | ||||
| msgid "Workspace %d%n" | ||||
| msgstr "Pracovná priestor %d%n" | ||||
|  | ||||
| #: ../src/ui/menu.c:212 | ||||
| #: ../src/ui/menu.c:214 | ||||
| #, c-format | ||||
| msgid "Workspace 1_0" | ||||
| msgstr "Pracovný priestor 1_0" | ||||
|  | ||||
| #: ../src/ui/menu.c:214 | ||||
| #: ../src/ui/menu.c:216 | ||||
| #, c-format | ||||
| msgid "Workspace %s%d" | ||||
| msgstr "Pracovný priestor %s%d" | ||||
|  | ||||
| #: ../src/ui/menu.c:384 | ||||
| #: ../src/ui/menu.c:397 | ||||
| msgid "Move to Another _Workspace" | ||||
| msgstr "P_resunúť na iný pracovný priestor" | ||||
|  | ||||
| @@ -1071,21 +1066,21 @@ msgstr "" | ||||
| # MČ: Preformuloval by som koniec: „platné sú len znaky A-Za-z0-9-_“ | ||||
| # PK: color_name je asi nejaky atribut, to sa nepreklada, ked tak do zatvorky | ||||
| #: ../src/ui/theme.c:1219 | ||||
| #, c-format | ||||
| #, fuzzy, c-format | ||||
| msgid "" | ||||
| "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-" | ||||
| "_ are valid" | ||||
| msgstr "" | ||||
| "V parametri color_name (názov farby) pre gtk:custom je neplatný znak „%c“, platné sú len " | ||||
| "V parametri názov_farby pre gtk:custom je neplatný znak „%c“, platné sú len " | ||||
| "znaky A-Za-z0-9-_" | ||||
|  | ||||
| #: ../src/ui/theme.c:1233 | ||||
| #, c-format | ||||
| #, fuzzy, c-format | ||||
| msgid "" | ||||
| "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not " | ||||
| "fit the format" | ||||
| msgstr "" | ||||
| "Formát Gtk:custom je  „gtk:custom(color_name,fallback)“, „%s“ tomu " | ||||
| "Formát Gtk:custom je  „gtk:custom(názov_farby,fallback)“, „%s“ tomu " | ||||
| "nezodpovedá" | ||||
|  | ||||
| #: ../src/ui/theme.c:1278 | ||||
| @@ -1271,20 +1266,20 @@ msgid "" | ||||
| "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>" | ||||
| msgstr "Chýbajúce <frame state=„%s“ resize=„%s“ focus=„%s“ style=„whatever“/>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5082 | ||||
| #: ../src/ui/theme.c:5084 | ||||
| #, c-format | ||||
| msgid "Failed to load theme \"%s\": %s\n" | ||||
| msgstr "Zlyhalo načítanie témy „%s“: %s\n" | ||||
|  | ||||
| # PK: prvok? | ||||
| # JK: XML značka (XML tag) | ||||
| #: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232 | ||||
| #: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246 | ||||
| #: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234 | ||||
| #: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248 | ||||
| #, c-format | ||||
| msgid "No <%s> set for theme \"%s\"" | ||||
| msgstr "Pre tému „%s“ nie je nastavená <%s>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5254 | ||||
| #: ../src/ui/theme.c:5256 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "No frame style set for window type \"%s\" in theme \"%s\", add a <window " | ||||
| @@ -1293,13 +1288,13 @@ msgstr "" | ||||
| "Pre typ okna „%s“ nie je sada štýlov v téme „%s“, pridajte prvok <window " | ||||
| "type=„%s“ style_set=„whatever“/>" | ||||
|  | ||||
| #: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786 | ||||
| #: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788 | ||||
| #, c-format | ||||
| msgid "" | ||||
| "User-defined constants must begin with a capital letter; \"%s\" does not" | ||||
| msgstr "Používateľské konštanty musia začínať veľkým písmenom, „%s“ nezačína" | ||||
|  | ||||
| #: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794 | ||||
| #: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796 | ||||
| #, c-format | ||||
| msgid "Constant \"%s\" has already been defined" | ||||
| msgstr "Konštanta „%s“ už je definovaná" | ||||
| @@ -1402,7 +1397,7 @@ msgstr "<%s> musí uvádzať buď geometriu alebo rodiča, ktorý má geometriu" | ||||
| msgid "You must specify a background for an alpha value to be meaningful" | ||||
| msgstr "Ak má byť hodnota alpha zmysluplná, tak musíte vybrať nejaké pozadie" | ||||
|  | ||||
| #  PM: asi atribút type | ||||
| # PM: asi atribút type | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123 | ||||
| #: ../src/ui/theme-parser.c:1264 | ||||
| #, fuzzy, c-format | ||||
| @@ -1564,7 +1559,6 @@ msgid "\"%s\" is not a valid value for resize attribute" | ||||
| msgstr "„%s“ nie je platná hodnota pre atribút zmeny veľkosti" | ||||
|  | ||||
| # PK: shaded states? to zatvorky daj popis co je resize | ||||
| # PM: skôr "pre stavy maximized (maximalizovaný)/shaded (zatienený)" | ||||
| #: ../src/ui/theme-parser.c:3147 | ||||
| #, fuzzy, c-format | ||||
| msgid "" | ||||
| @@ -1706,172 +1700,221 @@ msgstr "<%s> uvedený dvakrát pre túto tému" | ||||
| msgid "Failed to find a valid file for theme %s\n" | ||||
| msgstr "Zlyhalo nájdenie platného súboru pre tému%s\n" | ||||
|  | ||||
| #~ msgid "Usage: %s\n" | ||||
| #~ msgstr "Použitie: %s\n" | ||||
| #: ../src/ui/theme-viewer.c:99 | ||||
| msgid "_Windows" | ||||
| msgstr "_Okná" | ||||
|  | ||||
| #~ msgid "_Windows" | ||||
| #~ msgstr "_Okná" | ||||
| #: ../src/ui/theme-viewer.c:100 | ||||
| msgid "_Dialog" | ||||
| msgstr "_Dialógové okno" | ||||
|  | ||||
| #~ msgid "_Dialog" | ||||
| #~ msgstr "_Dialógové okno" | ||||
| #: ../src/ui/theme-viewer.c:101 | ||||
| msgid "_Modal dialog" | ||||
| msgstr "_Modálne dialógové okno" | ||||
|  | ||||
| #~ msgid "_Modal dialog" | ||||
| #~ msgstr "_Modálne dialógové okno" | ||||
| #: ../src/ui/theme-viewer.c:102 | ||||
| msgid "_Utility" | ||||
| msgstr "_Nástroje" | ||||
|  | ||||
| #~ msgid "_Utility" | ||||
| #~ msgstr "_Nástroje" | ||||
|  | ||||
| #~ msgid "_Splashscreen" | ||||
| #~ msgstr "Ú_vodná obrazovka" | ||||
| #: ../src/ui/theme-viewer.c:103 | ||||
| msgid "_Splashscreen" | ||||
| msgstr "Ú_vodná obrazovka" | ||||
|  | ||||
| # MČ: nie som si istý prekladom „dok“, nemal by to byť „panel“? | ||||
| #~ msgid "_Top dock" | ||||
| #~ msgstr "_Horný panel" | ||||
| #: ../src/ui/theme-viewer.c:104 | ||||
| msgid "_Top dock" | ||||
| msgstr "_Horný panel" | ||||
|  | ||||
| #~ msgid "_Bottom dock" | ||||
| #~ msgstr "_Spodný panel" | ||||
| #: ../src/ui/theme-viewer.c:105 | ||||
| msgid "_Bottom dock" | ||||
| msgstr "_Spodný panel" | ||||
|  | ||||
| #~ msgid "_Left dock" | ||||
| #~ msgstr "Ľ_avý panel" | ||||
| #: ../src/ui/theme-viewer.c:106 | ||||
| msgid "_Left dock" | ||||
| msgstr "Ľ_avý panel" | ||||
|  | ||||
| #~ msgid "_Right dock" | ||||
| #~ msgstr "_Pravý panel" | ||||
| #: ../src/ui/theme-viewer.c:107 | ||||
| msgid "_Right dock" | ||||
| msgstr "_Pravý panel" | ||||
|  | ||||
| #~ msgid "_All docks" | ||||
| #~ msgstr "_Všetky panely" | ||||
| #: ../src/ui/theme-viewer.c:108 | ||||
| msgid "_All docks" | ||||
| msgstr "_Všetky panely" | ||||
|  | ||||
| #~ msgid "Des_ktop" | ||||
| #~ msgstr "P_racovná plocha" | ||||
| #: ../src/ui/theme-viewer.c:109 | ||||
| msgid "Des_ktop" | ||||
| msgstr "P_racovná plocha" | ||||
|  | ||||
| # tooltip | ||||
| #~ msgid "Open another one of these windows" | ||||
| #~ msgstr "Otvorí ďalšie z týchto okien" | ||||
| #: ../src/ui/theme-viewer.c:115 | ||||
| msgid "Open another one of these windows" | ||||
| msgstr "Otvorí ďalšie z týchto okien" | ||||
|  | ||||
| # PK: prekladat to v uvodzovkach? nahlas bug | ||||
| # tooltip | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123 | ||||
| #: ../src/ui/theme-viewer.c:117 | ||||
| #, fuzzy | ||||
| #~ msgid "This is a demo button with an 'open' icon" | ||||
| #~ msgstr "Toto je ukážkové tlačidlo s ikonou „open“" | ||||
| msgid "This is a demo button with an 'open' icon" | ||||
| msgstr "Toto je ukážkové tlačidlo s ikonou „open“" | ||||
|  | ||||
| # tooltip | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123 | ||||
| #: ../src/ui/theme-viewer.c:119 | ||||
| #, fuzzy | ||||
| #~ msgid "This is a demo button with a 'quit' icon" | ||||
| #~ msgstr "Toto je ukážkové tlačidlo s ikonou „quit“" | ||||
| msgid "This is a demo button with a 'quit' icon" | ||||
| msgstr "Toto je ukážkové tlačidlo s ikonou „quit“" | ||||
|  | ||||
| # label | ||||
| #~ msgid "This is a sample message in a sample dialog" | ||||
| #~ msgstr "Toto je ukážková správa v ukážkovom dialógovom okne" | ||||
| #: ../src/ui/theme-viewer.c:248 | ||||
| msgid "This is a sample message in a sample dialog" | ||||
| msgstr "Toto je ukážková správa v ukážkovom dialógovom okne" | ||||
|  | ||||
| # PK: falosna | ||||
| #~ msgid "Fake menu item %d\n" | ||||
| #~ msgstr "Falošná položka ponuky č. %d\n" | ||||
| #: ../src/ui/theme-viewer.c:328 | ||||
| #, c-format | ||||
| msgid "Fake menu item %d\n" | ||||
| msgstr "Falošná položka ponuky č. %d\n" | ||||
|  | ||||
| #~ msgid "Border-only window" | ||||
| #~ msgstr "Okno len s okrajom" | ||||
| #: ../src/ui/theme-viewer.c:363 | ||||
| msgid "Border-only window" | ||||
| msgstr "Okno len s okrajom" | ||||
|  | ||||
| #~ msgid "Bar" | ||||
| #~ msgstr "Lišta" | ||||
| #: ../src/ui/theme-viewer.c:365 | ||||
| msgid "Bar" | ||||
| msgstr "Lišta" | ||||
|  | ||||
| #~ msgid "Normal Application Window" | ||||
| #~ msgstr "Normálne aplikačné okno" | ||||
| #: ../src/ui/theme-viewer.c:382 | ||||
| msgid "Normal Application Window" | ||||
| msgstr "Normálne aplikačné okno" | ||||
|  | ||||
| #~ msgid "Dialog Box" | ||||
| #~ msgstr "Dialógové okno" | ||||
| #: ../src/ui/theme-viewer.c:386 | ||||
| msgid "Dialog Box" | ||||
| msgstr "Dialógové okno" | ||||
|  | ||||
| #~ msgid "Modal Dialog Box" | ||||
| #~ msgstr "Modálne dialógové okno" | ||||
| #: ../src/ui/theme-viewer.c:390 | ||||
| msgid "Modal Dialog Box" | ||||
| msgstr "Modálne dialógové okno" | ||||
|  | ||||
| #~ msgid "Utility Palette" | ||||
| #~ msgstr "Paleta nástrojov" | ||||
| #: ../src/ui/theme-viewer.c:394 | ||||
| msgid "Utility Palette" | ||||
| msgstr "Paleta nástrojov" | ||||
|  | ||||
| #~ msgid "Torn-off Menu" | ||||
| #~ msgstr "Vypnúť ponuku" | ||||
| #: ../src/ui/theme-viewer.c:398 | ||||
| msgid "Torn-off Menu" | ||||
| msgstr "Vypnúť ponuku" | ||||
|  | ||||
| #~ msgid "Border" | ||||
| #~ msgstr "Okraj" | ||||
| #: ../src/ui/theme-viewer.c:402 | ||||
| msgid "Border" | ||||
| msgstr "Okraj" | ||||
|  | ||||
| #~ msgid "Attached Modal Dialog" | ||||
| #~ msgstr "Pričlenené modálne okno" | ||||
| #: ../src/ui/theme-viewer.c:406 | ||||
| msgid "Attached Modal Dialog" | ||||
| msgstr "Pričlenené modálne okno" | ||||
|  | ||||
| #~ msgid "Button layout test %d" | ||||
| #~ msgstr "Test rozloženia tlačidiel č. %d" | ||||
| #: ../src/ui/theme-viewer.c:737 | ||||
| #, c-format | ||||
| msgid "Button layout test %d" | ||||
| msgstr "Test rozloženia tlačidiel č. %d" | ||||
|  | ||||
| # PK: plural forms | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987 | ||||
| #, fuzzy | ||||
| #~ msgid "%g milliseconds to draw one window frame" | ||||
| #~ msgstr "%g milisekúnd pre vykreslenie jedného rámca okna" | ||||
| #: ../src/ui/theme-viewer.c:766 | ||||
| #, fuzzy, c-format | ||||
| msgid "%g milliseconds to draw one window frame" | ||||
| msgstr "%g milisekúnd pre vykreslenie jedného rámca okna" | ||||
|  | ||||
| #~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n" | ||||
| #~ msgstr "Použitie: metacity-theme-viewer [NÁZOVTÉMY]\n" | ||||
| #: ../src/ui/theme-viewer.c:811 | ||||
| #, c-format | ||||
| msgid "Usage: metacity-theme-viewer [THEMENAME]\n" | ||||
| msgstr "Použitie: metacity-theme-viewer [NÁZOVTÉMY]\n" | ||||
|  | ||||
| #~ msgid "Error loading theme: %s\n" | ||||
| #~ msgstr "Chyba pri načítavaní témy: %s\n" | ||||
| #: ../src/ui/theme-viewer.c:818 | ||||
| #, c-format | ||||
| msgid "Error loading theme: %s\n" | ||||
| msgstr "Chyba pri načítavaní témy: %s\n" | ||||
|  | ||||
| # PK: plural forms | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987 | ||||
| #, fuzzy | ||||
| #~ msgid "Loaded theme \"%s\" in %g seconds\n" | ||||
| #~ msgstr "Téma „%s“ načítaná za %g sekúnd\n" | ||||
| #: ../src/ui/theme-viewer.c:824 | ||||
| #, fuzzy, c-format | ||||
| msgid "Loaded theme \"%s\" in %g seconds\n" | ||||
| msgstr "Téma „%s“ načítaná za %g sekúnd\n" | ||||
|  | ||||
| # PK: inde titulku, aky je rozdiel | ||||
| #~ msgid "Normal Title Font" | ||||
| #~ msgstr "Obyčajné písmo titulku" | ||||
| #: ../src/ui/theme-viewer.c:869 | ||||
| msgid "Normal Title Font" | ||||
| msgstr "Obyčajné písmo titulku" | ||||
|  | ||||
| #~ msgid "Small Title Font" | ||||
| #~ msgstr "Malé písmo titulku" | ||||
| #: ../src/ui/theme-viewer.c:875 | ||||
| msgid "Small Title Font" | ||||
| msgstr "Malé písmo titulku" | ||||
|  | ||||
| #~ msgid "Large Title Font" | ||||
| #~ msgstr "Veľké písmo titulku" | ||||
| #: ../src/ui/theme-viewer.c:881 | ||||
| msgid "Large Title Font" | ||||
| msgstr "Veľké písmo titulku" | ||||
|  | ||||
| #~ msgid "Button Layouts" | ||||
| #~ msgstr "Rozloženia tlačidiel" | ||||
| #: ../src/ui/theme-viewer.c:886 | ||||
| msgid "Button Layouts" | ||||
| msgstr "Rozloženia tlačidiel" | ||||
|  | ||||
| #~ msgid "Benchmark" | ||||
| #~ msgstr "Test rýchlosti" | ||||
| #: ../src/ui/theme-viewer.c:891 | ||||
| msgid "Benchmark" | ||||
| msgstr "Test rýchlosti" | ||||
|  | ||||
| #~ msgid "Window Title Goes Here" | ||||
| #~ msgstr "Sem príde názov okna" | ||||
| #: ../src/ui/theme-viewer.c:947 | ||||
| msgid "Window Title Goes Here" | ||||
| msgstr "Sem príde názov okna" | ||||
|  | ||||
| # PK: plural forms | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987 | ||||
| #, fuzzy | ||||
| #~ msgid "" | ||||
| #~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and " | ||||
| #~ "%g seconds wall clock time including X server resources (%g milliseconds " | ||||
| #~ "per frame)\n" | ||||
| #~ msgstr "" | ||||
| #~ "Vykreslených %d rámcov za %g sekúnd na strane klienta (%g milisekúnd na " | ||||
| #~ "rámec) a %g sekúnd celkového času vrátane zdrojov servera X (%g " | ||||
| #~ "milisekúnd na rámec)\n" | ||||
| #: ../src/ui/theme-viewer.c:1053 | ||||
| #, fuzzy, c-format | ||||
| msgid "" | ||||
| "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g " | ||||
| "seconds wall clock time including X server resources (%g milliseconds per " | ||||
| "frame)\n" | ||||
| msgstr "" | ||||
| "Vykreslených %d rámcov za %g sekúnd na strane klienta (%g milisekúnd na " | ||||
| "rámec) a %g sekúnd celkového času vrátane zdrojov servera X (%g milisekúnd " | ||||
| "na rámec)\n" | ||||
|  | ||||
| #~ msgid "position expression test returned TRUE but set error" | ||||
| #~ msgstr "test výrazu polohy vrátil TRUE, ale nastavil chybu" | ||||
| #: ../src/ui/theme-viewer.c:1273 | ||||
| msgid "position expression test returned TRUE but set error" | ||||
| msgstr "test výrazu polohy vrátil TRUE, ale nastavil chybu" | ||||
|  | ||||
| #~ msgid "position expression test returned FALSE but didn't set error" | ||||
| #~ msgstr "test výrazu polohy vrátil FALSE, ale nenastavil chybu" | ||||
| #: ../src/ui/theme-viewer.c:1275 | ||||
| msgid "position expression test returned FALSE but didn't set error" | ||||
| msgstr "test výrazu polohy vrátil FALSE, ale nenastavil chybu" | ||||
|  | ||||
| #~ msgid "Error was expected but none given" | ||||
| #~ msgstr "Bola očakávaná chyba, ale žiadna nenastala" | ||||
| #: ../src/ui/theme-viewer.c:1279 | ||||
| msgid "Error was expected but none given" | ||||
| msgstr "Bola očakávaná chyba, ale žiadna nenastala" | ||||
|  | ||||
| #~ msgid "Error %d was expected but %d given" | ||||
| #~ msgstr "Bola očakávaná chyba %d, ale nastala %d" | ||||
| #: ../src/ui/theme-viewer.c:1281 | ||||
| #, c-format | ||||
| msgid "Error %d was expected but %d given" | ||||
| msgstr "Bola očakávaná chyba %d, ale nastala %d" | ||||
|  | ||||
| #~ msgid "Error not expected but one was returned: %s" | ||||
| #~ msgstr "Chyba nebola očakávaná, ale bola vrátená: %s" | ||||
| #: ../src/ui/theme-viewer.c:1287 | ||||
| #, c-format | ||||
| msgid "Error not expected but one was returned: %s" | ||||
| msgstr "Chyba nebola očakávaná, ale bola vrátená: %s" | ||||
|  | ||||
| #~ msgid "x value was %d, %d was expected" | ||||
| #~ msgstr "hodnota x bola %d, očakávaná bola %d" | ||||
| #: ../src/ui/theme-viewer.c:1291 | ||||
| #, c-format | ||||
| msgid "x value was %d, %d was expected" | ||||
| msgstr "hodnota x bola %d, očakávaná bola %d" | ||||
|  | ||||
| #~ msgid "y value was %d, %d was expected" | ||||
| #~ msgstr "hodnota y bola %d, očakávaná bola %d" | ||||
| #: ../src/ui/theme-viewer.c:1294 | ||||
| #, c-format | ||||
| msgid "y value was %d, %d was expected" | ||||
| msgstr "hodnota y bola %d, očakávaná bola %d" | ||||
|  | ||||
| # PK: plural forms | ||||
| # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987 | ||||
| #, fuzzy | ||||
| #~ msgid "" | ||||
| #~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n" | ||||
| #~ msgstr "" | ||||
| #~ "%d výrazov pre súradnice analyzovaných za %g sekúnd (priemer %g sekúnd)\n" | ||||
| #: ../src/ui/theme-viewer.c:1359 | ||||
| #, fuzzy, c-format | ||||
| msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n" | ||||
| msgstr "" | ||||
| "%d výrazov pre súradnice analyzovaných za %g sekúnd (priemer %g sekúnd)\n" | ||||
|   | ||||
							
								
								
									
										756
									
								
								po/sr@latin.po
									
									
									
									
									
								
							
							
						
						
									
										756
									
								
								po/sr@latin.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1228
									
								
								po/zh_CN.po
									
									
									
									
									
								
							
							
						
						
									
										1228
									
								
								po/zh_CN.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1445
									
								
								po/zh_HK.po
									
									
									
									
									
								
							
							
						
						
									
										1445
									
								
								po/zh_HK.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1473
									
								
								po/zh_TW.po
									
									
									
									
									
								
							
							
						
						
									
										1473
									
								
								po/zh_TW.po
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -17,9 +17,6 @@ | ||||
| 	<KeyListEntry name="move-to-workspace-4" | ||||
| 	              _description="Move window to workspace 4" /> | ||||
| 
 | ||||
|         <KeyListEntry name="move-to-workspace-last" | ||||
|                       _description="Move window to last workspace" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="move-to-workspace-left" | ||||
| 	              _description="Move window one workspace to the left" /> | ||||
| 
 | ||||
| @@ -32,81 +29,27 @@ | ||||
| 	<KeyListEntry name="move-to-workspace-down" | ||||
| 	              _description="Move window one workspace down" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="move-to-monitor-left" | ||||
| 	              _description="Move window one monitor to the left" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="move-to-monitor-right" | ||||
| 	              _description="Move window one monitor to the right" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="move-to-monitor-up" | ||||
| 	              _description="Move window one monitor up" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="move-to-monitor-down" | ||||
| 	              _description="Move window one monitor down" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-applications" | ||||
| 	              reverse-entry="switch-applications-backward" | ||||
| 	              _description="Switch applications"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-applications-backward" | ||||
| 	              reverse-entry="switch-applications" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch to previous application"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-windows" | ||||
| 	              reverse-entry="switch-windows-backward" | ||||
| 	              _description="Switch windows"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-windows-backward" | ||||
| 	              reverse-entry="switch-windows" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch to previous window"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-group" | ||||
| 	              reverse-entry="switch-group-backward" | ||||
| 	              _description="Switch windows of an application"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-group-backward" | ||||
| 	              reverse-entry="switch-group" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch to previous window of an application"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-panels" | ||||
| 	              reverse-entry="switch-panels-backward" | ||||
| 	              _description="Switch system controls"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-panels-backward" | ||||
| 	              reverse-entry="switch-panels" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch to previous system control"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-windows" | ||||
| 	              reverse-entry="cycle-windows-backward" | ||||
| 	              _description="Switch windows directly"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-windows-backward" | ||||
| 	              reverse-entry="cycle-windows" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch directly to previous window"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-group" | ||||
| 	              reverse-entry="cycle-group-backward" | ||||
| 	              _description="Switch windows of an app directly"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-group-backward" | ||||
| 	              reverse-entry="cycle-group" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch directly to previous window of an app"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-panels" | ||||
| 	              reverse-entry="cycle-panels-backward" | ||||
| 	              _description="Switch system controls directly"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="cycle-panels-backward" | ||||
| 	              reverse-entry="cycle-panels" | ||||
| 	              hidden="true" | ||||
| 	              _description="Switch directly to previous system control"/> | ||||
| 
 | ||||
| 	<KeyListEntry name="show-desktop" | ||||
| 	              _description="Hide all normal windows"/> | ||||
| 
 | ||||
| @@ -122,9 +65,6 @@ | ||||
| 	<KeyListEntry name="switch-to-workspace-4" | ||||
| 	              _description="Switch to workspace 4" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-to-workspace-last" | ||||
| 	              _description="Switch to last workspace" /> | ||||
| 
 | ||||
| 	<KeyListEntry name="switch-to-workspace-left" | ||||
| 	              _description="Move to workspace left" /> | ||||
| 
 | ||||
							
								
								
									
										318
									
								
								src/Makefile.am
									
									
									
									
									
								
							
							
						
						
									
										318
									
								
								src/Makefile.am
									
									
									
									
									
								
							| @@ -3,89 +3,39 @@ | ||||
|  | ||||
| lib_LTLIBRARIES = libmutter.la | ||||
|  | ||||
| SUBDIRS=compositor/plugins | ||||
| SUBDIRS=wm-tester tools compositor/plugins | ||||
|  | ||||
| AM_CPPFLAGS = \ | ||||
| 	-DCLUTTER_ENABLE_COMPOSITOR_API					\ | ||||
| INCLUDES=								\ | ||||
| 	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\ | ||||
| 	-DCOGL_ENABLE_EXPERIMENTAL_API					\ | ||||
| 	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \ | ||||
| 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS				\ | ||||
| 	-DCOGL_DISABLE_DEPRECATION_WARNINGS				\ | ||||
| 	$(MUTTER_CFLAGS)						\ | ||||
| 	$(MUTTER_NATIVE_BACKEND_CFLAGS)					\ | ||||
| 	-I$(builddir)							\ | ||||
| 	-I$(srcdir)							\ | ||||
| 	-I$(srcdir)/backends						\ | ||||
| 	-I$(srcdir)/core						\ | ||||
| 	-I$(srcdir)/ui							\ | ||||
| 	-I$(srcdir)/compositor						\ | ||||
| 	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\ | ||||
| 	-DMUTTER_LOCALEDIR=\"$(localedir)\"				\ | ||||
| 	-DHOST_ALIAS=\"@HOST_ALIAS@\"					\ | ||||
| 	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"		\ | ||||
| 	-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\"				\ | ||||
| 	-DMUTTER_DATADIR=\"$(datadir)\"					\ | ||||
| 	-DG_LOG_DOMAIN=\"mutter\"					\ | ||||
| 	-DSN_API_NOT_YET_FROZEN=1					\ | ||||
| 	-DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION)			\ | ||||
| 	-DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION)			\ | ||||
| 	-DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION)			\ | ||||
| 	-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION)	\ | ||||
| 	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\ | ||||
| 	-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"			\ | ||||
| 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\ | ||||
| 	-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\" | ||||
| 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\ | ||||
| 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" | ||||
|  | ||||
| mutter_built_sources = \ | ||||
| 	$(dbus_idle_built_sources)		\ | ||||
| 	$(dbus_display_config_built_sources)	\ | ||||
| 	$(dbus_login1_built_sources)		\ | ||||
| 	mutter-enum-types.h 			\ | ||||
| 	mutter-enum-types.h \ | ||||
| 	mutter-enum-types.c | ||||
|  | ||||
| if HAVE_WAYLAND | ||||
| mutter_built_sources += \ | ||||
| 	gtk-shell-protocol.c			\ | ||||
| 	gtk-shell-server-protocol.h		\ | ||||
| 	xdg-shell-protocol.c			\ | ||||
| 	xdg-shell-server-protocol.h | ||||
| endif | ||||
|  | ||||
| wayland_protocols = \ | ||||
| 	wayland/protocol/gtk-shell.xml		\ | ||||
| 	wayland/protocol/xdg-shell.xml | ||||
|  | ||||
| libmutter_la_SOURCES =				\ | ||||
| 	backends/meta-backend.c			\ | ||||
| 	meta/meta-backend.h			\ | ||||
| 	backends/meta-backend-private.h		\ | ||||
| 	backends/meta-cursor.c			\ | ||||
| 	backends/meta-cursor.h			\ | ||||
| 	backends/meta-cursor-private.h		\ | ||||
| 	backends/meta-cursor-tracker.c		\ | ||||
| 	backends/meta-cursor-tracker-private.h	\ | ||||
| 	backends/meta-cursor-renderer.c		\ | ||||
| 	backends/meta-cursor-renderer.h		\ | ||||
| 	backends/meta-display-config-shared.h	\ | ||||
| 	backends/meta-idle-monitor.c		\ | ||||
| 	backends/meta-idle-monitor-private.h	\ | ||||
| 	backends/meta-idle-monitor-dbus.c	\ | ||||
| 	backends/meta-idle-monitor-dbus.h	\ | ||||
| 	backends/meta-monitor-config.c		\ | ||||
| 	backends/meta-monitor-config.h		\ | ||||
| 	backends/meta-monitor-manager.c		\ | ||||
| 	backends/meta-monitor-manager.h		\ | ||||
| 	backends/meta-monitor-manager-dummy.c	\ | ||||
| 	backends/meta-monitor-manager-dummy.h	\ | ||||
| 	backends/meta-stage.h			\ | ||||
| 	backends/meta-stage.c			\ | ||||
| 	backends/edid-parse.c			\ | ||||
| 	backends/edid.h				\ | ||||
| 	backends/x11/meta-backend-x11.c			\ | ||||
| 	backends/x11/meta-backend-x11.h			\ | ||||
| 	backends/x11/meta-cursor-renderer-x11.c		\ | ||||
| 	backends/x11/meta-cursor-renderer-x11.h		\ | ||||
| 	backends/x11/meta-idle-monitor-xsync.c		\ | ||||
| 	backends/x11/meta-idle-monitor-xsync.h		\ | ||||
| 	backends/x11/meta-monitor-manager-xrandr.c	\ | ||||
| 	backends/x11/meta-monitor-manager-xrandr.h	\ | ||||
| 	core/meta-accel-parse.c			\ | ||||
| 	core/meta-accel-parse.h			\ | ||||
| 	core/async-getprop.c			\ | ||||
| 	core/async-getprop.h			\ | ||||
| 	core/barrier.c				\ | ||||
| 	meta/barrier.h				\ | ||||
| 	core/bell.c				\ | ||||
| @@ -103,8 +53,7 @@ libmutter_la_SOURCES =				\ | ||||
| 	compositor/meta-background-actor.c	\ | ||||
| 	compositor/meta-background-actor-private.h	\ | ||||
| 	compositor/meta-background-group.c	\ | ||||
| 	compositor/meta-cullable.c		\ | ||||
| 	compositor/meta-cullable.h		\ | ||||
| 	compositor/meta-background-group-private.h	\ | ||||
| 	compositor/meta-module.c		\ | ||||
| 	compositor/meta-module.h		\ | ||||
| 	compositor/meta-plugin.c		\ | ||||
| @@ -113,11 +62,6 @@ libmutter_la_SOURCES =				\ | ||||
| 	compositor/meta-shadow-factory.c	\ | ||||
| 	compositor/meta-shadow-factory-private.h	\ | ||||
| 	compositor/meta-shaped-texture.c	\ | ||||
| 	compositor/meta-shaped-texture-private.h 	\ | ||||
| 	compositor/meta-surface-actor.c		\ | ||||
| 	compositor/meta-surface-actor.h		\ | ||||
| 	compositor/meta-surface-actor-x11.c	\ | ||||
| 	compositor/meta-surface-actor-x11.h	\ | ||||
| 	compositor/meta-texture-rectangle.c	\ | ||||
| 	compositor/meta-texture-rectangle.h	\ | ||||
| 	compositor/meta-texture-tower.c		\ | ||||
| @@ -138,6 +82,7 @@ libmutter_la_SOURCES =				\ | ||||
| 	meta/meta-shadow-factory.h		\ | ||||
| 	meta/meta-window-actor.h		\ | ||||
| 	meta/compositor-mutter.h 		\ | ||||
| 	core/above-tab-keycode.c		\ | ||||
| 	core/constraints.c			\ | ||||
| 	core/constraints.h			\ | ||||
| 	core/core.c				\ | ||||
| @@ -145,21 +90,27 @@ libmutter_la_SOURCES =				\ | ||||
| 	core/display.c				\ | ||||
| 	core/display-private.h			\ | ||||
| 	meta/display.h				\ | ||||
| 	ui/draw-workspace.c			\ | ||||
| 	ui/draw-workspace.h			\ | ||||
| 	core/edge-resistance.c			\ | ||||
| 	core/edge-resistance.h			\ | ||||
| 	core/events.c				\ | ||||
| 	core/events.h				\ | ||||
| 	core/errors.c				\ | ||||
| 	meta/errors.h				\ | ||||
| 	core/frame.c				\ | ||||
| 	core/frame.h				\ | ||||
| 	ui/gradient.c				\ | ||||
| 	meta/gradient.h				\ | ||||
| 	core/meta-gesture-tracker.c		\ | ||||
| 	core/meta-gesture-tracker-private.h	\ | ||||
| 	core/group-private.h			\ | ||||
| 	core/group-props.c			\ | ||||
| 	core/group-props.h			\ | ||||
| 	core/group.c				\ | ||||
| 	meta/group.h				\ | ||||
| 	core/iconcache.c			\ | ||||
| 	core/iconcache.h			\ | ||||
| 	core/keybindings.c			\ | ||||
| 	core/keybindings-private.h		\ | ||||
| 	core/main.c				\ | ||||
| 	core/mutter-Xatomtype.h			\ | ||||
| 	core/place.c				\ | ||||
| 	core/place.h				\ | ||||
| 	core/prefs.c				\ | ||||
| @@ -168,108 +119,54 @@ libmutter_la_SOURCES =				\ | ||||
| 	core/screen-private.h			\ | ||||
| 	meta/screen.h				\ | ||||
| 	meta/types.h				\ | ||||
| 	core/restart.c				\ | ||||
| 	core/session.c				\ | ||||
| 	core/session.h				\ | ||||
| 	core/stack.c				\ | ||||
| 	core/stack.h				\ | ||||
| 	core/stack-tracker.c			\ | ||||
| 	core/stack-tracker.h			\ | ||||
| 	core/util.c				\ | ||||
| 	meta/util.h				\ | ||||
| 	core/util-private.h			\ | ||||
| 	core/window-props.c			\ | ||||
| 	core/window-props.h			\ | ||||
| 	core/window.c				\ | ||||
| 	core/window-private.h			\ | ||||
| 	meta/window.h				\ | ||||
| 	core/workspace.c			\ | ||||
| 	core/workspace-private.h		\ | ||||
| 	core/xprops.c				\ | ||||
| 	core/xprops.h				\ | ||||
| 	meta/common.h				\ | ||||
| 	core/core.h				\ | ||||
| 	ui/ui.h					\ | ||||
| 	inlinepixbufs.h				\ | ||||
| 	ui/frames.c				\ | ||||
| 	ui/frames.h				\ | ||||
| 	ui/menu.c				\ | ||||
| 	ui/menu.h				\ | ||||
| 	ui/metaaccellabel.c			\ | ||||
| 	ui/metaaccellabel.h			\ | ||||
| 	ui/resizepopup.c			\ | ||||
| 	ui/resizepopup.h			\ | ||||
| 	ui/tabpopup.c				\ | ||||
| 	ui/tabpopup.h				\ | ||||
| 	ui/tile-preview.c			\ | ||||
| 	ui/tile-preview.h			\ | ||||
| 	ui/theme-parser.c			\ | ||||
| 	ui/theme.c				\ | ||||
| 	meta/theme.h				\ | ||||
| 	ui/theme-private.h			\ | ||||
| 	ui/ui.c					\ | ||||
| 	x11/iconcache.c				\ | ||||
| 	x11/iconcache.h				\ | ||||
| 	x11/async-getprop.c			\ | ||||
| 	x11/async-getprop.h			\ | ||||
| 	x11/events.c				\ | ||||
| 	x11/events.h				\ | ||||
| 	x11/group-private.h			\ | ||||
| 	x11/group-props.c			\ | ||||
| 	x11/group-props.h			\ | ||||
| 	x11/group.c				\ | ||||
| 	meta/group.h				\ | ||||
| 	x11/session.c				\ | ||||
| 	x11/session.h				\ | ||||
| 	x11/window-props.c			\ | ||||
| 	x11/window-props.h			\ | ||||
| 	x11/window-x11.c			\ | ||||
| 	x11/window-x11.h			\ | ||||
| 	x11/window-x11-private.h		\ | ||||
| 	x11/xprops.c				\ | ||||
| 	x11/xprops.h				\ | ||||
| 	x11/mutter-Xatomtype.h | ||||
|  | ||||
| if HAVE_WAYLAND | ||||
| libmutter_la_SOURCES +=				\ | ||||
| 	compositor/meta-surface-actor-wayland.c	\ | ||||
| 	compositor/meta-surface-actor-wayland.h	\ | ||||
| 	wayland/meta-wayland.c			\ | ||||
| 	wayland/meta-wayland.h			\ | ||||
| 	wayland/meta-wayland-private.h		\ | ||||
| 	wayland/meta-xwayland.c			\ | ||||
| 	wayland/meta-xwayland.h			\ | ||||
| 	wayland/meta-xwayland-private.h		\ | ||||
| 	wayland/meta-wayland-data-device.c      \ | ||||
| 	wayland/meta-wayland-data-device.h      \ | ||||
| 	wayland/meta-wayland-keyboard.c		\ | ||||
| 	wayland/meta-wayland-keyboard.h		\ | ||||
| 	wayland/meta-wayland-pointer.c		\ | ||||
| 	wayland/meta-wayland-pointer.h		\ | ||||
| 	wayland/meta-wayland-seat.c		\ | ||||
| 	wayland/meta-wayland-seat.h		\ | ||||
| 	wayland/meta-wayland-touch.c		\ | ||||
| 	wayland/meta-wayland-touch.h		\ | ||||
| 	wayland/meta-wayland-surface.c		\ | ||||
| 	wayland/meta-wayland-surface.h		\ | ||||
| 	wayland/meta-wayland-types.h		\ | ||||
| 	wayland/meta-wayland-versions.h		\ | ||||
| 	wayland/meta-wayland-outputs.c		\ | ||||
| 	wayland/meta-wayland-outputs.h		\ | ||||
| 	wayland/window-wayland.c		\ | ||||
| 	wayland/window-wayland.h | ||||
| endif | ||||
|  | ||||
| if HAVE_NATIVE_BACKEND | ||||
| libmutter_la_SOURCES +=					\ | ||||
| 	backends/native/meta-backend-native.c		\ | ||||
| 	backends/native/meta-backend-native.h		\ | ||||
| 	backends/native/meta-cursor-renderer-native.c	\ | ||||
| 	backends/native/meta-cursor-renderer-native.h	\ | ||||
| 	backends/native/meta-idle-monitor-native.c	\ | ||||
| 	backends/native/meta-idle-monitor-native.h	\ | ||||
| 	backends/native/meta-monitor-manager-kms.c	\ | ||||
| 	backends/native/meta-monitor-manager-kms.h	\ | ||||
| 	backends/native/meta-launcher.c			\ | ||||
| 	backends/native/meta-launcher.h			\ | ||||
| 	backends/native/dbus-utils.c			\ | ||||
| 	backends/native/dbus-utils.h | ||||
| endif | ||||
|  | ||||
| nodist_libmutter_la_SOURCES =			\ | ||||
| 	meta/preview-widget.h			\ | ||||
| 	ui/preview-widget.c			\ | ||||
| 	$(mutter_built_sources) | ||||
|  | ||||
| libmutter_la_LDFLAGS = -no-undefined | ||||
| libmutter_la_LIBADD  = $(MUTTER_LIBS) $(MUTTER_NATIVE_BACKEND_LIBS) | ||||
| libmutter_la_LIBADD  = $(MUTTER_LIBS) | ||||
|  | ||||
| # Headers installed for plugins; introspected information will | ||||
| # be extracted into Mutter-<version>.gir | ||||
| libmutterinclude_headers =			\ | ||||
| libmutterinclude_base_headers =		\ | ||||
| 	meta/barrier.h				\ | ||||
| 	meta/boxes.h				\ | ||||
| 	meta/common.h				\ | ||||
| @@ -281,12 +178,9 @@ libmutterinclude_headers =			\ | ||||
| 	meta/group.h				\ | ||||
| 	meta/keybindings.h			\ | ||||
| 	meta/main.h				\ | ||||
| 	meta/meta-backend.h			\ | ||||
| 	meta/meta-background-actor.h		\ | ||||
| 	meta/meta-background-group.h		\ | ||||
| 	meta/meta-background.h			\ | ||||
| 	meta/meta-cursor-tracker.h		\ | ||||
| 	meta/meta-idle-monitor.h		\ | ||||
| 	meta/meta-plugin.h			\ | ||||
| 	meta/meta-shaped-texture.h		\ | ||||
| 	meta/meta-shadow-factory.h		\ | ||||
| @@ -299,36 +193,26 @@ libmutterinclude_headers =			\ | ||||
| 	meta/window.h				\ | ||||
| 	meta/workspace.h | ||||
|  | ||||
| libmutterinclude_built_headers =		\ | ||||
| 	meta/meta-version.h | ||||
|  | ||||
| libmutterinclude_base_headers =			\ | ||||
| 	$(libmutterinclude_headers)		\ | ||||
| 	$(libmutterinclude_built_headers) | ||||
|  | ||||
| # Excluded from scanning for introspection but installed | ||||
| # atomnames.h: macros cause problems for scanning process | ||||
| libmutterinclude_extra_headers =		\ | ||||
| 	meta/preview-widget.h			\ | ||||
| 	meta/atomnames.h | ||||
|  | ||||
| libmutterincludedir = $(includedir)/mutter/meta | ||||
|  | ||||
| libmutterinclude_HEADERS =			\ | ||||
| 	$(libmutterinclude_headers)		\ | ||||
| 	$(libmutterinclude_base_headers)	\ | ||||
| 	$(libmutterinclude_extra_headers) | ||||
|  | ||||
| nodist_libmutterinclude_HEADERS =		\ | ||||
| 	$(libmutterinclude_built_headers) | ||||
| mutter_theme_viewer_SOURCES=  \ | ||||
| 	ui/theme-viewer.c | ||||
|  | ||||
| bin_PROGRAMS=mutter | ||||
| bin_PROGRAMS=mutter mutter-theme-viewer | ||||
|  | ||||
| mutter_SOURCES = core/mutter.c | ||||
| mutter_LDADD = $(MUTTER_LIBS) libmutter.la | ||||
|  | ||||
| libexec_PROGRAMS = mutter-restart-helper | ||||
| mutter_restart_helper_SOURCES = core/restart-helper.c | ||||
| mutter_restart_helper_LDADD = $(MUTTER_LIBS) | ||||
|  | ||||
| if HAVE_INTROSPECTION | ||||
| include $(INTROSPECTION_MAKEFILE) | ||||
|  | ||||
| @@ -352,19 +236,21 @@ INTROSPECTION_GIRS = Meta-$(api_version).gir | ||||
| Meta-$(api_version).gir: libmutter.la | ||||
| @META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0 | ||||
| @META_GIR@_EXPORT_PACKAGES = libmutter | ||||
| @META_GIR@_CFLAGS = $(AM_CPPFLAGS) | ||||
| @META_GIR@_CFLAGS = $(INCLUDES) | ||||
| @META_GIR@_LIBS = libmutter.la | ||||
| @META_GIR@_FILES =				\ | ||||
| 	mutter-enum-types.h			\ | ||||
| 	$(libmutterinclude_base_headers)	\ | ||||
| 	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES)) | ||||
| 	$(filter %.c,$(libmutter_la_SOURCES)) | ||||
| @META_GIR@_SCANNERFLAGS = --warn-all --warn-error | ||||
|  | ||||
| endif | ||||
|  | ||||
| mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la | ||||
|  | ||||
| testboxes_SOURCES = core/testboxes.c | ||||
| testgradient_SOURCES = ui/testgradient.c | ||||
| testasyncgetprop_SOURCES = x11/testasyncgetprop.c | ||||
| testasyncgetprop_SOURCES = core/testasyncgetprop.c | ||||
|  | ||||
| noinst_PROGRAMS=testboxes testgradient testasyncgetprop | ||||
|  | ||||
| @@ -372,32 +258,69 @@ testboxes_LDADD = $(MUTTER_LIBS) libmutter.la | ||||
| testgradient_LDADD = $(MUTTER_LIBS) libmutter.la | ||||
| testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la | ||||
|  | ||||
| dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h | ||||
| @INTLTOOL_DESKTOP_RULE@ | ||||
|  | ||||
| desktopfilesdir=$(datadir)/applications | ||||
| desktopfiles_in_files=mutter.desktop.in | ||||
| desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) | ||||
| desktopfiles_DATA = $(desktopfiles_files) | ||||
|  | ||||
| wmpropertiesdir=$(datadir)/gnome/wm-properties | ||||
| wmproperties_in_files=mutter-wm.desktop.in | ||||
| wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop) | ||||
| wmproperties_DATA = $(wmproperties_files) | ||||
|  | ||||
| xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@ | ||||
| xml_in_files = \ | ||||
|         50-mutter-navigation.xml.in	\ | ||||
|         50-mutter-system.xml.in		\ | ||||
|         50-mutter-windows.xml.in | ||||
| xml_DATA     = $(xml_in_files:.xml.in=.xml) | ||||
|  | ||||
| gsettings_SCHEMAS = org.gnome.mutter.gschema.xml | ||||
| @INTLTOOL_XML_NOMERGE_RULE@ | ||||
| @GSETTINGS_RULES@ | ||||
|  | ||||
| convertdir = $(datadir)/GConf/gsettings | ||||
| convert_DATA = mutter-schemas.convert | ||||
|  | ||||
| IMAGES=stock_maximize.png stock_minimize.png stock_delete.png | ||||
| VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \ | ||||
|           stock_minimize_data $(srcdir)/stock_minimize.png \ | ||||
|           stock_delete_data $(srcdir)/stock_delete.png | ||||
|  | ||||
| BUILT_SOURCES = inlinepixbufs.h | ||||
| CLEANFILES =					\ | ||||
| 	inlinepixbufs.h				\ | ||||
| 	mutter.desktop				\ | ||||
| 	mutter-wm.desktop			\ | ||||
| 	org.gnome.mutter.gschema.xml		\ | ||||
| 	$(xml_DATA)				\ | ||||
| 	$(mutter_built_sources)			\ | ||||
| 	$(typelib_DATA)				\ | ||||
| 	$(gir_DATA) | ||||
|  | ||||
| DISTCLEANFILES = 				\ | ||||
| 	$(libmutterinclude_built_headers) | ||||
| inlinepixbufs.h: $(IMAGES) | ||||
| 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h | ||||
|  | ||||
| pkgconfigdir = $(libdir)/pkgconfig | ||||
| pkgconfig_DATA = libmutter.pc | ||||
|  | ||||
| EXTRA_DIST =				\ | ||||
| 	$(wayland_protocols)		\ | ||||
| pkgconfig_DATA = libmutter.pc mutter-plugins.pc | ||||
|  | ||||
| EXTRA_DIST=$(desktopfiles_files) 	\ | ||||
| 	$(wmproperties_files)		\ | ||||
| 	$(IMAGES) 			\ | ||||
| 	$(desktopfiles_in_files)	\ | ||||
| 	$(wmproperties_in_files)	\ | ||||
| 	$(xml_in_files)			\ | ||||
| 	org.gnome.mutter.gschema.xml.in \ | ||||
| 	mutter-schemas.convert \ | ||||
| 	libmutter.pc.in \ | ||||
| 	mutter-plugins.pc.in  \ | ||||
| 	mutter-enum-types.h.in \ | ||||
| 	mutter-enum-types.c.in \ | ||||
| 	org.freedesktop.login1.xml	\ | ||||
| 	org.gnome.Mutter.DisplayConfig.xml	\ | ||||
| 	org.gnome.Mutter.IdleMonitor.xml | ||||
|  | ||||
| BUILT_SOURCES =					\ | ||||
| 	$(mutter_built_sources)			\ | ||||
| 	$(libmutterinclude_built_headers) | ||||
| 	mutter-enum-types.c.in | ||||
|  | ||||
| BUILT_SOURCES += $(mutter_built_sources) | ||||
| MUTTER_STAMP_FILES = stamp-mutter-enum-types.h | ||||
| CLEANFILES += $(MUTTER_STAMP_FILES) | ||||
|  | ||||
| @@ -419,34 +342,3 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in | ||||
| 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \ | ||||
| 	cp xgen-tetc mutter-enum-types.c && \ | ||||
| 	rm -f xgen-tetc | ||||
|  | ||||
| dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h | ||||
|  | ||||
| $(dbus_display_config_built_sources) : Makefile.am org.gnome.Mutter.DisplayConfig.xml | ||||
| 	$(AM_V_GEN)gdbus-codegen							\ | ||||
| 		--interface-prefix org.gnome.Mutter					\ | ||||
| 		--c-namespace MetaDBus							\ | ||||
| 		--generate-c-code meta-dbus-display-config				\ | ||||
| 		$(srcdir)/org.gnome.Mutter.DisplayConfig.xml | ||||
|  | ||||
| $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml | ||||
| 	$(AM_V_GEN)gdbus-codegen							\ | ||||
| 		--interface-prefix org.gnome.Mutter					\ | ||||
| 		--c-namespace MetaDBus							\ | ||||
| 		--generate-c-code meta-dbus-idle-monitor				\ | ||||
| 		--c-generate-object-manager						\ | ||||
| 		$(srcdir)/org.gnome.Mutter.IdleMonitor.xml | ||||
|  | ||||
| dbus_login1_built_sources = meta-dbus-login1.c meta-dbus-login1.h | ||||
|  | ||||
| $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml | ||||
| 	$(AM_V_GEN)gdbus-codegen							\ | ||||
| 		--interface-prefix org.freedesktop.login1				\ | ||||
| 		--c-namespace Login1							\ | ||||
| 		--generate-c-code meta-dbus-login1					\ | ||||
| 		$(srcdir)/org.freedesktop.login1.xml | ||||
|  | ||||
| %-protocol.c : $(srcdir)/wayland/protocol/%.xml | ||||
| 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ | ||||
| %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml | ||||
| 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ | ||||
|   | ||||
| @@ -1,539 +0,0 @@ | ||||
| /* | ||||
|  * Copyright 2007 Red Hat, Inc. | ||||
|  * | ||||
|  * Permission is hereby granted, free of charge, to any person obtaining a | ||||
|  * copy of this software and associated documentation files (the "Software"), | ||||
|  * to deal in the Software without restriction, including without limitation | ||||
|  * on the rights to use, copy, modify, merge, publish, distribute, sub | ||||
|  * license, and/or sell copies of the Software, and to permit persons to whom | ||||
|  * the Software is furnished to do so, subject to the following conditions: | ||||
|  * | ||||
|  * The above copyright notice and this permission notice (including the next | ||||
|  * paragraph) shall be included in all copies or substantial portions of the | ||||
|  * Software. | ||||
|  * | ||||
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
|  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL | ||||
|  * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||||
|  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||||
|  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||
|  */ | ||||
|  | ||||
| /* Author: Soren Sandmann <sandmann@redhat.com> */ | ||||
|  | ||||
| #include "edid.h" | ||||
| #include <stdlib.h> | ||||
| #include <string.h> | ||||
| #include <math.h> | ||||
| #include <glib.h> | ||||
|  | ||||
| static int | ||||
| get_bit (int in, int bit) | ||||
| { | ||||
|   return (in & (1 << bit)) >> bit; | ||||
| } | ||||
|  | ||||
| static int | ||||
| get_bits (int in, int begin, int end) | ||||
| { | ||||
|   int mask = (1 << (end - begin + 1)) - 1; | ||||
|  | ||||
|   return (in >> begin) & mask; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_header (const uchar *edid) | ||||
| { | ||||
|   if (memcmp (edid, "\x00\xff\xff\xff\xff\xff\xff\x00", 8) == 0) | ||||
|     return TRUE; | ||||
|   return FALSE; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_vendor_and_product_identification (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   int is_model_year; | ||||
|  | ||||
|   /* Manufacturer Code */ | ||||
|   info->manufacturer_code[0]  = get_bits (edid[0x08], 2, 6); | ||||
|   info->manufacturer_code[1]  = get_bits (edid[0x08], 0, 1) << 3; | ||||
|   info->manufacturer_code[1] |= get_bits (edid[0x09], 5, 7); | ||||
|   info->manufacturer_code[2]  = get_bits (edid[0x09], 0, 4); | ||||
|   info->manufacturer_code[3]  = '\0'; | ||||
|  | ||||
|   info->manufacturer_code[0] += 'A' - 1; | ||||
|   info->manufacturer_code[1] += 'A' - 1; | ||||
|   info->manufacturer_code[2] += 'A' - 1; | ||||
|  | ||||
|   /* Product Code */ | ||||
|   info->product_code = edid[0x0b] << 8 | edid[0x0a]; | ||||
|  | ||||
|   /* Serial Number */ | ||||
|   info->serial_number = | ||||
|     edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | edid[0x0f] << 24; | ||||
|  | ||||
|   /* Week and Year */ | ||||
|   is_model_year = FALSE; | ||||
|   switch (edid[0x10]) | ||||
|     { | ||||
|     case 0x00: | ||||
|       info->production_week = -1; | ||||
|       break; | ||||
|  | ||||
|     case 0xff: | ||||
|       info->production_week = -1; | ||||
|       is_model_year = TRUE; | ||||
|       break; | ||||
|  | ||||
|     default: | ||||
|       info->production_week = edid[0x10]; | ||||
|       break; | ||||
|     } | ||||
|  | ||||
|   if (is_model_year) | ||||
|     { | ||||
|       info->production_year = -1; | ||||
|       info->model_year = 1990 + edid[0x11]; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       info->production_year = 1990 + edid[0x11]; | ||||
|       info->model_year = -1; | ||||
|     } | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_edid_version (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   info->major_version = edid[0x12]; | ||||
|   info->minor_version = edid[0x13]; | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_display_parameters (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   /* Digital vs Analog */ | ||||
|   info->is_digital = get_bit (edid[0x14], 7); | ||||
|  | ||||
|   if (info->is_digital) | ||||
|     { | ||||
|       int bits; | ||||
|  | ||||
|       static const int bit_depth[8] = | ||||
|         { | ||||
|           -1, 6, 8, 10, 12, 14, 16, -1 | ||||
|         }; | ||||
|  | ||||
|       static const Interface interfaces[6] = | ||||
|         { | ||||
|           UNDEFINED, DVI, HDMI_A, HDMI_B, MDDI, DISPLAY_PORT | ||||
|         }; | ||||
|  | ||||
|       bits = get_bits (edid[0x14], 4, 6); | ||||
|       info->connector.digital.bits_per_primary = bit_depth[bits]; | ||||
|  | ||||
|       bits = get_bits (edid[0x14], 0, 3); | ||||
|  | ||||
|       if (bits <= 5) | ||||
|         info->connector.digital.interface = interfaces[bits]; | ||||
|       else | ||||
|         info->connector.digital.interface = UNDEFINED; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       int bits = get_bits (edid[0x14], 5, 6); | ||||
|  | ||||
|       static const double levels[][3] = | ||||
|         { | ||||
|           { 0.7,   0.3,    1.0 }, | ||||
|           { 0.714, 0.286,  1.0 }, | ||||
|           { 1.0,   0.4,    1.4 }, | ||||
|           { 0.7,   0.0,    0.7 }, | ||||
|         }; | ||||
|  | ||||
|       info->connector.analog.video_signal_level = levels[bits][0]; | ||||
|       info->connector.analog.sync_signal_level = levels[bits][1]; | ||||
|       info->connector.analog.total_signal_level = levels[bits][2]; | ||||
|  | ||||
|       info->connector.analog.blank_to_black = get_bit (edid[0x14], 4); | ||||
|  | ||||
|       info->connector.analog.separate_hv_sync = get_bit (edid[0x14], 3); | ||||
|       info->connector.analog.composite_sync_on_h = get_bit (edid[0x14], 2); | ||||
|       info->connector.analog.composite_sync_on_green = get_bit (edid[0x14], 1); | ||||
|  | ||||
|       info->connector.analog.serration_on_vsync = get_bit (edid[0x14], 0); | ||||
|     } | ||||
|  | ||||
|   /* Screen Size / Aspect Ratio */ | ||||
|   if (edid[0x15] == 0 && edid[0x16] == 0) | ||||
|     { | ||||
|       info->width_mm = -1; | ||||
|       info->height_mm = -1; | ||||
|       info->aspect_ratio = -1.0; | ||||
|     } | ||||
|   else if (edid[0x16] == 0) | ||||
|     { | ||||
|       info->width_mm = -1; | ||||
|       info->height_mm = -1; | ||||
|       info->aspect_ratio = 100.0 / (edid[0x15] + 99); | ||||
|     } | ||||
|   else if (edid[0x15] == 0) | ||||
|     { | ||||
|       info->width_mm = -1; | ||||
|       info->height_mm = -1; | ||||
|       info->aspect_ratio = 100.0 / (edid[0x16] + 99); | ||||
|       info->aspect_ratio = 1/info->aspect_ratio; /* portrait */ | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       info->width_mm = 10 * edid[0x15]; | ||||
|       info->height_mm = 10 * edid[0x16]; | ||||
|     } | ||||
|  | ||||
|   /* Gamma */ | ||||
|   if (edid[0x17] == 0xFF) | ||||
|     info->gamma = -1.0; | ||||
|   else | ||||
|     info->gamma = (edid[0x17] + 100.0) / 100.0; | ||||
|  | ||||
|   /* Features */ | ||||
|   info->standby = get_bit (edid[0x18], 7); | ||||
|   info->suspend = get_bit (edid[0x18], 6); | ||||
|   info->active_off = get_bit (edid[0x18], 5); | ||||
|  | ||||
|   if (info->is_digital) | ||||
|     { | ||||
|       info->connector.digital.rgb444 = TRUE; | ||||
|       if (get_bit (edid[0x18], 3)) | ||||
|         info->connector.digital.ycrcb444 = 1; | ||||
|       if (get_bit (edid[0x18], 4)) | ||||
|         info->connector.digital.ycrcb422 = 1; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       int bits = get_bits (edid[0x18], 3, 4); | ||||
|       ColorType color_type[4] = | ||||
|         { | ||||
|           MONOCHROME, RGB, OTHER_COLOR, UNDEFINED_COLOR | ||||
|         }; | ||||
|  | ||||
|       info->connector.analog.color_type = color_type[bits]; | ||||
|     } | ||||
|  | ||||
|   info->srgb_is_standard = get_bit (edid[0x18], 2); | ||||
|  | ||||
|   /* In 1.3 this is called "has preferred timing" */ | ||||
|   info->preferred_timing_includes_native = get_bit (edid[0x18], 1); | ||||
|  | ||||
|   /* FIXME: In 1.3 this indicates whether the monitor accepts GTF */ | ||||
|   info->continuous_frequency = get_bit (edid[0x18], 0); | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static double | ||||
| decode_fraction (int high, int low) | ||||
| { | ||||
|   double result = 0.0; | ||||
|   int i; | ||||
|  | ||||
|   high = (high << 2) | low; | ||||
|  | ||||
|   for (i = 0; i < 10; ++i) | ||||
|     result += get_bit (high, i) * pow (2, i - 10); | ||||
|  | ||||
|   return result; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_color_characteristics (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   info->red_x = decode_fraction (edid[0x1b], get_bits (edid[0x19], 6, 7)); | ||||
|   info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 5, 4)); | ||||
|   info->green_x = decode_fraction (edid[0x1d], get_bits (edid[0x19], 2, 3)); | ||||
|   info->green_y = decode_fraction (edid[0x1e], get_bits (edid[0x19], 0, 1)); | ||||
|   info->blue_x = decode_fraction (edid[0x1f], get_bits (edid[0x1a], 6, 7)); | ||||
|   info->blue_y = decode_fraction (edid[0x20], get_bits (edid[0x1a], 4, 5)); | ||||
|   info->white_x = decode_fraction (edid[0x21], get_bits (edid[0x1a], 2, 3)); | ||||
|   info->white_y = decode_fraction (edid[0x22], get_bits (edid[0x1a], 0, 1)); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_established_timings (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   static const Timing established[][8] = | ||||
|     { | ||||
|       { | ||||
|         { 800, 600, 60 }, | ||||
|         { 800, 600, 56 }, | ||||
|         { 640, 480, 75 }, | ||||
|         { 640, 480, 72 }, | ||||
|         { 640, 480, 67 }, | ||||
|         { 640, 480, 60 }, | ||||
|         { 720, 400, 88 }, | ||||
|         { 720, 400, 70 } | ||||
|       }, | ||||
|       { | ||||
|         { 1280, 1024, 75 }, | ||||
|         { 1024, 768, 75 }, | ||||
|         { 1024, 768, 70 }, | ||||
|         { 1024, 768, 60 }, | ||||
|         { 1024, 768, 87 }, | ||||
|         { 832, 624, 75 }, | ||||
|         { 800, 600, 75 }, | ||||
|         { 800, 600, 72 } | ||||
| 	}, | ||||
|       { | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 0, 0, 0 }, | ||||
|         { 1152, 870, 75 } | ||||
|       }, | ||||
|     }; | ||||
|  | ||||
|   int i, j, idx; | ||||
|  | ||||
|   idx = 0; | ||||
|   for (i = 0; i < 3; ++i) | ||||
|     { | ||||
|       for (j = 0; j < 8; ++j) | ||||
| 	{ | ||||
|           int byte = edid[0x23 + i]; | ||||
|  | ||||
|           if (get_bit (byte, j) && established[i][j].frequency != 0) | ||||
|             info->established[idx++] = established[i][j]; | ||||
| 	} | ||||
|     } | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_standard_timings (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   int i; | ||||
|  | ||||
|   for (i = 0; i < 8; i++) | ||||
|     { | ||||
|       int first = edid[0x26 + 2 * i]; | ||||
|       int second = edid[0x27 + 2 * i]; | ||||
|  | ||||
|       if (first != 0x01 && second != 0x01) | ||||
| 	{ | ||||
|           int w = 8 * (first + 31); | ||||
|           int h = 0; | ||||
|  | ||||
|           switch (get_bits (second, 6, 7)) | ||||
|             { | ||||
| 	    case 0x00: h = (w / 16) * 10; break; | ||||
| 	    case 0x01: h = (w / 4) * 3; break; | ||||
| 	    case 0x02: h = (w / 5) * 4; break; | ||||
| 	    case 0x03: h = (w / 16) * 9; break; | ||||
| 	    } | ||||
|  | ||||
|           info->standard[i].width = w; | ||||
|           info->standard[i].height = h; | ||||
|           info->standard[i].frequency = get_bits (second, 0, 5) + 60; | ||||
| 	} | ||||
|     } | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| decode_lf_string (const uchar *s, int n_chars, char *result) | ||||
| { | ||||
|   int i; | ||||
|   for (i = 0; i < n_chars; ++i) | ||||
|     { | ||||
|       if (s[i] == 0x0a) | ||||
| 	{ | ||||
|           *result++ = '\0'; | ||||
|           break; | ||||
| 	} | ||||
|       else if (s[i] == 0x00) | ||||
| 	{ | ||||
|           /* Convert embedded 0's to spaces */ | ||||
|           *result++ = ' '; | ||||
| 	} | ||||
|       else | ||||
| 	{ | ||||
|           *result++ = s[i]; | ||||
| 	} | ||||
|     } | ||||
| } | ||||
|  | ||||
| static void | ||||
| decode_display_descriptor (const uchar *desc, | ||||
| 			   MonitorInfo *info) | ||||
| { | ||||
|   switch (desc[0x03]) | ||||
|     { | ||||
|     case 0xFC: | ||||
|       decode_lf_string (desc + 5, 13, info->dsc_product_name); | ||||
|       break; | ||||
|     case 0xFF: | ||||
|       decode_lf_string (desc + 5, 13, info->dsc_serial_number); | ||||
|       break; | ||||
|     case 0xFE: | ||||
|       decode_lf_string (desc + 5, 13, info->dsc_string); | ||||
|       break; | ||||
|     case 0xFD: | ||||
|       /* Range Limits */ | ||||
|       break; | ||||
|     case 0xFB: | ||||
|       /* Color Point */ | ||||
|       break; | ||||
|     case 0xFA: | ||||
|       /* Timing Identifications */ | ||||
|       break; | ||||
|     case 0xF9: | ||||
|       /* Color Management */ | ||||
|       break; | ||||
|     case 0xF8: | ||||
|       /* Timing Codes */ | ||||
|       break; | ||||
|     case 0xF7: | ||||
|       /* Established Timings */ | ||||
|       break; | ||||
|     case 0x10: | ||||
|       break; | ||||
|     } | ||||
| } | ||||
|  | ||||
| static void | ||||
| decode_detailed_timing (const uchar *timing, | ||||
| 			DetailedTiming *detailed) | ||||
| { | ||||
|   int bits; | ||||
|   StereoType stereo[] = | ||||
|     { | ||||
|       NO_STEREO, NO_STEREO, FIELD_RIGHT, FIELD_LEFT, | ||||
|       TWO_WAY_RIGHT_ON_EVEN, TWO_WAY_LEFT_ON_EVEN, | ||||
|       FOUR_WAY_INTERLEAVED, SIDE_BY_SIDE | ||||
|     }; | ||||
|  | ||||
|   detailed->pixel_clock = (timing[0x00] | timing[0x01] << 8) * 10000; | ||||
|   detailed->h_addr = timing[0x02] | ((timing[0x04] & 0xf0) << 4); | ||||
|   detailed->h_blank = timing[0x03] | ((timing[0x04] & 0x0f) << 8); | ||||
|   detailed->v_addr = timing[0x05] | ((timing[0x07] & 0xf0) << 4); | ||||
|   detailed->v_blank = timing[0x06] | ((timing[0x07] & 0x0f) << 8); | ||||
|   detailed->h_front_porch = timing[0x08] | get_bits (timing[0x0b], 6, 7) << 8; | ||||
|   detailed->h_sync = timing[0x09] | get_bits (timing[0x0b], 4, 5) << 8; | ||||
|   detailed->v_front_porch = | ||||
|     get_bits (timing[0x0a], 4, 7) | get_bits (timing[0x0b], 2, 3) << 4; | ||||
|   detailed->v_sync = | ||||
|     get_bits (timing[0x0a], 0, 3) | get_bits (timing[0x0b], 0, 1) << 4; | ||||
|   detailed->width_mm =  timing[0x0c] | get_bits (timing[0x0e], 4, 7) << 8; | ||||
|   detailed->height_mm = timing[0x0d] | get_bits (timing[0x0e], 0, 3) << 8; | ||||
|   detailed->right_border = timing[0x0f]; | ||||
|   detailed->top_border = timing[0x10]; | ||||
|  | ||||
|   detailed->interlaced = get_bit (timing[0x11], 7); | ||||
|  | ||||
|   /* Stereo */ | ||||
|   bits = get_bits (timing[0x11], 5, 6) << 1 | get_bit (timing[0x11], 0); | ||||
|   detailed->stereo = stereo[bits]; | ||||
|  | ||||
|   /* Sync */ | ||||
|   bits = timing[0x11]; | ||||
|  | ||||
|   detailed->digital_sync = get_bit (bits, 4); | ||||
|   if (detailed->digital_sync) | ||||
|     { | ||||
|       detailed->connector.digital.composite = !get_bit (bits, 3); | ||||
|  | ||||
|       if (detailed->connector.digital.composite) | ||||
| 	{ | ||||
|           detailed->connector.digital.serrations = get_bit (bits, 2); | ||||
|           detailed->connector.digital.negative_vsync = FALSE; | ||||
| 	} | ||||
|       else | ||||
| 	{ | ||||
|           detailed->connector.digital.serrations = FALSE; | ||||
|           detailed->connector.digital.negative_vsync = !get_bit (bits, 2); | ||||
| 	} | ||||
|  | ||||
|       detailed->connector.digital.negative_hsync = !get_bit (bits, 0); | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       detailed->connector.analog.bipolar = get_bit (bits, 3); | ||||
|       detailed->connector.analog.serrations = get_bit (bits, 2); | ||||
|       detailed->connector.analog.sync_on_green = !get_bit (bits, 1); | ||||
|     } | ||||
| } | ||||
|  | ||||
| static int | ||||
| decode_descriptors (const uchar *edid, MonitorInfo *info) | ||||
| { | ||||
|   int i; | ||||
|   int timing_idx; | ||||
|  | ||||
|   timing_idx = 0; | ||||
|  | ||||
|   for (i = 0; i < 4; ++i) | ||||
|     { | ||||
|       int index = 0x36 + i * 18; | ||||
|  | ||||
|       if (edid[index + 0] == 0x00 && edid[index + 1] == 0x00) | ||||
| 	{ | ||||
|           decode_display_descriptor (edid + index, info); | ||||
| 	} | ||||
|       else | ||||
| 	{ | ||||
|           decode_detailed_timing (edid + index, &(info->detailed_timings[timing_idx++])); | ||||
| 	} | ||||
|     } | ||||
|  | ||||
|   info->n_detailed_timings = timing_idx; | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| decode_check_sum (const uchar *edid, | ||||
| 		  MonitorInfo *info) | ||||
| { | ||||
|   int i; | ||||
|   uchar check = 0; | ||||
|  | ||||
|   for (i = 0; i < 128; ++i) | ||||
|     check += edid[i]; | ||||
|  | ||||
|   info->checksum = check; | ||||
| } | ||||
|  | ||||
| MonitorInfo * | ||||
| decode_edid (const uchar *edid) | ||||
| { | ||||
|   MonitorInfo *info = g_new0 (MonitorInfo, 1); | ||||
|  | ||||
|   decode_check_sum (edid, info); | ||||
|  | ||||
|   if (decode_header (edid) | ||||
|       && decode_vendor_and_product_identification (edid, info) | ||||
|       && decode_edid_version (edid, info) | ||||
|       && decode_display_parameters (edid, info) | ||||
|       && decode_color_characteristics (edid, info) | ||||
|       && decode_established_timings (edid, info) | ||||
|       && decode_standard_timings (edid, info) | ||||
|       && decode_descriptors (edid, info)) | ||||
|     { | ||||
|       return info; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       g_free (info); | ||||
|       return NULL; | ||||
|     } | ||||
| } | ||||
| @@ -1,195 +0,0 @@ | ||||
| /* edid.h | ||||
|  * | ||||
|  * Copyright 2007, 2008, Red Hat, Inc. | ||||
|  * | ||||
|  * This file is part of the Gnome Library. | ||||
|  * | ||||
|  * The Gnome Library 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 of the | ||||
|  * License, or (at your option) any later version. | ||||
|  * | ||||
|  * The Gnome Library 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 the Gnome Library; see the file COPYING.LIB.  If not, | ||||
|  * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||||
|  * Boston, MA 02110-1301, USA. | ||||
|  * | ||||
|  * Author: Soren Sandmann <sandmann@redhat.com> | ||||
|  */ | ||||
|  | ||||
| #ifndef EDID_H | ||||
| #define EDID_H | ||||
|  | ||||
| typedef unsigned char uchar; | ||||
| typedef struct MonitorInfo MonitorInfo; | ||||
| typedef struct Timing Timing; | ||||
| typedef struct DetailedTiming DetailedTiming; | ||||
|  | ||||
| typedef enum | ||||
| { | ||||
|   UNDEFINED, | ||||
|   DVI, | ||||
|   HDMI_A, | ||||
|   HDMI_B, | ||||
|   MDDI, | ||||
|   DISPLAY_PORT | ||||
| } Interface; | ||||
|  | ||||
| typedef enum | ||||
| { | ||||
|   UNDEFINED_COLOR, | ||||
|   MONOCHROME, | ||||
|   RGB, | ||||
|   OTHER_COLOR | ||||
| } ColorType; | ||||
|  | ||||
| typedef enum | ||||
| { | ||||
|   NO_STEREO, | ||||
|   FIELD_RIGHT, | ||||
|   FIELD_LEFT, | ||||
|   TWO_WAY_RIGHT_ON_EVEN, | ||||
|   TWO_WAY_LEFT_ON_EVEN, | ||||
|   FOUR_WAY_INTERLEAVED, | ||||
|   SIDE_BY_SIDE | ||||
| } StereoType; | ||||
|  | ||||
| struct Timing | ||||
| { | ||||
|   int width; | ||||
|   int height; | ||||
|   int frequency; | ||||
| }; | ||||
|  | ||||
| struct DetailedTiming | ||||
| { | ||||
|   int		pixel_clock; | ||||
|   int		h_addr; | ||||
|   int		h_blank; | ||||
|   int		h_sync; | ||||
|   int		h_front_porch; | ||||
|   int		v_addr; | ||||
|   int		v_blank; | ||||
|   int		v_sync; | ||||
|   int		v_front_porch; | ||||
|   int		width_mm; | ||||
|   int		height_mm; | ||||
|   int		right_border; | ||||
|   int		top_border; | ||||
|   int		interlaced; | ||||
|   StereoType	stereo; | ||||
|  | ||||
|   int		digital_sync; | ||||
|   union | ||||
|   { | ||||
|     struct | ||||
|     { | ||||
|       int bipolar; | ||||
|       int serrations; | ||||
|       int sync_on_green; | ||||
|     } analog; | ||||
|  | ||||
|     struct | ||||
|     { | ||||
|       int composite; | ||||
|       int serrations; | ||||
|       int negative_vsync; | ||||
|       int negative_hsync; | ||||
|     } digital; | ||||
|   } connector; | ||||
| }; | ||||
|  | ||||
| struct MonitorInfo | ||||
| { | ||||
|   int		checksum; | ||||
|   char		manufacturer_code[4]; | ||||
|   int		product_code; | ||||
|   unsigned int	serial_number; | ||||
|  | ||||
|   int		production_week;	/* -1 if not specified */ | ||||
|   int		production_year;	/* -1 if not specified */ | ||||
|   int		model_year;		/* -1 if not specified */ | ||||
|  | ||||
|   int		major_version; | ||||
|   int		minor_version; | ||||
|  | ||||
|   int		is_digital; | ||||
|  | ||||
|   union | ||||
|   { | ||||
|     struct | ||||
|     { | ||||
|       int	bits_per_primary; | ||||
|       Interface	interface; | ||||
|       int	rgb444; | ||||
|       int	ycrcb444; | ||||
|       int	ycrcb422; | ||||
|     } digital; | ||||
|  | ||||
|     struct | ||||
|     { | ||||
|       double	video_signal_level; | ||||
|       double	sync_signal_level; | ||||
|       double	total_signal_level; | ||||
|  | ||||
|       int	blank_to_black; | ||||
|  | ||||
|       int	separate_hv_sync; | ||||
|       int	composite_sync_on_h; | ||||
|       int	composite_sync_on_green; | ||||
|       int	serration_on_vsync; | ||||
|       ColorType	color_type; | ||||
|     } analog; | ||||
|   } connector; | ||||
|  | ||||
|   int		width_mm;		/* -1 if not specified */ | ||||
|   int		height_mm;		/* -1 if not specified */ | ||||
|   double	aspect_ratio;		/* -1.0 if not specififed */ | ||||
|  | ||||
|   double	gamma;			/* -1.0 if not specified */ | ||||
|  | ||||
|   int		standby; | ||||
|   int		suspend; | ||||
|   int		active_off; | ||||
|  | ||||
|   int		srgb_is_standard; | ||||
|   int		preferred_timing_includes_native; | ||||
|   int		continuous_frequency; | ||||
|  | ||||
|   double	red_x; | ||||
|   double	red_y; | ||||
|   double	green_x; | ||||
|   double	green_y; | ||||
|   double	blue_x; | ||||
|   double	blue_y; | ||||
|   double	white_x; | ||||
|   double	white_y; | ||||
|  | ||||
|   Timing	established[24];	/* Terminated by 0x0x0 */ | ||||
|   Timing	standard[8]; | ||||
|  | ||||
|   int		n_detailed_timings; | ||||
|   DetailedTiming detailed_timings[4];	/* If monitor has a preferred | ||||
|                                          * mode, it is the first one | ||||
|                                          * (whether it has, is | ||||
|                                          * determined by the | ||||
|                                          * preferred_timing_includes | ||||
|                                          * bit. | ||||
|                                          */ | ||||
|  | ||||
|   /* Optional product description */ | ||||
|   char		dsc_serial_number[14]; | ||||
|   char		dsc_product_name[14]; | ||||
|   char		dsc_string[14];		/* Unspecified ASCII data */ | ||||
| }; | ||||
|  | ||||
| MonitorInfo *decode_edid (const uchar *data); | ||||
| char *make_display_name (const MonitorInfo *info); | ||||
| char *make_display_size_string (int width_mm, int height_mm); | ||||
|  | ||||
| #endif | ||||
| @@ -1,110 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
|  | ||||
| #ifndef META_BACKEND_PRIVATE_H | ||||
| #define META_BACKEND_PRIVATE_H | ||||
|  | ||||
| #include <glib-object.h> | ||||
|  | ||||
| #include <xkbcommon/xkbcommon.h> | ||||
|  | ||||
| #include <meta/meta-backend.h> | ||||
| #include <meta/meta-idle-monitor.h> | ||||
| #include "meta-cursor-renderer.h" | ||||
| #include "meta-monitor-manager.h" | ||||
|  | ||||
| #define DEFAULT_XKB_RULES_FILE "evdev" | ||||
| #define DEFAULT_XKB_MODEL "pc105+inet" | ||||
|  | ||||
| #define META_TYPE_BACKEND             (meta_backend_get_type ()) | ||||
| #define META_BACKEND(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND, MetaBackend)) | ||||
| #define META_BACKEND_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BACKEND, MetaBackendClass)) | ||||
| #define META_IS_BACKEND(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BACKEND)) | ||||
| #define META_IS_BACKEND_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BACKEND)) | ||||
| #define META_BACKEND_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BACKEND, MetaBackendClass)) | ||||
|  | ||||
| struct _MetaBackend | ||||
| { | ||||
|   GObject parent; | ||||
|  | ||||
|   MetaIdleMonitor *device_monitors[256]; | ||||
|   int device_id_max; | ||||
| }; | ||||
|  | ||||
| struct _MetaBackendClass | ||||
| { | ||||
|   GObjectClass parent_class; | ||||
|  | ||||
|   void (* post_init) (MetaBackend *backend); | ||||
|  | ||||
|   MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend, | ||||
|                                              int          device_id); | ||||
|   MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend); | ||||
|   MetaCursorRenderer * (* create_cursor_renderer) (MetaBackend *backend); | ||||
|  | ||||
|   gboolean (* grab_device) (MetaBackend *backend, | ||||
|                             int          device_id, | ||||
|                             uint32_t     timestamp); | ||||
|   gboolean (* ungrab_device) (MetaBackend *backend, | ||||
|                               int          device_id, | ||||
|                               uint32_t     timestamp); | ||||
|  | ||||
|   void (* warp_pointer) (MetaBackend *backend, | ||||
|                          int          x, | ||||
|                          int          y); | ||||
|  | ||||
|   void (* set_keymap) (MetaBackend *backend, | ||||
|                        const char  *layouts, | ||||
|                        const char  *variants, | ||||
|                        const char  *options); | ||||
|  | ||||
|   struct xkb_keymap * (* get_keymap) (MetaBackend *backend); | ||||
|  | ||||
|   void (* lock_layout_group) (MetaBackend *backend, | ||||
|                               guint        idx); | ||||
|  | ||||
|   void (* update_screen_size) (MetaBackend *backend, int width, int height); | ||||
|   void (* select_stage_events) (MetaBackend *backend); | ||||
| }; | ||||
|  | ||||
| MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend, | ||||
|                                                  int          device_id); | ||||
| MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend); | ||||
| MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend); | ||||
|  | ||||
| gboolean meta_backend_grab_device (MetaBackend *backend, | ||||
|                                    int          device_id, | ||||
|                                    uint32_t     timestamp); | ||||
| gboolean meta_backend_ungrab_device (MetaBackend *backend, | ||||
|                                      int          device_id, | ||||
|                                      uint32_t     timestamp); | ||||
|  | ||||
| void meta_backend_warp_pointer (MetaBackend *backend, | ||||
|                                 int          x, | ||||
|                                 int          y); | ||||
|  | ||||
| struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend); | ||||
|  | ||||
| #endif /* META_BACKEND_PRIVATE_H */ | ||||
| @@ -1,412 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include <meta/meta-backend.h> | ||||
| #include "meta-backend-private.h" | ||||
|  | ||||
| #include "backends/x11/meta-backend-x11.h" | ||||
| #include "meta-stage.h" | ||||
|  | ||||
| #ifdef HAVE_NATIVE_BACKEND | ||||
| #include "backends/native/meta-backend-native.h" | ||||
| #endif | ||||
|  | ||||
| static MetaBackend *_backend; | ||||
|  | ||||
| /** | ||||
|  * meta_get_backend: | ||||
|  * | ||||
|  * Accessor for the singleton MetaBackend. | ||||
|  * | ||||
|  * Returns: (transfer none): The only #MetaBackend there is. | ||||
|  */ | ||||
| MetaBackend * | ||||
| meta_get_backend (void) | ||||
| { | ||||
|   return _backend; | ||||
| } | ||||
|  | ||||
| struct _MetaBackendPrivate | ||||
| { | ||||
|   MetaMonitorManager *monitor_manager; | ||||
|   MetaCursorRenderer *cursor_renderer; | ||||
|  | ||||
|   ClutterActor *stage; | ||||
| }; | ||||
| typedef struct _MetaBackendPrivate MetaBackendPrivate; | ||||
|  | ||||
| G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaBackend, meta_backend, G_TYPE_OBJECT); | ||||
|  | ||||
| static void | ||||
| meta_backend_finalize (GObject *object) | ||||
| { | ||||
|   MetaBackend *backend = META_BACKEND (object); | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|   int i; | ||||
|  | ||||
|   g_clear_object (&priv->monitor_manager); | ||||
|  | ||||
|   for (i = 0; i <= backend->device_id_max; i++) | ||||
|     { | ||||
|       if (backend->device_monitors[i]) | ||||
|         g_object_unref (backend->device_monitors[i]); | ||||
|     } | ||||
|  | ||||
|   G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_sync_screen_size (MetaBackend *backend) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|   int width, height; | ||||
|  | ||||
|   meta_monitor_manager_get_screen_size (priv->monitor_manager, &width, &height); | ||||
|  | ||||
|   META_BACKEND_GET_CLASS (backend)->update_screen_size (backend, width, height); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_monitors_changed (MetaMonitorManager *monitors, | ||||
|                      gpointer user_data) | ||||
| { | ||||
|   MetaBackend *backend = META_BACKEND (user_data); | ||||
|   meta_backend_sync_screen_size (backend); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_real_post_init (MetaBackend *backend) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|  | ||||
|   priv->stage = meta_stage_new (); | ||||
|   clutter_actor_realize (priv->stage); | ||||
|   META_BACKEND_GET_CLASS (backend)->select_stage_events (backend); | ||||
|  | ||||
|   priv->monitor_manager = META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend); | ||||
|  | ||||
|   g_signal_connect (priv->monitor_manager, "monitors-changed", | ||||
|                     G_CALLBACK (on_monitors_changed), backend); | ||||
|   meta_backend_sync_screen_size (backend); | ||||
|  | ||||
|   priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend); | ||||
| } | ||||
|  | ||||
| static MetaCursorRenderer * | ||||
| meta_backend_real_create_cursor_renderer (MetaBackend *backend) | ||||
| { | ||||
|   return meta_cursor_renderer_new (); | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| meta_backend_real_grab_device (MetaBackend *backend, | ||||
|                                int          device_id, | ||||
|                                uint32_t     timestamp) | ||||
| { | ||||
|   /* Do nothing */ | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| meta_backend_real_ungrab_device (MetaBackend *backend, | ||||
|                                  int          device_id, | ||||
|                                  uint32_t     timestamp) | ||||
| { | ||||
|   /* Do nothing */ | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_real_update_screen_size (MetaBackend *backend, | ||||
|                                       int width, int height) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|  | ||||
|   clutter_actor_set_size (priv->stage, width, height); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_real_select_stage_events (MetaBackend *backend) | ||||
| { | ||||
|   /* Do nothing */ | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_class_init (MetaBackendClass *klass) | ||||
| { | ||||
|   GObjectClass *object_class = G_OBJECT_CLASS (klass); | ||||
|  | ||||
|   object_class->finalize = meta_backend_finalize; | ||||
|  | ||||
|   klass->post_init = meta_backend_real_post_init; | ||||
|   klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer; | ||||
|   klass->grab_device = meta_backend_real_grab_device; | ||||
|   klass->ungrab_device = meta_backend_real_ungrab_device; | ||||
|   klass->update_screen_size = meta_backend_real_update_screen_size; | ||||
|   klass->select_stage_events = meta_backend_real_select_stage_events; | ||||
|  | ||||
|   g_signal_new ("keymap-changed", | ||||
|                 G_TYPE_FROM_CLASS (object_class), | ||||
|                 G_SIGNAL_RUN_LAST, | ||||
|                 0, | ||||
|                 NULL, NULL, NULL, | ||||
|                 G_TYPE_NONE, 0); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_init (MetaBackend *backend) | ||||
| { | ||||
|   _backend = backend; | ||||
| } | ||||
|  | ||||
| /* FIXME -- destroy device monitors at some point */ | ||||
| G_GNUC_UNUSED static void | ||||
| destroy_device_monitor (MetaBackend *backend, | ||||
|                         int          device_id) | ||||
| { | ||||
|   g_clear_object (&backend->device_monitors[device_id]); | ||||
|   if (device_id == backend->device_id_max) | ||||
|     backend->device_id_max--; | ||||
| } | ||||
|  | ||||
| static MetaIdleMonitor * | ||||
| meta_backend_create_idle_monitor (MetaBackend *backend, | ||||
|                                   int          device_id) | ||||
| { | ||||
|   return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_backend_post_init (MetaBackend *backend) | ||||
| { | ||||
|   META_BACKEND_GET_CLASS (backend)->post_init (backend); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_get_idle_monitor: (skip) | ||||
|  */ | ||||
| MetaIdleMonitor * | ||||
| meta_backend_get_idle_monitor (MetaBackend *backend, | ||||
|                                int          device_id) | ||||
| { | ||||
|   g_return_val_if_fail (device_id >= 0 && device_id < 256, NULL); | ||||
|  | ||||
|   if (!backend->device_monitors[device_id]) | ||||
|     { | ||||
|       backend->device_monitors[device_id] = meta_backend_create_idle_monitor (backend, device_id); | ||||
|       backend->device_id_max = MAX (backend->device_id_max, device_id); | ||||
|     } | ||||
|  | ||||
|   return backend->device_monitors[device_id]; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_get_monitor_manager: (skip) | ||||
|  */ | ||||
| MetaMonitorManager * | ||||
| meta_backend_get_monitor_manager (MetaBackend *backend) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|  | ||||
|   return priv->monitor_manager; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_get_cursor_renderer: (skip) | ||||
|  */ | ||||
| MetaCursorRenderer * | ||||
| meta_backend_get_cursor_renderer (MetaBackend *backend) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|  | ||||
|   return priv->cursor_renderer; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_grab_device: (skip) | ||||
|  */ | ||||
| gboolean | ||||
| meta_backend_grab_device (MetaBackend *backend, | ||||
|                           int          device_id, | ||||
|                           uint32_t     timestamp) | ||||
| { | ||||
|   return META_BACKEND_GET_CLASS (backend)->grab_device (backend, device_id, timestamp); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_ungrab_device: (skip) | ||||
|  */ | ||||
| gboolean | ||||
| meta_backend_ungrab_device (MetaBackend *backend, | ||||
|                             int          device_id, | ||||
|                             uint32_t     timestamp) | ||||
| { | ||||
|   return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_warp_pointer: (skip) | ||||
|  */ | ||||
| void | ||||
| meta_backend_warp_pointer (MetaBackend *backend, | ||||
|                            int          x, | ||||
|                            int          y) | ||||
| { | ||||
|   META_BACKEND_GET_CLASS (backend)->warp_pointer (backend, x, y); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_backend_set_keymap (MetaBackend *backend, | ||||
|                          const char  *layouts, | ||||
|                          const char  *variants, | ||||
|                          const char  *options) | ||||
| { | ||||
|   META_BACKEND_GET_CLASS (backend)->set_keymap (backend, layouts, variants, options); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_get_keymap: (skip) | ||||
|  */ | ||||
| struct xkb_keymap * | ||||
| meta_backend_get_keymap (MetaBackend *backend) | ||||
|  | ||||
| { | ||||
|   return META_BACKEND_GET_CLASS (backend)->get_keymap (backend); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_backend_lock_layout_group (MetaBackend *backend, | ||||
|                                 guint idx) | ||||
| { | ||||
|   META_BACKEND_GET_CLASS (backend)->lock_layout_group (backend, idx); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_backend_get_stage: | ||||
|  * @backend: A #MetaBackend | ||||
|  * | ||||
|  * Gets the global #ClutterStage that's managed by this backend. | ||||
|  * | ||||
|  * Returns: (transfer none): the #ClutterStage | ||||
|  */ | ||||
| ClutterActor * | ||||
| meta_backend_get_stage (MetaBackend *backend) | ||||
| { | ||||
|   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); | ||||
|   return priv->stage; | ||||
| } | ||||
|  | ||||
| static GType | ||||
| get_backend_type (void) | ||||
| { | ||||
| #if defined(CLUTTER_WINDOWING_X11) | ||||
|   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) | ||||
|     return META_TYPE_BACKEND_X11; | ||||
| #endif | ||||
|  | ||||
| #if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND) | ||||
|   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL)) | ||||
|     return META_TYPE_BACKEND_NATIVE; | ||||
| #endif | ||||
|  | ||||
|   g_assert_not_reached (); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_create_backend (void) | ||||
| { | ||||
|   /* meta_backend_init() above install the backend globally so | ||||
|    * so meta_get_backend() works even during initialization. */ | ||||
|   g_object_new (get_backend_type (), NULL); | ||||
| } | ||||
|  | ||||
| /* Mutter is responsible for pulling events off the X queue, so Clutter | ||||
|  * doesn't need (and shouldn't) run its normal event source which polls | ||||
|  * the X fd, but we do have to deal with dispatching events that accumulate | ||||
|  * in the clutter queue. This happens, for example, when clutter generate | ||||
|  * enter/leave events on mouse motion - several events are queued in the | ||||
|  * clutter queue but only one dispatched. It could also happen because of | ||||
|  * explicit calls to clutter_event_put(). We add a very simple custom | ||||
|  * event loop source which is simply responsible for pulling events off | ||||
|  * of the queue and dispatching them before we block for new events. | ||||
|  */ | ||||
|  | ||||
| static gboolean | ||||
| event_prepare (GSource    *source, | ||||
|                gint       *timeout_) | ||||
| { | ||||
|   *timeout_ = -1; | ||||
|  | ||||
|   return clutter_events_pending (); | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| event_check (GSource *source) | ||||
| { | ||||
|   return clutter_events_pending (); | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| event_dispatch (GSource    *source, | ||||
|                 GSourceFunc callback, | ||||
|                 gpointer    user_data) | ||||
| { | ||||
|   ClutterEvent *event = clutter_event_get (); | ||||
|  | ||||
|   if (event) | ||||
|     { | ||||
|       clutter_do_event (event); | ||||
|       clutter_event_free (event); | ||||
|     } | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static GSourceFuncs event_funcs = { | ||||
|   event_prepare, | ||||
|   event_check, | ||||
|   event_dispatch | ||||
| }; | ||||
|  | ||||
| /** | ||||
|  * meta_clutter_init: (skip) | ||||
|  */ | ||||
| void | ||||
| meta_clutter_init (void) | ||||
| { | ||||
|   GSource *source; | ||||
|  | ||||
|   meta_create_backend (); | ||||
|  | ||||
|   if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) | ||||
|     g_error ("Unable to initialize Clutter.\n"); | ||||
|  | ||||
|   source = g_source_new (&event_funcs, sizeof (GSource)); | ||||
|   g_source_attach (source, NULL); | ||||
|   g_source_unref (source); | ||||
|  | ||||
|   meta_backend_post_init (_backend); | ||||
| } | ||||
| @@ -1,51 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Author: Giovanni Campagna <gcampagn@redhat.com> | ||||
|  */ | ||||
|  | ||||
| #ifndef META_CURSOR_PRIVATE_H | ||||
| #define META_CURSOR_PRIVATE_H | ||||
|  | ||||
| #include "meta-cursor.h" | ||||
|  | ||||
| #include <cogl/cogl.h> | ||||
| #include <gbm.h> | ||||
|  | ||||
| typedef struct { | ||||
|   CoglTexture2D *texture; | ||||
|   struct gbm_bo *bo; | ||||
|   int hot_x, hot_y; | ||||
| } MetaCursorImage; | ||||
|  | ||||
| struct _MetaCursorReference { | ||||
|   int ref_count; | ||||
|  | ||||
|   MetaCursor cursor; | ||||
|   MetaCursorImage image; | ||||
| }; | ||||
|  | ||||
| CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor, | ||||
|                                                      int                 *hot_x, | ||||
|                                                      int                 *hot_y); | ||||
|  | ||||
| struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, | ||||
|                                                  int                 *hot_x, | ||||
|                                                  int                 *hot_y); | ||||
|  | ||||
| #endif /* META_CURSOR_PRIVATE_H */ | ||||
| @@ -1,175 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include "meta-cursor-renderer.h" | ||||
| #include "meta-cursor-private.h" | ||||
|  | ||||
| #include <meta/meta-backend.h> | ||||
| #include <meta/util.h> | ||||
|  | ||||
| #include <cogl/cogl.h> | ||||
| #include <clutter/clutter.h> | ||||
|  | ||||
| #include "meta-stage.h" | ||||
|  | ||||
| struct _MetaCursorRendererPrivate | ||||
| { | ||||
|   int current_x, current_y; | ||||
|   MetaRectangle current_rect; | ||||
|  | ||||
|   MetaCursorReference *displayed_cursor; | ||||
|   gboolean handled_by_backend; | ||||
| }; | ||||
| typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate; | ||||
|  | ||||
| G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT); | ||||
|  | ||||
| static void | ||||
| queue_redraw (MetaCursorRenderer *renderer) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|   MetaBackend *backend = meta_get_backend (); | ||||
|   ClutterActor *stage = meta_backend_get_stage (backend); | ||||
|   CoglTexture *texture; | ||||
|  | ||||
|   /* During early initialization, we can have no stage */ | ||||
|   if (!stage) | ||||
|     return; | ||||
|  | ||||
|   if (priv->displayed_cursor && !priv->handled_by_backend) | ||||
|     texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, NULL, NULL); | ||||
|   else | ||||
|     texture = NULL; | ||||
|  | ||||
|   meta_stage_set_cursor (META_STAGE (stage), texture, &priv->current_rect); | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer) | ||||
| { | ||||
|   return FALSE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_renderer_class_init (MetaCursorRendererClass *klass) | ||||
| { | ||||
|   klass->update_cursor = meta_cursor_renderer_real_update_cursor; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_renderer_init (MetaCursorRenderer *renderer) | ||||
| { | ||||
| } | ||||
|  | ||||
| static void | ||||
| update_cursor (MetaCursorRenderer *renderer) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|   gboolean handled_by_backend; | ||||
|   gboolean should_redraw = FALSE; | ||||
|  | ||||
|   if (priv->displayed_cursor) | ||||
|     { | ||||
|       CoglTexture *texture; | ||||
|       int hot_x, hot_y; | ||||
|  | ||||
|       texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y); | ||||
|  | ||||
|       priv->current_rect.x = priv->current_x - hot_x; | ||||
|       priv->current_rect.y = priv->current_y - hot_y; | ||||
|       priv->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture)); | ||||
|       priv->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture)); | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       priv->current_rect.x = 0; | ||||
|       priv->current_rect.y = 0; | ||||
|       priv->current_rect.width = 0; | ||||
|       priv->current_rect.height = 0; | ||||
|     } | ||||
|  | ||||
|   handled_by_backend = META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer); | ||||
|   if (handled_by_backend != priv->handled_by_backend) | ||||
|     { | ||||
|       priv->handled_by_backend = handled_by_backend; | ||||
|       should_redraw = TRUE; | ||||
|     } | ||||
|  | ||||
|   if (!handled_by_backend) | ||||
|     should_redraw = TRUE; | ||||
|  | ||||
|   if (should_redraw) | ||||
|     queue_redraw (renderer); | ||||
| } | ||||
|  | ||||
| MetaCursorRenderer * | ||||
| meta_cursor_renderer_new (void) | ||||
| { | ||||
|   return g_object_new (META_TYPE_CURSOR_RENDERER, NULL); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer, | ||||
|                                  MetaCursorReference *cursor) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|  | ||||
|   if (priv->displayed_cursor == cursor) | ||||
|     return; | ||||
|  | ||||
|   priv->displayed_cursor = cursor; | ||||
|   update_cursor (renderer); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_renderer_set_position (MetaCursorRenderer *renderer, | ||||
|                                    int x, int y) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|  | ||||
|   g_assert (meta_is_wayland_compositor ()); | ||||
|  | ||||
|   priv->current_x = x; | ||||
|   priv->current_y = y; | ||||
|  | ||||
|   update_cursor (renderer); | ||||
| } | ||||
|  | ||||
| MetaCursorReference * | ||||
| meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|  | ||||
|   return priv->displayed_cursor; | ||||
| } | ||||
|  | ||||
| const MetaRectangle * | ||||
| meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer) | ||||
| { | ||||
|   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); | ||||
|  | ||||
|   return &priv->current_rect; | ||||
| } | ||||
| @@ -1,70 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #ifndef META_CURSOR_RENDERER_H | ||||
| #define META_CURSOR_RENDERER_H | ||||
|  | ||||
| #include <glib-object.h> | ||||
|  | ||||
| #include <meta/screen.h> | ||||
| #include "meta-cursor.h" | ||||
|  | ||||
| #include <gbm.h> | ||||
|  | ||||
| #define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ()) | ||||
| #define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer)) | ||||
| #define META_CURSOR_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass)) | ||||
| #define META_IS_CURSOR_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER)) | ||||
| #define META_IS_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_RENDERER)) | ||||
| #define META_CURSOR_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass)) | ||||
|  | ||||
| typedef struct _MetaCursorRenderer        MetaCursorRenderer; | ||||
| typedef struct _MetaCursorRendererClass   MetaCursorRendererClass; | ||||
|  | ||||
| struct _MetaCursorRenderer | ||||
| { | ||||
|   GObject parent; | ||||
| }; | ||||
|  | ||||
| struct _MetaCursorRendererClass | ||||
| { | ||||
|   GObjectClass parent_class; | ||||
|  | ||||
|   gboolean (* update_cursor) (MetaCursorRenderer *renderer); | ||||
| }; | ||||
|  | ||||
| GType meta_cursor_renderer_get_type (void) G_GNUC_CONST; | ||||
|  | ||||
| MetaCursorRenderer * meta_cursor_renderer_new (void); | ||||
|  | ||||
| void meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer, | ||||
|                                       MetaCursorReference *cursor); | ||||
|  | ||||
| void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer, | ||||
|                                         int x, int y); | ||||
|  | ||||
| MetaCursorReference * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer); | ||||
| const MetaRectangle * meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer); | ||||
|  | ||||
| #endif /* META_CURSOR_RENDERER_H */ | ||||
| @@ -1,72 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Author: Giovanni Campagna <gcampagn@redhat.com> | ||||
|  */ | ||||
|  | ||||
| #ifndef META_CURSOR_TRACKER_PRIVATE_H | ||||
| #define META_CURSOR_TRACKER_PRIVATE_H | ||||
|  | ||||
| #include <meta/meta-cursor-tracker.h> | ||||
|  | ||||
| #include "meta-cursor.h" | ||||
| #include "meta-cursor-renderer.h" | ||||
|  | ||||
| struct _MetaCursorTracker { | ||||
|   GObject parent_instance; | ||||
|  | ||||
|   MetaCursorRenderer *renderer; | ||||
|  | ||||
|   gboolean is_showing; | ||||
|  | ||||
|   MetaCursorReference *displayed_cursor; | ||||
|  | ||||
|   /* Wayland clients can set a NULL buffer as their cursor | ||||
|    * explicitly, which means that we shouldn't display anything. | ||||
|    * So, we can't simply store a NULL in window_cursor to | ||||
|    * determine an unset window cursor; we need an extra boolean. | ||||
|    */ | ||||
|   gboolean has_window_cursor; | ||||
|   MetaCursorReference *window_cursor; | ||||
|  | ||||
|   MetaCursorReference *root_cursor; | ||||
|  | ||||
|   /* The cursor from the X11 server. */ | ||||
|   MetaCursorReference *xfixes_cursor; | ||||
| }; | ||||
|  | ||||
| struct _MetaCursorTrackerClass { | ||||
|   GObjectClass parent_class; | ||||
| }; | ||||
|  | ||||
| gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker, | ||||
| 					    XEvent            *xevent); | ||||
|  | ||||
| void     meta_cursor_tracker_set_window_cursor   (MetaCursorTracker   *tracker, | ||||
|                                                   MetaCursorReference *cursor); | ||||
| void     meta_cursor_tracker_unset_window_cursor (MetaCursorTracker   *tracker); | ||||
| void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker   *tracker, | ||||
|                                                   MetaCursorReference *cursor); | ||||
|  | ||||
| void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker, | ||||
| 					      int                new_x, | ||||
| 					      int                new_y); | ||||
|  | ||||
| MetaCursorReference * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker); | ||||
|  | ||||
| #endif | ||||
| @@ -1,443 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Author: Giovanni Campagna <gcampagn@redhat.com> | ||||
|  */ | ||||
|  | ||||
| /** | ||||
|  * SECTION:cursor-tracker | ||||
|  * @title: MetaCursorTracker | ||||
|  * @short_description: Mutter cursor tracking helper. Originally only | ||||
|  *                     tracking the cursor image, now more of a "core | ||||
|  *                     pointer abstraction" | ||||
|  */ | ||||
|  | ||||
| #include <config.h> | ||||
| #include <string.h> | ||||
| #include <meta/main.h> | ||||
| #include <meta/util.h> | ||||
| #include <meta/errors.h> | ||||
|  | ||||
| #include <cogl/cogl.h> | ||||
| #include <clutter/clutter.h> | ||||
|  | ||||
| #include <gdk/gdk.h> | ||||
| #include <gdk/gdkx.h> | ||||
|  | ||||
| #include "meta-backend-private.h" | ||||
|  | ||||
| #include "meta-cursor-private.h" | ||||
| #include "meta-cursor-tracker-private.h" | ||||
|  | ||||
| G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT); | ||||
|  | ||||
| enum { | ||||
|   CURSOR_CHANGED, | ||||
|   LAST_SIGNAL | ||||
| }; | ||||
|  | ||||
| static guint signals[LAST_SIGNAL]; | ||||
|  | ||||
| static MetaCursorReference * | ||||
| get_displayed_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   MetaDisplay *display = meta_get_display (); | ||||
|  | ||||
|   if (!tracker->is_showing) | ||||
|     return NULL; | ||||
|  | ||||
|   if (meta_display_windows_are_interactable (display)) | ||||
|     { | ||||
|       if (tracker->has_window_cursor) | ||||
|         return tracker->window_cursor; | ||||
|     } | ||||
|  | ||||
|   return tracker->root_cursor; | ||||
| } | ||||
|  | ||||
| static void | ||||
| update_displayed_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   meta_cursor_renderer_set_cursor (tracker->renderer, tracker->displayed_cursor); | ||||
| } | ||||
|  | ||||
| static void | ||||
| sync_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker); | ||||
|  | ||||
|   if (tracker->displayed_cursor == displayed_cursor) | ||||
|     return; | ||||
|  | ||||
|   g_clear_pointer (&tracker->displayed_cursor, meta_cursor_reference_unref); | ||||
|   if (displayed_cursor) | ||||
|     tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor); | ||||
|  | ||||
|   update_displayed_cursor (tracker); | ||||
|   g_signal_emit (tracker, signals[CURSOR_CHANGED], 0); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_tracker_init (MetaCursorTracker *self) | ||||
| { | ||||
|   MetaBackend *backend = meta_get_backend (); | ||||
|  | ||||
|   self->renderer = meta_backend_get_cursor_renderer (backend); | ||||
|   self->is_showing = TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_tracker_finalize (GObject *object) | ||||
| { | ||||
|   MetaCursorTracker *self = META_CURSOR_TRACKER (object); | ||||
|  | ||||
|   if (self->displayed_cursor) | ||||
|     meta_cursor_reference_unref (self->displayed_cursor); | ||||
|   if (self->root_cursor) | ||||
|     meta_cursor_reference_unref (self->root_cursor); | ||||
|  | ||||
|   G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass) | ||||
| { | ||||
|   GObjectClass *object_class = G_OBJECT_CLASS (klass); | ||||
|  | ||||
|   object_class->finalize = meta_cursor_tracker_finalize; | ||||
|  | ||||
|   signals[CURSOR_CHANGED] = g_signal_new ("cursor-changed", | ||||
|                                           G_TYPE_FROM_CLASS (klass), | ||||
|                                           G_SIGNAL_RUN_LAST, | ||||
|                                           0, | ||||
|                                           NULL, NULL, NULL, | ||||
|                                           G_TYPE_NONE, 0); | ||||
| } | ||||
|  | ||||
| static MetaCursorTracker * | ||||
| meta_cursor_tracker_new (void) | ||||
| { | ||||
|   return g_object_new (META_TYPE_CURSOR_TRACKER, NULL); | ||||
| } | ||||
|  | ||||
| static MetaCursorTracker *_cursor_tracker; | ||||
|  | ||||
| /** | ||||
|  * meta_cursor_tracker_get_for_screen: | ||||
|  * @screen: the #MetaScreen | ||||
|  * | ||||
|  * Retrieves the cursor tracker object for @screen. | ||||
|  * | ||||
|  * Returns: (transfer none): | ||||
|  */ | ||||
| MetaCursorTracker * | ||||
| meta_cursor_tracker_get_for_screen (MetaScreen *screen) | ||||
| { | ||||
|   if (!_cursor_tracker) | ||||
|     _cursor_tracker = meta_cursor_tracker_new (); | ||||
|  | ||||
|   return _cursor_tracker; | ||||
| } | ||||
|  | ||||
| static void | ||||
| set_window_cursor (MetaCursorTracker   *tracker, | ||||
|                    gboolean             has_cursor, | ||||
|                    MetaCursorReference *cursor) | ||||
| { | ||||
|   g_clear_pointer (&tracker->window_cursor, meta_cursor_reference_unref); | ||||
|   if (cursor) | ||||
|     tracker->window_cursor = meta_cursor_reference_ref (cursor); | ||||
|   tracker->has_window_cursor = has_cursor; | ||||
|   sync_cursor (tracker); | ||||
| } | ||||
|  | ||||
| gboolean | ||||
| meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker, | ||||
|                                    XEvent            *xevent) | ||||
| { | ||||
|   MetaDisplay *display = meta_get_display (); | ||||
|   XFixesCursorNotifyEvent *notify_event; | ||||
|  | ||||
|   if (meta_is_wayland_compositor ()) | ||||
|     return FALSE; | ||||
|  | ||||
|   if (xevent->xany.type != display->xfixes_event_base + XFixesCursorNotify) | ||||
|     return FALSE; | ||||
|  | ||||
|   notify_event = (XFixesCursorNotifyEvent *)xevent; | ||||
|   if (notify_event->subtype != XFixesDisplayCursorNotify) | ||||
|     return FALSE; | ||||
|  | ||||
|   g_clear_pointer (&tracker->xfixes_cursor, meta_cursor_reference_unref); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static MetaCursorReference * | ||||
| meta_cursor_reference_take_texture (CoglTexture2D *texture, | ||||
|                                     int            hot_x, | ||||
|                                     int            hot_y) | ||||
| { | ||||
|   MetaCursorReference *self; | ||||
|  | ||||
|   self = g_slice_new0 (MetaCursorReference); | ||||
|   self->ref_count = 1; | ||||
|   self->image.texture = texture; | ||||
|   self->image.hot_x = hot_x; | ||||
|   self->image.hot_y = hot_y; | ||||
|  | ||||
|   return self; | ||||
| } | ||||
|  | ||||
| static void | ||||
| ensure_xfixes_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   MetaDisplay *display = meta_get_display (); | ||||
|   XFixesCursorImage *cursor_image; | ||||
|   CoglTexture2D *sprite; | ||||
|   guint8 *cursor_data; | ||||
|   gboolean free_cursor_data; | ||||
|   CoglContext *ctx; | ||||
|  | ||||
|   if (tracker->xfixes_cursor) | ||||
|     return; | ||||
|  | ||||
|   cursor_image = XFixesGetCursorImage (display->xdisplay); | ||||
|   if (!cursor_image) | ||||
|     return; | ||||
|  | ||||
|   /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit | ||||
|    * quantities as arrays of long; we need to convert on 64 bit */ | ||||
|   if (sizeof(long) == 4) | ||||
|     { | ||||
|       cursor_data = (guint8 *)cursor_image->pixels; | ||||
|       free_cursor_data = FALSE; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       int i, j; | ||||
|       guint32 *cursor_words; | ||||
|       gulong *p; | ||||
|       guint32 *q; | ||||
|  | ||||
|       cursor_words = g_new (guint32, cursor_image->width * cursor_image->height); | ||||
|       cursor_data = (guint8 *)cursor_words; | ||||
|  | ||||
|       p = cursor_image->pixels; | ||||
|       q = cursor_words; | ||||
|       for (j = 0; j < cursor_image->height; j++) | ||||
|         for (i = 0; i < cursor_image->width; i++) | ||||
|           *(q++) = *(p++); | ||||
|  | ||||
|       free_cursor_data = TRUE; | ||||
|     } | ||||
|  | ||||
|   ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ()); | ||||
|   sprite = cogl_texture_2d_new_from_data (ctx, | ||||
|                                           cursor_image->width, | ||||
|                                           cursor_image->height, | ||||
|                                           CLUTTER_CAIRO_FORMAT_ARGB32, | ||||
|                                           cursor_image->width * 4, /* stride */ | ||||
|                                           cursor_data, | ||||
|                                           NULL); | ||||
|  | ||||
|   if (free_cursor_data) | ||||
|     g_free (cursor_data); | ||||
|  | ||||
|   if (sprite != NULL) | ||||
|     { | ||||
|       MetaCursorReference *cursor = meta_cursor_reference_take_texture (sprite, | ||||
|                                                                         cursor_image->xhot, | ||||
|                                                                         cursor_image->yhot); | ||||
|       tracker->xfixes_cursor = cursor; | ||||
|     } | ||||
|   XFree (cursor_image); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_cursor_tracker_get_sprite: | ||||
|  * | ||||
|  * Returns: (transfer none): | ||||
|  */ | ||||
| CoglTexture * | ||||
| meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker) | ||||
| { | ||||
|   MetaCursorReference *cursor; | ||||
|  | ||||
|   g_return_val_if_fail (META_IS_CURSOR_TRACKER (tracker), NULL); | ||||
|  | ||||
|   if (meta_is_wayland_compositor ()) | ||||
|     { | ||||
|       cursor = tracker->displayed_cursor; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       ensure_xfixes_cursor (tracker); | ||||
|       cursor = tracker->xfixes_cursor; | ||||
|     } | ||||
|  | ||||
|   if (cursor) | ||||
|     return meta_cursor_reference_get_cogl_texture (cursor, NULL, NULL); | ||||
|   else | ||||
|     return NULL; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_cursor_tracker_get_hot: | ||||
|  * @tracker: | ||||
|  * @x: (out): | ||||
|  * @y: (out): | ||||
|  * | ||||
|  */ | ||||
| void | ||||
| meta_cursor_tracker_get_hot (MetaCursorTracker *tracker, | ||||
|                              int               *x, | ||||
|                              int               *y) | ||||
| { | ||||
|   MetaCursorReference *cursor; | ||||
|  | ||||
|   g_return_if_fail (META_IS_CURSOR_TRACKER (tracker)); | ||||
|  | ||||
|   if (meta_is_wayland_compositor ()) | ||||
|     { | ||||
|       cursor = tracker->displayed_cursor; | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       ensure_xfixes_cursor (tracker); | ||||
|       cursor = tracker->xfixes_cursor; | ||||
|     } | ||||
|  | ||||
|   if (cursor) | ||||
|     meta_cursor_reference_get_cogl_texture (cursor, x, y); | ||||
|   else | ||||
|     { | ||||
|       if (x) | ||||
|         *x = 0; | ||||
|       if (y) | ||||
|         *y = 0; | ||||
|     } | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_set_window_cursor (MetaCursorTracker   *tracker, | ||||
|                                        MetaCursorReference *cursor) | ||||
| { | ||||
|   set_window_cursor (tracker, TRUE, cursor); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   set_window_cursor (tracker, FALSE, NULL); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_set_root_cursor (MetaCursorTracker   *tracker, | ||||
|                                      MetaCursorReference *cursor) | ||||
| { | ||||
|   g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref); | ||||
|   if (cursor) | ||||
|     tracker->root_cursor = meta_cursor_reference_ref (cursor); | ||||
|  | ||||
|   sync_cursor (tracker); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_update_position (MetaCursorTracker *tracker, | ||||
|                                      int                new_x, | ||||
|                                      int                new_y) | ||||
| { | ||||
|   g_assert (meta_is_wayland_compositor ()); | ||||
|  | ||||
|   meta_cursor_renderer_set_position (tracker->renderer, new_x, new_y); | ||||
| } | ||||
|  | ||||
| static void | ||||
| get_pointer_position_gdk (int         *x, | ||||
|                           int         *y, | ||||
|                           int         *mods) | ||||
| { | ||||
|   GdkDeviceManager *gmanager; | ||||
|   GdkDevice *gdevice; | ||||
|   GdkScreen *gscreen; | ||||
|  | ||||
|   gmanager = gdk_display_get_device_manager (gdk_display_get_default ()); | ||||
|   gdevice = gdk_x11_device_manager_lookup (gmanager, META_VIRTUAL_CORE_POINTER_ID); | ||||
|  | ||||
|   gdk_device_get_position (gdevice, &gscreen, x, y); | ||||
|   if (mods) | ||||
|     gdk_device_get_state (gdevice, | ||||
|                           gdk_screen_get_root_window (gscreen), | ||||
|                           NULL, (GdkModifierType*)mods); | ||||
| } | ||||
|  | ||||
| static void | ||||
| get_pointer_position_clutter (int         *x, | ||||
|                               int         *y, | ||||
|                               int         *mods) | ||||
| { | ||||
|   ClutterDeviceManager *cmanager; | ||||
|   ClutterInputDevice *cdevice; | ||||
|   ClutterPoint point; | ||||
|  | ||||
|   cmanager = clutter_device_manager_get_default (); | ||||
|   cdevice = clutter_device_manager_get_core_device (cmanager, CLUTTER_POINTER_DEVICE); | ||||
|  | ||||
|   clutter_input_device_get_coords (cdevice, NULL, &point); | ||||
|   if (x) | ||||
|     *x = point.x; | ||||
|   if (y) | ||||
|     *y = point.y; | ||||
|   if (mods) | ||||
|     *mods = clutter_input_device_get_modifier_state (cdevice); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_get_pointer (MetaCursorTracker   *tracker, | ||||
|                                  int                 *x, | ||||
|                                  int                 *y, | ||||
|                                  ClutterModifierType *mods) | ||||
| { | ||||
|   /* We can't use the clutter interface when not running as a wayland compositor, | ||||
|      because we need to query the server, rather than using the last cached value. | ||||
|      OTOH, on wayland we can't use GDK, because that only sees the events | ||||
|      we forward to xwayland. | ||||
|   */ | ||||
|   if (meta_is_wayland_compositor ()) | ||||
|     get_pointer_position_clutter (x, y, (int*)mods); | ||||
|   else | ||||
|     get_pointer_position_gdk (x, y, (int*)mods); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker, | ||||
|                                          gboolean           visible) | ||||
| { | ||||
|   if (visible == tracker->is_showing) | ||||
|     return; | ||||
|   tracker->is_showing = visible; | ||||
|  | ||||
|   sync_cursor (tracker); | ||||
| } | ||||
|  | ||||
| MetaCursorReference * | ||||
| meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker) | ||||
| { | ||||
|   return tracker->displayed_cursor; | ||||
| } | ||||
| @@ -1,381 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Author: Giovanni Campagna <gcampagn@redhat.com> | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include "meta-cursor-private.h" | ||||
|  | ||||
| #include <meta/errors.h> | ||||
|  | ||||
| #include "display-private.h" | ||||
| #include "screen-private.h" | ||||
| #include "meta-backend-private.h" | ||||
|  | ||||
| #ifdef HAVE_NATIVE_BACKEND | ||||
| #include "backends/native/meta-cursor-renderer-native.h" | ||||
| #endif | ||||
|  | ||||
| #include <string.h> | ||||
|  | ||||
| #include <X11/cursorfont.h> | ||||
| #include <X11/extensions/Xfixes.h> | ||||
| #include <X11/Xcursor/Xcursor.h> | ||||
|  | ||||
| #ifdef HAVE_WAYLAND | ||||
| #include <cogl/cogl-wayland-server.h> | ||||
| #endif | ||||
|  | ||||
| MetaCursorReference * | ||||
| meta_cursor_reference_ref (MetaCursorReference *self) | ||||
| { | ||||
|   g_assert (self->ref_count > 0); | ||||
|   self->ref_count++; | ||||
|  | ||||
|   return self; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_image_free (MetaCursorImage *image) | ||||
| { | ||||
|   cogl_object_unref (image->texture); | ||||
|   if (image->bo) | ||||
|     gbm_bo_destroy (image->bo); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_reference_free (MetaCursorReference *self) | ||||
| { | ||||
|   meta_cursor_image_free (&self->image); | ||||
|   g_slice_free (MetaCursorReference, self); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_cursor_reference_unref (MetaCursorReference *self) | ||||
| { | ||||
|   self->ref_count--; | ||||
|  | ||||
|   if (self->ref_count == 0) | ||||
|     meta_cursor_reference_free (self); | ||||
| } | ||||
|  | ||||
| static const char * | ||||
| translate_meta_cursor (MetaCursor cursor) | ||||
| { | ||||
|   switch (cursor) | ||||
|     { | ||||
|     case META_CURSOR_DEFAULT: | ||||
|       return "left_ptr"; | ||||
|     case META_CURSOR_NORTH_RESIZE: | ||||
|       return "top_side"; | ||||
|     case META_CURSOR_SOUTH_RESIZE: | ||||
|       return "bottom_side"; | ||||
|     case META_CURSOR_WEST_RESIZE: | ||||
|       return "left_side"; | ||||
|     case META_CURSOR_EAST_RESIZE: | ||||
|       return "right_side"; | ||||
|     case META_CURSOR_SE_RESIZE: | ||||
|       return "bottom_right_corner"; | ||||
|     case META_CURSOR_SW_RESIZE: | ||||
|       return "bottom_left_corner"; | ||||
|     case META_CURSOR_NE_RESIZE: | ||||
|       return "top_right_corner"; | ||||
|     case META_CURSOR_NW_RESIZE: | ||||
|       return "top_left_corner"; | ||||
|     case META_CURSOR_MOVE_OR_RESIZE_WINDOW: | ||||
|       return "fleur"; | ||||
|     case META_CURSOR_BUSY: | ||||
|       return "watch"; | ||||
|     case META_CURSOR_DND_IN_DRAG: | ||||
|       return "dnd-none"; | ||||
|     case META_CURSOR_DND_MOVE: | ||||
|       return "dnd-move"; | ||||
|     case META_CURSOR_DND_COPY: | ||||
|       return "dnd-copy"; | ||||
|     case META_CURSOR_DND_UNSUPPORTED_TARGET: | ||||
|       return "dnd-none"; | ||||
|     case META_CURSOR_POINTING_HAND: | ||||
|       return "hand2"; | ||||
|     case META_CURSOR_CROSSHAIR: | ||||
|       return "crosshair"; | ||||
|     case META_CURSOR_IBEAM: | ||||
|       return "xterm"; | ||||
|     default: | ||||
|       break; | ||||
|     } | ||||
|  | ||||
|   g_assert_not_reached (); | ||||
| } | ||||
|  | ||||
| Cursor | ||||
| meta_cursor_create_x_cursor (Display    *xdisplay, | ||||
|                              MetaCursor  cursor) | ||||
| { | ||||
|   return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor)); | ||||
| } | ||||
|  | ||||
| static XcursorImage * | ||||
| load_cursor_on_client (MetaCursor cursor) | ||||
| { | ||||
|   return XcursorLibraryLoadImage (translate_meta_cursor (cursor), | ||||
|                                   meta_prefs_get_cursor_theme (), | ||||
|                                   meta_prefs_get_cursor_size ()); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm, | ||||
|                                    MetaCursorImage   *image, | ||||
|                                    uint8_t           *pixels, | ||||
|                                    int                width, | ||||
|                                    int                height, | ||||
|                                    int                rowstride, | ||||
|                                    uint32_t           gbm_format) | ||||
| { | ||||
|   if (width > 64 || height > 64) | ||||
|     { | ||||
|       meta_warning ("Invalid theme cursor size (must be at most 64x64)\n"); | ||||
|       return; | ||||
|     } | ||||
|  | ||||
|   if (gbm_device_is_format_supported (gbm, gbm_format, | ||||
|                                       GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE)) | ||||
|     { | ||||
|       uint8_t buf[4 * 64 * 64]; | ||||
|       int i; | ||||
|  | ||||
|       image->bo = gbm_bo_create (gbm, 64, 64, | ||||
|                                  gbm_format, GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE); | ||||
|  | ||||
|       memset (buf, 0, sizeof(buf)); | ||||
|       for (i = 0; i < height; i++) | ||||
|         memcpy (buf + i * 4 * 64, pixels + i * rowstride, width * 4); | ||||
|  | ||||
|       gbm_bo_write (image->bo, buf, 64 * 64 * 4); | ||||
|     } | ||||
|   else | ||||
|     meta_warning ("HW cursor for format %d not supported\n", gbm_format); | ||||
| } | ||||
|  | ||||
| static struct gbm_device * | ||||
| get_gbm_device (void) | ||||
| { | ||||
| #ifdef HAVE_NATIVE_BACKEND | ||||
|   MetaBackend *meta_backend = meta_get_backend (); | ||||
|   MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend); | ||||
|  | ||||
|   if (META_IS_CURSOR_RENDERER_NATIVE (renderer)) | ||||
|     return meta_cursor_renderer_native_get_gbm_device (META_CURSOR_RENDERER_NATIVE (renderer)); | ||||
| #endif | ||||
|  | ||||
|   return NULL; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image, | ||||
|                                            XcursorImage      *xc_image) | ||||
| { | ||||
|   int width, height, rowstride; | ||||
|   CoglPixelFormat cogl_format; | ||||
|   uint32_t gbm_format; | ||||
|   ClutterBackend *clutter_backend; | ||||
|   CoglContext *cogl_context; | ||||
|   struct gbm_device *gbm; | ||||
|  | ||||
|   width           = xc_image->width; | ||||
|   height          = xc_image->height; | ||||
|   rowstride       = width * 4; | ||||
|  | ||||
|   gbm_format = GBM_FORMAT_ARGB8888; | ||||
| #if G_BYTE_ORDER == G_LITTLE_ENDIAN | ||||
|   cogl_format = COGL_PIXEL_FORMAT_BGRA_8888; | ||||
| #else | ||||
|   cogl_format = COGL_PIXEL_FORMAT_ARGB_8888; | ||||
| #endif | ||||
|  | ||||
|   image->hot_x = xc_image->xhot; | ||||
|   image->hot_y = xc_image->yhot; | ||||
|  | ||||
|   clutter_backend = clutter_get_default_backend (); | ||||
|   cogl_context = clutter_backend_get_cogl_context (clutter_backend); | ||||
|   image->texture = cogl_texture_2d_new_from_data (cogl_context, | ||||
|                                                   width, height, | ||||
|                                                   cogl_format, | ||||
|                                                   rowstride, | ||||
|                                                   (uint8_t *) xc_image->pixels, | ||||
|                                                   NULL); | ||||
|  | ||||
|   gbm = get_gbm_device (); | ||||
|   if (gbm) | ||||
|     meta_cursor_image_load_gbm_buffer (gbm, | ||||
|                                        image, | ||||
|                                        (uint8_t *) xc_image->pixels, | ||||
|                                        width, height, rowstride, | ||||
|                                        gbm_format); | ||||
| } | ||||
|  | ||||
| MetaCursorReference * | ||||
| meta_cursor_reference_from_theme (MetaCursor cursor) | ||||
| { | ||||
|   MetaCursorReference *self; | ||||
|   XcursorImage *image; | ||||
|  | ||||
|   image = load_cursor_on_client (cursor); | ||||
|   if (!image) | ||||
|     return NULL; | ||||
|  | ||||
|   self = g_slice_new0 (MetaCursorReference); | ||||
|   self->ref_count = 1; | ||||
|   self->cursor = cursor; | ||||
|   meta_cursor_image_load_from_xcursor_image (&self->image, image); | ||||
|  | ||||
|   XcursorImageDestroy (image); | ||||
|   return self; | ||||
| } | ||||
|  | ||||
| #ifdef HAVE_WAYLAND | ||||
| static void | ||||
| meta_cursor_image_load_from_buffer (MetaCursorImage    *image, | ||||
|                                     struct wl_resource *buffer, | ||||
|                                     int                 hot_x, | ||||
|                                     int                 hot_y) | ||||
| { | ||||
|   struct gbm_device *gbm = get_gbm_device (); | ||||
|  | ||||
|   ClutterBackend *backend; | ||||
|   CoglContext *cogl_context; | ||||
|   struct wl_shm_buffer *shm_buffer; | ||||
|   uint32_t gbm_format; | ||||
|   int width, height; | ||||
|  | ||||
|   image->hot_x = hot_x; | ||||
|   image->hot_y = hot_y; | ||||
|  | ||||
|   backend = clutter_get_default_backend (); | ||||
|   cogl_context = clutter_backend_get_cogl_context (backend); | ||||
|  | ||||
|   image->texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context, buffer, NULL); | ||||
|  | ||||
|   width = cogl_texture_get_width (COGL_TEXTURE (image->texture)); | ||||
|   height = cogl_texture_get_height (COGL_TEXTURE (image->texture)); | ||||
|  | ||||
|   shm_buffer = wl_shm_buffer_get (buffer); | ||||
|   if (shm_buffer) | ||||
|     { | ||||
|       if (gbm) | ||||
|         { | ||||
|           int rowstride = wl_shm_buffer_get_stride (shm_buffer); | ||||
|  | ||||
|           switch (wl_shm_buffer_get_format (shm_buffer)) | ||||
|             { | ||||
| #if G_BYTE_ORDER == G_BIG_ENDIAN | ||||
|             case WL_SHM_FORMAT_ARGB8888: | ||||
|               gbm_format = GBM_FORMAT_ARGB8888; | ||||
|               break; | ||||
|             case WL_SHM_FORMAT_XRGB8888: | ||||
|               gbm_format = GBM_FORMAT_XRGB8888; | ||||
|               break; | ||||
| #else | ||||
|             case WL_SHM_FORMAT_ARGB8888: | ||||
|               gbm_format = GBM_FORMAT_ARGB8888; | ||||
|               break; | ||||
|             case WL_SHM_FORMAT_XRGB8888: | ||||
|               gbm_format = GBM_FORMAT_XRGB8888; | ||||
|               break; | ||||
| #endif | ||||
|             default: | ||||
|               g_warn_if_reached (); | ||||
|               gbm_format = GBM_FORMAT_ARGB8888; | ||||
|             } | ||||
|  | ||||
|           meta_cursor_image_load_gbm_buffer (gbm, | ||||
|                                              image, | ||||
|                                              (uint8_t *) wl_shm_buffer_get_data (shm_buffer), | ||||
|                                              width, height, rowstride, | ||||
|                                              gbm_format); | ||||
|         } | ||||
|     } | ||||
|   else | ||||
|     { | ||||
|       /* HW cursors must be 64x64, but 64x64 is huge, and no cursor theme actually uses | ||||
|          that, so themed cursors must be padded with transparent pixels to fill the | ||||
|          overlay. This is trivial if we have CPU access to the data, but it's not | ||||
|          possible if the buffer is in GPU memory (and possibly tiled too), so if we | ||||
|          don't get the right size, we fallback to GL. | ||||
|       */ | ||||
|       if (width != 64 || height != 64) | ||||
|         { | ||||
|           meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n"); | ||||
|           return; | ||||
|         } | ||||
|  | ||||
|       if (gbm) | ||||
|         { | ||||
|           image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER, | ||||
|                                      buffer, GBM_BO_USE_CURSOR_64X64); | ||||
|           if (!image->bo) | ||||
|             meta_warning ("Importing HW cursor from wl_buffer failed\n"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| MetaCursorReference * | ||||
| meta_cursor_reference_from_buffer (struct wl_resource *buffer, | ||||
|                                    int                 hot_x, | ||||
|                                    int                 hot_y) | ||||
| { | ||||
|   MetaCursorReference *self; | ||||
|  | ||||
|   self = g_slice_new0 (MetaCursorReference); | ||||
|   self->ref_count = 1; | ||||
|   meta_cursor_image_load_from_buffer (&self->image, buffer, hot_x, hot_y); | ||||
|  | ||||
|   return self; | ||||
| } | ||||
| #endif | ||||
|  | ||||
| CoglTexture * | ||||
| meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor, | ||||
|                                         int                 *hot_x, | ||||
|                                         int                 *hot_y) | ||||
| { | ||||
|   if (hot_x) | ||||
|     *hot_x = cursor->image.hot_x; | ||||
|   if (hot_y) | ||||
|     *hot_y = cursor->image.hot_y; | ||||
|   return COGL_TEXTURE (cursor->image.texture); | ||||
| } | ||||
|  | ||||
| struct gbm_bo * | ||||
| meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, | ||||
|                                   int                 *hot_x, | ||||
|                                   int                 *hot_y) | ||||
| { | ||||
|   if (hot_x) | ||||
|     *hot_x = cursor->image.hot_x; | ||||
|   if (hot_y) | ||||
|     *hot_y = cursor->image.hot_y; | ||||
|   return cursor->image.bo; | ||||
| } | ||||
|  | ||||
| MetaCursor | ||||
| meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor) | ||||
| { | ||||
|   return cursor->cursor; | ||||
| } | ||||
| @@ -1,46 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Author: Giovanni Campagna <gcampagn@redhat.com> | ||||
|  */ | ||||
|  | ||||
| #ifndef META_CURSOR_H | ||||
| #define META_CURSOR_H | ||||
|  | ||||
| typedef struct _MetaCursorReference MetaCursorReference; | ||||
|  | ||||
| MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *cursor); | ||||
| void meta_cursor_reference_unref (MetaCursorReference *cursor); | ||||
|  | ||||
| #include <meta/common.h> | ||||
|  | ||||
| MetaCursorReference * meta_cursor_reference_from_theme  (MetaCursor          cursor); | ||||
|  | ||||
| #ifdef HAVE_WAYLAND | ||||
| #include <wayland-server.h> | ||||
| MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer, | ||||
|                                                          int                 hot_x, | ||||
|                                                          int                 hot_y); | ||||
| #endif | ||||
|  | ||||
| MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor); | ||||
|  | ||||
| Cursor meta_cursor_create_x_cursor (Display    *xdisplay, | ||||
|                                     MetaCursor  cursor); | ||||
|  | ||||
| #endif /* META_CURSOR_H */ | ||||
| @@ -1,38 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
| /* | ||||
|  * Copyright (C) 2013 Red Hat Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  */ | ||||
|  | ||||
| /* This file is shared between mutter (src/core/meta-display-config-shared.h) | ||||
|    and gnome-desktop (libgnome-desktop/meta-xrandr-shared.h). | ||||
|  | ||||
|    The canonical place for all changes is mutter. | ||||
|  | ||||
|    There should be no includes in this file. | ||||
| */ | ||||
|  | ||||
| #ifndef META_DISPLAY_CONFIG_SHARED_H | ||||
| #define META_DISPLAY_CONFIG_SHARED_H | ||||
|  | ||||
| typedef enum { | ||||
|   META_POWER_SAVE_UNSUPPORTED = -1, | ||||
|   META_POWER_SAVE_ON = 0, | ||||
|   META_POWER_SAVE_STANDBY, | ||||
|   META_POWER_SAVE_SUSPEND, | ||||
|   META_POWER_SAVE_OFF, | ||||
| } MetaPowerSave; | ||||
|  | ||||
| #endif /* META_DISPLAY_CONFIG_SHARED_H */ | ||||
| @@ -1,289 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and | ||||
|  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include "meta-idle-monitor-dbus.h" | ||||
| #include <meta/meta-idle-monitor.h> | ||||
| #include "meta-dbus-idle-monitor.h" | ||||
|  | ||||
| #include <clutter/clutter.h> | ||||
| #include <meta/util.h> | ||||
| #include <meta/main.h> /* for meta_get_replace_current_wm () */ | ||||
|  | ||||
| static gboolean | ||||
| handle_get_idletime (MetaDBusIdleMonitor   *skeleton, | ||||
|                      GDBusMethodInvocation *invocation, | ||||
|                      MetaIdleMonitor       *monitor) | ||||
| { | ||||
|   guint64 idletime; | ||||
|  | ||||
|   idletime = meta_idle_monitor_get_idletime (monitor); | ||||
|   meta_dbus_idle_monitor_complete_get_idletime (skeleton, invocation, idletime); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| typedef struct { | ||||
|   MetaDBusIdleMonitor *dbus_monitor; | ||||
|   MetaIdleMonitor *monitor; | ||||
|   char *dbus_name; | ||||
|   guint watch_id; | ||||
|   guint name_watcher_id; | ||||
| } DBusWatch; | ||||
|  | ||||
| static void | ||||
| destroy_dbus_watch (gpointer data) | ||||
| { | ||||
|   DBusWatch *watch = data; | ||||
|  | ||||
|   g_object_unref (watch->dbus_monitor); | ||||
|   g_object_unref (watch->monitor); | ||||
|   g_free (watch->dbus_name); | ||||
|   g_bus_unwatch_name (watch->name_watcher_id); | ||||
|  | ||||
|   g_slice_free (DBusWatch, watch); | ||||
| } | ||||
|  | ||||
| static void | ||||
| dbus_idle_callback (MetaIdleMonitor *monitor, | ||||
|                     guint            watch_id, | ||||
|                     gpointer         user_data) | ||||
| { | ||||
|   DBusWatch *watch = user_data; | ||||
|   GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (watch->dbus_monitor); | ||||
|  | ||||
|   g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (skeleton), | ||||
|                                  watch->dbus_name, | ||||
|                                  g_dbus_interface_skeleton_get_object_path (skeleton), | ||||
|                                  "org.gnome.Mutter.IdleMonitor", | ||||
|                                  "WatchFired", | ||||
|                                  g_variant_new ("(u)", watch_id), | ||||
|                                  NULL); | ||||
| } | ||||
|  | ||||
| static void | ||||
| name_vanished_callback (GDBusConnection *connection, | ||||
|                         const char      *name, | ||||
|                         gpointer         user_data) | ||||
| { | ||||
|   DBusWatch *watch = user_data; | ||||
|  | ||||
|   meta_idle_monitor_remove_watch (watch->monitor, watch->watch_id); | ||||
| } | ||||
|  | ||||
| static DBusWatch * | ||||
| make_dbus_watch (MetaDBusIdleMonitor   *skeleton, | ||||
|                  GDBusMethodInvocation *invocation, | ||||
|                  MetaIdleMonitor       *monitor) | ||||
| { | ||||
|   DBusWatch *watch; | ||||
|  | ||||
|   watch = g_slice_new (DBusWatch); | ||||
|   watch->dbus_monitor = g_object_ref (skeleton); | ||||
|   watch->monitor = g_object_ref (monitor); | ||||
|   watch->dbus_name = g_strdup (g_dbus_method_invocation_get_sender (invocation)); | ||||
|   watch->name_watcher_id = g_bus_watch_name_on_connection (g_dbus_method_invocation_get_connection (invocation), | ||||
|                                                            watch->dbus_name, | ||||
|                                                            G_BUS_NAME_WATCHER_FLAGS_NONE, | ||||
|                                                            NULL, /* appeared */ | ||||
|                                                            name_vanished_callback, | ||||
|                                                            watch, NULL); | ||||
|  | ||||
|   return watch; | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| handle_add_idle_watch (MetaDBusIdleMonitor   *skeleton, | ||||
|                        GDBusMethodInvocation *invocation, | ||||
|                        guint64                interval, | ||||
|                        MetaIdleMonitor       *monitor) | ||||
| { | ||||
|   DBusWatch *watch; | ||||
|  | ||||
|   watch = make_dbus_watch (skeleton, invocation, monitor); | ||||
|   watch->watch_id = meta_idle_monitor_add_idle_watch (monitor, interval, | ||||
|                                                       dbus_idle_callback, watch, destroy_dbus_watch); | ||||
|  | ||||
|   meta_dbus_idle_monitor_complete_add_idle_watch (skeleton, invocation, watch->watch_id); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| handle_add_user_active_watch (MetaDBusIdleMonitor   *skeleton, | ||||
|                               GDBusMethodInvocation *invocation, | ||||
|                               MetaIdleMonitor       *monitor) | ||||
| { | ||||
|   DBusWatch *watch; | ||||
|  | ||||
|   watch = make_dbus_watch (skeleton, invocation, monitor); | ||||
|   watch->watch_id = meta_idle_monitor_add_user_active_watch (monitor, | ||||
|                                                              dbus_idle_callback, watch, | ||||
|                                                              destroy_dbus_watch); | ||||
|  | ||||
|   meta_dbus_idle_monitor_complete_add_user_active_watch (skeleton, invocation, watch->watch_id); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static gboolean | ||||
| handle_remove_watch (MetaDBusIdleMonitor   *skeleton, | ||||
|                      GDBusMethodInvocation *invocation, | ||||
|                      guint                  id, | ||||
|                      MetaIdleMonitor       *monitor) | ||||
| { | ||||
|   meta_idle_monitor_remove_watch (monitor, id); | ||||
|   meta_dbus_idle_monitor_complete_remove_watch (skeleton, invocation); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| create_monitor_skeleton (GDBusObjectManagerServer *manager, | ||||
|                          MetaIdleMonitor          *monitor, | ||||
|                          const char               *path) | ||||
| { | ||||
|   MetaDBusIdleMonitor *skeleton; | ||||
|   MetaDBusObjectSkeleton *object; | ||||
|  | ||||
|   skeleton = meta_dbus_idle_monitor_skeleton_new (); | ||||
|   g_signal_connect_object (skeleton, "handle-add-idle-watch", | ||||
|                            G_CALLBACK (handle_add_idle_watch), monitor, 0); | ||||
|   g_signal_connect_object (skeleton, "handle-add-user-active-watch", | ||||
|                            G_CALLBACK (handle_add_user_active_watch), monitor, 0); | ||||
|   g_signal_connect_object (skeleton, "handle-remove-watch", | ||||
|                            G_CALLBACK (handle_remove_watch), monitor, 0); | ||||
|   g_signal_connect_object (skeleton, "handle-get-idletime", | ||||
|                            G_CALLBACK (handle_get_idletime), monitor, 0); | ||||
|  | ||||
|   object = meta_dbus_object_skeleton_new (path); | ||||
|   meta_dbus_object_skeleton_set_idle_monitor (object, skeleton); | ||||
|  | ||||
|   g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object)); | ||||
|  | ||||
|   g_object_unref (skeleton); | ||||
|   g_object_unref (object); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_device_added (ClutterDeviceManager     *device_manager, | ||||
|                  ClutterInputDevice       *device, | ||||
|                  GDBusObjectManagerServer *manager) | ||||
| { | ||||
|  | ||||
|   MetaIdleMonitor *monitor; | ||||
|   int device_id; | ||||
|   char *path; | ||||
|  | ||||
|   device_id = clutter_input_device_get_device_id (device); | ||||
|   monitor = meta_idle_monitor_get_for_device (device_id); | ||||
|   path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id); | ||||
|  | ||||
|   create_monitor_skeleton (manager, monitor, path); | ||||
|   g_free (path); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_device_removed (ClutterDeviceManager     *device_manager, | ||||
|                    ClutterInputDevice       *device, | ||||
|                    GDBusObjectManagerServer *manager) | ||||
| { | ||||
|   int device_id; | ||||
|   char *path; | ||||
|  | ||||
|   device_id = clutter_input_device_get_device_id (device); | ||||
|   path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id); | ||||
|   g_dbus_object_manager_server_unexport (manager, path); | ||||
|   g_free (path); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_bus_acquired (GDBusConnection *connection, | ||||
|                  const char      *name, | ||||
|                  gpointer         user_data) | ||||
| { | ||||
|   GDBusObjectManagerServer *manager; | ||||
|   ClutterDeviceManager *device_manager; | ||||
|   MetaIdleMonitor *monitor; | ||||
|   GSList *devices, *iter; | ||||
|   char *path; | ||||
|  | ||||
|   manager = g_dbus_object_manager_server_new ("/org/gnome/Mutter/IdleMonitor"); | ||||
|  | ||||
|   /* We never clear the core monitor, as that's supposed to cumulate idle times from | ||||
|      all devices */ | ||||
|   monitor = meta_idle_monitor_get_core (); | ||||
|   path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core"); | ||||
|   create_monitor_skeleton (manager, monitor, path); | ||||
|   g_free (path); | ||||
|  | ||||
|   device_manager = clutter_device_manager_get_default (); | ||||
|   devices = clutter_device_manager_list_devices (device_manager); | ||||
|  | ||||
|   for (iter = devices; iter; iter = iter->next) | ||||
|     on_device_added (device_manager, iter->data, manager); | ||||
|  | ||||
|   g_slist_free (devices); | ||||
|  | ||||
|   g_signal_connect_object (device_manager, "device-added", | ||||
|                            G_CALLBACK (on_device_added), manager, 0); | ||||
|   g_signal_connect_object (device_manager, "device-removed", | ||||
|                            G_CALLBACK (on_device_removed), manager, 0); | ||||
|  | ||||
|   g_dbus_object_manager_server_set_connection (manager, connection); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_name_acquired (GDBusConnection *connection, | ||||
|                   const char      *name, | ||||
|                   gpointer         user_data) | ||||
| { | ||||
|   meta_verbose ("Acquired name %s\n", name); | ||||
| } | ||||
|  | ||||
| static void | ||||
| on_name_lost (GDBusConnection *connection, | ||||
|               const char      *name, | ||||
|               gpointer         user_data) | ||||
| { | ||||
|   meta_verbose ("Lost or failed to acquire name %s\n", name); | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_idle_monitor_init_dbus (void) | ||||
| { | ||||
|   static int dbus_name_id; | ||||
|  | ||||
|   if (dbus_name_id > 0) | ||||
|     return; | ||||
|  | ||||
|   dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION, | ||||
|                                  "org.gnome.Mutter.IdleMonitor", | ||||
|                                  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | | ||||
|                                  (meta_get_replace_current_wm () ? | ||||
|                                   G_BUS_NAME_OWNER_FLAGS_REPLACE : 0), | ||||
|                                  on_bus_acquired, | ||||
|                                  on_name_acquired, | ||||
|                                  on_name_lost, | ||||
|                                  NULL, NULL); | ||||
| } | ||||
| @@ -1,28 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and | ||||
|  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c | ||||
|  */ | ||||
|  | ||||
| #ifndef META_IDLE_MONITOR_DBUS_H | ||||
| #define META_IDLE_MONITOR_DBUS_H | ||||
|  | ||||
| void meta_idle_monitor_init_dbus (void); | ||||
|  | ||||
| #endif | ||||
| @@ -1,65 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and | ||||
|  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c | ||||
|  */ | ||||
|  | ||||
| #ifndef META_IDLE_MONITOR_PRIVATE_H | ||||
| #define META_IDLE_MONITOR_PRIVATE_H | ||||
|  | ||||
| #include <meta/meta-idle-monitor.h> | ||||
| #include "display-private.h" | ||||
|  | ||||
| #include <X11/Xlib.h> | ||||
| #include <X11/extensions/sync.h> | ||||
|  | ||||
| typedef struct | ||||
| { | ||||
|   MetaIdleMonitor          *monitor; | ||||
|   guint	                    id; | ||||
|   MetaIdleMonitorWatchFunc  callback; | ||||
|   gpointer		    user_data; | ||||
|   GDestroyNotify            notify; | ||||
|   guint64                   timeout_msec; | ||||
|   int                       idle_source_id; | ||||
| } MetaIdleMonitorWatch; | ||||
|  | ||||
| struct _MetaIdleMonitor | ||||
| { | ||||
|   GObject parent_instance; | ||||
|  | ||||
|   GHashTable *watches; | ||||
|   int device_id; | ||||
| }; | ||||
|  | ||||
| struct _MetaIdleMonitorClass | ||||
| { | ||||
|   GObjectClass parent_class; | ||||
|  | ||||
|   gint64 (*get_idletime) (MetaIdleMonitor *monitor); | ||||
|   MetaIdleMonitorWatch * (*make_watch) (MetaIdleMonitor           *monitor, | ||||
|                                         guint64                    timeout_msec, | ||||
|                                         MetaIdleMonitorWatchFunc   callback, | ||||
|                                         gpointer                   user_data, | ||||
|                                         GDestroyNotify             notify); | ||||
| }; | ||||
|  | ||||
| void _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch); | ||||
|  | ||||
| #endif /* META_IDLE_MONITOR_PRIVATE_H */ | ||||
| @@ -1,318 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright 2013 Red Hat, Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and | ||||
|  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c | ||||
|  */ | ||||
|  | ||||
| /** | ||||
|  * SECTION:idle-monitor | ||||
|  * @title: MetaIdleMonitor | ||||
|  * @short_description: Mutter idle counter (similar to X's IDLETIME) | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include <string.h> | ||||
| #include <clutter/clutter.h> | ||||
| #include <X11/Xlib.h> | ||||
| #include <X11/extensions/sync.h> | ||||
|  | ||||
| #include <meta/util.h> | ||||
| #include <meta/main.h> | ||||
| #include <meta/meta-idle-monitor.h> | ||||
| #include "meta-idle-monitor-private.h" | ||||
| #include "meta-idle-monitor-dbus.h" | ||||
| #include "meta-backend-private.h" | ||||
|  | ||||
| G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer)); | ||||
|  | ||||
| enum | ||||
| { | ||||
|   PROP_0, | ||||
|   PROP_DEVICE_ID, | ||||
|   PROP_LAST, | ||||
| }; | ||||
|  | ||||
| static GParamSpec *obj_props[PROP_LAST]; | ||||
|  | ||||
| G_DEFINE_TYPE (MetaIdleMonitor, meta_idle_monitor, G_TYPE_OBJECT) | ||||
|  | ||||
| void | ||||
| _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch) | ||||
| { | ||||
|   MetaIdleMonitor *monitor; | ||||
|   guint id; | ||||
|   gboolean is_user_active_watch; | ||||
|  | ||||
|   monitor = watch->monitor; | ||||
|   g_object_ref (monitor); | ||||
|  | ||||
|   if (watch->idle_source_id) | ||||
|     { | ||||
|       g_source_remove (watch->idle_source_id); | ||||
|       watch->idle_source_id = 0; | ||||
|     } | ||||
|  | ||||
|   id = watch->id; | ||||
|   is_user_active_watch = (watch->timeout_msec == 0); | ||||
|  | ||||
|   if (watch->callback) | ||||
|     watch->callback (monitor, id, watch->user_data); | ||||
|  | ||||
|   if (is_user_active_watch) | ||||
|     meta_idle_monitor_remove_watch (monitor, id); | ||||
|  | ||||
|   g_object_unref (monitor); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_idle_monitor_dispose (GObject *object) | ||||
| { | ||||
|   MetaIdleMonitor *monitor = META_IDLE_MONITOR (object); | ||||
|  | ||||
|   g_clear_pointer (&monitor->watches, g_hash_table_destroy); | ||||
|  | ||||
|   G_OBJECT_CLASS (meta_idle_monitor_parent_class)->dispose (object); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_idle_monitor_get_property (GObject    *object, | ||||
|                                 guint       prop_id, | ||||
|                                 GValue     *value, | ||||
|                                 GParamSpec *pspec) | ||||
| { | ||||
|   MetaIdleMonitor *monitor = META_IDLE_MONITOR (object); | ||||
|  | ||||
|   switch (prop_id) | ||||
|     { | ||||
|     case PROP_DEVICE_ID: | ||||
|       g_value_set_int (value, monitor->device_id); | ||||
|       break; | ||||
|     default: | ||||
|       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||||
|       break; | ||||
|     } | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_idle_monitor_set_property (GObject      *object, | ||||
|                                 guint         prop_id, | ||||
|                                 const GValue *value, | ||||
|                                 GParamSpec   *pspec) | ||||
| { | ||||
|   MetaIdleMonitor *monitor = META_IDLE_MONITOR (object); | ||||
|   switch (prop_id) | ||||
|     { | ||||
|     case PROP_DEVICE_ID: | ||||
|       monitor->device_id = g_value_get_int (value); | ||||
|       break; | ||||
|     default: | ||||
|       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||||
|       break; | ||||
|     } | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_idle_monitor_class_init (MetaIdleMonitorClass *klass) | ||||
| { | ||||
|   GObjectClass *object_class = G_OBJECT_CLASS (klass); | ||||
|  | ||||
|   object_class->dispose = meta_idle_monitor_dispose; | ||||
|   object_class->get_property = meta_idle_monitor_get_property; | ||||
|   object_class->set_property = meta_idle_monitor_set_property; | ||||
|  | ||||
|   /** | ||||
|    * MetaIdleMonitor:device_id: | ||||
|    * | ||||
|    * The device to listen to idletime on. | ||||
|    */ | ||||
|   obj_props[PROP_DEVICE_ID] = | ||||
|     g_param_spec_int ("device-id", | ||||
|                       "Device ID", | ||||
|                       "The device to listen to idletime on", | ||||
|                       0, 255, 0, | ||||
|                       G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); | ||||
|   g_object_class_install_property (object_class, PROP_DEVICE_ID, obj_props[PROP_DEVICE_ID]); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_idle_monitor_init (MetaIdleMonitor *monitor) | ||||
| { | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_get_core: | ||||
|  * | ||||
|  * Returns: (transfer none): the #MetaIdleMonitor that tracks the server-global | ||||
|  * idletime for all devices. To track device-specific idletime, | ||||
|  * use meta_idle_monitor_get_for_device(). | ||||
|  */ | ||||
| MetaIdleMonitor * | ||||
| meta_idle_monitor_get_core (void) | ||||
| { | ||||
|   MetaBackend *backend = meta_get_backend (); | ||||
|   return meta_backend_get_idle_monitor (backend, 0); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_get_for_device: | ||||
|  * @device_id: the device to get the idle time for. | ||||
|  * | ||||
|  * Returns: (transfer none): a new #MetaIdleMonitor that tracks the | ||||
|  * device-specific idletime for @device. To track server-global idletime | ||||
|  * for all devices, use meta_idle_monitor_get_core(). | ||||
|  */ | ||||
| MetaIdleMonitor * | ||||
| meta_idle_monitor_get_for_device (int device_id) | ||||
| { | ||||
|   MetaBackend *backend = meta_get_backend (); | ||||
|   return meta_backend_get_idle_monitor (backend, device_id); | ||||
| } | ||||
|  | ||||
| static MetaIdleMonitorWatch * | ||||
| make_watch (MetaIdleMonitor           *monitor, | ||||
|             guint64                    timeout_msec, | ||||
|             MetaIdleMonitorWatchFunc   callback, | ||||
|             gpointer                   user_data, | ||||
|             GDestroyNotify             notify) | ||||
| { | ||||
|   MetaIdleMonitorWatch *watch; | ||||
|  | ||||
|   watch = META_IDLE_MONITOR_GET_CLASS (monitor)->make_watch (monitor, | ||||
|                                                              timeout_msec, | ||||
|                                                              callback, | ||||
|                                                              user_data, | ||||
|                                                              notify); | ||||
|  | ||||
|   g_hash_table_insert (monitor->watches, | ||||
|                        GUINT_TO_POINTER (watch->id), | ||||
|                        watch); | ||||
|   return watch; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_add_idle_watch: | ||||
|  * @monitor: A #MetaIdleMonitor | ||||
|  * @interval_msec: The idletime interval, in milliseconds | ||||
|  * @callback: (nullable): The callback to call when the user has | ||||
|  *     accumulated @interval_msec milliseconds of idle time. | ||||
|  * @user_data: (nullable): The user data to pass to the callback | ||||
|  * @notify: A #GDestroyNotify | ||||
|  * | ||||
|  * Returns: a watch id | ||||
|  * | ||||
|  * Adds a watch for a specific idle time. The callback will be called | ||||
|  * when the user has accumulated @interval_msec milliseconds of idle time. | ||||
|  * This function will return an ID that can either be passed to | ||||
|  * meta_idle_monitor_remove_watch(), or can be used to tell idle time | ||||
|  * watches apart if you have more than one. | ||||
|  * | ||||
|  * Also note that this function will only care about positive transitions | ||||
|  * (user's idle time exceeding a certain time). If you want to know about | ||||
|  * when the user has become active, use | ||||
|  * meta_idle_monitor_add_user_active_watch(). | ||||
|  */ | ||||
| guint | ||||
| meta_idle_monitor_add_idle_watch (MetaIdleMonitor	       *monitor, | ||||
|                                   guint64	                interval_msec, | ||||
|                                   MetaIdleMonitorWatchFunc      callback, | ||||
|                                   gpointer			user_data, | ||||
|                                   GDestroyNotify		notify) | ||||
| { | ||||
|   MetaIdleMonitorWatch *watch; | ||||
|  | ||||
|   g_return_val_if_fail (META_IS_IDLE_MONITOR (monitor), 0); | ||||
|   g_return_val_if_fail (interval_msec > 0, 0); | ||||
|  | ||||
|   watch = make_watch (monitor, | ||||
|                       interval_msec, | ||||
|                       callback, | ||||
|                       user_data, | ||||
|                       notify); | ||||
|  | ||||
|   return watch->id; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_add_user_active_watch: | ||||
|  * @monitor: A #MetaIdleMonitor | ||||
|  * @callback: (nullable): The callback to call when the user is | ||||
|  *     active again. | ||||
|  * @user_data: (nullable): The user data to pass to the callback | ||||
|  * @notify: A #GDestroyNotify | ||||
|  * | ||||
|  * Returns: a watch id | ||||
|  * | ||||
|  * Add a one-time watch to know when the user is active again. | ||||
|  * Note that this watch is one-time and will de-activate after the | ||||
|  * function is called, for efficiency purposes. It's most convenient | ||||
|  * to call this when an idle watch, as added by | ||||
|  * meta_idle_monitor_add_idle_watch(), has triggered. | ||||
|  */ | ||||
| guint | ||||
| meta_idle_monitor_add_user_active_watch (MetaIdleMonitor          *monitor, | ||||
|                                          MetaIdleMonitorWatchFunc  callback, | ||||
|                                          gpointer		   user_data, | ||||
|                                          GDestroyNotify	           notify) | ||||
| { | ||||
|   MetaIdleMonitorWatch *watch; | ||||
|  | ||||
|   g_return_val_if_fail (META_IS_IDLE_MONITOR (monitor), 0); | ||||
|  | ||||
|   watch = make_watch (monitor, | ||||
|                       0, | ||||
|                       callback, | ||||
|                       user_data, | ||||
|                       notify); | ||||
|  | ||||
|   return watch->id; | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_remove_watch: | ||||
|  * @monitor: A #MetaIdleMonitor | ||||
|  * @id: A watch ID | ||||
|  * | ||||
|  * Removes an idle time watcher, previously added by | ||||
|  * meta_idle_monitor_add_idle_watch() or | ||||
|  * meta_idle_monitor_add_user_active_watch(). | ||||
|  */ | ||||
| void | ||||
| meta_idle_monitor_remove_watch (MetaIdleMonitor *monitor, | ||||
|                                 guint	         id) | ||||
| { | ||||
|   g_return_if_fail (META_IS_IDLE_MONITOR (monitor)); | ||||
|  | ||||
|   g_object_ref (monitor); | ||||
|   g_hash_table_remove (monitor->watches, | ||||
|                        GUINT_TO_POINTER (id)); | ||||
|   g_object_unref (monitor); | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * meta_idle_monitor_get_idletime: | ||||
|  * @monitor: A #MetaIdleMonitor | ||||
|  * | ||||
|  * Returns: The current idle time, in milliseconds, or -1 for not supported | ||||
|  */ | ||||
| gint64 | ||||
| meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor) | ||||
| { | ||||
|   return META_IDLE_MONITOR_GET_CLASS (monitor)->get_idletime (monitor); | ||||
| } | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,55 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2001 Havoc Pennington | ||||
|  * Copyright (C) 2003 Rob Adams | ||||
|  * Copyright (C) 2004-2006 Elijah Newren | ||||
|  * Copyright (C) 2013 Red Hat Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  */ | ||||
|  | ||||
| #ifndef META_MONITOR_CONFIG_H | ||||
| #define META_MONITOR_CONFIG_H | ||||
|  | ||||
| #include "meta-monitor-manager.h" | ||||
|  | ||||
| #define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ()) | ||||
| #define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig)) | ||||
| #define META_MONITOR_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_CONFIG, MetaMonitorConfigClass)) | ||||
| #define META_IS_MONITOR_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_CONFIG)) | ||||
| #define META_IS_MONITOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_CONFIG)) | ||||
| #define META_MONITOR_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_CONFIG, MetaMonitorConfigClass)) | ||||
|  | ||||
| GType meta_monitor_config_get_type (void) G_GNUC_CONST; | ||||
|  | ||||
| MetaMonitorConfig *meta_monitor_config_new (void); | ||||
|  | ||||
| gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config, | ||||
|                                                       MetaMonitorManager *manager); | ||||
|  | ||||
| gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config, | ||||
|                                                      MetaMonitorManager *manager); | ||||
|  | ||||
| void               meta_monitor_config_make_default (MetaMonitorConfig  *config, | ||||
|                                                      MetaMonitorManager *manager); | ||||
|  | ||||
| void               meta_monitor_config_update_current (MetaMonitorConfig  *config, | ||||
|                                                        MetaMonitorManager *manager); | ||||
| void               meta_monitor_config_make_persistent (MetaMonitorConfig *config); | ||||
|  | ||||
| void               meta_monitor_config_restore_previous (MetaMonitorConfig  *config, | ||||
|                                                          MetaMonitorManager *manager); | ||||
|  | ||||
| #endif /* META_MONITOR_CONFIG_H */ | ||||
| @@ -1,227 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2001, 2002 Havoc Pennington | ||||
|  * Copyright (C) 2002, 2003 Red Hat Inc. | ||||
|  * Some ICCCM manager selection code derived from fvwm2, | ||||
|  * Copyright (C) 2001 Dominik Vogt, Matthias Clasen, and fvwm2 team | ||||
|  * Copyright (C) 2003 Rob Adams | ||||
|  * Copyright (C) 2004-2006 Elijah Newren | ||||
|  * Copyright (C) 2013 Red Hat Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include "meta-monitor-manager-dummy.h" | ||||
|  | ||||
| #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1) | ||||
|  | ||||
| struct _MetaMonitorManagerDummy | ||||
| { | ||||
|   MetaMonitorManager parent_instance; | ||||
| }; | ||||
|  | ||||
| struct _MetaMonitorManagerDummyClass | ||||
| { | ||||
|   MetaMonitorManagerClass parent_class; | ||||
| }; | ||||
|  | ||||
| G_DEFINE_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, META_TYPE_MONITOR_MANAGER); | ||||
|  | ||||
| static void | ||||
| meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager) | ||||
| { | ||||
|   manager->max_screen_width = 65535; | ||||
|   manager->max_screen_height = 65535; | ||||
|   manager->screen_width = 1024; | ||||
|   manager->screen_height = 768; | ||||
|  | ||||
|   manager->modes = g_new0 (MetaMonitorMode, 1); | ||||
|   manager->n_modes = 1; | ||||
|  | ||||
|   manager->modes[0].mode_id = 0; | ||||
|   manager->modes[0].width = 1024; | ||||
|   manager->modes[0].height = 768; | ||||
|   manager->modes[0].refresh_rate = 60.0; | ||||
|  | ||||
|   manager->crtcs = g_new0 (MetaCRTC, 1); | ||||
|   manager->n_crtcs = 1; | ||||
|  | ||||
|   manager->crtcs[0].crtc_id = 1; | ||||
|   manager->crtcs[0].rect.x = 0; | ||||
|   manager->crtcs[0].rect.y = 0; | ||||
|   manager->crtcs[0].rect.width = manager->modes[0].width; | ||||
|   manager->crtcs[0].rect.height = manager->modes[0].height; | ||||
|   manager->crtcs[0].current_mode = &manager->modes[0]; | ||||
|   manager->crtcs[0].transform = META_MONITOR_TRANSFORM_NORMAL; | ||||
|   manager->crtcs[0].all_transforms = ALL_TRANSFORMS; | ||||
|   manager->crtcs[0].is_dirty = FALSE; | ||||
|   manager->crtcs[0].logical_monitor = NULL; | ||||
|  | ||||
|   manager->outputs = g_new0 (MetaOutput, 1); | ||||
|   manager->n_outputs = 1; | ||||
|  | ||||
|   manager->outputs[0].crtc = &manager->crtcs[0]; | ||||
|   manager->outputs[0].winsys_id = 1; | ||||
|   manager->outputs[0].name = g_strdup ("LVDS"); | ||||
|   manager->outputs[0].vendor = g_strdup ("MetaProducts Inc."); | ||||
|   manager->outputs[0].product = g_strdup ("unknown"); | ||||
|   manager->outputs[0].serial = g_strdup ("0xC0FFEE"); | ||||
|   manager->outputs[0].width_mm = 222; | ||||
|   manager->outputs[0].height_mm = 125; | ||||
|   manager->outputs[0].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN; | ||||
|   manager->outputs[0].preferred_mode = &manager->modes[0]; | ||||
|   manager->outputs[0].n_modes = 1; | ||||
|   manager->outputs[0].modes = g_new0 (MetaMonitorMode *, 1); | ||||
|   manager->outputs[0].modes[0] = &manager->modes[0]; | ||||
|   manager->outputs[0].n_possible_crtcs = 1; | ||||
|   manager->outputs[0].possible_crtcs = g_new0 (MetaCRTC *, 1); | ||||
|   manager->outputs[0].possible_crtcs[0] = &manager->crtcs[0]; | ||||
|   manager->outputs[0].n_possible_clones = 0; | ||||
|   manager->outputs[0].possible_clones = g_new0 (MetaOutput *, 0); | ||||
|   manager->outputs[0].backlight = -1; | ||||
|   manager->outputs[0].backlight_min = 0; | ||||
|   manager->outputs[0].backlight_max = 0; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager, | ||||
|                                          MetaCRTCInfo       **crtcs, | ||||
|                                          unsigned int         n_crtcs, | ||||
|                                          MetaOutputInfo     **outputs, | ||||
|                                          unsigned int         n_outputs) | ||||
| { | ||||
|     unsigned i; | ||||
|     int screen_width = 0, screen_height = 0; | ||||
|  | ||||
|   for (i = 0; i < n_crtcs; i++) | ||||
|     { | ||||
|       MetaCRTCInfo *crtc_info = crtcs[i]; | ||||
|       MetaCRTC *crtc = crtc_info->crtc; | ||||
|       crtc->is_dirty = TRUE; | ||||
|  | ||||
|       if (crtc_info->mode == NULL) | ||||
|         { | ||||
|           crtc->rect.x = 0; | ||||
|           crtc->rect.y = 0; | ||||
|           crtc->rect.width = 0; | ||||
|           crtc->rect.height = 0; | ||||
|           crtc->current_mode = NULL; | ||||
|         } | ||||
|       else | ||||
|         { | ||||
|           MetaMonitorMode *mode; | ||||
|           MetaOutput *output; | ||||
|           int i, n_outputs; | ||||
|           int width, height; | ||||
|  | ||||
|           mode = crtc_info->mode; | ||||
|  | ||||
|           if (meta_monitor_transform_is_rotated (crtc_info->transform)) | ||||
|             { | ||||
|               width = mode->height; | ||||
|               height = mode->width; | ||||
|             } | ||||
|           else | ||||
|             { | ||||
|               width = mode->width; | ||||
|               height = mode->height; | ||||
|             } | ||||
|  | ||||
|           crtc->rect.x = crtc_info->x; | ||||
|           crtc->rect.y = crtc_info->y; | ||||
|           crtc->rect.width = width; | ||||
|           crtc->rect.height = height; | ||||
|           crtc->current_mode = mode; | ||||
|           crtc->transform = crtc_info->transform; | ||||
|  | ||||
|           screen_width = MAX (screen_width, crtc_info->x + width); | ||||
|           screen_height = MAX (screen_height, crtc_info->y + height); | ||||
|  | ||||
|           n_outputs = crtc_info->outputs->len; | ||||
|           for (i = 0; i < n_outputs; i++) | ||||
|             { | ||||
|               output = ((MetaOutput**)crtc_info->outputs->pdata)[i]; | ||||
|  | ||||
|               output->is_dirty = TRUE; | ||||
|               output->crtc = crtc; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   for (i = 0; i < n_outputs; i++) | ||||
|     { | ||||
|       MetaOutputInfo *output_info = outputs[i]; | ||||
|       MetaOutput *output = output_info->output; | ||||
|  | ||||
|       output->is_primary = output_info->is_primary; | ||||
|       output->is_presentation = output_info->is_presentation; | ||||
|     } | ||||
|  | ||||
|   /* Disable CRTCs not mentioned in the list */ | ||||
|   for (i = 0; i < manager->n_crtcs; i++) | ||||
|     { | ||||
|       MetaCRTC *crtc = &manager->crtcs[i]; | ||||
|  | ||||
|       crtc->logical_monitor = NULL; | ||||
|  | ||||
|       if (crtc->is_dirty) | ||||
|         { | ||||
|           crtc->is_dirty = FALSE; | ||||
|           continue; | ||||
|         } | ||||
|  | ||||
|       crtc->rect.x = 0; | ||||
|       crtc->rect.y = 0; | ||||
|       crtc->rect.width = 0; | ||||
|       crtc->rect.height = 0; | ||||
|       crtc->current_mode = NULL; | ||||
|     } | ||||
|  | ||||
|   /* Disable outputs not mentioned in the list */ | ||||
|   for (i = 0; i < manager->n_outputs; i++) | ||||
|     { | ||||
|       MetaOutput *output = &manager->outputs[i]; | ||||
|  | ||||
|       if (output->is_dirty) | ||||
|         { | ||||
|           output->is_dirty = FALSE; | ||||
|           continue; | ||||
|         } | ||||
|  | ||||
|       output->crtc = NULL; | ||||
|       output->is_primary = FALSE; | ||||
|     } | ||||
|  | ||||
|   manager->screen_width = screen_width; | ||||
|   manager->screen_height = screen_height; | ||||
|  | ||||
|   meta_monitor_manager_rebuild_derived (manager); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass) | ||||
| { | ||||
|   MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass); | ||||
|  | ||||
|   manager_class->read_current = meta_monitor_manager_dummy_read_current; | ||||
|   manager_class->apply_configuration = meta_monitor_manager_dummy_apply_config; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_monitor_manager_dummy_init (MetaMonitorManagerDummy *manager) | ||||
| { | ||||
| } | ||||
| @@ -1,40 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2001 Havoc Pennington | ||||
|  * Copyright (C) 2003 Rob Adams | ||||
|  * Copyright (C) 2004-2006 Elijah Newren | ||||
|  * Copyright (C) 2013 Red Hat Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  */ | ||||
|  | ||||
| #ifndef META_MONITOR_MANAGER_DUMMY_H | ||||
| #define META_MONITOR_MANAGER_DUMMY_H | ||||
|  | ||||
| #include "meta-monitor-manager.h" | ||||
|  | ||||
| #define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ()) | ||||
| #define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy)) | ||||
| #define META_MONITOR_MANAGER_DUMMY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass)) | ||||
| #define META_IS_MONITOR_MANAGER_DUMMY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER_DUMMY)) | ||||
| #define META_IS_MONITOR_MANAGER_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY)) | ||||
| #define META_MONITOR_MANAGER_DUMMY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass)) | ||||
|  | ||||
| typedef struct _MetaMonitorManagerDummyClass    MetaMonitorManagerDummyClass; | ||||
| typedef struct _MetaMonitorManagerDummy         MetaMonitorManagerDummy; | ||||
|  | ||||
| GType meta_monitor_manager_dummy_get_type (void); | ||||
|  | ||||
| #endif /* META_MONITOR_MANAGER_DUMMY_H */ | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,356 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /** | ||||
|  * \file screen-private.h  Handling of monitor configuration | ||||
|  * | ||||
|  * Managing multiple monitors | ||||
|  * This file contains structures and functions that handle | ||||
|  * multiple monitors, including reading the current configuration | ||||
|  * and available hardware, and applying it. | ||||
|  * | ||||
|  * This interface is private to mutter, API users should look | ||||
|  * at MetaScreen instead. | ||||
|  */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2001 Havoc Pennington | ||||
|  * Copyright (C) 2003 Rob Adams | ||||
|  * Copyright (C) 2004-2006 Elijah Newren | ||||
|  * Copyright (C) 2013 Red Hat Inc. | ||||
|  * | ||||
|  * 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, see <http://www.gnu.org/licenses/>. | ||||
|  */ | ||||
|  | ||||
| #ifndef META_MONITOR_PRIVATE_H | ||||
| #define META_MONITOR_PRIVATE_H | ||||
|  | ||||
| #include <cogl/cogl.h> | ||||
| #include <libgnome-desktop/gnome-pnp-ids.h> | ||||
|  | ||||
| #include "display-private.h" | ||||
| #include <meta/screen.h> | ||||
| #include "stack-tracker.h" | ||||
|  | ||||
| #include "meta-display-config-shared.h" | ||||
| #include "meta-dbus-display-config.h" | ||||
| #include "meta-cursor.h" | ||||
|  | ||||
| typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass; | ||||
| typedef struct _MetaMonitorManager         MetaMonitorManager; | ||||
| typedef struct _MetaMonitorConfigClass    MetaMonitorConfigClass; | ||||
| typedef struct _MetaMonitorConfig         MetaMonitorConfig; | ||||
|  | ||||
| typedef struct _MetaOutput MetaOutput; | ||||
| typedef struct _MetaCRTC MetaCRTC; | ||||
| typedef struct _MetaMonitorMode MetaMonitorMode; | ||||
| typedef struct _MetaMonitorInfo MetaMonitorInfo; | ||||
| typedef struct _MetaCRTCInfo MetaCRTCInfo; | ||||
| typedef struct _MetaOutputInfo MetaOutputInfo; | ||||
|  | ||||
| typedef enum { | ||||
|   META_MONITOR_TRANSFORM_NORMAL, | ||||
|   META_MONITOR_TRANSFORM_90, | ||||
|   META_MONITOR_TRANSFORM_180, | ||||
|   META_MONITOR_TRANSFORM_270, | ||||
|   META_MONITOR_TRANSFORM_FLIPPED, | ||||
|   META_MONITOR_TRANSFORM_FLIPPED_90, | ||||
|   META_MONITOR_TRANSFORM_FLIPPED_180, | ||||
|   META_MONITOR_TRANSFORM_FLIPPED_270, | ||||
| } MetaMonitorTransform; | ||||
|  | ||||
| struct _MetaOutput | ||||
| { | ||||
|   /* The CRTC driving this output, NULL if the output is not enabled */ | ||||
|   MetaCRTC *crtc; | ||||
|   /* The low-level ID of this output, used to apply back configuration */ | ||||
|   glong winsys_id; | ||||
|   char *name; | ||||
|   char *vendor; | ||||
|   char *product; | ||||
|   char *serial; | ||||
|   int width_mm; | ||||
|   int height_mm; | ||||
|   CoglSubpixelOrder subpixel_order; | ||||
|   int scale; | ||||
|  | ||||
|   MetaMonitorMode *preferred_mode; | ||||
|   MetaMonitorMode **modes; | ||||
|   unsigned int n_modes; | ||||
|  | ||||
|   MetaCRTC **possible_crtcs; | ||||
|   unsigned int n_possible_crtcs; | ||||
|  | ||||
|   MetaOutput **possible_clones; | ||||
|   unsigned int n_possible_clones; | ||||
|  | ||||
|   int backlight; | ||||
|   int backlight_min; | ||||
|   int backlight_max; | ||||
|  | ||||
|   /* Used when changing configuration */ | ||||
|   gboolean is_dirty; | ||||
|  | ||||
|   /* The low-level bits used to build the high-level info | ||||
|      in MetaMonitorInfo | ||||
|  | ||||
|      XXX: flags maybe? | ||||
|      There is a lot of code that uses MonitorInfo->is_primary, | ||||
|      but nobody uses MetaOutput yet | ||||
|   */ | ||||
|   gboolean is_primary; | ||||
|   gboolean is_presentation; | ||||
|  | ||||
|   gpointer driver_private; | ||||
|   GDestroyNotify driver_notify; | ||||
|  | ||||
|   /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */ | ||||
|   gboolean hotplug_mode_update; | ||||
| }; | ||||
|  | ||||
| struct _MetaCRTC | ||||
| { | ||||
|   glong crtc_id; | ||||
|   MetaRectangle rect; | ||||
|   MetaMonitorMode *current_mode; | ||||
|   MetaMonitorTransform transform; | ||||
|   unsigned int all_transforms; | ||||
|  | ||||
|   /* Only used to build the logical configuration | ||||
|      from the HW one | ||||
|   */ | ||||
|   MetaMonitorInfo *logical_monitor; | ||||
|  | ||||
|   /* Used when changing configuration */ | ||||
|   gboolean is_dirty; | ||||
|  | ||||
|   MetaCursorReference *cursor; | ||||
| }; | ||||
|  | ||||
| struct _MetaMonitorMode | ||||
| { | ||||
|   /* The low-level ID of this mode, used to apply back configuration */ | ||||
|   glong mode_id; | ||||
|   char *name; | ||||
|  | ||||
|   int width; | ||||
|   int height; | ||||
|   float refresh_rate; | ||||
|  | ||||
|   gpointer driver_private; | ||||
|   GDestroyNotify driver_notify; | ||||
| }; | ||||
|  | ||||
| /** | ||||
|  * MetaMonitorInfo: | ||||
|  * | ||||
|  * A structure with high-level information about monitors. | ||||
|  * This corresponds to a subset of the compositor coordinate space. | ||||
|  * Clones are only reported once, irrespective of the way | ||||
|  * they're implemented (two CRTCs configured for the same | ||||
|  * coordinates or one CRTCs driving two outputs). Inactive CRTCs | ||||
|  * are ignored, and so are disabled outputs. | ||||
|  */ | ||||
| struct _MetaMonitorInfo | ||||
| { | ||||
|   int number; | ||||
|   int xinerama_index; | ||||
|   MetaRectangle rect; | ||||
|   gboolean is_primary; | ||||
|   gboolean is_presentation; /* XXX: not yet used */ | ||||
|   gboolean in_fullscreen; | ||||
|  | ||||
|   /* The primary or first output for this monitor, 0 if we can't figure out. | ||||
|      It can be matched to a winsys_id of a MetaOutput. | ||||
|  | ||||
|      This is used as an opaque token on reconfiguration when switching from | ||||
|      clone to extened, to decide on what output the windows should go next | ||||
|      (it's an attempt to keep windows on the same monitor, and preferably on | ||||
|      the primary one). | ||||
|   */ | ||||
|   glong winsys_id; | ||||
| }; | ||||
|  | ||||
| /* | ||||
|  * MetaCRTCInfo: | ||||
|  * This represents the writable part of a CRTC, as deserialized from DBus | ||||
|  * or built by MetaMonitorConfig | ||||
|  * | ||||
|  * Note: differently from the other structures in this file, MetaCRTCInfo | ||||
|  * is handled by pointer. This is to accomodate the usage in MetaMonitorConfig | ||||
|  */ | ||||
| struct _MetaCRTCInfo { | ||||
|   MetaCRTC                 *crtc; | ||||
|   MetaMonitorMode          *mode; | ||||
|   int                       x; | ||||
|   int                       y; | ||||
|   MetaMonitorTransform      transform; | ||||
|   GPtrArray                *outputs; | ||||
| }; | ||||
|  | ||||
| /* | ||||
|  * MetaOutputInfo: | ||||
|  * this is the same as MetaOutputInfo, but for CRTCs | ||||
|  */ | ||||
| struct _MetaOutputInfo { | ||||
|   MetaOutput  *output; | ||||
|   gboolean     is_primary; | ||||
|   gboolean     is_presentation; | ||||
| }; | ||||
|  | ||||
| #define META_TYPE_MONITOR_MANAGER            (meta_monitor_manager_get_type ()) | ||||
| #define META_MONITOR_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER, MetaMonitorManager)) | ||||
| #define META_MONITOR_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass)) | ||||
| #define META_IS_MONITOR_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER)) | ||||
| #define META_IS_MONITOR_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER)) | ||||
| #define META_MONITOR_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass)) | ||||
|  | ||||
| struct _MetaMonitorManager | ||||
| { | ||||
|   MetaDBusDisplayConfigSkeleton parent_instance; | ||||
|  | ||||
|   /* XXX: this structure is very badly | ||||
|      packed, but I like the logical organization | ||||
|      of fields */ | ||||
|  | ||||
|   gboolean in_init; | ||||
|   unsigned int serial; | ||||
|  | ||||
|   MetaPowerSave power_save_mode; | ||||
|  | ||||
|   int max_screen_width; | ||||
|   int max_screen_height; | ||||
|   int screen_width; | ||||
|   int screen_height; | ||||
|  | ||||
|   /* Outputs refer to physical screens, | ||||
|      CRTCs refer to stuff that can drive outputs | ||||
|      (like encoders, but less tied to the HW), | ||||
|      while monitor_infos refer to logical ones. | ||||
|   */ | ||||
|   MetaOutput *outputs; | ||||
|   unsigned int n_outputs; | ||||
|  | ||||
|   MetaMonitorMode *modes; | ||||
|   unsigned int n_modes; | ||||
|  | ||||
|   MetaCRTC *crtcs; | ||||
|   unsigned int n_crtcs; | ||||
|  | ||||
|   MetaMonitorInfo *monitor_infos; | ||||
|   unsigned int n_monitor_infos; | ||||
|   int primary_monitor_index; | ||||
|  | ||||
|   int dbus_name_id; | ||||
|  | ||||
|   int persistent_timeout_id; | ||||
|   MetaMonitorConfig *config; | ||||
|  | ||||
|   GnomePnpIds *pnp_ids; | ||||
| }; | ||||
|  | ||||
| struct _MetaMonitorManagerClass | ||||
| { | ||||
|   MetaDBusDisplayConfigSkeletonClass parent_class; | ||||
|  | ||||
|   void (*read_current) (MetaMonitorManager *); | ||||
|  | ||||
|   char* (*get_edid_file) (MetaMonitorManager *, | ||||
|                           MetaOutput         *); | ||||
|   GBytes* (*read_edid) (MetaMonitorManager *, | ||||
|                         MetaOutput         *); | ||||
|  | ||||
|   void (*apply_configuration) (MetaMonitorManager  *, | ||||
|                                MetaCRTCInfo       **, | ||||
|                                unsigned int         , | ||||
|                                MetaOutputInfo     **, | ||||
|                                unsigned int); | ||||
|  | ||||
|   void (*set_power_save_mode) (MetaMonitorManager *, | ||||
|                                MetaPowerSave); | ||||
|  | ||||
|   void (*change_backlight) (MetaMonitorManager *, | ||||
|                             MetaOutput         *, | ||||
|                             int); | ||||
|  | ||||
|   void (*get_crtc_gamma) (MetaMonitorManager  *, | ||||
|                           MetaCRTC            *, | ||||
|                           gsize               *, | ||||
|                           unsigned short     **, | ||||
|                           unsigned short     **, | ||||
|                           unsigned short     **); | ||||
|   void (*set_crtc_gamma) (MetaMonitorManager *, | ||||
|                           MetaCRTC           *, | ||||
|                           gsize               , | ||||
|                           unsigned short     *, | ||||
|                           unsigned short     *, | ||||
|                           unsigned short     *); | ||||
| }; | ||||
|  | ||||
| GType meta_monitor_manager_get_type (void); | ||||
|  | ||||
| MetaMonitorManager *meta_monitor_manager_get  (void); | ||||
|  | ||||
| void                meta_monitor_manager_rebuild_derived   (MetaMonitorManager *manager); | ||||
|  | ||||
| MetaMonitorInfo    *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager, | ||||
| 							    unsigned int       *n_infos); | ||||
|  | ||||
| MetaOutput         *meta_monitor_manager_get_outputs       (MetaMonitorManager *manager, | ||||
| 							    unsigned int       *n_outputs); | ||||
|  | ||||
| void                meta_monitor_manager_get_resources     (MetaMonitorManager  *manager, | ||||
|                                                             MetaMonitorMode    **modes, | ||||
|                                                             unsigned int        *n_modes, | ||||
|                                                             MetaCRTC           **crtcs, | ||||
|                                                             unsigned int        *n_crtcs, | ||||
|                                                             MetaOutput         **outputs, | ||||
|                                                             unsigned int        *n_outputs); | ||||
|  | ||||
| int                 meta_monitor_manager_get_primary_index (MetaMonitorManager *manager); | ||||
|  | ||||
| void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *manager, | ||||
|                                                             int                *width, | ||||
|                                                             int                *height); | ||||
|  | ||||
| void                meta_monitor_manager_get_screen_limits (MetaMonitorManager *manager, | ||||
|                                                             int                *width, | ||||
|                                                             int                *height); | ||||
|  | ||||
| void                meta_monitor_manager_apply_configuration (MetaMonitorManager  *manager, | ||||
|                                                               MetaCRTCInfo       **crtcs, | ||||
|                                                               unsigned int         n_crtcs, | ||||
|                                                               MetaOutputInfo     **outputs, | ||||
|                                                               unsigned int         n_outputs); | ||||
|  | ||||
| void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager, | ||||
|                                                                 gboolean            ok); | ||||
|  | ||||
| void               meta_crtc_info_free   (MetaCRTCInfo   *info); | ||||
| void               meta_output_info_free (MetaOutputInfo *info); | ||||
|  | ||||
| void               meta_monitor_manager_free_output_array (MetaOutput *old_outputs, | ||||
|                                                            int         n_old_outputs); | ||||
| void               meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes, | ||||
|                                                          int              n_old_modes); | ||||
| gboolean           meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager); | ||||
|  | ||||
| /* Returns true if transform causes width and height to be inverted | ||||
|    This is true for the odd transforms in the enum */ | ||||
| static inline gboolean | ||||
| meta_monitor_transform_is_rotated (MetaMonitorTransform transform) | ||||
| { | ||||
|   return (transform % 2); | ||||
| } | ||||
|  | ||||
| #endif | ||||
| @@ -1,197 +0,0 @@ | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #include <config.h> | ||||
|  | ||||
| #include "meta-stage.h" | ||||
|  | ||||
| #include "meta-cursor-private.h" | ||||
| #include <meta/meta-backend.h> | ||||
| #include <meta/util.h> | ||||
|  | ||||
| typedef struct { | ||||
|   gboolean enabled; | ||||
|  | ||||
|   CoglPipeline *pipeline; | ||||
|   CoglTexture *texture; | ||||
|  | ||||
|   MetaRectangle current_rect; | ||||
|   MetaRectangle previous_rect; | ||||
|   gboolean previous_is_valid; | ||||
| } MetaOverlay; | ||||
|  | ||||
| struct _MetaStagePrivate { | ||||
|   MetaOverlay cursor_overlay; | ||||
| }; | ||||
| typedef struct _MetaStagePrivate MetaStagePrivate; | ||||
|  | ||||
| G_DEFINE_TYPE_WITH_PRIVATE (MetaStage, meta_stage, CLUTTER_TYPE_STAGE); | ||||
|  | ||||
| static void | ||||
| meta_overlay_init (MetaOverlay *overlay) | ||||
| { | ||||
|   CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ()); | ||||
|  | ||||
|   overlay->pipeline = cogl_pipeline_new (ctx); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_overlay_free (MetaOverlay *overlay) | ||||
| { | ||||
|   if (overlay->pipeline) | ||||
|     cogl_object_unref (overlay->pipeline); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_overlay_set (MetaOverlay   *overlay, | ||||
|                   CoglTexture   *texture, | ||||
|                   MetaRectangle *rect) | ||||
| { | ||||
|   if (overlay->texture != texture) | ||||
|     { | ||||
|       overlay->texture = texture; | ||||
|  | ||||
|       if (texture) | ||||
|         { | ||||
|           cogl_pipeline_set_layer_texture (overlay->pipeline, 0, texture); | ||||
|           overlay->enabled = TRUE; | ||||
|         } | ||||
|       else | ||||
|         { | ||||
|           cogl_pipeline_set_layer_texture (overlay->pipeline, 0, NULL); | ||||
|           overlay->enabled = FALSE; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   overlay->current_rect = *rect; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_overlay_paint (MetaOverlay *overlay) | ||||
| { | ||||
|   if (!overlay->enabled) | ||||
|     return; | ||||
|  | ||||
|   g_assert (meta_is_wayland_compositor ()); | ||||
|  | ||||
|   cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (), | ||||
|                                    overlay->pipeline, | ||||
|                                    overlay->current_rect.x, | ||||
|                                    overlay->current_rect.y, | ||||
|                                    overlay->current_rect.x + | ||||
|                                    overlay->current_rect.width, | ||||
|                                    overlay->current_rect.y + | ||||
|                                    overlay->current_rect.height); | ||||
|  | ||||
|   overlay->previous_rect = overlay->current_rect; | ||||
|   overlay->previous_is_valid = TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_stage_finalize (GObject *object) | ||||
| { | ||||
|   MetaStage *stage = META_STAGE (object); | ||||
|   MetaStagePrivate *priv = meta_stage_get_instance_private (stage); | ||||
|  | ||||
|   meta_overlay_free (&priv->cursor_overlay); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_stage_paint (ClutterActor *actor) | ||||
| { | ||||
|   MetaStage *stage = META_STAGE (actor); | ||||
|   MetaStagePrivate *priv = meta_stage_get_instance_private (stage); | ||||
|  | ||||
|   CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor); | ||||
|  | ||||
|   meta_overlay_paint (&priv->cursor_overlay); | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_stage_class_init (MetaStageClass *klass) | ||||
| { | ||||
|   ClutterActorClass *actor_class = (ClutterActorClass *) klass; | ||||
|   GObjectClass *object_class = (GObjectClass *) klass; | ||||
|  | ||||
|   object_class->finalize = meta_stage_finalize; | ||||
|  | ||||
|   actor_class->paint = meta_stage_paint; | ||||
| } | ||||
|  | ||||
| static void | ||||
| meta_stage_init (MetaStage *stage) | ||||
| { | ||||
|   MetaStagePrivate *priv = meta_stage_get_instance_private (stage); | ||||
|  | ||||
|   meta_overlay_init (&priv->cursor_overlay); | ||||
|  | ||||
|   clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), FALSE); | ||||
| } | ||||
|  | ||||
| ClutterActor * | ||||
| meta_stage_new (void) | ||||
| { | ||||
|   return g_object_new (META_TYPE_STAGE, | ||||
|                        "cursor-visible", FALSE, | ||||
|                        NULL); | ||||
| } | ||||
|  | ||||
| static void | ||||
| queue_redraw_for_overlay (MetaStage   *stage, | ||||
|                           MetaOverlay *overlay) | ||||
| { | ||||
|   cairo_rectangle_int_t clip; | ||||
|  | ||||
|   /* Clear the location the overlay was at before, if we need to. */ | ||||
|   if (overlay->previous_is_valid) | ||||
|     { | ||||
|       clip.x = overlay->previous_rect.x; | ||||
|       clip.y = overlay->previous_rect.y; | ||||
|       clip.width = overlay->previous_rect.width; | ||||
|       clip.height = overlay->previous_rect.height; | ||||
|       clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip); | ||||
|       overlay->previous_is_valid = FALSE; | ||||
|     } | ||||
|  | ||||
|   /* Draw the overlay at the new position */ | ||||
|   if (overlay->enabled) | ||||
|     { | ||||
|       clip.x = overlay->current_rect.x; | ||||
|       clip.y = overlay->current_rect.y; | ||||
|       clip.width = overlay->current_rect.width; | ||||
|       clip.height = overlay->current_rect.height; | ||||
|       clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip); | ||||
|     } | ||||
| } | ||||
|  | ||||
| void | ||||
| meta_stage_set_cursor (MetaStage     *stage, | ||||
|                        CoglTexture   *texture, | ||||
|                        MetaRectangle *rect) | ||||
| { | ||||
|   MetaStagePrivate *priv = meta_stage_get_instance_private (stage); | ||||
|  | ||||
|   g_assert (meta_is_wayland_compositor () || texture == NULL); | ||||
|  | ||||
|   meta_overlay_set (&priv->cursor_overlay, texture, rect); | ||||
|   queue_redraw_for_overlay (stage, &priv->cursor_overlay); | ||||
| } | ||||
| @@ -1,59 +0,0 @@ | ||||
| /* | ||||
|  * Copyright (C) 2012 Intel Corporation | ||||
|  * | ||||
|  * This program is free software; you can redistribute it and/or | ||||
|  * modify it under the terms of the GNU General Public License as | ||||
|  * published by the Free Software Foundation; either version 2 of the | ||||
|  * License, or (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, but | ||||
|  * WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | ||||
|  * General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program; if not, write to the Free Software | ||||
|  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||||
|  * 02111-1307, USA. | ||||
|  */ | ||||
|  | ||||
| #ifndef META_STAGE_H | ||||
| #define META_STAGE_H | ||||
|  | ||||
| #include <clutter/clutter.h> | ||||
|  | ||||
| #include "meta-cursor.h" | ||||
| #include <meta/boxes.h> | ||||
|  | ||||
| G_BEGIN_DECLS | ||||
|  | ||||
| #define META_TYPE_STAGE            (meta_stage_get_type ()) | ||||
| #define META_STAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_STAGE, MetaStage)) | ||||
| #define META_STAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_STAGE, MetaStageClass)) | ||||
| #define META_IS_STAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_STAGE)) | ||||
| #define META_IS_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_STAGE)) | ||||
| #define META_STAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_STAGE, MetaStageClass)) | ||||
|  | ||||
| typedef struct _MetaStage      MetaStage; | ||||
| typedef struct _MetaStageClass MetaStageClass; | ||||
|  | ||||
| struct _MetaStageClass | ||||
| { | ||||
|   ClutterStageClass parent_class; | ||||
| }; | ||||
|  | ||||
| struct _MetaStage | ||||
| { | ||||
|   ClutterStage parent; | ||||
| }; | ||||
|  | ||||
| GType             meta_stage_get_type                (void) G_GNUC_CONST; | ||||
|  | ||||
| ClutterActor     *meta_stage_new                     (void); | ||||
|  | ||||
| void meta_stage_set_cursor (MetaStage     *stage, | ||||
|                             CoglTexture   *texture, | ||||
|                             MetaRectangle *rect); | ||||
| G_END_DECLS | ||||
|  | ||||
| #endif /* META_STAGE_H */ | ||||
| @@ -1,107 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #include "dbus-utils.h" | ||||
|  | ||||
| #include <glib.h> | ||||
|  | ||||
| /* Stolen from tp_escape_as_identifier, from tp-glib, | ||||
|  * which follows the same escaping convention as systemd. | ||||
|  */ | ||||
| static inline gboolean | ||||
| _esc_ident_bad (gchar c, gboolean is_first) | ||||
| { | ||||
|   return ((c < 'a' || c > 'z') && | ||||
|           (c < 'A' || c > 'Z') && | ||||
|           (c < '0' || c > '9' || is_first)); | ||||
| } | ||||
|  | ||||
| static gchar * | ||||
| escape_dbus_component (const gchar *name) | ||||
| { | ||||
|   gboolean bad = FALSE; | ||||
|   size_t len = 0; | ||||
|   GString *op; | ||||
|   const gchar *ptr, *first_ok; | ||||
|  | ||||
|   g_return_val_if_fail (name != NULL, NULL); | ||||
|  | ||||
|   /* fast path for empty name */ | ||||
|   if (name[0] == '\0') | ||||
|     return g_strdup ("_"); | ||||
|  | ||||
|   for (ptr = name; *ptr; ptr++) | ||||
|     { | ||||
|       if (_esc_ident_bad (*ptr, ptr == name)) | ||||
|         { | ||||
|           bad = TRUE; | ||||
|           len += 3; | ||||
|         } | ||||
|       else | ||||
|         len++; | ||||
|     } | ||||
|  | ||||
|   /* fast path if it's clean */ | ||||
|   if (!bad) | ||||
|     return g_strdup (name); | ||||
|  | ||||
|   /* If strictly less than ptr, first_ok is the first uncopied safe character. | ||||
|    */ | ||||
|   first_ok = name; | ||||
|   op = g_string_sized_new (len); | ||||
|   for (ptr = name; *ptr; ptr++) | ||||
|     { | ||||
|       if (_esc_ident_bad (*ptr, ptr == name)) | ||||
|         { | ||||
|           /* copy preceding safe characters if any */ | ||||
|           if (first_ok < ptr) | ||||
|             { | ||||
|               g_string_append_len (op, first_ok, ptr - first_ok); | ||||
|             } | ||||
|           /* escape the unsafe character */ | ||||
|           g_string_append_printf (op, "_%02x", (unsigned char)(*ptr)); | ||||
|           /* restart after it */ | ||||
|           first_ok = ptr + 1; | ||||
|         } | ||||
|     } | ||||
|   /* copy trailing safe characters if any */ | ||||
|   if (first_ok < ptr) | ||||
|     { | ||||
|       g_string_append_len (op, first_ok, ptr - first_ok); | ||||
|     } | ||||
|   return g_string_free (op, FALSE); | ||||
| } | ||||
|  | ||||
| char * | ||||
| get_escaped_dbus_path (const char *prefix, | ||||
|                        const char *component) | ||||
| { | ||||
|   char *escaped_component = escape_dbus_component (component); | ||||
|   char *path = g_strconcat (prefix, "/", escaped_component, NULL); | ||||
|  | ||||
|   g_free (escaped_component); | ||||
|   return path; | ||||
| } | ||||
| @@ -1,32 +0,0 @@ | ||||
| /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ | ||||
|  | ||||
| /* | ||||
|  * Copyright (C) 2014 Red Hat | ||||
|  * | ||||
|  * 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. | ||||
|  * | ||||
|  * Written by: | ||||
|  *     Jasper St. Pierre <jstpierre@mecheye.net> | ||||
|  */ | ||||
|  | ||||
| #ifndef DBUS_UTILS_H | ||||
| #define DBUS_UTILS_H | ||||
|  | ||||
| char * | ||||
| get_escaped_dbus_path (const char *prefix, | ||||
|                        const char *component); | ||||
|  | ||||
| #endif /* DBUS_UTILS_H */ | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user