530 Commits

Author SHA1 Message Date
Jonas Berlin
667503ef7d Cleanup, documentation 2019-12-04 21:01:29 +02:00
Jonas Berlin
39c97e28f6 [ReviewFix] get_pixbuf_from_file: Free memory on error return 2019-12-03 20:27:31 +02:00
Jonas Berlin
364bce1ed0 Scale icons during loading to get best quality for e.g. vector images 2019-11-29 21:28:22 +02:00
Jonas Berlin
ab3b5c2805 Implement #392 2019-11-29 21:14:57 +02:00
Benedikt Heine
53e7f3d16a
Merge pull request #650 from tsipinakis/bugfix/parse-empty
option_parser: Fail early when parsing empty string
2019-08-10 20:06:11 +02:00
Nikos Tsipinakis
f37a5d1c64 option_parser: Fail early when parsing empty string
Sometimes these parse functions can have other side-effects such as the
sepcolor one which defaults to a custom color string if the value is
unknown. If the string is empty all of these functions should fail to
allow for the default to be used.

See #649 for details
2019-08-10 19:47:30 +03:00
Benedikt Heine
52a8489043 Don't overflow when passing INT_MAX on DBus wire 2019-08-09 14:41:37 +02:00
Nikos Tsipinakis
ac94eca79e Recheck fullscreen status on ConfigureNotify
IceWM does not send PropertyNotify when exiting fullscreen. As a
band-aid solution also re-check the fullscreen status on ConfigureNotify
events. We're receiving them already so a few extra checks should not be
noticeable in any case.

Fixes #613
2019-06-20 15:25:54 +03:00
Nikos Tsipinakis
69a682ce34 Fix call to draw when no notifications are available
Draw should not be called when there are no notifications in the queue.
This for unknown reasons causes a crash the next time we attempt to get
the currently active window with a BadValue error from
XGetWindowProperty.

Fixes #630.
2019-06-19 11:02:46 +03:00
Nikos Tsipinakis
700a3225f2 Increase notification character limit
Fixes #636
2019-06-18 14:16:32 +03:00
Nikos Tsipinakis
264df67a63 Fix negative width being ignored
In `x_parse_geometry` we modified the global settings struct for
negative width instead of updating it in the struct that is currently
being constructed.

As a result the negative_width field was always false as it was being
overwritten by the struct assignment after the functions return.

Fixes #628
2019-05-02 12:34:25 +03:00
Nikos Tsipinakis
d6bd506669 Fix parsing of comments after a quoted string in the config
Quoted values can still have a trailing comment that we need to remove
before calling `add_value`. Otherwise, when trying to strip the quotes
from the value `string_strip_quotes` only looks at the end which
is inside the comment and so it won't find a matching end quote to
strip.

Fixes #626
2019-04-27 10:30:02 +03:00
Dmitri Goutnik
6e8de70c82 Make extract_urls regex more portable 2019-04-08 09:15:59 -05:00
Nikos Tsipinakis
dda26bfbe9 Fix dynamic width check
The width_set field is true if the width is set in the geometry setting,
in other words if a specific (or dynamic) width is set or we want the
notification to cover the whole screen.
In order to check if a specific width is chosen we need to also exclude
dynamic width, meaning the width field has to be non 0;

Fixes #614
2019-04-02 11:34:27 +03:00
Nikos Tsipinakis
1bc3237a35 Subscribe to PropertyChangeMask regardless of follow_mode
PropertyNotify events are used primarily to detect active screen changes
when follow mode is used but now we also need them to receive resource
manager events in order to update the dpi value.
2019-03-23 20:01:27 +02:00
Benedikt Heine
812d5a3b84 Replace the xresources DB on PropertyNotify
When changing values with xrdb on the command line, an XEvent is
triggered on the "RESOURCE_MANAGER" atom.

But xlib just doesn't care. XResourceManagerString() will still report
the old values. Also XrmGetDatabase() won't help out.

So, when we receive a PropertyNotify for the resource manager atom, we
have to manually query its contents, convert it to a DB and replace it
in the display object.

This allows, that any method just can call XrmGetDatabase() and get the
latest values.
2019-03-23 20:01:27 +02:00
Benedikt Heine
4b06d67605 Initialize xrm during init
Initializing xrm is required only once. Everything else would be
overhead.
2019-03-23 20:01:27 +02:00
Benedikt Heine
9961efd10c Copy the database from the display connection
This allows to update the DB on the xctx.dpy object. Crawling the string
from xctx.dpy will always return the xdefaults string, which represents
the defaults from the initialisation, but not with any other updates.
2019-03-23 20:01:27 +02:00
Benedikt Heine
e9e199c4ec Pass pointer to check_screen_event 2019-03-23 20:01:27 +02:00
Benedikt Heine
ca7234b1c8 Cache the Xft.dpi value outside
The Xft.dpi value is one way to set the dpi of the X11 display. Querying
this value requires much overhead. Therefore we have to cache this.

Previously we did just query it at the beginning and ignored further
changes.

As there is no native signal to catch a change in its xrdb value, we
have to rely on the root window's PropertyNotify event and filter there
the RESOURCE_MANAGER atom.

This will get hooked up later.
2019-03-23 20:01:27 +02:00
Benedikt Heine
37e580e857 (style) swap conditional blocks 2019-03-23 20:01:27 +02:00
Benedikt Heine
4f510e1703 Query the X11 screen's DPI instead of monitor
When changing the DPI via xrandr --dpi <DPI>, xrandr will send a
RRScreenChangeEvent and the DPI value should get adjusted.

Falsely, we thought randr_update() would catch up and query the right
monitor values. But nothing changes, because we query the
XRRMonitorInfo. The monitor info contains the real physical width and
height of the monitor's screen.

But xrandr --dpi only changes the - let's say - virtual screen size of
the virtual overall screen (and therefore changing the DPI to the
matching value).

Important commands to understand:

- Changes dpi of the virtual screen

    xrandr --dpi

- Gives info about the "virtual" screen size (used by DisplayWidth)

    xdpyinfo | grep -B1 resolution

- Gives info about the "physical" screen size (used by XRRMonitorInfo)

    xrandr -q

I know, that I'm probably not right and might not understand the topic
in its full size yet[0]. But I'm 100% sure, that the terms "monitor",
"screen", "screens", "output" and "display" do not have a consistent
naming scheme.
[0] https://twitter.com/dechampsgu/status/857924498280124416

Fixes #382
2019-03-23 20:01:27 +02:00
Benedikt Heine
121ddd2b94 Always throw out the whole screen array
If n < screens_len, screens_len did not get updated. So boundary
checks wouldn't catch, if screens between n and screens_len are
accessed. This will prevent such an error type in the future.
2019-03-23 20:01:27 +02:00
Benedikt Heine
9bcb27f2e8 Pass the RRScreenChangeNotify event to libxrandr
From Xrandr(3):

> Clients must call back into Xlib using XRRUpdateConfiguration when
> screen configuration change notify events are generated [...].
2019-03-23 20:01:27 +02:00
Nikos Tsipinakis
59a87e4e99
Merge pull request #610 from bebehei/docs-retval
Use @retval in codedocs
2019-03-07 22:29:18 +02:00
Benedikt Heine
16fcbc9db9 Use @retval in codedocs 2019-03-06 21:14:52 +01:00
Sascha kruse
c99f715391 Limit icon size when we have a fixed width
Fix #540
2019-02-13 12:01:35 +02:00
Michael Sloan
802b1abb09 Use queues_notification_close for skip_display instead of queues_history_push
https://github.com/dunst-project/dunst/pull/590
2019-02-05 13:36:56 -08:00
Michael Sloan
977a7a7ea4 New rule option: skip_display 2019-01-30 23:50:33 -08:00
Nikos Tsipinakis
dd6320a0a9
Merge pull request #592 from bebehei/desktop-entry
Desktop entry filters.
2019-01-25 14:09:13 +02:00
Benedikt Heine
1e82c761c9 Add support for desktop-entry hints 2019-01-25 07:59:01 +01:00
Benedikt Heine
19c9a8e296 Harden against undefined X Atoms
Fixes #589
2019-01-23 17:56:59 +01:00
Benedikt Heine
3828cca699 Introduce rule_new 2019-01-23 16:20:21 +01:00
Benedikt Heine
53ad430b48 Compose rule matching function more readable 2019-01-23 16:11:22 +01:00
Nikos Tsipinakis
c8c7d2e675
Merge pull request #587 from mgsloan/fix-notification-decode-error-handling
Fix handling of case where notification decode failure occurs
2019-01-13 17:48:02 +02:00
Nikos Tsipinakis
b0db27eed4
Merge pull request #586 from bebehei/checksummed-icons
Checksummed icons
2019-01-13 17:34:11 +02:00
Michael Sloan
dd54709b9e Fix handling of case where notification decode failure occurs
I'm not sure whether this case can happen in the wild, but if
artifically exercising the condition, I noticed it behaves
poorly. Specifically:

* The error_name parameter must be a valid D-Bus error name. It seems
  conventional to set this to "org.freedesktop.Notifications.Error".
  Without this change, the following error is thrown:

  CRITICAL: g_dbus_method_invocation_return_dbus_error: assertion 'error_name != NULL && g_dbus_is_name (error_name)' failed

* Previously execution would continue even though the notification did
  not decode, causing essentially a null pointer exception later.
  Adds a return for this case.

* With those two things fixed, this case seems relatively silent -
  "notify-send" invocations succeed even if the condition for the if
  is "true". So, I added a warning log to indicate that this case is
  occurring
2019-01-13 01:15:19 -08:00
Benedikt Heine
6f8b53c4e8 Compare raw icons by their checksums
Currently, we just skipped the notification comparison, if the
notification had a raw icon attached. This is a bit counterintuitive.

Calculating a checksum of the raw icon's data is the solution.

For that we cache the pixel buffer and introduce a field, which saves
the current icon's id. The icon_id may be a path or a hash.
So you can compare two notifications by their icon_id field regardless
of their icon type by their icon_id field.
2019-01-11 13:10:37 +01:00
Benedikt Heine
5627d06070 Pass NULL instead of empty string to option parser
A bug, introduced in #576. If alignment isn't set in the config, the
settings would print a warning about an invalid value. But actually it's
just the default string, which can't get parsed.

The fallback value should get handled by a false return value and not by
the option_get_string's default value.
2019-01-09 13:12:46 +01:00
Benedikt Heine
8a46b88da9 Use g_strcmp0 for string comparisons
g_strcmp0 handles NULL values correctly. This allows to omit NULL
pointer checks, which would be otherwise crucial.
2019-01-07 17:56:00 +01:00
Benedikt Heine
f9f5804b08 Remove notification_icon_get wrapper 2019-01-07 17:56:00 +01:00
Benedikt Heine
cd09d5a88e Cache GdkPixbuf in notification structure 2019-01-07 17:56:00 +01:00
Benedikt Heine
088907488c Rename icon field to iconname 2019-01-07 17:56:00 +01:00
Benedikt Heine
4043e1a18e Refactor pixbuf scaling into seperate method 2019-01-07 17:56:00 +01:00
Benedikt Heine
6a8f1c52c3
Merge pull request #576 from bebehei/settings-p1
Settings (part 1/x)
2019-01-07 17:17:16 +01:00
Benedikt Heine
41ce7cce4a Add string_parse_* functions
Changes all string parsers to have a the almost same interface while
also having a proper return value, which indicates success of the
parsing process.
2019-01-07 15:32:28 +01:00
Benedikt Heine
8579b3ed6b Add assertion macro to return values
Just recently, I started using g_return_val_if_fail as a brief assertion
checker. It'll also exit the function with a specified return value.

But actually this introduces some weird behavior. It's configurable by
environment variables and it'll print out a log message, if the
expression didn't validate properly. But some of these assertions are
actually ment to be silent.

Using a simple macro makes it simple to structure the assertions and its
return values in a block at the start of a function or anywhere else.
2019-01-07 15:30:42 +01:00
Benedikt Heine
56f2adb106 Manually convert GdkPixbuf to cairo surfaces
As already noted in the code comment, we all knew that the in memory
conversion to a PNG stream is a cumbersome technique. But it was worth
to remove the GTK dependency.

After finding out, that gdk_pixbuf_new_from_data can actually use a
GVariant and share its memory without allocating new memory, I poked
the cairo docs for a similar technique.

There is cairo_image_surface_create_for_data, which would achieve the
same, but cairo uses another color byte order. So we have to manually
copy and reassemble the bytes.

It may look like a big rise in complexity, but actually, it's straight
forward copying pixel by pixel and changing the byte's order.

And the gdk_pixbuf_to_cairo_surface is 33x faster.
2019-01-07 00:45:34 +01:00
Benedikt Heine
5ebedab78b Fix maybe uninitialized variable 2018-12-29 14:38:59 +01:00
Benedikt Heine
63f455276f Print correct ID for foreign DBus service
By providing an additional layer of pointers, the printed PID was
actually the value at the PID's memory position. 🙈
2018-12-29 14:38:59 +01:00