Skip to content

F_CMD_ARGS and F_PASS_ARGS have been replaced by normal parameter list #1287

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

Open
peripherium wants to merge 1 commit into
base: main
Choose a base branch
from
Open

F_CMD_ARGS and F_PASS_ARGS have been replaced by normal parameter list #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions fvwm/add_window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,9 +2503,7 @@ FvwmWindow *AddWindow(
exc, &ecc, ECC_FW | ECC_W | ECC_WCONTEXT);
SET_STICKY_ACROSS_PAGES(fw, 0);
SET_STICKY_ACROSS_DESKS(fw, 0);
handle_stick(
NULL, exc2, "", NULL, stick_page, stick_desk,
1, 0);
handle_stick(exc2, "", stick_page, stick_desk, 1, 0);
exc_destroy_context(exc2);
}
}
Expand Down
20 changes: 12 additions & 8 deletions fvwm/bindings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ static int ParseBinding(
return rc;
}

static void binding_cmd(F_CMD_ARGS, binding_t type)
static void binding_cmd(char *action, binding_t type)
{
Binding *b;
int count;
Expand Down Expand Up @@ -610,30 +610,34 @@ unsigned int GetUnusedModifiers(void)

/* ---------------------------- builtin commands --------------------------- */

void CMD_Key(F_CMD_ARGS)
void CMD_Key(cond_rc_t *cond_rc, const exec_context_t *exc, char *action,
cmdparser_context_t *pc)
{
binding_cmd(F_PASS_ARGS, BIND_KEYPRESS);
binding_cmd(action, BIND_KEYPRESS);

return;
}

void CMD_PointerKey(F_CMD_ARGS)
void CMD_PointerKey(cond_rc_t *cond_rc, const exec_context_t *exc,
char *action, cmdparser_context_t *pc)
{
binding_cmd(F_PASS_ARGS, BIND_PKEYPRESS);
binding_cmd(action, BIND_PKEYPRESS);

return;
}

void CMD_Mouse(F_CMD_ARGS)
void CMD_Mouse(cond_rc_t *cond_rc, const exec_context_t *exc, char *action,
cmdparser_context_t *pc)
{
binding_cmd(F_PASS_ARGS, BIND_BUTTONPRESS);
binding_cmd(action, BIND_BUTTONPRESS);

return;
}

/* Declares which X modifiers are actually locks and should be ignored when
* testing mouse/key binding modifiers. */
void CMD_IgnoreModifiers(F_CMD_ARGS)
void CMD_IgnoreModifiers(cond_rc_t *cond_rc, const exec_context_t *exc,
char *action, cmdparser_context_t *pc)
{
char *token;
int mods_unused_old = mods_unused;
Expand Down
6 changes: 4 additions & 2 deletions fvwm/borders.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5163,7 +5163,8 @@ unsigned int border_get_transparent_decorations_part(FvwmWindow *fw)
* Sets the allowed button states
*
*/
void CMD_ButtonState(F_CMD_ARGS)
void CMD_ButtonState(cond_rc_t *cond_rc, const exec_context_t *exc,
char *action, cmdparser_context_t *pc)
{
char *token;

Expand Down Expand Up @@ -5221,7 +5222,8 @@ void CMD_ButtonState(F_CMD_ARGS)
* Sets the border style (veliaa@rpi.edu)
*
*/
void CMD_BorderStyle(F_CMD_ARGS)
void CMD_BorderStyle(cond_rc_t *cond_rc, const exec_context_t *exc,
char *action, cmdparser_context_t *pc)
{
char *parm;
char *prev;
Expand Down
Loading