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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.5 by pcg, Tue Nov 25 15:44:38 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.1 2003/11/24 17:28:08 pcg Exp $ 4 * $Id: command.C,v 1.5 2003/11/25 15:44:38 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 659
660void
661rxvt_term::process_x_events ()
662{
663 do
664 {
665 XEvent xev;
666
667 XNextEvent (Xdisplay, &xev);
668
669#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink)
671 && xev.type == KeyPress) {
672 if (hidden_cursor) {
673 hidden_cursor = 0;
674 want_refresh = 1;
675 }
676 blink_ev.start (NOW + BLINK_INTERVAL);
677 }
678#endif
679
680#if defined(POINTER_BLANK)
681 if ((Options & Opt_pointerBlank)
682 && (pointerBlankDelay > 0)) {
683 if (xev.type == MotionNotify
684 || xev.type == ButtonPress
685 || xev.type == ButtonRelease) {
686 if (hidden_pointer)
687 rxvt_pointer_unblank(aR);
688 want_motion_time = 1;
689 }
690 if (xev.type == KeyPress && hidden_pointer == 0)
691 rxvt_pointer_blank (this);
692 }
693#endif
694
695#ifdef USE_XIM
696 if (!XFilterEvent (&xev, xev.xany.window))
697#endif
698 rxvt_process_x_event (this, &xev);
699 }
700 while (XPending (Xdisplay));
701}
702
703void
704rxvt_term::blink_cb (time_watcher &w)
705{
706 w.at += BLINK_INTERVAL;
707 hidden_cursor = !hidden_cursor;
708 want_refresh = 1;
709 flush();
710}
711
712void
713rxvt_term::x_cb (io_watcher &w, short revents)
714{
715 process_x_events ();
716
717 flush ();
718}
719
660// read the next character, currently handles UTF-8 720// read the next character, currently handles UTF-8
661// will probably handle all sorts of other stuff in the future 721// will probably handle all sorts of other stuff in the future
662static uint32_t 722uint32_t
663next_char (pR) 723rxvt_term::next_char ()
664{ 724{
665 rxvt_hidden *h = R->h;
666 mbstate &s = h->mbstate; 725 struct mbstate &s = mbstate;
667 726
668 while (h->cmdbuf_ptr < h->cmdbuf_endp) 727 while (cmdbuf_ptr < cmdbuf_endp)
669 { 728 {
670 uint8_t ch = *h->cmdbuf_ptr; 729 uint8_t ch = *cmdbuf_ptr;
671 730
672 if (s.cnt) 731 if (s.cnt)
673 { 732 {
674 if ((ch & 0xc0) == 0x80) 733 if ((ch & 0xc0) == 0x80)
675 { 734 {
676 h->cmdbuf_ptr++; 735 cmdbuf_ptr++;
677 736
678 /* continuation */ 737 /* continuation */
679 s.reg = (s.reg << 6) | (ch & 0x7f); 738 s.reg = (s.reg << 6) | (ch & 0x7f);
680 739
681 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or hacking */ 740 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
682 return s.reg; 741 return s.reg;
683 742
684 continue; 743 continue;
685 } 744 }
686 else 745 else
… …
690 } 749 }
691 } 750 }
692 751
693 if ((ch & 0xc0) == 0xc0) 752 if ((ch & 0xc0) == 0xc0)
694 { 753 {
695 h->cmdbuf_ptr++; 754 cmdbuf_ptr++;
696 755
697 /* first byte */ 756 /* first byte */
698 s.orig = ch; /* for broken encodings */ 757 s.orig = ch; /* for broken encodings */
699 s.reg = ch; 758 s.reg = ch;
700 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 759 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
… …
703 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 762 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
704 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 763 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
705 } 764 }
706 else 765 else
707 { 766 {
708 h->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 767 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
709 return ch; 768 return ch;
710 } 769 }
711 } 770 }
712 771
713 return NOCHAR; 772 return NOCHAR;
773}
774
775bool
776rxvt_term::pty_fill (size_t count)
777{
778 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779
780 memmove (cmdbuf_base, cmdbuf_ptr, n);
781 cmdbuf_ptr = cmdbuf_base;
782 cmdbuf_endp = cmdbuf_ptr + n;
783
784 n = read (cmd_fd, cmdbuf_endp, count);
785
786 if (n > 0)
787 {
788 cmdbuf_endp += n;
789 return true;
790 }
791 else if (n < 0 && errno == EAGAIN)
792 return false;
793
794 rxvt_clean_exit();
795 exit(EXIT_FAILURE); /* bad order of events? */
796}
797
798void
799rxvt_term::pty_cb (io_watcher &w, short revents)
800{
801 while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
802 {
803 /* once we know the shell is running, send the screen size. Again! */
804 //ch = rxvt_cmd_getc(aR); /* wait for something */
805 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806
807 uint32_t ch = NOCHAR;
808
809 for (;;)
810 {
811 if (ch == NOCHAR)
812 ch = next_char ();
813
814 if (ch == NOCHAR) // TODO: improve
815 break;
816
817 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818 {
819 /* Read a text string from the input buffer */
820 uint32_t buf[BUFSIZ];
821 bool refreshnow = false;
822 int nlines = 0;
823 uint32_t *str = buf;
824
825 *str++ = ch;
826
827 for (;;)
828 {
829 ch = next_char ();
830
831 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832 break;
833 else
834 {
835 *str++ = ch;
836
837 if (ch == '\n')
838 {
839 nlines++;
840 refresh_count++;
841
842 if (!(Options & Opt_jumpScroll)
843 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844 {
845 refreshnow = true;
846 ch = NOCHAR;
847 break;
848 }
849 }
850
851 if (str >= buf + BUFSIZ)
852 {
853 ch = NOCHAR;
854 break;
855 }
856 }
857 }
858
859 rxvt_scr_add_lines (this, buf, nlines, str - buf);
860
861 /*
862 * If there have been a lot of new lines, then update the screen
863 * What the heck I'll cheat and only refresh less than every page-full.
864 * the number of pages between refreshes is refresh_limit, which
865 * is incremented here because we must be doing flat-out scrolling.
866 *
867 * refreshing should be correct for small scrolls, because of the
868 * time-out
869 */
870 if (refreshnow)
871 {
872 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873 refresh_limit++;
874
875 rxvt_scr_refresh (this, refresh_type);
876 }
877
878 }
879 else
880 {
881 switch (ch)
882 {
883 default:
884 rxvt_process_nonprinting (this, ch);
885 break;
886 case C0_ESC: /* escape char */
887 rxvt_process_escape_seq (this);
888 break;
889 /*case 0x9b: */ /* CSI */
890 /* rxvt_process_csi_seq (this); */
891 }
892
893 ch = NOCHAR;
894 }
895 }
896 }
897
898 flush ();
899}
900
901void
902rxvt_term::flush ()
903{
904#ifdef TRANSPARENT
905 if (want_full_refresh)
906 {
907 want_full_refresh = 0;
908 rxvt_scr_clear (this);
909 rxvt_scr_touch (this, False);
910 want_refresh = 1;
911 }
912#endif
913
914 if (want_refresh)
915 {
916 rxvt_scr_refresh (this, refresh_type);
917 rxvt_scrollbar_show (this, 1);
918#ifdef USE_XIM
919 rxvt_IMSendSpot (this);
920#endif
921 }
922
923 XFlush (Xdisplay);
714} 924}
715 925
716/* rxvt_cmd_getc() - Return next input character */ 926/* rxvt_cmd_getc() - Return next input character */
717/* 927/*
718 * Return the next input character after first passing any keyboard input 928 * Return the next input character after first passing any keyboard input
… …
720 */ 930 */
721/* INTPROTO */ 931/* INTPROTO */
722uint32_t 932uint32_t
723rxvt_cmd_getc(pR) 933rxvt_cmd_getc(pR)
724{ 934{
935 for (;;)
936 {
937 uint32_t c = R->next_char ();
938 if (c != NOCHAR)
939 return c;
940
941 // incomplete sequences should occur rarely, still, a better solution
942 // would be preferred. either setjmp/longjmp or better design.
943 fcntl (R->cmd_fd, F_SETFL, 0);
944 R->pty_fill (1);
945 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946 }
947
725#define TIMEOUT_USEC 5000 948#define TIMEOUT_USEC 5000
726 fd_set readfds; 949 fd_set readfds;
727 int quick_timeout, select_res; 950 int quick_timeout, select_res;
728 int want_motion_time, want_keypress_time; 951 int want_motion_time, want_keypress_time;
729 struct timeval value; 952 struct timeval value;
730#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 953#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
731 struct timeval tp; 954 struct timeval tp;
732#endif 955#endif
733 struct rxvt_hidden *h = R->h;
734
735 uint32_t c = next_char (aR);
736 if (c != NOCHAR)
737 return c;
738 956
739 for (;;) { 957 for (;;) {
740 /* loop until we can return something */ 958 /* loop until we can return something */
741 959
742 if (h->v_bufstr < h->v_bufptr) /* output any pending chars */ 960 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
743 rxvt_tt_write(aR_ NULL, 0); 961 rxvt_tt_write(aR_ NULL, 0);
744 962
745#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 963#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
746 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */ 964 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
747#endif 965#endif
… …
750#endif 968#endif
751#if defined(POINTER_BLANK) 969#if defined(POINTER_BLANK)
752 want_motion_time = 0; 970 want_motion_time = 0;
753#endif 971#endif
754 972
755 while (XPending(R->Xdisplay)) { /* process pending X events */ 973 if (XPending (R->Xdisplay))
756 XEvent xev; 974 {
975 R->process_x_events ();
757 976
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 */ 977 /* in case button actions pushed chars to cmdbuf */
791 if (h->cmdbuf_ptr < h->cmdbuf_endp) 978 if (R->cmdbuf_ptr < R->cmdbuf_endp)
792 return *h->cmdbuf_ptr++; 979 return *R->cmdbuf_ptr++;
793 } 980 }
794 981
795#if defined(CURSOR_BLINK) 982#if defined(CURSOR_BLINK)
796 if (want_keypress_time) { 983 if (want_keypress_time) {
797 (void)gettimeofday(&tp, NULL); 984 (void)gettimeofday(&tp, NULL);
798 h->lastcursorchange.tv_sec = tp.tv_sec; 985 R->lastcursorchange.tv_sec = tp.tv_sec;
799 h->lastcursorchange.tv_usec = tp.tv_usec; 986 R->lastcursorchange.tv_usec = tp.tv_usec;
800 } 987 }
801#endif 988#endif
802#if defined(POINTER_BLANK) 989#if defined(POINTER_BLANK)
803 if (want_motion_time) { 990 if (want_motion_time) {
804 if (!tp.tv_sec) 991 if (!tp.tv_sec)
805 (void)gettimeofday(&tp, NULL); 992 (void)gettimeofday(&tp, NULL);
806 h->lastmotion.tv_sec = tp.tv_sec; 993 R->lastmotion.tv_sec = tp.tv_sec;
807 h->lastmotion.tv_usec = tp.tv_usec; 994 R->lastmotion.tv_usec = tp.tv_usec;
808 } 995 }
809#endif 996#endif
810 997
811/* 998/*
812 * the command input buffer is empty and we have no pending X events 999 * the command input buffer is empty and we have no pending X events
813 */ 1000 */
814 quick_timeout = 0; 1001 quick_timeout = 0;
815 1002
816#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
817 if (h->mouse_slip_wheel_speed) { 1004 if (R->mouse_slip_wheel_speed) {
818 quick_timeout = 1; 1005 quick_timeout = 1;
819 if (!h->mouse_slip_wheel_delay-- 1006 if (!R->mouse_slip_wheel_delay--
820 && rxvt_scr_page(aR_ h->mouse_slip_wheel_speed > 0 ? UP : DN, 1007 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
821 abs(h->mouse_slip_wheel_speed))) { 1008 abs(R->mouse_slip_wheel_speed))) {
822 h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1009 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
823 h->refresh_type |= SMOOTH_REFRESH; 1010 R->refresh_type |= SMOOTH_REFRESH;
824 h->want_refresh = 1; 1011 R->want_refresh = 1;
825 } 1012 }
826 } 1013 }
827#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 1014#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
828#ifdef SELECTION_SCROLLING 1015#ifdef SELECTION_SCROLLING
829 if (h->pending_scroll_selection) { 1016 if (R->pending_scroll_selection) {
830 quick_timeout = 1; 1017 quick_timeout = 1;
831 if (!h->scroll_selection_delay-- 1018 if (!R->scroll_selection_delay--
832 && rxvt_scr_page(aR_ h->scroll_selection_dir, 1019 && rxvt_scr_page(aR_ R->scroll_selection_dir,
833 h->scroll_selection_lines)) { 1020 R->scroll_selection_lines)) {
834 rxvt_selection_extend(aR_ h->selection_save_x, 1021 rxvt_selection_extend(aR_ R->selection_save_x,
835 h->selection_save_y, h->selection_save_state); 1022 R->selection_save_y, R->selection_save_state);
836 h->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1023 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
837 h->refresh_type |= SMOOTH_REFRESH; 1024 R->refresh_type |= SMOOTH_REFRESH;
838 h->want_refresh = 1; 1025 R->want_refresh = 1;
839 } 1026 }
840 } 1027 }
841#endif 1028#endif
842#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
843 if (scrollbar_isUp() || scrollbar_isDn()) { 1030 if (scrollbar_isUp() || scrollbar_isDn()) {
844 quick_timeout = 1; 1031 quick_timeout = 1;
845 if (!h->scroll_arrow_delay-- 1032 if (!R->scroll_arrow_delay--
846 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1033 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
847 h->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1034 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
848 h->refresh_type |= SMOOTH_REFRESH; 1035 R->refresh_type |= SMOOTH_REFRESH;
849 h->want_refresh = 1; 1036 R->want_refresh = 1;
850 } 1037 }
851 } 1038 }
852#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1039#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
853 1040
854 FD_ZERO(&readfds); 1041 FD_ZERO(&readfds);
… …
858 value.tv_sec = 0; 1045 value.tv_sec = 0;
859 1046
860 if (!R->TermWin.mapped) 1047 if (!R->TermWin.mapped)
861 quick_timeout = 0; 1048 quick_timeout = 0;
862 else { 1049 else {
863 quick_timeout |= h->want_refresh; 1050 quick_timeout |= R->want_refresh;
864#ifdef TRANSPARENT 1051#ifdef TRANSPARENT
865 quick_timeout |= h->want_full_refresh; 1052 quick_timeout |= R->want_full_refresh;
866#endif 1053#endif
867 } 1054 }
868 1055
869#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 1056#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
870 { 1057 {
… …
876# if defined(CURSOR_BLINK) 1063# if defined(CURSOR_BLINK)
877 if (R->Options & Opt_cursorBlink) { 1064 if (R->Options & Opt_cursorBlink) {
878 if (!tp.tv_sec) /* didn't get it before so get it now */ 1065 if (!tp.tv_sec) /* didn't get it before so get it now */
879 (void)gettimeofday(&tp, NULL); 1066 (void)gettimeofday(&tp, NULL);
880 1067
881 csdiff = (tp.tv_sec - h->lastcursorchange.tv_sec) * 1000000L 1068 csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
882 + tp.tv_usec - h->lastcursorchange.tv_usec; 1069 + tp.tv_usec - R->lastcursorchange.tv_usec;
883 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */ 1070 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
884 h->lastcursorchange.tv_sec = tp.tv_sec; 1071 R->lastcursorchange.tv_sec = tp.tv_sec;
885 h->lastcursorchange.tv_usec = tp.tv_usec; 1072 R->lastcursorchange.tv_usec = tp.tv_usec;
886 h->hidden_cursor = !h->hidden_cursor; 1073 R->hidden_cursor = !R->hidden_cursor;
887 csdiff = 0; 1074 csdiff = 0;
888 } else 1075 } else
889 csdiff = BLINK_TIME - csdiff; 1076 csdiff = BLINK_TIME - csdiff;
890 set_quick_timeout = 1; 1077 set_quick_timeout = 1;
891 } 1078 }
… …
893# if defined(POINTER_BLANK) 1080# if defined(POINTER_BLANK)
894 /* 1081 /*
895 * If we haven't moved the pointer for a while 1082 * If we haven't moved the pointer for a while
896 */ 1083 */
897 if ((R->Options & Opt_pointerBlank) 1084 if ((R->Options & Opt_pointerBlank)
898 && (h->pointerBlankDelay > 0) 1085 && (R->pointerBlankDelay > 0)
899 && (h->hidden_pointer == 0)) { 1086 && (R->hidden_pointer == 0)) {
900 long pdelay; 1087 long pdelay;
901 1088
902 if (!tp.tv_sec) /* didn't get it before so get it now */ 1089 if (!tp.tv_sec) /* didn't get it before so get it now */
903 (void)gettimeofday(&tp, NULL); 1090 (void)gettimeofday(&tp, NULL);
904 psdiff = (tp.tv_sec - h->lastmotion.tv_sec) * 1000000L 1091 psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
905 + tp.tv_usec - h->lastmotion.tv_usec; 1092 + tp.tv_usec - R->lastmotion.tv_usec;
906 pdelay = h->pointerBlankDelay * 1000000L; 1093 pdelay = R->pointerBlankDelay * 1000000L;
907 if (psdiff >= pdelay) 1094 if (psdiff >= pdelay)
908 rxvt_pointer_blank(aR); 1095 rxvt_pointer_blank(aR);
909 else { 1096 else {
910 set_quick_timeout = 1; 1097 set_quick_timeout = 1;
911 psdiff = pdelay - psdiff; 1098 psdiff = pdelay - psdiff;
… …
922#endif 1109#endif
923 1110
924 if ((select_res = select(R->num_fds, &readfds, NULL, NULL, 1111 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
925 (quick_timeout ? &value : NULL))) == 0) { 1112 (quick_timeout ? &value : NULL))) == 0) {
926 /* select statement timed out - we're not hard and fast scrolling */ 1113 /* select statement timed out - we're not hard and fast scrolling */
927 h->refresh_limit = 1; 1114 R->refresh_limit = 1;
928 } 1115 }
929#if defined(CURSOR_BLINK) 1116#if defined(CURSOR_BLINK)
930 if (R->Options & Opt_cursorBlink) 1117 if (R->Options & Opt_cursorBlink)
931 h->want_refresh = 1; 1118 R->want_refresh = 1;
932#endif 1119#endif
933
934 /* See if we can read new data from the application */
935 if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) {
936 int n;
937 unsigned int count;
938
939 h->cmdbuf_ptr = h->cmdbuf_endp = h->cmdbuf_base;
940 for (count = BUFSIZ; count; count -= n, h->cmdbuf_endp += n)
941 if ((n = read(R->cmd_fd, h->cmdbuf_endp, count)) > 0)
942 continue;
943 else if (n == 0 || (n < 0 && errno == EAGAIN))
944 break;
945 else {
946 rxvt_clean_exit();
947 exit(EXIT_FAILURE); /* bad order of events? */
948 }
949
950 if (count != BUFSIZ) /* some characters read in */
951 {
952 uint32_t c = next_char (aR);
953 if (c != NOCHAR)
954 return c;
955 }
956 }
957#ifdef TRANSPARENT
958 if (h->want_full_refresh) {
959 h->want_full_refresh = 0;
960 rxvt_scr_clear(aR);
961 rxvt_scr_touch(aR_ False);
962 h->want_refresh = 1;
963 }
964#endif
965 if (h->want_refresh) {
966 rxvt_scr_refresh(aR_ h->refresh_type);
967 rxvt_scrollbar_show(aR_ 1);
968#ifdef USE_XIM
969 rxvt_IMSendSpot(aR);
970#endif
971 }
972 } 1120 }
973/* NOTREACHED */
974} 1121}
975/*}}} */
976 1122
977/* EXTPROTO */ 1123/* EXTPROTO */
978void 1124void
979rxvt_pointer_unblank(pR) 1125rxvt_pointer_unblank(pR)
980{ 1126{
981 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1127 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);
982 rxvt_recolour_cursor(aR); 1128 rxvt_recolour_cursor(aR);
983#ifdef POINTER_BLANK 1129#ifdef POINTER_BLANK
984 R->h->hidden_pointer = 0; 1130 R->hidden_pointer = 0;
985 if (R->h->pointerBlankDelay > 0) { 1131 if (R->pointerBlankDelay > 0) {
986 struct timeval tp; 1132 struct timeval tp;
987 1133
988 (void)gettimeofday(&tp, NULL); 1134 (void)gettimeofday(&tp, NULL);
989 R->h->lastmotion.tv_sec = tp.tv_sec; 1135 R->lastmotion.tv_sec = tp.tv_sec;
990 R->h->lastmotion.tv_usec = tp.tv_usec; 1136 R->lastmotion.tv_usec = tp.tv_usec;
991 } 1137 }
992#endif 1138#endif
993} 1139}
994 1140
995#ifdef POINTER_BLANK 1141#ifdef POINTER_BLANK
996/* INTPROTO */ 1142/* INTPROTO */
997void 1143void
998rxvt_pointer_blank(pR) 1144rxvt_pointer_blank(pR)
999{ 1145{
1000 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->h->pointer_blank); 1146 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);
1001 XFlush(R->Xdisplay); 1147 XFlush(R->Xdisplay);
1002 R->h->hidden_pointer = 1; 1148 R->hidden_pointer = 1;
1003} 1149}
1004#endif 1150#endif
1005 1151
1006/* INTPROTO */ 1152/* INTPROTO */
1007void 1153void
… …
1012 1158
1013 x = ev->x; 1159 x = ev->x;
1014 y = ev->y; 1160 y = ev->y;
1015 rxvt_pixel_position(aR_ &x, &y); 1161 rxvt_pixel_position(aR_ &x, &y);
1016 1162
1017 if (R->h->MEvent.button == AnyButton) { 1163 if (R->MEvent.button == AnyButton) {
1018 button_number = 3; 1164 button_number = 3;
1019 } else { 1165 } else {
1020 button_number = R->h->MEvent.button - Button1; 1166 button_number = R->MEvent.button - Button1;
1021 /* add 0x3D for wheel events, like xterm does */ 1167 /* add 0x3D for wheel events, like xterm does */
1022 if (button_number >= 3) 1168 if (button_number >= 3)
1023 button_number += (64 - 3); 1169 button_number += (64 - 3);
1024 } 1170 }
1025 1171
1026 if (R->h->PrivateModes & PrivMode_MouseX10) { 1172 if (R->PrivateModes & PrivMode_MouseX10) {
1027 /* 1173 /*
1028 * do not report ButtonRelease 1174 * do not report ButtonRelease
1029 * no state info allowed 1175 * no state info allowed
1030 */ 1176 */
1031 key_state = 0; 1177 key_state = 0;
… …
1037 * 8 = Meta 1183 * 8 = Meta
1038 * 16 = Control 1184 * 16 = Control
1039 * plus will add in our own Double-Click reporting 1185 * plus will add in our own Double-Click reporting
1040 * 32 = Double Click 1186 * 32 = Double Click
1041 */ 1187 */
1042 key_state = ((R->h->MEvent.state & ShiftMask) ? 4 : 0) 1188 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0)
1043 + ((R->h->MEvent.state & R->h->ModMetaMask) ? 8 : 0) 1189 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0)
1044 + ((R->h->MEvent.state & ControlMask) ? 16 : 0); 1190 + ((R->MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1191#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((R->h->MEvent.clicks > 1) ? 32 : 0); 1192 key_state += ((R->MEvent.clicks > 1) ? 32 : 0);
1047#endif 1193#endif
1048 } 1194 }
1049 1195
1050#ifdef DEBUG_MOUSEREPORT 1196#ifdef DEBUG_MOUSEREPORT
1051 fprintf(stderr, "Mouse ["); 1197 fprintf(stderr, "Mouse [");
… …
1088 int i, want_timeout; 1234 int i, want_timeout;
1089 Window unused_root, unused_child; 1235 Window unused_root, unused_child;
1090 int unused_root_x, unused_root_y; 1236 int unused_root_x, unused_root_y;
1091 unsigned int unused_mask; 1237 unsigned int unused_mask;
1092 struct timeval tp; 1238 struct timeval tp;
1093 struct rxvt_hidden *h = R->h; 1239
1094#ifdef DEBUG_X 1240#ifdef DEBUG_X
1095 const char *const eventnames[] = 1241 const char *const eventnames[] =
1096 { /* mason - this matches my system */ 1242 { /* mason - this matches my system */
1097 "", 1243 "",
1098 "", 1244 "",
… …
1136 /* 1282 /*
1137 * check if we need to get the time for any timeouts 1283 * check if we need to get the time for any timeouts
1138 */ 1284 */
1139 1285
1140 for (i = NUM_TIMEOUTS; i--; ) 1286 for (i = NUM_TIMEOUTS; i--; )
1141 if (h->timeout[i].tv_sec) { 1287 if (R->timeout[i].tv_sec) {
1142 want_timeout = 1; 1288 want_timeout = 1;
1143 break; 1289 break;
1144 } 1290 }
1145 1291
1146#ifndef DEBUG_X 1292#ifndef DEBUG_X
… …
1154#endif 1300#endif
1155 1301
1156 /* X event timeouts */ 1302 /* X event timeouts */
1157 if (want_timeout) 1303 if (want_timeout)
1158 for (i = NUM_TIMEOUTS; i--; ) { 1304 for (i = NUM_TIMEOUTS; i--; ) {
1159 if (h->timeout[i].tv_sec == 0) 1305 if (R->timeout[i].tv_sec == 0)
1160 continue; 1306 continue;
1161 if ((tp.tv_sec < h->timeout[i].tv_sec) 1307 if ((tp.tv_sec < R->timeout[i].tv_sec)
1162 || (tp.tv_sec == h->timeout[i].tv_sec 1308 || (tp.tv_sec == R->timeout[i].tv_sec
1163 && tp.tv_usec < h->timeout[i].tv_usec)) 1309 && tp.tv_usec < R->timeout[i].tv_usec))
1164 continue; 1310 continue;
1165 h->timeout[i].tv_sec = 0; 1311 R->timeout[i].tv_sec = 0;
1166 switch(i) { 1312 switch(i) {
1167 case TIMEOUT_INCR: 1313 case TIMEOUT_INCR:
1168 rxvt_print_error("data loss: timeout on INCR selection paste"); 1314 rxvt_print_error("data loss: timeout on INCR selection paste");
1169 h->selection_wait = Sel_none; 1315 R->selection_wait = Sel_none;
1170 break; 1316 break;
1171 default: 1317 default:
1172 break; 1318 break;
1173 } 1319 }
1174 } 1320 }
… …
1180 1326
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1328 case KeyRelease:
1183 { 1329 {
1184 if (!(ev->xkey.state & ControlMask)) 1330 if (!(ev->xkey.state & ControlMask))
1185 h->mouse_slip_wheel_speed = 0; 1331 R->mouse_slip_wheel_speed = 0;
1186 else { 1332 else {
1187 KeySym ks; 1333 KeySym ks;
1188 1334
1189 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1335 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0);
1190 if (ks == XK_Control_L || ks == XK_Control_R) 1336 if (ks == XK_Control_L || ks == XK_Control_R)
1191 h->mouse_slip_wheel_speed = 0; 1337 R->mouse_slip_wheel_speed = 0;
1192 } 1338 }
1193 break; 1339 break;
1194 } 1340 }
1195#endif 1341#endif
1196 1342
… …
1202 rxvt_button_release(aR_ (XButtonEvent *)ev); 1348 rxvt_button_release(aR_ (XButtonEvent *)ev);
1203 break; 1349 break;
1204 1350
1205 case ClientMessage: 1351 case ClientMessage:
1206 if (ev->xclient.format == 32 1352 if (ev->xclient.format == 32
1207 && (Atom)ev->xclient.data.l[0] == h->xa[XA_WMDELETEWINDOW]) 1353 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1208 exit(EXIT_SUCCESS); 1354 exit(EXIT_SUCCESS);
1209#ifdef OFFIX_DND 1355#ifdef OFFIX_DND
1210 /* OffiX Dnd (drag 'n' drop) protocol */ 1356 /* OffiX Dnd (drag 'n' drop) protocol */
1211 if (ev->xclient.message_type == h->xa[XA_DNDPROTOCOL] 1357 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1212 && (ev->xclient.data.l[0] == DndFile 1358 && (ev->xclient.data.l[0] == DndFile
1213 || ev->xclient.data.l[0] == DndDir 1359 || ev->xclient.data.l[0] == DndDir
1214 || ev->xclient.data.l[0] == DndLink)) { 1360 || ev->xclient.data.l[0] == DndLink)) {
1215 /* Get Dnd data */ 1361 /* Get Dnd data */
1216 Atom ActualType; 1362 Atom ActualType;
1217 int ActualFormat; 1363 int ActualFormat;
1218 unsigned char *data; 1364 unsigned char *data;
1219 unsigned long Size, RemainingBytes; 1365 unsigned long Size, RemainingBytes;
1220 1366
1221 XGetWindowProperty(R->Xdisplay, Xroot, 1367 XGetWindowProperty(R->Xdisplay, Xroot,
1222 R->h->xa[XA_DNDSELECTION], 1368 R->xa[XA_DNDSELECTION],
1223 0L, 1000000L, 1369 0L, 1000000L,
1224 False, AnyPropertyType, 1370 False, AnyPropertyType,
1225 &ActualType, &ActualFormat, 1371 &ActualType, &ActualFormat,
1226 &Size, &RemainingBytes, 1372 &Size, &RemainingBytes,
1227 &data); 1373 &data);
… …
1250 * which ought to make things real slow! 1396 * which ought to make things real slow!
1251 */ 1397 */
1252 case VisibilityNotify: 1398 case VisibilityNotify:
1253 switch (ev->xvisibility.state) { 1399 switch (ev->xvisibility.state) {
1254 case VisibilityUnobscured: 1400 case VisibilityUnobscured:
1255 h->refresh_type = FAST_REFRESH; 1401 R->refresh_type = FAST_REFRESH;
1256 break; 1402 break;
1257 case VisibilityPartiallyObscured: 1403 case VisibilityPartiallyObscured:
1258 h->refresh_type = SLOW_REFRESH; 1404 R->refresh_type = SLOW_REFRESH;
1259 break; 1405 break;
1260 default: 1406 default:
1261 h->refresh_type = NO_REFRESH; 1407 R->refresh_type = NO_REFRESH;
1262 break; 1408 break;
1263 } 1409 }
1264 break; 1410 break;
1265 1411
1266 case FocusIn: 1412 case FocusIn:
1267 if (!R->TermWin.focus) { 1413 if (!R->TermWin.focus) {
1268 R->TermWin.focus = 1; 1414 R->TermWin.focus = 1;
1269 h->want_refresh = 1; 1415 R->want_refresh = 1;
1270#ifdef USE_XIM 1416#ifdef USE_XIM
1271 if (h->Input_Context != NULL) 1417 if (R->Input_Context != NULL)
1272 XSetICFocus(h->Input_Context); 1418 XSetICFocus(R->Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (R->Options & Opt_cursorBlink)
1422 R->blink_ev.start (NOW + BLINK_INTERVAL);
1273#endif 1423#endif
1274 } 1424 }
1275 break; 1425 break;
1276 1426
1277 case FocusOut: 1427 case FocusOut:
1278 if (R->TermWin.focus) { 1428 if (R->TermWin.focus) {
1279 R->TermWin.focus = 0; 1429 R->TermWin.focus = 0;
1280 h->want_refresh = 1; 1430 R->want_refresh = 1;
1281#ifdef USE_XIM 1431#ifdef USE_XIM
1282 if (h->Input_Context != NULL) 1432 if (R->Input_Context != NULL)
1283 XUnsetICFocus(h->Input_Context); 1433 XUnsetICFocus(R->Input_Context);
1434#endif
1435#ifdef CURSOR_BLINK
1436 if (R->Options & Opt_cursorBlink)
1437 R->blink_ev.stop ();
1438 R->hidden_cursor = 0;
1284#endif 1439#endif
1285 } 1440 }
1286 break; 1441 break;
1287 1442
1288 case ConfigureNotify: 1443 case ConfigureNotify:
… …
1306 } 1461 }
1307#endif 1462#endif
1308#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1309 if (R->Options & Opt_transparent) { 1464 if (R->Options & Opt_transparent) {
1310 rxvt_check_our_parents(aR); 1465 rxvt_check_our_parents(aR);
1311 if (h->am_transparent) 1466 if (R->am_transparent)
1312 h->want_full_refresh = 1; 1467 R->want_full_refresh = 1;
1313 } 1468 }
1314#endif 1469#endif
1315 } 1470 }
1316 break; 1471 break;
1317 1472
1318 case SelectionClear: 1473 case SelectionClear:
1319 rxvt_selection_clear(aR); 1474 rxvt_selection_clear(aR);
1320 break; 1475 break;
1321 1476
1322 case SelectionNotify: 1477 case SelectionNotify:
1323 if (h->selection_wait == Sel_normal) 1478 if (R->selection_wait == Sel_normal)
1324 rxvt_selection_paste(aR_ ev->xselection.requestor, 1479 rxvt_selection_paste(aR_ ev->xselection.requestor,
1325 ev->xselection.property, True); 1480 ev->xselection.property, True);
1326 break; 1481 break;
1327 1482
1328 case SelectionRequest: 1483 case SelectionRequest:
… …
1336 case MapNotify: 1491 case MapNotify:
1337 R->TermWin.mapped = 1; 1492 R->TermWin.mapped = 1;
1338 break; 1493 break;
1339 1494
1340 case PropertyNotify: 1495 case PropertyNotify:
1341 if (ev->xproperty.atom == h->xa[XA_VT_SELECTION]) { 1496 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1342 if (ev->xproperty.state == PropertyNewValue) 1497 if (ev->xproperty.state == PropertyNewValue)
1343 rxvt_selection_property(aR_ ev->xproperty.window, 1498 rxvt_selection_property(aR_ ev->xproperty.window,
1344 ev->xproperty.atom); 1499 ev->xproperty.atom);
1345 break; 1500 break;
1346 } 1501 }
1347#ifdef TRANSPARENT 1502#ifdef TRANSPARENT
1348 /* 1503 /*
1349 * if user used some Esetroot compatible prog to set the root bg, 1504 * 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. 1505 * use the property to determine the pixmap. We use it later on.
1351 */ 1506 */
1352 if (h->xa[XA_XROOTPMAPID] == 0) 1507 if (R->xa[XA_XROOTPMAPID] == 0)
1353 h->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1508 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1354 "_XROOTPMAP_ID", False); 1509 "_XROOTPMAP_ID", False);
1355 if (ev->xproperty.atom != h->xa[XA_XROOTPMAPID]) 1510 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1356 break; 1511 break;
1357 /* FALLTHROUGH */ 1512 /* FALLTHROUGH */
1358 case ReparentNotify: 1513 case ReparentNotify:
1359 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1514 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) {
1360 if (h->am_transparent) 1515 if (R->am_transparent)
1361 h->want_full_refresh = 1; 1516 R->want_full_refresh = 1;
1362 } 1517 }
1363#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1364 break; 1519 break;
1365 1520
1366 case GraphicsExpose: 1521 case GraphicsExpose:
… …
1374 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1529 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,
1375 ev->xexpose.width, ev->xexpose.height, False); 1530 ev->xexpose.width, ev->xexpose.height, False);
1376 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1531 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1377 // ev->xexpose.width, R->TermWin.height, False); 1532 // ev->xexpose.width, R->TermWin.height, False);
1378#endif 1533#endif
1379 h->want_refresh = 1; 1534 R->want_refresh = 1;
1380 } else { 1535 } else {
1381 XEvent unused_xevent; 1536 XEvent unused_xevent;
1382 1537
1383 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1538 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1384 Expose, 1539 Expose,
… …
1400 } 1555 }
1401 break; 1556 break;
1402 1557
1403 case MotionNotify: 1558 case MotionNotify:
1404#ifdef POINTER_BLANK 1559#ifdef POINTER_BLANK
1405 if (R->h->hidden_pointer) 1560 if (R->hidden_pointer)
1406 rxvt_pointer_unblank(aR); 1561 rxvt_pointer_unblank(aR);
1407#endif 1562#endif
1408#if MENUBAR 1563#if MENUBAR
1409 if (isMenuBarWindow(ev->xany.window)) { 1564 if (isMenuBarWindow(ev->xany.window)) {
1410 rxvt_menubar_control(aR_ &(ev->xbutton)); 1565 rxvt_menubar_control(aR_ &(ev->xbutton));
1411 break; 1566 break;
1412 } 1567 }
1413#endif 1568#endif
1414 if ((h->PrivateModes & PrivMode_mouse_report) && !(h->bypass_keystate)) 1569 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate))
1415 break; 1570 break;
1416 1571
1417 if (ev->xany.window == R->TermWin.vt) { 1572 if (ev->xany.window == R->TermWin.vt) {
1418 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1573 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1419 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1574 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt,
… …
1423 &unused_root_x, &unused_root_y, 1578 &unused_root_x, &unused_root_y,
1424 &(ev->xbutton.x), &(ev->xbutton.y), 1579 &(ev->xbutton.x), &(ev->xbutton.y),
1425 &unused_mask); 1580 &unused_mask);
1426#ifdef MOUSE_THRESHOLD 1581#ifdef MOUSE_THRESHOLD
1427 /* deal with a `jumpy' mouse */ 1582 /* deal with a `jumpy' mouse */
1428 if ((ev->xmotion.time - h->MEvent.time) > MOUSE_THRESHOLD) { 1583 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1429#endif 1584#endif
1430 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1585 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),
1431 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1586 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1432#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1433 if (ev->xbutton.y<R->TermWin.int_bwidth || 1588 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1434 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1589 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1435 int dist; 1590 int dist;
1436 1591
1437 h->pending_scroll_selection=1; 1592 R->pending_scroll_selection=1;
1438 1593
1439 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1440 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1441 */ 1596 */
1442 if (h->scroll_selection_delay<=0) 1597 if (R->scroll_selection_delay<=0)
1443 h->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1598 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1444 1599
1445 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1446 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1447 */ 1602 */
1448 h->selection_save_x=ev->xbutton.x; 1603 R->selection_save_x=ev->xbutton.x;
1449 h->selection_save_y=ev->xbutton.y; 1604 R->selection_save_y=ev->xbutton.y;
1450 h->selection_save_state= 1605 R->selection_save_state=
1451 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1606 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1452 1607
1453 /* calc number of lines to scroll */ 1608 /* calc number of lines to scroll */
1454 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1609 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1455 h->scroll_selection_dir = UP; 1610 R->scroll_selection_dir = UP;
1456 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1611 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1457 } 1612 }
1458 else { 1613 else {
1459 h->scroll_selection_dir = DN; 1614 R->scroll_selection_dir = DN;
1460 dist = ev->xbutton.y - 1615 dist = ev->xbutton.y -
1461 (R->TermWin.int_bwidth + R->TermWin.height); 1616 (R->TermWin.int_bwidth + R->TermWin.height);
1462 } 1617 }
1463 h->scroll_selection_lines=(Pixel2Height(dist)/ 1618 R->scroll_selection_lines=(Pixel2Height(dist)/
1464 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1465 MIN_IT(h->scroll_selection_lines, 1620 MIN_IT(R->scroll_selection_lines,
1466 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1467 } 1622 }
1468 else { 1623 else {
1469 /* we are within the text window, so we 1624 /* we are within the text window, so we
1470 * shouldn't be scrolling 1625 * shouldn't be scrolling
1471 */ 1626 */
1472 h->pending_scroll_selection = 0; 1627 R->pending_scroll_selection = 0;
1473 } 1628 }
1474#endif 1629#endif
1475#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1476 } 1631 }
1477#endif 1632#endif
… …
1482 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1637 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1483 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1484 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1485 &(ev->xbutton.x), &(ev->xbutton.y), 1640 &(ev->xbutton.x), &(ev->xbutton.y),
1486 &unused_mask); 1641 &unused_mask);
1487 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - h->csrO, 1642 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1488 scrollbar_size()); 1643 scrollbar_size());
1489 rxvt_scr_refresh(aR_ h->refresh_type); 1644 rxvt_scr_refresh(aR_ R->refresh_type);
1490 h->refresh_limit = 0; 1645 R->refresh_limit = 0;
1491 rxvt_scrollbar_show(aR_ 1); 1646 rxvt_scrollbar_show(aR_ 1);
1492 } 1647 }
1493 break; 1648 break;
1494 } 1649 }
1495} 1650}
… …
1497/* INTPROTO */ 1652/* INTPROTO */
1498void 1653void
1499rxvt_button_press(pR_ XButtonEvent *ev) 1654rxvt_button_press(pR_ XButtonEvent *ev)
1500{ 1655{
1501 int reportmode = 0, clickintime; 1656 int reportmode = 0, clickintime;
1502 struct rxvt_hidden *h = R->h;
1503 1657
1504 h->bypass_keystate = ev->state & (h->ModMetaMask | ShiftMask); 1658 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1505 if (!h->bypass_keystate) 1659 if (!R->bypass_keystate)
1506 reportmode = !!(h->PrivateModes & PrivMode_mouse_report); 1660 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1507/* 1661/*
1508 * VT window processing of button press 1662 * VT window processing of button press
1509 */ 1663 */
1510 if (ev->window == R->TermWin.vt) 1664 if (ev->window == R->TermWin.vt)
1511 { 1665 {
… …
1513 if (ev->subwindow != None) 1667 if (ev->subwindow != None)
1514 rxvt_Gr_ButtonPress(ev->x, ev->y); 1668 rxvt_Gr_ButtonPress(ev->x, ev->y);
1515 else 1669 else
1516#endif 1670#endif
1517 { 1671 {
1518 clickintime = ev->time - h->MEvent.time < MULTICLICK_TIME; 1672 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1519 if (reportmode) 1673 if (reportmode)
1520 { 1674 {
1521 /* mouse report from vt window */ 1675 /* mouse report from vt window */
1522 /* save the xbutton state (for ButtonRelease) */ 1676 /* save the xbutton state (for ButtonRelease) */
1523 h->MEvent.state = ev->state; 1677 R->MEvent.state = ev->state;
1524#ifdef MOUSE_REPORT_DOUBLECLICK 1678#ifdef MOUSE_REPORT_DOUBLECLICK
1525 if (ev->button == h->MEvent.button && clickintime) 1679 if (ev->button == R->MEvent.button && clickintime)
1526 { 1680 {
1527 /* same button, within alloted time */ 1681 /* same button, within alloted time */
1528 h->MEvent.clicks++; 1682 R->MEvent.clicks++;
1529 if (h->MEvent.clicks > 1) 1683 if (R->MEvent.clicks > 1)
1530 { 1684 {
1531 /* only report double clicks */ 1685 /* only report double clicks */
1532 h->MEvent.clicks = 2; 1686 R->MEvent.clicks = 2;
1533 rxvt_mouse_report(aR_ ev); 1687 rxvt_mouse_report(aR_ ev);
1534 1688
1535 /* don't report the release */ 1689 /* don't report the release */
1536 h->MEvent.clicks = 0; 1690 R->MEvent.clicks = 0;
1537 h->MEvent.button = AnyButton; 1691 R->MEvent.button = AnyButton;
1538 } 1692 }
1539 } 1693 }
1540 else 1694 else
1541 { 1695 {
1542 /* different button, or time expired */ 1696 /* different button, or time expired */
1543 h->MEvent.clicks = 1; 1697 R->MEvent.clicks = 1;
1544 h->MEvent.button = ev->button; 1698 R->MEvent.button = ev->button;
1545 rxvt_mouse_report(aR_ ev); 1699 rxvt_mouse_report(aR_ ev);
1546 } 1700 }
1547#else 1701#else
1548 h->MEvent.button = ev->button; 1702 R->MEvent.button = ev->button;
1549 rxvt_mouse_report(aR_ ev); 1703 rxvt_mouse_report(aR_ ev);
1550#endif /* MOUSE_REPORT_DOUBLECLICK */ 1704#endif /* MOUSE_REPORT_DOUBLECLICK */
1551 } 1705 }
1552 else 1706 else
1553 { 1707 {
1554 if (ev->button != h->MEvent.button) 1708 if (ev->button != R->MEvent.button)
1555 h->MEvent.clicks = 0; 1709 R->MEvent.clicks = 0;
1556 switch (ev->button) 1710 switch (ev->button)
1557 { 1711 {
1558 case Button1: 1712 case Button1:
1559 if (h->MEvent.button == Button1 && clickintime) 1713 if (R->MEvent.button == Button1 && clickintime)
1560 h->MEvent.clicks++; 1714 R->MEvent.clicks++;
1561 else 1715 else
1562 h->MEvent.clicks = 1; 1716 R->MEvent.clicks = 1;
1563 rxvt_selection_click(aR_ h->MEvent.clicks, ev->x, ev->y); 1717 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1564 h->MEvent.button = Button1; 1718 R->MEvent.button = Button1;
1565 break; 1719 break;
1566 1720
1567 case Button3: 1721 case Button3:
1568 if (h->MEvent.button == Button3 && clickintime) 1722 if (R->MEvent.button == Button3 && clickintime)
1569 rxvt_selection_rotate(aR_ ev->x, ev->y); 1723 rxvt_selection_rotate(aR_ ev->x, ev->y);
1570 else 1724 else
1571 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1725 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1572 h->MEvent.button = Button3; 1726 R->MEvent.button = Button3;
1573 break; 1727 break;
1574 } 1728 }
1575 } 1729 }
1576 h->MEvent.time = ev->time; 1730 R->MEvent.time = ev->time;
1577 return; 1731 return;
1578 } 1732 }
1579 } 1733 }
1580 1734
1581/* 1735/*
… …
1640 else if (scrollbarrxvt_dnButton(ev->y)) 1794 else if (scrollbarrxvt_dnButton(ev->y))
1641 upordown = 1; /* down */ 1795 upordown = 1; /* down */
1642 } 1796 }
1643 if (upordown) { 1797 if (upordown) {
1644#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1798#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1645 h->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1799 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1646#endif 1800#endif
1647 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1801 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1648 if (upordown < 0) 1802 if (upordown < 0)
1649 scrollbar_setUp(); 1803 scrollbar_setUp();
1650 else 1804 else
1651 scrollbar_setDn(); 1805 scrollbar_setDn();
1652 } 1806 }
1653 } else 1807 } else
1654 switch (ev->button) { 1808 switch (ev->button) {
1655 case Button2: 1809 case Button2:
1656 switch (h->scrollbar_align) { 1810 switch (R->scrollbar_align) {
1657 case R_SB_ALIGN_TOP: 1811 case R_SB_ALIGN_TOP:
1658 h->csrO = 0; 1812 R->csrO = 0;
1659 break; 1813 break;
1660 case R_SB_ALIGN_CENTRE: 1814 case R_SB_ALIGN_CENTRE:
1661 h->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1815 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1662 break; 1816 break;
1663 case R_SB_ALIGN_BOTTOM: 1817 case R_SB_ALIGN_BOTTOM:
1664 h->csrO = R->scrollBar.bot - R->scrollBar.top; 1818 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1665 break; 1819 break;
1666 } 1820 }
1667 if (R->scrollBar.style == R_SB_XTERM 1821 if (R->scrollBar.style == R_SB_XTERM
1668 || scrollbar_above_slider(ev->y) 1822 || scrollbar_above_slider(ev->y)
1669 || scrollbar_below_slider(ev->y)) 1823 || scrollbar_below_slider(ev->y))
1670 rxvt_scr_move_to(aR_ 1824 rxvt_scr_move_to(aR_
1671 scrollbar_position(ev->y) - h->csrO, 1825 scrollbar_position(ev->y) - R->csrO,
1672 scrollbar_size()); 1826 scrollbar_size());
1673 scrollbar_setMotion(); 1827 scrollbar_setMotion();
1674 break; 1828 break;
1675 1829
1676 case Button1: 1830 case Button1:
1677 if (h->scrollbar_align == R_SB_ALIGN_CENTRE) 1831 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1678 h->csrO = ev->y - R->scrollBar.top; 1832 R->csrO = ev->y - R->scrollBar.top;
1679 /* FALLTHROUGH */ 1833 /* FALLTHROUGH */
1680 1834
1681 case Button3: 1835 case Button3:
1682 if (R->scrollBar.style != R_SB_XTERM) { 1836 if (R->scrollBar.style != R_SB_XTERM) {
1683 if (scrollbar_above_slider(ev->y)) 1837 if (scrollbar_above_slider(ev->y))
… …
1718void 1872void
1719rxvt_button_release(pR_ XButtonEvent *ev) 1873rxvt_button_release(pR_ XButtonEvent *ev)
1720{ 1874{
1721 int reportmode = 0; 1875 int reportmode = 0;
1722 1876
1723 R->h->csrO = 0; /* reset csr Offset */ 1877 R->csrO = 0; /* reset csr Offset */
1724 if (!R->h->bypass_keystate) 1878 if (!R->bypass_keystate)
1725 reportmode = !!(R->h->PrivateModes & PrivMode_mouse_report); 1879 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1726 1880
1727 if (scrollbar_isUpDn()) { 1881 if (scrollbar_isUpDn()) {
1728 scrollbar_setIdle(); 1882 scrollbar_setIdle();
1729 rxvt_scrollbar_show(aR_ 0); 1883 rxvt_scrollbar_show(aR_ 0);
1730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1731 R->h->refresh_type &= ~SMOOTH_REFRESH; 1885 R->refresh_type &= ~SMOOTH_REFRESH;
1732#endif 1886#endif
1733 } 1887 }
1734#ifdef SELECTION_SCROLLING 1888#ifdef SELECTION_SCROLLING
1735 R->h->pending_scroll_selection=0; 1889 R->pending_scroll_selection=0;
1736#endif 1890#endif
1737 if (ev->window == R->TermWin.vt) 1891 if (ev->window == R->TermWin.vt)
1738 { 1892 {
1739#ifdef RXVT_GRAPHICS 1893#ifdef RXVT_GRAPHICS
1740 if (ev->subwindow != None) 1894 if (ev->subwindow != None)
… …
1748 /* don't report release of wheel "buttons" */ 1902 /* don't report release of wheel "buttons" */
1749 if (ev->button >= 4) 1903 if (ev->button >= 4)
1750 return; 1904 return;
1751#ifdef MOUSE_REPORT_DOUBLECLICK 1905#ifdef MOUSE_REPORT_DOUBLECLICK
1752 /* only report the release of 'slow' single clicks */ 1906 /* only report the release of 'slow' single clicks */
1753 if (R->h->MEvent.button != AnyButton 1907 if (R->MEvent.button != AnyButton
1754 && (ev->button != R->h->MEvent.button 1908 && (ev->button != R->MEvent.button
1755 || (ev->time - R->h->MEvent.time 1909 || (ev->time - R->MEvent.time
1756 > MULTICLICK_TIME / 2))) 1910 > MULTICLICK_TIME / 2)))
1757 { 1911 {
1758 R->h->MEvent.clicks = 0; 1912 R->MEvent.clicks = 0;
1759 R->h->MEvent.button = AnyButton; 1913 R->MEvent.button = AnyButton;
1760 rxvt_mouse_report(aR_ ev); 1914 rxvt_mouse_report(aR_ ev);
1761 } 1915 }
1762#else /* MOUSE_REPORT_DOUBLECLICK */ 1916#else /* MOUSE_REPORT_DOUBLECLICK */
1763 R->h->MEvent.button = AnyButton; 1917 R->MEvent.button = AnyButton;
1764 rxvt_mouse_report(aR_ ev); 1918 rxvt_mouse_report(aR_ ev);
1765#endif /* MOUSE_REPORT_DOUBLECLICK */ 1919#endif /* MOUSE_REPORT_DOUBLECLICK */
1766 return; 1920 return;
1767 } 1921 }
1768 /* 1922 /*
1769 * dumb hack to compensate for the failure of click-and-drag 1923 * dumb hack to compensate for the failure of click-and-drag
1770 * when overriding mouse reporting 1924 * when overriding mouse reporting
1771 */ 1925 */
1772 if (R->h->PrivateModes & PrivMode_mouse_report 1926 if (R->PrivateModes & PrivMode_mouse_report
1773 && R->h->bypass_keystate 1927 && R->bypass_keystate
1774 && ev->button == Button1 && R->h->MEvent.clicks <= 1) 1928 && ev->button == Button1 && R->MEvent.clicks <= 1)
1775 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1929 rxvt_selection_extend(aR_ ev->x, ev->y, 0);
1776 1930
1777 switch (ev->button) { 1931 switch (ev->button) {
1778 case Button1: 1932 case Button1:
1779 case Button3: 1933 case Button3:
… …
1796 else 1950 else
1797 i = 5; 1951 i = 5;
1798# ifdef MOUSE_SLIP_WHEELING 1952# ifdef MOUSE_SLIP_WHEELING
1799 if (ev->state & ControlMask) 1953 if (ev->state & ControlMask)
1800 { 1954 {
1801 R->h->mouse_slip_wheel_speed += (v ? -1 : 1); 1955 R->mouse_slip_wheel_speed += (v ? -1 : 1);
1802 R->h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1956 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1803 } 1957 }
1804# endif 1958# endif
1805# ifdef JUMP_MOUSE_WHEEL 1959# ifdef JUMP_MOUSE_WHEEL
1806 rxvt_scr_page(aR_ v, i); 1960 rxvt_scr_page(aR_ v, i);
1807 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1961 rxvt_scr_refresh(aR_ SMOOTH_REFRESH);
… …
1852 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 2006 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr);
1853 rootdepth = wrootattr.depth; 2007 rootdepth = wrootattr.depth;
1854 2008
1855 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2009 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
1856 if (rootdepth != wattr.depth) { 2010 if (rootdepth != wattr.depth) {
1857 if (R->h->am_transparent) { 2011 if (R->am_transparent) {
1858 pchanged = 1; 2012 pchanged = 1;
1859 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2013 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1860 R->PixColors[Color_bg]); 2014 R->PixColors[Color_bg]);
1861 R->h->am_transparent = R->h->am_pixmap_trans = 0; 2015 R->am_transparent = R->am_pixmap_trans = 0;
1862 } 2016 }
1863 return pchanged; /* Don't try any more */ 2017 return pchanged; /* Don't try any more */
1864 } 2018 }
1865 2019
1866/* Get all X ops out of the queue so that our information is up-to-date. */ 2020/* Get all X ops out of the queue so that our information is up-to-date. */
… …
1869/* 2023/*
1870 * Make the frame window set by the window manager have 2024 * Make the frame window set by the window manager have
1871 * the root background. Some window managers put multiple nested frame 2025 * the root background. Some window managers put multiple nested frame
1872 * windows for each client, so we have to take care about that. 2026 * windows for each client, so we have to take care about that.
1873 */ 2027 */
1874 i = (R->h->xa[XA_XROOTPMAPID] != 0 2028 i = (R->xa[XA_XROOTPMAPID] != 0
1875 && (XGetWindowProperty(R->Xdisplay, Xroot, R->h->xa[XA_XROOTPMAPID], 2029 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID],
1876 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1877 &nitems, &bytes_after, &prop) == Success)); 2031 &nitems, &bytes_after, &prop) == Success));
1878 if (!i || prop == NULL) 2032 if (!i || prop == NULL)
1879 have_pixmap = 0; 2033 have_pixmap = 0;
1880 else { 2034 else {
… …
1908 ny = -sy; 2062 ny = -sy;
1909 sy = 0; 2063 sy = 0;
1910 } 2064 }
1911 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2065 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1912 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2066 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1913 R->h->allowedxerror = -1; 2067 R->allowedxerror = -1;
1914 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2068 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1915 ZPixmap); 2069 ZPixmap);
1916 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2070 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1917 /* XXX: may need a delay here? */ 2071 /* XXX: may need a delay here? */
1918 R->h->allowedxerror = 0; 2072 R->allowedxerror = 0;
1919 if (image == NULL) { 2073 if (image == NULL) {
1920 if (R->h->am_transparent && R->h->am_pixmap_trans) { 2074 if (R->am_transparent && R->am_pixmap_trans) {
1921 pchanged = 1; 2075 pchanged = 1;
1922 if (R->TermWin.pixmap != None) { 2076 if (R->TermWin.pixmap != None) {
1923 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2077 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1924 R->TermWin.pixmap = None; 2078 R->TermWin.pixmap = None;
1925 } 2079 }
1926 } 2080 }
1927 R->h->am_pixmap_trans = 0; 2081 R->am_pixmap_trans = 0;
1928 } else { 2082 } else {
1929 if (R->TermWin.pixmap != None) 2083 if (R->TermWin.pixmap != None)
1930 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2084 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1931 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 2085 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1932 (unsigned int)R->szHint.width, 2086 (unsigned int)R->szHint.width,
… …
1938 (unsigned int)image->height); 2092 (unsigned int)image->height);
1939 XFreeGC(R->Xdisplay, gc); 2093 XFreeGC(R->Xdisplay, gc);
1940 XDestroyImage(image); 2094 XDestroyImage(image);
1941 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2095 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1942 R->TermWin.pixmap); 2096 R->TermWin.pixmap);
1943 if (!R->h->am_transparent || !R->h->am_pixmap_trans) 2097 if (!R->am_transparent || !R->am_pixmap_trans)
1944 pchanged = 1; 2098 pchanged = 1;
1945 R->h->am_transparent = R->h->am_pixmap_trans = 1; 2099 R->am_transparent = R->am_pixmap_trans = 1;
1946 } 2100 }
1947 } 2101 }
1948 if (!R->h->am_pixmap_trans) { 2102 if (!R->am_pixmap_trans) {
1949 unsigned int n; 2103 unsigned int n;
1950/* 2104/*
1951 * InheritPixmap transparency 2105 * InheritPixmap transparency
1952 */ 2106 */
1953 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2107 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
… …
1982 D_X((stderr, "InheritPixmap Turning off")); 2136 D_X((stderr, "InheritPixmap Turning off"));
1983 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2137 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0],
1984 R->PixColors[Color_fg]); 2138 R->PixColors[Color_fg]);
1985 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2139 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1986 R->PixColors[Color_bg]); 2140 R->PixColors[Color_bg]);
1987 R->h->am_transparent = 0; 2141 R->am_transparent = 0;
1988 /* XXX: also turn off Opt_transparent? */ 2142 /* XXX: also turn off Opt_transparent? */
1989 } else { 2143 } else {
1990 /* wait (an arbitrary period) for the WM to do its thing 2144 /* wait (an arbitrary period) for the WM to do its thing
1991 * needed for fvwm2.2.2 (and before?) */ 2145 * needed for fvwm2.2.2 (and before?) */
1992# ifdef HAVE_NANOSLEEP 2146# ifdef HAVE_NANOSLEEP
… …
2002 for (n = 0; n < (unsigned int)i; n++) 2156 for (n = 0; n < (unsigned int)i; n++)
2003 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2157 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n],
2004 ParentRelative); 2158 ParentRelative);
2005 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2159 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2006 ParentRelative); 2160 ParentRelative);
2007 R->h->am_transparent = 1; 2161 R->am_transparent = 1;
2008 } 2162 }
2009 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2163 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++)
2010 R->TermWin.parent[i] = None; 2164 R->TermWin.parent[i] = None;
2011 } 2165 }
2012 return pchanged; 2166 return pchanged;
… …
2020#ifdef PRINTPIPE 2174#ifdef PRINTPIPE
2021/* EXTPROTO */ 2175/* EXTPROTO */
2022FILE * 2176FILE *
2023rxvt_popen_printer(pR) 2177rxvt_popen_printer(pR)
2024{ 2178{
2025 FILE *stream = popen(R->h->rs[Rs_print_pipe], "w"); 2179 FILE *stream = popen(R->rs[Rs_print_pipe], "w");
2026 2180
2027 if (stream == NULL) 2181 if (stream == NULL)
2028 rxvt_print_error("can't open printer pipe"); 2182 rxvt_print_error("can't open printer pipe");
2029 return stream; 2183 return stream;
2030} 2184}
… …
2109void 2263void
2110rxvt_process_nonprinting(pR_ unsigned char ch) 2264rxvt_process_nonprinting(pR_ unsigned char ch)
2111{ 2265{
2112 switch (ch) { 2266 switch (ch) {
2113 case C0_ENQ: /* terminal Status */ 2267 case C0_ENQ: /* terminal Status */
2114 if (R->h->rs[Rs_answerbackstring]) 2268 if (R->rs[Rs_answerbackstring])
2115 rxvt_tt_write(aR_ 2269 rxvt_tt_write(aR_
2116 (const unsigned char *)R->h->rs[Rs_answerbackstring], 2270 (const unsigned char *)R->rs[Rs_answerbackstring],
2117 (unsigned int)STRLEN(R->h->rs[Rs_answerbackstring])); 2271 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2118 else 2272 else
2119 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2273 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,
2120 (unsigned int)STRLEN(VT100_ANS)); 2274 (unsigned int)STRLEN(VT100_ANS));
2121 break; 2275 break;
2122 case C0_BEL: /* bell */ 2276 case C0_BEL: /* bell */
… …
2212void 2366void
2213rxvt_process_escape_seq(pR) 2367rxvt_process_escape_seq(pR)
2214{ 2368{
2215 unsigned char ch = rxvt_cmd_getc(aR); 2369 unsigned char ch = rxvt_cmd_getc(aR);
2216 2370
2217 if (R->h->PrivateModes & PrivMode_vt52) { 2371 if (R->PrivateModes & PrivMode_vt52) {
2218 rxvt_process_escape_vt52(aR_ ch); 2372 rxvt_process_escape_vt52(aR_ ch);
2219 return; 2373 return;
2220 } 2374 }
2221 2375
2222 switch (ch) { 2376 switch (ch) {
… …
2570 case 6: /* CPR requested */ 2724 case 6: /* CPR requested */
2571 rxvt_scr_report_position(aR); 2725 rxvt_scr_report_position(aR);
2572 break; 2726 break;
2573#if defined (ENABLE_DISPLAY_ANSWER) 2727#if defined (ENABLE_DISPLAY_ANSWER)
2574 case 7: /* unofficial extension */ 2728 case 7: /* unofficial extension */
2575 rxvt_tt_printf(aR_ "%-.250s\n", R->h->rs[Rs_display_name]); 2729 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);
2576 break; 2730 break;
2577#endif 2731#endif
2578 case 8: /* unofficial extension */ 2732 case 8: /* unofficial extension */
2579 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2733 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2580 break; 2734 break;
… …
2977rxvt_privcases(pR_ int mode, unsigned long bit) 3131rxvt_privcases(pR_ int mode, unsigned long bit)
2978{ 3132{
2979 int state; 3133 int state;
2980 3134
2981 if (mode == 's') { 3135 if (mode == 's') {
2982 R->h->SavedModes |= (R->h->PrivateModes & bit); 3136 R->SavedModes |= (R->PrivateModes & bit);
2983 return -1; 3137 return -1;
2984 } else { 3138 } else {
2985 if (mode == 'r') 3139 if (mode == 'r')
2986 state = (R->h->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3140 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */
2987 else 3141 else
2988 state = (mode == 't') ? !(R->h->PrivateModes & bit) : mode; 3142 state = (mode == 't') ? !(R->PrivateModes & bit) : mode;
2989 PrivMode(state, bit); 3143 PrivMode(state, bit);
2990 } 3144 }
2991 return state; 3145 return state;
2992} 3146}
2993 3147
… …
3071 * within VT52 mode 3225 * within VT52 mode
3072 */ 3226 */
3073 PrivMode(1, PrivMode_vt52); 3227 PrivMode(1, PrivMode_vt52);
3074 break; 3228 break;
3075 case 3: /* 80/132 */ 3229 case 3: /* 80/132 */
3076 if (R->h->PrivateModes & PrivMode_132OK) 3230 if (R->PrivateModes & PrivMode_132OK)
3077 rxvt_set_widthheight(aR_ 3231 rxvt_set_widthheight(aR_
3078 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3232 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth),
3079 (unsigned int)R->TermWin.height); 3233 (unsigned int)R->TermWin.height);
3080 break; 3234 break;
3081 case 4: /* smooth scrolling */ 3235 case 4: /* smooth scrolling */
… …
3094 rxvt_scr_autowrap(aR_ state); 3248 rxvt_scr_autowrap(aR_ state);
3095 break; 3249 break;
3096 /* case 8: - auto repeat, can't do on a per window basis */ 3250 /* case 8: - auto repeat, can't do on a per window basis */
3097 case 9: /* X10 mouse reporting */ 3251 case 9: /* X10 mouse reporting */
3098 if (state) /* orthogonal */ 3252 if (state) /* orthogonal */
3099 R->h->PrivateModes &= ~(PrivMode_MouseX11); 3253 R->PrivateModes &= ~(PrivMode_MouseX11);
3100 break; 3254 break;
3101#ifdef menuBar_esc 3255#ifdef menuBar_esc
3102 case menuBar_esc: 3256 case menuBar_esc:
3103#ifdef MENUBAR 3257#ifdef MENUBAR
3104 rxvt_map_menuBar(aR_ state); 3258 rxvt_map_menuBar(aR_ state);
… …
3123 break; 3277 break;
3124 /* case 66: - application key pad */ 3278 /* case 66: - application key pad */
3125 /* case 67: - backspace key */ 3279 /* case 67: - backspace key */
3126 case 1000: /* X11 mouse reporting */ 3280 case 1000: /* X11 mouse reporting */
3127 if (state) /* orthogonal */ 3281 if (state) /* orthogonal */
3128 R->h->PrivateModes &= ~(PrivMode_MouseX10); 3282 R->PrivateModes &= ~(PrivMode_MouseX10);
3129 break; 3283 break;
3130#if 0 3284#if 0
3131 case 1001: 3285 case 1001:
3132 break; /* X11 mouse highlighting */ 3286 break; /* X11 mouse highlighting */
3133#endif 3287#endif
… …
3142 R->Options |= Opt_scrollTtyKeypress; 3296 R->Options |= Opt_scrollTtyKeypress;
3143 else 3297 else
3144 R->Options &= ~Opt_scrollTtyKeypress; 3298 R->Options &= ~Opt_scrollTtyKeypress;
3145 break; 3299 break;
3146 case 1047: /* secondary screen w/ clearing */ 3300 case 1047: /* secondary screen w/ clearing */
3147 if (R->h->current_screen != PRIMARY) 3301 if (R->current_screen != PRIMARY)
3148 rxvt_scr_erase_screen(aR_ 2); 3302 rxvt_scr_erase_screen(aR_ 2);
3149 rxvt_scr_change_screen(aR_ state); 3303 rxvt_scr_change_screen(aR_ state);
3150 /* FALLTHROUGH */ 3304 /* FALLTHROUGH */
3151 default: 3305 default:
3152 break; 3306 break;
… …
3341#endif 3495#endif
3342} 3496}
3343/*}}} */ 3497/*}}} */
3344 3498
3345/* ------------------------------------------------------------------------- */ 3499/* ------------------------------------------------------------------------- */
3346
3347/*{{{ Read and process output from the application */
3348/* LIBPROTO */
3349void
3350rxvt_main_loop(pR)
3351{
3352 uint32_t ch, *str, buf[BUFSIZ];
3353 int nlines, refreshnow;
3354 struct rxvt_hidden *h = R->h;
3355
3356 h->cmdbuf_ptr = h->cmdbuf_endp = h->cmdbuf_base;
3357
3358 /* once we know the shell is running, send the screen size. Again! */
3359 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);
3361
3362 refreshnow = 0;
3363 for (;;) {
3364 if (ch == NOCHAR)
3365 ch = rxvt_cmd_getc(aR);
3366
3367 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
3368 {
3369 /* Read a text string from the input buffer */
3370 nlines = 0;
3371 str = buf;
3372 *str++ = ch;
3373 for (;;)
3374 {
3375 ch = next_char (aR);
3376
3377 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
3378 break;
3379 else
3380 {
3381 *str++ = ch;
3382
3383 if (ch == '\n')
3384 {
3385 nlines++;
3386 h->refresh_count++;
3387 if (!(R->Options & Opt_jumpScroll)
3388 || (h->refresh_count >= (h->refresh_limit
3389 * (R->TermWin.nrow - 1))))
3390 {
3391 refreshnow = 1;
3392 ch = NOCHAR;
3393 break;
3394 }
3395 }
3396
3397 if (str >= buf + BUFSIZ)
3398 {
3399 ch = NOCHAR;
3400 break;
3401 }
3402 }
3403 }
3404
3405 rxvt_scr_add_lines(aR_ buf, nlines, str - buf);
3406
3407 /*
3408 * 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.
3410 * the number of pages between refreshes is h->refresh_limit, which
3411 * is incremented here because we must be doing flat-out scrolling.
3412 *
3413 * refreshing should be correct for small scrolls, because of the
3414 * time-out
3415 */
3416
3417 //TODO: REFRESH_PERIOD is one, fix it
3418 if (refreshnow)
3419 {
3420 refreshnow = 0;
3421
3422 if ((R->Options & Opt_jumpScroll) && h->refresh_limit < REFRESH_PERIOD)
3423 h->refresh_limit++;
3424
3425 rxvt_scr_refresh(aR_ h->refresh_type);
3426 }
3427
3428 }
3429 else
3430 {
3431 switch (ch)
3432 {
3433 default:
3434 rxvt_process_nonprinting(aR_ ch);
3435 break;
3436 case C0_ESC: /* escape char */
3437 rxvt_process_escape_seq(aR);
3438 break;
3439 /* case 0x9b: */ /* CSI */
3440 /* rxvt_process_csi_seq(aR); */
3441 }
3442
3443 ch = NOCHAR;
3444 }
3445 }
3446/* NOTREACHED */
3447}
3448 3500
3449/* 3501/*
3450 * Send printf() formatted output to the command. 3502 * Send printf() formatted output to the command.
3451 * Only use for small amounts of data. 3503 * Only use for small amounts of data.
3452 */ 3504 */
… …
3480 unsigned char *v_buffer, /* start of physical buffer */ 3532 unsigned char *v_buffer, /* start of physical buffer */
3481 *v_bufstr, /* start of current buffer pending */ 3533 *v_bufstr, /* start of current buffer pending */
3482 *v_bufptr, /* end of current buffer pending */ 3534 *v_bufptr, /* end of current buffer pending */
3483 *v_bufend; /* end of physical buffer */ 3535 *v_bufend; /* end of physical buffer */
3484 3536
3485 if (R->h->v_bufstr == NULL && len > 0) { 3537 if (R->v_bufstr == NULL && len > 0) {
3486 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3538 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3487 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p); 3539 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3488 v_bufend = v_buffer + p; 3540 v_bufend = v_buffer + p;
3489 } else { 3541 } else {
3490 v_buffer = R->h->v_buffer; 3542 v_buffer = R->v_buffer;
3491 v_bufstr = R->h->v_bufstr; 3543 v_bufstr = R->v_bufstr;
3492 v_bufptr = R->h->v_bufptr; 3544 v_bufptr = R->v_bufptr;
3493 v_bufend = R->h->v_bufend; 3545 v_bufend = R->v_bufend;
3494 } 3546 }
3495 3547
3496 /* 3548 /*
3497 * Append to the block we already have. Always doing this simplifies the 3549 * 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 3550 * code, and isn't too bad, either. If this is a short block, it isn't
… …
3572 } else { 3624 } else {
3573 /* should we print a warning if couldn't return memory? */ 3625 /* should we print a warning if couldn't return memory? */
3574 v_buffer = v_bufstr - start; /* restore clobbered pointer */ 3626 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3575 } 3627 }
3576 } 3628 }
3577 R->h->v_buffer = v_buffer; 3629 R->v_buffer = v_buffer;
3578 R->h->v_bufstr = v_bufstr; 3630 R->v_bufstr = v_bufstr;
3579 R->h->v_bufptr = v_bufptr; 3631 R->v_bufptr = v_bufptr;
3580 R->h->v_bufend = v_bufend; 3632 R->v_bufend = v_bufend;
3581} 3633}
3582/*----------------------- end-of-file (C source) -----------------------*/ 3634/*----------------------- end-of-file (C source) -----------------------*/
3583 3635

Diff Legend

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