← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid-proposed

« back to all changes in this revision

Viewing changes to libgnome-desktop/gnome-rr-private.h

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-09-12 07:22:38 UTC
  • mfrom: (1.6.4) (31.1.1 utopic-proposed)
  • Revision ID: package-import@ubuntu.com-20140912072238-fv5g0rpwuk5yynip
Tags: 3.12.2-2ubuntu1
https://launchpad.net/bugs/1372346
* New upstream release (LP: #1372346)
* Merge with Debian, Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/rules:
    + drop obsolete --disable-scrollkeeper configure flag
  - debian/libgnome-desktop-3-10.symbols:
    + Add symbols included in Ubuntu patches
  - debian/control.in:
    + Mark gnome-desktop3-data Multi-Arch: foreign
* Dropped changes:
  - 02_refuse_to_break_GL_compositors.patch:
    + xrandr code has moved into libunity-settings-daemon now

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome-desktop/gnome-rr-private.h
1
1
#ifndef GNOME_RR_PRIVATE_H
2
2
#define GNOME_RR_PRIVATE_H
3
3
 
4
 
#include <X11/Xlib.h>
 
4
#ifdef GDK_WINDOWING_WAYLAND
 
5
#include <gdk/gdkwayland.h>
 
6
#else
 
7
enum wl_output_transform {
 
8
  WL_OUTPUT_TRANSFORM_NORMAL,
 
9
  WL_OUTPUT_TRANSFORM_90,
 
10
  WL_OUTPUT_TRANSFORM_180,
 
11
  WL_OUTPUT_TRANSFORM_270,
 
12
  WL_OUTPUT_TRANSFORM_FLIPPED,
 
13
  WL_OUTPUT_TRANSFORM_FLIPPED_90,
 
14
  WL_OUTPUT_TRANSFORM_FLIPPED_180,
 
15
  WL_OUTPUT_TRANSFORM_FLIPPED_270
 
16
};
 
17
#endif
5
18
 
6
 
#include <X11/extensions/Xrandr.h>
 
19
#include "meta-xrandr-shared.h"
 
20
#include "meta-dbus-xrandr.h"
7
21
 
8
22
typedef struct ScreenInfo ScreenInfo;
9
23
 
14
28
    int                 min_height;
15
29
    int                 max_height;
16
30
 
17
 
    XRRScreenResources *resources;
 
31
    guint               serial;
18
32
    
19
33
    GnomeRROutput **    outputs;
20
34
    GnomeRRCrtc **      crtcs;
24
38
 
25
39
    GnomeRRMode **      clone_modes;
26
40
 
27
 
    RROutput            primary;
 
41
    GnomeRROutput *     primary;
28
42
};
29
43
 
30
44
struct GnomeRRScreenPrivate
31
45
{
32
46
    GdkScreen *                 gdk_screen;
33
47
    GdkWindow *                 gdk_root;
34
 
    Display *                   xdisplay;
35
 
    Screen *                    xscreen;
36
 
    Window                      xroot;
37
48
    ScreenInfo *                info;
38
 
    
39
 
    int                         randr_event_base;
40
 
    int                         rr_major_version;
41
 
    int                         rr_minor_version;
42
 
    
43
 
    Atom                        connector_type_atom;
44
 
    gboolean                    dpms_capable;
 
49
 
 
50
    int                         init_name_watch_id;
 
51
    MetaDBusDisplayConfig      *proxy;
45
52
};
46
53
 
47
54
struct _GnomeRROutputInfoPrivate
55
62
    int                 x;
56
63
    int                 y;
57
64
    GnomeRRRotation     rotation;
 
65
    GnomeRRRotation     available_rotations;
58
66
 
59
67
    gboolean            connected;
60
 
    gchar               vendor[4];
61
 
    guint               product;
62
 
    guint               serial;
 
68
    char *              vendor;
 
69
    char *              product;
 
70
    char *              serial;
63
71
    double              aspect;
64
72
    int                 pref_width;
65
73
    int                 pref_height;
74
82
  GnomeRROutputInfo **outputs;
75
83
};
76
84
 
77
 
gboolean _gnome_rr_output_name_is_laptop (const char *name);
 
85
gboolean _gnome_rr_output_name_is_builtin_display (const char *name);
 
86
 
 
87
gboolean _gnome_rr_screen_apply_configuration (GnomeRRScreen  *screen,
 
88
                                               gboolean        persistent,
 
89
                                               GVariant       *crtcs,
 
90
                                               GVariant       *outputs,
 
91
                                               GError        **error);
78
92
 
79
93
#endif