frame

Merge lp:~chasedouglas/frame/resolution into lp:frame

  1. resolution
  2. Merge into trunk
Proposed by Chase Douglas
Status: Merged
Merged at revision: 40
Proposed branch: lp:~chasedouglas/frame/resolution
Merge into: lp:frame
Diff against target: 47 lines (+4/-4)
3 files modified
src/frame-mtdev.c (+4/-0)
src/frame-xi2.c (+0/-3)
src/frame.c (+0/-1)
To merge this branch: bzr merge lp:~chasedouglas/frame/resolution
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+70945@code.launchpad.net

Description of the change

Some devices have ST resolution but not MT resolution yet. Use ST resolution for these devices.

Also, remove some unused variables.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/frame-mtdev.c'
2--- src/frame-mtdev.c 2011-04-27 11:53:32 +0000
3+++ src/frame-mtdev.c 2011-08-09 19:24:36 +0000
4@@ -122,6 +122,8 @@
5 s->max_orient = 1;
6
7 tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_X);
8+ if (tmp == 0)
9+ tmp = evemu_get_abs_resolution(dev, ABS_X);
10 if (tmp > 0)
11 s->phys_width = (s->max_x - s->min_x) / tmp;
12 else if (s->needs_pointer)
13@@ -130,6 +132,8 @@
14 s->phys_width = 250;
15
16 tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_Y);
17+ if (tmp == 0)
18+ tmp = evemu_get_abs_resolution(dev, ABS_Y);
19 if (tmp > 0)
20 s->phys_height = (s->max_y - s->min_y) / tmp;
21 else if (s->needs_pointer)
22
23=== modified file 'src/frame-xi2.c'
24--- src/frame-xi2.c 2011-05-18 16:45:01 +0000
25+++ src/frame-xi2.c 2011-08-09 19:24:36 +0000
26@@ -196,9 +196,6 @@
27 int utouch_frame_init_xi2(utouch_frame_handle fh,
28 Display *dpy, const XIDeviceInfo *dev)
29 {
30- int event;
31- int err;
32-
33 free(fh->evmap);
34 fh->evmap =calloc(dev->num_classes, sizeof(int));
35 if (!fh->evmap)
36
37=== modified file 'src/frame.c'
38--- src/frame.c 2011-04-27 14:09:29 +0000
39+++ src/frame.c 2011-08-09 19:24:36 +0000
40@@ -103,7 +103,6 @@
41 int frame_size, int slot_size)
42 {
43 struct utouch_frame *frame;
44- int i;
45
46 frame = calloc(1, frame_size);
47 if (!frame)

Subscribers

People subscribed via source and target branches