diff options
| author | Bryce Harrington <bryce@canonical.com> | 2011-12-01 17:11:47 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@canonical.com> | 2012-01-06 12:35:11 -0800 |
| commit | 03fe846c17569a741afa6f387e918ed8d1ffc71b (patch) | |
| tree | 6def40ddcc1d964f1ff3d55f7faf96ac03e58b05 | |
| parent | d6de6afa528c3a23c808a27d175969408c42979e (diff) | |
Refactor geometry structs in xrandr.c to use libXrandrUtil's
Signed-off-by: Bryce Harrington <bryce@canonical.com>
| -rw-r--r-- | examples/.gitignore | 1 | ||||
| -rw-r--r-- | examples/xrandr.c | 33 |
2 files changed, 10 insertions, 24 deletions
diff --git a/examples/.gitignore b/examples/.gitignore new file mode 100644 index 0000000..11f9367 --- /dev/null +++ b/examples/.gitignore @@ -0,0 +1 @@ +xrandr diff --git a/examples/xrandr.c b/examples/xrandr.c index 35dff3e..6d921fb 100644 --- a/examples/xrandr.c +++ b/examples/xrandr.c @@ -39,6 +39,7 @@ #include <math.h> #include "config.h" +#include "XrandrUtils.h" static char *program_name; static Display *dpy; @@ -209,26 +210,10 @@ reflection_name (Rotation rotation) return "invalid reflection"; } -typedef enum _relation { - relation_left_of, - relation_right_of, - relation_above, - relation_below, - relation_same_as, -} relation_t; - typedef struct { int x, y, width, height; } rectangle_t; -typedef struct { - int x1, y1, x2, y2; -} box_t; - -typedef struct { - int x, y; -} point_t; - typedef enum _changes { changes_none = 0, changes_crtc = (1 << 0), @@ -315,7 +300,7 @@ struct _output { name_t addmode; - relation_t relation; + XRURelation relation; char *relative_to; int x, y; @@ -446,10 +431,10 @@ transform_point (XTransform *transform, double *xp, double *yp) } static void -path_bounds (XTransform *transform, point_t *points, int npoints, box_t *box) +path_bounds (XTransform *transform, XRUPoint *points, int npoints, XRUBox *box) { int i; - box_t point; + XRUBox point; for (i = 0; i < npoints; i++) { double x, y; @@ -474,9 +459,9 @@ path_bounds (XTransform *transform, point_t *points, int npoints, box_t *box) static void mode_geometry (XRRModeInfo *mode_info, Rotation rotation, XTransform *transform, - box_t *bounds) + XRUBox *bounds) { - point_t rect[4]; + XRUPoint rect[4]; int width = mode_width (mode_info, rotation); int height = mode_height (mode_info, rotation); @@ -1573,7 +1558,7 @@ apply (void) { XRRModeInfo *old_mode = find_mode_by_xid (crtc_info->mode); int x, y, w, h; - box_t bounds; + XRUBox bounds; if (!old_mode) panic (RRSetConfigFailed, crtc); @@ -1937,8 +1922,8 @@ set_screen_size (void) { XRRModeInfo *mode_info = output->mode_info; int x, y, w, h; - box_t bounds; - + XRUBox bounds; + if (!mode_info) continue; mode_geometry (mode_info, output->rotation, |