nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nagbar: Remove i3-nagbar.h

This commit is contained in:
Orestis Floros 2020-04-19 11:14:20 +02:00
parent 0b62129224
commit 2954125324
No known key found for this signature in database
GPG Key ID: A09DBD7D3222C1C3
4 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -379,7 +379,6 @@ i3_nagbar_i3_nagbar_LDADD = \
i3_nagbar_i3_nagbar_SOURCES = \ i3_nagbar_i3_nagbar_SOURCES = \
i3-nagbar/atoms.xmacro \ i3-nagbar/atoms.xmacro \
i3-nagbar/i3-nagbar.h \
i3-nagbar/main.c i3-nagbar/main.c
i3bar_i3bar_CPPFLAGS = \ i3bar_i3bar_CPPFLAGS = \

1
i3-config-wizard/main.c
View File

@ -9,6 +9,7 @@
* *
*/ */
#include <config.h> #include <config.h>
#include "libi3.h"
#include "libi3.h" #include "libi3.h"

18
i3-nagbar/i3-nagbar.h
View File

@ -1,18 +0,0 @@
#pragma once
#include <config.h>
#include <err.h>
#define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
#define FREE(pointer) \
do { \
free(pointer); \
pointer = NULL; \
} while (0)
#define xmacro(atom) xcb_atom_t A_##atom;
#include "atoms.xmacro"
#undef xmacro
extern xcb_window_t root;

22
i3-nagbar/main.c
View File

@ -8,15 +8,15 @@
* when the user has an error in their configuration file. * when the user has an error in their configuration file.
* *
*/ */
#include <config.h>
#include "libi3.h"
#include <err.h> #include <err.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>
#include <limits.h> #include <limits.h>
#include <paths.h> #include <paths.h>
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -28,14 +28,10 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_aux.h> #include <xcb/xcb_aux.h>
#include <xcb/xcb_cursor.h> #include <xcb/xcb_cursor.h>
#include <xcb/xcb_event.h>
xcb_visualtype_t *visual_type = NULL; xcb_visualtype_t *visual_type = NULL;
#include "libi3.h"
#define SN_API_NOT_YET_FROZEN 1 #define SN_API_NOT_YET_FROZEN 1
#include "i3-nagbar.h"
#include <libsn/sn-launchee.h> #include <libsn/sn-launchee.h>
#define MSG_PADDING logical_px(8) #define MSG_PADDING logical_px(8)
@ -45,6 +41,12 @@ xcb_visualtype_t *visual_type = NULL;
#define CLOSE_BTN_GAP logical_px(15) #define CLOSE_BTN_GAP logical_px(15)
#define BAR_BORDER logical_px(2) #define BAR_BORDER logical_px(2)
#define xmacro(atom) xcb_atom_t A_##atom;
#include "atoms.xmacro"
#undef xmacro
#define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
static char *argv0 = NULL; static char *argv0 = NULL;
typedef struct { typedef struct {
@ -314,8 +316,8 @@ static xcb_rectangle_t get_window_position(void) {
goto free_resources; goto free_resources;
free_resources: free_resources:
FREE(res); free(res);
FREE(primary); free(primary);
return result; return result;
} }
@ -598,7 +600,7 @@ int main(int argc, char *argv[]) {
free(event); free(event);
} }
FREE(pattern); free(pattern);
draw_util_surface_free(conn, &bar); draw_util_surface_free(conn, &bar);
return 0; return 0;