swc

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.nihaljere.xyz/swc
Log | Files | Refs | README | LICENSE

commit 9df1eb09fe6947cb334288fd8c47805c35aad1b9
parent b0ef818bf74c474d4ddead011768d95c4e8fe6f2
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 23 Apr 2014 18:51:10 -0700

xserver, xwm: Drop swc_ prefix for internal functions

Diffstat:
Mlibswc/swc.c | 4++--
Mlibswc/xserver.c | 10+++++-----
Mlibswc/xserver.h | 6+++---
Mlibswc/xwm.c | 6+++---
Mlibswc/xwm.h | 6+++---
5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libswc/swc.c b/libswc/swc.c @@ -156,7 +156,7 @@ bool swc_initialize(struct wl_display * display, } #ifdef ENABLE_XWAYLAND - if (!swc_xserver_initialize()) + if (!xserver_initialize()) { ERROR("Could not initialize xwayland\n"); goto error10; @@ -197,7 +197,7 @@ EXPORT void swc_finalize() { #ifdef ENABLE_XWAYLAND - swc_xserver_finalize(); + xserver_finalize(); #endif panel_manager_finalize(); swc_shell_finalize(); diff --git a/libswc/xserver.c b/libswc/xserver.c @@ -65,7 +65,7 @@ static void set_window_id(struct wl_client * client, { struct swc_surface * surface = wl_resource_get_user_data(surface_resource); - swc_xwm_manage_window(id, surface); + xwm_manage_window(id, surface); } const static struct xserver_interface xserver_implementation = { @@ -201,7 +201,7 @@ static void bind_xserver(struct wl_client * client, void * data, /* Need to flush the xserver client so the X window manager can connect to * it's socket. */ wl_client_flush(xserver.client); - swc_xwm_initialize(sv[0]); + xwm_initialize(sv[0]); xserver_send_listen_socket(xserver.resource, xserver.abstract_socket); xserver_send_listen_socket(xserver.resource, xserver.unix_socket); @@ -265,7 +265,7 @@ static bool start_xserver() return false; } -bool swc_xserver_initialize() +bool xserver_initialize() { xserver.global = wl_global_create(swc.display, &xserver_interface, 1, NULL, &bind_xserver); @@ -284,9 +284,9 @@ bool swc_xserver_initialize() return false; } -void swc_xserver_finalize() +void xserver_finalize() { - swc_xwm_finalize(); + xwm_finalize(); close_display(); wl_global_destroy(xserver.global); } diff --git a/libswc/xserver.h b/libswc/xserver.h @@ -1,6 +1,6 @@ /* swc: libswc/xserver.h * - * Copyright (c) 2013 Michael Forney + * Copyright (c) 2013, 2014 Michael Forney * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,8 +26,8 @@ #include <stdbool.h> -bool swc_xserver_initialize(); -void swc_xserver_finalize(); +bool xserver_initialize(); +void xserver_finalize(); #endif diff --git a/libswc/xwm.c b/libswc/xwm.c @@ -170,7 +170,7 @@ static int connection_data(int fd, uint32_t mask, void * data) return count; } -bool swc_xwm_initialize(int fd) +bool xwm_initialize(int fd) { const xcb_setup_t * setup; xcb_screen_iterator_t screen_iterator; @@ -263,7 +263,7 @@ bool swc_xwm_initialize(int fd) return false; } -void swc_xwm_finalize() +void xwm_finalize() { wl_event_source_remove(xwm.source); xcb_ewmh_connection_wipe(&xwm.ewmh); @@ -314,7 +314,7 @@ static void handle_surface_destroy(struct wl_listener * listener, void * data) wl_list_insert(&xwm.unpaired_windows, &xwl_window->link); } -void swc_xwm_manage_window(xcb_window_t id, struct swc_surface * surface) +void xwm_manage_window(xcb_window_t id, struct swc_surface * surface) { struct xwl_window * xwl_window; xcb_get_geometry_cookie_t geometry_cookie; diff --git a/libswc/xwm.h b/libswc/xwm.h @@ -29,10 +29,10 @@ struct swc_surface; -bool swc_xwm_initialize(int fd); -void swc_xwm_finalize(); +bool xwm_initialize(int fd); +void xwm_finalize(); -void swc_xwm_manage_window(xcb_window_t window, struct swc_surface * surface); +void xwm_manage_window(xcb_window_t window, struct swc_surface * surface); #endif