Mercurial > code > home > repos > homeauto

annotate lib/localdisplay.py @ 1573:d68e20c831f7 dependabot/pip/service/wifi/lxml-4.6.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump lxml from 4.3.3 to 4.6.2 in /service/wifi Bumps [lxml](https://github.com/lxml/lxml) from 4.3.3 to 4.6.2. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.3.3...lxml-4.6.2) Signed-off-by: dependabot[bot] <support@github.com>
author dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
date Thu, 07 Jan 2021 22:55:33 +0000
parents 6d67b23f3a75
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
886
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
1 import psutil, os
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
2
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
3 def setDisplayToLocalX():
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
4 """
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
5 set DISPLAY env var in this process to the id of the X process on localhost
924
4620a5d2f337 comment
drewp <drewp@bigasterisk.com>
parents: 886
diff changeset
6
4620a5d2f337 comment
drewp <drewp@bigasterisk.com>
parents: 886
diff changeset
7 I might need something like xauth merge /run/gdm/auth-for-gdm-xxxxxx/database too
4620a5d2f337 comment
drewp <drewp@bigasterisk.com>
parents: 886
diff changeset
8 and this isn't automated yet
886
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
9 """
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
10 for pid in psutil.get_pid_list():
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
11 try:
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
12 proc = psutil.Process(pid)
1157
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
13 if proc.exe not in ['/usr/bin/Xorg', '/usr/bin/X', '/usr/bin/X11/X', '/usr/lib/xorg/Xorg']:
886
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
14 continue
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
15 except (psutil.error.AccessDenied, psutil.error.NoSuchProcess):
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
16 continue
1157
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
17 argIter = iter(proc.cmdline)
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
18 while True:
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
19 arg = argIter.next()
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
20 if arg in ['-background']:
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
21 argIter.next()
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
22 continue
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
23 if arg in ['-nolisten']:
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
24 continue
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
25 if arg.startswith(':'):
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
26 display = arg
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
27 break
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
28 if arg == 'tcp':
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
29 display = ':0.0'
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
30 break
6d67b23f3a75 better X detection in localdisplay
drewp <drewp@bigasterisk.com>
parents: 1060
diff changeset
31
886
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
32 assert display.startswith(':'), display
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
33 os.environ['DISPLAY'] = display
1060
0cd92c2f8cf4 find .Xauthority better, tools that talk to X
drewp <drewp@bigasterisk.com>
parents: 1001
diff changeset
34 os.environ['XAUTHORITY'] = os.path.expanduser('~/.Xauthority')
886
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
35 break
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
36 else:
2d055bce2e60 Xorg display number fetcher for use by xidle and dpms
drewp <drewp@bigasterisk.com>
parents:
diff changeset
37 raise ValueError("didn't find an Xorg process")