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

Diff Legend

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