New setting: merge_overlapping_monitors

[bspwm.git] / types.h

diff --git a/types.h b/types.h
index 4333e74a3486d958e0821a6cad9e0a960d088aa4..6c577133949dced3648f35e67d1272c9bc75edfa 100644 (file)
--- a/types.h
+++ b/types.h
@@ -1,16 +1,15 @@
-/*
- * Copyright (c) 2012-2014, Bastien Dejean
+/* Copyright (c) 2012-2014, Bastien Dejean
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -21,7 +20,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those
  * of the authors and should not be interpreted as representing official policies,
  * either expressed or implied, of the FreeBSD Project.
@@ -61,11 +60,17 @@ typedef enum {
        CLIENT_CLASS_DIFFER
 } client_class_t;
 
+typedef enum {
+       CLIENT_MODE_ALL,
+       CLIENT_MODE_AUTOMATIC,
+       CLIENT_MODE_MANUAL
+} client_mode_t;
+
 typedef struct {
        client_type_t type;
        client_class_t class;
+       client_mode_t mode;
        bool urgent;
-       bool manual;
        bool local;
 } client_select_t;
 
@@ -148,8 +153,8 @@ typedef struct {
 
 typedef struct {
        xcb_window_t window;
-       char class_name[SMALEN];
-       char instance_name[SMALEN];
+       char class_name[3 * SMALEN / 2];
+       char instance_name[3 * SMALEN / 2];
        unsigned int border_width;
        bool pseudo_tiled;
        bool floating;
@@ -260,11 +265,12 @@ struct rule_t {
 };
 
 typedef struct {
-       char class_name[SMALEN];
-       char instance_name[SMALEN];
+       char class_name[3 * SMALEN / 2];
+       char instance_name[3 * SMALEN / 2];
        char monitor_desc[MAXLEN];
        char desktop_desc[MAXLEN];
        char node_desc[MAXLEN];
+       char split_dir[SMALEN];
        uint16_t min_width;
        uint16_t max_width;
        uint16_t min_height;
@@ -276,7 +282,6 @@ typedef struct {
        bool sticky;
        bool private;
        bool center;
-       bool lower;
        bool follow;
        bool manage;
        bool focus;