Commit graph

469 commits

Author SHA1 Message Date
Dana Jansens
3905872982 merge in r6153-6154 from the 3.4 branch 2007-05-07 22:07:13 +00:00
Dana Jansens
82b2f0aa7a popups fixes. if the text for the popup is empty now, there wont be extra padding for it. desktop name fixes. 2007-05-07 06:33:43 +00:00
Dana Jansens
526560b8a0 changes to the client menu, which entries are there, and reorganizing, and renaming.
let you highlight disabled menu entries, they just aren't runable of course, and add the activedisabled theme element for these entries.
add the all desktops button picture to "All desktops" in the client menu
update the themes for the new element, and some changes to make things more readable-better contrast.

CLEARLOOKS-OLIVE is now DIFFERENT FROM THE 3.4 BRANCH SO DON'T RE-RUN THEMETOXML ON IT :( :(
yeah.. i think that is everything?
2007-05-05 22:26:59 +00:00
Dana Jansens
020cbeff19 unsigned.. 2007-05-03 03:17:18 +00:00
Dana Jansens
66d6e1120e small change to the render API. RrMinsize became RrMinSize. added RrMinWidth and RrMinHeight.
make focus/desktop popups wider based on the screen size with the old size as a minimum.
left-align the desktop dialog.. i think better dialogs would be nice. and to make them hide or something when you switch desktops while switching windows etc.
2007-05-02 00:35:22 +00:00
Dana Jansens
4e590eba23 add a separate font config for onscreendisplays
change menutitle in the rc to menuheader
fix up the xsd for fonts
2007-04-26 13:10:36 +00:00
Dana Jansens
c4ba6e605a assume a valid utf8 char is at the shortcut position. the menu parser makes sure of this 2007-04-26 03:18:48 +00:00
Dana Jansens
b5dbe857db dont go to disabled menu entries with keyboard shortcuts
fix some rendering of shortcuts
2007-04-25 18:26:02 +00:00
Dana Jansens
0c41ab3c20 make rendering the shortcuts much faster 2007-04-25 18:04:15 +00:00
Dana Jansens
0927804559 "text" was no longer needed 2007-04-25 01:59:56 +00:00
Dana Jansens
138d3e38d8 add shortcuts for text rendering. it underlines the first character in the string that matches the shortcut 2007-04-25 01:32:43 +00:00
Dana Jansens
f507432c86 error in the new error message code 2007-04-23 20:36:51 +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
8612fcfb99 better matching of the menu titles/separators to the theme 2007-04-22 03:54:43 +00:00
Mikael Magnusson
58be283e94 copy paste error, spotted by tilman ftw 2007-03-28 18:15:36 +00:00
Dana Jansens
bd27269850 more updates for toggled states. also updating the theme files. 2007-03-28 03:51:27 +00:00
Dana Jansens
5fb30e4488 add toggled-pressed and toggled-hover button states to themes. also rename toggled to be toggled-unpressed 2007-03-28 03:32:46 +00:00
Dana Jansens
3678f8df8a use const char*'s when we should be 2007-03-18 15:07:30 +00:00
Dana Jansens
4e19d8411d add support for 8bit TrueColor visuals. Who knew these existed. Fixes vnc's 8bit mode. (bug 2878) 2007-03-14 03:05:47 +00:00
Dana Jansens
56307d6077 a) remove the top_grip_height business from the theme
b) make the focus indicator based on border width and padding, not the handle height
c) add 2 more windows for the top corners for resizing, much easier to find them now. also base their width on padding, not the handle height or other weird things
2007-03-08 01:26:03 +00:00
Dana Jansens
b37a8b7e76 Fix possible crashingness, from last commit. 2007-03-08 01:03:13 +00:00
Dana Jansens
a79651294c Split RrPaint to RrPaint and RrPaintPixmap, so you can paint things other than windows. If you don't free the returned pixmap though, you will be leaking memory in the server! 2007-03-07 22:57:10 +00:00
Dana Jansens
45087efbcd point and padding became redundant.. do remove padding type from xsd and use point type. also fix bug in theme parser where it was looking for wrong one. 2007-03-05 16:23:13 +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
d209d828a7 assert on invalid color values 2007-03-05 05:25:16 +00:00
Dana Jansens
7744067b6b moving shadow information out of the themes, and into the Text textures.
cleaning up some old Xft cruft in font.c also, that is no longer needed.
2007-03-04 18:47:21 +00:00
Dana Jansens
5109b5ae20 keep the default tint at 50, for theme compatibility 2007-03-04 17:31:18 +00:00
Dana Jansens
f7fe596e28 lighten the default shadow, it's alittle harsh right now 2007-03-04 17:03:50 +00:00
Dana Jansens
d0f9d647aa remove the font code for parsing Xft font strings. we are using the individual values specified in the user's configuration now, no longer using the strings from the theme file at all 2007-03-04 07:14:25 +00:00
Dana Jansens
43d0f79057 fonts are no longer loaded from the theme file. instead, they are created by the application and passed in while creating/loading a theme 2007-03-04 07:12:34 +00:00
Dana Jansens
3b77950a79 add font weight and font slant enumerations 2007-03-04 01:08:51 +00:00
Dana Jansens
ac6fe98008 use font 8point by default if none is specified 2007-03-04 01:08:33 +00:00
Dana Jansens
41e272bd27 add missing comment 2007-03-04 00:47:26 +00:00
Dana Jansens
8343a8192f fix memleak, free the render instance on shutdown. 2007-03-03 02:53:57 +00:00
Dana Jansens
037fc862b0 pango is now mandatory..
lots of cleanups to the pango code, which was a very nice base to start from. thanks to whomever wrote that for us.. put some of the pango variables into the various render structs so that they don't need to be created all the time. put the pango context inside our RrInstance so that it can be properly freed at shutdown. removed xft dependencies all through the code and the build system also. who knows if this will break compiling for some poor souls. i guess we'll find out, won't we!
2007-03-03 02:53:41 +00:00
Dana Jansens
07fe0980be declare variables at the beginning of blocks, because it is nice to do so. and polite? 2007-03-02 22:11:46 +00:00
Dana Jansens
78af5d15e9 this includes a number of things since my magnificent return....
1. some random compiling/style cleanups
2. some bigfixes
 - mislogic in per-window-settings and focusing new windows
 - use client_can_focus rather than checking variables for directional focus
 - MAYBE fix all those lock-ups forever. using event_curtime (a new variable) now instead of event_lasttime. event_lasttime is still used however when the event being processed did not have a time associated with it. this may or may not be a problem, and will be seen.
3. um.. i forget
4. oh yeah, 3rd party docks are now treated like the internal ob dock irt focus. that is, clicking on them won't pass them focus. this is going to be ratified as expected behavior in the wm-spec just now. if docks/panels want focus they can request it with _net_active_window, and then they can have all the focus they want! one day alt-tabbing around dock windows might be nice. but not until the ob dock is moved out into a separate application. going to have to add a wmapp selection and stuff for that though... ugly. who uses wmdockapps anymore !? someone must.. *sigh*
2007-03-02 02:23:00 +00:00
Mikael Magnusson
d3d4aa2987 80 cols 2006-11-15 21:12:06 +00:00
Mikael Magnusson
6930bdb289 fix a crash when using mirrorhorizontal and resizing a window to width 1 2006-09-07 11:40:01 +00:00
Mikael Magnusson
d84f1aac10 remove .cvsignore files 2006-08-31 13:49:36 +00:00
Mikael Magnusson
d4b90d3641 strstr is our friend, thanks merry 2006-08-24 22:04:19 +00:00
Mikael Magnusson
766e7ae9bf rename osx to mirrorhorizontal and split to splitvertical, this will make all themes that used them not look right so update them 2006-08-24 17:57:01 +00:00
Mikael Magnusson
d9f14c1d01 update copyright step 2 2006-08-22 16:44:18 +00:00
Mikael Magnusson
a8274acdd6 useless * 2006-08-20 16:44:33 +00:00
Mikael Magnusson
e8c19d0c99 patch from thorsten vollmer to fix bug #2506, interlaces and bevels not drawing correctly 2006-08-20 07:15:18 +00:00
Mikael Magnusson
2fd2473de5 some systems seem to not include locale.h even with ENABLE_NLS set 2006-08-19 13:49:53 +00:00
Mikael Magnusson
005eb35ee8 fix some warnings from -Wall 2006-08-19 05:05:36 +00:00
Mikael Magnusson
c495ecfeff why did i save that return value? 2006-08-19 04:19:57 +00:00
Mikael Magnusson
9fb488c7bf maybe it was just a syntax error? 2006-08-19 04:17:55 +00:00
Mikael Magnusson
ba6daeae8e don't be so afraid to include locale.h 2006-08-19 04:15:51 +00:00
Mikael Magnusson
5d40209fbd make grips always 25 pixels 2006-08-18 19:48:48 +00:00
Mikael Magnusson
e3c52da8c3 can't call ob_debug from libobrender... 2006-08-03 13:51:19 +00:00
Mikael Magnusson
95222014e2 maybe fix some stuff, i dunno 2006-08-03 01:12:29 +00:00
Mikael Magnusson
50292dbd75 a "osx" gradient, it is like horizontal but mirrors in the center 2006-08-01 20:34:35 +00:00
Mikael Magnusson
b3fa579a61 so it wont leak because ob uses a hash for colors, but lets free the colors anyway 2006-06-14 19:47:28 +00:00
Mikael Magnusson
7ca93b9ff2 okay that parent didnt point where i thought 2006-06-14 19:27:32 +00:00
Mikael Magnusson
18cd2fa938 forgot i was in the middle of something 2006-06-14 19:23:27 +00:00
Mikael Magnusson
335a0eecc7 initial commit of split gradient, looks like some RrColor leaking perhaps 2006-06-14 19:20:46 +00:00
Mikael Magnusson
dd48997668 fix two memleaks 2006-06-11 10:21:35 +00:00
Mikael Magnusson
a908e04818 try another scaling algo for the icons 2006-03-16 23:53:11 +00:00
Mikael Magnusson
f0a82ab599 make reverse_bits static 2006-03-14 17:32:35 +00:00
Mikael Magnusson
f1ed62cead fix 1bit bitmaps on msbfirst architectures + some indentation fixes 2006-03-14 15:27:15 +00:00
Mikael Magnusson
31527192c8 finally fix broken gimp window icons 2006-03-05 23:23:55 +00:00
Mikael Magnusson
c5a14b4f04 !"$!#"% 2006-01-15 11:40:34 +00:00
Mikael Magnusson
b177ace2c3 yes it is 2006-01-15 11:40:21 +00:00
Mikael Magnusson
425dc31808 fix pixelsize when using pango (set_size != set_absolute_size) 2006-01-15 11:39:55 +00:00
Mikael Magnusson
efcb68de1d and tidy it up a bit 2005-09-01 15:34:03 +00:00
Mikael Magnusson
e298cde9b0 remove some excessive swearing from a comment about pango 2005-09-01 15:33:04 +00:00
Mikael Magnusson
3b83230aaf ifdef helps 2005-07-26 08:02:13 +00:00
Mikael Magnusson
eecc457292 --disable-nls disables locale.h which is needed for pango, sort of 2005-07-20 19:51:57 +00:00
Mikael Magnusson
3d1048f5a7 forgot debug print 2005-07-16 20:30:17 +00:00
Mikael Magnusson
b2cd881d31 80 columns 2005-07-16 20:27:06 +00:00
Mikael Magnusson
b1a1ad5d06 fix the PangoLanguage thing to get from locale 2005-07-16 20:16:55 +00:00
Mikael Magnusson
2fb7b70ccb maybe even better layouting (ie the previous was off by a few marks). memo to self, what do to about PangoLanguage? 2005-07-16 16:11:58 +00:00
Mikael Magnusson
e37b07bfa0 dont need pll 2005-07-16 14:45:41 +00:00
Mikael Magnusson
a08bb4abba minor movement of code 2005-07-16 01:01:04 +00:00
Mikael Magnusson
a5100fe677 make the pango rendering code really complicated because that is the only way to make it draw correctly 2005-07-16 00:56:45 +00:00
Mikael Magnusson
8f9aae0cc2 fix the dpi stuff with pango by reading the right ascent and descent stuff 2005-07-15 14:39:31 +00:00
Mikael Magnusson
b10b0000db revert the pressed toggled thing for a while 2005-07-14 20:41:24 +00:00
Mikael Magnusson
5c95d2ffea correctly show pressed state when pressing toggled buttons, bug #2311 2005-07-14 13:02:39 +00:00
Mikael Magnusson
0417d1226c RrFontHeight is meaningless with pango, it will be different for every string drawn, so ask pango for the height after we tell it the text to draw. Should make text be centered vertically better when mixing fonts. Still moves a pixel down for some strings for me, but it was several before. If anyone knows more about this please mail or bugzilla etc. Also fix an indenting error. 2005-06-26 01:39:53 +00:00
Mikael Magnusson
3b51624005 well, i pinpointed the problem code that causes the fonts to be cut off, but this workaround is extremely temporary and possibly only works for me by accident? 2005-04-04 07:02:22 +00:00
Mikael Magnusson
7fc31cd045 fix a warning 2005-03-31 08:31:31 +00:00
Mikael Magnusson
2290916e2e Update the pango code 2005-03-11 21:49:07 +00:00
Mikael Magnusson
7089a86006 remove a spurious identical ifdef diff decided to generate 2005-02-13 17:27:51 +00:00
Mikael Magnusson
9be3a21380 apparently nobody uses cvs or bothers to tell me about compile errors 2004-12-03 23:53:17 +00:00
Mikael Magnusson
e7d1ba6ae3 Pango! yay. Patch mostly by Mohammed Sameer, fixed some memleaks and ifdeffed by me. May still have some bugs. 2004-11-07 13:20:54 +00:00
Mikael Magnusson
35c5a62ca1 there was a typo here, but the code worked anyway. oh well. 2004-06-14 12:25:28 +00:00
Mikael Magnusson
4b32a060ad no more april's fool (and also committed a bit too much before) 2004-04-01 21:50:11 +00:00
Mikael Magnusson
1c9a69e1df these two changes make the text a lot more readable 2004-03-31 18:32:44 +00:00
Mikael Magnusson
335e8acbfc yay no tabs in the source 2004-03-21 01:03:00 +00:00
Dana Jansens
06202e2bad dont scale images to 0 px wide or tall 2003-11-11 12:04:47 +00:00
Dana Jansens
13206849ea add version info the library headers 2003-10-27 20:11:14 +00:00
Dana Jansens
740c5b2a20 consistant glib type usage 2003-10-15 03:59:35 +00:00
Dana Jansens
637ba6cf5c cooler method 2003-10-12 20:30:38 +00:00
Dana Jansens
4b0e4af80a add debug shit 2003-10-11 06:46:51 +00:00
Dana Jansens
3740966916 simplify 2003-10-11 06:45:41 +00:00
Dana Jansens
35e3370651 add an id to colors for debugging purposes 2003-10-11 06:45:04 +00:00
Dana Jansens
84dae2d747 mem leak 2003-10-11 03:42:15 +00:00
Dana Jansens
281390a926 fix memory leak 2003-10-10 05:39:21 +00:00
Dana Jansens
f8c81e8ca4 add a check to make sure the color hash is empty on shutdown 2003-10-10 05:38:36 +00:00
Dana Jansens
647baa7740 add an assert to try catch color hash table misuses 2003-10-10 05:37:24 +00:00
Dana Jansens
38ed4331b1 indenting 2003-10-10 03:46:53 +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
96f9db0d0c api cleanups for render/theme.h 2003-09-17 06:21:35 +00:00
Dana Jansens
8ba479a367 look in ~/.themes for themes also 2003-09-15 19:41:48 +00:00
Dana Jansens
46d99fbaff new icon from merry, more clarity when small 2003-09-15 19:35:15 +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
e60dd0259a fix 2 mem leaks 2003-09-14 21:10:30 +00:00
Dana Jansens
eeebd3e43f add a default icon made by merry. 2003-09-14 18:32:18 +00:00
Dana Jansens
54d04314e7 remove debug print 2003-09-14 07:33:16 +00:00
Dana Jansens
960ce01f71 use the values passed to the function 2003-09-14 06:43:16 +00:00
Dana Jansens
dcc433926c code style 2003-09-14 06:42:57 +00:00
Dana Jansens
3559312321 free XImages 2003-09-14 06:42:33 +00:00
Dana Jansens
3dc4750ea4 destroy 'pat' always 2003-09-14 06:42:04 +00:00
Dana Jansens
d634731fca X allocs more bytes than i thought, new algo to pick the amount of memory for the bitmap data 2003-09-14 06:41:00 +00:00
Dana Jansens
5d658c98e2 add app_(un)hilite_fg, which is never parentrelative 2003-09-12 05:56:57 +00:00
Dana Jansens
4685a11530 wasted variable 2003-09-12 05:56:02 +00:00
Dana Jansens
6fc8e1784e handle parentrel app labels, by using the title's texture instead 2003-09-12 05:42:57 +00:00
Dana Jansens
cee67e1700 better more valid C 2003-09-12 02:19:05 +00:00
Dana Jansens
49a73ce15c add support for a default icon, but no icon has been made yet. 2003-09-12 01:11:33 +00:00
Dana Jansens
191f982dd4 allow a padding.width of 0 2003-09-08 19:09:59 +00:00
Dana Jansens
a72371b41f bigtime theme changes. bigtime. 2003-09-08 18:38:52 +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
a1184b2b77 add the margins to the label_height so that the text doesnt cover the bevel/border 2003-09-06 08:43:30 +00:00
Dana Jansens
4cbfe3eac0 new scaling based on the Bresenham algorithm 2003-09-04 06:23:57 +00:00
Dana Jansens
55ed757c5f new scaling, based on the Bresenham algorithm 2003-09-04 06:23:27 +00:00
Dana Jansens
e9c1e44e68 provide a function to give the margins for an appearance 2003-09-03 06:28:57 +00:00
Dana Jansens
83c213143e we use the offsets we get from the server, we should use the byte order too.. 2003-09-03 05:28:19 +00:00
Dana Jansens
694a628a2f remove bad comment 2003-09-03 04:28:00 +00:00
Dana Jansens
72f3195821 interlace is drawn first, so bevels n shit cover it 2003-09-02 19:16:56 +00:00
Dana Jansens
aeef656993 add menu.bullet.selected.imageColor 2003-09-02 18:52:24 +00:00
Dana Jansens
3b2b0998fc remove debug print 2003-09-02 17:42:57 +00:00
Dana Jansens
fffc89c226 remove XXX comment, it was right, now its done :> 2003-09-02 08:38:33 +00:00
Dana Jansens
ac9d8c58cb use the new color hash to cache RrColors 2003-09-02 08:38:03 +00:00
Dana Jansens
92feea765a move some internal functions from render.h to instance.h
add a color hash table to the RrInstance
2003-09-02 08:37:52 +00:00
Dana Jansens
06252b3076 rename back the app_selected appearances to app_hilite 2003-09-01 16:37:21 +00:00
Dana Jansens
f33bbca9e6 couple more xrdb theme format cleanups:
window.focus.font -> window.label.focus.font
window.unfocus.font -> window.label.unfocus.font
window.justify -> window.label.justify
menu.frame.* -> menu.items.*
menu.hilite.* -> menu.selected.*
*.picColor -> *.imageColor
2003-09-01 07:03:04 +00:00
Dana Jansens
4a107aa4b3 i rul.. at typos.. 2003-09-01 03:35:45 +00:00
Dana Jansens
1d31a09fd3 copy/free the new interlaced color 2003-09-01 03:34:24 +00:00
Dana Jansens
e91814e99f add interlaceColor, and support interlaced gradients 2003-09-01 03:10:47 +00:00
Dana Jansens
cd75b454eb add RrColorGC
add a LineArt texture type for drawing a line, this is used for drawing the menu separators
2003-08-31 17:02:49 +00:00
Dana Jansens
6e86a42c4b use RrColorGC 2003-08-31 17:02:10 +00:00
Dana Jansens
f90167d8b5 add RrColorGC 2003-08-31 17:01:53 +00:00
Dana Jansens
f97e7133d4 allow handlewidth of 0, which sets show_handle to false 2003-08-30 19:02:10 +00:00
Dana Jansens
50f2037aea bugz, wrong vars 2003-08-30 18:47:02 +00:00
Dana Jansens
735776321c nicer default bullets 2003-08-29 05:44:17 +00:00