*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
*
*/
#include <xcb/xcb.h>
+#include <xcb/randr.h>
#include <xcb/xcb_atom.h>
#include <stdbool.h>
*
* Let’s start from the biggest to the smallest:
*
- * - An i3Screen is a virtual screen (Xinerama). This can be a single one,
- * though two monitors might be connected, if you’re running clone
- * mode. There can also be multiple of them.
+ * - An Output is a physical output on your graphics driver. Outputs which
+ * are currently in use have (output->active == true). Each output has a
+ * position and a mode. An output usually corresponds to one connected
+ * screen (except if you are running multiple screens in clone mode).
*
- * - Each i3Screen contains Workspaces. The concept is known from various
+ * - Each Output contains Workspaces. The concept is known from various
* other window managers. Basically, a workspace is a specific set of
* windows, usually grouped thematically (irc, www, work, …). You can switch
* between these.
typedef struct Binding Binding;
typedef struct Workspace Workspace;
typedef struct Rect Rect;
-typedef struct Screen i3Screen;
+typedef struct xoutput Output;
/******************************************************************************
* Helper types
* It needs to be packed so that the compiler will not add any padding bytes.
* (it is used in src/ewmh.c for example)
*
+ * Note that x and y can contain signed values in some cases (for example when
+ * used for the coordinates of a window, which can be set outside of the
+ * visible area, but not when specifying the position of a workspace for the
+ * _NET_WM_WORKAREA hint). Not declaring x/y as int32_t saves us a lot of
+ * typecasts.
+ *
*/
struct Rect {
uint32_t x;
* appended) */
TAILQ_HEAD(floating_clients_head, Client) floating_clients;
- /** Backpointer to the screen this workspace is on */
- i3Screen *screen;
+ /** Backpointer to the output this workspace is on */
+ Output *output;
/** This is a two-dimensional dynamic array of
* Container-pointers. I’ve always wanted to be a three-star
* in. If set to true, legacy window names are ignored. */
bool uses_net_wm_name;
- /** Holds the WM_CLASS, useful for matching the client in commands */
- char *window_class;
+ /** Holds the WM_CLASS (which consists of two strings, the instance
+ * and the class), useful for matching the client in commands */
+ char *window_class_instance;
+ char *window_class_class;
/** Holds the client’s mark, for vim-like jumping */
char *mark;
};
/**
- * This is a virtual screen (Xinerama). This can be a single one, though two
- * monitors might be connected, if you’re running clone mode. There can also
- * be multiple of them.
+ * An Output is a physical output on your graphics driver. Outputs which
+ * are currently in use have (output->active == true). Each output has a
+ * position and a mode. An output usually corresponds to one connected
+ * screen (except if you are running multiple screens in clone mode).
*
*/
-struct Screen {
- /** Virtual screen number */
- int num;
+struct xoutput {
+ /** Output id, so that we can requery the output directly later */
+ xcb_randr_output_t id;
+ /** Name of the output */
+ char *name;
+
+ /** Whether the output is currently (has a CRTC attached with a valid
+ * mode) */
+ bool active;
/** Current workspace selected on this virtual screen */
Workspace *current_workspace;
* _NET_WM_WINDOW_TYPE_DOCK */
SLIST_HEAD(dock_clients_head, Client) dock_clients;
- TAILQ_ENTRY(Screen) screens;
+ TAILQ_ENTRY(xoutput) outputs;
};
#endif