ceos/cagebreak
1
0
Fork 0
mirror of https://cagebreak.project-repo.co/cagebreak.git synced 2026-08-26 23:44:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse source
This commit is contained in:
project-repo 2023-02-02 20:42:33 +01:00
commit 2dc27c4b21
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
keybinding.c
View file

@ -699,18 +699,20 @@ keybinding_cycle_views(struct cg_server *server, bool reverse, bool ipc) {
seat_set_focus(server->seat, next_view);
if(ipc) {
int curr_id=-1;
int curr_pid=-1;
if(current_view!=NULL && current_view->link.next != curr_workspace->views.next) {
curr_id=current_view->id;
curr_pid=current_view->impl->get_pid(current_view);
}
ipc_send_event(
curr_workspace->output->server,
"{\"event_name\":\"cycle_views\",\"old_view_id\":%d,\"old_view_"
"pid\":%d,"
"\"new_view_id\":%d,\"new_view_pid\":%d,\"tile_id\":%d,"
"\"workspace\":%d,\"output\":\"%s\",\"output_id\":%d}",
current_view->link.next == curr_workspace->views.next
? -1
: (int)current_view->id,
current_view->link.next == curr_workspace->views.next
? -1
: (int)current_view->impl->get_pid(current_view),
curr_id,
curr_pid,
next_view == NULL ? -1 : (int)next_view->id,
next_view == NULL ? -1 : (int)next_view->impl->get_pid(next_view),
next_view->tile->id, curr_workspace->num + 1,

8
seat.c
View file

@ -214,8 +214,10 @@ handle_command_key_bindings(struct cg_server *server, xkb_keysym_t sym,
wlr_scene_buffer_from_node(node));
if(scene_surface != NULL) {
surface = scene_surface->surface;
if(surface!=NULL) {
wlr_seat_pointer_notify_enter(wlr_seat, surface, sx, sy);
}
}
wlr_seat_pointer_notify_enter(wlr_seat, surface, sx, sy);
}
}
}
@ -701,8 +703,10 @@ process_cursor_motion(struct cg_seat *seat, uint32_t time) {
wlr_scene_surface_from_buffer(wlr_scene_buffer_from_node(node));
if(scene_surface != NULL) {
surface = scene_surface->surface;
if(surface!=NULL) {
wlr_seat_pointer_notify_enter(wlr_seat, surface, sx, sy);
}
}
wlr_seat_pointer_notify_enter(wlr_seat, surface, sx, sy);
bool focus_changed = wlr_seat->pointer_state.focused_surface != surface;
if(!focus_changed && time > 0) {