Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FvwmEvent: handle previous_monitor and no longer passthrough ID #701

Merged
merged 2 commits into from
Sep 28, 2022
Merged

FvwmEvent: handle previous_monitor and no longer passthrough ID #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb0253
FvwmEvent: flip prev_focused monitor
ThomasAdam Sep 19, 2022
f85c4dc
FvwmEvent: don't special-case monitor extended events
ThomasAdam Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions doc/FvwmEvent.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,7 @@ needed.
The monitor_* events do not operate in a window context (as there isn't
one), but react to when a monitor is plugged in (enabled), unplugged
(disabled), focused (focus) or changed (resized/rotated, etc., which
will only be true if the monitor is already active). In all cases, the
monitor name is is passed through to the command, hence the following
example prints out the changed monitor's name, and width/height values:
+
....
DestroyFunc MonitorExample
AddToFunc MonitorExample
+ I Echo "Monitor $0 changed ($[monitor.$0.width] x $[monitor.$0.height])

*FvwmEvent: monitor_changed MonitorExample
....
will only be true if the monitor is already active).
+
The echo event is generated whenever Fvwm receives an Echo command.
+
Expand Down
70 changes: 53 additions & 17 deletions fvwm/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ typedef struct
} _merge_cr_args;

/* ---------------------------- forward declarations ----------------------- */
static void toggle_prev_monitor_state(struct monitor *, struct monitor *,
FvwmWindow *);

/* ---------------------------- local variables ---------------------------- */

Expand Down Expand Up @@ -1981,6 +1983,35 @@ void HandleDestroyNotify(const evh_args_t *ea)
return;
}

static void
toggle_prev_monitor_state(struct monitor *this, struct monitor *prev,
FvwmWindow *fw)
{
if (fw == NULL) {
/* Assume root window. */
if (this != prev) {
BroadcastName(MX_MONITOR_FOCUS, -1, -1, -1,
this->si->name /* Name of the monitor. */
);
}
/* Toggle the state of the previous monitor. */
prev->is_prev = false;
this->is_prev = true;

return;
}

if (fw->m != prev) {
BroadcastName(MX_MONITOR_FOCUS, -1, -1, -1,
this->si->name /* Name of the monitor. */
);

/* Toggle the state of the previous monitor. */
prev->is_prev = false;
this->is_prev = true;
}
}

#if DEBUG_ENTERNOTIFY
static int ecount=0;
#define ENTER_DBG(x) fprintf x;
Expand Down Expand Up @@ -2223,6 +2254,14 @@ void HandleEnterNotify(const evh_args_t *ea)
InstallWindowColormaps(NULL);
}
focus_grab_buttons(lf);

struct monitor *pfm, *this_m;
pfm = monitor_resolve_name(prev_focused_monitor);
this_m = monitor_get_current();

/* Send MX_MONITOR_FOCUS event. */
toggle_prev_monitor_state(this_m, pfm, NULL);

return;
}
else
Expand Down Expand Up @@ -2312,9 +2351,20 @@ void HandleEnterNotify(const evh_args_t *ea)
ewp->window == FW_W_ICON_TITLE(fw) ||
ewp->window == FW_W_ICON_PIXMAP(fw))
{
BroadcastPacket(
MX_ENTER_WINDOW, 3, (long)FW_W(fw),
(long)FW_W_FRAME(fw), (unsigned long)fw);
struct monitor *pfm;
pfm = monitor_resolve_name(prev_focused_monitor);

BroadcastPacket(MX_ENTER_WINDOW, 3, (long)FW_W(fw),
(long)FW_W_FRAME(fw), (unsigned long)fw);

if (fw != NULL) {
/* Send MX_MONITOR_FOCUS event. */
toggle_prev_monitor_state(fw->m, pfm, fw);

if (pfm->virtual_scr.CurrentDesk !=
fw->m->virtual_scr.CurrentDesk)
EWMH_SetCurrentDesktop(fw->m);
}
}
sf = get_focus_window();
if (sf && fw != sf && FP_DO_UNFOCUS_LEAVE(FW_FOCUS_POLICY(sf)))
Expand Down Expand Up @@ -2577,20 +2627,6 @@ void HandleFocusIn(const evh_args_t *ea)
(unsigned long)IsLastFocusSetByMouse(),
(long)fc, (long)bc);
EWMH_SetActiveWindow(focus_w);

struct monitor *pfm;
pfm = monitor_resolve_name(prev_focused_monitor);

if (fw != NULL && fw->m != pfm) {
pfm->is_prev = true;
fw->m->is_prev = false;
BroadcastName(MX_MONITOR_FOCUS, -1, -1, -1,
fw->m->si->name /* Name of the monitor. */
);
if (pfm->virtual_scr.CurrentDesk !=
fw->m->virtual_scr.CurrentDesk)
EWMH_SetCurrentDesktop(fw->m);
}
}
last_focus_w = focus_w;
last_focus_fw = focus_fw;
Expand Down
6 changes: 6 additions & 0 deletions libs/FScreen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,11 @@ struct monitor *
monitor_get_prev(void)
{
struct monitor *m, *mret = NULL;
struct monitor *this = monitor_get_current();

TAILQ_FOREACH(m, &monitor_q, entry) {
if (m == this)
continue;
if (m->is_prev) {
mret = m;
break;
Expand Down Expand Up @@ -537,6 +540,7 @@ void FScreenInit(Display *dpy)
m->Desktops->next = NULL;
m->Desktops->desk = 0;
m->flags |= (MONITOR_NEW|MONITOR_ENABLED);
m->is_prev = false;
monitor_scan_edges(m);
}

Expand Down Expand Up @@ -572,6 +576,7 @@ monitor_dump_state(struct monitor *m)
"\tDisabled:\t%s\n"
"\tIs Primary:\t%s\n"
"\tIs Current:\t%s\n"
"\tIs Previous:\t%s\n"
"\tOutput:\t%d\n"
"\tCoords:\t{x: %d, y: %d, w: %d, h: %d}\n"
"\tVirtScr: {\n"
Expand All @@ -586,6 +591,7 @@ monitor_dump_state(struct monitor *m)
(m2->flags & MONITOR_DISABLED) ? "true" : "false",
(m2->flags & MONITOR_PRIMARY) ? "yes" : "no",
(mcur && m2 == mcur) ? "yes" : "no",
m2->is_prev ? "yes" : "no",
(int)m2->si->rr_output,
m2->si->x, m2->si->y, m2->si->w, m2->si->h,
m2->virtual_scr.VxMax, m2->virtual_scr.VyMax,
Expand Down
16 changes: 5 additions & 11 deletions modules/FvwmEvent/FvwmEvent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ static Bool audio_compat = False;
static char *audio_play_dir = NULL;

#define ARG_NO_WINID 1024 /* just a large number */
#define ARG_EXPECTS_CHAR 1025

#define EVENT_ENTRY(name,action_arg) { name, action_arg, {NULL} }
static event_entry message_event_table[] =
Expand Down Expand Up @@ -139,11 +138,11 @@ static event_entry extended_message_event_table[] =
EVENT_ENTRY( "enter_window", 0 ),
EVENT_ENTRY( "leave_window", 0 ),
EVENT_ENTRY( "property_change", 0),
EVENT_ENTRY( "monitor_enabled", 0 | ARG_EXPECTS_CHAR),
EVENT_ENTRY( "monitor_disabled", 0 | ARG_EXPECTS_CHAR),
EVENT_ENTRY( "monitor_changed", 0 | ARG_EXPECTS_CHAR),
EVENT_ENTRY( "monitor_focus", 0 | ARG_EXPECTS_CHAR),
EVENT_ENTRY( "echo", 0 | ARG_EXPECTS_CHAR),
EVENT_ENTRY( "monitor_enabled", 0 | ARG_NO_WINID),
EVENT_ENTRY( "monitor_disabled", 0 | ARG_NO_WINID),
EVENT_ENTRY( "monitor_changed", 0 | ARG_NO_WINID),
EVENT_ENTRY( "monitor_focus", 0 | ARG_NO_WINID),
EVENT_ENTRY( "echo", 0),
EVENT_ENTRY( "reply", 0), /* FvwmEvent will never receive MX_REPLY */
EVENT_ENTRY(NULL,0)
};
Expand Down Expand Up @@ -469,11 +468,6 @@ void execute_event(event_entry *event_table, short event, unsigned long *body)
action, body[action_arg]);
}
}
/* monitor_* events. */
else if (action_arg != -1 && (action_arg & ARG_EXPECTS_CHAR)) {
sprintf(buf, "%s %s %s", cmd_line, action,
(char *)(&body[3]));
}
else
{
sprintf(buf,"%s %s", cmd_line, action);
Expand Down