nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement all options for output follow mode.

Browse Source 
As far as I know, it's not possible to differentiate keyboard and
mouse focus, so they behave the same. This commit also fixes
a bug where a NULL pointer was dereferenced.
This commit is contained in:
fwsmit 2020-11-29 18:21:52 +01:00
parent ac6093a577
commit 836d044df8
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/wayland/wl.c
View File

@ -60,9 +60,9 @@ struct wl_ctx {
struct wl_list outputs; struct wl_list outputs;
struct wl_surface *surface; struct wl_surface *surface;
struct wl_output *surface_output; struct dunst_output *surface_output;
struct zwlr_layer_surface_v1 *layer_surface; struct zwlr_layer_surface_v1 *layer_surface;
struct wl_output *layer_surface_output; struct dunst_output *layer_surface_output;
struct wl_callback *frame_callback; struct wl_callback *frame_callback;
struct org_kde_kwin_idle *idle_handler; struct org_kde_kwin_idle *idle_handler;
bool configured; bool configured;
@ -171,10 +171,10 @@ static void create_output( struct wl_output *wl_output, uint32_t global_name) {
} }
static void destroy_output(struct dunst_output *output) { static void destroy_output(struct dunst_output *output) {
if (ctx.surface_output == output->wl_output) { if (ctx.surface_output == output) {
ctx.surface_output = NULL; ctx.surface_output = NULL;
} }
if (ctx.layer_surface_output == output->wl_output) { if (ctx.layer_surface_output == output) {
ctx.layer_surface_output = NULL; ctx.layer_surface_output = NULL;
} }
wl_list_remove(&output->link); wl_list_remove(&output->link);
@ -446,15 +446,27 @@ void finish_wayland() {
static struct dunst_output *get_configured_output() { static struct dunst_output *get_configured_output() {
struct dunst_output *output; struct dunst_output *output;
/* if (strcmp(output_name, "") == 0) { */ /* LOG_D("Follow mode %i", settings.f_mode); */
/* return NULL; */ switch (settings.f_mode){
/* } */ case FOLLOW_NONE:
// FIXME Make sure the returned output corresponds to the monitor number configured in the dunstrc LOG_I("Follow none, using monitor setting: %i", settings.monitor);
wl_list_for_each(output, &ctx.outputs, link) { int n = 0;
return output; int target_monitor = settings.monitor;
}
wl_list_for_each(output, &ctx.outputs, link) {
if (n == target_monitor)
return output;
n++;
}
LOG_W("Monitor %i doesn't exist, using focused monitor", settings.monitor);
return NULL; return NULL;
case FOLLOW_MOUSE:
// fallthrough
case FOLLOW_KEYBOARD:
// fallthrough
default:
return NULL;
}
} }
static void schedule_frame_and_commit(); static void schedule_frame_and_commit();
@ -469,7 +481,7 @@ static void send_frame() {
// There are two cases where we want to tear down the surface: zero // There are two cases where we want to tear down the surface: zero
// notifications (height = 0) or moving between outputs. // notifications (height = 0) or moving between outputs.
if (height == 0 || ctx.layer_surface_output != output->wl_output) { if (height == 0 || ctx.layer_surface_output != output) {
if (ctx.layer_surface != NULL) { if (ctx.layer_surface != NULL) {
zwlr_layer_surface_v1_destroy(ctx.layer_surface); zwlr_layer_surface_v1_destroy(ctx.layer_surface);
ctx.layer_surface = NULL; ctx.layer_surface = NULL;
@ -500,7 +512,7 @@ static void send_frame() {
wl_output = output->wl_output; wl_output = output->wl_output;
} else } else
LOG_I("output is null"); LOG_I("output is null");
ctx.layer_surface_output = output->wl_output; ctx.layer_surface_output = output;
ctx.surface = wl_compositor_create_surface(ctx.compositor); ctx.surface = wl_compositor_create_surface(ctx.compositor);
wl_surface_add_listener(ctx.surface, &surface_listener, NULL); wl_surface_add_listener(ctx.surface, &surface_listener, NULL);