o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates from andrey

Browse source
This commit is contained in:
rsc 2004-12-30 18:07:18 +00:00
parent 8d8865f3d0
commit 08166a4548
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/cmd/rio/menu.c
View file

@ -121,17 +121,17 @@ button(XButtonEvent *e)
case Button3: case Button3:
break; break;
case Button4: case Button4:
/* scroll down changes to next virtual screen */
if(!c)
if(numvirtuals > 1 && virt < numvirtuals - 1)
switch_to(virt + 1);
return;
case Button5:
/* scroll up changes to previous virtual screen */ /* scroll up changes to previous virtual screen */
if(!c) if(!c && e->type == ButtonPress)
if(numvirtuals > 1 && virt > 0) if(numvirtuals > 1 && virt > 0)
switch_to(virt - 1); switch_to(virt - 1);
return; return;
case Button5:
/* scroll down changes to next virtual screen */
if(!c && e->type == ButtonPress)
if(numvirtuals > 1 && virt < numvirtuals - 1)
switch_to(virt + 1);
return;
default: default:
return; return;
} }
@ -193,7 +193,7 @@ spawn(ScreenInfo *s)
fprintf(stderr, "rio: exec %s", shell); fprintf(stderr, "rio: exec %s", shell);
perror(" failed"); perror(" failed");
} }
execlp("9term", "9term", "-w", 0); execlp("9term", "9term", scrolling ? "-ws" : "-w", 0);
execlp("xterm", "xterm", "-ut", 0); execlp("xterm", "xterm", "-ut", 0);
perror("rio: exec 9term/xterm failed"); perror("rio: exec 9term/xterm failed");
exit(1); exit(1);
@ -382,6 +382,12 @@ switch_to(int n)
return; return;
currents[virt] = current; currents[virt] = current;
virt = n; virt = n;
/* redundant when called from a menu switch
* but needed for scroll-button switches
*/
b2menu.lasthit = n;
switch_to_c(n, clients); switch_to_c(n, clients);
current = currents[virt]; current = currents[virt];
} }