← Back to branch summary

~ubuntu-branches/ubuntu/precise/xfwm4/precise-updates

« back to all changes in this revision

Viewing changes to src/display.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Casadevall
  • Date: 2008-11-10 07:40:26 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20081110074026-xo3f144nja3wl7kz
Tags: 4.4.3-0ubuntu1
* Merge with Debian Xfce UNRELEASED, remaining Ubuntu changes
  - debian/xfwm4.1: update bug reporting address (LP instead of Debian BTS).
  - debian/rules: keep the .desktop installed, but add "NoDisplay=true" to hide
    them by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/display.h
1
 
/*      $Id: display.h 25831 2007-06-21 22:28:04Z olivier $
 
1
/*      $Id: display.h 28362 2008-10-22 19:58:39Z olivier $
2
2
 
3
3
        This program is free software; you can redistribute it and/or modify
4
4
        it under the terms of the GNU General Public License as published by
48
48
#define HAVE_NAME_WINDOW_PIXMAP 1
49
49
#endif /* HAVE_NAME_WINDOW_PIXMAP */
50
50
#endif /* COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2 */
 
51
#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 3
 
52
#ifndef HAVE_OVERLAYS
 
53
#define HAVE_OVERLAYS 1
 
54
#endif /* HAVE_OVERLAYS */
 
55
#endif /* COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 3 */
51
56
#endif /* HAVE_COMPOSITOR */
52
57
 
53
58
#include <gtk/gtk.h>
125
130
    NET_DESKTOP_NAMES,
126
131
    NET_DESKTOP_VIEWPORT,
127
132
    NET_FRAME_EXTENTS,
 
133
    NET_MOVERESIZE_WINDOW,
128
134
    NET_NUMBER_OF_DESKTOPS,
129
135
    NET_REQUEST_FRAME_EXTENTS,
130
136
    NET_SHOWING_DESKTOP,
249
255
    gint nb_screens;
250
256
    gchar* hostname;
251
257
 
252
 
    Time current_time;
253
 
    Time last_user_time;
 
258
    guint32 current_time;
 
259
    guint32 last_user_time;
254
260
 
255
261
    gboolean enable_compositor;
256
262
#ifdef HAVE_RENDER
286
292
    gboolean have_name_window_pixmap;
287
293
#endif /* HAVE_NAME_WINDOW_PIXMAP */
288
294
 
 
295
#if HAVE_OVERLAYS
 
296
    gboolean have_overlays;
 
297
#endif /* HAVE_OVERLAYS */
 
298
 
289
299
#endif /* HAVE_COMPOSITOR */
290
300
};
291
301
 
328
338
                                                                 XSyncAlarm);
329
339
#endif /* HAVE_XSYNC */
330
340
ScreenInfo              *myDisplayGetDefaultScreen              (DisplayInfo *);
331
 
Time                     myDisplayUpdateCurrentTime             (DisplayInfo *,
 
341
guint32                  myDisplayUpdateCurrentTime             (DisplayInfo *,
332
342
                                                                 XEvent *);
333
 
Time                     myDisplayGetCurrentTime                (DisplayInfo *);
334
 
Time                     myDisplayGetTime                       (DisplayInfo *, 
335
 
                                                                 Time);
336
 
Time                     myDisplayGetLastUserTime               (DisplayInfo *);
 
343
guint32                  myDisplayGetCurrentTime                (DisplayInfo *);
 
344
guint32                  myDisplayGetTime                       (DisplayInfo *,
 
345
                                                                 guint32);
 
346
guint32                  myDisplayGetLastUserTime               (DisplayInfo *);
337
347
void                     myDisplaySetLastUserTime               (DisplayInfo *,
338
 
                                                                 Time);
 
348
                                                                 guint32);
339
349
gboolean                 myDisplayTestXrender                   (DisplayInfo *,
340
350
                                                                 gdouble);
341
351