action: Inline private/action.h into action.c

There is no need for a header since the types defined in it are
used only in action.c.
This commit is contained in:
John Lindgren 2022-11-22 11:59:54 -05:00 committed by Johan Malm
parent 4da37c6532
commit 4906d1833a
3 changed files with 19 additions and 26 deletions

View file

@ -2,9 +2,10 @@
#ifndef __LABWC_ACTION_H #ifndef __LABWC_ACTION_H
#define __LABWC_ACTION_H #define __LABWC_ACTION_H
#include <wayland-util.h>
struct view; struct view;
struct server; struct server;
struct wl_list;
struct action { struct action {
struct wl_list link; /* struct wl_list link; /*

View file

@ -1,24 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __LABWC_PRIVATE_ACTION_H
#define __LABWC_PRIVATE_ACTION_H
/* Don't include ourself as search path starts at current directory */
#include "../action.h"
enum action_arg_type {
LAB_ACTION_ARG_STR = 0,
};
struct action_arg {
struct wl_list link; /* struct action.args */
char *key; /* May be NULL if there is just one arg */
enum action_arg_type type;
};
struct action_arg_str {
struct action_arg base;
char *value;
};
#endif /* __LABWC_PRIVATE_ACTION_H */

View file

@ -6,17 +6,33 @@
#include <strings.h> #include <strings.h>
#include <unistd.h> #include <unistd.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "action.h"
#include "common/list.h" #include "common/list.h"
#include "common/mem.h" #include "common/mem.h"
#include "common/spawn.h" #include "common/spawn.h"
#include "debug.h" #include "debug.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "private/action.h"
#include "ssd.h" #include "ssd.h"
#include "view.h" #include "view.h"
#include "workspaces.h" #include "workspaces.h"
enum action_arg_type {
LAB_ACTION_ARG_STR = 0,
};
struct action_arg {
struct wl_list link; /* struct action.args */
char *key; /* May be NULL if there is just one arg */
enum action_arg_type type;
};
struct action_arg_str {
struct action_arg base;
char *value;
};
enum action_type { enum action_type {
ACTION_TYPE_INVALID = 0, ACTION_TYPE_INVALID = 0,
ACTION_TYPE_NONE, ACTION_TYPE_NONE,