Pr/autograb #393

uli42 · 2017-03-11T13:31:32Z

second version, added inputlock (force-grab) via ctrl-alt-c. Please test. Enable autograb via ctrl-alt-g.

Code definitely needs cleanup, this is just w-i-p with a lot of testing/debug code.

sunweaver · 2017-03-14T08:18:27Z

compiler warning:

Events.c: In function ‘setWinNameSuffix’:
Events.c:714:58: warning: passing argument 3 of ‘XFetchName’ from incompatible pointer type
     XFetchName(nxagentDisplay, nxagentDefaultWindows[0], &prev);
                                                          ^
In file included from Agent.h:114:0,
                 from Events.c:44:
../../../../exports/include/nx-X11/Xlib.h:2471:15: note: expected ‘char **’ but argument is of type ‘unsigned char **’
 extern Status XFetchName(
               ^
Events.c:722:55: warning: pointer targets in passing argument 3 of ‘XStoreName’ differ in signedness [-Wpointer-sign]
  XStoreName(nxagentDisplay, nxagentDefaultWindows[0], prev);
                                                       ^
In file included from Agent.h:114:0,
                 from Events.c:44:
../../../../exports/include/nx-X11/Xlib.h:3413:12: note: expected ‘const char *’ but argument is of type ‘unsigned char *’
 extern int XStoreName(
            ^

sunweaver · 2017-03-14T08:19:26Z

should be:

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 30f743b..dbb079f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -694,7 +694,7 @@ static void nxagentSwitchDeferMode(void)
 
 void setWinNameSuffix(const char *suffix)
 {
-  static unsigned char * prev = NULL;
+  static char * prev = NULL;
   char * pre = " (";
   char * post = ")";
   char * newname;

sunweaver · 2017-03-14T08:30:46Z

Not working:

Ctrl + Alt + c (input lock)
Ctrl + Alt + f (switch to fullscreen/allscreens)
Ctrl + Alt + f (returned to windowed desktop session mode)

-> window title still says "... (input lock)" but the actual lock is gone.

Ctrl + Alt + c twice brings me back to input lock mode

sunweaver · 2017-03-14T08:50:21Z

IRC backlog regarding this PR:

09:08 <@sunweaver> uli42: please already rebase the pr/autograb branch against 3.6.x, so it potentially is ready to merge.
09:09 <@sunweaver> (it's a trivial rebase)
09:13 < uli42> sunweaver: ?? it should be rebased, i checked it in ~1 o'clock
09:14 <@sunweaver> it is rebased by commits. But not rebased fully against the branch. It is missing the merge commits.
09:14 <@sunweaver> you need to pull 3.6.x anew before rebasing against your local 3.6.x branch.
09:15 <@sunweaver> uli42: before I write a sermon on GH, I don't get the approach you use for static unsigned char * prev = NULL;
09:16 <@sunweaver> you declare prev as a local variable and seem to get back to it in a next call to setWinNameSuffix.
09:17 <@sunweaver> Isn't it so that function-local const variables must be restricted to being handled in the one function call only. It seems like "prev" should be some global variable.
09:20 < uli42> well, we can make it global. But the purpose is to being able to reset the window title to the previous title. This is required when you use autograb and then invoke inputlock and then disable 
               inoutlock again. There's one problem with that code: prev does not get freed on exit of nxagent. I am aware of that and will fix that.
09:21 < uli42> sunweaver: regardig rebasing: I have done this after you merged #392:
09:21 < uli42> git co 3.6.x
09:21 < uli42> git pull
09:21 < uli42> git co -
09:21 < uli42> git rebase 3.6.x
09:21 < uli42> So what's wrong with that?
09:22 <@sunweaver> missing: git push gh-uli42 pr/autograb:pr/autograb
09:22 <@sunweaver> what is your latest HEAD on 3.6.x
09:23 <@sunweaver> it should be 6ac805ab4411d3045c99e3ceefe8495ac95d8e15
09:23 -!- Irssi: Pasting 25 lines to #arctica. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.
09:23 <@sunweaver> Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.x
09:24 <@sunweaver> it seems that prev made somehow global.
09:24 <@sunweaver> note that X2Go for example changes the window title after x2goagent startup, so we cannot grab that on session startup and reuse the grabbed name.
09:25 <@sunweaver> maybe you should even check if the suffix is still present in the window title and _only_ then reinstate the previous title.
09:25 <@sunweaver> It may happen that an external application modified it while being in autograb mode.
09:25 <@sunweaver> inputlock mode, that is.
09:29 < uli42> Ok, I cannot look at my latest commit, that one is at home... But as there are valid comments I will do some more work anyway. the unsigned was there because I had used XSetWMName before which 
               requires and unsigned char *. And x2go does something weird here: it runx nxagent with -name "X2GO-some-long-id" and then changes the window title from the outside. Using my approach will set the 
               window title to "X2Go-some-long-id", so maybe x2go shou
09:30 < uli42> Why do you think prev is global?
09:32 <@sunweaver> because you set it in one function call and get back to it in another function call.
09:32 < uli42> inputlock + fullscreen handling ist now implemented yet. I think rootless + inputlock will also break things...
09:32 < uli42> sunweaver: that's why it is static.
09:33 <@sunweaver> why not declare it globbally, handle it in the setWinNameSuffix, and then properly clean it up at session end.
09:34 <@sunweaver> e.g. handle it in AbortDDX() in Init.c or in nxagentAbortDisplay().
09:36 < uli42> sunweaver: yes, that's the way to go. But it was late yesterday and I have to get up a 6:15...
09:37 <@sunweaver> hehehe. same here, but I was in bed earlier, I guess.
09:37 < uli42> does autograb work proeprly for you?
09:42 <@sunweaver> wow!!!
09:43 <@sunweaver> I have been playing with input lock first.
09:43 <@sunweaver> and had MATE nested on top of a local i3 session.
09:43 <@sunweaver> now I tested nested i3 on top of local i3.
09:43 <@sunweaver> this is amazing.
09:43 <@sunweaver> I'd say, we should swich on autograb by default.
09:43 <@sunweaver> because it feels so much more organic.
09:47 <@sunweaver> except from my comments here and on GH, the PR looks fine.
09:47 <@sunweaver> I'll dump our chat log into the GH issue tracker

TL;DR; the prev variable in setWinNameSuffix() requires more work (make it global, manage it in setWinNameSuffix() and free it properly at session end / abortion.

Plus comments above.

The new autograb functionality is so great, I believe we should make it the default (if not now, then at least very very soon!).

uli42 · 2017-03-16T07:07:31Z

Things that need to be improved:

fix handling of FullScreen switch when autograb and/or inputlock are active
restrict autograb and inputlock to windowed mode
add keystroke to window title for inputlock mode
add commandline and/or options support for both autograb and inputlock
make autograb and inputlock variables global nxagent* variables
free prev from SetWinNameSuffix at program exit. So it needs to become global (or a resource, maybe?)

sunweaver · 2017-04-03T19:20:02Z

@uli42: any news on this one? What's its status?

uli42 · 2017-04-03T19:26:05Z

On Mon, Apr 3, 2017 at 9:20 PM, Mike Gabriel ***@***.***> wrote: @uli42: any news on this one? What's its status?

Being a bit distracted currently, but: I cannot seem to get the fullscreen stuff fixed. Also, I am unsure how to implement the activation. Command line switch, options file, keep previous state a reconnect or not?

sunweaver · 2017-04-03T19:47:46Z

Hi Uli,

On Mo 03 Apr 2017 21:26:05 CEST, Ulrich Sibiller wrote: On Mon, Apr 3, 2017 at 9:20 PM, Mike Gabriel ***@***.***> wrote: > > @uli42: any news on this one? What's its status? Being a bit distracted currently, but: I cannot seem to get the fullscreen stuff fixed.

I may not be of help with this...

Also, I am unsure how to implement the activation.

Oh, that's easy...

Command line switch

Yes.

options file

Yes.

keep previous state a reconnect or not?

Yes. Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: [email protected], http://das-netzwerkteam.de

uli42 · 2017-04-03T19:57:31Z

On Mon, Apr 3, 2017 at 9:47 PM, Mike Gabriel ***@***.***> wrote: > Command line switch Yes. > options file Yes.

Really both? Why?

sunweaver · 2017-04-03T20:03:54Z

Hi Uli,

On Mo 03 Apr 2017 21:57:31 CEST, Ulrich Sibiller wrote: On Mon, Apr 3, 2017 at 9:47 PM, Mike Gabriel ***@***.***> wrote: > > Command line switch > > Yes. > > > options file > > Yes. Really both? Why?

Yes. I can help with both or either, once the core code is in. Mike

…

-- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: [email protected], http://das-netzwerkteam.de

sunweaver · 2017-06-28T07:56:25Z

@uli42: this is not working yet... As you know I use a tiling window manager (i3). I can easily escape the input lock if auto-grab is off, for example.

Also, I wonder, if we shouldn't rather introduce "flags" as opposed to the "autograb on|off" and "input lock on|off" strings in the title. E.g. "nxagent [GIX]" (grab, input lock, xinerama on) vs. "nxagent [giX]" (grab and input off, Xinerama on). That makes the agent not seem soooo English.

Furthermore, the autograb mode standalone seems to work. So I wonder, if we should separate those two features for now and get the autograb code in as is.

The input lock, I can e.g. escape from when I disable the autograb mode and then manipulate the window (e.g. minize or some fancy tiling command in i3). The window moves by keyboard event to "somewhere" else, the mouse is left outside nxagent and nxagent still shows input lock. Not true.

So for input lock we maybe need to capture mouse-in and mouse-out events (seen from nxagent's perspective). If the user manages to escape from the nxagent windows, then a new mouse-in event should trigger the input lock once more and capture the pointer.

I can take a closer look tomorrow, but maybe the above gives you a clue and things are fixed by tomorrow morning. Hehehe...

uli42 · 2017-06-28T22:36:18Z

Changing display of the state in the window title can be adjusted after this patch works in all situations... You write "the autograb mode standalone seems to work". Well, have you tried switch to fullscreen and then switching back? This is not working properly for me.

Also, I have not understood yet how to synthetically insert events into the queue as you suggest for the mouse stuff.

I'd appreciate any help to get this going.

Fixes ArcticaProject#384 You can now toggle between autograb mode by pressing CTRL-ALT-G (default, can be adjusted in keystrokes.cfg). You can toogle inputlock mode (pointer stays in the nxagent window) by pressing CTRL-ALT-C.

…tivation_

This also make re-autograbbing after switch back from AllScreens work.

uli42 · 2019-11-15T12:32:55Z

Update: autograb code is merged and working, but we have left out the window title handling stuff and the inputlock code.

uli42 added the work-in-progress label Mar 11, 2017

uli42 requested review from sunweaver and Ionic March 11, 2017 13:32

uli42 force-pushed the pr/autograb branch from 98d4176 to 132a48b Compare March 13, 2017 23:46

sunweaver assigned uli42 Apr 11, 2017

sunweaver added this to the 3.6.0.0 milestone Apr 11, 2017

uli42 force-pushed the pr/autograb branch from 037acb9 to 5a4ce09 Compare April 20, 2017 12:20

uli42 force-pushed the pr/autograb branch 3 times, most recently from 051708f to 025ba6e Compare May 18, 2017 22:32

uli42 force-pushed the pr/autograb branch from 8ea77cc to 7975f65 Compare June 13, 2017 21:50

uli42 force-pushed the pr/autograb branch from 7975f65 to be630c1 Compare June 27, 2019 18:55

uli42 added 6 commits August 14, 2019 20:04

add autograb mode and inputlock mode

b4a390a

Fixes ArcticaProject#384 You can now toggle between autograb mode by pressing CTRL-ALT-G (default, can be adjusted in keystrokes.cfg). You can toogle inputlock mode (pointer stays in the nxagent window) by pressing CTRL-ALT-C.

Refactor AutoGrab

355ce89

Refactor InputLock

c3376e2

Events.c: window name is signed

3a0fbd0

make autograb and inputlock nxagent options

b5338e7

add command line options -autograb and -inputlock

5ccd51a

uli42 added 8 commits August 14, 2019 20:04

make autograb and inputlock available via options file, too

5312a8a

Events.c: improve window name suffix handling

495d954

Events.c: improve debugging output for FocusIn/Out

bbe4093

Events.c: do not ungrab keyboard on LeaveNotify when in autograb mode

924cde3

Events.c: change global variable for autograb and inputlock on (de)ac…

b128c17

…tivation_

Events.c: fix state display in window title

06be726

Events.c: Autograb only for windowed modes

11fdfda

This also make re-autograbbing after switch back from AllScreens work.

nxagent.1: fix indentation

b739b2d

uli42 force-pushed the pr/autograb branch from be630c1 to b739b2d Compare August 14, 2019 18:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pr/autograb #393

Pr/autograb #393

uli42 commented Mar 11, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

uli42 commented Mar 16, 2017 •

edited

Loading

sunweaver commented Apr 3, 2017

uli42 commented Apr 3, 2017 via email

sunweaver commented Apr 3, 2017 via email

uli42 commented Apr 3, 2017 via email

sunweaver commented Apr 3, 2017 via email

sunweaver commented Jun 28, 2017

uli42 commented Jun 28, 2017

uli42 commented Nov 15, 2019

Pr/autograb #393

Are you sure you want to change the base?

Pr/autograb #393

Conversation

uli42 commented Mar 11, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

sunweaver commented Mar 14, 2017

uli42 commented Mar 16, 2017 • edited Loading

sunweaver commented Apr 3, 2017

uli42 commented Apr 3, 2017 via email

sunweaver commented Apr 3, 2017 via email

uli42 commented Apr 3, 2017 via email

sunweaver commented Apr 3, 2017 via email

sunweaver commented Jun 28, 2017

uli42 commented Jun 28, 2017

uli42 commented Nov 15, 2019

uli42 commented Mar 16, 2017 •

edited

Loading