ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.2 2003/11/24 17:31:27 pcg Exp $ 4 * $Id: command.C,v 1.3 2003/11/25 11:52:42 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
64 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
65#endif 65#endif
66#ifdef USE_XIM 66#ifdef USE_XIM
67 int valid_keysym; 67 int valid_keysym;
68#endif 68#endif
69 unsigned char *kbuf = R->h->kbuf; 69 unsigned char *kbuf = R->kbuf;
70 70
71/* 71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
75 * Always permit `shift' to override the current setting 75 * Always permit `shift' to override the current setting
76 */ 76 */
77 shft = (ev->state & ShiftMask); 77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->h->ModMetaMask); 79 meta = (ev->state & R->ModMetaMask);
80 if (R->numlock_state || (ev->state & R->h->ModNumLockMask)) { 80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) {
81 R->numlock_state = (ev->state & R->h->ModNumLockMask); 81 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 83 }
84#ifdef USE_XIM 84#ifdef USE_XIM
85 if (R->h->Input_Context != NULL) { 85 if (R->Input_Context != NULL) {
86 Status status_return; 86 Status status_return;
87 87
88 kbuf[0] = '\0'; 88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 89#ifdef X_HAVE_UTF8_STRING
90 len = Xutf8LookupString(R->h->Input_Context, ev, (char *)kbuf, 90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 91 KBUFSZ, &keysym, &status_return);
92#else 92#else
93 len = XmbLookupString(R->h->Input_Context, ev, (char *)kbuf, 93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 94 KBUFSZ, &keysym, &status_return);
95#endif 95#endif
96 valid_keysym = ((status_return == XLookupKeySym) 96 valid_keysym = ((status_return == XLookupKeySym)
97 || (status_return == XLookupBoth)); 97 || (status_return == XLookupBoth));
98 } else { 98 } else {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
100 &R->h->compose); 100 &R->compose);
101 valid_keysym = 1; 101 valid_keysym = 1;
102 } 102 }
103#else /* USE_XIM */ 103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->h->compose); 105 &R->compose);
106/* 106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1 107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE 108 * good for installations with correct fonts, but without XLOCALE
109 */ 109 */
110 if (!len) { 110 if (!len) {
… …
126# ifdef HOTKEY_CTRL 126# ifdef HOTKEY_CTRL
127 if (ctrl) { 127 if (ctrl) {
128# else 128# else
129 if (meta) { 129 if (meta) {
130# endif 130# endif
131 if (keysym == R->h->ks_bigfont) { 131 if (keysym == R->ks_bigfont) {
132 rxvt_change_font(aR_ 0, FONT_UP); 132 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 133 return;
134 } else if (keysym == R->h->ks_smallfont) { 134 } else if (keysym == R->ks_smallfont) {
135 rxvt_change_font(aR_ 0, FONT_DN); 135 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 136 return;
137 } 137 }
138 } 138 }
139#endif 139#endif
… …
186 if (shft) { 186 if (shft) {
187 /* Shift + F1 - F10 generates F11 - F20 */ 187 /* Shift + F1 - F10 generates F11 - F20 */
188 if (keysym >= XK_F1 && keysym <= XK_F10) { 188 if (keysym >= XK_F1 && keysym <= XK_F10) {
189 keysym += (XK_F11 - XK_F1); 189 keysym += (XK_F11 - XK_F1);
190 shft = 0; /* turn off Shift */ 190 shft = 0; /* turn off Shift */
191 } else if (!ctrl && !meta && (R->h->PrivateModes & PrivMode_ShiftKeys)) { 191 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) {
192 switch (keysym) { 192 switch (keysym) {
193 /* normal XTerm key bindings */ 193 /* normal XTerm key bindings */
194 case XK_Insert: /* Shift+Insert = paste mouse selection */ 194 case XK_Insert: /* Shift+Insert = paste mouse selection */
195 rxvt_selection_request(aR_ ev->time, 0, 0); 195 rxvt_selection_request(aR_ ev->time, 0, 0);
196 return; 196 return;
… …
209 rxvt_scr_printscreen(aR_ ctrl | shft); 209 rxvt_scr_printscreen(aR_ ctrl | shft);
210 return; 210 return;
211 } 211 }
212#endif 212#endif
213#ifdef GREEK_SUPPORT 213#ifdef GREEK_SUPPORT
214 if (keysym == R->h->ks_greekmodeswith) { 214 if (keysym == R->ks_greekmodeswith) {
215 R->h->greek_mode = !R->h->greek_mode; 215 R->greek_mode = !R->greek_mode;
216 if (R->h->greek_mode) { 216 if (R->greek_mode) {
217 rxvt_xterm_seq(aR_ XTerm_title, 217 rxvt_xterm_seq(aR_ XTerm_title,
218 (greek_getmode() == GREEK_ELOT928 218 (greek_getmode() == GREEK_ELOT928
219 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 219 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
220 greek_reset(); 220 greek_reset();
221 } else 221 } else
… …
224 } 224 }
225#endif 225#endif
226 226
227 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 227 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
228#ifdef KEYSYM_RESOURCE 228#ifdef KEYSYM_RESOURCE
229 if (!(shft | ctrl) && R->h->Keysym_map[keysym & 0xFF] != NULL) { 229 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) {
230 unsigned int l; 230 unsigned int l;
231 const unsigned char *kbuf0; 231 const unsigned char *kbuf0;
232 const unsigned char ch = C0_ESC; 232 const unsigned char ch = C0_ESC;
233 233
234 kbuf0 = (R->h->Keysym_map[keysym & 0xFF]); 234 kbuf0 = (R->Keysym_map[keysym & 0xFF]);
235 l = (unsigned int)*kbuf0++; 235 l = (unsigned int)*kbuf0++;
236 236
237 /* escape prefix */ 237 /* escape prefix */
238 if (meta) 238 if (meta)
239# ifdef META8_OPTION 239# ifdef META8_OPTION
240 if (R->h->meta_char == C0_ESC) 240 if (R->meta_char == C0_ESC)
241# endif 241# endif
242 rxvt_tt_write(aR_ &ch, 1); 242 rxvt_tt_write(aR_ &ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 243 rxvt_tt_write(aR_ kbuf0, l);
244 return; 244 return;
245 } else 245 } else
… …
247 { 247 {
248 newlen = 1; 248 newlen = 1;
249 switch (keysym) { 249 switch (keysym) {
250#ifndef NO_BACKSPACE_KEY 250#ifndef NO_BACKSPACE_KEY
251 case XK_BackSpace: 251 case XK_BackSpace:
252 if (R->h->PrivateModes & PrivMode_HaveBackSpace) { 252 if (R->PrivateModes & PrivMode_HaveBackSpace) {
253 kbuf[0] = (!!(R->h->PrivateModes & PrivMode_BackSpace) 253 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace)
254 ^ !!ctrl) ? '\b' : '\177'; 254 ^ !!ctrl) ? '\b' : '\177';
255 kbuf[1] = '\0'; 255 kbuf[1] = '\0';
256 } else 256 } else
257 STRCPY(kbuf, R->h->key_backspace); 257 STRCPY(kbuf, R->key_backspace);
258# ifdef MULTICHAR_SET 258# ifdef MULTICHAR_SET
259 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 259 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) {
260 int col, row; 260 int col, row;
261 261
262 newlen = STRLEN(kbuf); 262 newlen = STRLEN(kbuf);
… …
268# endif 268# endif
269 break; 269 break;
270#endif 270#endif
271#ifndef NO_DELETE_KEY 271#ifndef NO_DELETE_KEY
272 case XK_Delete: 272 case XK_Delete:
273 STRCPY(kbuf, R->h->key_delete); 273 STRCPY(kbuf, R->key_delete);
274# ifdef MULTICHAR_SET 274# ifdef MULTICHAR_SET
275 if (R->Options & Opt_mc_hack) { 275 if (R->Options & Opt_mc_hack) {
276 int col, row; 276 int col, row;
277 277
278 newlen = STRLEN(kbuf); 278 newlen = STRLEN(kbuf);
… …
304#ifdef XK_KP_Left 304#ifdef XK_KP_Left
305 case XK_KP_Up: /* \033Ox or standard */ 305 case XK_KP_Up: /* \033Ox or standard */
306 case XK_KP_Down: /* \033Or or standard */ 306 case XK_KP_Down: /* \033Or or standard */
307 case XK_KP_Right: /* \033Ov or standard */ 307 case XK_KP_Right: /* \033Ov or standard */
308 case XK_KP_Left: /* \033Ot or standard */ 308 case XK_KP_Left: /* \033Ot or standard */
309 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 309 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
310 STRCPY(kbuf, "\033OZ"); 310 STRCPY(kbuf, "\033OZ");
311 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 311 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
312 break; 312 break;
313 } else 313 } else
314 /* translate to std. cursor key */ 314 /* translate to std. cursor key */
… …
325 if (shft) 325 if (shft)
326 kbuf[2] = ("dacb"[keysym - XK_Left]); 326 kbuf[2] = ("dacb"[keysym - XK_Left]);
327 else if (ctrl) { 327 else if (ctrl) {
328 kbuf[1] = 'O'; 328 kbuf[1] = 'O';
329 kbuf[2] = ("dacb"[keysym - XK_Left]); 329 kbuf[2] = ("dacb"[keysym - XK_Left]);
330 } else if (R->h->PrivateModes & PrivMode_aplCUR) 330 } else if (R->PrivateModes & PrivMode_aplCUR)
331 kbuf[1] = 'O'; 331 kbuf[1] = 'O';
332#ifdef MULTICHAR_SET 332#ifdef MULTICHAR_SET
333 //TODO: ?? 333 //TODO: ??
334 if (R->Options & Opt_mc_hack) { 334 if (R->Options & Opt_mc_hack) {
335 int col, row, m; 335 int col, row, m;
… …
363 363
364#ifndef UNSHIFTED_SCROLLKEYS 364#ifndef UNSHIFTED_SCROLLKEYS
365# ifdef XK_KP_Prior 365# ifdef XK_KP_Prior
366 case XK_KP_Prior: 366 case XK_KP_Prior:
367 /* allow shift to override */ 367 /* allow shift to override */
368 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 368 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
369 STRCPY(kbuf, "\033Oy"); 369 STRCPY(kbuf, "\033Oy");
370 break; 370 break;
371 } 371 }
372 /* FALLTHROUGH */ 372 /* FALLTHROUGH */
373# endif 373# endif
… …
375 STRCPY(kbuf, "\033[5~"); 375 STRCPY(kbuf, "\033[5~");
376 break; 376 break;
377# ifdef XK_KP_Next 377# ifdef XK_KP_Next
378 case XK_KP_Next: 378 case XK_KP_Next:
379 /* allow shift to override */ 379 /* allow shift to override */
380 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 380 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
381 STRCPY(kbuf, "\033Os"); 381 STRCPY(kbuf, "\033Os");
382 break; 382 break;
383 } 383 }
384 /* FALLTHROUGH */ 384 /* FALLTHROUGH */
385# endif 385# endif
… …
387 STRCPY(kbuf, "\033[6~"); 387 STRCPY(kbuf, "\033[6~");
388 break; 388 break;
389#endif 389#endif
390 case XK_KP_Enter: 390 case XK_KP_Enter:
391 /* allow shift to override */ 391 /* allow shift to override */
392 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 392 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
393 STRCPY(kbuf, "\033OM"); 393 STRCPY(kbuf, "\033OM");
394 } else { 394 } else {
395 kbuf[0] = '\r'; 395 kbuf[0] = '\r';
396 kbuf[1] = '\0'; 396 kbuf[1] = '\0';
397 } 397 }
… …
433 case XK_KP_6: /* "\033Ov" : "6" */ 433 case XK_KP_6: /* "\033Ov" : "6" */
434 case XK_KP_7: /* "\033Ow" : "7" */ 434 case XK_KP_7: /* "\033Ow" : "7" */
435 case XK_KP_8: /* "\033Ox" : "8" */ 435 case XK_KP_8: /* "\033Ox" : "8" */
436 case XK_KP_9: /* "\033Oy" : "9" */ 436 case XK_KP_9: /* "\033Oy" : "9" */
437 /* allow shift to override */ 437 /* allow shift to override */
438 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 438 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
439 STRCPY(kbuf, "\033Oj"); 439 STRCPY(kbuf, "\033Oj");
440 kbuf[2] += (keysym - XK_KP_Multiply); 440 kbuf[2] += (keysym - XK_KP_Multiply);
441 } else { 441 } else {
442 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 442 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
443 kbuf[1] = '\0'; 443 kbuf[1] = '\0';
… …
461 STRCPY(kbuf, "\033[4~"); 461 STRCPY(kbuf, "\033[4~");
462 break; 462 break;
463#ifdef XK_KP_End 463#ifdef XK_KP_End
464 case XK_KP_End: 464 case XK_KP_End:
465 /* allow shift to override */ 465 /* allow shift to override */
466 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 466 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
467 STRCPY(kbuf, "\033Oq"); 467 STRCPY(kbuf, "\033Oq");
468 break; 468 break;
469 } 469 }
470 /* FALLTHROUGH */ 470 /* FALLTHROUGH */
471#endif 471#endif
… …
473 STRCPY(kbuf, KS_END); 473 STRCPY(kbuf, KS_END);
474 break; 474 break;
475#ifdef XK_KP_Home 475#ifdef XK_KP_Home
476 case XK_KP_Home: 476 case XK_KP_Home:
477 /* allow shift to override */ 477 /* allow shift to override */
478 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 478 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
479 STRCPY(kbuf, "\033Ow"); 479 STRCPY(kbuf, "\033Ow");
480 break; 480 break;
481 } 481 }
482 /* FALLTHROUGH */ 482 /* FALLTHROUGH */
483#endif 483#endif
… …
549 } 549 }
550 /* 550 /*
551 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
552 */ 552 */
553#ifdef META8_OPTION 553#ifdef META8_OPTION
554 if (meta && (R->h->meta_char == 0x80) && len > 0) 554 if (meta && (R->meta_char == 0x80) && len > 0)
555 kbuf[len - 1] |= 0x80; 555 kbuf[len - 1] |= 0x80;
556#endif 556#endif
557 } else if (ctrl && keysym == XK_minus) { 557 } else if (ctrl && keysym == XK_minus) {
558 len = 1; 558 len = 1;
559 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 559 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
560 } else { 560 } else {
561#ifdef META8_OPTION 561#ifdef META8_OPTION
562 /* set 8-bit on */ 562 /* set 8-bit on */
563 if (meta && (R->h->meta_char == 0x80)) { 563 if (meta && (R->meta_char == 0x80)) {
564 unsigned char *ch; 564 unsigned char *ch;
565 565
566 for (ch = kbuf; ch < kbuf + len; ch++) 566 for (ch = kbuf; ch < kbuf + len; ch++)
567 *ch |= 0x80; 567 *ch |= 0x80;
568 meta = 0; 568 meta = 0;
569 } 569 }
570#endif 570#endif
571#ifdef GREEK_SUPPORT 571#ifdef GREEK_SUPPORT
572 if (R->h->greek_mode) 572 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 573 len = greek_xlat(kbuf, len);
574#endif 574#endif
575 /* nil */ ; 575 /* nil */ ;
576 } 576 }
577 } 577 }
… …
580 return; /* not mapped */ 580 return; /* not mapped */
581 581
582 if (R->Options & Opt_scrollTtyKeypress) 582 if (R->Options & Opt_scrollTtyKeypress)
583 if (R->TermWin.view_start) { 583 if (R->TermWin.view_start) {
584 R->TermWin.view_start = 0; 584 R->TermWin.view_start = 0;
585 R->h->want_refresh = 1; 585 R->want_refresh = 1;
586 } 586 }
587 587
588/* 588/*
589 * these modifications only affect the static keybuffer 589 * these modifications only affect the static keybuffer
590 * pass Shift/Control indicators for function keys ending with `~' 590 * pass Shift/Control indicators for function keys ending with `~'
… …
600 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 600 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
601 601
602/* escape prefix */ 602/* escape prefix */
603 if (meta 603 if (meta
604#ifdef META8_OPTION 604#ifdef META8_OPTION
605 && (R->h->meta_char == C0_ESC) 605 && (R->meta_char == C0_ESC)
606#endif 606#endif
607 ) { 607 ) {
608 const unsigned char ch = C0_ESC; 608 const unsigned char ch = C0_ESC;
609 609
610 rxvt_tt_write(aR_ &ch, 1); 610 rxvt_tt_write(aR_ &ch, 1);
… …
630/* EXTPROTO */ 630/* EXTPROTO */
631unsigned int 631unsigned int
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633{ 633{
634 unsigned int n, s; 634 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->h->cmdbuf_base, 635 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->h->cmdbuf_endp, 636 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->h->cmdbuf_ptr; 637 *cmdbuf_ptr = R->cmdbuf_ptr;
638 638
639 n = cmdbuf_ptr - cmdbuf_base; 639 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 641 if (n > 0 && s < count) {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 642 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
… …
649 rxvt_print_error("data loss: cmd_write too large"); 649 rxvt_print_error("data loss: cmd_write too large");
650 count = s; 650 count = s;
651 } 651 }
652 for (; count--;) 652 for (; count--;)
653 *cmdbuf_endp++ = *str++; 653 *cmdbuf_endp++ = *str++;
654 R->h->cmdbuf_ptr = cmdbuf_ptr; 654 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->h->cmdbuf_endp = cmdbuf_endp; 655 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 656 return 0;
657} 657}
658#endif /* MENUBAR_MAX */ 658#endif /* MENUBAR_MAX */
659
660void
661rxvt_term::process_x_events ()
662{
663 do
664 {
665 XEvent xev;
666
667 XNextEvent (Xdisplay, &xev);
668#if defined(CURSOR_BLINK)
669 if ((Options & Opt_cursorBlink)
670 && xev.type == KeyPress) {
671 if (hidden_cursor) {
672 hidden_cursor = 0;
673 want_refresh = 1;
674 }
675 want_keypress_time = 1;
676 }
677#endif
678
679#if defined(POINTER_BLANK)
680 if ((Options & Opt_pointerBlank)
681 && (pointerBlankDelay > 0)) {
682 if (xev.type == MotionNotify
683 || xev.type == ButtonPress
684 || xev.type == ButtonRelease) {
685 if (hidden_pointer)
686 rxvt_pointer_unblank(aR);
687 want_motion_time = 1;
688 }
689 if (xev.type == KeyPress && hidden_pointer == 0)
690 rxvt_pointer_blank (this);
691 }
692#endif
693
694#ifdef USE_XIM
695 if (!XFilterEvent (&xev, xev.xany.window))
696#endif
697 rxvt_process_x_event (this, &xev);
698 }
699 while (XPending (Xdisplay));
700}
701
702void
703rxvt_term::x_cb (io_watcher &w, short revents)
704{
705 process_x_events ();
706}
659 707
660// read the next character, currently handles UTF-8 708// read the next character, currently handles UTF-8
661// will probably handle all sorts of other stuff in the future 709// will probably handle all sorts of other stuff in the future
662static uint32_t 710static uint32_t
663next_char (pR) 711next_char (pR)
664{ 712{
665 rxvt_hidden *h = R->h;
666 mbstate &s = h->mbstate; 713 mbstate &s = R->mbstate;
667 714
668 while (h->cmdbuf_ptr < h->cmdbuf_endp) 715 while (R->cmdbuf_ptr < R->cmdbuf_endp)
669 { 716 {
670 uint8_t ch = *h->cmdbuf_ptr; 717 uint8_t ch = *R->cmdbuf_ptr;
671 718
672 if (s.cnt) 719 if (s.cnt)
673 { 720 {
674 if ((ch & 0xc0) == 0x80) 721 if ((ch & 0xc0) == 0x80)
675 { 722 {
676 h->cmdbuf_ptr++; 723 R->cmdbuf_ptr++;
677 724
678 /* continuation */ 725 /* continuation */
679 s.reg = (s.reg << 6) | (ch & 0x7f); 726 s.reg = (s.reg << 6) | (ch & 0x7f);
680 727
681 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or hacking */ 728 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
682 return s.reg; 729 return s.reg;
683 730
684 continue; 731 continue;
685 } 732 }
686 else 733 else
… …
690 } 737 }
691 } 738 }
692 739
693 if ((ch & 0xc0) == 0xc0) 740 if ((ch & 0xc0) == 0xc0)
694 { 741 {
695 h->cmdbuf_ptr++; 742 R->cmdbuf_ptr++;
696 743
697 /* first byte */ 744 /* first byte */
698 s.orig = ch; /* for broken encodings */ 745 s.orig = ch; /* for broken encodings */
699 s.reg = ch; 746 s.reg = ch;
700 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 747 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
… …
703 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 750 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
704 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 751 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
705 } 752 }
706 else 753 else
707 { 754 {
708 h->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 755 R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
709 return ch; 756 return ch;
710 } 757 }
711 } 758 }
712 759
713 return NOCHAR; 760 return NOCHAR;
761}
762
763void
764rxvt_term::pty_cb (io_watcher &w, short revents)
765{
766 int n;
767 unsigned int count;
768
769 if (count = (cmdbuf_endp - cmdbuf_ptr))
770 {
771 memmove (cmdbuf_base, cmdbuf_ptr, count);
772 cmdbuf_ptr = cmdbuf_base;
773 cmdbuf_endp = cmdbuf_ptr + count;
774 }
775
776
777 for (count = BUFSIZ - count; count; count -= n, cmdbuf_endp += n)
778 if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0)
779 continue;
780 else if (n == 0 || (n < 0 && errno == EAGAIN))
781 break;
782 else
783 {
784 rxvt_clean_exit();
785 exit(EXIT_FAILURE); /* bad order of events? */
786 }
787
788 if (count != BUFSIZ) /* some characters read in */
789 {
790 uint32_t c = next_char (this);
791
792#if 0
793 if (c != NOCHAR)
794 return c;
795#endif
796 }
714} 797}
715 798
716/* rxvt_cmd_getc() - Return next input character */ 799/* rxvt_cmd_getc() - Return next input character */
717/* 800/*
718 * Return the next input character after first passing any keyboard input 801 * Return the next input character after first passing any keyboard input
… …
728 int want_motion_time, want_keypress_time; 811 int want_motion_time, want_keypress_time;
729 struct timeval value; 812 struct timeval value;
730#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 813#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
731 struct timeval tp; 814 struct timeval tp;
732#endif 815#endif
733 struct rxvt_hidden *h = R->h;
734 816
735 uint32_t c = next_char (aR); 817 uint32_t c = next_char (aR);
736 if (c != NOCHAR) 818 if (c != NOCHAR)
737 return c; 819 return c;
738 820
739 for (;;) { 821 for (;;) {
740 /* loop until we can return something */ 822 /* loop until we can return something */
741 823
742 if (h->v_bufstr < h->v_bufptr) /* output any pending chars */ 824 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
743 rxvt_tt_write(aR_ NULL, 0); 825 rxvt_tt_write(aR_ NULL, 0);
744 826
745#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 827#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
746 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */ 828 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
747#endif 829#endif
… …
750#endif 832#endif
751#if defined(POINTER_BLANK) 833#if defined(POINTER_BLANK)
752 want_motion_time = 0; 834 want_motion_time = 0;
753#endif 835#endif
754 836
755 while (XPending(R->Xdisplay)) { /* process pending X events */ 837 if (XPending (R->Xdisplay))
756 XEvent xev; 838 {
839 R->process_x_events ();
757 840
758 XNextEvent(R->Xdisplay, &xev);
759#if defined(CURSOR_BLINK)
760 if ((R->Options & Opt_cursorBlink)
761 && xev.type == KeyPress) {
762 if (h->hidden_cursor) {
763 h->hidden_cursor = 0;
764 h->want_refresh = 1;
765 }
766 want_keypress_time = 1;
767 }
768#endif
769#if defined(POINTER_BLANK)
770 if ((R->Options & Opt_pointerBlank)
771 && (h->pointerBlankDelay > 0)) {
772 if (xev.type == MotionNotify
773 || xev.type == ButtonPress
774 || xev.type == ButtonRelease) {
775 if (R->h->hidden_pointer)
776 rxvt_pointer_unblank(aR);
777 want_motion_time = 1;
778 }
779 if (xev.type == KeyPress && R->h->hidden_pointer == 0)
780 rxvt_pointer_blank(aR);
781 }
782#endif
783#ifdef USE_XIM
784 if (!XFilterEvent(&xev, xev.xany.window))
785 rxvt_process_x_event(aR_ &xev);
786 h->event_type = xev.type;
787#else
788 rxvt_process_x_event(aR_ &xev);
789#endif
790 /* in case button actions pushed chars to cmdbuf */ 841 /* in case button actions pushed chars to cmdbuf */
791 if (h->cmdbuf_ptr < h->cmdbuf_endp) 842 if (R->cmdbuf_ptr < R->cmdbuf_endp)
792 return *h->cmdbuf_ptr++; 843 return *R->cmdbuf_ptr++;
793 } 844 }
794 845
795#if defined(CURSOR_BLINK) 846#if defined(CURSOR_BLINK)
796 if (want_keypress_time) { 847 if (want_keypress_time) {
797 (void)gettimeofday(&tp, NULL); 848 (void)gettimeofday(&tp, NULL);
798 h->lastcursorchange.tv_sec = tp.tv_sec; 849 R->lastcursorchange.tv_sec = tp.tv_sec;
799 h->lastcursorchange.tv_usec = tp.tv_usec; 850 R->lastcursorchange.tv_usec = tp.tv_usec;
800 } 851 }
801#endif 852#endif
802#if defined(POINTER_BLANK) 853#if defined(POINTER_BLANK)
803 if (want_motion_time) { 854 if (want_motion_time) {
804 if (!tp.tv_sec) 855 if (!tp.tv_sec)
805 (void)gettimeofday(&tp, NULL); 856 (void)gettimeofday(&tp, NULL);
806 h->lastmotion.tv_sec = tp.tv_sec; 857 R->lastmotion.tv_sec = tp.tv_sec;
807 h->lastmotion.tv_usec = tp.tv_usec; 858 R->lastmotion.tv_usec = tp.tv_usec;
808 } 859 }
809#endif 860#endif
810 861
811/* 862/*
812 * the command input buffer is empty and we have no pending X events 863 * the command input buffer is empty and we have no pending X events
813 */ 864 */
814 quick_timeout = 0; 865 quick_timeout = 0;
815 866
816#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 867#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
817 if (h->mouse_slip_wheel_speed) { 868 if (R->mouse_slip_wheel_speed) {
818 quick_timeout = 1; 869 quick_timeout = 1;
819 if (!h->mouse_slip_wheel_delay-- 870 if (!R->mouse_slip_wheel_delay--
820 && rxvt_scr_page(aR_ h->mouse_slip_wheel_speed > 0 ? UP : DN, 871 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
821 abs(h->mouse_slip_wheel_speed))) { 872 abs(R->mouse_slip_wheel_speed))) {
822 h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 873 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
823 h->refresh_type |= SMOOTH_REFRESH; 874 R->refresh_type |= SMOOTH_REFRESH;
824 h->want_refresh = 1; 875 R->want_refresh = 1;
825 } 876 }
826 } 877 }
827#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 878#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
828#ifdef SELECTION_SCROLLING 879#ifdef SELECTION_SCROLLING
829 if (h->pending_scroll_selection) { 880 if (R->pending_scroll_selection) {
830 quick_timeout = 1; 881 quick_timeout = 1;
831 if (!h->scroll_selection_delay-- 882 if (!R->scroll_selection_delay--
832 && rxvt_scr_page(aR_ h->scroll_selection_dir, 883 && rxvt_scr_page(aR_ R->scroll_selection_dir,
833 h->scroll_selection_lines)) { 884 R->scroll_selection_lines)) {
834 rxvt_selection_extend(aR_ h->selection_save_x, 885 rxvt_selection_extend(aR_ R->selection_save_x,
835 h->selection_save_y, h->selection_save_state); 886 R->selection_save_y, R->selection_save_state);
836 h->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 887 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
837 h->refresh_type |= SMOOTH_REFRESH; 888 R->refresh_type |= SMOOTH_REFRESH;
838 h->want_refresh = 1; 889 R->want_refresh = 1;
839 } 890 }
840 } 891 }
841#endif 892#endif
842#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 893#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
843 if (scrollbar_isUp() || scrollbar_isDn()) { 894 if (scrollbar_isUp() || scrollbar_isDn()) {
844 quick_timeout = 1; 895 quick_timeout = 1;
845 if (!h->scroll_arrow_delay-- 896 if (!R->scroll_arrow_delay--
846 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 897 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
847 h->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 898 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
848 h->refresh_type |= SMOOTH_REFRESH; 899 R->refresh_type |= SMOOTH_REFRESH;
849 h->want_refresh = 1; 900 R->want_refresh = 1;
850 } 901 }
851 } 902 }
852#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 903#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
853 904
854 FD_ZERO(&readfds); 905 FD_ZERO(&readfds);
… …
858 value.tv_sec = 0; 909 value.tv_sec = 0;
859 910
860 if (!R->TermWin.mapped) 911 if (!R->TermWin.mapped)
861 quick_timeout = 0; 912 quick_timeout = 0;
862 else { 913 else {
863 quick_timeout |= h->want_refresh; 914 quick_timeout |= R->want_refresh;
864#ifdef TRANSPARENT 915#ifdef TRANSPARENT
865 quick_timeout |= h->want_full_refresh; 916 quick_timeout |= R->want_full_refresh;
866#endif 917#endif
867 } 918 }
868 919
869#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 920#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
870 { 921 {
… …
876# if defined(CURSOR_BLINK) 927# if defined(CURSOR_BLINK)
877 if (R->Options & Opt_cursorBlink) { 928 if (R->Options & Opt_cursorBlink) {
878 if (!tp.tv_sec) /* didn't get it before so get it now */ 929 if (!tp.tv_sec) /* didn't get it before so get it now */
879 (void)gettimeofday(&tp, NULL); 930 (void)gettimeofday(&tp, NULL);
880 931
881 csdiff = (tp.tv_sec - h->lastcursorchange.tv_sec) * 1000000L 932 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
882 + tp.tv_usec - h->lastcursorchange.tv_usec; 933 + tp.tv_usec - R->lastcursorchange.tv_usec;
883 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */ 934 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
884 h->lastcursorchange.tv_sec = tp.tv_sec; 935 R->lastcursorchange.tv_sec = tp.tv_sec;
885 h->lastcursorchange.tv_usec = tp.tv_usec; 936 R->lastcursorchange.tv_usec = tp.tv_usec;
886 h->hidden_cursor = !h->hidden_cursor; 937 R->hidden_cursor = !R->hidden_cursor;
887 csdiff = 0; 938 csdiff = 0;
888 } else 939 } else
889 csdiff = BLINK_TIME - csdiff; 940 csdiff = BLINK_TIME - csdiff;
890 set_quick_timeout = 1; 941 set_quick_timeout = 1;
891 } 942 }
… …
893# if defined(POINTER_BLANK) 944# if defined(POINTER_BLANK)
894 /* 945 /*
895 * If we haven't moved the pointer for a while 946 * If we haven't moved the pointer for a while
896 */ 947 */
897 if ((R->Options & Opt_pointerBlank) 948 if ((R->Options & Opt_pointerBlank)
898 && (h->pointerBlankDelay > 0) 949 && (R->pointerBlankDelay > 0)
899 && (h->hidden_pointer == 0)) { 950 && (R->hidden_pointer == 0)) {
900 long pdelay; 951 long pdelay;
901 952
902 if (!tp.tv_sec) /* didn't get it before so get it now */ 953 if (!tp.tv_sec) /* didn't get it before so get it now */
903 (void)gettimeofday(&tp, NULL); 954 (void)gettimeofday(&tp, NULL);
904 psdiff = (tp.tv_sec - h->lastmotion.tv_sec) * 1000000L 955 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
905 + tp.tv_usec - h->lastmotion.tv_usec; 956 + tp.tv_usec - R->lastmotion.tv_usec;
906 pdelay = h->pointerBlankDelay * 1000000L; 957 pdelay = R->pointerBlankDelay * 1000000L;
907 if (psdiff >= pdelay) 958 if (psdiff >= pdelay)
908 rxvt_pointer_blank(aR); 959 rxvt_pointer_blank(aR);
909 else { 960 else {
910 set_quick_timeout = 1; 961 set_quick_timeout = 1;
911 psdiff = pdelay - psdiff; 962 psdiff = pdelay - psdiff;
… …
922#endif 973#endif
923 974
924 if ((select_res = select(R->num_fds, &readfds, NULL, NULL, 975 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
925 (quick_timeout ? &value : NULL))) == 0) { 976 (quick_timeout ? &value : NULL))) == 0) {
926 /* select statement timed out - we're not hard and fast scrolling */ 977 /* select statement timed out - we're not hard and fast scrolling */
927 h->refresh_limit = 1; 978 R->refresh_limit = 1;
928 } 979 }
929#if defined(CURSOR_BLINK) 980#if defined(CURSOR_BLINK)
930 if (R->Options & Opt_cursorBlink) 981 if (R->Options & Opt_cursorBlink)
931 h->want_refresh = 1; 982 R->want_refresh = 1;
932#endif 983#endif
933 984
934 /* See if we can read new data from the application */ 985 /* See if we can read new data from the application */
935 if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) { 986 if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) {
936 int n; 987 int n;
937 unsigned int count; 988 unsigned int count;
938 989
939 h->cmdbuf_ptr = h->cmdbuf_endp = h->cmdbuf_base; 990 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
940 for (count = BUFSIZ; count; count -= n, h->cmdbuf_endp += n) 991 for (count = BUFSIZ; count; count -= n, R->cmdbuf_endp += n)
941 if ((n = read(R->cmd_fd, h->cmdbuf_endp, count)) > 0) 992 if ((n = read(R->cmd_fd, R->cmdbuf_endp, count)) > 0)
942 continue; 993 continue;
943 else if (n == 0 || (n < 0 && errno == EAGAIN)) 994 else if (n == 0 || (n < 0 && errno == EAGAIN))
944 break; 995 break;
945 else { 996 else {
946 rxvt_clean_exit(); 997 rxvt_clean_exit();
… …
953 if (c != NOCHAR) 1004 if (c != NOCHAR)
954 return c; 1005 return c;
955 } 1006 }
956 } 1007 }
957#ifdef TRANSPARENT 1008#ifdef TRANSPARENT
958 if (h->want_full_refresh) { 1009 if (R->want_full_refresh) {
959 h->want_full_refresh = 0; 1010 R->want_full_refresh = 0;
960 rxvt_scr_clear(aR); 1011 rxvt_scr_clear(aR);
961 rxvt_scr_touch(aR_ False); 1012 rxvt_scr_touch(aR_ False);
962 h->want_refresh = 1; 1013 R->want_refresh = 1;
963 } 1014 }
964#endif 1015#endif
965 if (h->want_refresh) { 1016 if (R->want_refresh) {
966 rxvt_scr_refresh(aR_ h->refresh_type); 1017 rxvt_scr_refresh(aR_ R->refresh_type);
967 rxvt_scrollbar_show(aR_ 1); 1018 rxvt_scrollbar_show(aR_ 1);
968#ifdef USE_XIM 1019#ifdef USE_XIM
969 rxvt_IMSendSpot(aR); 1020 rxvt_IMSendSpot(aR);
970#endif 1021#endif
971 } 1022 }
… …
979rxvt_pointer_unblank(pR) 1030rxvt_pointer_unblank(pR)
980{ 1031{
981 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1032 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);
982 rxvt_recolour_cursor(aR); 1033 rxvt_recolour_cursor(aR);
983#ifdef POINTER_BLANK 1034#ifdef POINTER_BLANK
984 R->h->hidden_pointer = 0; 1035 R->hidden_pointer = 0;
985 if (R->h->pointerBlankDelay > 0) { 1036 if (R->pointerBlankDelay > 0) {
986 struct timeval tp; 1037 struct timeval tp;
987 1038
988 (void)gettimeofday(&tp, NULL); 1039 (void)gettimeofday(&tp, NULL);
989 R->h->lastmotion.tv_sec = tp.tv_sec; 1040 R->lastmotion.tv_sec = tp.tv_sec;
990 R->h->lastmotion.tv_usec = tp.tv_usec; 1041 R->lastmotion.tv_usec = tp.tv_usec;
991 } 1042 }
992#endif 1043#endif
993} 1044}
994 1045
995#ifdef POINTER_BLANK 1046#ifdef POINTER_BLANK
996/* INTPROTO */ 1047/* INTPROTO */
997void 1048void
998rxvt_pointer_blank(pR) 1049rxvt_pointer_blank(pR)
999{ 1050{
1000 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->h->pointer_blank); 1051 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);
1001 XFlush(R->Xdisplay); 1052 XFlush(R->Xdisplay);
1002 R->h->hidden_pointer = 1; 1053 R->hidden_pointer = 1;
1003} 1054}
1004#endif 1055#endif
1005 1056
1006/* INTPROTO */ 1057/* INTPROTO */
1007void 1058void
… …
1012 1063
1013 x = ev->x; 1064 x = ev->x;
1014 y = ev->y; 1065 y = ev->y;
1015 rxvt_pixel_position(aR_ &x, &y); 1066 rxvt_pixel_position(aR_ &x, &y);
1016 1067
1017 if (R->h->MEvent.button == AnyButton) { 1068 if (R->MEvent.button == AnyButton) {
1018 button_number = 3; 1069 button_number = 3;
1019 } else { 1070 } else {
1020 button_number = R->h->MEvent.button - Button1; 1071 button_number = R->MEvent.button - Button1;
1021 /* add 0x3D for wheel events, like xterm does */ 1072 /* add 0x3D for wheel events, like xterm does */
1022 if (button_number >= 3) 1073 if (button_number >= 3)
1023 button_number += (64 - 3); 1074 button_number += (64 - 3);
1024 } 1075 }
1025 1076
1026 if (R->h->PrivateModes & PrivMode_MouseX10) { 1077 if (R->PrivateModes & PrivMode_MouseX10) {
1027 /* 1078 /*
1028 * do not report ButtonRelease 1079 * do not report ButtonRelease
1029 * no state info allowed 1080 * no state info allowed
1030 */ 1081 */
1031 key_state = 0; 1082 key_state = 0;
… …
1037 * 8 = Meta 1088 * 8 = Meta
1038 * 16 = Control 1089 * 16 = Control
1039 * plus will add in our own Double-Click reporting 1090 * plus will add in our own Double-Click reporting
1040 * 32 = Double Click 1091 * 32 = Double Click
1041 */ 1092 */
1042 key_state = ((R->h->MEvent.state & ShiftMask) ? 4 : 0) 1093 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0)
1043 + ((R->h->MEvent.state & R->h->ModMetaMask) ? 8 : 0) 1094 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0)
1044 + ((R->h->MEvent.state & ControlMask) ? 16 : 0); 1095 + ((R->MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1096#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((R->h->MEvent.clicks > 1) ? 32 : 0); 1097 key_state += ((R->MEvent.clicks > 1) ? 32 : 0);
1047#endif 1098#endif
1048 } 1099 }
1049 1100
1050#ifdef DEBUG_MOUSEREPORT 1101#ifdef DEBUG_MOUSEREPORT
1051 fprintf(stderr, "Mouse ["); 1102 fprintf(stderr, "Mouse [");
… …
1088 int i, want_timeout; 1139 int i, want_timeout;
1089 Window unused_root, unused_child; 1140 Window unused_root, unused_child;
1090 int unused_root_x, unused_root_y; 1141 int unused_root_x, unused_root_y;
1091 unsigned int unused_mask; 1142 unsigned int unused_mask;
1092 struct timeval tp; 1143 struct timeval tp;
1093 struct rxvt_hidden *h = R->h; 1144
1094#ifdef DEBUG_X 1145#ifdef DEBUG_X
1095 const char *const eventnames[] = 1146 const char *const eventnames[] =
1096 { /* mason - this matches my system */ 1147 { /* mason - this matches my system */
1097 "", 1148 "",
1098 "", 1149 "",
… …
1136 /* 1187 /*
1137 * check if we need to get the time for any timeouts 1188 * check if we need to get the time for any timeouts
1138 */ 1189 */
1139 1190
1140 for (i = NUM_TIMEOUTS; i--; ) 1191 for (i = NUM_TIMEOUTS; i--; )
1141 if (h->timeout[i].tv_sec) { 1192 if (R->timeout[i].tv_sec) {
1142 want_timeout = 1; 1193 want_timeout = 1;
1143 break; 1194 break;
1144 } 1195 }
1145 1196
1146#ifndef DEBUG_X 1197#ifndef DEBUG_X
… …
1154#endif 1205#endif
1155 1206
1156 /* X event timeouts */ 1207 /* X event timeouts */
1157 if (want_timeout) 1208 if (want_timeout)
1158 for (i = NUM_TIMEOUTS; i--; ) { 1209 for (i = NUM_TIMEOUTS; i--; ) {
1159 if (h->timeout[i].tv_sec == 0) 1210 if (R->timeout[i].tv_sec == 0)
1160 continue; 1211 continue;
1161 if ((tp.tv_sec < h->timeout[i].tv_sec) 1212 if ((tp.tv_sec < R->timeout[i].tv_sec)
1162 || (tp.tv_sec == h->timeout[i].tv_sec 1213 || (tp.tv_sec == R->timeout[i].tv_sec
1163 && tp.tv_usec < h->timeout[i].tv_usec)) 1214 && tp.tv_usec < R->timeout[i].tv_usec))
1164 continue; 1215 continue;
1165 h->timeout[i].tv_sec = 0; 1216 R->timeout[i].tv_sec = 0;
1166 switch(i) { 1217 switch(i) {
1167 case TIMEOUT_INCR: 1218 case TIMEOUT_INCR:
1168 rxvt_print_error("data loss: timeout on INCR selection paste"); 1219 rxvt_print_error("data loss: timeout on INCR selection paste");
1169 h->selection_wait = Sel_none; 1220 R->selection_wait = Sel_none;
1170 break; 1221 break;
1171 default: 1222 default:
1172 break; 1223 break;
1173 } 1224 }
1174 } 1225 }
… …
1180 1231
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1232#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1233 case KeyRelease:
1183 { 1234 {
1184 if (!(ev->xkey.state & ControlMask)) 1235 if (!(ev->xkey.state & ControlMask))
1185 h->mouse_slip_wheel_speed = 0; 1236 R->mouse_slip_wheel_speed = 0;
1186 else { 1237 else {
1187 KeySym ks; 1238 KeySym ks;
1188 1239
1189 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1240 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0);
1190 if (ks == XK_Control_L || ks == XK_Control_R) 1241 if (ks == XK_Control_L || ks == XK_Control_R)
1191 h->mouse_slip_wheel_speed = 0; 1242 R->mouse_slip_wheel_speed = 0;
1192 } 1243 }
1193 break; 1244 break;
1194 } 1245 }
1195#endif 1246#endif
1196 1247
… …
1202 rxvt_button_release(aR_ (XButtonEvent *)ev); 1253 rxvt_button_release(aR_ (XButtonEvent *)ev);
1203 break; 1254 break;
1204 1255
1205 case ClientMessage: 1256 case ClientMessage:
1206 if (ev->xclient.format == 32 1257 if (ev->xclient.format == 32
1207 && (Atom)ev->xclient.data.l[0] == h->xa[XA_WMDELETEWINDOW]) 1258 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1208 exit(EXIT_SUCCESS); 1259 exit(EXIT_SUCCESS);
1209#ifdef OFFIX_DND 1260#ifdef OFFIX_DND
1210 /* OffiX Dnd (drag 'n' drop) protocol */ 1261 /* OffiX Dnd (drag 'n' drop) protocol */
1211 if (ev->xclient.message_type == h->xa[XA_DNDPROTOCOL] 1262 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1212 && (ev->xclient.data.l[0] == DndFile 1263 && (ev->xclient.data.l[0] == DndFile
1213 || ev->xclient.data.l[0] == DndDir 1264 || ev->xclient.data.l[0] == DndDir
1214 || ev->xclient.data.l[0] == DndLink)) { 1265 || ev->xclient.data.l[0] == DndLink)) {
1215 /* Get Dnd data */ 1266 /* Get Dnd data */
1216 Atom ActualType; 1267 Atom ActualType;
1217 int ActualFormat; 1268 int ActualFormat;
1218 unsigned char *data; 1269 unsigned char *data;
1219 unsigned long Size, RemainingBytes; 1270 unsigned long Size, RemainingBytes;
1220 1271
1221 XGetWindowProperty(R->Xdisplay, Xroot, 1272 XGetWindowProperty(R->Xdisplay, Xroot,
1222 R->h->xa[XA_DNDSELECTION], 1273 R->xa[XA_DNDSELECTION],
1223 0L, 1000000L, 1274 0L, 1000000L,
1224 False, AnyPropertyType, 1275 False, AnyPropertyType,
1225 &ActualType, &ActualFormat, 1276 &ActualType, &ActualFormat,
1226 &Size, &RemainingBytes, 1277 &Size, &RemainingBytes,
1227 &data); 1278 &data);
… …
1250 * which ought to make things real slow! 1301 * which ought to make things real slow!
1251 */ 1302 */
1252 case VisibilityNotify: 1303 case VisibilityNotify:
1253 switch (ev->xvisibility.state) { 1304 switch (ev->xvisibility.state) {
1254 case VisibilityUnobscured: 1305 case VisibilityUnobscured:
1255 h->refresh_type = FAST_REFRESH; 1306 R->refresh_type = FAST_REFRESH;
1256 break; 1307 break;
1257 case VisibilityPartiallyObscured: 1308 case VisibilityPartiallyObscured:
1258 h->refresh_type = SLOW_REFRESH; 1309 R->refresh_type = SLOW_REFRESH;
1259 break; 1310 break;
1260 default: 1311 default:
1261 h->refresh_type = NO_REFRESH; 1312 R->refresh_type = NO_REFRESH;
1262 break; 1313 break;
1263 } 1314 }
1264 break; 1315 break;
1265 1316
1266 case FocusIn: 1317 case FocusIn:
1267 if (!R->TermWin.focus) { 1318 if (!R->TermWin.focus) {
1268 R->TermWin.focus = 1; 1319 R->TermWin.focus = 1;
1269 h->want_refresh = 1; 1320 R->want_refresh = 1;
1270#ifdef USE_XIM 1321#ifdef USE_XIM
1271 if (h->Input_Context != NULL) 1322 if (R->Input_Context != NULL)
1272 XSetICFocus(h->Input_Context); 1323 XSetICFocus(R->Input_Context);
1273#endif 1324#endif
1274 } 1325 }
1275 break; 1326 break;
1276 1327
1277 case FocusOut: 1328 case FocusOut:
1278 if (R->TermWin.focus) { 1329 if (R->TermWin.focus) {
1279 R->TermWin.focus = 0; 1330 R->TermWin.focus = 0;
1280 h->want_refresh = 1; 1331 R->want_refresh = 1;
1281#ifdef USE_XIM 1332#ifdef USE_XIM
1282 if (h->Input_Context != NULL) 1333 if (R->Input_Context != NULL)
1283 XUnsetICFocus(h->Input_Context); 1334 XUnsetICFocus(R->Input_Context);
1284#endif 1335#endif
1285 } 1336 }
1286 break; 1337 break;
1287 1338
1288 case ConfigureNotify: 1339 case ConfigureNotify:
… …
1306 } 1357 }
1307#endif 1358#endif
1308#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1359#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1309 if (R->Options & Opt_transparent) { 1360 if (R->Options & Opt_transparent) {
1310 rxvt_check_our_parents(aR); 1361 rxvt_check_our_parents(aR);
1311 if (h->am_transparent) 1362 if (R->am_transparent)
1312 h->want_full_refresh = 1; 1363 R->want_full_refresh = 1;
1313 } 1364 }
1314#endif 1365#endif
1315 } 1366 }
1316 break; 1367 break;
1317 1368
1318 case SelectionClear: 1369 case SelectionClear:
1319 rxvt_selection_clear(aR); 1370 rxvt_selection_clear(aR);
1320 break; 1371 break;
1321 1372
1322 case SelectionNotify: 1373 case SelectionNotify:
1323 if (h->selection_wait == Sel_normal) 1374 if (R->selection_wait == Sel_normal)
1324 rxvt_selection_paste(aR_ ev->xselection.requestor, 1375 rxvt_selection_paste(aR_ ev->xselection.requestor,
1325 ev->xselection.property, True); 1376 ev->xselection.property, True);
1326 break; 1377 break;
1327 1378
1328 case SelectionRequest: 1379 case SelectionRequest:
… …
1336 case MapNotify: 1387 case MapNotify:
1337 R->TermWin.mapped = 1; 1388 R->TermWin.mapped = 1;
1338 break; 1389 break;
1339 1390
1340 case PropertyNotify: 1391 case PropertyNotify:
1341 if (ev->xproperty.atom == h->xa[XA_VT_SELECTION]) { 1392 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1342 if (ev->xproperty.state == PropertyNewValue) 1393 if (ev->xproperty.state == PropertyNewValue)
1343 rxvt_selection_property(aR_ ev->xproperty.window, 1394 rxvt_selection_property(aR_ ev->xproperty.window,
1344 ev->xproperty.atom); 1395 ev->xproperty.atom);
1345 break; 1396 break;
1346 } 1397 }
1347#ifdef TRANSPARENT 1398#ifdef TRANSPARENT
1348 /* 1399 /*
1349 * if user used some Esetroot compatible prog to set the root bg, 1400 * if user used some Esetroot compatible prog to set the root bg,
1350 * use the property to determine the pixmap. We use it later on. 1401 * use the property to determine the pixmap. We use it later on.
1351 */ 1402 */
1352 if (h->xa[XA_XROOTPMAPID] == 0) 1403 if (R->xa[XA_XROOTPMAPID] == 0)
1353 h->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1404 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1354 "_XROOTPMAP_ID", False); 1405 "_XROOTPMAP_ID", False);
1355 if (ev->xproperty.atom != h->xa[XA_XROOTPMAPID]) 1406 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1356 break; 1407 break;
1357 /* FALLTHROUGH */ 1408 /* FALLTHROUGH */
1358 case ReparentNotify: 1409 case ReparentNotify:
1359 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1410 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) {
1360 if (h->am_transparent) 1411 if (R->am_transparent)
1361 h->want_full_refresh = 1; 1412 R->want_full_refresh = 1;
1362 } 1413 }
1363#endif /* TRANSPARENT */ 1414#endif /* TRANSPARENT */
1364 break; 1415 break;
1365 1416
1366 case GraphicsExpose: 1417 case GraphicsExpose:
… …
1374 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1425 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,
1375 ev->xexpose.width, ev->xexpose.height, False); 1426 ev->xexpose.width, ev->xexpose.height, False);
1376 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1427 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1377 // ev->xexpose.width, R->TermWin.height, False); 1428 // ev->xexpose.width, R->TermWin.height, False);
1378#endif 1429#endif
1379 h->want_refresh = 1; 1430 R->want_refresh = 1;
1380 } else { 1431 } else {
1381 XEvent unused_xevent; 1432 XEvent unused_xevent;
1382 1433
1383 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1434 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1384 Expose, 1435 Expose,
… …
1400 } 1451 }
1401 break; 1452 break;
1402 1453
1403 case MotionNotify: 1454 case MotionNotify:
1404#ifdef POINTER_BLANK 1455#ifdef POINTER_BLANK
1405 if (R->h->hidden_pointer) 1456 if (R->hidden_pointer)
1406 rxvt_pointer_unblank(aR); 1457 rxvt_pointer_unblank(aR);
1407#endif 1458#endif
1408#if MENUBAR 1459#if MENUBAR
1409 if (isMenuBarWindow(ev->xany.window)) { 1460 if (isMenuBarWindow(ev->xany.window)) {
1410 rxvt_menubar_control(aR_ &(ev->xbutton)); 1461 rxvt_menubar_control(aR_ &(ev->xbutton));
1411 break; 1462 break;
1412 } 1463 }
1413#endif 1464#endif
1414 if ((h->PrivateModes & PrivMode_mouse_report) && !(h->bypass_keystate)) 1465 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate))
1415 break; 1466 break;
1416 1467
1417 if (ev->xany.window == R->TermWin.vt) { 1468 if (ev->xany.window == R->TermWin.vt) {
1418 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1469 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1419 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1470 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt,
… …
1423 &unused_root_x, &unused_root_y, 1474 &unused_root_x, &unused_root_y,
1424 &(ev->xbutton.x), &(ev->xbutton.y), 1475 &(ev->xbutton.x), &(ev->xbutton.y),
1425 &unused_mask); 1476 &unused_mask);
1426#ifdef MOUSE_THRESHOLD 1477#ifdef MOUSE_THRESHOLD
1427 /* deal with a `jumpy' mouse */ 1478 /* deal with a `jumpy' mouse */
1428 if ((ev->xmotion.time - h->MEvent.time) > MOUSE_THRESHOLD) { 1479 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1429#endif 1480#endif
1430 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1481 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),
1431 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1482 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1432#ifdef SELECTION_SCROLLING 1483#ifdef SELECTION_SCROLLING
1433 if (ev->xbutton.y<R->TermWin.int_bwidth || 1484 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1434 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1485 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1435 int dist; 1486 int dist;
1436 1487
1437 h->pending_scroll_selection=1; 1488 R->pending_scroll_selection=1;
1438 1489
1439 /* don't clobber the current delay if we are 1490 /* don't clobber the current delay if we are
1440 * already in the middle of scrolling. 1491 * already in the middle of scrolling.
1441 */ 1492 */
1442 if (h->scroll_selection_delay<=0) 1493 if (R->scroll_selection_delay<=0)
1443 h->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1494 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1444 1495
1445 /* save the event params so we can highlight 1496 /* save the event params so we can highlight
1446 * the selection in the pending-scroll loop 1497 * the selection in the pending-scroll loop
1447 */ 1498 */
1448 h->selection_save_x=ev->xbutton.x; 1499 R->selection_save_x=ev->xbutton.x;
1449 h->selection_save_y=ev->xbutton.y; 1500 R->selection_save_y=ev->xbutton.y;
1450 h->selection_save_state= 1501 R->selection_save_state=
1451 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1502 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1452 1503
1453 /* calc number of lines to scroll */ 1504 /* calc number of lines to scroll */
1454 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1505 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1455 h->scroll_selection_dir = UP; 1506 R->scroll_selection_dir = UP;
1456 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1507 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1457 } 1508 }
1458 else { 1509 else {
1459 h->scroll_selection_dir = DN; 1510 R->scroll_selection_dir = DN;
1460 dist = ev->xbutton.y - 1511 dist = ev->xbutton.y -
1461 (R->TermWin.int_bwidth + R->TermWin.height); 1512 (R->TermWin.int_bwidth + R->TermWin.height);
1462 } 1513 }
1463 h->scroll_selection_lines=(Pixel2Height(dist)/ 1514 R->scroll_selection_lines=(Pixel2Height(dist)/
1464 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1515 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1465 MIN_IT(h->scroll_selection_lines, 1516 MIN_IT(R->scroll_selection_lines,
1466 SELECTION_SCROLL_MAX_LINES); 1517 SELECTION_SCROLL_MAX_LINES);
1467 } 1518 }
1468 else { 1519 else {
1469 /* we are within the text window, so we 1520 /* we are within the text window, so we
1470 * shouldn't be scrolling 1521 * shouldn't be scrolling
1471 */ 1522 */
1472 h->pending_scroll_selection = 0; 1523 R->pending_scroll_selection = 0;
1473 } 1524 }
1474#endif 1525#endif
1475#ifdef MOUSE_THRESHOLD 1526#ifdef MOUSE_THRESHOLD
1476 } 1527 }
1477#endif 1528#endif
… …
1482 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1533 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1483 &unused_root, &unused_child, 1534 &unused_root, &unused_child,
1484 &unused_root_x, &unused_root_y, 1535 &unused_root_x, &unused_root_y,
1485 &(ev->xbutton.x), &(ev->xbutton.y), 1536 &(ev->xbutton.x), &(ev->xbutton.y),
1486 &unused_mask); 1537 &unused_mask);
1487 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - h->csrO, 1538 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1488 scrollbar_size()); 1539 scrollbar_size());
1489 rxvt_scr_refresh(aR_ h->refresh_type); 1540 rxvt_scr_refresh(aR_ R->refresh_type);
1490 h->refresh_limit = 0; 1541 R->refresh_limit = 0;
1491 rxvt_scrollbar_show(aR_ 1); 1542 rxvt_scrollbar_show(aR_ 1);
1492 } 1543 }
1493 break; 1544 break;
1494 } 1545 }
1495} 1546}
… …
1497/* INTPROTO */ 1548/* INTPROTO */
1498void 1549void
1499rxvt_button_press(pR_ XButtonEvent *ev) 1550rxvt_button_press(pR_ XButtonEvent *ev)
1500{ 1551{
1501 int reportmode = 0, clickintime; 1552 int reportmode = 0, clickintime;
1502 struct rxvt_hidden *h = R->h;
1503 1553
1504 h->bypass_keystate = ev->state & (h->ModMetaMask | ShiftMask); 1554 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1505 if (!h->bypass_keystate) 1555 if (!R->bypass_keystate)
1506 reportmode = !!(h->PrivateModes & PrivMode_mouse_report); 1556 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1507/* 1557/*
1508 * VT window processing of button press 1558 * VT window processing of button press
1509 */ 1559 */
1510 if (ev->window == R->TermWin.vt) 1560 if (ev->window == R->TermWin.vt)
1511 { 1561 {
… …
1513 if (ev->subwindow != None) 1563 if (ev->subwindow != None)
1514 rxvt_Gr_ButtonPress(ev->x, ev->y); 1564 rxvt_Gr_ButtonPress(ev->x, ev->y);
1515 else 1565 else
1516#endif 1566#endif
1517 { 1567 {
1518 clickintime = ev->time - h->MEvent.time < MULTICLICK_TIME; 1568 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1519 if (reportmode) 1569 if (reportmode)
1520 { 1570 {
1521 /* mouse report from vt window */ 1571 /* mouse report from vt window */
1522 /* save the xbutton state (for ButtonRelease) */ 1572 /* save the xbutton state (for ButtonRelease) */
1523 h->MEvent.state = ev->state; 1573 R->MEvent.state = ev->state;
1524#ifdef MOUSE_REPORT_DOUBLECLICK 1574#ifdef MOUSE_REPORT_DOUBLECLICK
1525 if (ev->button == h->MEvent.button && clickintime) 1575 if (ev->button == R->MEvent.button && clickintime)
1526 { 1576 {
1527 /* same button, within alloted time */ 1577 /* same button, within alloted time */
1528 h->MEvent.clicks++; 1578 R->MEvent.clicks++;
1529 if (h->MEvent.clicks > 1) 1579 if (R->MEvent.clicks > 1)
1530 { 1580 {
1531 /* only report double clicks */ 1581 /* only report double clicks */
1532 h->MEvent.clicks = 2; 1582 R->MEvent.clicks = 2;
1533 rxvt_mouse_report(aR_ ev); 1583 rxvt_mouse_report(aR_ ev);
1534 1584
1535 /* don't report the release */ 1585 /* don't report the release */
1536 h->MEvent.clicks = 0; 1586 R->MEvent.clicks = 0;
1537 h->MEvent.button = AnyButton; 1587 R->MEvent.button = AnyButton;
1538 } 1588 }
1539 } 1589 }
1540 else 1590 else
1541 { 1591 {
1542 /* different button, or time expired */ 1592 /* different button, or time expired */
1543 h->MEvent.clicks = 1; 1593 R->MEvent.clicks = 1;
1544 h->MEvent.button = ev->button; 1594 R->MEvent.button = ev->button;
1545 rxvt_mouse_report(aR_ ev); 1595 rxvt_mouse_report(aR_ ev);
1546 } 1596 }
1547#else 1597#else
1548 h->MEvent.button = ev->button; 1598 R->MEvent.button = ev->button;
1549 rxvt_mouse_report(aR_ ev); 1599 rxvt_mouse_report(aR_ ev);
1550#endif /* MOUSE_REPORT_DOUBLECLICK */ 1600#endif /* MOUSE_REPORT_DOUBLECLICK */
1551 } 1601 }
1552 else 1602 else
1553 { 1603 {
1554 if (ev->button != h->MEvent.button) 1604 if (ev->button != R->MEvent.button)
1555 h->MEvent.clicks = 0; 1605 R->MEvent.clicks = 0;
1556 switch (ev->button) 1606 switch (ev->button)
1557 { 1607 {
1558 case Button1: 1608 case Button1:
1559 if (h->MEvent.button == Button1 && clickintime) 1609 if (R->MEvent.button == Button1 && clickintime)
1560 h->MEvent.clicks++; 1610 R->MEvent.clicks++;
1561 else 1611 else
1562 h->MEvent.clicks = 1; 1612 R->MEvent.clicks = 1;
1563 rxvt_selection_click(aR_ h->MEvent.clicks, ev->x, ev->y); 1613 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1564 h->MEvent.button = Button1; 1614 R->MEvent.button = Button1;
1565 break; 1615 break;
1566 1616
1567 case Button3: 1617 case Button3:
1568 if (h->MEvent.button == Button3 && clickintime) 1618 if (R->MEvent.button == Button3 && clickintime)
1569 rxvt_selection_rotate(aR_ ev->x, ev->y); 1619 rxvt_selection_rotate(aR_ ev->x, ev->y);
1570 else 1620 else
1571 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1621 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1572 h->MEvent.button = Button3; 1622 R->MEvent.button = Button3;
1573 break; 1623 break;
1574 } 1624 }
1575 } 1625 }
1576 h->MEvent.time = ev->time; 1626 R->MEvent.time = ev->time;
1577 return; 1627 return;
1578 } 1628 }
1579 } 1629 }
1580 1630
1581/* 1631/*
… …
1640 else if (scrollbarrxvt_dnButton(ev->y)) 1690 else if (scrollbarrxvt_dnButton(ev->y))
1641 upordown = 1; /* down */ 1691 upordown = 1; /* down */
1642 } 1692 }
1643 if (upordown) { 1693 if (upordown) {
1644#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1694#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1645 h->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1695 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1646#endif 1696#endif
1647 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1697 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1648 if (upordown < 0) 1698 if (upordown < 0)
1649 scrollbar_setUp(); 1699 scrollbar_setUp();
1650 else 1700 else
1651 scrollbar_setDn(); 1701 scrollbar_setDn();
1652 } 1702 }
1653 } else 1703 } else
1654 switch (ev->button) { 1704 switch (ev->button) {
1655 case Button2: 1705 case Button2:
1656 switch (h->scrollbar_align) { 1706 switch (R->scrollbar_align) {
1657 case R_SB_ALIGN_TOP: 1707 case R_SB_ALIGN_TOP:
1658 h->csrO = 0; 1708 R->csrO = 0;
1659 break; 1709 break;
1660 case R_SB_ALIGN_CENTRE: 1710 case R_SB_ALIGN_CENTRE:
1661 h->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1711 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1662 break; 1712 break;
1663 case R_SB_ALIGN_BOTTOM: 1713 case R_SB_ALIGN_BOTTOM:
1664 h->csrO = R->scrollBar.bot - R->scrollBar.top; 1714 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1665 break; 1715 break;
1666 } 1716 }
1667 if (R->scrollBar.style == R_SB_XTERM 1717 if (R->scrollBar.style == R_SB_XTERM
1668 || scrollbar_above_slider(ev->y) 1718 || scrollbar_above_slider(ev->y)
1669 || scrollbar_below_slider(ev->y)) 1719 || scrollbar_below_slider(ev->y))
1670 rxvt_scr_move_to(aR_ 1720 rxvt_scr_move_to(aR_
1671 scrollbar_position(ev->y) - h->csrO, 1721 scrollbar_position(ev->y) - R->csrO,
1672 scrollbar_size()); 1722 scrollbar_size());
1673 scrollbar_setMotion(); 1723 scrollbar_setMotion();
1674 break; 1724 break;
1675 1725
1676 case Button1: 1726 case Button1:
1677 if (h->scrollbar_align == R_SB_ALIGN_CENTRE) 1727 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1678 h->csrO = ev->y - R->scrollBar.top; 1728 R->csrO = ev->y - R->scrollBar.top;
1679 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1680 1730
1681 case Button3: 1731 case Button3:
1682 if (R->scrollBar.style != R_SB_XTERM) { 1732 if (R->scrollBar.style != R_SB_XTERM) {
1683 if (scrollbar_above_slider(ev->y)) 1733 if (scrollbar_above_slider(ev->y))
… …
1718void 1768void
1719rxvt_button_release(pR_ XButtonEvent *ev) 1769rxvt_button_release(pR_ XButtonEvent *ev)
1720{ 1770{
1721 int reportmode = 0; 1771 int reportmode = 0;
1722 1772
1723 R->h->csrO = 0; /* reset csr Offset */ 1773 R->csrO = 0; /* reset csr Offset */
1724 if (!R->h->bypass_keystate) 1774 if (!R->bypass_keystate)
1725 reportmode = !!(R->h->PrivateModes & PrivMode_mouse_report); 1775 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1726 1776
1727 if (scrollbar_isUpDn()) { 1777 if (scrollbar_isUpDn()) {
1728 scrollbar_setIdle(); 1778 scrollbar_setIdle();
1729 rxvt_scrollbar_show(aR_ 0); 1779 rxvt_scrollbar_show(aR_ 0);
1730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1780#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1731 R->h->refresh_type &= ~SMOOTH_REFRESH; 1781 R->refresh_type &= ~SMOOTH_REFRESH;
1732#endif 1782#endif
1733 } 1783 }
1734#ifdef SELECTION_SCROLLING 1784#ifdef SELECTION_SCROLLING
1735 R->h->pending_scroll_selection=0; 1785 R->pending_scroll_selection=0;
1736#endif 1786#endif
1737 if (ev->window == R->TermWin.vt) 1787 if (ev->window == R->TermWin.vt)
1738 { 1788 {
1739#ifdef RXVT_GRAPHICS 1789#ifdef RXVT_GRAPHICS
1740 if (ev->subwindow != None) 1790 if (ev->subwindow != None)
… …
1748 /* don't report release of wheel "buttons" */ 1798 /* don't report release of wheel "buttons" */
1749 if (ev->button >= 4) 1799 if (ev->button >= 4)
1750 return; 1800 return;
1751#ifdef MOUSE_REPORT_DOUBLECLICK 1801#ifdef MOUSE_REPORT_DOUBLECLICK
1752 /* only report the release of 'slow' single clicks */ 1802 /* only report the release of 'slow' single clicks */
1753 if (R->h->MEvent.button != AnyButton 1803 if (R->MEvent.button != AnyButton
1754 && (ev->button != R->h->MEvent.button 1804 && (ev->button != R->MEvent.button
1755 || (ev->time - R->h->MEvent.time 1805 || (ev->time - R->MEvent.time
1756 > MULTICLICK_TIME / 2))) 1806 > MULTICLICK_TIME / 2)))
1757 { 1807 {
1758 R->h->MEvent.clicks = 0; 1808 R->MEvent.clicks = 0;
1759 R->h->MEvent.button = AnyButton; 1809 R->MEvent.button = AnyButton;
1760 rxvt_mouse_report(aR_ ev); 1810 rxvt_mouse_report(aR_ ev);
1761 } 1811 }
1762#else /* MOUSE_REPORT_DOUBLECLICK */ 1812#else /* MOUSE_REPORT_DOUBLECLICK */
1763 R->h->MEvent.button = AnyButton; 1813 R->MEvent.button = AnyButton;
1764 rxvt_mouse_report(aR_ ev); 1814 rxvt_mouse_report(aR_ ev);
1765#endif /* MOUSE_REPORT_DOUBLECLICK */ 1815#endif /* MOUSE_REPORT_DOUBLECLICK */
1766 return; 1816 return;
1767 } 1817 }
1768 /* 1818 /*
1769 * dumb hack to compensate for the failure of click-and-drag 1819 * dumb hack to compensate for the failure of click-and-drag
1770 * when overriding mouse reporting 1820 * when overriding mouse reporting
1771 */ 1821 */
1772 if (R->h->PrivateModes & PrivMode_mouse_report 1822 if (R->PrivateModes & PrivMode_mouse_report
1773 && R->h->bypass_keystate 1823 && R->bypass_keystate
1774 && ev->button == Button1 && R->h->MEvent.clicks <= 1) 1824 && ev->button == Button1 && R->MEvent.clicks <= 1)
1775 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1825 rxvt_selection_extend(aR_ ev->x, ev->y, 0);
1776 1826
1777 switch (ev->button) { 1827 switch (ev->button) {
1778 case Button1: 1828 case Button1:
1779 case Button3: 1829 case Button3:
… …
1796 else 1846 else
1797 i = 5; 1847 i = 5;
1798# ifdef MOUSE_SLIP_WHEELING 1848# ifdef MOUSE_SLIP_WHEELING
1799 if (ev->state & ControlMask) 1849 if (ev->state & ControlMask)
1800 { 1850 {
1801 R->h->mouse_slip_wheel_speed += (v ? -1 : 1); 1851 R->mouse_slip_wheel_speed += (v ? -1 : 1);
1802 R->h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1852 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1803 } 1853 }
1804# endif 1854# endif
1805# ifdef JUMP_MOUSE_WHEEL 1855# ifdef JUMP_MOUSE_WHEEL
1806 rxvt_scr_page(aR_ v, i); 1856 rxvt_scr_page(aR_ v, i);
1807 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1857 rxvt_scr_refresh(aR_ SMOOTH_REFRESH);
… …
1852 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1902 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr);
1853 rootdepth = wrootattr.depth; 1903 rootdepth = wrootattr.depth;
1854 1904
1855 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1905 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
1856 if (rootdepth != wattr.depth) { 1906 if (rootdepth != wattr.depth) {
1857 if (R->h->am_transparent) { 1907 if (R->am_transparent) {
1858 pchanged = 1; 1908 pchanged = 1;
1859 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1909 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1860 R->PixColors[Color_bg]); 1910 R->PixColors[Color_bg]);
1861 R->h->am_transparent = R->h->am_pixmap_trans = 0; 1911 R->am_transparent = R->am_pixmap_trans = 0;
1862 } 1912 }
1863 return pchanged; /* Don't try any more */ 1913 return pchanged; /* Don't try any more */
1864 } 1914 }
1865 1915
1866/* Get all X ops out of the queue so that our information is up-to-date. */ 1916/* Get all X ops out of the queue so that our information is up-to-date. */
… …
1869/* 1919/*
1870 * Make the frame window set by the window manager have 1920 * Make the frame window set by the window manager have
1871 * the root background. Some window managers put multiple nested frame 1921 * the root background. Some window managers put multiple nested frame
1872 * windows for each client, so we have to take care about that. 1922 * windows for each client, so we have to take care about that.
1873 */ 1923 */
1874 i = (R->h->xa[XA_XROOTPMAPID] != 0 1924 i = (R->xa[XA_XROOTPMAPID] != 0
1875 && (XGetWindowProperty(R->Xdisplay, Xroot, R->h->xa[XA_XROOTPMAPID], 1925 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID],
1876 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1926 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1877 &nitems, &bytes_after, &prop) == Success)); 1927 &nitems, &bytes_after, &prop) == Success));
1878 if (!i || prop == NULL) 1928 if (!i || prop == NULL)
1879 have_pixmap = 0; 1929 have_pixmap = 0;
1880 else { 1930 else {
… …
1908 ny = -sy; 1958 ny = -sy;
1909 sy = 0; 1959 sy = 0;
1910 } 1960 }
1911 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1961 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1912 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1962 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1913 R->h->allowedxerror = -1; 1963 R->allowedxerror = -1;
1914 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1964 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1915 ZPixmap); 1965 ZPixmap);
1916 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1966 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1917 /* XXX: may need a delay here? */ 1967 /* XXX: may need a delay here? */
1918 R->h->allowedxerror = 0; 1968 R->allowedxerror = 0;
1919 if (image == NULL) { 1969 if (image == NULL) {
1920 if (R->h->am_transparent && R->h->am_pixmap_trans) { 1970 if (R->am_transparent && R->am_pixmap_trans) {
1921 pchanged = 1; 1971 pchanged = 1;
1922 if (R->TermWin.pixmap != None) { 1972 if (R->TermWin.pixmap != None) {
1923 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1973 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1924 R->TermWin.pixmap = None; 1974 R->TermWin.pixmap = None;
1925 } 1975 }
1926 } 1976 }
1927 R->h->am_pixmap_trans = 0; 1977 R->am_pixmap_trans = 0;
1928 } else { 1978 } else {
1929 if (R->TermWin.pixmap != None) 1979 if (R->TermWin.pixmap != None)
1930 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1980 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1931 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 1981 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1932 (unsigned int)R->szHint.width, 1982 (unsigned int)R->szHint.width,
… …
1938 (unsigned int)image->height); 1988 (unsigned int)image->height);
1939 XFreeGC(R->Xdisplay, gc); 1989 XFreeGC(R->Xdisplay, gc);
1940 XDestroyImage(image); 1990 XDestroyImage(image);
1941 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 1991 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1942 R->TermWin.pixmap); 1992 R->TermWin.pixmap);
1943 if (!R->h->am_transparent || !R->h->am_pixmap_trans) 1993 if (!R->am_transparent || !R->am_pixmap_trans)
1944 pchanged = 1; 1994 pchanged = 1;
1945 R->h->am_transparent = R->h->am_pixmap_trans = 1; 1995 R->am_transparent = R->am_pixmap_trans = 1;
1946 } 1996 }
1947 } 1997 }
1948 if (!R->h->am_pixmap_trans) { 1998 if (!R->am_pixmap_trans) {
1949 unsigned int n; 1999 unsigned int n;
1950/* 2000/*
1951 * InheritPixmap transparency 2001 * InheritPixmap transparency
1952 */ 2002 */
1953 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2003 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
… …
1982 D_X((stderr, "InheritPixmap Turning off")); 2032 D_X((stderr, "InheritPixmap Turning off"));
1983 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2033 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0],
1984 R->PixColors[Color_fg]); 2034 R->PixColors[Color_fg]);
1985 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2035 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1986 R->PixColors[Color_bg]); 2036 R->PixColors[Color_bg]);
1987 R->h->am_transparent = 0; 2037 R->am_transparent = 0;
1988 /* XXX: also turn off Opt_transparent? */ 2038 /* XXX: also turn off Opt_transparent? */
1989 } else { 2039 } else {
1990 /* wait (an arbitrary period) for the WM to do its thing 2040 /* wait (an arbitrary period) for the WM to do its thing
1991 * needed for fvwm2.2.2 (and before?) */ 2041 * needed for fvwm2.2.2 (and before?) */
1992# ifdef HAVE_NANOSLEEP 2042# ifdef HAVE_NANOSLEEP
… …
2002 for (n = 0; n < (unsigned int)i; n++) 2052 for (n = 0; n < (unsigned int)i; n++)
2003 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2053 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n],
2004 ParentRelative); 2054 ParentRelative);
2005 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2055 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2006 ParentRelative); 2056 ParentRelative);
2007 R->h->am_transparent = 1; 2057 R->am_transparent = 1;
2008 } 2058 }
2009 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2059 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++)
2010 R->TermWin.parent[i] = None; 2060 R->TermWin.parent[i] = None;
2011 } 2061 }
2012 return pchanged; 2062 return pchanged;
… …
2020#ifdef PRINTPIPE 2070#ifdef PRINTPIPE
2021/* EXTPROTO */ 2071/* EXTPROTO */
2022FILE * 2072FILE *
2023rxvt_popen_printer(pR) 2073rxvt_popen_printer(pR)
2024{ 2074{
2025 FILE *stream = popen(R->h->rs[Rs_print_pipe], "w"); 2075 FILE *stream = popen(R->rs[Rs_print_pipe], "w");
2026 2076
2027 if (stream == NULL) 2077 if (stream == NULL)
2028 rxvt_print_error("can't open printer pipe"); 2078 rxvt_print_error("can't open printer pipe");
2029 return stream; 2079 return stream;
2030} 2080}
… …
2109void 2159void
2110rxvt_process_nonprinting(pR_ unsigned char ch) 2160rxvt_process_nonprinting(pR_ unsigned char ch)
2111{ 2161{
2112 switch (ch) { 2162 switch (ch) {
2113 case C0_ENQ: /* terminal Status */ 2163 case C0_ENQ: /* terminal Status */
2114 if (R->h->rs[Rs_answerbackstring]) 2164 if (R->rs[Rs_answerbackstring])
2115 rxvt_tt_write(aR_ 2165 rxvt_tt_write(aR_
2116 (const unsigned char *)R->h->rs[Rs_answerbackstring], 2166 (const unsigned char *)R->rs[Rs_answerbackstring],
2117 (unsigned int)STRLEN(R->h->rs[Rs_answerbackstring])); 2167 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2118 else 2168 else
2119 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2169 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,
2120 (unsigned int)STRLEN(VT100_ANS)); 2170 (unsigned int)STRLEN(VT100_ANS));
2121 break; 2171 break;
2122 case C0_BEL: /* bell */ 2172 case C0_BEL: /* bell */
… …
2212void 2262void
2213rxvt_process_escape_seq(pR) 2263rxvt_process_escape_seq(pR)
2214{ 2264{
2215 unsigned char ch = rxvt_cmd_getc(aR); 2265 unsigned char ch = rxvt_cmd_getc(aR);
2216 2266
2217 if (R->h->PrivateModes & PrivMode_vt52) { 2267 if (R->PrivateModes & PrivMode_vt52) {
2218 rxvt_process_escape_vt52(aR_ ch); 2268 rxvt_process_escape_vt52(aR_ ch);
2219 return; 2269 return;
2220 } 2270 }
2221 2271
2222 switch (ch) { 2272 switch (ch) {
… …
2570 case 6: /* CPR requested */ 2620 case 6: /* CPR requested */
2571 rxvt_scr_report_position(aR); 2621 rxvt_scr_report_position(aR);
2572 break; 2622 break;
2573#if defined (ENABLE_DISPLAY_ANSWER) 2623#if defined (ENABLE_DISPLAY_ANSWER)
2574 case 7: /* unofficial extension */ 2624 case 7: /* unofficial extension */
2575 rxvt_tt_printf(aR_ "%-.250s\n", R->h->rs[Rs_display_name]); 2625 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);
2576 break; 2626 break;
2577#endif 2627#endif
2578 case 8: /* unofficial extension */ 2628 case 8: /* unofficial extension */
2579 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2629 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2580 break; 2630 break;
… …
2977rxvt_privcases(pR_ int mode, unsigned long bit) 3027rxvt_privcases(pR_ int mode, unsigned long bit)
2978{ 3028{
2979 int state; 3029 int state;
2980 3030
2981 if (mode == 's') { 3031 if (mode == 's') {
2982 R->h->SavedModes |= (R->h->PrivateModes & bit); 3032 R->SavedModes |= (R->PrivateModes & bit);
2983 return -1; 3033 return -1;
2984 } else { 3034 } else {
2985 if (mode == 'r') 3035 if (mode == 'r')
2986 state = (R->h->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3036 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */
2987 else 3037 else
2988 state = (mode == 't') ? !(R->h->PrivateModes & bit) : mode; 3038 state = (mode == 't') ? !(R->PrivateModes & bit) : mode;
2989 PrivMode(state, bit); 3039 PrivMode(state, bit);
2990 } 3040 }
2991 return state; 3041 return state;
2992} 3042}
2993 3043
… …
3071 * within VT52 mode 3121 * within VT52 mode
3072 */ 3122 */
3073 PrivMode(1, PrivMode_vt52); 3123 PrivMode(1, PrivMode_vt52);
3074 break; 3124 break;
3075 case 3: /* 80/132 */ 3125 case 3: /* 80/132 */
3076 if (R->h->PrivateModes & PrivMode_132OK) 3126 if (R->PrivateModes & PrivMode_132OK)
3077 rxvt_set_widthheight(aR_ 3127 rxvt_set_widthheight(aR_
3078 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3128 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth),
3079 (unsigned int)R->TermWin.height); 3129 (unsigned int)R->TermWin.height);
3080 break; 3130 break;
3081 case 4: /* smooth scrolling */ 3131 case 4: /* smooth scrolling */
… …
3094 rxvt_scr_autowrap(aR_ state); 3144 rxvt_scr_autowrap(aR_ state);
3095 break; 3145 break;
3096 /* case 8: - auto repeat, can't do on a per window basis */ 3146 /* case 8: - auto repeat, can't do on a per window basis */
3097 case 9: /* X10 mouse reporting */ 3147 case 9: /* X10 mouse reporting */
3098 if (state) /* orthogonal */ 3148 if (state) /* orthogonal */
3099 R->h->PrivateModes &= ~(PrivMode_MouseX11); 3149 R->PrivateModes &= ~(PrivMode_MouseX11);
3100 break; 3150 break;
3101#ifdef menuBar_esc 3151#ifdef menuBar_esc
3102 case menuBar_esc: 3152 case menuBar_esc:
3103#ifdef MENUBAR 3153#ifdef MENUBAR
3104 rxvt_map_menuBar(aR_ state); 3154 rxvt_map_menuBar(aR_ state);
… …
3123 break; 3173 break;
3124 /* case 66: - application key pad */ 3174 /* case 66: - application key pad */
3125 /* case 67: - backspace key */ 3175 /* case 67: - backspace key */
3126 case 1000: /* X11 mouse reporting */ 3176 case 1000: /* X11 mouse reporting */
3127 if (state) /* orthogonal */ 3177 if (state) /* orthogonal */
3128 R->h->PrivateModes &= ~(PrivMode_MouseX10); 3178 R->PrivateModes &= ~(PrivMode_MouseX10);
3129 break; 3179 break;
3130#if 0 3180#if 0
3131 case 1001: 3181 case 1001:
3132 break; /* X11 mouse highlighting */ 3182 break; /* X11 mouse highlighting */
3133#endif 3183#endif
… …
3142 R->Options |= Opt_scrollTtyKeypress; 3192 R->Options |= Opt_scrollTtyKeypress;
3143 else 3193 else
3144 R->Options &= ~Opt_scrollTtyKeypress; 3194 R->Options &= ~Opt_scrollTtyKeypress;
3145 break; 3195 break;
3146 case 1047: /* secondary screen w/ clearing */ 3196 case 1047: /* secondary screen w/ clearing */
3147 if (R->h->current_screen != PRIMARY) 3197 if (R->current_screen != PRIMARY)
3148 rxvt_scr_erase_screen(aR_ 2); 3198 rxvt_scr_erase_screen(aR_ 2);
3149 rxvt_scr_change_screen(aR_ state); 3199 rxvt_scr_change_screen(aR_ state);
3150 /* FALLTHROUGH */ 3200 /* FALLTHROUGH */
3151 default: 3201 default:
3152 break; 3202 break;
… …
3349void 3399void
3350rxvt_main_loop(pR) 3400rxvt_main_loop(pR)
3351{ 3401{
3352 uint32_t ch, *str, buf[BUFSIZ]; 3402 uint32_t ch, *str, buf[BUFSIZ];
3353 int nlines, refreshnow; 3403 int nlines, refreshnow;
3354 struct rxvt_hidden *h = R->h;
3355 3404
3356 h->cmdbuf_ptr = h->cmdbuf_endp = h->cmdbuf_base; 3405 R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
3357 3406
3358 /* once we know the shell is running, send the screen size. Again! */ 3407 /* once we know the shell is running, send the screen size. Again! */
3359 ch = rxvt_cmd_getc(aR); /* wait for something */ 3408 ch = rxvt_cmd_getc(aR); /* wait for something */
3360 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->h->cmd_pid); 3409 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid);
3361 3410
3362 refreshnow = 0; 3411 refreshnow = 0;
3363 for (;;) { 3412 for (;;) {
3364 if (ch == NOCHAR) 3413 if (ch == NOCHAR)
3365 ch = rxvt_cmd_getc(aR); 3414 ch = rxvt_cmd_getc(aR);
… …
3381 *str++ = ch; 3430 *str++ = ch;
3382 3431
3383 if (ch == '\n') 3432 if (ch == '\n')
3384 { 3433 {
3385 nlines++; 3434 nlines++;
3386 h->refresh_count++; 3435 R->refresh_count++;
3387 if (!(R->Options & Opt_jumpScroll) 3436 if (!(R->Options & Opt_jumpScroll)
3388 || (h->refresh_count >= (h->refresh_limit 3437 || (R->refresh_count >= (R->refresh_limit
3389 * (R->TermWin.nrow - 1)))) 3438 * (R->TermWin.nrow - 1))))
3390 { 3439 {
3391 refreshnow = 1; 3440 refreshnow = 1;
3392 ch = NOCHAR; 3441 ch = NOCHAR;
3393 break; 3442 break;
… …
3405 rxvt_scr_add_lines(aR_ buf, nlines, str - buf); 3454 rxvt_scr_add_lines(aR_ buf, nlines, str - buf);
3406 3455
3407 /* 3456 /*
3408 * If there have been a lot of new lines, then update the screen 3457 * If there have been a lot of new lines, then update the screen
3409 * What the heck I'll cheat and only refresh less than every page-full. 3458 * What the heck I'll cheat and only refresh less than every page-full.
3410 * the number of pages between refreshes is h->refresh_limit, which 3459 * the number of pages between refreshes is R->refresh_limit, which
3411 * is incremented here because we must be doing flat-out scrolling. 3460 * is incremented here because we must be doing flat-out scrolling.
3412 * 3461 *
3413 * refreshing should be correct for small scrolls, because of the 3462 * refreshing should be correct for small scrolls, because of the
3414 * time-out 3463 * time-out
3415 */ 3464 */
… …
3417 //TODO: REFRESH_PERIOD is one, fix it 3466 //TODO: REFRESH_PERIOD is one, fix it
3418 if (refreshnow) 3467 if (refreshnow)
3419 { 3468 {
3420 refreshnow = 0; 3469 refreshnow = 0;
3421 3470
3422 if ((R->Options & Opt_jumpScroll) && h->refresh_limit < REFRESH_PERIOD) 3471 if ((R->Options & Opt_jumpScroll) && R->refresh_limit < REFRESH_PERIOD)
3423 h->refresh_limit++; 3472 R->refresh_limit++;
3424 3473
3425 rxvt_scr_refresh(aR_ h->refresh_type); 3474 rxvt_scr_refresh(aR_ R->refresh_type);
3426 } 3475 }
3427 3476
3428 } 3477 }
3429 else 3478 else
3430 { 3479 {
… …
3480 unsigned char *v_buffer, /* start of physical buffer */ 3529 unsigned char *v_buffer, /* start of physical buffer */
3481 *v_bufstr, /* start of current buffer pending */ 3530 *v_bufstr, /* start of current buffer pending */
3482 *v_bufptr, /* end of current buffer pending */ 3531 *v_bufptr, /* end of current buffer pending */
3483 *v_bufend; /* end of physical buffer */ 3532 *v_bufend; /* end of physical buffer */
3484 3533
3485 if (R->h->v_bufstr == NULL && len > 0) { 3534 if (R->v_bufstr == NULL && len > 0) {
3486 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3535 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3487 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p); 3536 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3488 v_bufend = v_buffer + p; 3537 v_bufend = v_buffer + p;
3489 } else { 3538 } else {
3490 v_buffer = R->h->v_buffer; 3539 v_buffer = R->v_buffer;
3491 v_bufstr = R->h->v_bufstr; 3540 v_bufstr = R->v_bufstr;
3492 v_bufptr = R->h->v_bufptr; 3541 v_bufptr = R->v_bufptr;
3493 v_bufend = R->h->v_bufend; 3542 v_bufend = R->v_bufend;
3494 } 3543 }
3495 3544
3496 /* 3545 /*
3497 * Append to the block we already have. Always doing this simplifies the 3546 * Append to the block we already have. Always doing this simplifies the
3498 * code, and isn't too bad, either. If this is a short block, it isn't 3547 * code, and isn't too bad, either. If this is a short block, it isn't
… …
3572 } else { 3621 } else {
3573 /* should we print a warning if couldn't return memory? */ 3622 /* should we print a warning if couldn't return memory? */
3574 v_buffer = v_bufstr - start; /* restore clobbered pointer */ 3623 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3575 } 3624 }
3576 } 3625 }
3577 R->h->v_buffer = v_buffer; 3626 R->v_buffer = v_buffer;
3578 R->h->v_bufstr = v_bufstr; 3627 R->v_bufstr = v_bufstr;
3579 R->h->v_bufptr = v_bufptr; 3628 R->v_bufptr = v_bufptr;
3580 R->h->v_bufend = v_bufend; 3629 R->v_bufend = v_bufend;
3581} 3630}
3582/*----------------------- end-of-file (C source) -----------------------*/ 3631/*----------------------- end-of-file (C source) -----------------------*/
3583 3632

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines