Merge pull request #17 from jszczerbinsky/dev

v1.4

Author: jszczerbinsky

Makefile

@@ -7,7 +7,7 @@ default:
 	mkdir -p build/etc
 	gcc main.c window.c parser.c debug.c -lSDL2 -lX11 -o build/usr/bin/lwp
 	cp -R wallpapers build/usr/share/lwp
-	cp default.cfg build/etc
+	cp default.cfg build/etc/lwp.cfg
 	cp LICENSE build/usr/share/lwp
 install:
 	cp -R build/* /

default.cfg

@@ -5,16 +5,41 @@
 # ███████╗╚███╔███╔╝██║     
 # ╚══════╝ ╚══╝╚══╝ ╚═╝     
 
+# Path to wallpaper directory
 path=/usr/share/lwp/wallpapers/test
+
+# Wallpaper layers count
 count=3
 
+# If You are using a compositor, or lwp window deosn't show,
+# try setting this to 1
+reload_rootwindow=0
+
+# Movement smoothness
 smooth=8
-movementX = 0.05
-movementY = 0.05
 
+# Movement sensitivity:
+movementX=0.05
+movementY=0.05
+
+# You can also set movement sensitivity for a specific layer
+# Here is an example of setting movement in X axis for the 2nd one
+# movementX_2=0.08
+
+# Monitors count
 monitors=1
 
+# Monitor position and resolution
 monitor1_x=0
 monitor1_y=0
 monitor1_w=1920
 monitor1_h=1080
+
+# If Your wallpaper has different resolution than Your monitor
+# You can set wallpaper's resolution and position relative to monitor
+# Overflowing parts of the wallpaper will be cropped
+# monitor1_render_x=0
+# monitor1_render_y=0
+# monitor1_render_w=1920
+# monitor1_render_h=1080
+

defaultWin.cfg

@@ -5,16 +5,38 @@
 # ███████╗╚███╔███╔╝██║     
 # ╚══════╝ ╚══╝╚══╝ ╚═╝     
 
+# Path to wallpaper directory
+# Set empty value to use default wallpaper
 path=
+
+# Wallpaper layers count
 count=3
 
+# Movement smoothness
 smooth=8
-movementX = 0.05
-movementY = 0.05
 
+# Movement sensitivity:
+movementX=0.05
+movementY=0.05
+
+# You can also set movement sensitivity for a specific layer
+# Here is an example of setting movement in X axis for the 2nd one
+# movementX_2=0.08
+
+# Monitors count
 monitors=1
 
+# Monitor position and resolution
 monitor1_x=0
 monitor1_y=0
 monitor1_w=1920
 monitor1_h=1080
+
+# If Your wallpaper has different resolution than Your monitor
+# You can set wallpaper's resolution and position relative to monitor
+# Overflowing parts of the wallpaper will be cropped
+# monitor1_render_x=-100
+# monitor1_render_y=-40
+# monitor1_render_w=2500
+# monitor1_render_h=1200
+

main.c

@@ -8,15 +8,15 @@ App app;
 
 int lerp(int a, int b, float t) { return (int)((float)a + (float)t * ((float)b - (float)a)); }
 
-void init()
+void init(Config *cfg)
 {
   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) != 0) SDL_Log("%s", SDL_GetError());
 
 #ifndef __WIN32
   app.display = XOpenDisplay(NULL);
 #endif
 
-  initWindow();
+  initWindow(&app, cfg);
 
   app.renderer =
       SDL_CreateRenderer(app.window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
   Instance     instances[cfg.monitors];
   SDL_Texture *tex[cfg.count];
 
-  init();
+  init(&cfg);
 
   if (!loadTextures(&cfg, tex)) return 1;
 
@@ -86,12 +86,11 @@ int main(int argc, char *argv[])
     instances[i].buffTex =
         SDL_CreateTexture(app.renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET,
                           instances[i].dest.w, instances[i].dest.h);
+    instances[i].finalTex =
+        SDL_CreateTexture(app.renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET,
+                          instances[i].finalDest.w, instances[i].finalDest.h);
   }
 
-#ifndef __WIN32
-  SDL_SetRelativeMouseMode(SDL_TRUE);
-#endif
-
   SDL_Event event;
   int       quit = 0;
 
@@ -114,34 +113,35 @@ int main(int argc, char *argv[])
     GetCursorPos(&mPos);
     mx = mPos.x;
     my = mPos.y;
+#else
+    SDL_GetGlobalMouseState(&mx, &my);
 #endif
 
     while (SDL_PollEvent(&event))
-    {
       if (event.type == SDL_QUIT) quit = 1;
-#ifndef __WIN32
-      else if (event.type == SDL_MOUSEMOTION)
-      {
-        mx = event.motion.x;
-        my = event.motion.y;
-      }
-#endif
-    }
 
     currentX = lerp(currentX, mx, dT * cfg.smooth);
     currentY = lerp(currentY, my, dT * cfg.smooth);
 
     for (int u = 0; u < cfg.monitors; u++)
     {
+      int relativeCurrentX = currentX - instances[u].finalDest.x;
+      int relativeCurrentY = currentY - instances[u].finalDest.y;
+
+      if (relativeCurrentX < 0) relativeCurrentX = 0;
+      if (relativeCurrentY < 0) relativeCurrentY = 0;
+      if (relativeCurrentX > instances[u].finalDest.w) relativeCurrentX = instances[u].finalDest.w;
+      if (relativeCurrentY > instances[u].finalDest.y) relativeCurrentY = instances[u].finalDest.h;
+
       SDL_SetRenderTarget(app.renderer, instances[u].buffTex);
       SDL_RenderClear(app.renderer);
 
       for (int i = 0; i < cfg.count; i++)
       {
         SDL_Rect src = {.x = 0, .y = 0, .w = app.srcWidth, .h = app.srcHeight};
 
-        int x = -((currentX - instances[u].dest.w / 2) * layerMovX[i]) * i;
-        int y = -((currentY - instances[u].dest.h / 2) * layerMovY[i]) * i;
+        int x = -((relativeCurrentX - instances[u].dest.w / 2) * layerMovX[i]);
+        int y = -((relativeCurrentY - instances[u].dest.h / 2) * layerMovY[i]);
 
         for (int j = -1; j <= 1; j++)
         {
@@ -154,17 +154,36 @@ int main(int argc, char *argv[])
         }
       }
 
-      SDL_SetRenderTarget(app.renderer, NULL);
-      SDL_Rect src = {.x = 0, .y = 0, .w = instances[u].dest.w, .h = instances[u].dest.h};
+      SDL_SetRenderTarget(app.renderer, instances[u].finalTex);
+      SDL_Rect src = {
+          .x = 0,
+          .y = 0,
+          .w = instances[u].dest.w,
+          .h = instances[u].dest.h,
+      };
 
       SDL_RenderCopy(app.renderer, instances[u].buffTex, &src, &instances[u].dest);
+
+      SDL_SetRenderTarget(app.renderer, NULL);
+      SDL_Rect finalSrc = {
+          .x = 0,
+          .y = 0,
+          .w = instances[u].finalDest.w,
+          .h = instances[u].finalDest.h,
+      };
+
+      SDL_RenderCopy(app.renderer, instances[u].finalTex, &finalSrc, &instances[u].finalDest);
     }
     SDL_RenderPresent(app.renderer);
     SDL_Delay(1000 / 60);
   }
 
   for (int i = 0; i < cfg.count; i++) SDL_DestroyTexture(tex[i]);
-  for (int i = 0; i < cfg.monitors; i++) SDL_DestroyTexture(instances[i].buffTex);
+  for (int i = 0; i < cfg.monitors; i++)
+  {
+    SDL_DestroyTexture(instances[i].buffTex);
+    SDL_DestroyTexture(instances[i].finalTex);
+  }
 #ifndef __WIN32
   XCloseDisplay(app.display);
 #endif

main.h

@@ -3,33 +3,34 @@
 
 #include <SDL2/SDL.h>
 #ifdef __WIN32
-	#include <windows.h>
-	#include <stdio.h>
-	#include <SDL2/SDL_syswm.h>
+#include <SDL2/SDL_syswm.h>
+#include <stdio.h>
+#include <windows.h>
 #else
-	#include <X11/Xlib.h>
-	#include <linux/limits.h>
-	#include <unistd.h>
-	#include <pwd.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <linux/limits.h>
+#include <pwd.h>
+#include <unistd.h>
 #endif
 
 typedef struct
 {
-	SDL_Rect dest;
-	SDL_Texture *buffTex;
+  SDL_Rect     dest;
+  SDL_Texture *buffTex;
+  SDL_Rect     finalDest;
+  SDL_Texture *finalTex;
 } Instance;
 
 typedef struct
 {
-	int srcWidth;
-	int srcHeight;
-	SDL_Window *window;
-	SDL_Renderer *renderer;
-	#ifndef __WIN32
-		Display *display;
-	#endif
+  int           srcWidth;
+  int           srcHeight;
+  SDL_Window   *window;
+  SDL_Renderer *renderer;
+#ifndef __WIN32
+  Display *display;
+#endif
 } App;
 
-extern App app;
-
 #endif

parser.c

@@ -125,15 +125,22 @@ int findLine(const char *name, int type, void *output)
 
 int parseConfig(Config *cfg)
 {
-  const char *names[] = {"path", "monitors", "count", "smooth", "movementX", "movementY"};
+  const char *names[] = {
+      "path", "monitors", "count", "smooth", "movementX", "movementY", "reload_rootwindow",
+  };
 
-  const int types[] = {TYPE_STR, TYPE_INT, TYPE_INT, TYPE_FLOAT, TYPE_FLOAT, TYPE_FLOAT};
+  const int types[] = {TYPE_STR, TYPE_INT, TYPE_INT, TYPE_FLOAT, TYPE_FLOAT, TYPE_FLOAT, TYPE_INT};
 
   void *outputs[] = {
-      cfg->path, &cfg->monitors, &cfg->count, &cfg->smooth, &cfg->movementX, &cfg->movementY,
+      cfg->path,       &cfg->monitors,  &cfg->count,         &cfg->smooth,
+      &cfg->movementX, &cfg->movementY, &cfg->reloadRootWnd,
   };
 
+#ifdef __WIN32
   for (int i = 0; i < 6; i++)
+#else
+  for (int i = 0; i < 7; i++)  // ignore reload_rootwindow on Windows
+#endif
   {
     if (!findLine(names[i], types[i], outputs[i]))
     {
@@ -157,13 +164,22 @@ int parseConfig(Config *cfg)
 
 void parseInstancesConfig(Instance *instances, int instancesCount)
 {
-  char str[15];
+  char str[35];
 
   const char *paramStr[] = {"_x", "_y", "_w", "_h"};
 
+  const char *renderParamStr[] = {"_render_x", "_render_y", "_render_w", "_render_h"};
+
   for (int i = 0; i < instancesCount; i++)
   {
     int *outputPtr[] = {
+        &instances[i].finalDest.x,
+        &instances[i].finalDest.y,
+        &instances[i].finalDest.w,
+        &instances[i].finalDest.h,
+    };
+
+    int *renderOutputPtr[] = {
         &instances[i].dest.x,
         &instances[i].dest.y,
         &instances[i].dest.w,
@@ -176,6 +192,24 @@ void parseInstancesConfig(Instance *instances, int instancesCount)
       if (!findLine(str, TYPE_INT, outputPtr[p]))
         lwpLog(LOG_ERROR, "Can't find line '%s' in config", str);
     }
+    for (int p = 0; p < 4; p++)
+    {
+      sprintf(str, "monitor%d%s", i + 1, renderParamStr[p]);
+      if (!findLine(str, TYPE_INT, renderOutputPtr[p]))
+      {
+        if (p > 1)
+        {
+          lwpLog(LOG_WARNING,
+                 "Can't find line '%s' in config, setting the same value as the monitor size", str);
+          *(renderOutputPtr[p]) = *(outputPtr[p]);
+        }
+        else
+        {
+          lwpLog(LOG_WARNING, "Can't find line '%s' in config, setting the value to 0", str);
+          *(renderOutputPtr[p]) = 0;
+        }
+      }
+    }
   }
 }
 
@@ -187,8 +221,8 @@ void parsePerLayerMovements(float *layerMovX, float *layerMovY, int count, float
   for (int i = 0; i < count; i++)
   {
     sprintf(str, "movementX_%d", i + 1);
-    if (!findLine(str, TYPE_FLOAT, layerMovX + i)) layerMovX[i] = defaultValX;
+    if (!findLine(str, TYPE_FLOAT, layerMovX + i)) layerMovX[i] = defaultValX * i;
     sprintf(str, "movementY_%d", i + 1);
-    if (!findLine(str, TYPE_FLOAT, layerMovY + i)) layerMovY[i] = defaultValY;
+    if (!findLine(str, TYPE_FLOAT, layerMovY + i)) layerMovY[i] = defaultValY * i;
   }
 }

parser.h

@@ -11,6 +11,7 @@ typedef struct
   float movementY;
   int   monitors;
   int   count;
+  int   reloadRootWnd;
 } Config;
 
 void openConfig();