Merge branch 'master' into next

[i3/i3] / include / scratchpad.h

diff --git a/include/scratchpad.h b/include/scratchpad.h
index 4fb7523a0bf4df581c25c2831d23380a774ce4e2..1aca73bda56ce466932628b0a5466b363fa3a41d 100644 (file)
--- a/include/scratchpad.h
+++ b/include/scratchpad.h
@@ -7,8 +7,7 @@
  * scratchpad.c: Scratchpad functions (TODO: more description)
  *
  */
-#ifndef _SCRATCHPAD_H
-#define _SCRATCHPAD_H
+#pragma once
 
 /**
  * Moves the specified window to the __i3_scratch workspace, making it floating
@@ -30,4 +29,12 @@ void scratchpad_move(Con *con);
  */
 void scratchpad_show(Con *con);
 
-#endif
+/**
+ * When starting i3 initially (and after each change to the connected outputs),
+ * this function fixes the resolution of the __i3 pseudo-output. When that
+ * resolution is not set to a function which shares a common divisor with every
+ * active output’s resolution, floating point calculation errors will lead to
+ * the scratchpad window moving when shown repeatedly.
+ *
+ */
+void scratchpad_fix_resolution(void);