Commit graph

54 commits

Author SHA1 Message Date
Dana Jansens
567fd15eeb Merge branch 'backport' into work
Conflicts:

	configure.ac
	data/rc.xml
	openbox/client.c
	openbox/event.c
	openbox/focus_cycle.c
	openbox/focus_cycle_popup.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	version.h.in
2010-01-11 16:20:53 -05:00
Mikael Magnusson
2b0dfb81cf Fix the ~ expansion regex
The look-around things are fixed-width but the [stuff] is 1 char, and
the $ is 0 so it didn't work.  I already used that trick for the ^,
maybe it used to work due to a bug or smth.
2010-01-08 21:07:05 +01:00
Mikael Magnusson
b69ee77256 Don't replace ~ when we shouldn't
Bump glib req to 2.14 to get GRegex, now we only replace ~ with your
homedir in an action if it is (at the start of the string or preceded
by whitespace) and (at the end of the string or followed by (whitespace
or a slash)). (?:^|(?<=[ \t]))~(?=[/ \t$])

Fixes bug #4033.
2009-07-05 20:51:04 +02:00
Dana Jansens
bbad88aa21 add a --config-file command line option, and OB_CONFIG_FILE root hint 2008-02-02 09:45:33 -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
5960d27b1c setup versioning for libotk that is separate from libobrender (and libobparser for now), and bump library versions up to 4.0.
also make the render versioning more explicit that it's for the render library not all of openbox
2008-01-20 01:36:54 -05:00
Mikael Magnusson
556eb7b7fb ANSI function declarations, ie () -> (void) 2007-09-04 06:27:10 +02:00
Mikael Magnusson
77baf26a7f remove trailing whitespace 2007-07-17 02:48:16 +02:00
Mikael Magnusson
96bb892054 back xml themes out of trunk 2007-06-07 23:46:28 +00:00
Dana Jansens
62e068eabd when a bool field is empty return false, not signal 11.. :| 2007-06-04 15:22:20 +00:00
Dana Jansens
b645e3720d when an integer field is empty return 0, not signal 11 2007-06-04 15:21:16 +00:00
Dana Jansens
df948db3be i know we broke backwards compatibility but noone uses it except obconf and it still works, so just leave the pkgconfigs as -3.0, and obconf2 and require version >= 3.3.990 instead. 2007-05-19 01:33:40 +00:00
Dana Jansens
e77888ef17 change obrender-3.0 and obparser-3.0 to 3.4 because we broke backward compatibility 2007-05-18 00:58:43 +00:00
Dana Jansens
9eaf7086d3 the edit part :( 2007-05-12 23:18:40 +00:00
Dana Jansens
41f0ff035b look for themes where they were installed by make install first 2007-05-12 00:06:50 +00:00
Dana Jansens
24c0d61847 add the 'engine="box"' to the theme format, and require it to be there so we can change that in the future 2007-05-07 02:38:13 +00:00
Dana Jansens
a6aaabe62c change the --config-file to --config, which works differently..
change the _OPENBOX_RC root property to _OPENBOX_CONFIG which is also different.
2007-05-05 23:54:04 +00:00
Dana Jansens
2442cdfd85 1) translate all of openbox's output
2) update copyrights.
3) make release. ok that part not quite yet.
2007-04-23 17:56:35 +00:00
Dana Jansens
213426194f look in sysconfdir before looking in /etc/xdg. this kinda violates the spec, i think, but i don't see any other proper alternative really. 2007-04-22 00:29:33 +00:00
Dana Jansens
da04050c9a dont do the same thing 100 times 2007-04-21 22:16:24 +00:00
Dana Jansens
78d7250098 add --debug-focus
add --config-file: to specify a config file to use.

set OPENBOX_RC property on the root window containing the path of the RC file being the full path to the RC file being used by openbox
2007-04-21 22:06:47 +00:00
Dana Jansens
2db6cf5130 xml tags are case sensitive 2007-03-25 15:39:56 +00:00
Dana Jansens
7db7d62ceb free unused path strings.
always pass in malloc'd memory, cuz it is going to be freed later.
2007-03-18 15:23:42 +00:00
Dana Jansens
efedb4df9c Be more lenient with errors in xml file. If there are errors, try to keep loading it anyways. 2007-03-07 22:56:37 +00:00
Dana Jansens
ec304c9e43 scary commit..but here goes.
YOUR THEMES ARE NOW OFFICIALLY BROKEN.

Openbox has just moved it's theme format to an XML based one. The details of
this format can be found in data/themerc.xsd (and http://openbox.org/themerc.xsd

ALSO! This is very good and important and stuff! In the tools directory you
will find THEMETOXML ! This tool takes a themerc on stdin, and spits out
the same theme in theme.xml format. So this is all you need to do to update
your themes.

PLEASE NOTE: This themetoxml does _not_ install itself anywhere. It simply
builds and then lives out in its tools/themetoxml directory, and that's it. So
if you want to use it, that is where to find it.

In moving to the new XML format, a number of additions/changes to the theme
engine have been made. Themetoxml takes these into account and will set all
the new things appropriately to make your theme look the same as it always has.

New additions include..
* padding now has an horizontal and vertical component, instead of being one number
* menus can have different borders than windows (color and size)
* menu offset can now be negative. it's a little weird, but someone will want it no doubt
* fonts are no longer controled by the theme at all, however font shadowing is, and on that note..
* font shadows are now any color you want, not just black and white
* you can now set the shadow anywhere you can set the text's color, so you have more control, i.e. you can set shadow on active menu items but not inactive, or disabled, etc.
* every color now has an alpha channel. at the moment they don't do anything, besides the font shadow one, but it leaves room for future explorations. it is REALLY HIGHLY RECOMMENDED that you set the alpha to 255 all the time, until such time as it could be useful. otherwise one day your theme may turn awful for people.
* font colors are in the range 0-255, in case you were wondering, and they have to be specified in decimal
* if you'd like to change you font's you can do so in your configuration file. this is how it is going to stay. changing the font in the theme assumes too much about peoples eye sight and locality and stuff. it doesn't belong there, sorry. the system-wide default rc.xml includes the new font settings for your viewing pleasure, and ill drop an example of it below.
* shadows can now be positioned in any direction, they have both an x and a y offset which can be negative and positive. and offset of 0,0 will disable the shadow

This isn't a release or anything. If someone had some good ideas about the xml theme format, I'd like to hear them. But I don't think it will be changing much right now beyond where it is. I don't even know how the new functionality will play out for themers, so we'll see.

Whew.. I guess that's it. I'm not sure if I mentioned every little change or not, but oh well. Mileage may vary.. Please send any feedback.

Here's the font configuration example. Hopefully ObConf will let you set this real soon.

<theme>
...
  <font place="ActiveWindow">
    <name>arial,sans</name>
    <size>7</size>
    <weight>bold</weight>
    <slant>normal</slant>
  </font>
  <font place="InactiveWindow">
    <name>arial,sans</name>
    <size>7</size>
    <weight>bold</weight>
    <slant>normal</slant>
  </font>
  <font place="MenuTitle">
    <name>arial,sans</name>
    <size>8</size>
    <weight>bold</weight>
    <slant>normal</slant>
  </font>
  <font place="MenuItem">
    <name>arial,sans</name>
    <size>8</size>
    <weight>bold</weight>
    <slant>normal</slant>
  </font>
</theme>
2007-03-05 15:44:17 +00:00
Dana Jansens
aeda86f460 add parse_attr_bool, and fix a possible segfault 2007-03-04 07:09:55 +00:00
Mikael Magnusson
d84f1aac10 remove .cvsignore files 2006-08-31 13:49:36 +00:00
Dana Jansens
13206849ea add version info the library headers 2003-10-27 20:11:14 +00:00
Dana Jansens
7ed0e10404 g_getenv fix, it returns const char*. use gpointer for void* 2003-10-25 19:38:51 +00:00
Dana Jansens
e5c7e635bc use g_getenv 2003-10-25 19:35:12 +00:00
Dana Jansens
5cadc1bff5 much improved functions for maknig directories, props to Logan 2003-10-25 19:13:09 +00:00
Dana Jansens
138d98fc3f avoid duplicates in the path lists 2003-10-25 18:57:34 +00:00
Dana Jansens
740c5b2a20 consistant glib type usage 2003-10-15 03:59:35 +00:00
Dana Jansens
8085f3490f use g_strsplit to save work 2003-10-15 03:11:59 +00:00
Dana Jansens
4805a6a40e remove debug prints 2003-10-13 08:05:30 +00:00
Dana Jansens
26b98ded3c free the data paths 2003-10-10 05:36:30 +00:00
Dana Jansens
cd4377366c using the wrong free function 2003-10-03 02:56:02 +00:00
Dana Jansens
26a7e6b31a was adding a data dir to the config dirs list 2003-09-29 03:39:49 +00:00
Dana Jansens
4460548ca0 wrap public headers in G_BEGIN/END_DECLS 2003-09-25 22:48:04 +00:00
Dana Jansens
136b113278 change how stuff is linked, this should make libtool and automake work nicely again I think 2003-09-25 21:58:10 +00:00
Dana Jansens
16f46c296d no tabs 2003-09-17 07:44:49 +00:00
Dana Jansens
c4e4760c41 add copyright headers, adjust --version output to include copyright, and --help output to not include version output. 2003-09-17 07:32:52 +00:00
Dana Jansens
c1b2fc5324 make openbox base-dir spec compliant, and change the theme dir structure, so that themes go in $XDG_DATA_DIRS/themes/ with gtk/metacity/whateverelse themes 2003-09-15 19:20:05 +00:00
Dana Jansens
84a60ebbfb dont use obsolete xmlChildrenNode 2003-09-07 23:34:01 +00:00
Dana Jansens
bbc22b9870 remove obconf from this tree.
add versioning for the libraries and pkgconfig files for them.
2003-09-07 23:33:11 +00:00
Dana Jansens
cf40ff8791 move rc3 to rc.xml 2003-09-01 17:01:21 +00:00
Dana Jansens
ffba11aeb0 load menu plugins automatically from whats in the menu file
menu fixups
move enabled into the 'normal menu item' specific data stuff
2003-08-28 06:32:27 +00:00
Dana Jansens
9ea78a4eb0 create ObParseInst structuer which can be then used to parse more than one file/memory thing at a time.
add function to parse memory block.
2003-08-12 19:14:53 +00:00
Dana Jansens
577ae81f3f always return a string from parse_string 2003-07-31 09:05:45 +00:00
Dana Jansens
5be0a82a35 use ob_debug for any debug printing and only display the output when its a debug build or when --debug is passed to it 2003-07-24 06:02:38 +00:00