mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SirCmpwn/sway 

merging
This commit is contained in:
taiyu 2015-08-20 05:08:04 -07:00
parent f5fde7c45c 95f5660897
commit 927ef0a5ec
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sway/container.c
View File

@ -66,7 +66,7 @@ swayc_t *new_output(wlc_handle handle) {
output->height = size->h; output->height = size->h;
output->handle = handle; output->handle = handle;
output->name = name ? strdup(name) : NULL; output->name = name ? strdup(name) : NULL;
output->gaps = config->gaps_outer; output->gaps = config->gaps_outer + config->gaps_inner / 2;
add_child(&root_container, output); add_child(&root_container, output);

15
sway/handlers.c
View File

@ -286,13 +286,6 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers, static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers,
uint32_t key, uint32_t sym, enum wlc_key_state state) { uint32_t key, uint32_t sym, enum wlc_key_state state) {
static const uint32_t modifier_syms[] = {
XKB_KEY_Shift_L, XKB_KEY_Shift_R, XKB_KEY_Control_L, XKB_KEY_Control_R,
XKB_KEY_Caps_Lock, XKB_KEY_Shift_Lock, XKB_KEY_Meta_L, XKB_KEY_Meta_R,
XKB_KEY_Alt_L, XKB_KEY_Alt_R, XKB_KEY_Super_L, XKB_KEY_Super_R,
XKB_KEY_Hyper_L, XKB_KEY_Hyper_R
};
if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) { if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) {
return false; return false;
} }
@ -316,14 +309,6 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
sym = tolower(sym); sym = tolower(sym);
int i; int i;
bool mod = false;
for (i = 0; i < sizeof(modifier_syms) / sizeof(uint32_t); ++i) {
if (modifier_syms[i] == sym) {
mod = true;
break;
}
}
if (state == WLC_KEY_STATE_PRESSED) { if (state == WLC_KEY_STATE_PRESSED) {
press_key(sym); press_key(sym);

8
sway/layout.c
View File

@ -152,12 +152,12 @@ void arrange_windows(swayc_t *container, int width, int height) {
{ {
struct wlc_geometry geometry = { struct wlc_geometry geometry = {
.origin = { .origin = {
.x = container->x + container->gaps, .x = container->x + container->gaps / 2,
.y = container->y + container->gaps .y = container->y + container->gaps / 2
}, },
.size = { .size = {
.w = width - container->gaps * 2, .w = width - container->gaps,
.h = height - container->gaps * 2 .h = height - container->gaps
} }
}; };
if (wlc_view_get_state(container->handle) & WLC_BIT_FULLSCREEN) { if (wlc_view_get_state(container->handle) & WLC_BIT_FULLSCREEN) {