Fix prototype in include/xcursor.h (Thanks Greg Kroah-Hartman)

[i3/i3] / include / data.h

diff --git a/include/data.h b/include/data.h
index 7a280b2eccfe533b97e261ad605d65448fb41823..740278aecd12eb4bae72c0848d5ec25c474bf28d 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -7,13 +7,17 @@
  * include/data.h: This file defines all data structures used by i3
  *
  */
+#ifndef _DATA_H
+#define _DATA_H
+
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn-launcher.h>
+
 #include <xcb/randr.h>
 #include <xcb/xcb_atom.h>
 #include <stdbool.h>
 #include <pcre.h>
 
-#ifndef _DATA_H
-#define _DATA_H
 #include "queue.h"
 
 /*
@@ -28,7 +32,6 @@
  */
 
 /* Forward definitions */
-typedef struct Font i3Font;
 typedef struct Binding Binding;
 typedef struct Rect Rect;
 typedef struct xoutput Output;
@@ -148,6 +151,8 @@ struct Startup_Sequence {
     char *id;
     /** workspace on which this startup was initiated */
     char *workspace;
+    /** libstartup-notification context for this launch */
+    SnLauncherContext *context;
 
     TAILQ_ENTRY(Startup_Sequence) sequences;
 };
@@ -213,24 +218,13 @@ struct Binding {
 struct Autostart {
     /** Command, like in command mode */
     char *command;
+    /** no_startup_id flag for start_application(). Determines whether a
+     * startup notification context/ID should be created. */
+    bool no_startup_id;
     TAILQ_ENTRY(Autostart) autostarts;
     TAILQ_ENTRY(Autostart) autostarts_always;
 };
 
-/**
- * Data structure for cached font information:
- * - font id in X11 (load it once)
- * - font height (multiple calls needed to get it)
- *
- */
-struct Font {
-    /** The height of the font, built from font_ascent + font_descent */
-    int height;
-    /** The xcb-id for the font */
-    xcb_font_t id;
-};
-
-
 /**
  * An Output is a physical output on your graphics driver. Outputs which
  * are currently in use have (output->active == true). Each output has a