Commit graph

9 commits

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

	openbox/frame.c
	openbox/menuframe.c
2008-02-15 10:03:55 -05:00
Dana Jansens
0dc7eca4cd Merge branch 'backport' into work
Conflicts:

	openbox/client.c
	openbox/event.c
	openbox/mouse.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	parser/parse.h
2008-02-02 11:37:35 -05:00
Dana Jansens
ea481338b5 make the obt library branch compile again with all the changes merged in from backport 2008-01-20 01:36:56 -05:00
Dana Jansens
c22e6012d1 fix constness 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
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
2f0e73cf9d add functions for setting locale strings (on top of existing functions for setting utf8 strings). they are untested though! wonder if they work? 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