Commit graph

272 commits

Author SHA1 Message Date
Dana Jansens
6014a41760 Merge branch 'backport' into work 2010-02-08 14:28:18 -05:00
Dana Jansens
95f81b8e4c Add obxprop manpage to install 2010-02-08 14:23:32 -05:00
Dana Jansens
8c9fb63baa Rework the code provided by Kadlcik Libor for loading/showing icons in Openbox menus.
This changes how the imagecache works, you can load an image into it directly,
or you can load it by name (then it will load it from a file on disk).

NOTE: The name part is incomplete, as it needs to use the freedesktop.org icon
spec to search for the right file.  Also to resize it should look for another
icon on disk with the same name but different size (icon themes).
2010-01-08 17:55:19 -05:00
Mikael Magnusson
51257397b0 Some style changes, less ifdefs. 2010-01-08 17:55:19 -05:00
Kadlcik Libor
0352abfa88 This patch implements support for icons in user-defined menus into Openbox
Image loading is done using the Imlib2 library.
I chose Imlib2 because it's pretty fast, it's easy to use, supports many file
formats (tested xpm, gif, jpeg, png) and doesn't introduce too much bloat (it
depends :)).

I ported the patch to 3.4.7-pre3 and added some enhancements. Caching is much
better now, and icons can be disabled at compile time using --disable-imlib2
option.

What's new?
Syntax of configuration files (namely rc.xml and menu.xml) has been changed
slightly to allow users to associate icons to menu entries. This is done by
specifying path to icon file in the new "icon" attribute in "<item>" element,
e.g:
<item label="Vim" icon="/usr/share/pixmaps/vim-32.xpm">
  <action name="Execute"><execute>x-terminal-emulator -T Vim -e
vim</execute></action>
</item>

If user doesn't want to display any icons in his user-defined menus, he/she can
disable icons in rc.xml, inside "<menu>" section:
<menu>
 ...
  <showIcons>no</showIcons>
 ...
</menu>
Default value is "yes".
(New boolean variable "config_menu_user_show_icons" has been added to source
code.)

An icon is loaded (using menu_item_attach_icon()) when a new entry of menu is
created. Fortunately, I haven't notice any performance problems because of this
:).
2010-01-08 17:55:19 -05:00
Dana Jansens
73575c10ce Merge branch 'backport' into work
Conflicts:

	Makefile.am
	openbox/actions/focus.c
	openbox/config.c
	openbox/event.c
	openbox/menuframe.c
2010-01-08 10:22:30 -05:00
Dana Jansens
e65411aa0d add a manpage for obxprop 2010-01-06 17:13:03 -05:00
Dana Jansens
b06b684589 rename the obt_parse library to obt_xml (since it is very xml specific) 2009-12-21 14:08:38 -05:00
Dana Jansens
7aae8cc526 Set up work for making a 3.5 prerelease.
Set version stuff to 3.5.0-rc1.
Copy the CHANGELOG from 3.4-working.
Rename the obt-4.0 and obrender-4.0 pkgconfig stuff to obt-3.5 and obrender-3.5
Rename the "render" directory to "obrender" so that the public headers can be
  installed in <obrender/*>
2009-12-21 14:08:34 -05:00
Dana Jansens
a03b817aeb Merge branch 'backport' into work 2009-12-21 10:43:38 -05:00
Dana Jansens
6d8b7bd5f7 Rename obprop to obxprop (Fixes bug #4419)
Avoids collision with openbabel.
2009-12-21 09:59:28 -05:00
Dana Jansens
a93b00a5e9 Merge branch 'backport' into work 2009-12-14 15:25:57 -05:00
Dana Jansens
f3e553446f Add an obprop tool which can print UTF-8 strings properly, for our users. 2009-12-14 15:25:31 -05:00
Dana Jansens
acafa38c8e Merge branch 'backport' into work
Conflicts:
	openbox/config.c
	openbox/event.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	openbox/screen.h
2009-12-11 19:02:11 -05:00
Dana Jansens
c5155e7422 Add an openbox.desktop file for the applications/ directory
This is for gnome-session to start Openbox correctly as the window manager
See the commit log for http://cvs.fedoraproject.org/viewvc/devel/openbox/openbox.desktop?revision=1.3&view=markup
2009-12-10 10:27:54 -05:00
Dana Jansens
2f09e0ce38 Merge branch 'backport' into work
Conflicts:

	openbox/actions/all.h
	openbox/actions/session.c
	openbox/client.c
	openbox/event.c
	openbox/grab.c
2009-12-08 14:19:04 -05:00
Dana Jansens
7f36e21ea9 Combine the Exit and SessionLogout actions
Just "do the right thing" based on if you are connected to a session manager
or not.
2009-11-24 19:36:18 -05:00
Dana Jansens
c828154886 Revert all commits for the Hooks feature to move it to a topic branch.
This reverts commit fd2f617be7.
This reverts commit a47d0a5365.
This reverts commit a1908e0767.
This reverts commit dc2e6f6bf7.
This reverts commit 985e7dadf9.
This reverts commit db781556d6.
This reverts commit feec8f663f.
2009-11-21 13:56:55 -05:00
Mikael Magnusson
b89cc58590 Add all the action names used in 3.4 so configs don't break 2009-09-19 15:57:20 +02:00
Mikael Magnusson
661a53cb68 Don't need to explicitly check for xft. 2008-04-20 00:10:52 +02:00
Dana Jansens
37705f444e Merge branch 'backport' into work
Conflicts:

	openbox/actions/all.h
	openbox/event.c
	openbox/prompt.c
2008-03-02 04:19:05 -05:00
Dana Jansens
d9739288b7 add a gdm-control tool that lets you..control..gdm.. 2008-03-02 03:46:28 -05:00
Dana Jansens
4d09821730 add a SessionLogout action 2008-03-02 03:46:22 -05:00
Dana Jansens
db781556d6 Add a hook system. They hooks don't run yet but they parse from the config file. 2008-02-29 23:37:57 -05:00
Dana Jansens
9d1bb266ee render depends on obt, so make/install it first (fixes making deb package from it) 2008-02-28 21:40:46 -05:00
Mikael Magnusson
163950b23b Merge branch 'backport' into work
Conflicts:

	Makefile.am
2008-02-28 06:20:50 +01:00
Dana Jansens
573bbb08a6 add the autostart.sh.in to the dist targz instead of the autostart.sh 2008-02-27 22:46:44 -05:00
Dana Jansens
40c014faf1 include the xdg-autostart script in the dist targz 2008-02-27 22:44:22 -05:00
Dana Jansens
26cc41f6c6 Merge branch 'backport' into work 2008-02-27 19:37:48 -05:00
Dana Jansens
b1dc814128 make the xdg-autostart script get installed to PREFIX/lib/openbox, and make the autostart.sh script look for it there. 2008-02-27 19:36:48 -05:00
Dana Jansens
4c7cc1cfa6 Introducing the icon cache.
If an icon is the same as one in the cache, then it uses that one.
icons of different sizes (from the same client) are linked together into
one, and resizes of icons are cached and linked to all the various sizes.
so you only need one icon in memory for all your terminals now. ya!
2008-02-14 15:09:24 -05:00
Dana Jansens
c313b219a2 you can create dialog windows called "prompts" which have a message and some buttons! they don't do anything interesting yet. 2008-02-14 14:24:07 -05:00
Dana Jansens
ea435b99a8 Introducing the icon cache.
If an icon is the same as one in the cache, then it uses that one.
icons of different sizes (from the same client) are linked together into
one, and resizes of icons are cached and linked to all the various sizes.
so you only need one icon in memory for all your terminals now. ya!
2008-02-14 11:44:28 +01:00
Dana Jansens
3167fc223e Merge branch 'backport' 2008-02-09 19:07:55 -05:00
Dana Jansens
11408575b3 make an xdg-autostart script. it is very fancy. 2008-02-09 19:02:03 -05:00
Dana Jansens
a01ece1353 you can create dialog windows called "prompts" which have a message and some buttons! they don't do anything interesting yet. 2008-02-07 02:14:43 -05:00
Mikael Magnusson
4435c3a438 Remove the //. 2008-02-02 22:13:31 +01:00
Dana Jansens
de0873824e split the version.h into render/ and obt/ copies, with the appropriate version info 2008-02-02 15:59:44 -05:00
Dana Jansens
f34add5440 install the right headers for obt/obrender 2008-01-31 18:22:58 -05:00
Dana Jansens
20b8fcfa33 Merge branch 'backport' into work
Conflicts:

	openbox/client.c
	openbox/config.c
	openbox/event.c
	openbox/extensions.c
	openbox/focus_cycle_indicator.c
	openbox/focus_cycle_popup.c
	openbox/menuframe.c
	openbox/moveresize.c
	openbox/openbox.c
	openbox/screen.c
	openbox/stacking.c
	openbox/startupnotify.c
2008-01-31 12:51:38 -05:00
Dana Jansens
ac1b79834c its OBT_VERSION not OB_VERSION anymore 2008-01-31 12:25:30 -05:00
Dana Jansens
be8fee4050 add the new Clearlooks theme by mulberry, and rename the current one to Clearlooks-3.4 2008-01-24 23:05:58 -05:00
Dana Jansens
9f5296fb14 add the xevent callback system to libobt in xevent.[ch] 2008-01-20 01:36:56 -05:00
Dana Jansens
07d5674d39 move the xdg path stuff into obt/paths.[ch], and make render and openbox use it 2008-01-20 01:36:55 -05:00
Dana Jansens
fdabb69f4f update openbox to use the current parser interface in libobt
there is also some random bug fixes for other libobt stuff in here.
2008-01-20 01:36:55 -05:00
Dana Jansens
0667bbc3e2 add parsing to libobt with a new API! (it is not completely changed/fixedup yet) 2008-01-20 01:36:55 -05:00
Dana Jansens
759e9f58a8 change openbox to use the libotk's keyboard.[ch] stuff instead of the old modkeys.[ch] and some of translate.[ch] 2008-01-20 01:36:55 -05:00
Dana Jansens
1aac72bc4c add keyboard.[ch] to libobt. these are for tracking modifier keys, and translating to/from keycodes/keysyms/modmasks (also include a new obt/internal.h for putting functions that are not public) 2008-01-20 01:36:55 -05:00
Dana Jansens
0fcf5ead0f make openbox use the obt prop.c/h stuff
holy search and replace batman
2008-01-20 01:36:54 -05:00
Dana Jansens
6c8acc079a add prop.[ch] to the libobt, but they are not used yet. add a global obt_display which obt can use, and the application. 2008-01-20 01:36:54 -05:00