mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3485 from mstoeckl/minimize-deps

Browse source 
Remove wlroots dependency for sway(bar|bg|msg|nag)
This commit is contained in:
Brian Ashworth 2019-01-22 01:02:48 -05:00 committed by GitHub
commit f493fb526d
Failed to generate hash of commit
19 changed files with 146 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/meson.build
View file

@ -8,8 +8,7 @@ lib_sway_client = static_library(
gdk_pixbuf,
pango,
pangocairo,
wlroots,
wayland_client,
wayland_client
],
link_with: [lib_sway_common],
include_directories: sway_inc

3
common/meson.build
View file

@ -15,8 +15,7 @@ lib_sway_common = static_library(
cairo,
gdk_pixbuf,
pango,
pangocairo,
wlroots
pangocairo
],
include_directories: sway_inc
)

114
common/util.c
View file

@ -1,17 +1,9 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <float.h>
#include <math.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <xkbcommon/xkbcommon-names.h>
#include <wlr/types/wlr_keyboard.h>
#include "log.h"
#include "util.h"
@ -20,93 +12,12 @@ int wrap(int i, int max) {
}
int numlen(int n) {
if (n == 0) {
return 1;
int j = n <= 0 ? 1 : 0;
while (n) {
j++;
n /= 10;
}
// Account for the '-' in negative numbers.
return log10(abs(n)) + (n > 0 ? 1 : 2);
}
static struct modifier_key {
char *name;
uint32_t mod;
} modifiers[] = {
{ XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
{ XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
{ XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
{ "Ctrl", WLR_MODIFIER_CTRL },
{ XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
{ "Alt", WLR_MODIFIER_ALT },
{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
{ "Mod3", WLR_MODIFIER_MOD3 },
{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
{ "Mod5", WLR_MODIFIER_MOD5 },
};
uint32_t get_modifier_mask_by_name(const char *name) {
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if (strcasecmp(modifiers[i].name, name) == 0) {
return modifiers[i].mod;
}
}
return 0;
}
const char *get_modifier_name_by_mask(uint32_t modifier) {
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if (modifiers[i].mod == modifier) {
return modifiers[i].name;
}
}
return NULL;
}
int get_modifier_names(const char **names, uint32_t modifier_masks) {
int length = 0;
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if ((modifier_masks & modifiers[i].mod) != 0) {
names[length] = modifiers[i].name;
++length;
modifier_masks ^= modifiers[i].mod;
}
}
return length;
}
pid_t get_parent_pid(pid_t child) {
pid_t parent = -1;
char file_name[100];
char *buffer = NULL;
char *token = NULL;
const char *sep = " ";
FILE *stat = NULL;
size_t buf_size = 0;
sprintf(file_name, "/proc/%d/stat", child);
if ((stat = fopen(file_name, "r"))) {
if (getline(&buffer, &buf_size, stat) != -1) {
token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid
parent = strtol(token, NULL, 10);
}
free(buffer);
fclose(stat);
}
if (parent) {
return (parent == child) ? -1 : parent;
}
return -1;
return j;
}
uint32_t parse_color(const char *color) {
@ -152,18 +63,3 @@ float parse_float(const char *value) {
}
return flt;
}
enum wlr_direction opposite_direction(enum wlr_direction d) {
switch (d) {
case WLR_DIRECTION_UP:
return WLR_DIRECTION_DOWN;
case WLR_DIRECTION_DOWN:
return WLR_DIRECTION_UP;
case WLR_DIRECTION_RIGHT:
return WLR_DIRECTION_LEFT;
case WLR_DIRECTION_LEFT:
return WLR_DIRECTION_RIGHT;
}
assert(false);
return 0;
}

2
include/cairo.h
View file

@ -4,7 +4,7 @@
#include "config.h"
#include <stdint.h>
#include <cairo/cairo.h>
#include <wlr/types/wlr_output.h>
#include <wayland-client-protocol.h>
#if HAVE_GDK_PIXBUF
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif

21
include/sway/input/keyboard.h
View file

@ -5,6 +5,27 @@
#define SWAY_KEYBOARD_PRESSED_KEYS_CAP 32
/**
* Get modifier mask from modifier name.
*
* Returns the modifer mask or 0 if the name isn't found.
*/
uint32_t get_modifier_mask_by_name(const char *name);
/**
* Get modifier name from modifier mask.
*
* Returns the modifier name or NULL if it isn't found.
*/
const char *get_modifier_name_by_mask(uint32_t modifier);
/**
* Get an array of modifier names from modifier_masks
*
* Populates the names array and return the number of names added.
*/
int get_modifier_names(const char **names, uint32_t modifier_masks);
struct sway_shortcut_state {
/**
* A list of pressed key ids (either keysyms or keycodes),

2
include/sway/output.h
View file

@ -152,4 +152,6 @@ void premultiply_alpha(float color[4], float opacity);
void scale_box(struct wlr_box *box, float scale);
enum wlr_direction opposite_direction(enum wlr_direction d);
#endif

35
include/util.h
View file

@ -3,9 +3,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
#include <wlr/types/wlr_output_layout.h>
#include <xkbcommon/xkbcommon.h>
/**
* Wrap i into the range [0, max[
@ -13,38 +10,10 @@
int wrap(int i, int max);
/**
* Count number of digits in int
* Count number of digits in int, including '-' sign if there is one
*/
int numlen(int n);
/**
* Get modifier mask from modifier name.
*
* Returns the modifer mask or 0 if the name isn't found.
*/
uint32_t get_modifier_mask_by_name(const char *name);
/**
* Get modifier name from modifier mask.
*
* Returns the modifier name or NULL if it isn't found.
*/
const char *get_modifier_name_by_mask(uint32_t modifier);
/**
* Get an array of modifier names from modifier_masks
*
* Populates the names array and return the number of names added.
*/
int get_modifier_names(const char **names, uint32_t modifier_masks);
/**
* Get the pid of a parent process given the pid of a child process.
*
* Returns the parent pid or NULL if the parent pid cannot be determined.
*/
pid_t get_parent_pid(pid_t pid);
/**
* Given a string that represents an RGB(A) color, return a uint32_t
* version of the color.
@ -65,6 +34,4 @@ bool parse_boolean(const char *boolean, bool current);
*/
float parse_float(const char *value);
enum wlr_direction opposite_direction(enum wlr_direction d);
#endif

2
sway/commands/bar/modifier.c
View file

@ -1,8 +1,8 @@
#include <string.h>
#include "sway/commands.h"
#include "sway/input/keyboard.h"
#include "log.h"
#include "stringop.h"
#include "util.h"
struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
struct cmd_results *error = NULL;

1
sway/commands/bind.c
View file

@ -8,6 +8,7 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/input/cursor.h"
#include "sway/input/keyboard.h"
#include "sway/ipc-server.h"
#include "list.h"
#include "log.h"

2
sway/commands/floating_modifier.c
View file

@ -1,7 +1,7 @@
#include "strings.h"
#include "sway/commands.h"
#include "sway/config.h"
#include "util.h"
#include "sway/input/keyboard.h"
struct cmd_results *cmd_floating_modifier(int argc, char **argv) {
struct cmd_results *error = NULL;

4
sway/config/bar.c
View file

@ -11,12 +11,12 @@
#include <strings.h>
#include <signal.h>
#include "sway/config.h"
#include "sway/input/keyboard.h"
#include "sway/output.h"
#include "config.h"
#include "stringop.h"
#include "list.h"
#include "log.h"
#include "util.h"
#include "stringop.h"
static void terminate_swaybar(pid_t pid) {
sway_log(SWAY_DEBUG, "Terminating swaybar %d", pid);

54
sway/input/keyboard.c
View file

@ -1,9 +1,11 @@
#include <assert.h>
#include <limits.h>
#include <strings.h>
#include <wlr/backend/multi.h>
#include <wlr/backend/session.h>
#include <wlr/types/wlr_idle.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include <xkbcommon/xkbcommon-names.h>
#include "sway/commands.h"
#include "sway/desktop/transaction.h"
#include "sway/input/input-manager.h"
@ -12,6 +14,58 @@
#include "sway/ipc-server.h"
#include "log.h"
static struct modifier_key {
char *name;
uint32_t mod;
} modifiers[] = {
{ XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
{ XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
{ XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
{ "Ctrl", WLR_MODIFIER_CTRL },
{ XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
{ "Alt", WLR_MODIFIER_ALT },
{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
{ "Mod3", WLR_MODIFIER_MOD3 },
{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
{ "Mod5", WLR_MODIFIER_MOD5 },
};
uint32_t get_modifier_mask_by_name(const char *name) {
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if (strcasecmp(modifiers[i].name, name) == 0) {
return modifiers[i].mod;
}
}
return 0;
}
const char *get_modifier_name_by_mask(uint32_t modifier) {
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if (modifiers[i].mod == modifier) {
return modifiers[i].name;
}
}
return NULL;
}
int get_modifier_names(const char **names, uint32_t modifier_masks) {
int length = 0;
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if ((modifier_masks & modifiers[i].mod) != 0) {
names[length] = modifiers[i].name;
++length;
modifier_masks ^= modifiers[i].mod;
}
}
return length;
}
/**
* Remove all key ids associated to a keycode from the list of pressed keys
*/

1
sway/ipc-server.c
View file

@ -23,6 +23,7 @@
#include "sway/output.h"
#include "sway/server.h"
#include "sway/input/input-manager.h"
#include "sway/input/keyboard.h"
#include "sway/input/seat.h"
#include "sway/tree/root.h"
#include "sway/tree/view.h"

16
sway/tree/output.c
View file

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <ctype.h>
#include <string.h>
#include <strings.h>
@ -12,6 +13,21 @@
#include "log.h"
#include "util.h"
enum wlr_direction opposite_direction(enum wlr_direction d) {
switch (d) {
case WLR_DIRECTION_UP:
return WLR_DIRECTION_DOWN;
case WLR_DIRECTION_DOWN:
return WLR_DIRECTION_UP;
case WLR_DIRECTION_RIGHT:
return WLR_DIRECTION_LEFT;
case WLR_DIRECTION_LEFT:
return WLR_DIRECTION_RIGHT;
}
assert(false);
return 0;
}
static void restore_workspaces(struct sway_output *output) {
// Workspace output priority
for (int i = 0; i < root->outputs->length; i++) {

35
sway/tree/root.c
View file

@ -169,6 +169,41 @@ struct pid_workspace {
static struct wl_list pid_workspaces;
/**
* Get the pid of a parent process given the pid of a child process.
*
* Returns the parent pid or NULL if the parent pid cannot be determined.
*/
static pid_t get_parent_pid(pid_t child) {
pid_t parent = -1;
char file_name[100];
char *buffer = NULL;
char *token = NULL;
const char *sep = " ";
FILE *stat = NULL;
size_t buf_size = 0;
sprintf(file_name, "/proc/%d/stat", child);
if ((stat = fopen(file_name, "r"))) {
if (getline(&buffer, &buf_size, stat) != -1) {
token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid
parent = strtol(token, NULL, 10);
}
free(buffer);
fclose(stat);
}
if (parent) {
return (parent == child) ? -1 : parent;
}
return -1;
}
struct sway_workspace *root_workspace_for_pid(pid_t pid) {
if (!pid_workspaces.prev && !pid_workspaces.next) {
wl_list_init(&pid_workspaces);

3
swaybar/meson.build
View file

@ -16,8 +16,7 @@ swaybar_deps = [
pangocairo,
rt,
wayland_client,
wayland_cursor,
wlroots,
wayland_cursor
]
if have_tray
if systemd.found()

4
swaybg/meson.build
View file

@ -7,11 +7,9 @@ executable(
client_protos,
gdk_pixbuf,
jsonc,
math,
pango,
pangocairo,
wayland_client,
wlroots,
wayland_client
],
link_with: [lib_sway_common, lib_sway_client],
install: true

2
swaymsg/meson.build
View file

@ -2,7 +2,7 @@ executable(
'swaymsg',
'main.c',
include_directories: [sway_inc],
dependencies: [jsonc, wlroots],
dependencies: [jsonc],
link_with: [lib_sway_common],
install: true
)

2
swaynag/meson.build
View file

@ -11,12 +11,10 @@ executable(
cairo,
client_protos,
gdk_pixbuf,
math,
pango,
pangocairo,
wayland_client,
wayland_cursor,
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
install: true