Fix parsing of shadow-exclude-reg

Closes #13 Signed-off-by: Yuxuan Shui <[email protected]>
tryone144 · Oct 3, 2018 · 9e1422d · 9e1422d
1 parent f1872c4
commit 9e1422d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/config.c b/src/config.c
@@ -213,7 +213,7 @@ parse_geometry(session_t *ps, const char *src, region_t *dest) {
   if (!ps->root_width || !ps->root_height)
     return true;
 
-  geometry_t geom = { .wid = -1, .hei = -1, .x = -1, .y = -1 };
+  geometry_t geom = { .wid = ps->root_width, .hei = ps->root_height, .x = 0, .y = 0 };
   long val = 0L;
   char *endptr = NULL;
 
@@ -225,7 +225,8 @@ parse_geometry(session_t *ps, const char *src, region_t *dest) {
   // Must be base 10, because "0x0..." may appear
   if (!('+' == *src || '-' == *src)) {
     val = strtol(src, &endptr, 10);
-    if (endptr && src != endptr) {
+    assert(endptr);
+    if (src != endptr) {
       geom.wid = val;
       if (geom.wid < 0) {
         printf_errf("(\"%s\"): Invalid width.", src);
@@ -240,7 +241,8 @@ parse_geometry(session_t *ps, const char *src, region_t *dest) {
   if ('x' == *src) {
     ++src;
     val = strtol(src, &endptr, 10);
-    if (endptr && src != endptr) {
+    assert(endptr);
+    if (src != endptr) {
       geom.hei = val;
       if (geom.hei < 0) {
         printf_errf("(\"%s\"): Invalid height.", src);