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.11 by pcg, Tue Dec 2 21:49:46 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.11 2003/12/02 21:49:46 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 R->tt_write(&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 243 R->tt_write(kbuf0, l);
244 return; 244 return;
245 } else 245 } else
246#endif 246#endif
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 R->tt_write(&ch, 1);
611 } 611 }
612#ifdef DEBUG_CMD 612#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 613 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 614 char *p;
615 int i; 615 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 618 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 620 fprintf(stderr, "'\n");
621 } 621 }
622#endif /* DEBUG_CMD */ 622#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 623 R->tt_write(kbuf, (unsigned int)len);
624} 624}
625/*}}} */ 625/*}}} */
626 626
627#if (MENUBAR_MAX) 627#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
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::flush ()
662{
663#ifdef TRANSPARENT
664 if (want_full_refresh)
665 {
666 want_full_refresh = 0;
667 rxvt_scr_clear (this);
668 rxvt_scr_touch (this, False);
669 want_refresh = 1;
670 }
671#endif
672
673 if (want_refresh)
674 {
675 rxvt_scr_refresh (this, refresh_type);
676 rxvt_scrollbar_show (this, 1);
677#ifdef USE_XIM
678 rxvt_IMSendSpot (this);
679#endif
680 }
681
682 XFlush (Xdisplay);
683#if 0
684 if (XPending (Xdisplay)) process_x_events ();
685 if (XPending (Xdisplay)) process_x_events ();
686#endif
687}
688
689void
690rxvt_term::check_cb (check_watcher &w)
691{
692 SET_R (this);
693
694 flush ();
695}
696
697void
698rxvt_term::process_x_events ()
699{
700 do
701 {
702 XEvent xev;
703
704 XNextEvent (Xdisplay, &xev);
705
706#if defined(CURSOR_BLINK)
707 if ((Options & Opt_cursorBlink)
708 && xev.type == KeyPress)
709 {
710 if (hidden_cursor)
711 {
712 hidden_cursor = 0;
713 want_refresh = 1;
714 }
715
716 blink_ev.start (NOW + BLINK_INTERVAL);
717 }
718#endif
719
720#if defined(POINTER_BLANK)
721 if ((Options & Opt_pointerBlank)
722 && (pointerBlankDelay > 0))
723 {
724 if (xev.type == MotionNotify
725 || xev.type == ButtonPress
726 || xev.type == ButtonRelease)
727 if (hidden_pointer)
728 pointer_unblank ();
729
730 if (xev.type == KeyPress && hidden_pointer == 0)
731 pointer_blank ();
732 }
733#endif
734
735#ifdef USE_XIM
736 if (!XFilterEvent (&xev, xev.xany.window))
737#endif
738 rxvt_process_x_event (this, &xev);
739 }
740 while (XPending (Xdisplay));
741}
742
743void
744rxvt_term::blink_cb (time_watcher &w)
745{
746 SET_R (this);
747
748 w.at += BLINK_INTERVAL;
749 hidden_cursor = !hidden_cursor;
750 want_refresh = 1;
751}
752
753void
754rxvt_term::x_cb (io_watcher &w, short revents)
755{
756 SET_R (this);
757
758 process_x_events ();
759}
760
761bool
762rxvt_term::pty_fill ()
763{
764 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
765
766 memmove (cmdbuf_base, cmdbuf_ptr, n);
767 cmdbuf_ptr = cmdbuf_base;
768 cmdbuf_endp = cmdbuf_ptr + n;
769
770 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
771
772 if (n > 0)
773 {
774 cmdbuf_endp += n;
775 return true;
776 }
777 else if (n < 0 && errno == EAGAIN)
778 return false;
779
780 destroy ();
781}
782
783void
784rxvt_term::pty_cb (io_watcher &w, short revents)
785{
786 SET_R (this);
787
788 if (revents & EVENT_WRITE)
789 tt_write (0, 0);
790 else if (revents & EVENT_READ)
791 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); )
794 {
795 if (!seen_input)
796 {
797 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch ();
800 }
801
802 uint32_t ch = NOCHAR;
803
804 for (;;)
805 {
806 if (ch == NOCHAR)
807 ch = next_char ();
808
809 if (ch == NOCHAR) // TODO: improve
810 break;
811
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 {
814 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ];
816 bool refreshnow = false;
817 int nlines = 0;
818 uint32_t *str = buf;
819
820 *str++ = ch;
821
822 for (;;)
823 {
824 ch = next_char ();
825
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break;
828 else
829 {
830 *str++ = ch;
831
832 if (ch == '\n')
833 {
834 nlines++;
835 refresh_count++;
836
837 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 {
840 refreshnow = true;
841 ch = NOCHAR;
842 break;
843 }
844 }
845
846 if (str >= buf + BUFSIZ)
847 {
848 ch = NOCHAR;
849 break;
850 }
851 }
852 }
853
854 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855
856 /*
857 * If there have been a lot of new lines, then update the screen
858 * What the heck I'll cheat and only refresh less than every page-full.
859 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling.
861 *
862 * refreshing should be correct for small scrolls, because of the
863 * time-out
864 */
865 if (refreshnow)
866 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++;
869
870 rxvt_scr_refresh (this, refresh_type);
871 }
872
873 }
874 else
875 {
876 switch (ch)
877 {
878 default:
879 rxvt_process_nonprinting (this, ch);
880 break;
881 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this);
883 break;
884 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */
886 }
887
888 ch = NOCHAR;
889 }
890 }
891 }
892}
659 893
660// read the next character, currently handles UTF-8 894// read the next character, currently handles UTF-8
661// will probably handle all sorts of other stuff in the future 895// will probably handle all sorts of other stuff in the future
662static uint32_t 896uint32_t
663next_char (pR) 897rxvt_term::next_char ()
664{ 898{
665 rxvt_hidden *h = R->h;
666 mbstate &s = h->mbstate; 899 struct mbstate &s = mbstate;
667 900
668 while (h->cmdbuf_ptr < h->cmdbuf_endp) 901 while (cmdbuf_ptr < cmdbuf_endp)
669 { 902 {
670 uint8_t ch = *h->cmdbuf_ptr; 903 uint8_t ch = *cmdbuf_ptr;
671 904
672 if (s.cnt) 905 if (s.cnt)
673 { 906 {
674 if ((ch & 0xc0) == 0x80) 907 if ((ch & 0xc0) == 0x80)
675 { 908 {
676 h->cmdbuf_ptr++; 909 cmdbuf_ptr++;
677 910
678 /* continuation */ 911 /* continuation */
679 s.reg = (s.reg << 6) | (ch & 0x7f); 912 s.reg = (s.reg << 6) | (ch & 0x7f);
680 913
681 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or hacking */ 914 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
682 return s.reg; 915 return s.reg;
683 916
684 continue; 917 continue;
685 } 918 }
686 else 919 else
… …
690 } 923 }
691 } 924 }
692 925
693 if ((ch & 0xc0) == 0xc0) 926 if ((ch & 0xc0) == 0xc0)
694 { 927 {
695 h->cmdbuf_ptr++; 928 cmdbuf_ptr++;
696 929
697 /* first byte */ 930 /* first byte */
698 s.orig = ch; /* for broken encodings */ 931 s.orig = ch; /* for broken encodings */
699 s.reg = ch; 932 s.reg = ch;
700 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 933 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
… …
703 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 936 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
704 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 937 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
705 } 938 }
706 else 939 else
707 { 940 {
708 h->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 941 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
709 return ch; 942 return ch;
710 } 943 }
711 } 944 }
712 945
713 return NOCHAR; 946 return NOCHAR;
… …
720 */ 953 */
721/* INTPROTO */ 954/* INTPROTO */
722uint32_t 955uint32_t
723rxvt_cmd_getc(pR) 956rxvt_cmd_getc(pR)
724{ 957{
958 for (;;)
959 {
960 uint32_t c = R->next_char ();
961 if (c != NOCHAR)
962 return c;
963
964 // incomplete sequences should occur rarely, still, a better solution
965 // would be preferred. either setjmp/longjmp or better design.
966 fcntl (R->cmd_fd, F_SETFL, 0);
967 R->pty_fill ();
968 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
969 }
970
971#if 0
725#define TIMEOUT_USEC 5000 972#define TIMEOUT_USEC 5000
726 fd_set readfds; 973 fd_set readfds;
727 int quick_timeout, select_res; 974 int quick_timeout, select_res;
728 int want_motion_time, want_keypress_time; 975 int want_motion_time, want_keypress_time;
729 struct timeval value; 976 struct timeval value;
730#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 977#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
731 struct timeval tp; 978 struct timeval tp;
732#endif 979#endif
733 struct rxvt_hidden *h = R->h;
734
735 uint32_t c = next_char (aR);
736 if (c != NOCHAR)
737 return c;
738 980
739 for (;;) { 981 for (;;) {
740 /* loop until we can return something */ 982 /* loop until we can return something */
741 983
742 if (h->v_bufstr < h->v_bufptr) /* output any pending chars */ 984 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
743 rxvt_tt_write(aR_ NULL, 0); 985 R->tt_write(NULL, 0);
744
745#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
746 tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
747#endif
748#if defined(CURSOR_BLINK)
749 want_keypress_time = 0;
750#endif
751#if defined(POINTER_BLANK)
752 want_motion_time = 0;
753#endif
754
755 while (XPending(R->Xdisplay)) { /* process pending X events */
756 XEvent xev;
757
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 */
791 if (h->cmdbuf_ptr < h->cmdbuf_endp)
792 return *h->cmdbuf_ptr++;
793 }
794
795#if defined(CURSOR_BLINK)
796 if (want_keypress_time) {
797 (void)gettimeofday(&tp, NULL);
798 h->lastcursorchange.tv_sec = tp.tv_sec;
799 h->lastcursorchange.tv_usec = tp.tv_usec;
800 }
801#endif
802#if defined(POINTER_BLANK)
803 if (want_motion_time) {
804 if (!tp.tv_sec)
805 (void)gettimeofday(&tp, NULL);
806 h->lastmotion.tv_sec = tp.tv_sec;
807 h->lastmotion.tv_usec = tp.tv_usec;
808 }
809#endif
810
811/*
812 * the command input buffer is empty and we have no pending X events
813 */
814 quick_timeout = 0;
815 986
816#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 987#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
817 if (h->mouse_slip_wheel_speed) { 988 if (R->mouse_slip_wheel_speed) {
818 quick_timeout = 1; 989 quick_timeout = 1;
819 if (!h->mouse_slip_wheel_delay-- 990 if (!R->mouse_slip_wheel_delay--
820 && rxvt_scr_page(aR_ h->mouse_slip_wheel_speed > 0 ? UP : DN, 991 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
821 abs(h->mouse_slip_wheel_speed))) { 992 abs(R->mouse_slip_wheel_speed))) {
822 h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 993 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
823 h->refresh_type |= SMOOTH_REFRESH; 994 R->refresh_type |= SMOOTH_REFRESH;
824 h->want_refresh = 1; 995 R->want_refresh = 1;
825 } 996 }
826 } 997 }
827#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 998#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
828#ifdef SELECTION_SCROLLING 999#ifdef SELECTION_SCROLLING
829 if (h->pending_scroll_selection) { 1000 if (R->pending_scroll_selection) {
830 quick_timeout = 1; 1001 quick_timeout = 1;
831 if (!h->scroll_selection_delay-- 1002 if (!R->scroll_selection_delay--
832 && rxvt_scr_page(aR_ h->scroll_selection_dir, 1003 && rxvt_scr_page(aR_ R->scroll_selection_dir,
833 h->scroll_selection_lines)) { 1004 R->scroll_selection_lines)) {
834 rxvt_selection_extend(aR_ h->selection_save_x, 1005 rxvt_selection_extend(aR_ R->selection_save_x,
835 h->selection_save_y, h->selection_save_state); 1006 R->selection_save_y, R->selection_save_state);
836 h->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1007 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
837 h->refresh_type |= SMOOTH_REFRESH; 1008 R->refresh_type |= SMOOTH_REFRESH;
838 h->want_refresh = 1; 1009 R->want_refresh = 1;
839 } 1010 }
840 } 1011 }
841#endif 1012#endif
842#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
843 if (scrollbar_isUp() || scrollbar_isDn()) { 1014 if (scrollbar_isUp() || scrollbar_isDn()) {
844 quick_timeout = 1; 1015 quick_timeout = 1;
845 if (!h->scroll_arrow_delay-- 1016 if (!R->scroll_arrow_delay--
846 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1017 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
847 h->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1018 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
848 h->refresh_type |= SMOOTH_REFRESH; 1019 R->refresh_type |= SMOOTH_REFRESH;
849 h->want_refresh = 1; 1020 R->want_refresh = 1;
850 } 1021 }
851 } 1022 }
852#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1023#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
853 1024
854 FD_ZERO(&readfds);
855 FD_SET(R->cmd_fd, &readfds);
856 FD_SET(R->Xfd, &readfds);
857 value.tv_usec = TIMEOUT_USEC;
858 value.tv_sec = 0;
859
860 if (!R->TermWin.mapped)
861 quick_timeout = 0;
862 else {
863 quick_timeout |= h->want_refresh;
864#ifdef TRANSPARENT 1025#ifdef TRANSPARENT
865 quick_timeout |= h->want_full_refresh; 1026 quick_timeout |= R->want_full_refresh;
866#endif
867 }
868
869#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
870 {
871 int set_quick_timeout = 0;
872 long csdiff, psdiff;
873
874#define BLINK_TIME 500000L
875 csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
876# if defined(CURSOR_BLINK)
877 if (R->Options & Opt_cursorBlink) {
878 if (!tp.tv_sec) /* didn't get it before so get it now */
879 (void)gettimeofday(&tp, NULL);
880
881 csdiff = (tp.tv_sec - h->lastcursorchange.tv_sec) * 1000000L
882 + tp.tv_usec - h->lastcursorchange.tv_usec;
883 if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
884 h->lastcursorchange.tv_sec = tp.tv_sec;
885 h->lastcursorchange.tv_usec = tp.tv_usec;
886 h->hidden_cursor = !h->hidden_cursor;
887 csdiff = 0;
888 } else
889 csdiff = BLINK_TIME - csdiff;
890 set_quick_timeout = 1;
891 }
892# endif 1027#endif
893# if defined(POINTER_BLANK)
894 /*
895 * If we haven't moved the pointer for a while
896 */
897 if ((R->Options & Opt_pointerBlank)
898 && (h->pointerBlankDelay > 0)
899 && (h->hidden_pointer == 0)) {
900 long pdelay;
901
902 if (!tp.tv_sec) /* didn't get it before so get it now */
903 (void)gettimeofday(&tp, NULL);
904 psdiff = (tp.tv_sec - h->lastmotion.tv_sec) * 1000000L
905 + tp.tv_usec - h->lastmotion.tv_usec;
906 pdelay = h->pointerBlankDelay * 1000000L;
907 if (psdiff >= pdelay)
908 rxvt_pointer_blank(aR);
909 else {
910 set_quick_timeout = 1;
911 psdiff = pdelay - psdiff;
912 }
913 }
914# endif 1028#endif
915 if (!quick_timeout && set_quick_timeout) {
916 MIN_IT(csdiff, psdiff);
917 value.tv_sec = csdiff / 1000000L;
918 value.tv_usec = csdiff % 1000000L;
919 quick_timeout = 1;
920 }
921 }
922#endif
923
924 if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
925 (quick_timeout ? &value : NULL))) == 0) {
926 /* select statement timed out - we're not hard and fast scrolling */
927 h->refresh_limit = 1;
928 }
929#if defined(CURSOR_BLINK)
930 if (R->Options & Opt_cursorBlink)
931 h->want_refresh = 1;
932#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 }
973/* NOTREACHED */
974} 1029}
975/*}}} */
976 1030
977/* EXTPROTO */
978void 1031void
979rxvt_pointer_unblank(pR) 1032rxvt_term::pointer_unblank ()
980{ 1033{
981 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1034 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
982 rxvt_recolour_cursor(aR); 1035 rxvt_recolour_cursor (this);
1036
983#ifdef POINTER_BLANK 1037#ifdef POINTER_BLANK
984 R->h->hidden_pointer = 0; 1038 hidden_pointer = 0;
985 if (R->h->pointerBlankDelay > 0) {
986 struct timeval tp;
987 1039
988 (void)gettimeofday(&tp, NULL); 1040 if (Options & Opt_pointerBlank)
989 R->h->lastmotion.tv_sec = tp.tv_sec; 1041 pointer_ev.start (NOW + pointerBlankDelay);
990 R->h->lastmotion.tv_usec = tp.tv_usec;
991 }
992#endif 1042#endif
993} 1043}
994 1044
995#ifdef POINTER_BLANK 1045#ifdef POINTER_BLANK
996/* INTPROTO */
997void 1046void
998rxvt_pointer_blank(pR) 1047rxvt_term::pointer_blank ()
999{ 1048{
1049 pointer_ev.stop ();
1050
1051 if (!(Options & Opt_pointerBlank))
1052 return;
1053
1000 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->h->pointer_blank); 1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1001 XFlush(R->Xdisplay); 1055 XFlush (Xdisplay);
1056
1002 R->h->hidden_pointer = 1; 1057 hidden_pointer = 1;
1058}
1059
1060void
1061rxvt_term::pointer_cb (time_watcher &w)
1062{
1063 SET_R (this);
1064
1065 pointer_blank ();
1003} 1066}
1004#endif 1067#endif
1005 1068
1006/* INTPROTO */ 1069/* INTPROTO */
1007void 1070void
… …
1012 1075
1013 x = ev->x; 1076 x = ev->x;
1014 y = ev->y; 1077 y = ev->y;
1015 rxvt_pixel_position(aR_ &x, &y); 1078 rxvt_pixel_position(aR_ &x, &y);
1016 1079
1017 if (R->h->MEvent.button == AnyButton) { 1080 if (R->MEvent.button == AnyButton) {
1018 button_number = 3; 1081 button_number = 3;
1019 } else { 1082 } else {
1020 button_number = R->h->MEvent.button - Button1; 1083 button_number = R->MEvent.button - Button1;
1021 /* add 0x3D for wheel events, like xterm does */ 1084 /* add 0x3D for wheel events, like xterm does */
1022 if (button_number >= 3) 1085 if (button_number >= 3)
1023 button_number += (64 - 3); 1086 button_number += (64 - 3);
1024 } 1087 }
1025 1088
1026 if (R->h->PrivateModes & PrivMode_MouseX10) { 1089 if (R->PrivateModes & PrivMode_MouseX10) {
1027 /* 1090 /*
1028 * do not report ButtonRelease 1091 * do not report ButtonRelease
1029 * no state info allowed 1092 * no state info allowed
1030 */ 1093 */
1031 key_state = 0; 1094 key_state = 0;
… …
1037 * 8 = Meta 1100 * 8 = Meta
1038 * 16 = Control 1101 * 16 = Control
1039 * plus will add in our own Double-Click reporting 1102 * plus will add in our own Double-Click reporting
1040 * 32 = Double Click 1103 * 32 = Double Click
1041 */ 1104 */
1042 key_state = ((R->h->MEvent.state & ShiftMask) ? 4 : 0) 1105 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0)
1043 + ((R->h->MEvent.state & R->h->ModMetaMask) ? 8 : 0) 1106 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0)
1044 + ((R->h->MEvent.state & ControlMask) ? 16 : 0); 1107 + ((R->MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1108#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((R->h->MEvent.clicks > 1) ? 32 : 0); 1109 key_state += ((R->MEvent.clicks > 1) ? 32 : 0);
1047#endif 1110#endif
1048 } 1111 }
1049 1112
1050#ifdef DEBUG_MOUSEREPORT 1113#ifdef DEBUG_MOUSEREPORT
1051 fprintf(stderr, "Mouse ["); 1114 fprintf(stderr, "Mouse [");
… …
1060 fprintf(stderr, "]: <%d>, %d/%d\n", 1123 fprintf(stderr, "]: <%d>, %d/%d\n",
1061 button_number, 1124 button_number,
1062 x + 1, 1125 x + 1,
1063 y + 1); 1126 y + 1);
1064#else 1127#else
1065 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1128 R->tt_printf("\033[M%c%c%c",
1066 (32 + button_number + key_state), 1129 (32 + button_number + key_state),
1067 (32 + x + 1), 1130 (32 + x + 1),
1068 (32 + y + 1)); 1131 (32 + y + 1));
1069#endif 1132#endif
1070} 1133}
… …
1088 int i, want_timeout; 1151 int i, want_timeout;
1089 Window unused_root, unused_child; 1152 Window unused_root, unused_child;
1090 int unused_root_x, unused_root_y; 1153 int unused_root_x, unused_root_y;
1091 unsigned int unused_mask; 1154 unsigned int unused_mask;
1092 struct timeval tp; 1155 struct timeval tp;
1093 struct rxvt_hidden *h = R->h; 1156
1094#ifdef DEBUG_X 1157#ifdef DEBUG_X
1095 const char *const eventnames[] = 1158 const char *const eventnames[] =
1096 { /* mason - this matches my system */ 1159 { /* mason - this matches my system */
1097 "", 1160 "",
1098 "", 1161 "",
… …
1136 /* 1199 /*
1137 * check if we need to get the time for any timeouts 1200 * check if we need to get the time for any timeouts
1138 */ 1201 */
1139 1202
1140 for (i = NUM_TIMEOUTS; i--; ) 1203 for (i = NUM_TIMEOUTS; i--; )
1141 if (h->timeout[i].tv_sec) { 1204 if (R->timeout[i].tv_sec) {
1142 want_timeout = 1; 1205 want_timeout = 1;
1143 break; 1206 break;
1144 } 1207 }
1145 1208
1146#ifndef DEBUG_X 1209#ifndef DEBUG_X
… …
1154#endif 1217#endif
1155 1218
1156 /* X event timeouts */ 1219 /* X event timeouts */
1157 if (want_timeout) 1220 if (want_timeout)
1158 for (i = NUM_TIMEOUTS; i--; ) { 1221 for (i = NUM_TIMEOUTS; i--; ) {
1159 if (h->timeout[i].tv_sec == 0) 1222 if (R->timeout[i].tv_sec == 0)
1160 continue; 1223 continue;
1161 if ((tp.tv_sec < h->timeout[i].tv_sec) 1224 if ((tp.tv_sec < R->timeout[i].tv_sec)
1162 || (tp.tv_sec == h->timeout[i].tv_sec 1225 || (tp.tv_sec == R->timeout[i].tv_sec
1163 && tp.tv_usec < h->timeout[i].tv_usec)) 1226 && tp.tv_usec < R->timeout[i].tv_usec))
1164 continue; 1227 continue;
1165 h->timeout[i].tv_sec = 0; 1228 R->timeout[i].tv_sec = 0;
1166 switch(i) { 1229 switch(i) {
1167 case TIMEOUT_INCR: 1230 case TIMEOUT_INCR:
1168 rxvt_print_error("data loss: timeout on INCR selection paste"); 1231 rxvt_print_error("data loss: timeout on INCR selection paste");
1169 h->selection_wait = Sel_none; 1232 R->selection_wait = Sel_none;
1170 break; 1233 break;
1171 default: 1234 default:
1172 break; 1235 break;
1173 } 1236 }
1174 } 1237 }
… …
1180 1243
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1244#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1245 case KeyRelease:
1183 { 1246 {
1184 if (!(ev->xkey.state & ControlMask)) 1247 if (!(ev->xkey.state & ControlMask))
1185 h->mouse_slip_wheel_speed = 0; 1248 R->mouse_slip_wheel_speed = 0;
1186 else { 1249 else {
1187 KeySym ks; 1250 KeySym ks;
1188 1251
1189 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1252 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0);
1190 if (ks == XK_Control_L || ks == XK_Control_R) 1253 if (ks == XK_Control_L || ks == XK_Control_R)
1191 h->mouse_slip_wheel_speed = 0; 1254 R->mouse_slip_wheel_speed = 0;
1192 } 1255 }
1193 break; 1256 break;
1194 } 1257 }
1195#endif 1258#endif
1196 1259
… …
1202 rxvt_button_release(aR_ (XButtonEvent *)ev); 1265 rxvt_button_release(aR_ (XButtonEvent *)ev);
1203 break; 1266 break;
1204 1267
1205 case ClientMessage: 1268 case ClientMessage:
1206 if (ev->xclient.format == 32 1269 if (ev->xclient.format == 32
1207 && (Atom)ev->xclient.data.l[0] == h->xa[XA_WMDELETEWINDOW]) 1270 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1208 exit(EXIT_SUCCESS); 1271 R->destroy ();
1209#ifdef OFFIX_DND 1272#ifdef OFFIX_DND
1210 /* OffiX Dnd (drag 'n' drop) protocol */ 1273 /* OffiX Dnd (drag 'n' drop) protocol */
1211 if (ev->xclient.message_type == h->xa[XA_DNDPROTOCOL] 1274 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1212 && (ev->xclient.data.l[0] == DndFile 1275 && (ev->xclient.data.l[0] == DndFile
1213 || ev->xclient.data.l[0] == DndDir 1276 || ev->xclient.data.l[0] == DndDir
1214 || ev->xclient.data.l[0] == DndLink)) { 1277 || ev->xclient.data.l[0] == DndLink)) {
1215 /* Get Dnd data */ 1278 /* Get Dnd data */
1216 Atom ActualType; 1279 Atom ActualType;
1217 int ActualFormat; 1280 int ActualFormat;
1218 unsigned char *data; 1281 unsigned char *data;
1219 unsigned long Size, RemainingBytes; 1282 unsigned long Size, RemainingBytes;
1220 1283
1221 XGetWindowProperty(R->Xdisplay, Xroot, 1284 XGetWindowProperty(R->Xdisplay, Xroot,
1222 R->h->xa[XA_DNDSELECTION], 1285 R->xa[XA_DNDSELECTION],
1223 0L, 1000000L, 1286 0L, 1000000L,
1224 False, AnyPropertyType, 1287 False, AnyPropertyType,
1225 &ActualType, &ActualFormat, 1288 &ActualType, &ActualFormat,
1226 &Size, &RemainingBytes, 1289 &Size, &RemainingBytes,
1227 &data); 1290 &data);
… …
1248 * in the GraphicsExpose parts, which means that after each refresh, 1311 * in the GraphicsExpose parts, which means that after each refresh,
1249 * we need to wait for the graphics expose or Noexpose events, 1312 * we need to wait for the graphics expose or Noexpose events,
1250 * which ought to make things real slow! 1313 * which ought to make things real slow!
1251 */ 1314 */
1252 case VisibilityNotify: 1315 case VisibilityNotify:
1253 switch (ev->xvisibility.state) { 1316 switch (ev->xvisibility.state)
1317 {
1254 case VisibilityUnobscured: 1318 case VisibilityUnobscured:
1255 h->refresh_type = FAST_REFRESH; 1319 R->refresh_type = FAST_REFRESH;
1256 break; 1320 break;
1257 case VisibilityPartiallyObscured: 1321 case VisibilityPartiallyObscured:
1258 h->refresh_type = SLOW_REFRESH; 1322 R->refresh_type = SLOW_REFRESH;
1259 break; 1323 break;
1260 default: 1324 default:
1261 h->refresh_type = NO_REFRESH; 1325 R->refresh_type = NO_REFRESH;
1262 break; 1326 break;
1263 } 1327 }
1264 break; 1328 break;
1265 1329
1266 case FocusIn: 1330 case FocusIn:
1267 if (!R->TermWin.focus) { 1331 if (!R->TermWin.focus) {
1268 R->TermWin.focus = 1; 1332 R->TermWin.focus = 1;
1269 h->want_refresh = 1; 1333 R->want_refresh = 1;
1270#ifdef USE_XIM 1334#ifdef USE_XIM
1271 if (h->Input_Context != NULL) 1335 if (R->Input_Context != NULL)
1272 XSetICFocus(h->Input_Context); 1336 XSetICFocus(R->Input_Context);
1337#endif
1338#ifdef CURSOR_BLINK
1339 if (R->Options & Opt_cursorBlink)
1340 R->blink_ev.start (NOW + BLINK_INTERVAL);
1273#endif 1341#endif
1274 } 1342 }
1275 break; 1343 break;
1276 1344
1277 case FocusOut: 1345 case FocusOut:
1278 if (R->TermWin.focus) { 1346 if (R->TermWin.focus) {
1279 R->TermWin.focus = 0; 1347 R->TermWin.focus = 0;
1280 h->want_refresh = 1; 1348 R->want_refresh = 1;
1281#ifdef USE_XIM 1349#ifdef USE_XIM
1282 if (h->Input_Context != NULL) 1350 if (R->Input_Context != NULL)
1283 XUnsetICFocus(h->Input_Context); 1351 XUnsetICFocus(R->Input_Context);
1352#endif
1353#ifdef CURSOR_BLINK
1354 if (R->Options & Opt_cursorBlink)
1355 R->blink_ev.stop ();
1356 R->hidden_cursor = 0;
1284#endif 1357#endif
1285 } 1358 }
1286 break; 1359 break;
1287 1360
1288 case ConfigureNotify: 1361 case ConfigureNotify:
… …
1306 } 1379 }
1307#endif 1380#endif
1308#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1381#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1309 if (R->Options & Opt_transparent) { 1382 if (R->Options & Opt_transparent) {
1310 rxvt_check_our_parents(aR); 1383 rxvt_check_our_parents(aR);
1311 if (h->am_transparent) 1384 if (R->am_transparent)
1312 h->want_full_refresh = 1; 1385 R->want_full_refresh = 1;
1313 } 1386 }
1314#endif 1387#endif
1315 } 1388 }
1316 break; 1389 break;
1317 1390
1318 case SelectionClear: 1391 case SelectionClear:
1319 rxvt_selection_clear(aR); 1392 rxvt_selection_clear(aR);
1320 break; 1393 break;
1321 1394
1322 case SelectionNotify: 1395 case SelectionNotify:
1323 if (h->selection_wait == Sel_normal) 1396 if (R->selection_wait == Sel_normal)
1324 rxvt_selection_paste(aR_ ev->xselection.requestor, 1397 rxvt_selection_paste(aR_ ev->xselection.requestor,
1325 ev->xselection.property, True); 1398 ev->xselection.property, True);
1326 break; 1399 break;
1327 1400
1328 case SelectionRequest: 1401 case SelectionRequest:
… …
1336 case MapNotify: 1409 case MapNotify:
1337 R->TermWin.mapped = 1; 1410 R->TermWin.mapped = 1;
1338 break; 1411 break;
1339 1412
1340 case PropertyNotify: 1413 case PropertyNotify:
1341 if (ev->xproperty.atom == h->xa[XA_VT_SELECTION]) { 1414 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1342 if (ev->xproperty.state == PropertyNewValue) 1415 if (ev->xproperty.state == PropertyNewValue)
1343 rxvt_selection_property(aR_ ev->xproperty.window, 1416 rxvt_selection_property(aR_ ev->xproperty.window,
1344 ev->xproperty.atom); 1417 ev->xproperty.atom);
1345 break; 1418 break;
1346 } 1419 }
1347#ifdef TRANSPARENT 1420#ifdef TRANSPARENT
1348 /* 1421 /*
1349 * if user used some Esetroot compatible prog to set the root bg, 1422 * 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. 1423 * use the property to determine the pixmap. We use it later on.
1351 */ 1424 */
1352 if (h->xa[XA_XROOTPMAPID] == 0) 1425 if (R->xa[XA_XROOTPMAPID] == 0)
1353 h->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1426 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1354 "_XROOTPMAP_ID", False); 1427 "_XROOTPMAP_ID", False);
1355 if (ev->xproperty.atom != h->xa[XA_XROOTPMAPID]) 1428 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1356 break; 1429 break;
1357 /* FALLTHROUGH */ 1430 /* FALLTHROUGH */
1358 case ReparentNotify: 1431 case ReparentNotify:
1359 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1432 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) {
1360 if (h->am_transparent) 1433 if (R->am_transparent)
1361 h->want_full_refresh = 1; 1434 R->want_full_refresh = 1;
1362 } 1435 }
1363#endif /* TRANSPARENT */ 1436#endif /* TRANSPARENT */
1364 break; 1437 break;
1365 1438
1366 case GraphicsExpose: 1439 case GraphicsExpose:
… …
1374 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1447 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,
1375 ev->xexpose.width, ev->xexpose.height, False); 1448 ev->xexpose.width, ev->xexpose.height, False);
1376 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1449 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1377 // ev->xexpose.width, R->TermWin.height, False); 1450 // ev->xexpose.width, R->TermWin.height, False);
1378#endif 1451#endif
1379 h->want_refresh = 1; 1452 R->want_refresh = 1;
1380 } else { 1453 } else {
1381 XEvent unused_xevent; 1454 XEvent unused_xevent;
1382 1455
1383 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1456 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1384 Expose, 1457 Expose,
… …
1400 } 1473 }
1401 break; 1474 break;
1402 1475
1403 case MotionNotify: 1476 case MotionNotify:
1404#ifdef POINTER_BLANK 1477#ifdef POINTER_BLANK
1405 if (R->h->hidden_pointer) 1478 if (R->hidden_pointer)
1406 rxvt_pointer_unblank(aR); 1479 R->pointer_unblank ();
1407#endif 1480#endif
1408#if MENUBAR 1481#if MENUBAR
1409 if (isMenuBarWindow(ev->xany.window)) { 1482 if (isMenuBarWindow(ev->xany.window)) {
1410 rxvt_menubar_control(aR_ &(ev->xbutton)); 1483 rxvt_menubar_control(aR_ &(ev->xbutton));
1411 break; 1484 break;
1412 } 1485 }
1413#endif 1486#endif
1414 if ((h->PrivateModes & PrivMode_mouse_report) && !(h->bypass_keystate)) 1487 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate))
1415 break; 1488 break;
1416 1489
1417 if (ev->xany.window == R->TermWin.vt) { 1490 if (ev->xany.window == R->TermWin.vt) {
1418 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1491 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1419 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1492 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt,
… …
1423 &unused_root_x, &unused_root_y, 1496 &unused_root_x, &unused_root_y,
1424 &(ev->xbutton.x), &(ev->xbutton.y), 1497 &(ev->xbutton.x), &(ev->xbutton.y),
1425 &unused_mask); 1498 &unused_mask);
1426#ifdef MOUSE_THRESHOLD 1499#ifdef MOUSE_THRESHOLD
1427 /* deal with a `jumpy' mouse */ 1500 /* deal with a `jumpy' mouse */
1428 if ((ev->xmotion.time - h->MEvent.time) > MOUSE_THRESHOLD) { 1501 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1429#endif 1502#endif
1430 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1503 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),
1431 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1504 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1432#ifdef SELECTION_SCROLLING 1505#ifdef SELECTION_SCROLLING
1433 if (ev->xbutton.y<R->TermWin.int_bwidth || 1506 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1434 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1507 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1435 int dist; 1508 int dist;
1436 1509
1437 h->pending_scroll_selection=1; 1510 R->pending_scroll_selection=1;
1438 1511
1439 /* don't clobber the current delay if we are 1512 /* don't clobber the current delay if we are
1440 * already in the middle of scrolling. 1513 * already in the middle of scrolling.
1441 */ 1514 */
1442 if (h->scroll_selection_delay<=0) 1515 if (R->scroll_selection_delay<=0)
1443 h->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1516 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1444 1517
1445 /* save the event params so we can highlight 1518 /* save the event params so we can highlight
1446 * the selection in the pending-scroll loop 1519 * the selection in the pending-scroll loop
1447 */ 1520 */
1448 h->selection_save_x=ev->xbutton.x; 1521 R->selection_save_x=ev->xbutton.x;
1449 h->selection_save_y=ev->xbutton.y; 1522 R->selection_save_y=ev->xbutton.y;
1450 h->selection_save_state= 1523 R->selection_save_state=
1451 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1524 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1452 1525
1453 /* calc number of lines to scroll */ 1526 /* calc number of lines to scroll */
1454 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1527 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1455 h->scroll_selection_dir = UP; 1528 R->scroll_selection_dir = UP;
1456 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1529 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1457 } 1530 }
1458 else { 1531 else {
1459 h->scroll_selection_dir = DN; 1532 R->scroll_selection_dir = DN;
1460 dist = ev->xbutton.y - 1533 dist = ev->xbutton.y -
1461 (R->TermWin.int_bwidth + R->TermWin.height); 1534 (R->TermWin.int_bwidth + R->TermWin.height);
1462 } 1535 }
1463 h->scroll_selection_lines=(Pixel2Height(dist)/ 1536 R->scroll_selection_lines=(Pixel2Height(dist)/
1464 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1537 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1465 MIN_IT(h->scroll_selection_lines, 1538 MIN_IT(R->scroll_selection_lines,
1466 SELECTION_SCROLL_MAX_LINES); 1539 SELECTION_SCROLL_MAX_LINES);
1467 } 1540 }
1468 else { 1541 else {
1469 /* we are within the text window, so we 1542 /* we are within the text window, so we
1470 * shouldn't be scrolling 1543 * shouldn't be scrolling
1471 */ 1544 */
1472 h->pending_scroll_selection = 0; 1545 R->pending_scroll_selection = 0;
1473 } 1546 }
1474#endif 1547#endif
1475#ifdef MOUSE_THRESHOLD 1548#ifdef MOUSE_THRESHOLD
1476 } 1549 }
1477#endif 1550#endif
… …
1482 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1555 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1483 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1484 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1485 &(ev->xbutton.x), &(ev->xbutton.y), 1558 &(ev->xbutton.x), &(ev->xbutton.y),
1486 &unused_mask); 1559 &unused_mask);
1487 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - h->csrO, 1560 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1488 scrollbar_size()); 1561 scrollbar_size());
1489 rxvt_scr_refresh(aR_ h->refresh_type); 1562 rxvt_scr_refresh(aR_ R->refresh_type);
1490 h->refresh_limit = 0; 1563 R->refresh_limit = 0;
1491 rxvt_scrollbar_show(aR_ 1); 1564 rxvt_scrollbar_show(aR_ 1);
1492 } 1565 }
1493 break; 1566 break;
1494 } 1567 }
1495} 1568}
… …
1497/* INTPROTO */ 1570/* INTPROTO */
1498void 1571void
1499rxvt_button_press(pR_ XButtonEvent *ev) 1572rxvt_button_press(pR_ XButtonEvent *ev)
1500{ 1573{
1501 int reportmode = 0, clickintime; 1574 int reportmode = 0, clickintime;
1502 struct rxvt_hidden *h = R->h;
1503 1575
1504 h->bypass_keystate = ev->state & (h->ModMetaMask | ShiftMask); 1576 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1505 if (!h->bypass_keystate) 1577 if (!R->bypass_keystate)
1506 reportmode = !!(h->PrivateModes & PrivMode_mouse_report); 1578 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1507/* 1579/*
1508 * VT window processing of button press 1580 * VT window processing of button press
1509 */ 1581 */
1510 if (ev->window == R->TermWin.vt) 1582 if (ev->window == R->TermWin.vt)
1511 { 1583 {
… …
1513 if (ev->subwindow != None) 1585 if (ev->subwindow != None)
1514 rxvt_Gr_ButtonPress(ev->x, ev->y); 1586 rxvt_Gr_ButtonPress(ev->x, ev->y);
1515 else 1587 else
1516#endif 1588#endif
1517 { 1589 {
1518 clickintime = ev->time - h->MEvent.time < MULTICLICK_TIME; 1590 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1519 if (reportmode) 1591 if (reportmode)
1520 { 1592 {
1521 /* mouse report from vt window */ 1593 /* mouse report from vt window */
1522 /* save the xbutton state (for ButtonRelease) */ 1594 /* save the xbutton state (for ButtonRelease) */
1523 h->MEvent.state = ev->state; 1595 R->MEvent.state = ev->state;
1524#ifdef MOUSE_REPORT_DOUBLECLICK 1596#ifdef MOUSE_REPORT_DOUBLECLICK
1525 if (ev->button == h->MEvent.button && clickintime) 1597 if (ev->button == R->MEvent.button && clickintime)
1526 { 1598 {
1527 /* same button, within alloted time */ 1599 /* same button, within alloted time */
1528 h->MEvent.clicks++; 1600 R->MEvent.clicks++;
1529 if (h->MEvent.clicks > 1) 1601 if (R->MEvent.clicks > 1)
1530 { 1602 {
1531 /* only report double clicks */ 1603 /* only report double clicks */
1532 h->MEvent.clicks = 2; 1604 R->MEvent.clicks = 2;
1533 rxvt_mouse_report(aR_ ev); 1605 rxvt_mouse_report(aR_ ev);
1534 1606
1535 /* don't report the release */ 1607 /* don't report the release */
1536 h->MEvent.clicks = 0; 1608 R->MEvent.clicks = 0;
1537 h->MEvent.button = AnyButton; 1609 R->MEvent.button = AnyButton;
1538 } 1610 }
1539 } 1611 }
1540 else 1612 else
1541 { 1613 {
1542 /* different button, or time expired */ 1614 /* different button, or time expired */
1543 h->MEvent.clicks = 1; 1615 R->MEvent.clicks = 1;
1544 h->MEvent.button = ev->button; 1616 R->MEvent.button = ev->button;
1545 rxvt_mouse_report(aR_ ev); 1617 rxvt_mouse_report(aR_ ev);
1546 } 1618 }
1547#else 1619#else
1548 h->MEvent.button = ev->button; 1620 R->MEvent.button = ev->button;
1549 rxvt_mouse_report(aR_ ev); 1621 rxvt_mouse_report(aR_ ev);
1550#endif /* MOUSE_REPORT_DOUBLECLICK */ 1622#endif /* MOUSE_REPORT_DOUBLECLICK */
1551 } 1623 }
1552 else 1624 else
1553 { 1625 {
1554 if (ev->button != h->MEvent.button) 1626 if (ev->button != R->MEvent.button)
1555 h->MEvent.clicks = 0; 1627 R->MEvent.clicks = 0;
1556 switch (ev->button) 1628 switch (ev->button)
1557 { 1629 {
1558 case Button1: 1630 case Button1:
1559 if (h->MEvent.button == Button1 && clickintime) 1631 if (R->MEvent.button == Button1 && clickintime)
1560 h->MEvent.clicks++; 1632 R->MEvent.clicks++;
1561 else 1633 else
1562 h->MEvent.clicks = 1; 1634 R->MEvent.clicks = 1;
1563 rxvt_selection_click(aR_ h->MEvent.clicks, ev->x, ev->y); 1635 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1564 h->MEvent.button = Button1; 1636 R->MEvent.button = Button1;
1565 break; 1637 break;
1566 1638
1567 case Button3: 1639 case Button3:
1568 if (h->MEvent.button == Button3 && clickintime) 1640 if (R->MEvent.button == Button3 && clickintime)
1569 rxvt_selection_rotate(aR_ ev->x, ev->y); 1641 rxvt_selection_rotate(aR_ ev->x, ev->y);
1570 else 1642 else
1571 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1643 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1572 h->MEvent.button = Button3; 1644 R->MEvent.button = Button3;
1573 break; 1645 break;
1574 } 1646 }
1575 } 1647 }
1576 h->MEvent.time = ev->time; 1648 R->MEvent.time = ev->time;
1577 return; 1649 return;
1578 } 1650 }
1579 } 1651 }
1580 1652
1581/* 1653/*
… …
1603 */ 1675 */
1604 if ((R->scrollBar.style == R_SB_NEXT 1676 if ((R->scrollBar.style == R_SB_NEXT
1605 && scrollbarnext_upButton(ev->y)) 1677 && scrollbarnext_upButton(ev->y))
1606 || (R->scrollBar.style == R_SB_RXVT 1678 || (R->scrollBar.style == R_SB_RXVT
1607 && scrollbarrxvt_upButton(ev->y))) 1679 && scrollbarrxvt_upButton(ev->y)))
1608 rxvt_tt_printf(aR_ "\033[A"); 1680 R->tt_printf("\033[A");
1609 else if ((R->scrollBar.style == R_SB_NEXT 1681 else if ((R->scrollBar.style == R_SB_NEXT
1610 && scrollbarnext_dnButton(ev->y)) 1682 && scrollbarnext_dnButton(ev->y))
1611 || (R->scrollBar.style == R_SB_RXVT 1683 || (R->scrollBar.style == R_SB_RXVT
1612 && scrollbarrxvt_dnButton(ev->y))) 1684 && scrollbarrxvt_dnButton(ev->y)))
1613 rxvt_tt_printf(aR_ "\033[B"); 1685 R->tt_printf("\033[B");
1614 else 1686 else
1615 switch (ev->button) { 1687 switch (ev->button) {
1616 case Button2: 1688 case Button2:
1617 rxvt_tt_printf(aR_ "\014"); 1689 R->tt_printf("\014");
1618 break; 1690 break;
1619 case Button1: 1691 case Button1:
1620 rxvt_tt_printf(aR_ "\033[6~"); 1692 R->tt_printf("\033[6~");
1621 break; 1693 break;
1622 case Button3: 1694 case Button3:
1623 rxvt_tt_printf(aR_ "\033[5~"); 1695 R->tt_printf("\033[5~");
1624 break; 1696 break;
1625 } 1697 }
1626 } 1698 }
1627 else 1699 else
1628#endif /* NO_SCROLLBAR_REPORT */ 1700#endif /* NO_SCROLLBAR_REPORT */
… …
1640 else if (scrollbarrxvt_dnButton(ev->y)) 1712 else if (scrollbarrxvt_dnButton(ev->y))
1641 upordown = 1; /* down */ 1713 upordown = 1; /* down */
1642 } 1714 }
1643 if (upordown) { 1715 if (upordown) {
1644#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1716#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1645 h->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1717 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1646#endif 1718#endif
1647 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1719 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1648 if (upordown < 0) 1720 if (upordown < 0)
1649 scrollbar_setUp(); 1721 scrollbar_setUp();
1650 else 1722 else
1651 scrollbar_setDn(); 1723 scrollbar_setDn();
1652 } 1724 }
1653 } else 1725 } else
1654 switch (ev->button) { 1726 switch (ev->button) {
1655 case Button2: 1727 case Button2:
1656 switch (h->scrollbar_align) { 1728 switch (R->scrollbar_align) {
1657 case R_SB_ALIGN_TOP: 1729 case R_SB_ALIGN_TOP:
1658 h->csrO = 0; 1730 R->csrO = 0;
1659 break; 1731 break;
1660 case R_SB_ALIGN_CENTRE: 1732 case R_SB_ALIGN_CENTRE:
1661 h->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1733 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1662 break; 1734 break;
1663 case R_SB_ALIGN_BOTTOM: 1735 case R_SB_ALIGN_BOTTOM:
1664 h->csrO = R->scrollBar.bot - R->scrollBar.top; 1736 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1665 break; 1737 break;
1666 } 1738 }
1667 if (R->scrollBar.style == R_SB_XTERM 1739 if (R->scrollBar.style == R_SB_XTERM
1668 || scrollbar_above_slider(ev->y) 1740 || scrollbar_above_slider(ev->y)
1669 || scrollbar_below_slider(ev->y)) 1741 || scrollbar_below_slider(ev->y))
1670 rxvt_scr_move_to(aR_ 1742 rxvt_scr_move_to(aR_
1671 scrollbar_position(ev->y) - h->csrO, 1743 scrollbar_position(ev->y) - R->csrO,
1672 scrollbar_size()); 1744 scrollbar_size());
1673 scrollbar_setMotion(); 1745 scrollbar_setMotion();
1674 break; 1746 break;
1675 1747
1676 case Button1: 1748 case Button1:
1677 if (h->scrollbar_align == R_SB_ALIGN_CENTRE) 1749 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1678 h->csrO = ev->y - R->scrollBar.top; 1750 R->csrO = ev->y - R->scrollBar.top;
1679 /* FALLTHROUGH */ 1751 /* FALLTHROUGH */
1680 1752
1681 case Button3: 1753 case Button3:
1682 if (R->scrollBar.style != R_SB_XTERM) { 1754 if (R->scrollBar.style != R_SB_XTERM) {
1683 if (scrollbar_above_slider(ev->y)) 1755 if (scrollbar_above_slider(ev->y))
… …
1718void 1790void
1719rxvt_button_release(pR_ XButtonEvent *ev) 1791rxvt_button_release(pR_ XButtonEvent *ev)
1720{ 1792{
1721 int reportmode = 0; 1793 int reportmode = 0;
1722 1794
1723 R->h->csrO = 0; /* reset csr Offset */ 1795 R->csrO = 0; /* reset csr Offset */
1724 if (!R->h->bypass_keystate) 1796 if (!R->bypass_keystate)
1725 reportmode = !!(R->h->PrivateModes & PrivMode_mouse_report); 1797 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1726 1798
1727 if (scrollbar_isUpDn()) { 1799 if (scrollbar_isUpDn()) {
1728 scrollbar_setIdle(); 1800 scrollbar_setIdle();
1729 rxvt_scrollbar_show(aR_ 0); 1801 rxvt_scrollbar_show(aR_ 0);
1730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1802#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1731 R->h->refresh_type &= ~SMOOTH_REFRESH; 1803 R->refresh_type &= ~SMOOTH_REFRESH;
1732#endif 1804#endif
1733 } 1805 }
1734#ifdef SELECTION_SCROLLING 1806#ifdef SELECTION_SCROLLING
1735 R->h->pending_scroll_selection=0; 1807 R->pending_scroll_selection=0;
1736#endif 1808#endif
1737 if (ev->window == R->TermWin.vt) 1809 if (ev->window == R->TermWin.vt)
1738 { 1810 {
1739#ifdef RXVT_GRAPHICS 1811#ifdef RXVT_GRAPHICS
1740 if (ev->subwindow != None) 1812 if (ev->subwindow != None)
… …
1748 /* don't report release of wheel "buttons" */ 1820 /* don't report release of wheel "buttons" */
1749 if (ev->button >= 4) 1821 if (ev->button >= 4)
1750 return; 1822 return;
1751#ifdef MOUSE_REPORT_DOUBLECLICK 1823#ifdef MOUSE_REPORT_DOUBLECLICK
1752 /* only report the release of 'slow' single clicks */ 1824 /* only report the release of 'slow' single clicks */
1753 if (R->h->MEvent.button != AnyButton 1825 if (R->MEvent.button != AnyButton
1754 && (ev->button != R->h->MEvent.button 1826 && (ev->button != R->MEvent.button
1755 || (ev->time - R->h->MEvent.time 1827 || (ev->time - R->MEvent.time
1756 > MULTICLICK_TIME / 2))) 1828 > MULTICLICK_TIME / 2)))
1757 { 1829 {
1758 R->h->MEvent.clicks = 0; 1830 R->MEvent.clicks = 0;
1759 R->h->MEvent.button = AnyButton; 1831 R->MEvent.button = AnyButton;
1760 rxvt_mouse_report(aR_ ev); 1832 rxvt_mouse_report(aR_ ev);
1761 } 1833 }
1762#else /* MOUSE_REPORT_DOUBLECLICK */ 1834#else /* MOUSE_REPORT_DOUBLECLICK */
1763 R->h->MEvent.button = AnyButton; 1835 R->MEvent.button = AnyButton;
1764 rxvt_mouse_report(aR_ ev); 1836 rxvt_mouse_report(aR_ ev);
1765#endif /* MOUSE_REPORT_DOUBLECLICK */ 1837#endif /* MOUSE_REPORT_DOUBLECLICK */
1766 return; 1838 return;
1767 } 1839 }
1768 /* 1840 /*
1769 * dumb hack to compensate for the failure of click-and-drag 1841 * dumb hack to compensate for the failure of click-and-drag
1770 * when overriding mouse reporting 1842 * when overriding mouse reporting
1771 */ 1843 */
1772 if (R->h->PrivateModes & PrivMode_mouse_report 1844 if (R->PrivateModes & PrivMode_mouse_report
1773 && R->h->bypass_keystate 1845 && R->bypass_keystate
1774 && ev->button == Button1 && R->h->MEvent.clicks <= 1) 1846 && ev->button == Button1 && R->MEvent.clicks <= 1)
1775 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1847 rxvt_selection_extend(aR_ ev->x, ev->y, 0);
1776 1848
1777 switch (ev->button) { 1849 switch (ev->button) {
1778 case Button1: 1850 case Button1:
1779 case Button3: 1851 case Button3:
… …
1796 else 1868 else
1797 i = 5; 1869 i = 5;
1798# ifdef MOUSE_SLIP_WHEELING 1870# ifdef MOUSE_SLIP_WHEELING
1799 if (ev->state & ControlMask) 1871 if (ev->state & ControlMask)
1800 { 1872 {
1801 R->h->mouse_slip_wheel_speed += (v ? -1 : 1); 1873 R->mouse_slip_wheel_speed += (v ? -1 : 1);
1802 R->h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1874 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1803 } 1875 }
1804# endif 1876# endif
1805# ifdef JUMP_MOUSE_WHEEL 1877# ifdef JUMP_MOUSE_WHEEL
1806 rxvt_scr_page(aR_ v, i); 1878 rxvt_scr_page(aR_ v, i);
1807 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1879 rxvt_scr_refresh(aR_ SMOOTH_REFRESH);
… …
1852 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1924 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr);
1853 rootdepth = wrootattr.depth; 1925 rootdepth = wrootattr.depth;
1854 1926
1855 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1927 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
1856 if (rootdepth != wattr.depth) { 1928 if (rootdepth != wattr.depth) {
1857 if (R->h->am_transparent) { 1929 if (R->am_transparent) {
1858 pchanged = 1; 1930 pchanged = 1;
1859 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1931 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1860 R->PixColors[Color_bg]); 1932 R->PixColors[Color_bg]);
1861 R->h->am_transparent = R->h->am_pixmap_trans = 0; 1933 R->am_transparent = R->am_pixmap_trans = 0;
1862 } 1934 }
1863 return pchanged; /* Don't try any more */ 1935 return pchanged; /* Don't try any more */
1864 } 1936 }
1865 1937
1866/* Get all X ops out of the queue so that our information is up-to-date. */ 1938/* Get all X ops out of the queue so that our information is up-to-date. */
… …
1869/* 1941/*
1870 * Make the frame window set by the window manager have 1942 * Make the frame window set by the window manager have
1871 * the root background. Some window managers put multiple nested frame 1943 * the root background. Some window managers put multiple nested frame
1872 * windows for each client, so we have to take care about that. 1944 * windows for each client, so we have to take care about that.
1873 */ 1945 */
1874 i = (R->h->xa[XA_XROOTPMAPID] != 0 1946 i = (R->xa[XA_XROOTPMAPID] != 0
1875 && (XGetWindowProperty(R->Xdisplay, Xroot, R->h->xa[XA_XROOTPMAPID], 1947 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID],
1876 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1948 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1877 &nitems, &bytes_after, &prop) == Success)); 1949 &nitems, &bytes_after, &prop) == Success));
1878 if (!i || prop == NULL) 1950 if (!i || prop == NULL)
1879 have_pixmap = 0; 1951 have_pixmap = 0;
1880 else { 1952 else {
… …
1908 ny = -sy; 1980 ny = -sy;
1909 sy = 0; 1981 sy = 0;
1910 } 1982 }
1911 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1983 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1912 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1984 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1913 R->h->allowedxerror = -1; 1985 R->allowedxerror = -1;
1914 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1986 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1915 ZPixmap); 1987 ZPixmap);
1916 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1988 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1917 /* XXX: may need a delay here? */ 1989 /* XXX: may need a delay here? */
1918 R->h->allowedxerror = 0; 1990 R->allowedxerror = 0;
1919 if (image == NULL) { 1991 if (image == NULL) {
1920 if (R->h->am_transparent && R->h->am_pixmap_trans) { 1992 if (R->am_transparent && R->am_pixmap_trans) {
1921 pchanged = 1; 1993 pchanged = 1;
1922 if (R->TermWin.pixmap != None) { 1994 if (R->TermWin.pixmap != None) {
1923 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1995 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1924 R->TermWin.pixmap = None; 1996 R->TermWin.pixmap = None;
1925 } 1997 }
1926 } 1998 }
1927 R->h->am_pixmap_trans = 0; 1999 R->am_pixmap_trans = 0;
1928 } else { 2000 } else {
1929 if (R->TermWin.pixmap != None) 2001 if (R->TermWin.pixmap != None)
1930 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2002 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1931 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 2003 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1932 (unsigned int)R->szHint.width, 2004 (unsigned int)R->szHint.width,
… …
1938 (unsigned int)image->height); 2010 (unsigned int)image->height);
1939 XFreeGC(R->Xdisplay, gc); 2011 XFreeGC(R->Xdisplay, gc);
1940 XDestroyImage(image); 2012 XDestroyImage(image);
1941 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2013 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1942 R->TermWin.pixmap); 2014 R->TermWin.pixmap);
1943 if (!R->h->am_transparent || !R->h->am_pixmap_trans) 2015 if (!R->am_transparent || !R->am_pixmap_trans)
1944 pchanged = 1; 2016 pchanged = 1;
1945 R->h->am_transparent = R->h->am_pixmap_trans = 1; 2017 R->am_transparent = R->am_pixmap_trans = 1;
1946 } 2018 }
1947 } 2019 }
1948 if (!R->h->am_pixmap_trans) { 2020 if (!R->am_pixmap_trans) {
1949 unsigned int n; 2021 unsigned int n;
1950/* 2022/*
1951 * InheritPixmap transparency 2023 * InheritPixmap transparency
1952 */ 2024 */
1953 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2025 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
… …
1982 D_X((stderr, "InheritPixmap Turning off")); 2054 D_X((stderr, "InheritPixmap Turning off"));
1983 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2055 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0],
1984 R->PixColors[Color_fg]); 2056 R->PixColors[Color_fg]);
1985 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2057 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1986 R->PixColors[Color_bg]); 2058 R->PixColors[Color_bg]);
1987 R->h->am_transparent = 0; 2059 R->am_transparent = 0;
1988 /* XXX: also turn off Opt_transparent? */ 2060 /* XXX: also turn off Opt_transparent? */
1989 } else { 2061 } else {
1990 /* wait (an arbitrary period) for the WM to do its thing 2062 /* wait (an arbitrary period) for the WM to do its thing
1991 * needed for fvwm2.2.2 (and before?) */ 2063 * needed for fvwm2.2.2 (and before?) */
1992# ifdef HAVE_NANOSLEEP 2064# ifdef HAVE_NANOSLEEP
… …
2002 for (n = 0; n < (unsigned int)i; n++) 2074 for (n = 0; n < (unsigned int)i; n++)
2003 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2075 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n],
2004 ParentRelative); 2076 ParentRelative);
2005 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2077 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2006 ParentRelative); 2078 ParentRelative);
2007 R->h->am_transparent = 1; 2079 R->am_transparent = 1;
2008 } 2080 }
2009 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2081 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++)
2010 R->TermWin.parent[i] = None; 2082 R->TermWin.parent[i] = None;
2011 } 2083 }
2012 return pchanged; 2084 return pchanged;
… …
2020#ifdef PRINTPIPE 2092#ifdef PRINTPIPE
2021/* EXTPROTO */ 2093/* EXTPROTO */
2022FILE * 2094FILE *
2023rxvt_popen_printer(pR) 2095rxvt_popen_printer(pR)
2024{ 2096{
2025 FILE *stream = popen(R->h->rs[Rs_print_pipe], "w"); 2097 FILE *stream = popen(R->rs[Rs_print_pipe], "w");
2026 2098
2027 if (stream == NULL) 2099 if (stream == NULL)
2028 rxvt_print_error("can't open printer pipe"); 2100 rxvt_print_error("can't open printer pipe");
2029 return stream; 2101 return stream;
2030} 2102}
2031 2103
2032/* EXTPROTO */ 2104/* EXTPROTO */
2033int 2105int
2034rxvt_pclose_printer(FILE *stream) 2106rxvt_pclose_printer (FILE *stream)
2035{ 2107{
2036 fflush(stream); 2108 fflush (stream);
2037/* pclose() reported not to work on SunOS 4.1.3 */ 2109/* pclose() reported not to work on SunOS 4.1.3 */
2038# if defined (__sun__) /* TODO: RESOLVE THIS */ 2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2039/* pclose works provided SIGCHLD handler uses waitpid */ 2111/* pclose works provided SIGCHLD handler uses waitpid */
2040 return pclose(stream); /* return fclose (stream); */ 2112 return pclose (stream); /* return fclose (stream); */
2041# else 2113# else
2042 return pclose(stream); 2114 return pclose (stream);
2043# endif 2115# endif
2044} 2116}
2045 2117
2046/* 2118/*
2047 * simulate attached vt100 printer 2119 * simulate attached vt100 printer
… …
2109void 2181void
2110rxvt_process_nonprinting(pR_ unsigned char ch) 2182rxvt_process_nonprinting(pR_ unsigned char ch)
2111{ 2183{
2112 switch (ch) { 2184 switch (ch) {
2113 case C0_ENQ: /* terminal Status */ 2185 case C0_ENQ: /* terminal Status */
2114 if (R->h->rs[Rs_answerbackstring]) 2186 if (R->rs[Rs_answerbackstring])
2115 rxvt_tt_write(aR_ 2187 R->tt_write(
2116 (const unsigned char *)R->h->rs[Rs_answerbackstring], 2188 (const unsigned char *)R->rs[Rs_answerbackstring],
2117 (unsigned int)STRLEN(R->h->rs[Rs_answerbackstring])); 2189 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2118 else 2190 else
2119 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2191 R->tt_write((unsigned char *)VT100_ANS,
2120 (unsigned int)STRLEN(VT100_ANS)); 2192 (unsigned int)STRLEN(VT100_ANS));
2121 break; 2193 break;
2122 case C0_BEL: /* bell */ 2194 case C0_BEL: /* bell */
2123 rxvt_scr_bell(aR); 2195 rxvt_scr_bell(aR);
2124 break; 2196 break;
… …
2187 row = rxvt_cmd_getc(aR) - ' '; 2259 row = rxvt_cmd_getc(aR) - ' ';
2188 col = rxvt_cmd_getc(aR) - ' '; 2260 col = rxvt_cmd_getc(aR) - ' ';
2189 rxvt_scr_gotorc(aR_ row, col, 0); 2261 rxvt_scr_gotorc(aR_ row, col, 0);
2190 break; 2262 break;
2191 case 'Z': /* identify the terminal type */ 2263 case 'Z': /* identify the terminal type */
2192 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2264 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2193 break; 2265 break;
2194 case '<': /* turn off VT52 mode */ 2266 case '<': /* turn off VT52 mode */
2195 PrivMode(0, PrivMode_vt52); 2267 PrivMode(0, PrivMode_vt52);
2196 break; 2268 break;
2197 case 'F': /* use special graphics character set */ 2269 case 'F': /* use special graphics character set */
… …
2212void 2284void
2213rxvt_process_escape_seq(pR) 2285rxvt_process_escape_seq(pR)
2214{ 2286{
2215 unsigned char ch = rxvt_cmd_getc(aR); 2287 unsigned char ch = rxvt_cmd_getc(aR);
2216 2288
2217 if (R->h->PrivateModes & PrivMode_vt52) { 2289 if (R->PrivateModes & PrivMode_vt52) {
2218 rxvt_process_escape_vt52(aR_ ch); 2290 rxvt_process_escape_vt52(aR_ ch);
2219 return; 2291 return;
2220 } 2292 }
2221 2293
2222 switch (ch) { 2294 switch (ch) {
… …
2304 rxvt_process_dcs_seq(aR); 2376 rxvt_process_dcs_seq(aR);
2305 break; 2377 break;
2306 2378
2307 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2379 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2308 case C1_SCI: /* ESC Z */ 2380 case C1_SCI: /* ESC Z */
2309 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2381 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2310 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2382 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2311 break; /* steal obsolete ESC [ c */ 2383 break; /* steal obsolete ESC [ c */
2312 2384
2313 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2385 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2314 case C1_CSI: /* ESC [ */ 2386 case C1_CSI: /* ESC [ */
… …
2435 */ 2507 */
2436 if (priv) { 2508 if (priv) {
2437 switch (priv) { 2509 switch (priv) {
2438 case '>': 2510 case '>':
2439 if (ch == CSI_DA) /* secondary device attributes */ 2511 if (ch == CSI_DA) /* secondary device attributes */
2440 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2512 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2441 break; 2513 break;
2442 case '?': 2514 case '?':
2443 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2515 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2444 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2516 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2445 break; 2517 break;
… …
2552 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2553 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2625 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2554 break; 2626 break;
2555 2627
2556 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2557 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2629 R->tt_write((const unsigned char *)VT100_ANS,
2558 (unsigned int)(sizeof(VT100_ANS) - 1)); 2630 (unsigned int)(sizeof(VT100_ANS) - 1));
2559 break; 2631 break;
2560 2632
2561 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2633 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2562 rxvt_process_sgr_mode(aR_ nargs, arg); 2634 rxvt_process_sgr_mode(aR_ nargs, arg);
2563 break; 2635 break;
2564 2636
2565 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2637 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2566 switch (arg[0]) { 2638 switch (arg[0]) {
2567 case 5: /* DSR requested */ 2639 case 5: /* DSR requested */
2568 rxvt_tt_printf(aR_ "\033[0n"); 2640 R->tt_printf("\033[0n");
2569 break; 2641 break;
2570 case 6: /* CPR requested */ 2642 case 6: /* CPR requested */
2571 rxvt_scr_report_position(aR); 2643 rxvt_scr_report_position(aR);
2572 break; 2644 break;
2573#if defined (ENABLE_DISPLAY_ANSWER) 2645#if defined (ENABLE_DISPLAY_ANSWER)
2574 case 7: /* unofficial extension */ 2646 case 7: /* unofficial extension */
2575 rxvt_tt_printf(aR_ "%-.250s\n", R->h->rs[Rs_display_name]); 2647 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2576 break; 2648 break;
2577#endif 2649#endif
2578 case 8: /* unofficial extension */ 2650 case 8: /* unofficial extension */
2579 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2651 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2580 break; 2652 break;
… …
2649 break; 2721 break;
2650#endif 2722#endif
2651 2723
2652 case CSI_78: /* DECREQTPARM */ 2724 case CSI_78: /* DECREQTPARM */
2653 if (arg[0] == 0 || arg[0] == 1) 2725 if (arg[0] == 0 || arg[0] == 1)
2654 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2726 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2655 /* FALLTHROUGH */ 2727 /* FALLTHROUGH */
2656 2728
2657 default: 2729 default:
2658 break; 2730 break;
2659 } 2731 }
… …
2713 /* 2785 /*
2714 * reports - some output format copied from XTerm 2786 * reports - some output format copied from XTerm
2715 */ 2787 */
2716 case 11: /* report window state */ 2788 case 11: /* report window state */
2717 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2718 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2790 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2719 break; 2791 break;
2720 case 13: /* report window position */ 2792 case 13: /* report window position */
2721 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2722 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2794 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2723 -wattr.border_width, -wattr.border_width, 2795 -wattr.border_width, -wattr.border_width,
2724 &x, &y, &wdummy); 2796 &x, &y, &wdummy);
2725 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2797 R->tt_printf("\033[3;%d;%dt", x, y);
2726 break; 2798 break;
2727 case 14: /* report window size (pixels) */ 2799 case 14: /* report window size (pixels) */
2728 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2800 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2729 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2801 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2730 break; 2802 break;
2731 case 18: /* report window size (chars) */ 2803 case 18: /* report window size (chars) */
2732 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2804 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2733 break; 2805 break;
2734#if 0 /* XXX: currently disabled due to security concerns */ 2806#if 0 /* XXX: currently disabled due to security concerns */
2735 case 20: /* report icon label */ 2807 case 20: /* report icon label */
2736 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2808 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2737 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2809 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2738 break; 2810 break;
2739 case 21: /* report window title */ 2811 case 21: /* report window title */
2740 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2812 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2741 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2813 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2742 break; 2814 break;
2743#endif 2815#endif
2744 } 2816 }
2745} 2817}
2746#endif 2818#endif
… …
2977rxvt_privcases(pR_ int mode, unsigned long bit) 3049rxvt_privcases(pR_ int mode, unsigned long bit)
2978{ 3050{
2979 int state; 3051 int state;
2980 3052
2981 if (mode == 's') { 3053 if (mode == 's') {
2982 R->h->SavedModes |= (R->h->PrivateModes & bit); 3054 R->SavedModes |= (R->PrivateModes & bit);
2983 return -1; 3055 return -1;
2984 } else { 3056 } else {
2985 if (mode == 'r') 3057 if (mode == 'r')
2986 state = (R->h->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3058 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */
2987 else 3059 else
2988 state = (mode == 't') ? !(R->h->PrivateModes & bit) : mode; 3060 state = (mode == 't') ? !(R->PrivateModes & bit) : mode;
2989 PrivMode(state, bit); 3061 PrivMode(state, bit);
2990 } 3062 }
2991 return state; 3063 return state;
2992} 3064}
2993 3065
… …
3071 * within VT52 mode 3143 * within VT52 mode
3072 */ 3144 */
3073 PrivMode(1, PrivMode_vt52); 3145 PrivMode(1, PrivMode_vt52);
3074 break; 3146 break;
3075 case 3: /* 80/132 */ 3147 case 3: /* 80/132 */
3076 if (R->h->PrivateModes & PrivMode_132OK) 3148 if (R->PrivateModes & PrivMode_132OK)
3077 rxvt_set_widthheight(aR_ 3149 rxvt_set_widthheight(aR_
3078 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3150 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth),
3079 (unsigned int)R->TermWin.height); 3151 (unsigned int)R->TermWin.height);
3080 break; 3152 break;
3081 case 4: /* smooth scrolling */ 3153 case 4: /* smooth scrolling */
… …
3094 rxvt_scr_autowrap(aR_ state); 3166 rxvt_scr_autowrap(aR_ state);
3095 break; 3167 break;
3096 /* case 8: - auto repeat, can't do on a per window basis */ 3168 /* case 8: - auto repeat, can't do on a per window basis */
3097 case 9: /* X10 mouse reporting */ 3169 case 9: /* X10 mouse reporting */
3098 if (state) /* orthogonal */ 3170 if (state) /* orthogonal */
3099 R->h->PrivateModes &= ~(PrivMode_MouseX11); 3171 R->PrivateModes &= ~(PrivMode_MouseX11);
3100 break; 3172 break;
3101#ifdef menuBar_esc 3173#ifdef menuBar_esc
3102 case menuBar_esc: 3174 case menuBar_esc:
3103#ifdef MENUBAR 3175#ifdef MENUBAR
3104 rxvt_map_menuBar(aR_ state); 3176 rxvt_map_menuBar(aR_ state);
… …
3123 break; 3195 break;
3124 /* case 66: - application key pad */ 3196 /* case 66: - application key pad */
3125 /* case 67: - backspace key */ 3197 /* case 67: - backspace key */
3126 case 1000: /* X11 mouse reporting */ 3198 case 1000: /* X11 mouse reporting */
3127 if (state) /* orthogonal */ 3199 if (state) /* orthogonal */
3128 R->h->PrivateModes &= ~(PrivMode_MouseX10); 3200 R->PrivateModes &= ~(PrivMode_MouseX10);
3129 break; 3201 break;
3130#if 0 3202#if 0
3131 case 1001: 3203 case 1001:
3132 break; /* X11 mouse highlighting */ 3204 break; /* X11 mouse highlighting */
3133#endif 3205#endif
… …
3142 R->Options |= Opt_scrollTtyKeypress; 3214 R->Options |= Opt_scrollTtyKeypress;
3143 else 3215 else
3144 R->Options &= ~Opt_scrollTtyKeypress; 3216 R->Options &= ~Opt_scrollTtyKeypress;
3145 break; 3217 break;
3146 case 1047: /* secondary screen w/ clearing */ 3218 case 1047: /* secondary screen w/ clearing */
3147 if (R->h->current_screen != PRIMARY) 3219 if (R->current_screen != PRIMARY)
3148 rxvt_scr_erase_screen(aR_ 2); 3220 rxvt_scr_erase_screen(aR_ 2);
3149 rxvt_scr_change_screen(aR_ state); 3221 rxvt_scr_change_screen(aR_ state);
3150 /* FALLTHROUGH */ 3222 /* FALLTHROUGH */
3151 default: 3223 default:
3152 break; 3224 break;
… …
3289{ 3361{
3290 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3362 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3291 3363
3292#ifndef RXVT_GRAPHICS 3364#ifndef RXVT_GRAPHICS
3293 if (cmd == 'Q') { /* query graphics */ 3365 if (cmd == 'Q') { /* query graphics */
3294 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3366 R->tt_printf("\033G0\n"); /* no graphics */
3295 return; 3367 return;
3296 } 3368 }
3297/* swallow other graphics sequences until terminating ':' */ 3369/* swallow other graphics sequences until terminating ':' */
3298 do 3370 do
3299 ch = rxvt_cmd_getc(aR); 3371 ch = rxvt_cmd_getc(aR);
… …
3302 unsigned int nargs; 3374 unsigned int nargs;
3303 int args[NGRX_PTS]; 3375 int args[NGRX_PTS];
3304 unsigned char *text = NULL; 3376 unsigned char *text = NULL;
3305 3377
3306 if (cmd == 'Q') { /* query graphics */ 3378 if (cmd == 'Q') { /* query graphics */
3307 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3379 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3308 return; 3380 return;
3309 } 3381 }
3310 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3382 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3311 int neg; 3383 int neg;
3312 3384
… …
3342} 3414}
3343/*}}} */ 3415/*}}} */
3344 3416
3345/* ------------------------------------------------------------------------- */ 3417/* ------------------------------------------------------------------------- */
3346 3418
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
3449/* 3419/*
3450 * Send printf() formatted output to the command. 3420 * Send printf() formatted output to the command.
3451 * Only use for small amounts of data. 3421 * Only use for small amounts of data.
3452 */ 3422 */
3453/* EXTPROTO */
3454void 3423void
3455rxvt_tt_printf(pR_ const char *fmt,...) 3424rxvt_term::tt_printf (const char *fmt,...)
3456{ 3425{
3457 va_list arg_ptr; 3426 va_list arg_ptr;
3458 unsigned char buf[256]; 3427 unsigned char buf[256];
3459 3428
3460 va_start(arg_ptr, fmt); 3429 va_start (arg_ptr, fmt);
3461 vsprintf((char *)buf, fmt, arg_ptr); 3430 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3462 va_end(arg_ptr); 3431 va_end (arg_ptr);
3463 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3432 tt_write (buf, STRLEN (buf));
3464} 3433}
3465 3434
3466/* ---------------------------------------------------------------------- */ 3435/* ---------------------------------------------------------------------- */
3467/* Addresses pasting large amounts of data and rxvt hang
3468 * code pinched from xterm (v_write()) and applied originally to
3469 * rxvt-2.18 - Hops
3470 * Write data to the pty as typed by the user, pasted with the mouse, 3436/* Write data to the pty as typed by the user, pasted with the mouse,
3471 * or generated by us in response to a query ESC sequence. 3437 * or generated by us in response to a query ESC sequence.
3472 */ 3438 */
3473/* EXTPROTO */
3474void 3439void
3475rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3440rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3476{ 3441{
3477#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3442 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3478 int riten;
3479 unsigned int p;
3480 unsigned char *v_buffer, /* start of physical buffer */
3481 *v_bufstr, /* start of current buffer pending */
3482 *v_bufptr, /* end of current buffer pending */
3483 *v_bufend; /* end of physical buffer */
3484 3443
3485 if (R->h->v_bufstr == NULL && len > 0) { 3444 if (len)
3486 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3487 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3488 v_bufend = v_buffer + p;
3489 } else {
3490 v_buffer = R->h->v_buffer;
3491 v_bufstr = R->h->v_bufstr;
3492 v_bufptr = R->h->v_bufptr;
3493 v_bufend = R->h->v_bufend;
3494 } 3445 {
3446 if (v_buflen == 0)
3447 {
3448 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3449 if (written == len)
3450 return;
3495 3451
3496 /* 3452 data += written;
3497 * Append to the block we already have. Always doing this simplifies the 3453 len -= written;
3498 * code, and isn't too bad, either. If this is a short block, it isn't 3454 }
3499 * too expensive, and if this is a long block, we won't be able to write 3455
3500 * it all anyway. 3456
3501 */ 3457 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3502 if (len > 0) { 3458
3503 if (v_bufend < v_bufptr + len) { /* run out of room */ 3459 memcpy (v_buffer + v_buflen, data, len);
3504 if (v_bufstr != v_buffer) { 3460 v_buflen += len;
3505 /* there is unused space, move everything down */
3506 MEMMOVE(v_buffer, v_bufstr,
3507 (unsigned int)(v_bufptr - v_bufstr));
3508 v_bufptr -= v_bufstr - v_buffer;
3509 v_bufstr = v_buffer;
3510 } 3461 }
3511 if (v_bufend < v_bufptr + len) {
3512 /* still won't fit: get more space */
3513 /* use most basic realloc because an error is not fatal. */
3514 unsigned int size = v_bufptr - v_buffer;
3515 unsigned int reallocto;
3516 3462
3517 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3463 for (;;)
3518 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3464 {
3519 /* save across realloc */ 3465 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3520 if (v_buffer) { 3466
3521 v_bufstr = v_buffer; 3467 if (written > 0)
3522 v_bufptr = v_buffer + size; 3468 {
3523 v_bufend = v_buffer + reallocto; 3469 v_buflen -= written;
3524 } else { /* no memory: ignore entire write request */ 3470
3525 rxvt_print_error("data loss: cannot allocate buffer space"); 3471 if (v_buflen == 0)
3526 v_buffer = v_bufstr; /* restore clobbered pointer */ 3472 {
3527 } 3473 free (v_buffer);
3474 v_buffer = 0;
3475 v_buflen = 0;
3476
3477 pty_ev.set (EVENT_READ);
3478 return;
3479 }
3480
3481 memmove (v_buffer, v_buffer + written, v_buflen);
3482 }
3483 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3484 // original code just ignores this...
3485 destroy ();
3486 else
3487 {
3488 pty_ev.set (EVENT_READ | EVENT_WRITE);
3489 return;
3490 }
3528 } 3491 }
3529 }
3530 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3531 MEMCPY(v_bufptr, d, len);
3532 v_bufptr += len;
3533 }
3534 }
3535
3536 /*
3537 * Write out as much of the buffer as we can.
3538 * Be careful not to overflow the pty's input silo.
3539 * We are conservative here and only write a small amount at a time.
3540 *
3541 * If we can't push all the data into the pty yet, we expect write
3542 * to return a non-negative number less than the length requested
3543 * (if some data written) or -1 and set errno to EAGAIN,
3544 * EWOULDBLOCK, or EINTR (if no data written).
3545 *
3546 * (Not all systems do this, sigh, so the code is actually
3547 * a little more forgiving.)
3548 */
3549 if ((p = v_bufptr - v_bufstr) > 0) {
3550 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3551 if (riten < 0)
3552 riten = 0;
3553 v_bufstr += riten;
3554 if (v_bufstr >= v_bufptr) /* we wrote it all */
3555 v_bufstr = v_bufptr = v_buffer;
3556 }
3557 /*
3558 * If we have lots of unused memory allocated, return it
3559 */
3560 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3561 /* save pointers across realloc */
3562 unsigned int start = v_bufstr - v_buffer;
3563 unsigned int size = v_bufptr - v_buffer;
3564 unsigned int reallocto;
3565
3566 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3567 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3568 if (v_buffer) {
3569 v_bufstr = v_buffer + start;
3570 v_bufptr = v_buffer + size;
3571 v_bufend = v_buffer + reallocto;
3572 } else {
3573 /* should we print a warning if couldn't return memory? */
3574 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3575 }
3576 }
3577 R->h->v_buffer = v_buffer;
3578 R->h->v_bufstr = v_bufstr;
3579 R->h->v_bufptr = v_bufptr;
3580 R->h->v_bufend = v_bufend;
3581} 3492}
3493
3582/*----------------------- end-of-file (C source) -----------------------*/ 3494/*----------------------- end-of-file (C source) -----------------------*/
3583 3495

Diff Legend

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