aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshay Nair <phenax5@gmail.com>2020-06-21 15:52:00 +0530
committerAkshay Nair <phenax5@gmail.com>2020-06-21 15:52:00 +0530
commit900c5a3a955324aad6035c499003b16bbdd0d96c (patch)
treeac4ea76dae0808f53f438c6966228f04b883bc16
parent9157b99be306edd80dab87e56f187d6168271f09 (diff)
downloadshotkey-900c5a3a955324aad6035c499003b16bbdd0d96c.tar.gz
shotkey-900c5a3a955324aad6035c499003b16bbdd0d96c.zip
Fixes style issues
-rw-r--r--config.h10
-rw-r--r--shotkey.c34
2 files changed, 23 insertions, 21 deletions
diff --git a/config.h b/config.h
index 9de947a..ebab43c 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
// Shell
-static char shell[] = "/bin/sh";
+char shell[] = "/bin/sh";
#define Super Mod4Mask
@@ -13,7 +13,7 @@ enum {
// Define mode key bindings here
// NOTE: "10" here is the maximum number of key bindings for each mode
-static Key modes[MODE_SIZE][10] = {
+Key modes[MODE_SIZE][10] = {
[Music] = {
{ 0, XK_m, cmd("notify-send inside_music") },
},
@@ -24,17 +24,17 @@ static Key modes[MODE_SIZE][10] = {
};
// Define normal mode key bindings here
-static Key keys[] = {
+Key keys[] = {
{ Super|ShiftMask, XK_y, cmd("notify-send hello") },
{ Super|ShiftMask, XK_z, mode(Music, False) },
{ Super|ShiftMask, XK_x, mode(Bright, True) },
};
-static ModeProperties mode_properties[MODE_SIZE] = {
+ModeProperties mode_properties[MODE_SIZE] = {
[Music] = { "Music player" },
[Bright] = { "Brightness" },
};
// Call this script on mode change
-static char* on_mode_change = "notify-send \"kadj [$SHOTKEY_MODE_ID] $SHOTKEY_MODE_LABEL\"";
+char* on_mode_change = "notify-send \"kadj [$SHOTKEY_MODE_ID] $SHOTKEY_MODE_LABEL\"";
diff --git a/shotkey.c b/shotkey.c
index 3df41ce..6c9ed65 100644
--- a/shotkey.c
+++ b/shotkey.c
@@ -3,7 +3,6 @@
#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <unistd.h>
typedef struct Command {
char* command;
@@ -57,18 +56,21 @@ int error_handler(Display *disp, XErrorEvent *xe) {
}
void spawn(char** command) {
- if (fork() == 0) {
- setsid();
- execve(command[0], command, environ);
- fprintf(stderr, "shotkey: execve %s", command[0]);
- perror(" failed");
- exit(0);
- }
+ if (fork() == 0) {
+ setsid();
+ execve(command[0], command, environ);
+ fprintf(stderr, "shotkey: execve %s", command[0]);
+ perror(" failed");
+ exit(0);
+ }
}
char* get_mode_label() {
- if (current_mode == NormalMode) return "";
- if (LENGTH(mode_properties) <= current_mode) return "";
+ if (current_mode == NormalMode)
+ return "";
+ if (LENGTH(mode_properties) <= current_mode)
+ return "";
+
ModeProperties props = mode_properties[current_mode];
return props.label;
}
@@ -99,7 +101,7 @@ void run(Display* dpy, Window win, Command command) {
if (command.command) {
char* cmd[] = {shell, "-c", command.command, NULL};
spawn(cmd);
- } else if(command.mode != NormalMode) {
+ } else if (command.mode != NormalMode) {
// Bind keyboard for mode
XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
@@ -171,13 +173,13 @@ int main() {
handle_mode_change();
- /* main event loop */
+ /* main event loop */
XEvent ev;
- XSync(dpy, False);
- while (running) {
+ XSync(dpy, False);
+ while (running) {
XMaskEvent(dpy, KeyPressMask, &ev);
- switch (ev.type) {
+ switch (ev.type) {
case KeyPress: {
keypress(dpy, root, &ev.xkey);
break;
@@ -185,6 +187,6 @@ int main() {
}
}
- XCloseDisplay(dpy);
+ XCloseDisplay(dpy);
}