dana/openbox.git
13 years agorm some unused fn defns
Dana Jansens [Thu, 28 Jul 2011 18:07:22 +0000 (14:07 -0400)]
rm some unused fn defns

13 years agorm the actions_parse* functions which parsed xml actions
Dana Jansens [Thu, 28 Jul 2011 18:05:54 +0000 (14:05 -0400)]
rm the actions_parse* functions which parsed xml actions

13 years agorm some unused struct defns cruft
Dana Jansens [Thu, 28 Jul 2011 18:03:28 +0000 (14:03 -0400)]
rm some unused struct defns cruft

13 years agoParse ObActionsList*s from the config file (out of the xml for now).
Dana Jansens [Wed, 27 Jul 2011 20:32:05 +0000 (16:32 -0400)]
Parse ObActionsList*s from the config file (out of the xml for now).

- config.c: use the new actions parser
- actions.c: provide the actions parser a way to create a new action (takes
    a hash table of options for it)
- actions/*.c: take a hash table of options instead of an xml subtree
- *: us ObActionsList* instead of a GList* of ObActionAct*s.

TODO:
1. make filters
  openbox/filters/*.c
  openbox/filters.c as interface to them
  store filters in parsed filter tests instead of key/value pairs
2. make action(s) to change config options
  includes key and mouse binding
3. rm -rf *xml*

13 years agoAdd a parser for the action command language.
Dana Jansens [Tue, 26 Jul 2011 22:06:42 +0000 (18:06 -0400)]
Add a parser for the action command language.

The parser generates list of actions (complete with filters).  The parser isn't
called anywhere yet, and uses the incomplete actions_act_new() function.

TODO:
The filters now are just text string key:value pairs. But they should
  become intelligent objects like actions are.
The actions need to change their option parsing from XML to the new key:value
  pair lists.

13 years agoFix blocking in inotify reader.
Dana Jansens [Tue, 26 Jul 2011 13:40:52 +0000 (09:40 -0400)]
Fix blocking in inotify reader.

If the inotify reader reads an event and it ends at the same place the read()
  ended, then we don't know that there is anything more available, so don't
  try read() again until after it has been poll()'d.

13 years agoadd GNOME environment to the menus for now
Dana Jansens [Sun, 24 Jul 2011 23:41:05 +0000 (19:41 -0400)]
add GNOME environment to the menus for now

13 years agoMake OnlyShowIn and NotShowIn work in .desktop file parsing
Dana Jansens [Sun, 24 Jul 2011 23:40:38 +0000 (19:40 -0400)]
Make OnlyShowIn and NotShowIn work in .desktop file parsing

13 years agoProperly build path names for TryExec
Dana Jansens [Sun, 24 Jul 2011 23:29:26 +0000 (19:29 -0400)]
Properly build path names for TryExec

13 years agoremove debug prints
Dana Jansens [Sun, 24 Jul 2011 23:19:17 +0000 (19:19 -0400)]
remove debug prints

13 years agoFix memory issues in the apps menu when reconfiguring.
Dana Jansens [Sun, 24 Jul 2011 22:58:29 +0000 (18:58 -0400)]
Fix memory issues in the apps menu when reconfiguring.

All menu pointers must be given up and recreated every reconfigure. The menu
system destroys all menus on its own.

13 years agoOn reconfigure, make the apps menu's linkbase refresh.
Dana Jansens [Sun, 24 Jul 2011 22:37:50 +0000 (18:37 -0400)]
On reconfigure, make the apps menu's linkbase refresh.

13 years agoMake the obt_watch functionality work without inotify (via manual refreshes).
Dana Jansens [Sun, 24 Jul 2011 22:13:36 +0000 (18:13 -0400)]
Make the obt_watch functionality work without inotify (via manual refreshes).

Adds obt/watch_manual.c which is a filler for when watch_inotify.c can't be
  used.  Other watch_foo.c may also exist in the future I hope.
Adds obt/watch_interface.h which the inotify (and others) subsystem can use
  to call back notification to the main watch system that events have
  occured.
Keep track of all files being watched within the main watch system, so that if
  a directory disappears, we can report the files inside it being removed.
  This change moved a lot of the recursive functionality out from
  watch_inotify.c into the main watch.c, making it much more simple and should
  help make it much easier to add other watch_foo.c subsystems.

13 years agofix updates in the app menu from the linkbase.
Dana Jansens [Wed, 9 Mar 2011 18:49:11 +0000 (13:49 -0500)]
fix updates in the app menu from the linkbase.

it did not remove things correctly if the linkbase removed something while the
  menu was not shown.
it sorted the wrong list.
basically it was buggy. tested now with a duplicate .desktop id in 2 places,
  and the menu shows only one copy. updating it while the menu is not shown
  correctly updates the menu.  updating it while the menu is shown also
  correclty updates the menu.

13 years agokeep only one version of each .desktop file "id" in the linkbase category lists.
Dana Jansens [Wed, 9 Mar 2011 16:08:19 +0000 (11:08 -0500)]
keep only one version of each .desktop file "id" in the linkbase category lists.

13 years agodon't follow pointers after freeing them
Dana Jansens [Tue, 8 Mar 2011 21:02:14 +0000 (16:02 -0500)]
don't follow pointers after freeing them

13 years agoShow all the .desktop links available in the system in the "apps-menu" menu.
Dana Jansens [Thu, 27 Jan 2011 22:31:41 +0000 (17:31 -0500)]
Show all the .desktop links available in the system in the "apps-menu" menu.

They don't do anything, cuz it's problematic to try create an Execute action
from in the code right now.

13 years agoadd menu_sort_entries() which sorts all entries in an ObMenu
Dana Jansens [Thu, 27 Jan 2011 22:30:45 +0000 (17:30 -0500)]
add menu_sort_entries() which sorts all entries in an ObMenu

this function sorts each group of entries that appear together between two
consecutive separators (or ends of the list)

13 years agoGive info for changes in the update callback from ObtLinkBase
Dana Jansens [Thu, 27 Jan 2011 22:29:25 +0000 (17:29 -0500)]
Give info for changes in the update callback from ObtLinkBase

Also provide a function to access all ObtLink objects in a given category.

13 years agospecify the encoding of filesystem paths, and include a comparator function
Dana Jansens [Thu, 27 Jan 2011 22:28:12 +0000 (17:28 -0500)]
specify the encoding of filesystem paths, and include a comparator function

the comparator compares two ObtLink** objects by their names.  if the names are
equal it uses the path of the source as a tie-breaker.

13 years agouse the filesystem's locale for opening a .desktop file
Dana Jansens [Thu, 27 Jan 2011 22:27:22 +0000 (17:27 -0500)]
use the filesystem's locale for opening a .desktop file

13 years agoAdd another BSEARCH function that lets you search through an array of objects.
Dana Jansens [Thu, 27 Jan 2011 22:23:47 +0000 (17:23 -0500)]
Add another BSEARCH function that lets you search through an array of objects.

If you give it a value x, the macro lets you pull a value out of each object
that you want to compare to x.

13 years agoShow the list of categories in the apps menus as submenus.
Dana Jansens [Wed, 26 Jan 2011 23:11:22 +0000 (18:11 -0500)]
Show the list of categories in the apps menus as submenus.

The categories are not based on what you actually have yet but will be soon.

Removed the "main category" notion from the links themselves, they just
publish a list of categories instead.  Moved this notion out to the Apps menu
itself.  This should make it easy to possibly to customize your set of
visible categories if we should like to do that sometime.

13 years agoStore all links in the linkbase grouped by their main category.
Dana Jansens [Tue, 25 Jan 2011 22:38:47 +0000 (17:38 -0500)]
Store all links in the linkbase grouped by their main category.

13 years agodon't free the linkbase on reconfigure
Dana Jansens [Tue, 25 Jan 2011 18:40:56 +0000 (13:40 -0500)]
don't free the linkbase on reconfigure

the menu does get freed, so don't free it with the menu.

13 years agoskip empty strings when splitting paths in the environment
Dana Jansens [Tue, 25 Jan 2011 18:32:43 +0000 (13:32 -0500)]
skip empty strings when splitting paths in the environment

13 years agodon't free lists in the linkbase hash table prematurely.
Dana Jansens [Tue, 25 Jan 2011 18:25:22 +0000 (13:25 -0500)]
don't free lists in the linkbase hash table prematurely.

the values (GSList objects) are freed by the hash table's free function if a
new value is inserted.  if we change the list and reinsert it, then it would
cause the list we're inserting to get freed (partially).  not good.  so instead
we manually free them when we remove them/destroy the hash table.

13 years agoWIP: Add an xdg applications menu (it doesn't have anything in it yet, but it does...
Dana Jansens [Mon, 24 Jan 2011 22:06:41 +0000 (17:06 -0500)]
WIP: Add an xdg applications menu (it doesn't have anything in it yet, but it does make a linkbase)

13 years agoAvoid blocks on read() for inotify.
Dana Jansens [Mon, 24 Jan 2011 22:05:44 +0000 (17:05 -0500)]
Avoid blocks on read() for inotify.

When we come into the function we don't know how much data is available to
read.  So just read a single event and return, so poll can figure out if there
is more for us or not.

13 years agohide the menus before shutting them down on reconfigure
Dana Jansens [Mon, 24 Jan 2011 22:00:41 +0000 (17:00 -0500)]
hide the menus before shutting them down on reconfigure

13 years agoMove the GSource attach out to the generic watch code, and avoid blocking reads
Dana Jansens [Mon, 24 Jan 2011 21:57:37 +0000 (16:57 -0500)]
Move the GSource attach out to the generic watch code, and avoid blocking reads

GLib seems to call the read function sometimes even tho the PollFD's revents
field is empty.  So don't read from the fd if this happens.

13 years agoAdd an optional callback to ObtLinkBase to hear about updates, and fix crash.
Dana Jansens [Mon, 24 Jan 2011 21:56:21 +0000 (16:56 -0500)]
Add an optional callback to ObtLinkBase to hear about updates, and fix crash.

13 years agoFix for when the menu's update function returns FALSE and no menu is shown.
Dana Jansens [Mon, 24 Jan 2011 21:45:56 +0000 (16:45 -0500)]
Fix for when the menu's update function returns FALSE and no menu is shown.

The ObMenuFrame was not being freed, and the child pointer was being left
pointing to the frame that was not visible.

13 years agoFilter links in a ObtLinkbase by environments.
Dana Jansens [Mon, 24 Jan 2011 20:13:27 +0000 (15:13 -0500)]
Filter links in a ObtLinkbase by environments.

Store a set of active environments in a linkbase and only include links in the
linkbase that 1) want to be displayed, 2) pass TryExec, 3) match environment
requirements and restrictions.

13 years agoadd comments
Dana Jansens [Mon, 24 Jan 2011 20:02:07 +0000 (15:02 -0500)]
add comments

13 years agoadd --disable option inotify
Dana Jansens [Mon, 4 Oct 2010 22:03:36 +0000 (18:03 -0400)]
add --disable option inotify

so we can test compiling without it present

13 years agoadd a comment
Dana Jansens [Mon, 4 Oct 2010 22:55:03 +0000 (18:55 -0400)]
add a comment

13 years agoLinkbase adds all the .desktops in the system, and updates them as they change.
Dana Jansens [Tue, 21 Sep 2010 00:46:37 +0000 (20:46 -0400)]
Linkbase adds all the .desktops in the system, and updates them as they change.

Fixes to .desktop parsing.
Add language/locale support for .desktop files.
Fixes to inotify watching, change what information is passed through the notify handler.
Add linkbase.h to the public obt headers.

13 years agoAdd linkbase which will keep track of available .desktop files for application launch...
Dana Jansens [Mon, 20 Sep 2010 19:47:10 +0000 (15:47 -0400)]
Add linkbase which will keep track of available .desktop files for application launching etc.

13 years agoAdd/fix inotify support for watching filesystem changes.
Dana Jansens [Mon, 20 Sep 2010 19:45:36 +0000 (15:45 -0400)]
Add/fix inotify support for watching filesystem changes.

obt/watch.h has the interface.
obt/watch.c has the generic watch code.
obt/watch_inotify.c has an inotify-specific backend, which could be replaced with another.

13 years agosome missing ifdef HAVE_SYS_INOTIFY
Dana Jansens [Mon, 24 Jan 2011 19:09:49 +0000 (14:09 -0500)]
some missing ifdef HAVE_SYS_INOTIFY

13 years agoadd an inotify watcher for directories (doesnt work without inotify yet)
Dana Jansens [Mon, 24 Jan 2011 19:23:46 +0000 (14:23 -0500)]
add an inotify watcher for directories (doesnt work without inotify yet)

13 years agoFix window width/height going less than 1 on some platforms (bug #5246)
Dana Jansens [Sun, 16 Oct 2011 14:50:51 +0000 (10:50 -0400)]
Fix window width/height going less than 1 on some platforms (bug #5246)

13 years agoignore .rej files
Dana Jansens [Sun, 16 Oct 2011 02:45:03 +0000 (22:45 -0400)]
ignore .rej files

13 years agoFix maximized windows and such after screen resizings
Dana Jansens [Sun, 16 Oct 2011 01:04:54 +0000 (21:04 -0400)]
Fix maximized windows and such after screen resizings

13 years agoHear screen resizes when they don't change the root window (cloning)
Dana Jansens [Sun, 16 Oct 2011 01:04:21 +0000 (21:04 -0400)]
Hear screen resizes when they don't change the root window (cloning)

13 years agoCheck the return value for launching the startup command.
Dana Jansens [Sat, 15 Oct 2011 19:37:58 +0000 (15:37 -0400)]
Check the return value for launching the startup command.

Copy/paste error?

13 years agoFixes for gnome-session 3.
Dana Jansens [Sat, 15 Oct 2011 19:07:59 +0000 (15:07 -0400)]
Fixes for gnome-session 3.

We run by default with a panel (default gnome-panel) and then run Openbox
without any panel if one cannot be found.

- Adds a fallback session for if a panel (default gnome-panel) not found.
- Removes notifications as a requirement.  Seems to be a legacy thing judging
  from the ubuntu .session files.  Notifications are being provided by
  notify-osd on modern systems, and you can't check for its presence in
  gnome-session (gnome-classic.session always fails because it looks for it, so
  ubuntu falls back to gnome-fallback.session).

13 years agoRemove unused variable
Dana Jansens [Sat, 15 Oct 2011 17:42:30 +0000 (13:42 -0400)]
Remove unused variable

13 years agorespect the active/mouse options for monitor placement, and use ObMonitorPlace for...
Dana Jansens [Sun, 16 Oct 2011 00:07:57 +0000 (20:07 -0400)]
respect the active/mouse options for monitor placement, and use ObMonitorPlace for per-app too

13 years agoAllow per-app settings to pick a monitor for a window without choosing a position...
Dana Jansens [Fri, 14 Oct 2011 23:24:45 +0000 (19:24 -0400)]
Allow per-app settings to pick a monitor for a window without choosing a position in it.

13 years agoAdd "active" and "primary" options to the <monitor> placement option for per-app...
Dana Jansens [Fri, 14 Oct 2011 23:12:11 +0000 (19:12 -0400)]
Add "active" and "primary" options to the <monitor> placement option for per-app settings (bug #5180)

13 years agomake undecorated windows place according to their undecorated state (bug #5179)
Dana Jansens [Fri, 14 Oct 2011 22:54:32 +0000 (18:54 -0400)]
make undecorated windows place according to their undecorated state (bug #5179)

splits client_setup_decor_and_functions() into 3 functions.

1. add client_setup_default_decor_and_functions()
- called from client_get_all() to get the maximum decor/functions that will
  be available for use by the client.
2. add client_setup_decor_undecorated()
- sets up the client's undecorarted decor if the flag is set by the per-app
  settings or session state.
- we do this before setting up the frame so the frame reflects the window as it
  should be when getting placed.
3. client_setup_decor_and_functions()
- calls the above 2 to perform the same functions as before.
- added to client_apply_startup_state() so that we can ensure it was run fully
  at least once in the mapping process, since it is not called in
  client_get_all() anymore.

13 years agoit would seem this cannot return NULL now
Dana Jansens [Fri, 14 Oct 2011 22:52:36 +0000 (18:52 -0400)]
it would seem this cannot return NULL now

It will get the primary monitor if there is not monitor under the pointer. But
assert so it's clear something went wrong if this does happen. Note that there
was previously no check for the return value even though the comment claimed
there should be.

13 years agoLink libobt into libobrender, as it uses things from libobt (bug #5150)
Fryderyk Dziarmagowski [Fri, 14 Oct 2011 21:41:43 +0000 (17:41 -0400)]
Link libobt into libobrender, as it uses things from libobt (bug #5150)

libobrender uses ObtPaths stuff, so it needs to link in libobt.

13 years agoPropagate _NET_WM_WINDOW_OPACITY to the frame window (bug #5132)
Dana Jansens [Fri, 14 Oct 2011 21:39:24 +0000 (17:39 -0400)]
Propagate _NET_WM_WINDOW_OPACITY to the frame window (bug #5132)

13 years agoStrip leading/trailing whitespace when parsing colors and other strings (bug #4937)
Dana Jansens [Fri, 14 Oct 2011 21:06:05 +0000 (17:06 -0400)]
Strip leading/trailing whitespace when parsing colors and other strings (bug #4937)

13 years agofree undecorated border colors
Dana Jansens [Fri, 14 Oct 2011 21:17:22 +0000 (17:17 -0400)]
free undecorated border colors

13 years agoSpecific border width/color for undecorated active/inactive windows (bug #4889)
Carlos Pita [Fri, 14 Oct 2011 21:01:18 +0000 (17:01 -0400)]
Specific border width/color for undecorated active/inactive windows (bug #4889)

The attached patch adds three theme options with backward compatible defaults:

undecorated.border.width
  defaults to border.width

window.undecorated.active.border.color
  defaults to window.active.border.color

window.undecorated.inactive.border.color
  defaults to window.inactive.border.color

13 years agoFix crash when keyboard map changes and no keybindings exist.
Dana Jansens [Fri, 14 Oct 2011 20:43:18 +0000 (16:43 -0400)]
Fix crash when keyboard map changes and no keybindings exist.

Don't assume old tree is non-null and start rebinding it.

13 years agoChange default doubleclick timeout to 500ms and keep track of where last click was
Mikael Magnusson [Thu, 4 Aug 2011 16:34:54 +0000 (18:34 +0200)]
Change default doubleclick timeout to 500ms and keep track of where last click was

Bug #5152 - "mouse double-click time is too low by default - 200ms"

We only use the doubleclick in one place in the default configuration,
for doubleclicking titlebars to maximize windows, so any negative impact
of increasing the timeout should be minimal, especially with the
addition of requiring the two clicks to be in the same place.

Doubleclicks are hardcoded to occur within 8 pixels for now, it doesn't
seem worth it to add a config until someone complains. A possibility is
using the drag threshold, but some people have that set very low so it
could be hard to doubleclick then.

13 years agoParse all the actions in a single menu item
Dana Jansens [Sat, 15 Oct 2011 19:45:27 +0000 (15:45 -0400)]
Parse all the actions in a single menu item

13 years agoDon't remove openbox-gnome.session on make clean - it's not generated.
Dana Jansens [Tue, 11 Oct 2011 22:03:24 +0000 (18:03 -0400)]
Don't remove openbox-gnome.session on make clean - it's not generated.

13 years agoMake openbox-gnome-session compatible with gnome3 with gnome-session 3.0+ support.
Geoffrey Antos [Fri, 7 Oct 2011 13:29:30 +0000 (09:29 -0400)]
Make openbox-gnome-session compatible with gnome3 with gnome-session 3.0+ support.

Yay they did something nice and made it easier for other window managers to be used.  How unexpected and pleasant.

13 years agoDon't show prompts inside the message handler to prevent recursion
Dana Jansens [Thu, 6 Oct 2011 14:03:52 +0000 (10:03 -0400)]
Don't show prompts inside the message handler to prevent recursion

Showing prompts causes messages to be created which causes the glib message
handler to abort().  Save the messages and show them when done all other
processing for the current event.

13 years agobug #5253 kde4 is out now, use kde4 menus by default.
Dana Jansens [Thu, 29 Sep 2011 16:52:07 +0000 (12:52 -0400)]
bug #5253 kde4 is out now, use kde4 menus by default.

Startup scripts should export "XDG_MENU_PREFIX=kde-4-" but they export
"XDG_MENU_PREFIX=kde-".

13 years agoMake "no" a valid choice for the dialog option in cyclewindows.c.
Dana Jansens [Tue, 30 Aug 2011 15:14:06 +0000 (11:14 -0400)]
Make "no" a valid choice for the dialog option in cyclewindows.c.

It is the same as "none" for backward compatibility (it used to be a boolean).

13 years agoUpdate copyright notice in --version output
Mikael Magnusson [Tue, 13 Sep 2011 18:39:12 +0000 (20:39 +0200)]
Update copyright notice in --version output

13 years agoFix typo in configure.ac, noticed by hwoarang
Mikael Magnusson [Sat, 3 Sep 2011 10:23:22 +0000 (12:23 +0200)]
Fix typo in configure.ac, noticed by hwoarang

13 years agoConsistency with helper/modal windows and multiple desktops.
Dana Jansens [Wed, 5 Oct 2011 17:25:46 +0000 (13:25 -0400)]
Consistency with helper/modal windows and multiple desktops.

When focusing a window, bring its helper windows.  This happened before when
switching its desktop, but if you have 2 windows on different desktops and
switch between them, the helpers should come to both when they are being used.

When a new helper/modal window maps on a different desktop and you are using
the application, then the helper/modal window is moved to the current desktop
to be with the application you are using.

13 years agoFix focus stealing for changing desktops/Use timestamp for user input events
Dana Jansens [Tue, 4 Oct 2011 21:53:54 +0000 (17:53 -0400)]
Fix focus stealing for changing desktops/Use timestamp for user input events

Change the logic for when to allow stealing focus across desktops.
- It was possible to call event_time_after() with a CurrentTime in the old code.
- It would disallow a user requested change which is crazy.
- It would change desktops on you when a new window appeared but this is
  generally not desirable.

event_source_time() is supposed to give the time which the user made things
happen. we leave it at 0 for user-input events right now which means stuff like
changing desktop doesn't save any timestamp at all.  we should use the
timestamp from x for user-generated events.

14 years agoFix a memleak introduced by 0dd91ba0e2382a8f6177f501f8a0b26e0daf26a8, some cleanups
Mikael Magnusson [Wed, 3 Aug 2011 21:01:28 +0000 (23:01 +0200)]
Fix a memleak introduced by 0dd91ba0e2382a8f6177f501f8a0b26e0daf26a8, some cleanups

14 years agobe a bit more explicit about what is being copied from one texture to another
Dana Jansens [Tue, 25 Jan 2011 17:02:42 +0000 (12:02 -0500)]
be a bit more explicit about what is being copied from one texture to another

14 years agoSeparate theme options for osd prompt buttons.
Carlos Pita [Wed, 12 Jan 2011 23:49:45 +0000 (20:49 -0300)]
Separate theme options for osd prompt buttons.

I managed to keep backwards compatibility without really cluttering
the code so here is the patch
http://bugzilla.icculus.org/show_bug.cgi?id=4874 too.

Please keep in mind that this is my first piece of code for openbox
and that I'm not a die hard openbox user (yet), not to tell the patch
was not exhaustively tested. Anyway I think it's pretty much in a good
shape but any criticism will be welcome.

Basically the patch add the following theme options for controlling
buttons in osd prompts:

%%%% colors
%
% for the text inside the button
osd.button.unpressed.text.color
osd.button.pressed.text.color
osd.button.focused.text.color
%
% for the line art around the button
%  (if you don't wan't the box just make box.color = bg.color)
osd.button.pressed.box.color
osd.button.focused.box.color

%%%% textures
%
osd.button.unpressed.bg
osd.button.pressed.bg
osd.button.focused.bg

The buttons can be in three states:

 unpressed: neither clicked nor selected
 focused: selected but not clicked
 pressed: clicked (and of course selected)

I discarded the previous distinction between press and pfocus as in
fact it was only a formal distinction, in that both appearances
mimicked each other in every sense. It think that it was just
inherited from the way titlebar buttons are managed so I decided to
simplify it a bit.

All the options default in a way that preserves backwards compatibility:

osd.button.unpressed.text.color  -> osd.active.label.text.color
osd.button.pressed.text.color -> osd.active.label.text.color
osd.button.focused.text.color -> osd.active.label.text.color

osd.button.pressed.box.color ->  window.active.button.pressed.image.color
osd.button.focused.box.color -> window.active.button.hover.image.color

osd.button.unpressed.bg -> window.active.button.unpressed.bg
osd.button.pressed.bg -> window.active.button.pressed.bg
osd.button.focused.bg -> window.active.button.hover.bg

Notice that a good deal of locs where added to theme.c but in
compensation prompt.c is pretty much simpler now because the
appearances and textures are created while loading the theme.

14 years agoMerge branch 'm4/master'
Mikael Magnusson [Tue, 2 Aug 2011 20:18:14 +0000 (22:18 +0200)]
Merge branch 'm4/master'

14 years agoRevert these two commits temporarily to make the buttons merge easier
Mikael Magnusson [Tue, 2 Aug 2011 20:17:11 +0000 (22:17 +0200)]
Revert these two commits temporarily to make the buttons merge easier

1e427a3358deeadf8abc326e714ee201fddc43d6
2288da0ae3b44c987687e3deeb7864fcb7b23bb9

14 years agoUpdate portuguese translation
Pedro Beja [Sat, 24 Apr 2010 20:21:23 +0000 (22:21 +0200)]
Update portuguese translation

14 years agoUpdate estonian translation
Mikael Magnusson [Thu, 22 Apr 2010 13:55:13 +0000 (15:55 +0200)]
Update estonian translation

14 years agoAdd Plural-Forms header to fi.po and remove fuzzy mark.
Mikael Magnusson [Sat, 13 Mar 2010 20:57:58 +0000 (21:57 +0100)]
Add Plural-Forms header to fi.po and remove fuzzy mark.

14 years agoUpdate polish translation.
Jakub Łojewski [Thu, 11 Mar 2010 13:29:41 +0000 (14:29 +0100)]
Update polish translation.

14 years agoFix some rebase artifacts
Mikael Magnusson [Thu, 14 Oct 2010 14:05:15 +0000 (16:05 +0200)]
Fix some rebase artifacts

14 years agoadd --disable options for x extensions release-3.5.0
Dana Jansens [Mon, 24 Jan 2011 19:06:56 +0000 (14:06 -0500)]
add --disable options for x extensions

so we can test compiling without them present

14 years agoUpdate Brazilian Portuguese translation
Og Maciel [Mon, 1 Aug 2011 19:47:00 +0000 (21:47 +0200)]
Update Brazilian Portuguese translation

14 years agoadd the 3.4.10+ changes to the CHANGELOG
Dana Jansens [Mon, 1 Aug 2011 17:49:40 +0000 (13:49 -0400)]
add the 3.4.10+ changes to the CHANGELOG

14 years agoAdd 3.5.0 changes
Dana Jansens [Mon, 1 Aug 2011 17:41:44 +0000 (13:41 -0400)]
Add 3.5.0 changes

14 years agoUpdate other po files
Mikael Magnusson [Mon, 1 Aug 2011 16:58:03 +0000 (18:58 +0200)]
Update other po files

14 years agoUpdate swedish translation
Mikael Magnusson [Mon, 1 Aug 2011 16:22:16 +0000 (18:22 +0200)]
Update swedish translation

14 years agoFix some translation string markings
Mikael Magnusson [Tue, 10 May 2011 14:03:33 +0000 (16:03 +0200)]
Fix some translation string markings

14 years agoAllow setting icons for submenus
Mikael Magnusson [Fri, 16 Apr 2010 15:58:20 +0000 (17:58 +0200)]
Allow setting icons for submenus

14 years agoFix menu placement to avoid dead xinerama areas, possibly break other stuff
Mikael Magnusson [Tue, 10 May 2011 14:03:33 +0000 (16:03 +0200)]
Fix menu placement to avoid dead xinerama areas, possibly break other stuff

Use screen_find_monitor(area) instead of screen_find_monitor_point(
topleft corner) in order to find a better monitor when the menu isn't
opening with the mouse cursor in the top left corner.

I made screen_find_monitor return the primary screen when it failed to
find a monitor containing the rect, instead of the total area, no idea
what behaviour this will change but I doubt it will be worse.

14 years agoLink libraries directly to compile on some systems (debian).
Mikael Magnusson [Sun, 22 May 2011 15:42:34 +0000 (17:42 +0200)]
Link libraries directly to compile on some systems (debian).

If program (A) is linked to library (B) which is linked to library (C),
then A must also link C directly in order to use things from it directly.

14 years agoThe environments are passed in from the openbox-session script so use them.
Dana Jansens [Sun, 24 Jul 2011 23:39:47 +0000 (19:39 -0400)]
The environments are passed in from the openbox-session script so use them.

14 years agoFix bug #4877 (Some harmless code quirks involving booleans)
Dana Jansens [Fri, 28 Jan 2011 18:25:32 +0000 (13:25 -0500)]
Fix bug #4877 (Some harmless code quirks involving booleans)

14 years agobe a bit more explicit about what is being copied from one texture to another
Dana Jansens [Tue, 25 Jan 2011 17:02:42 +0000 (12:02 -0500)]
be a bit more explicit about what is being copied from one texture to another

14 years agoSeparate theme options for osd prompt buttons.
Carlos Pita [Wed, 12 Jan 2011 23:49:45 +0000 (20:49 -0300)]
Separate theme options for osd prompt buttons.

I managed to keep backwards compatibility without really cluttering
the code so here is the patch
http://bugzilla.icculus.org/show_bug.cgi?id=4874 too.

Please keep in mind that this is my first piece of code for openbox
and that I'm not a die hard openbox user (yet), not to tell the patch
was not exhaustively tested. Anyway I think it's pretty much in a good
shape but any criticism will be welcome.

Basically the patch add the following theme options for controlling
buttons in osd prompts:

%%%% colors
%
% for the text inside the button
osd.button.unpressed.text.color
osd.button.pressed.text.color
osd.button.focused.text.color
%
% for the line art around the button
%  (if you don't wan't the box just make box.color = bg.color)
osd.button.pressed.box.color
osd.button.focused.box.color

%%%% textures
%
osd.button.unpressed.bg
osd.button.pressed.bg
osd.button.focused.bg

The buttons can be in three states:

 unpressed: neither clicked nor selected
 focused: selected but not clicked
 pressed: clicked (and of course selected)

I discarded the previous distinction between press and pfocus as in
fact it was only a formal distinction, in that both appearances
mimicked each other in every sense. It think that it was just
inherited from the way titlebar buttons are managed so I decided to
simplify it a bit.

All the options default in a way that preserves backwards compatibility:

osd.button.unpressed.text.color  -> osd.active.label.text.color
osd.button.pressed.text.color -> osd.active.label.text.color
osd.button.focused.text.color -> osd.active.label.text.color

osd.button.pressed.box.color ->  window.active.button.pressed.image.color
osd.button.focused.box.color -> window.active.button.hover.image.color

osd.button.unpressed.bg -> window.active.button.unpressed.bg
osd.button.pressed.bg -> window.active.button.pressed.bg
osd.button.focused.bg -> window.active.button.hover.bg

Notice that a good deal of locs where added to theme.c but in
compensation prompt.c is pretty much simpler now because the
appearances and textures are created while loading the theme.

14 years agomove Imlib to the option deps in the git readme
Dana Jansens [Mon, 1 Aug 2011 15:41:34 +0000 (11:41 -0400)]
move Imlib to the option deps in the git readme

14 years agoUpdate note on dependencies wrt autopoint
Mikael Magnusson [Sat, 5 Mar 2011 16:44:26 +0000 (17:44 +0100)]
Update note on dependencies wrt autopoint

14 years agoUpdate README.GIT to the packages in current ubuntu distribution and include imlib2
Dana Jansens [Sat, 23 Jul 2011 22:51:38 +0000 (18:51 -0400)]
Update README.GIT to the packages in current ubuntu distribution and include imlib2

14 years agoComment fix
Dana Jansens [Tue, 26 Jul 2011 19:08:35 +0000 (15:08 -0400)]
Comment fix

14 years agobump version to 3.5.0 and library versions
Dana Jansens [Mon, 1 Aug 2011 15:25:55 +0000 (11:25 -0400)]
bump version to 3.5.0 and library versions