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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.15 by pcg, Tue Dec 16 23:04:13 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.1 2003/11/24 17:28:08 pcg Exp $ 4 * $Id: command.C,v 1.15 2003/12/16 23:04:13 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>
… …
61 unsigned int newlen; 61 unsigned int newlen;
62 KeySym keysym; 62 KeySym keysym;
63#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
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
67 int valid_keysym; 66 int valid_keysym;
68#endif
69 unsigned char *kbuf = R->h->kbuf; 67 unsigned char *kbuf = R->kbuf;
70 68
71/* 69/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
74 * 72 *
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->h->ModMetaMask); 77 meta = (ev->state & R->ModMetaMask);
78
80 if (R->numlock_state || (ev->state & R->h->ModNumLockMask)) { 79 if (R->numlock_state || (ev->state & R->ModNumLockMask))
80 {
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
85 kbuf[0] = 0;
86
84#ifdef USE_XIM 87#ifdef USE_XIM
85 if (R->h->Input_Context != NULL) { 88 if (R->Input_Context)
89 {
86 Status status_return; 90 Status status_return;
87 91
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
90 len = Xutf8LookupString(R->h->Input_Context, ev, (char *)kbuf, 93 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 94 KBUFSZ, &keysym, &status_return);
92#else 95#else
93 len = XmbLookupString(R->h->Input_Context, ev, (char *)kbuf, 96 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
95#endif 98#endif
96 valid_keysym = ((status_return == XLookupKeySym) 99 valid_keysym = ((status_return == XLookupKeySym)
97 || (status_return == XLookupBoth)); 100 || (status_return == XLookupBoth));
101 }
98 } else { 102 else
103#endif
104 {
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 105 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100 &R->h->compose);
101 valid_keysym = 1; 106 valid_keysym = !len;
102 } 107 }
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105 &R->h->compose);
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 }
118#endif /* USE_XIM */
119 108
120#ifdef USE_XIM
121 if (valid_keysym) 109 if (valid_keysym)
122#endif
123 { 110 {
124/* for some backwards compatibility */ 111/* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 112#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 113# ifdef HOTKEY_CTRL
127 if (ctrl) { 114 if (ctrl)
128# else 115# else
129 if (meta) { 116 if (meta)
130# endif 117# endif
118 {
131 if (keysym == R->h->ks_bigfont) { 119 if (keysym == R->ks_bigfont)
120 {
132 rxvt_change_font(aR_ 0, FONT_UP); 121 rxvt_change_font(aR_ 0, FONT_UP);
133 return; 122 return;
123 }
134 } else if (keysym == R->h->ks_smallfont) { 124 else if (keysym == R->ks_smallfont)
125 {
135 rxvt_change_font(aR_ 0, FONT_DN); 126 rxvt_change_font(aR_ 0, FONT_DN);
136 return; 127 return;
137 } 128 }
138 } 129 }
139#endif 130#endif
140 131
141 if (R->TermWin.saveLines) { 132 if (R->TermWin.saveLines) {
142#ifdef UNSHIFTED_SCROLLKEYS 133#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 134 if (!ctrl && !meta) {
… …
186 if (shft) { 177 if (shft) {
187 /* Shift + F1 - F10 generates F11 - F20 */ 178 /* Shift + F1 - F10 generates F11 - F20 */
188 if (keysym >= XK_F1 && keysym <= XK_F10) { 179 if (keysym >= XK_F1 && keysym <= XK_F10) {
189 keysym += (XK_F11 - XK_F1); 180 keysym += (XK_F11 - XK_F1);
190 shft = 0; /* turn off Shift */ 181 shft = 0; /* turn off Shift */
191 } else if (!ctrl && !meta && (R->h->PrivateModes & PrivMode_ShiftKeys)) { 182 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) {
192 switch (keysym) { 183 switch (keysym) {
193 /* normal XTerm key bindings */ 184 /* normal XTerm key bindings */
194 case XK_Insert: /* Shift+Insert = paste mouse selection */ 185 case XK_Insert: /* Shift+Insert = paste mouse selection */
195 rxvt_selection_request(aR_ ev->time, 0, 0); 186 rxvt_selection_request(aR_ ev->time, 0, 0);
196 return; 187 return;
… …
209 rxvt_scr_printscreen(aR_ ctrl | shft); 200 rxvt_scr_printscreen(aR_ ctrl | shft);
210 return; 201 return;
211 } 202 }
212#endif 203#endif
213#ifdef GREEK_SUPPORT 204#ifdef GREEK_SUPPORT
214 if (keysym == R->h->ks_greekmodeswith) { 205 if (keysym == R->ks_greekmodeswith) {
215 R->h->greek_mode = !R->h->greek_mode; 206 R->greek_mode = !R->greek_mode;
216 if (R->h->greek_mode) { 207 if (R->greek_mode) {
217 rxvt_xterm_seq(aR_ XTerm_title, 208 rxvt_xterm_seq(aR_ XTerm_title,
218 (greek_getmode() == GREEK_ELOT928 209 (greek_getmode() == GREEK_ELOT928
219 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 210 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
220 greek_reset(); 211 greek_reset();
221 } else 212 } else
… …
224 } 215 }
225#endif 216#endif
226 217
227 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 218 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
228#ifdef KEYSYM_RESOURCE 219#ifdef KEYSYM_RESOURCE
229 if (!(shft | ctrl) && R->h->Keysym_map[keysym & 0xFF] != NULL) { 220 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) {
230 unsigned int l; 221 unsigned int l;
231 const unsigned char *kbuf0; 222 const unsigned char *kbuf0;
232 const unsigned char ch = C0_ESC; 223 const unsigned char ch = C0_ESC;
233 224
234 kbuf0 = (R->h->Keysym_map[keysym & 0xFF]); 225 kbuf0 = (R->Keysym_map[keysym & 0xFF]);
235 l = (unsigned int)*kbuf0++; 226 l = (unsigned int)*kbuf0++;
236 227
237 /* escape prefix */ 228 /* escape prefix */
238 if (meta) 229 if (meta)
239# ifdef META8_OPTION 230# ifdef META8_OPTION
240 if (R->h->meta_char == C0_ESC) 231 if (R->meta_char == C0_ESC)
241# endif 232# endif
242 rxvt_tt_write(aR_ &ch, 1); 233 R->tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 234 R->tt_write (kbuf0, l);
244 return; 235 return;
245 } else 236 } else
246#endif 237#endif
247 { 238 {
248 newlen = 1; 239 newlen = 1;
249 switch (keysym) { 240 switch (keysym) {
250#ifndef NO_BACKSPACE_KEY 241#ifndef NO_BACKSPACE_KEY
251 case XK_BackSpace: 242 case XK_BackSpace:
252 if (R->h->PrivateModes & PrivMode_HaveBackSpace) { 243 if (R->PrivateModes & PrivMode_HaveBackSpace) {
253 kbuf[0] = (!!(R->h->PrivateModes & PrivMode_BackSpace) 244 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace)
254 ^ !!ctrl) ? '\b' : '\177'; 245 ^ !!ctrl) ? '\b' : '\177';
255 kbuf[1] = '\0'; 246 kbuf[1] = '\0';
256 } else 247 } else
257 STRCPY(kbuf, R->h->key_backspace); 248 STRCPY(kbuf, R->key_backspace);
258# ifdef MULTICHAR_SET 249# ifdef MULTICHAR_SET
259 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 250 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) {
260 int col, row; 251 int col, row;
261 252
262 newlen = STRLEN(kbuf); 253 newlen = STRLEN(kbuf);
… …
268# endif 259# endif
269 break; 260 break;
270#endif 261#endif
271#ifndef NO_DELETE_KEY 262#ifndef NO_DELETE_KEY
272 case XK_Delete: 263 case XK_Delete:
273 STRCPY(kbuf, R->h->key_delete); 264 STRCPY(kbuf, R->key_delete);
274# ifdef MULTICHAR_SET 265# ifdef MULTICHAR_SET
275 if (R->Options & Opt_mc_hack) { 266 if (R->Options & Opt_mc_hack) {
276 int col, row; 267 int col, row;
277 268
278 newlen = STRLEN(kbuf); 269 newlen = STRLEN(kbuf);
… …
304#ifdef XK_KP_Left 295#ifdef XK_KP_Left
305 case XK_KP_Up: /* \033Ox or standard */ 296 case XK_KP_Up: /* \033Ox or standard */
306 case XK_KP_Down: /* \033Or or standard */ 297 case XK_KP_Down: /* \033Or or standard */
307 case XK_KP_Right: /* \033Ov or standard */ 298 case XK_KP_Right: /* \033Ov or standard */
308 case XK_KP_Left: /* \033Ot or standard */ 299 case XK_KP_Left: /* \033Ot or standard */
309 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 300 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
310 STRCPY(kbuf, "\033OZ"); 301 STRCPY(kbuf, "\033OZ");
311 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 302 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
312 break; 303 break;
313 } else 304 } else
314 /* translate to std. cursor key */ 305 /* translate to std. cursor key */
… …
325 if (shft) 316 if (shft)
326 kbuf[2] = ("dacb"[keysym - XK_Left]); 317 kbuf[2] = ("dacb"[keysym - XK_Left]);
327 else if (ctrl) { 318 else if (ctrl) {
328 kbuf[1] = 'O'; 319 kbuf[1] = 'O';
329 kbuf[2] = ("dacb"[keysym - XK_Left]); 320 kbuf[2] = ("dacb"[keysym - XK_Left]);
330 } else if (R->h->PrivateModes & PrivMode_aplCUR) 321 } else if (R->PrivateModes & PrivMode_aplCUR)
331 kbuf[1] = 'O'; 322 kbuf[1] = 'O';
332#ifdef MULTICHAR_SET 323#ifdef MULTICHAR_SET
333 //TODO: ?? 324 //TODO: ??
334 if (R->Options & Opt_mc_hack) { 325 if (R->Options & Opt_mc_hack) {
335 int col, row, m; 326 int col, row, m;
… …
363 354
364#ifndef UNSHIFTED_SCROLLKEYS 355#ifndef UNSHIFTED_SCROLLKEYS
365# ifdef XK_KP_Prior 356# ifdef XK_KP_Prior
366 case XK_KP_Prior: 357 case XK_KP_Prior:
367 /* allow shift to override */ 358 /* allow shift to override */
368 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 359 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
369 STRCPY(kbuf, "\033Oy"); 360 STRCPY(kbuf, "\033Oy");
370 break; 361 break;
371 } 362 }
372 /* FALLTHROUGH */ 363 /* FALLTHROUGH */
373# endif 364# endif
… …
375 STRCPY(kbuf, "\033[5~"); 366 STRCPY(kbuf, "\033[5~");
376 break; 367 break;
377# ifdef XK_KP_Next 368# ifdef XK_KP_Next
378 case XK_KP_Next: 369 case XK_KP_Next:
379 /* allow shift to override */ 370 /* allow shift to override */
380 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 371 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
381 STRCPY(kbuf, "\033Os"); 372 STRCPY(kbuf, "\033Os");
382 break; 373 break;
383 } 374 }
384 /* FALLTHROUGH */ 375 /* FALLTHROUGH */
385# endif 376# endif
… …
387 STRCPY(kbuf, "\033[6~"); 378 STRCPY(kbuf, "\033[6~");
388 break; 379 break;
389#endif 380#endif
390 case XK_KP_Enter: 381 case XK_KP_Enter:
391 /* allow shift to override */ 382 /* allow shift to override */
392 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 383 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
393 STRCPY(kbuf, "\033OM"); 384 STRCPY(kbuf, "\033OM");
394 } else { 385 } else {
395 kbuf[0] = '\r'; 386 kbuf[0] = '\r';
396 kbuf[1] = '\0'; 387 kbuf[1] = '\0';
397 } 388 }
… …
433 case XK_KP_6: /* "\033Ov" : "6" */ 424 case XK_KP_6: /* "\033Ov" : "6" */
434 case XK_KP_7: /* "\033Ow" : "7" */ 425 case XK_KP_7: /* "\033Ow" : "7" */
435 case XK_KP_8: /* "\033Ox" : "8" */ 426 case XK_KP_8: /* "\033Ox" : "8" */
436 case XK_KP_9: /* "\033Oy" : "9" */ 427 case XK_KP_9: /* "\033Oy" : "9" */
437 /* allow shift to override */ 428 /* allow shift to override */
438 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 429 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
439 STRCPY(kbuf, "\033Oj"); 430 STRCPY(kbuf, "\033Oj");
440 kbuf[2] += (keysym - XK_KP_Multiply); 431 kbuf[2] += (keysym - XK_KP_Multiply);
441 } else { 432 } else {
442 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 433 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
443 kbuf[1] = '\0'; 434 kbuf[1] = '\0';
… …
461 STRCPY(kbuf, "\033[4~"); 452 STRCPY(kbuf, "\033[4~");
462 break; 453 break;
463#ifdef XK_KP_End 454#ifdef XK_KP_End
464 case XK_KP_End: 455 case XK_KP_End:
465 /* allow shift to override */ 456 /* allow shift to override */
466 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 457 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
467 STRCPY(kbuf, "\033Oq"); 458 STRCPY(kbuf, "\033Oq");
468 break; 459 break;
469 } 460 }
470 /* FALLTHROUGH */ 461 /* FALLTHROUGH */
471#endif 462#endif
… …
473 STRCPY(kbuf, KS_END); 464 STRCPY(kbuf, KS_END);
474 break; 465 break;
475#ifdef XK_KP_Home 466#ifdef XK_KP_Home
476 case XK_KP_Home: 467 case XK_KP_Home:
477 /* allow shift to override */ 468 /* allow shift to override */
478 if ((R->h->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 469 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) {
479 STRCPY(kbuf, "\033Ow"); 470 STRCPY(kbuf, "\033Ow");
480 break; 471 break;
481 } 472 }
482 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
483#endif 474#endif
… …
549 } 540 }
550 /* 541 /*
551 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
552 */ 543 */
553#ifdef META8_OPTION 544#ifdef META8_OPTION
554 if (meta && (R->h->meta_char == 0x80) && len > 0) 545 if (meta && (R->meta_char == 0x80) && len > 0)
555 kbuf[len - 1] |= 0x80; 546 kbuf[len - 1] |= 0x80;
556#endif 547#endif
557 } else if (ctrl && keysym == XK_minus) { 548 } else if (ctrl && keysym == XK_minus) {
558 len = 1; 549 len = 1;
559 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 550 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
560 } else { 551 } else {
561#ifdef META8_OPTION 552#ifdef META8_OPTION
562 /* set 8-bit on */ 553 /* set 8-bit on */
563 if (meta && (R->h->meta_char == 0x80)) { 554 if (meta && (R->meta_char == 0x80)) {
564 unsigned char *ch; 555 unsigned char *ch;
565 556
566 for (ch = kbuf; ch < kbuf + len; ch++) 557 for (ch = kbuf; ch < kbuf + len; ch++)
567 *ch |= 0x80; 558 *ch |= 0x80;
568 meta = 0; 559 meta = 0;
569 } 560 }
570#endif 561#endif
571#ifdef GREEK_SUPPORT 562#ifdef GREEK_SUPPORT
572 if (R->h->greek_mode) 563 if (R->greek_mode)
573 len = greek_xlat(kbuf, len); 564 len = greek_xlat(kbuf, len);
574#endif 565#endif
575 /* nil */ ; 566 /* nil */ ;
576 } 567 }
577 } 568 }
578 569
579 if (len <= 0) 570 if (len <= 0)
580 return; /* not mapped */ 571 return; /* not mapped */
581 572
582 if (R->Options & Opt_scrollTtyKeypress) 573 if (R->Options & Opt_scrollTtyKeypress)
583 if (R->TermWin.view_start) { 574 if (R->TermWin.view_start) {
584 R->TermWin.view_start = 0; 575 R->TermWin.view_start = 0;
585 R->h->want_refresh = 1; 576 R->want_refresh = 1;
586 } 577 }
587 578
588/* 579/*
589 * these modifications only affect the static keybuffer 580 * these modifications only affect the static keybuffer
590 * pass Shift/Control indicators for function keys ending with `~' 581 * pass Shift/Control indicators for function keys ending with `~'
… …
600 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 591 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
601 592
602/* escape prefix */ 593/* escape prefix */
603 if (meta 594 if (meta
604#ifdef META8_OPTION 595#ifdef META8_OPTION
605 && (R->h->meta_char == C0_ESC) 596 && (R->meta_char == C0_ESC)
606#endif 597#endif
607 ) { 598 ) {
608 const unsigned char ch = C0_ESC; 599 const unsigned char ch = C0_ESC;
609 600
610 rxvt_tt_write(aR_ &ch, 1); 601 R->tt_write(&ch, 1);
611 } 602 }
612#ifdef DEBUG_CMD 603#ifdef DEBUG_CMD
613 if (debug_key) { /* Display keyboard buffer contents */ 604 if (debug_key) { /* Display keyboard buffer contents */
614 char *p; 605 char *p;
615 int i; 606 int i;
… …
618 for (i = 0, p = kbuf; i < len; i++, p++) 609 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 610 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 611 fprintf(stderr, "'\n");
621 } 612 }
622#endif /* DEBUG_CMD */ 613#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 614 R->tt_write(kbuf, (unsigned int)len);
624} 615}
625/*}}} */ 616/*}}} */
626 617
627#if (MENUBAR_MAX) 618#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 619/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
630/* EXTPROTO */ 621/* EXTPROTO */
631unsigned int 622unsigned int
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 623rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633{ 624{
634 unsigned int n, s; 625 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->h->cmdbuf_base, 626 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->h->cmdbuf_endp, 627 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->h->cmdbuf_ptr; 628 *cmdbuf_ptr = R->cmdbuf_ptr;
638 629
639 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 632 if (n > 0 && s < count) {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 633 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
… …
649 rxvt_print_error("data loss: cmd_write too large"); 640 rxvt_print_error("data loss: cmd_write too large");
650 count = s; 641 count = s;
651 } 642 }
652 for (; count--;) 643 for (; count--;)
653 *cmdbuf_endp++ = *str++; 644 *cmdbuf_endp++ = *str++;
654 R->h->cmdbuf_ptr = cmdbuf_ptr; 645 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->h->cmdbuf_endp = cmdbuf_endp; 646 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 647 return 0;
657} 648}
658#endif /* MENUBAR_MAX */ 649#endif /* MENUBAR_MAX */
650
651void
652rxvt_term::flush ()
653{
654#ifdef TRANSPARENT
655 if (want_full_refresh)
656 {
657 want_full_refresh = 0;
658 rxvt_scr_clear (this);
659 rxvt_scr_touch (this, False);
660 want_refresh = 1;
661 }
662#endif
663
664 if (want_refresh)
665 {
666 rxvt_scr_refresh (this, refresh_type);
667 rxvt_scrollbar_show (this, 1);
668#ifdef USE_XIM
669 rxvt_IMSendSpot (this);
670#endif
671 }
672
673 XFlush (Xdisplay);
674#if 0
675 if (XPending (Xdisplay)) process_x_events ();
676 if (XPending (Xdisplay)) process_x_events ();
677#endif
678}
679
680void
681rxvt_term::check_cb (check_watcher &w)
682{
683 SET_R (this);
684
685 flush ();
686}
687
688void
689rxvt_term::process_x_events ()
690{
691 do
692 {
693 XEvent xev;
694
695 XNextEvent (Xdisplay, &xev);
696
697#if defined(CURSOR_BLINK)
698 if ((Options & Opt_cursorBlink)
699 && xev.type == KeyPress)
700 {
701 if (hidden_cursor)
702 {
703 hidden_cursor = 0;
704 want_refresh = 1;
705 }
706
707 blink_ev.start (NOW + BLINK_INTERVAL);
708 }
709#endif
710
711#if defined(POINTER_BLANK)
712 if ((Options & Opt_pointerBlank)
713 && (pointerBlankDelay > 0))
714 {
715 if (xev.type == MotionNotify
716 || xev.type == ButtonPress
717 || xev.type == ButtonRelease)
718 if (hidden_pointer)
719 pointer_unblank ();
720
721 if (xev.type == KeyPress && hidden_pointer == 0)
722 pointer_blank ();
723 }
724#endif
725
726#ifdef USE_XIM
727 if (!XFilterEvent (&xev, xev.xany.window))
728#endif
729 rxvt_process_x_event (this, &xev);
730 }
731 while (XPending (Xdisplay));
732}
733
734void
735rxvt_term::blink_cb (time_watcher &w)
736{
737 SET_R (this);
738
739 w.at += BLINK_INTERVAL;
740 hidden_cursor = !hidden_cursor;
741 want_refresh = 1;
742}
743
744void
745rxvt_term::x_cb (io_watcher &w, short revents)
746{
747 SET_R (this);
748
749 process_x_events ();
750}
751
752bool
753rxvt_term::pty_fill ()
754{
755 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
756
757 memmove (cmdbuf_base, cmdbuf_ptr, n);
758 cmdbuf_ptr = cmdbuf_base;
759 cmdbuf_endp = cmdbuf_ptr + n;
760
761 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
762
763 if (n > 0)
764 {
765 cmdbuf_endp += n;
766 return true;
767 }
768 else if (n < 0 && errno != EAGAIN)
769 destroy ();
770
771 return false;
772}
773
774void
775rxvt_term::pty_cb (io_watcher &w, short revents)
776{
777 SET_R (this);
778
779 if (revents & EVENT_WRITE)
780 tt_write (0, 0);
781 else if (revents & EVENT_READ)
782 {
783 bool flag = true;
784
785 // loop, but don't allow a single term to monopolize us
786 // the number of loops is fully arbitrary, and thus wrong
787 while (flag && pty_fill ())
788 {
789 if (!seen_input)
790 {
791 seen_input = 1;
792 /* once we know the shell is running, send the screen size. Again! */
793 tt_winch ();
794 }
795
796 uint32_t ch = NOCHAR;
797
798 for (;;)
799 {
800 if (ch == NOCHAR)
801 ch = next_char ();
802
803 if (ch == NOCHAR) // TODO: improve
804 break;
805
806 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
807 {
808 /* Read a text string from the input buffer */
809 uint32_t buf[BUFSIZ];
810 bool refreshnow = false;
811 int nlines = 0;
812 uint32_t *str = buf;
813
814 *str++ = ch;
815
816 for (;;)
817 {
818 ch = next_char ();
819
820 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
821 break;
822 else
823 {
824 *str++ = ch;
825
826 if (ch == '\n')
827 {
828 nlines++;
829 refresh_count++;
830
831 if (!(Options & Opt_jumpScroll)
832 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
833 {
834 refreshnow = true;
835 flag = false;
836 ch = NOCHAR;
837 break;
838 }
839 }
840
841 if (str >= buf + BUFSIZ)
842 {
843 ch = NOCHAR;
844 break;
845 }
846 }
847 }
848
849 rxvt_scr_add_lines (this, buf, nlines, str - buf);
850
851 /*
852 * If there have been a lot of new lines, then update the screen
853 * What the heck I'll cheat and only refresh less than every page-full.
854 * the number of pages between refreshes is refresh_limit, which
855 * is incremented here because we must be doing flat-out scrolling.
856 *
857 * refreshing should be correct for small scrolls, because of the
858 * time-out
859 */
860 if (refreshnow)
861 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++;
864
865 rxvt_scr_refresh (this, refresh_type);
866 }
867
868 }
869 else
870 {
871 switch (ch)
872 {
873 default:
874 rxvt_process_nonprinting (this, ch);
875 break;
876 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this);
878 break;
879 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */
881 }
882
883 ch = NOCHAR;
884 }
885 }
886 }
887 }
888}
659 889
660// read the next character, currently handles UTF-8 890// read the next character, currently handles UTF-8
661// will probably handle all sorts of other stuff in the future 891// will probably handle all sorts of other stuff in the future
662static uint32_t 892uint32_t
663next_char (pR) 893rxvt_term::next_char ()
664{ 894{
665 rxvt_hidden *h = R->h;
666 mbstate &s = h->mbstate; 895 struct mbstate &s = mbstate;
667 896
668 while (h->cmdbuf_ptr < h->cmdbuf_endp) 897 while (cmdbuf_ptr < cmdbuf_endp)
669 { 898 {
670 uint8_t ch = *h->cmdbuf_ptr; 899 uint8_t ch = *cmdbuf_ptr;
671 900
672 if (s.cnt) 901 if (s.cnt)
673 { 902 {
674 if ((ch & 0xc0) == 0x80) 903 if ((ch & 0xc0) == 0x80)
675 { 904 {
676 h->cmdbuf_ptr++; 905 cmdbuf_ptr++;
677 906
678 /* continuation */ 907 /* continuation */
679 s.reg = (s.reg << 6) | (ch & 0x7f); 908 s.reg = (s.reg << 6) | (ch & 0x7f);
680 909
681 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or hacking */ 910 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
682 return s.reg; 911 return s.reg;
683 912
684 continue; 913 continue;
685 } 914 }
686 else 915 else
… …
690 } 919 }
691 } 920 }
692 921
693 if ((ch & 0xc0) == 0xc0) 922 if ((ch & 0xc0) == 0xc0)
694 { 923 {
695 h->cmdbuf_ptr++; 924 cmdbuf_ptr++;
696 925
697 /* first byte */ 926 /* first byte */
698 s.orig = ch; /* for broken encodings */ 927 s.orig = ch; /* for broken encodings */
699 s.reg = ch; 928 s.reg = ch;
700 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
… …
703 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
704 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
705 } 934 }
706 else 935 else
707 { 936 {
708 h->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ 937 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
709 return ch; 938 return ch;
710 } 939 }
711 } 940 }
712 941
713 return NOCHAR; 942 return NOCHAR;
… …
720 */ 949 */
721/* INTPROTO */ 950/* INTPROTO */
722uint32_t 951uint32_t
723rxvt_cmd_getc(pR) 952rxvt_cmd_getc(pR)
724{ 953{
954 for (;;)
955 {
956 uint32_t c = R->next_char ();
957 if (c != NOCHAR)
958 return c;
959
960 // incomplete sequences should occur rarely, still, a better solution
961 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (R->cmd_fd, F_SETFL, 0);
963 R->pty_fill ();
964 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
965 }
966
967#if 0
725#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
726 fd_set readfds; 969 fd_set readfds;
727 int quick_timeout, select_res; 970 int quick_timeout, select_res;
728 int want_motion_time, want_keypress_time; 971 int want_motion_time, want_keypress_time;
729 struct timeval value; 972 struct timeval value;
730#if defined(POINTER_BLANK) || defined(CURSOR_BLINK) 973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
731 struct timeval tp; 974 struct timeval tp;
732#endif 975#endif
733 struct rxvt_hidden *h = R->h;
734
735 uint32_t c = next_char (aR);
736 if (c != NOCHAR)
737 return c;
738 976
739 for (;;) { 977 for (;;) {
740 /* loop until we can return something */ 978 /* loop until we can return something */
741 979
742 if (h->v_bufstr < h->v_bufptr) /* output any pending chars */ 980 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
743 rxvt_tt_write(aR_ NULL, 0); 981 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 982
816#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
817 if (h->mouse_slip_wheel_speed) { 984 if (R->mouse_slip_wheel_speed) {
818 quick_timeout = 1; 985 quick_timeout = 1;
819 if (!h->mouse_slip_wheel_delay-- 986 if (!R->mouse_slip_wheel_delay--
820 && rxvt_scr_page(aR_ h->mouse_slip_wheel_speed > 0 ? UP : DN, 987 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
821 abs(h->mouse_slip_wheel_speed))) { 988 abs(R->mouse_slip_wheel_speed))) {
822 h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 989 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
823 h->refresh_type |= SMOOTH_REFRESH; 990 R->refresh_type |= SMOOTH_REFRESH;
824 h->want_refresh = 1; 991 R->want_refresh = 1;
825 } 992 }
826 } 993 }
827#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
828#ifdef SELECTION_SCROLLING 995#ifdef SELECTION_SCROLLING
829 if (h->pending_scroll_selection) { 996 if (R->pending_scroll_selection) {
830 quick_timeout = 1; 997 quick_timeout = 1;
831 if (!h->scroll_selection_delay-- 998 if (!R->scroll_selection_delay--
832 && rxvt_scr_page(aR_ h->scroll_selection_dir, 999 && rxvt_scr_page(aR_ R->scroll_selection_dir,
833 h->scroll_selection_lines)) { 1000 R->scroll_selection_lines)) {
834 rxvt_selection_extend(aR_ h->selection_save_x, 1001 rxvt_selection_extend(aR_ R->selection_save_x,
835 h->selection_save_y, h->selection_save_state); 1002 R->selection_save_y, R->selection_save_state);
836 h->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1003 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
837 h->refresh_type |= SMOOTH_REFRESH; 1004 R->refresh_type |= SMOOTH_REFRESH;
838 h->want_refresh = 1; 1005 R->want_refresh = 1;
839 } 1006 }
840 } 1007 }
841#endif 1008#endif
842#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
843 if (scrollbar_isUp() || scrollbar_isDn()) { 1010 if (scrollbar_isUp() || scrollbar_isDn()) {
844 quick_timeout = 1; 1011 quick_timeout = 1;
845 if (!h->scroll_arrow_delay-- 1012 if (!R->scroll_arrow_delay--
846 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1013 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
847 h->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1014 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
848 h->refresh_type |= SMOOTH_REFRESH; 1015 R->refresh_type |= SMOOTH_REFRESH;
849 h->want_refresh = 1; 1016 R->want_refresh = 1;
850 } 1017 }
851 } 1018 }
852#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
853 1020
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 1021#ifdef TRANSPARENT
865 quick_timeout |= h->want_full_refresh; 1022 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 1023#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 1024#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} 1025}
975/*}}} */
976 1026
977/* EXTPROTO */
978void 1027void
979rxvt_pointer_unblank(pR) 1028rxvt_term::pointer_unblank ()
980{ 1029{
981 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor); 1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
982 rxvt_recolour_cursor(aR); 1031 rxvt_recolour_cursor (this);
1032
983#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
984 R->h->hidden_pointer = 0; 1034 hidden_pointer = 0;
985 if (R->h->pointerBlankDelay > 0) {
986 struct timeval tp;
987 1035
988 (void)gettimeofday(&tp, NULL); 1036 if (Options & Opt_pointerBlank)
989 R->h->lastmotion.tv_sec = tp.tv_sec; 1037 pointer_ev.start (NOW + pointerBlankDelay);
990 R->h->lastmotion.tv_usec = tp.tv_usec;
991 }
992#endif 1038#endif
993} 1039}
994 1040
995#ifdef POINTER_BLANK 1041#ifdef POINTER_BLANK
996/* INTPROTO */
997void 1042void
998rxvt_pointer_blank(pR) 1043rxvt_term::pointer_blank ()
999{ 1044{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank))
1048 return;
1049
1000 XDefineCursor(R->Xdisplay, R->TermWin.vt, R->h->pointer_blank); 1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1001 XFlush(R->Xdisplay); 1051 XFlush (Xdisplay);
1052
1002 R->h->hidden_pointer = 1; 1053 hidden_pointer = 1;
1054}
1055
1056void
1057rxvt_term::pointer_cb (time_watcher &w)
1058{
1059 SET_R (this);
1060
1061 pointer_blank ();
1003} 1062}
1004#endif 1063#endif
1005 1064
1006/* INTPROTO */ 1065/* INTPROTO */
1007void 1066void
… …
1012 1071
1013 x = ev->x; 1072 x = ev->x;
1014 y = ev->y; 1073 y = ev->y;
1015 rxvt_pixel_position(aR_ &x, &y); 1074 rxvt_pixel_position(aR_ &x, &y);
1016 1075
1017 if (R->h->MEvent.button == AnyButton) { 1076 if (R->MEvent.button == AnyButton) {
1018 button_number = 3; 1077 button_number = 3;
1019 } else { 1078 } else {
1020 button_number = R->h->MEvent.button - Button1; 1079 button_number = R->MEvent.button - Button1;
1021 /* add 0x3D for wheel events, like xterm does */ 1080 /* add 0x3D for wheel events, like xterm does */
1022 if (button_number >= 3) 1081 if (button_number >= 3)
1023 button_number += (64 - 3); 1082 button_number += (64 - 3);
1024 } 1083 }
1025 1084
1026 if (R->h->PrivateModes & PrivMode_MouseX10) { 1085 if (R->PrivateModes & PrivMode_MouseX10) {
1027 /* 1086 /*
1028 * do not report ButtonRelease 1087 * do not report ButtonRelease
1029 * no state info allowed 1088 * no state info allowed
1030 */ 1089 */
1031 key_state = 0; 1090 key_state = 0;
… …
1037 * 8 = Meta 1096 * 8 = Meta
1038 * 16 = Control 1097 * 16 = Control
1039 * plus will add in our own Double-Click reporting 1098 * plus will add in our own Double-Click reporting
1040 * 32 = Double Click 1099 * 32 = Double Click
1041 */ 1100 */
1042 key_state = ((R->h->MEvent.state & ShiftMask) ? 4 : 0) 1101 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0)
1043 + ((R->h->MEvent.state & R->h->ModMetaMask) ? 8 : 0) 1102 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0)
1044 + ((R->h->MEvent.state & ControlMask) ? 16 : 0); 1103 + ((R->MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1104#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((R->h->MEvent.clicks > 1) ? 32 : 0); 1105 key_state += ((R->MEvent.clicks > 1) ? 32 : 0);
1047#endif 1106#endif
1048 } 1107 }
1049 1108
1050#ifdef DEBUG_MOUSEREPORT 1109#ifdef DEBUG_MOUSEREPORT
1051 fprintf(stderr, "Mouse ["); 1110 fprintf(stderr, "Mouse [");
… …
1060 fprintf(stderr, "]: <%d>, %d/%d\n", 1119 fprintf(stderr, "]: <%d>, %d/%d\n",
1061 button_number, 1120 button_number,
1062 x + 1, 1121 x + 1,
1063 y + 1); 1122 y + 1);
1064#else 1123#else
1065 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1124 R->tt_printf("\033[M%c%c%c",
1066 (32 + button_number + key_state), 1125 (32 + button_number + key_state),
1067 (32 + x + 1), 1126 (32 + x + 1),
1068 (32 + y + 1)); 1127 (32 + y + 1));
1069#endif 1128#endif
1070} 1129}
… …
1087{ 1146{
1088 int i, want_timeout; 1147 int i, want_timeout;
1089 Window unused_root, unused_child; 1148 Window unused_root, unused_child;
1090 int unused_root_x, unused_root_y; 1149 int unused_root_x, unused_root_y;
1091 unsigned int unused_mask; 1150 unsigned int unused_mask;
1092 struct timeval tp; 1151
1093 struct rxvt_hidden *h = R->h;
1094#ifdef DEBUG_X 1152#ifdef DEBUG_X
1095 const char *const eventnames[] = 1153 const char *const eventnames[] =
1096 { /* mason - this matches my system */ 1154 { /* mason - this matches my system */
1097 "", 1155 "",
1098 "", 1156 "",
… …
1128 "SelectionNotify", 1186 "SelectionNotify",
1129 "ColormapNotify", 1187 "ColormapNotify",
1130 "ClientMessage", 1188 "ClientMessage",
1131 "MappingNotify" 1189 "MappingNotify"
1132 }; 1190 };
1191#endif
1192
1193#ifdef DEBUG_X
1194 struct timeval tp;
1133 struct tm *ltt; 1195 struct tm *ltt;
1134#endif
1135
1136 /*
1137 * check if we need to get the time for any timeouts
1138 */
1139
1140 for (i = NUM_TIMEOUTS; i--; )
1141 if (h->timeout[i].tv_sec) {
1142 want_timeout = 1;
1143 break;
1144 }
1145
1146#ifndef DEBUG_X
1147 if (want_timeout)
1148#endif
1149 (void)gettimeofday(&tp, NULL); 1196 (void)gettimeofday(&tp, NULL);
1150
1151#ifdef DEBUG_X
1152 ltt = localtime(&(tp.tv_sec)); 1197 ltt = localtime(&(tp.tv_sec));
1153 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1198 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1154#endif 1199#endif
1155
1156 /* X event timeouts */
1157 if (want_timeout)
1158 for (i = NUM_TIMEOUTS; i--; ) {
1159 if (h->timeout[i].tv_sec == 0)
1160 continue;
1161 if ((tp.tv_sec < h->timeout[i].tv_sec)
1162 || (tp.tv_sec == h->timeout[i].tv_sec
1163 && tp.tv_usec < h->timeout[i].tv_usec))
1164 continue;
1165 h->timeout[i].tv_sec = 0;
1166 switch(i) {
1167 case TIMEOUT_INCR:
1168 rxvt_print_error("data loss: timeout on INCR selection paste");
1169 h->selection_wait = Sel_none;
1170 break;
1171 default:
1172 break;
1173 }
1174 }
1175 1200
1176 switch (ev->type) { 1201 switch (ev->type) {
1177 case KeyPress: 1202 case KeyPress:
1178 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1203 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1179 break; 1204 break;
1180 1205
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1206#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1207 case KeyRelease:
1183 { 1208 {
1184 if (!(ev->xkey.state & ControlMask)) 1209 if (!(ev->xkey.state & ControlMask))
1185 h->mouse_slip_wheel_speed = 0; 1210 R->mouse_slip_wheel_speed = 0;
1186 else { 1211 else {
1187 KeySym ks; 1212 KeySym ks;
1188 1213
1189 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1214 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0);
1190 if (ks == XK_Control_L || ks == XK_Control_R) 1215 if (ks == XK_Control_L || ks == XK_Control_R)
1191 h->mouse_slip_wheel_speed = 0; 1216 R->mouse_slip_wheel_speed = 0;
1192 } 1217 }
1193 break; 1218 break;
1194 } 1219 }
1195#endif 1220#endif
1196 1221
… …
1202 rxvt_button_release(aR_ (XButtonEvent *)ev); 1227 rxvt_button_release(aR_ (XButtonEvent *)ev);
1203 break; 1228 break;
1204 1229
1205 case ClientMessage: 1230 case ClientMessage:
1206 if (ev->xclient.format == 32 1231 if (ev->xclient.format == 32
1207 && (Atom)ev->xclient.data.l[0] == h->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1208 exit(EXIT_SUCCESS); 1233 R->destroy ();
1209#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1210 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1211 if (ev->xclient.message_type == h->xa[XA_DNDPROTOCOL] 1236 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1212 && (ev->xclient.data.l[0] == DndFile 1237 && (ev->xclient.data.l[0] == DndFile
1213 || ev->xclient.data.l[0] == DndDir 1238 || ev->xclient.data.l[0] == DndDir
1214 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev->xclient.data.l[0] == DndLink)) {
1215 /* Get Dnd data */ 1240 /* Get Dnd data */
1216 Atom ActualType; 1241 Atom ActualType;
1217 int ActualFormat; 1242 int ActualFormat;
1218 unsigned char *data; 1243 unsigned char *data;
1219 unsigned long Size, RemainingBytes; 1244 unsigned long Size, RemainingBytes;
1220 1245
1221 XGetWindowProperty(R->Xdisplay, Xroot, 1246 XGetWindowProperty(R->Xdisplay, Xroot,
1222 R->h->xa[XA_DNDSELECTION], 1247 R->xa[XA_DNDSELECTION],
1223 0L, 1000000L, 1248 0L, 1000000L,
1224 False, AnyPropertyType, 1249 False, AnyPropertyType,
1225 &ActualType, &ActualFormat, 1250 &ActualType, &ActualFormat,
1226 &Size, &RemainingBytes, 1251 &Size, &RemainingBytes,
1227 &data); 1252 &data);
… …
1248 * in the GraphicsExpose parts, which means that after each refresh, 1273 * in the GraphicsExpose parts, which means that after each refresh,
1249 * we need to wait for the graphics expose or Noexpose events, 1274 * we need to wait for the graphics expose or Noexpose events,
1250 * which ought to make things real slow! 1275 * which ought to make things real slow!
1251 */ 1276 */
1252 case VisibilityNotify: 1277 case VisibilityNotify:
1253 switch (ev->xvisibility.state) { 1278 switch (ev->xvisibility.state)
1279 {
1254 case VisibilityUnobscured: 1280 case VisibilityUnobscured:
1255 h->refresh_type = FAST_REFRESH; 1281 R->refresh_type = FAST_REFRESH;
1256 break; 1282 break;
1257 case VisibilityPartiallyObscured: 1283 case VisibilityPartiallyObscured:
1258 h->refresh_type = SLOW_REFRESH; 1284 R->refresh_type = SLOW_REFRESH;
1259 break; 1285 break;
1260 default: 1286 default:
1261 h->refresh_type = NO_REFRESH; 1287 R->refresh_type = NO_REFRESH;
1262 break; 1288 break;
1263 } 1289 }
1264 break; 1290 break;
1265 1291
1266 case FocusIn: 1292 case FocusIn:
1267 if (!R->TermWin.focus) { 1293 if (!R->TermWin.focus) {
1268 R->TermWin.focus = 1; 1294 R->TermWin.focus = 1;
1269 h->want_refresh = 1; 1295 R->want_refresh = 1;
1270#ifdef USE_XIM 1296#ifdef USE_XIM
1271 if (h->Input_Context != NULL) 1297 if (R->Input_Context != NULL)
1272 XSetICFocus(h->Input_Context); 1298 XSetICFocus(R->Input_Context);
1299#endif
1300#ifdef CURSOR_BLINK
1301 if (R->Options & Opt_cursorBlink)
1302 R->blink_ev.start (NOW + BLINK_INTERVAL);
1273#endif 1303#endif
1274 } 1304 }
1275 break; 1305 break;
1276 1306
1277 case FocusOut: 1307 case FocusOut:
1278 if (R->TermWin.focus) { 1308 if (R->TermWin.focus) {
1279 R->TermWin.focus = 0; 1309 R->TermWin.focus = 0;
1280 h->want_refresh = 1; 1310 R->want_refresh = 1;
1281#ifdef USE_XIM 1311#ifdef USE_XIM
1282 if (h->Input_Context != NULL) 1312 if (R->Input_Context != NULL)
1283 XUnsetICFocus(h->Input_Context); 1313 XUnsetICFocus(R->Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (R->Options & Opt_cursorBlink)
1317 R->blink_ev.stop ();
1318 R->hidden_cursor = 0;
1284#endif 1319#endif
1285 } 1320 }
1286 break; 1321 break;
1287 1322
1288 case ConfigureNotify: 1323 case ConfigureNotify:
… …
1306 } 1341 }
1307#endif 1342#endif
1308#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1343#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1309 if (R->Options & Opt_transparent) { 1344 if (R->Options & Opt_transparent) {
1310 rxvt_check_our_parents(aR); 1345 rxvt_check_our_parents(aR);
1311 if (h->am_transparent) 1346 if (R->am_transparent)
1312 h->want_full_refresh = 1; 1347 R->want_full_refresh = 1;
1313 } 1348 }
1314#endif 1349#endif
1315 } 1350 }
1316 break; 1351 break;
1317 1352
1318 case SelectionClear: 1353 case SelectionClear:
1319 rxvt_selection_clear(aR); 1354 rxvt_selection_clear(aR);
1320 break; 1355 break;
1321 1356
1322 case SelectionNotify: 1357 case SelectionNotify:
1323 if (h->selection_wait == Sel_normal) 1358 if (R->selection_wait == Sel_normal)
1324 rxvt_selection_paste(aR_ ev->xselection.requestor, 1359 rxvt_selection_paste(aR_ ev->xselection.requestor,
1325 ev->xselection.property, True); 1360 ev->xselection.property, True);
1326 break; 1361 break;
1327 1362
1328 case SelectionRequest: 1363 case SelectionRequest:
… …
1336 case MapNotify: 1371 case MapNotify:
1337 R->TermWin.mapped = 1; 1372 R->TermWin.mapped = 1;
1338 break; 1373 break;
1339 1374
1340 case PropertyNotify: 1375 case PropertyNotify:
1341 if (ev->xproperty.atom == h->xa[XA_VT_SELECTION]) { 1376 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1342 if (ev->xproperty.state == PropertyNewValue) 1377 if (ev->xproperty.state == PropertyNewValue)
1343 rxvt_selection_property(aR_ ev->xproperty.window, 1378 rxvt_selection_property(aR_ ev->xproperty.window,
1344 ev->xproperty.atom); 1379 ev->xproperty.atom);
1345 break; 1380 break;
1346 } 1381 }
1347#ifdef TRANSPARENT 1382#ifdef TRANSPARENT
1348 /* 1383 /*
1349 * if user used some Esetroot compatible prog to set the root bg, 1384 * 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. 1385 * use the property to determine the pixmap. We use it later on.
1351 */ 1386 */
1352 if (h->xa[XA_XROOTPMAPID] == 0) 1387 if (R->xa[XA_XROOTPMAPID] == 0)
1353 h->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1388 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1354 "_XROOTPMAP_ID", False); 1389 "_XROOTPMAP_ID", False);
1355 if (ev->xproperty.atom != h->xa[XA_XROOTPMAPID]) 1390 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1356 break; 1391 break;
1357 /* FALLTHROUGH */ 1392 /* FALLTHROUGH */
1358 case ReparentNotify: 1393 case ReparentNotify:
1359 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1394 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) {
1360 if (h->am_transparent) 1395 if (R->am_transparent)
1361 h->want_full_refresh = 1; 1396 R->want_full_refresh = 1;
1362 } 1397 }
1363#endif /* TRANSPARENT */ 1398#endif /* TRANSPARENT */
1364 break; 1399 break;
1365 1400
1366 case GraphicsExpose: 1401 case GraphicsExpose:
… …
1374 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1409 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,
1375 ev->xexpose.width, ev->xexpose.height, False); 1410 ev->xexpose.width, ev->xexpose.height, False);
1376 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1411 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1377 // ev->xexpose.width, R->TermWin.height, False); 1412 // ev->xexpose.width, R->TermWin.height, False);
1378#endif 1413#endif
1379 h->want_refresh = 1; 1414 R->want_refresh = 1;
1380 } else { 1415 } else {
1381 XEvent unused_xevent; 1416 XEvent unused_xevent;
1382 1417
1383 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1418 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1384 Expose, 1419 Expose,
… …
1400 } 1435 }
1401 break; 1436 break;
1402 1437
1403 case MotionNotify: 1438 case MotionNotify:
1404#ifdef POINTER_BLANK 1439#ifdef POINTER_BLANK
1405 if (R->h->hidden_pointer) 1440 if (R->hidden_pointer)
1406 rxvt_pointer_unblank(aR); 1441 R->pointer_unblank ();
1407#endif 1442#endif
1408#if MENUBAR 1443#if MENUBAR
1409 if (isMenuBarWindow(ev->xany.window)) { 1444 if (isMenuBarWindow(ev->xany.window)) {
1410 rxvt_menubar_control(aR_ &(ev->xbutton)); 1445 rxvt_menubar_control(aR_ &(ev->xbutton));
1411 break; 1446 break;
1412 } 1447 }
1413#endif 1448#endif
1414 if ((h->PrivateModes & PrivMode_mouse_report) && !(h->bypass_keystate)) 1449 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate))
1415 break; 1450 break;
1416 1451
1417 if (ev->xany.window == R->TermWin.vt) { 1452 if (ev->xany.window == R->TermWin.vt) {
1418 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1453 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1419 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1454 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt,
… …
1423 &unused_root_x, &unused_root_y, 1458 &unused_root_x, &unused_root_y,
1424 &(ev->xbutton.x), &(ev->xbutton.y), 1459 &(ev->xbutton.x), &(ev->xbutton.y),
1425 &unused_mask); 1460 &unused_mask);
1426#ifdef MOUSE_THRESHOLD 1461#ifdef MOUSE_THRESHOLD
1427 /* deal with a `jumpy' mouse */ 1462 /* deal with a `jumpy' mouse */
1428 if ((ev->xmotion.time - h->MEvent.time) > MOUSE_THRESHOLD) { 1463 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1429#endif 1464#endif
1430 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1465 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),
1431 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1466 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1432#ifdef SELECTION_SCROLLING 1467#ifdef SELECTION_SCROLLING
1433 if (ev->xbutton.y<R->TermWin.int_bwidth || 1468 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1434 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1469 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1435 int dist; 1470 int dist;
1436 1471
1437 h->pending_scroll_selection=1; 1472 R->pending_scroll_selection=1;
1438 1473
1439 /* don't clobber the current delay if we are 1474 /* don't clobber the current delay if we are
1440 * already in the middle of scrolling. 1475 * already in the middle of scrolling.
1441 */ 1476 */
1442 if (h->scroll_selection_delay<=0) 1477 if (R->scroll_selection_delay<=0)
1443 h->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1478 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1444 1479
1445 /* save the event params so we can highlight 1480 /* save the event params so we can highlight
1446 * the selection in the pending-scroll loop 1481 * the selection in the pending-scroll loop
1447 */ 1482 */
1448 h->selection_save_x=ev->xbutton.x; 1483 R->selection_save_x=ev->xbutton.x;
1449 h->selection_save_y=ev->xbutton.y; 1484 R->selection_save_y=ev->xbutton.y;
1450 h->selection_save_state= 1485 R->selection_save_state=
1451 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1486 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1452 1487
1453 /* calc number of lines to scroll */ 1488 /* calc number of lines to scroll */
1454 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1489 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1455 h->scroll_selection_dir = UP; 1490 R->scroll_selection_dir = UP;
1456 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1491 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1457 } 1492 }
1458 else { 1493 else {
1459 h->scroll_selection_dir = DN; 1494 R->scroll_selection_dir = DN;
1460 dist = ev->xbutton.y - 1495 dist = ev->xbutton.y -
1461 (R->TermWin.int_bwidth + R->TermWin.height); 1496 (R->TermWin.int_bwidth + R->TermWin.height);
1462 } 1497 }
1463 h->scroll_selection_lines=(Pixel2Height(dist)/ 1498 R->scroll_selection_lines=(Pixel2Height(dist)/
1464 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1499 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1465 MIN_IT(h->scroll_selection_lines, 1500 MIN_IT(R->scroll_selection_lines,
1466 SELECTION_SCROLL_MAX_LINES); 1501 SELECTION_SCROLL_MAX_LINES);
1467 } 1502 }
1468 else { 1503 else {
1469 /* we are within the text window, so we 1504 /* we are within the text window, so we
1470 * shouldn't be scrolling 1505 * shouldn't be scrolling
1471 */ 1506 */
1472 h->pending_scroll_selection = 0; 1507 R->pending_scroll_selection = 0;
1473 } 1508 }
1474#endif 1509#endif
1475#ifdef MOUSE_THRESHOLD 1510#ifdef MOUSE_THRESHOLD
1476 } 1511 }
1477#endif 1512#endif
… …
1482 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1517 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1483 &unused_root, &unused_child, 1518 &unused_root, &unused_child,
1484 &unused_root_x, &unused_root_y, 1519 &unused_root_x, &unused_root_y,
1485 &(ev->xbutton.x), &(ev->xbutton.y), 1520 &(ev->xbutton.x), &(ev->xbutton.y),
1486 &unused_mask); 1521 &unused_mask);
1487 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - h->csrO, 1522 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1488 scrollbar_size()); 1523 scrollbar_size());
1489 rxvt_scr_refresh(aR_ h->refresh_type); 1524 rxvt_scr_refresh(aR_ R->refresh_type);
1490 h->refresh_limit = 0; 1525 R->refresh_limit = 0;
1491 rxvt_scrollbar_show(aR_ 1); 1526 rxvt_scrollbar_show(aR_ 1);
1492 } 1527 }
1493 break; 1528 break;
1494 } 1529 }
1495} 1530}
… …
1497/* INTPROTO */ 1532/* INTPROTO */
1498void 1533void
1499rxvt_button_press(pR_ XButtonEvent *ev) 1534rxvt_button_press(pR_ XButtonEvent *ev)
1500{ 1535{
1501 int reportmode = 0, clickintime; 1536 int reportmode = 0, clickintime;
1502 struct rxvt_hidden *h = R->h;
1503 1537
1504 h->bypass_keystate = ev->state & (h->ModMetaMask | ShiftMask); 1538 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1505 if (!h->bypass_keystate) 1539 if (!R->bypass_keystate)
1506 reportmode = !!(h->PrivateModes & PrivMode_mouse_report); 1540 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1507/* 1541/*
1508 * VT window processing of button press 1542 * VT window processing of button press
1509 */ 1543 */
1510 if (ev->window == R->TermWin.vt) 1544 if (ev->window == R->TermWin.vt)
1511 { 1545 {
… …
1513 if (ev->subwindow != None) 1547 if (ev->subwindow != None)
1514 rxvt_Gr_ButtonPress(ev->x, ev->y); 1548 rxvt_Gr_ButtonPress(ev->x, ev->y);
1515 else 1549 else
1516#endif 1550#endif
1517 { 1551 {
1518 clickintime = ev->time - h->MEvent.time < MULTICLICK_TIME; 1552 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1519 if (reportmode) 1553 if (reportmode)
1520 { 1554 {
1521 /* mouse report from vt window */ 1555 /* mouse report from vt window */
1522 /* save the xbutton state (for ButtonRelease) */ 1556 /* save the xbutton state (for ButtonRelease) */
1523 h->MEvent.state = ev->state; 1557 R->MEvent.state = ev->state;
1524#ifdef MOUSE_REPORT_DOUBLECLICK 1558#ifdef MOUSE_REPORT_DOUBLECLICK
1525 if (ev->button == h->MEvent.button && clickintime) 1559 if (ev->button == R->MEvent.button && clickintime)
1526 { 1560 {
1527 /* same button, within alloted time */ 1561 /* same button, within alloted time */
1528 h->MEvent.clicks++; 1562 R->MEvent.clicks++;
1529 if (h->MEvent.clicks > 1) 1563 if (R->MEvent.clicks > 1)
1530 { 1564 {
1531 /* only report double clicks */ 1565 /* only report double clicks */
1532 h->MEvent.clicks = 2; 1566 R->MEvent.clicks = 2;
1533 rxvt_mouse_report(aR_ ev); 1567 rxvt_mouse_report(aR_ ev);
1534 1568
1535 /* don't report the release */ 1569 /* don't report the release */
1536 h->MEvent.clicks = 0; 1570 R->MEvent.clicks = 0;
1537 h->MEvent.button = AnyButton; 1571 R->MEvent.button = AnyButton;
1538 } 1572 }
1539 } 1573 }
1540 else 1574 else
1541 { 1575 {
1542 /* different button, or time expired */ 1576 /* different button, or time expired */
1543 h->MEvent.clicks = 1; 1577 R->MEvent.clicks = 1;
1544 h->MEvent.button = ev->button; 1578 R->MEvent.button = ev->button;
1545 rxvt_mouse_report(aR_ ev); 1579 rxvt_mouse_report(aR_ ev);
1546 } 1580 }
1547#else 1581#else
1548 h->MEvent.button = ev->button; 1582 R->MEvent.button = ev->button;
1549 rxvt_mouse_report(aR_ ev); 1583 rxvt_mouse_report(aR_ ev);
1550#endif /* MOUSE_REPORT_DOUBLECLICK */ 1584#endif /* MOUSE_REPORT_DOUBLECLICK */
1551 } 1585 }
1552 else 1586 else
1553 { 1587 {
1554 if (ev->button != h->MEvent.button) 1588 if (ev->button != R->MEvent.button)
1555 h->MEvent.clicks = 0; 1589 R->MEvent.clicks = 0;
1556 switch (ev->button) 1590 switch (ev->button)
1557 { 1591 {
1558 case Button1: 1592 case Button1:
1559 if (h->MEvent.button == Button1 && clickintime) 1593 if (R->MEvent.button == Button1 && clickintime)
1560 h->MEvent.clicks++; 1594 R->MEvent.clicks++;
1561 else 1595 else
1562 h->MEvent.clicks = 1; 1596 R->MEvent.clicks = 1;
1563 rxvt_selection_click(aR_ h->MEvent.clicks, ev->x, ev->y); 1597 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1564 h->MEvent.button = Button1; 1598 R->MEvent.button = Button1;
1565 break; 1599 break;
1566 1600
1567 case Button3: 1601 case Button3:
1568 if (h->MEvent.button == Button3 && clickintime) 1602 if (R->MEvent.button == Button3 && clickintime)
1569 rxvt_selection_rotate(aR_ ev->x, ev->y); 1603 rxvt_selection_rotate(aR_ ev->x, ev->y);
1570 else 1604 else
1571 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1605 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1572 h->MEvent.button = Button3; 1606 R->MEvent.button = Button3;
1573 break; 1607 break;
1574 } 1608 }
1575 } 1609 }
1576 h->MEvent.time = ev->time; 1610 R->MEvent.time = ev->time;
1577 return; 1611 return;
1578 } 1612 }
1579 } 1613 }
1580 1614
1581/* 1615/*
… …
1603 */ 1637 */
1604 if ((R->scrollBar.style == R_SB_NEXT 1638 if ((R->scrollBar.style == R_SB_NEXT
1605 && scrollbarnext_upButton(ev->y)) 1639 && scrollbarnext_upButton(ev->y))
1606 || (R->scrollBar.style == R_SB_RXVT 1640 || (R->scrollBar.style == R_SB_RXVT
1607 && scrollbarrxvt_upButton(ev->y))) 1641 && scrollbarrxvt_upButton(ev->y)))
1608 rxvt_tt_printf(aR_ "\033[A"); 1642 R->tt_printf("\033[A");
1609 else if ((R->scrollBar.style == R_SB_NEXT 1643 else if ((R->scrollBar.style == R_SB_NEXT
1610 && scrollbarnext_dnButton(ev->y)) 1644 && scrollbarnext_dnButton(ev->y))
1611 || (R->scrollBar.style == R_SB_RXVT 1645 || (R->scrollBar.style == R_SB_RXVT
1612 && scrollbarrxvt_dnButton(ev->y))) 1646 && scrollbarrxvt_dnButton(ev->y)))
1613 rxvt_tt_printf(aR_ "\033[B"); 1647 R->tt_printf("\033[B");
1614 else 1648 else
1615 switch (ev->button) { 1649 switch (ev->button) {
1616 case Button2: 1650 case Button2:
1617 rxvt_tt_printf(aR_ "\014"); 1651 R->tt_printf("\014");
1618 break; 1652 break;
1619 case Button1: 1653 case Button1:
1620 rxvt_tt_printf(aR_ "\033[6~"); 1654 R->tt_printf("\033[6~");
1621 break; 1655 break;
1622 case Button3: 1656 case Button3:
1623 rxvt_tt_printf(aR_ "\033[5~"); 1657 R->tt_printf("\033[5~");
1624 break; 1658 break;
1625 } 1659 }
1626 } 1660 }
1627 else 1661 else
1628#endif /* NO_SCROLLBAR_REPORT */ 1662#endif /* NO_SCROLLBAR_REPORT */
… …
1640 else if (scrollbarrxvt_dnButton(ev->y)) 1674 else if (scrollbarrxvt_dnButton(ev->y))
1641 upordown = 1; /* down */ 1675 upordown = 1; /* down */
1642 } 1676 }
1643 if (upordown) { 1677 if (upordown) {
1644#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1678#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1645 h->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1679 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1646#endif 1680#endif
1647 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1681 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1648 if (upordown < 0) 1682 if (upordown < 0)
1649 scrollbar_setUp(); 1683 scrollbar_setUp();
1650 else 1684 else
1651 scrollbar_setDn(); 1685 scrollbar_setDn();
1652 } 1686 }
1653 } else 1687 } else
1654 switch (ev->button) { 1688 switch (ev->button) {
1655 case Button2: 1689 case Button2:
1656 switch (h->scrollbar_align) { 1690 switch (R->scrollbar_align) {
1657 case R_SB_ALIGN_TOP: 1691 case R_SB_ALIGN_TOP:
1658 h->csrO = 0; 1692 R->csrO = 0;
1659 break; 1693 break;
1660 case R_SB_ALIGN_CENTRE: 1694 case R_SB_ALIGN_CENTRE:
1661 h->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1695 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1662 break; 1696 break;
1663 case R_SB_ALIGN_BOTTOM: 1697 case R_SB_ALIGN_BOTTOM:
1664 h->csrO = R->scrollBar.bot - R->scrollBar.top; 1698 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1665 break; 1699 break;
1666 } 1700 }
1667 if (R->scrollBar.style == R_SB_XTERM 1701 if (R->scrollBar.style == R_SB_XTERM
1668 || scrollbar_above_slider(ev->y) 1702 || scrollbar_above_slider(ev->y)
1669 || scrollbar_below_slider(ev->y)) 1703 || scrollbar_below_slider(ev->y))
1670 rxvt_scr_move_to(aR_ 1704 rxvt_scr_move_to(aR_
1671 scrollbar_position(ev->y) - h->csrO, 1705 scrollbar_position(ev->y) - R->csrO,
1672 scrollbar_size()); 1706 scrollbar_size());
1673 scrollbar_setMotion(); 1707 scrollbar_setMotion();
1674 break; 1708 break;
1675 1709
1676 case Button1: 1710 case Button1:
1677 if (h->scrollbar_align == R_SB_ALIGN_CENTRE) 1711 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1678 h->csrO = ev->y - R->scrollBar.top; 1712 R->csrO = ev->y - R->scrollBar.top;
1679 /* FALLTHROUGH */ 1713 /* FALLTHROUGH */
1680 1714
1681 case Button3: 1715 case Button3:
1682 if (R->scrollBar.style != R_SB_XTERM) { 1716 if (R->scrollBar.style != R_SB_XTERM) {
1683 if (scrollbar_above_slider(ev->y)) 1717 if (scrollbar_above_slider(ev->y))
… …
1718void 1752void
1719rxvt_button_release(pR_ XButtonEvent *ev) 1753rxvt_button_release(pR_ XButtonEvent *ev)
1720{ 1754{
1721 int reportmode = 0; 1755 int reportmode = 0;
1722 1756
1723 R->h->csrO = 0; /* reset csr Offset */ 1757 R->csrO = 0; /* reset csr Offset */
1724 if (!R->h->bypass_keystate) 1758 if (!R->bypass_keystate)
1725 reportmode = !!(R->h->PrivateModes & PrivMode_mouse_report); 1759 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1726 1760
1727 if (scrollbar_isUpDn()) { 1761 if (scrollbar_isUpDn()) {
1728 scrollbar_setIdle(); 1762 scrollbar_setIdle();
1729 rxvt_scrollbar_show(aR_ 0); 1763 rxvt_scrollbar_show(aR_ 0);
1730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1731 R->h->refresh_type &= ~SMOOTH_REFRESH; 1765 R->refresh_type &= ~SMOOTH_REFRESH;
1732#endif 1766#endif
1733 } 1767 }
1734#ifdef SELECTION_SCROLLING 1768#ifdef SELECTION_SCROLLING
1735 R->h->pending_scroll_selection=0; 1769 R->pending_scroll_selection=0;
1736#endif 1770#endif
1737 if (ev->window == R->TermWin.vt) 1771 if (ev->window == R->TermWin.vt)
1738 { 1772 {
1739#ifdef RXVT_GRAPHICS 1773#ifdef RXVT_GRAPHICS
1740 if (ev->subwindow != None) 1774 if (ev->subwindow != None)
… …
1748 /* don't report release of wheel "buttons" */ 1782 /* don't report release of wheel "buttons" */
1749 if (ev->button >= 4) 1783 if (ev->button >= 4)
1750 return; 1784 return;
1751#ifdef MOUSE_REPORT_DOUBLECLICK 1785#ifdef MOUSE_REPORT_DOUBLECLICK
1752 /* only report the release of 'slow' single clicks */ 1786 /* only report the release of 'slow' single clicks */
1753 if (R->h->MEvent.button != AnyButton 1787 if (R->MEvent.button != AnyButton
1754 && (ev->button != R->h->MEvent.button 1788 && (ev->button != R->MEvent.button
1755 || (ev->time - R->h->MEvent.time 1789 || (ev->time - R->MEvent.time
1756 > MULTICLICK_TIME / 2))) 1790 > MULTICLICK_TIME / 2)))
1757 { 1791 {
1758 R->h->MEvent.clicks = 0; 1792 R->MEvent.clicks = 0;
1759 R->h->MEvent.button = AnyButton; 1793 R->MEvent.button = AnyButton;
1760 rxvt_mouse_report(aR_ ev); 1794 rxvt_mouse_report(aR_ ev);
1761 } 1795 }
1762#else /* MOUSE_REPORT_DOUBLECLICK */ 1796#else /* MOUSE_REPORT_DOUBLECLICK */
1763 R->h->MEvent.button = AnyButton; 1797 R->MEvent.button = AnyButton;
1764 rxvt_mouse_report(aR_ ev); 1798 rxvt_mouse_report(aR_ ev);
1765#endif /* MOUSE_REPORT_DOUBLECLICK */ 1799#endif /* MOUSE_REPORT_DOUBLECLICK */
1766 return; 1800 return;
1767 } 1801 }
1768 /* 1802 /*
1769 * dumb hack to compensate for the failure of click-and-drag 1803 * dumb hack to compensate for the failure of click-and-drag
1770 * when overriding mouse reporting 1804 * when overriding mouse reporting
1771 */ 1805 */
1772 if (R->h->PrivateModes & PrivMode_mouse_report 1806 if (R->PrivateModes & PrivMode_mouse_report
1773 && R->h->bypass_keystate 1807 && R->bypass_keystate
1774 && ev->button == Button1 && R->h->MEvent.clicks <= 1) 1808 && ev->button == Button1 && R->MEvent.clicks <= 1)
1775 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1809 rxvt_selection_extend(aR_ ev->x, ev->y, 0);
1776 1810
1777 switch (ev->button) { 1811 switch (ev->button) {
1778 case Button1: 1812 case Button1:
1779 case Button3: 1813 case Button3:
… …
1796 else 1830 else
1797 i = 5; 1831 i = 5;
1798# ifdef MOUSE_SLIP_WHEELING 1832# ifdef MOUSE_SLIP_WHEELING
1799 if (ev->state & ControlMask) 1833 if (ev->state & ControlMask)
1800 { 1834 {
1801 R->h->mouse_slip_wheel_speed += (v ? -1 : 1); 1835 R->mouse_slip_wheel_speed += (v ? -1 : 1);
1802 R->h->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1836 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1803 } 1837 }
1804# endif 1838# endif
1805# ifdef JUMP_MOUSE_WHEEL 1839# ifdef JUMP_MOUSE_WHEEL
1806 rxvt_scr_page(aR_ v, i); 1840 rxvt_scr_page(aR_ v, i);
1807 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1841 rxvt_scr_refresh(aR_ SMOOTH_REFRESH);
… …
1852 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1886 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr);
1853 rootdepth = wrootattr.depth; 1887 rootdepth = wrootattr.depth;
1854 1888
1855 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1889 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
1856 if (rootdepth != wattr.depth) { 1890 if (rootdepth != wattr.depth) {
1857 if (R->h->am_transparent) { 1891 if (R->am_transparent) {
1858 pchanged = 1; 1892 pchanged = 1;
1859 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1893 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1860 R->PixColors[Color_bg]); 1894 R->PixColors[Color_bg]);
1861 R->h->am_transparent = R->h->am_pixmap_trans = 0; 1895 R->am_transparent = R->am_pixmap_trans = 0;
1862 } 1896 }
1863 return pchanged; /* Don't try any more */ 1897 return pchanged; /* Don't try any more */
1864 } 1898 }
1865 1899
1866/* Get all X ops out of the queue so that our information is up-to-date. */ 1900/* Get all X ops out of the queue so that our information is up-to-date. */
… …
1869/* 1903/*
1870 * Make the frame window set by the window manager have 1904 * Make the frame window set by the window manager have
1871 * the root background. Some window managers put multiple nested frame 1905 * the root background. Some window managers put multiple nested frame
1872 * windows for each client, so we have to take care about that. 1906 * windows for each client, so we have to take care about that.
1873 */ 1907 */
1874 i = (R->h->xa[XA_XROOTPMAPID] != 0 1908 i = (R->xa[XA_XROOTPMAPID] != 0
1875 && (XGetWindowProperty(R->Xdisplay, Xroot, R->h->xa[XA_XROOTPMAPID], 1909 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID],
1876 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1910 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1877 &nitems, &bytes_after, &prop) == Success)); 1911 &nitems, &bytes_after, &prop) == Success));
1878 if (!i || prop == NULL) 1912 if (!i || prop == NULL)
1879 have_pixmap = 0; 1913 have_pixmap = 0;
1880 else { 1914 else {
… …
1908 ny = -sy; 1942 ny = -sy;
1909 sy = 0; 1943 sy = 0;
1910 } 1944 }
1911 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1945 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1912 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1946 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1913 R->h->allowedxerror = -1; 1947 R->allowedxerror = -1;
1914 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1948 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1915 ZPixmap); 1949 ZPixmap);
1916 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1950 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1917 /* XXX: may need a delay here? */ 1951 /* XXX: may need a delay here? */
1918 R->h->allowedxerror = 0; 1952 R->allowedxerror = 0;
1919 if (image == NULL) { 1953 if (image == NULL) {
1920 if (R->h->am_transparent && R->h->am_pixmap_trans) { 1954 if (R->am_transparent && R->am_pixmap_trans) {
1921 pchanged = 1; 1955 pchanged = 1;
1922 if (R->TermWin.pixmap != None) { 1956 if (R->TermWin.pixmap != None) {
1923 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1957 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1924 R->TermWin.pixmap = None; 1958 R->TermWin.pixmap = None;
1925 } 1959 }
1926 } 1960 }
1927 R->h->am_pixmap_trans = 0; 1961 R->am_pixmap_trans = 0;
1928 } else { 1962 } else {
1929 if (R->TermWin.pixmap != None) 1963 if (R->TermWin.pixmap != None)
1930 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1964 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1931 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 1965 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1932 (unsigned int)R->szHint.width, 1966 (unsigned int)R->szHint.width,
… …
1938 (unsigned int)image->height); 1972 (unsigned int)image->height);
1939 XFreeGC(R->Xdisplay, gc); 1973 XFreeGC(R->Xdisplay, gc);
1940 XDestroyImage(image); 1974 XDestroyImage(image);
1941 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 1975 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1942 R->TermWin.pixmap); 1976 R->TermWin.pixmap);
1943 if (!R->h->am_transparent || !R->h->am_pixmap_trans) 1977 if (!R->am_transparent || !R->am_pixmap_trans)
1944 pchanged = 1; 1978 pchanged = 1;
1945 R->h->am_transparent = R->h->am_pixmap_trans = 1; 1979 R->am_transparent = R->am_pixmap_trans = 1;
1946 } 1980 }
1947 } 1981 }
1948 if (!R->h->am_pixmap_trans) { 1982 if (!R->am_pixmap_trans) {
1949 unsigned int n; 1983 unsigned int n;
1950/* 1984/*
1951 * InheritPixmap transparency 1985 * InheritPixmap transparency
1952 */ 1986 */
1953 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 1987 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
… …
1982 D_X((stderr, "InheritPixmap Turning off")); 2016 D_X((stderr, "InheritPixmap Turning off"));
1983 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2017 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0],
1984 R->PixColors[Color_fg]); 2018 R->PixColors[Color_fg]);
1985 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2019 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
1986 R->PixColors[Color_bg]); 2020 R->PixColors[Color_bg]);
1987 R->h->am_transparent = 0; 2021 R->am_transparent = 0;
1988 /* XXX: also turn off Opt_transparent? */ 2022 /* XXX: also turn off Opt_transparent? */
1989 } else { 2023 } else {
1990 /* wait (an arbitrary period) for the WM to do its thing 2024 /* wait (an arbitrary period) for the WM to do its thing
1991 * needed for fvwm2.2.2 (and before?) */ 2025 * needed for fvwm2.2.2 (and before?) */
1992# ifdef HAVE_NANOSLEEP 2026# ifdef HAVE_NANOSLEEP
… …
2002 for (n = 0; n < (unsigned int)i; n++) 2036 for (n = 0; n < (unsigned int)i; n++)
2003 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2037 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n],
2004 ParentRelative); 2038 ParentRelative);
2005 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2039 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2006 ParentRelative); 2040 ParentRelative);
2007 R->h->am_transparent = 1; 2041 R->am_transparent = 1;
2008 } 2042 }
2009 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2043 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++)
2010 R->TermWin.parent[i] = None; 2044 R->TermWin.parent[i] = None;
2011 } 2045 }
2012 return pchanged; 2046 return pchanged;
… …
2020#ifdef PRINTPIPE 2054#ifdef PRINTPIPE
2021/* EXTPROTO */ 2055/* EXTPROTO */
2022FILE * 2056FILE *
2023rxvt_popen_printer(pR) 2057rxvt_popen_printer(pR)
2024{ 2058{
2025 FILE *stream = popen(R->h->rs[Rs_print_pipe], "w"); 2059 FILE *stream = popen(R->rs[Rs_print_pipe], "w");
2026 2060
2027 if (stream == NULL) 2061 if (stream == NULL)
2028 rxvt_print_error("can't open printer pipe"); 2062 rxvt_print_error("can't open printer pipe");
2029 return stream; 2063 return stream;
2030} 2064}
2031 2065
2032/* EXTPROTO */ 2066/* EXTPROTO */
2033int 2067int
2034rxvt_pclose_printer(FILE *stream) 2068rxvt_pclose_printer (FILE *stream)
2035{ 2069{
2036 fflush(stream); 2070 fflush (stream);
2037/* pclose() reported not to work on SunOS 4.1.3 */ 2071/* pclose() reported not to work on SunOS 4.1.3 */
2038# if defined (__sun__) /* TODO: RESOLVE THIS */ 2072# if defined (__sun__) /* TODO: RESOLVE THIS */
2039/* pclose works provided SIGCHLD handler uses waitpid */ 2073/* pclose works provided SIGCHLD handler uses waitpid */
2040 return pclose(stream); /* return fclose (stream); */ 2074 return pclose (stream); /* return fclose (stream); */
2041# else 2075# else
2042 return pclose(stream); 2076 return pclose (stream);
2043# endif 2077# endif
2044} 2078}
2045 2079
2046/* 2080/*
2047 * simulate attached vt100 printer 2081 * simulate attached vt100 printer
… …
2109void 2143void
2110rxvt_process_nonprinting(pR_ unsigned char ch) 2144rxvt_process_nonprinting(pR_ unsigned char ch)
2111{ 2145{
2112 switch (ch) { 2146 switch (ch) {
2113 case C0_ENQ: /* terminal Status */ 2147 case C0_ENQ: /* terminal Status */
2114 if (R->h->rs[Rs_answerbackstring]) 2148 if (R->rs[Rs_answerbackstring])
2115 rxvt_tt_write(aR_ 2149 R->tt_write(
2116 (const unsigned char *)R->h->rs[Rs_answerbackstring], 2150 (const unsigned char *)R->rs[Rs_answerbackstring],
2117 (unsigned int)STRLEN(R->h->rs[Rs_answerbackstring])); 2151 (unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2118 else 2152 else
2119 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2153 R->tt_write((unsigned char *)VT100_ANS,
2120 (unsigned int)STRLEN(VT100_ANS)); 2154 (unsigned int)STRLEN(VT100_ANS));
2121 break; 2155 break;
2122 case C0_BEL: /* bell */ 2156 case C0_BEL: /* bell */
2123 rxvt_scr_bell(aR); 2157 rxvt_scr_bell(aR);
2124 break; 2158 break;
… …
2187 row = rxvt_cmd_getc(aR) - ' '; 2221 row = rxvt_cmd_getc(aR) - ' ';
2188 col = rxvt_cmd_getc(aR) - ' '; 2222 col = rxvt_cmd_getc(aR) - ' ';
2189 rxvt_scr_gotorc(aR_ row, col, 0); 2223 rxvt_scr_gotorc(aR_ row, col, 0);
2190 break; 2224 break;
2191 case 'Z': /* identify the terminal type */ 2225 case 'Z': /* identify the terminal type */
2192 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2226 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2193 break; 2227 break;
2194 case '<': /* turn off VT52 mode */ 2228 case '<': /* turn off VT52 mode */
2195 PrivMode(0, PrivMode_vt52); 2229 PrivMode(0, PrivMode_vt52);
2196 break; 2230 break;
2197 case 'F': /* use special graphics character set */ 2231 case 'F': /* use special graphics character set */
… …
2212void 2246void
2213rxvt_process_escape_seq(pR) 2247rxvt_process_escape_seq(pR)
2214{ 2248{
2215 unsigned char ch = rxvt_cmd_getc(aR); 2249 unsigned char ch = rxvt_cmd_getc(aR);
2216 2250
2217 if (R->h->PrivateModes & PrivMode_vt52) { 2251 if (R->PrivateModes & PrivMode_vt52) {
2218 rxvt_process_escape_vt52(aR_ ch); 2252 rxvt_process_escape_vt52(aR_ ch);
2219 return; 2253 return;
2220 } 2254 }
2221 2255
2222 switch (ch) { 2256 switch (ch) {
… …
2304 rxvt_process_dcs_seq(aR); 2338 rxvt_process_dcs_seq(aR);
2305 break; 2339 break;
2306 2340
2307 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2341 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2308 case C1_SCI: /* ESC Z */ 2342 case C1_SCI: /* ESC Z */
2309 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2343 R->tt_write((const unsigned char *)ESCZ_ANSWER,
2310 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2344 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2311 break; /* steal obsolete ESC [ c */ 2345 break; /* steal obsolete ESC [ c */
2312 2346
2313 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2347 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2314 case C1_CSI: /* ESC [ */ 2348 case C1_CSI: /* ESC [ */
… …
2435 */ 2469 */
2436 if (priv) { 2470 if (priv) {
2437 switch (priv) { 2471 switch (priv) {
2438 case '>': 2472 case '>':
2439 if (ch == CSI_DA) /* secondary device attributes */ 2473 if (ch == CSI_DA) /* secondary device attributes */
2440 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2474 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2441 break; 2475 break;
2442 case '?': 2476 case '?':
2443 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2477 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2444 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2478 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2445 break; 2479 break;
… …
2552 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2586 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2553 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2587 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2554 break; 2588 break;
2555 2589
2556 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2590 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2557 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2591 R->tt_write((const unsigned char *)VT100_ANS,
2558 (unsigned int)(sizeof(VT100_ANS) - 1)); 2592 (unsigned int)(sizeof(VT100_ANS) - 1));
2559 break; 2593 break;
2560 2594
2561 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2595 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2562 rxvt_process_sgr_mode(aR_ nargs, arg); 2596 rxvt_process_sgr_mode(aR_ nargs, arg);
2563 break; 2597 break;
2564 2598
2565 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2599 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2566 switch (arg[0]) { 2600 switch (arg[0]) {
2567 case 5: /* DSR requested */ 2601 case 5: /* DSR requested */
2568 rxvt_tt_printf(aR_ "\033[0n"); 2602 R->tt_printf("\033[0n");
2569 break; 2603 break;
2570 case 6: /* CPR requested */ 2604 case 6: /* CPR requested */
2571 rxvt_scr_report_position(aR); 2605 rxvt_scr_report_position(aR);
2572 break; 2606 break;
2573#if defined (ENABLE_DISPLAY_ANSWER) 2607#if defined (ENABLE_DISPLAY_ANSWER)
2574 case 7: /* unofficial extension */ 2608 case 7: /* unofficial extension */
2575 rxvt_tt_printf(aR_ "%-.250s\n", R->h->rs[Rs_display_name]); 2609 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2576 break; 2610 break;
2577#endif 2611#endif
2578 case 8: /* unofficial extension */ 2612 case 8: /* unofficial extension */
2579 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2613 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2580 break; 2614 break;
… …
2649 break; 2683 break;
2650#endif 2684#endif
2651 2685
2652 case CSI_78: /* DECREQTPARM */ 2686 case CSI_78: /* DECREQTPARM */
2653 if (arg[0] == 0 || arg[0] == 1) 2687 if (arg[0] == 0 || arg[0] == 1)
2654 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2688 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2655 /* FALLTHROUGH */ 2689 /* FALLTHROUGH */
2656 2690
2657 default: 2691 default:
2658 break; 2692 break;
2659 } 2693 }
… …
2713 /* 2747 /*
2714 * reports - some output format copied from XTerm 2748 * reports - some output format copied from XTerm
2715 */ 2749 */
2716 case 11: /* report window state */ 2750 case 11: /* report window state */
2717 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2751 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2718 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2752 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2719 break; 2753 break;
2720 case 13: /* report window position */ 2754 case 13: /* report window position */
2721 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2755 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2722 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2756 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2723 -wattr.border_width, -wattr.border_width, 2757 -wattr.border_width, -wattr.border_width,
2724 &x, &y, &wdummy); 2758 &x, &y, &wdummy);
2725 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2759 R->tt_printf("\033[3;%d;%dt", x, y);
2726 break; 2760 break;
2727 case 14: /* report window size (pixels) */ 2761 case 14: /* report window size (pixels) */
2728 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2762 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2729 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2763 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2730 break; 2764 break;
2731 case 18: /* report window size (chars) */ 2765 case 18: /* report window size (chars) */
2732 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2766 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2733 break; 2767 break;
2734#if 0 /* XXX: currently disabled due to security concerns */ 2768#if 0 /* XXX: currently disabled due to security concerns */
2735 case 20: /* report icon label */ 2769 case 20: /* report icon label */
2736 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2770 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2737 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2771 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2738 break; 2772 break;
2739 case 21: /* report window title */ 2773 case 21: /* report window title */
2740 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2774 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2741 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2775 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2742 break; 2776 break;
2743#endif 2777#endif
2744 } 2778 }
2745} 2779}
2746#endif 2780#endif
… …
2977rxvt_privcases(pR_ int mode, unsigned long bit) 3011rxvt_privcases(pR_ int mode, unsigned long bit)
2978{ 3012{
2979 int state; 3013 int state;
2980 3014
2981 if (mode == 's') { 3015 if (mode == 's') {
2982 R->h->SavedModes |= (R->h->PrivateModes & bit); 3016 R->SavedModes |= (R->PrivateModes & bit);
2983 return -1; 3017 return -1;
2984 } else { 3018 } else {
2985 if (mode == 'r') 3019 if (mode == 'r')
2986 state = (R->h->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3020 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */
2987 else 3021 else
2988 state = (mode == 't') ? !(R->h->PrivateModes & bit) : mode; 3022 state = (mode == 't') ? !(R->PrivateModes & bit) : mode;
2989 PrivMode(state, bit); 3023 PrivMode(state, bit);
2990 } 3024 }
2991 return state; 3025 return state;
2992} 3026}
2993 3027
… …
3071 * within VT52 mode 3105 * within VT52 mode
3072 */ 3106 */
3073 PrivMode(1, PrivMode_vt52); 3107 PrivMode(1, PrivMode_vt52);
3074 break; 3108 break;
3075 case 3: /* 80/132 */ 3109 case 3: /* 80/132 */
3076 if (R->h->PrivateModes & PrivMode_132OK) 3110 if (R->PrivateModes & PrivMode_132OK)
3077 rxvt_set_widthheight(aR_ 3111 rxvt_set_widthheight(aR_
3078 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3112 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth),
3079 (unsigned int)R->TermWin.height); 3113 (unsigned int)R->TermWin.height);
3080 break; 3114 break;
3081 case 4: /* smooth scrolling */ 3115 case 4: /* smooth scrolling */
… …
3094 rxvt_scr_autowrap(aR_ state); 3128 rxvt_scr_autowrap(aR_ state);
3095 break; 3129 break;
3096 /* case 8: - auto repeat, can't do on a per window basis */ 3130 /* case 8: - auto repeat, can't do on a per window basis */
3097 case 9: /* X10 mouse reporting */ 3131 case 9: /* X10 mouse reporting */
3098 if (state) /* orthogonal */ 3132 if (state) /* orthogonal */
3099 R->h->PrivateModes &= ~(PrivMode_MouseX11); 3133 R->PrivateModes &= ~(PrivMode_MouseX11);
3100 break; 3134 break;
3101#ifdef menuBar_esc 3135#ifdef menuBar_esc
3102 case menuBar_esc: 3136 case menuBar_esc:
3103#ifdef MENUBAR 3137#ifdef MENUBAR
3104 rxvt_map_menuBar(aR_ state); 3138 rxvt_map_menuBar(aR_ state);
… …
3123 break; 3157 break;
3124 /* case 66: - application key pad */ 3158 /* case 66: - application key pad */
3125 /* case 67: - backspace key */ 3159 /* case 67: - backspace key */
3126 case 1000: /* X11 mouse reporting */ 3160 case 1000: /* X11 mouse reporting */
3127 if (state) /* orthogonal */ 3161 if (state) /* orthogonal */
3128 R->h->PrivateModes &= ~(PrivMode_MouseX10); 3162 R->PrivateModes &= ~(PrivMode_MouseX10);
3129 break; 3163 break;
3130#if 0 3164#if 0
3131 case 1001: 3165 case 1001:
3132 break; /* X11 mouse highlighting */ 3166 break; /* X11 mouse highlighting */
3133#endif 3167#endif
… …
3142 R->Options |= Opt_scrollTtyKeypress; 3176 R->Options |= Opt_scrollTtyKeypress;
3143 else 3177 else
3144 R->Options &= ~Opt_scrollTtyKeypress; 3178 R->Options &= ~Opt_scrollTtyKeypress;
3145 break; 3179 break;
3146 case 1047: /* secondary screen w/ clearing */ 3180 case 1047: /* secondary screen w/ clearing */
3147 if (R->h->current_screen != PRIMARY) 3181 if (R->current_screen != PRIMARY)
3148 rxvt_scr_erase_screen(aR_ 2); 3182 rxvt_scr_erase_screen(aR_ 2);
3149 rxvt_scr_change_screen(aR_ state); 3183 rxvt_scr_change_screen(aR_ state);
3150 /* FALLTHROUGH */ 3184 /* FALLTHROUGH */
3151 default: 3185 default:
3152 break; 3186 break;
… …
3289{ 3323{
3290 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3324 unsigned char ch, cmd = rxvt_cmd_getc(aR);
3291 3325
3292#ifndef RXVT_GRAPHICS 3326#ifndef RXVT_GRAPHICS
3293 if (cmd == 'Q') { /* query graphics */ 3327 if (cmd == 'Q') { /* query graphics */
3294 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3328 R->tt_printf("\033G0\n"); /* no graphics */
3295 return; 3329 return;
3296 } 3330 }
3297/* swallow other graphics sequences until terminating ':' */ 3331/* swallow other graphics sequences until terminating ':' */
3298 do 3332 do
3299 ch = rxvt_cmd_getc(aR); 3333 ch = rxvt_cmd_getc(aR);
… …
3302 unsigned int nargs; 3336 unsigned int nargs;
3303 int args[NGRX_PTS]; 3337 int args[NGRX_PTS];
3304 unsigned char *text = NULL; 3338 unsigned char *text = NULL;
3305 3339
3306 if (cmd == 'Q') { /* query graphics */ 3340 if (cmd == 'Q') { /* query graphics */
3307 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3341 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3308 return; 3342 return;
3309 } 3343 }
3310 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3344 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3311 int neg; 3345 int neg;
3312 3346
… …
3342} 3376}
3343/*}}} */ 3377/*}}} */
3344 3378
3345/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3346 3380
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/* 3381/*
3450 * Send printf() formatted output to the command. 3382 * Send printf() formatted output to the command.
3451 * Only use for small amounts of data. 3383 * Only use for small amounts of data.
3452 */ 3384 */
3453/* EXTPROTO */
3454void 3385void
3455rxvt_tt_printf(pR_ const char *fmt,...) 3386rxvt_term::tt_printf (const char *fmt,...)
3456{ 3387{
3457 va_list arg_ptr; 3388 va_list arg_ptr;
3458 unsigned char buf[256]; 3389 unsigned char buf[256];
3459 3390
3460 va_start(arg_ptr, fmt); 3391 va_start (arg_ptr, fmt);
3461 vsprintf((char *)buf, fmt, arg_ptr); 3392 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3462 va_end(arg_ptr); 3393 va_end (arg_ptr);
3463 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3394 tt_write (buf, STRLEN (buf));
3464} 3395}
3465 3396
3466/* ---------------------------------------------------------------------- */ 3397/* ---------------------------------------------------------------------- */
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, 3398/* 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. 3399 * or generated by us in response to a query ESC sequence.
3472 */ 3400 */
3473/* EXTPROTO */
3474void 3401void
3475rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3402rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3476{ 3403{
3477#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3404 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 3405
3485 if (R->h->v_bufstr == NULL && len > 0) { 3406 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 } 3407 {
3408 if (v_buflen == 0)
3409 {
3410 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3411 if (written == len)
3412 return;
3495 3413
3496 /* 3414 data += written;
3497 * Append to the block we already have. Always doing this simplifies the 3415 len -= written;
3498 * code, and isn't too bad, either. If this is a short block, it isn't 3416 }
3499 * too expensive, and if this is a long block, we won't be able to write 3417
3500 * it all anyway. 3418
3501 */ 3419 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3502 if (len > 0) { 3420
3503 if (v_bufend < v_bufptr + len) { /* run out of room */ 3421 memcpy (v_buffer + v_buflen, data, len);
3504 if (v_bufstr != v_buffer) { 3422 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 } 3423 }
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 3424
3517 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3425 for (;;)
3518 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3426 {
3519 /* save across realloc */ 3427 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3520 if (v_buffer) { 3428
3521 v_bufstr = v_buffer; 3429 if (written > 0)
3522 v_bufptr = v_buffer + size; 3430 {
3523 v_bufend = v_buffer + reallocto; 3431 v_buflen -= written;
3524 } else { /* no memory: ignore entire write request */ 3432
3525 rxvt_print_error("data loss: cannot allocate buffer space"); 3433 if (v_buflen == 0)
3526 v_buffer = v_bufstr; /* restore clobbered pointer */ 3434 {
3527 } 3435 free (v_buffer);
3436 v_buffer = 0;
3437 v_buflen = 0;
3438
3439 pty_ev.set (EVENT_READ);
3440 return;
3441 }
3442
3443 memmove (v_buffer, v_buffer + written, v_buflen);
3444 }
3445 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3446 // original code just ignores this...
3447 destroy ();
3448 else
3449 {
3450 pty_ev.set (EVENT_READ | EVENT_WRITE);
3451 return;
3452 }
3528 } 3453 }
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} 3454}
3455
3582/*----------------------- end-of-file (C source) -----------------------*/ 3456/*----------------------- end-of-file (C source) -----------------------*/
3583 3457

Diff Legend

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