|
0 |
---
|
|
1 |
src/lib/accerciser/node.py | 33 ++++++++++++++++-----------------
|
|
2 |
1 file changed, 16 insertions(+), 17 deletions(-)
|
|
3 |
|
|
4 |
--- a/src/lib/accerciser/node.py
|
|
5 |
+++ b/src/lib/accerciser/node.py
|
|
6 |
@@ -24,6 +24,8 @@ import pyatspi
|
|
7 |
import string
|
|
8 |
from .tools import ToolsAccessor, parseColorString
|
|
9 |
|
|
10 |
+import Xlib, Xlib.display
|
|
11 |
+
|
|
12 |
MAX_BLINKS = 6
|
|
13 |
|
|
14 |
gsettings = GSettings.new('org.a11y.Accerciser')
|
|
15 |
@@ -147,14 +149,11 @@ class Node(GObject.GObject, ToolsAccesso
|
|
16 |
self.max_blinks = times
|
|
17 |
self.blinks = 0
|
|
18 |
# get info for drawing higlight rectangles
|
|
19 |
- display = gdk.Display.get_default()
|
|
20 |
- screen = display.get_default_screen()
|
|
21 |
- self.root = screen.get_root_window()
|
|
22 |
- self.gc = self.root.new_gc()
|
|
23 |
- self.gc.set_subwindow(gdk.SubwindowMode.INCLUDE_INFERIORS)
|
|
24 |
- self.gc.set_function(gdk.Function.INVERT)
|
|
25 |
- self.gc.set_line_attributes(3, gdk.LineStyle.ON_OFF_DASH, \
|
|
26 |
- gdk.CapStyle.BUTT, gdk.JoinStyle.MITER)
|
|
27 |
+ display = Xlib.display.Display()
|
|
28 |
+ screen = display.screen()
|
|
29 |
+ self.root = screen.root
|
|
30 |
+ self.gc = w.create_gc(subwindow_mode = Xlib.X.IncludeInferiors, function = Xlib.X.GXinvert)
|
|
31 |
+
|
|
32 |
self.inv = gtk.Invisible()
|
|
33 |
self.inv.set_screen(screen)
|
|
34 |
GLib.timeout_add(30, self._drawRectangle)
|
|
35 |
@@ -167,7 +166,7 @@ class Node(GObject.GObject, ToolsAccesso
|
|
36 |
if self.blinks == 0:
|
|
37 |
self.inv.show()
|
|
38 |
self.inv.grab_add()
|
|
39 |
- self.root.draw_rectangle(self.gc, False,
|
|
40 |
+ self.root.fill_rectangle(self.gc,
|
|
41 |
self.extents.x,
|
|
42 |
self.extents.y,
|
|
43 |
self.extents.width,
|
|
44 |
@@ -217,10 +216,10 @@ class _HighLight(gtk.Window):
|
|
45 |
screen = self.get_screen()
|
|
46 |
visual = screen.get_rgba_visual()
|
|
47 |
self.set_visual(visual)
|
|
48 |
- else:
|
|
49 |
- # Take a screenshot for compositing on the client side.
|
|
50 |
- self.root = gdk.get_default_root_window().get_image(
|
|
51 |
- self.x, self.y, self.w, self.h)
|
|
52 |
+ #else:
|
|
53 |
+ # Take a screenshot for compositing on the client side.
|
|
54 |
+ # self.root = gdk.get_default_root_window().get_image(
|
|
55 |
+ # self.x, self.y, self.w, self.h)
|
|
56 |
|
|
57 |
# Place window, and resize it, and set proper properties.
|
|
58 |
self.set_app_paintable(True)
|
|
59 |
@@ -265,10 +264,10 @@ class _HighLight(gtk.Window):
|
|
60 |
if not self._composited:
|
|
61 |
# Draw the screengrab of the underlaying window, and set the drawing
|
|
62 |
# operator to OVER.
|
|
63 |
- self.window.draw_image(self.style.black_gc, self.root,
|
|
64 |
- event.area.x,event.area.y,
|
|
65 |
- event.area.x, event.area.y,
|
|
66 |
- event.area.width, event.area.height)
|
|
67 |
+ #self.window.draw_image(self.style.black_gc, self.root,
|
|
68 |
+ # event.area.x,event.area.y,
|
|
69 |
+ # event.area.x, event.area.y,
|
|
70 |
+ # event.area.width, event.area.height)
|
|
71 |
cairo_operator = cairo.OPERATOR_OVER
|
|
72 |
else:
|
|
73 |
cairo_operator = cairo.OPERATOR_SOURCE
|