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.417 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.555 by sf-exg, Sat Aug 16 10:51:23 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
322 }; 324 };
323 325
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
334# endif 336# endif
335#endif 337#endif
336 return keysym; 338 return keysym;
337} 339}
338 340
339static inline int 341static inline int ecb_cold
340map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
341{ 343{
342 int param = 0; 344 int param = 0;
343 345
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
369 param = 3; 371 param = 3;
370 break; 372 break;
371 case XK_Select: 373 case XK_Select:
372 param = 4; 374 param = 4;
373 break; 375 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior: 376 case XK_Prior:
376 param = 5; 377 param = 5;
377 break; 378 break;
378 case XK_Next: 379 case XK_Next:
379 param = 6; 380 param = 6;
… …
382 param = 7; 383 param = 7;
383 break; 384 break;
384 case XK_End: 385 case XK_End:
385 param = 8; 386 param = 8;
386 break; 387 break;
387#endif
388 case XK_Help: 388 case XK_Help:
389 param = 28; 389 param = 28;
390 break; 390 break;
391 case XK_Menu: 391 case XK_Menu:
392 param = 29; 392 param = 29;
393 break; 393 break;
394 } 394 }
395 return param; 395 return param;
396} 396}
397 397
398void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
400{ 409{
401 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
402 KeySym keysym; 411 KeySym keysym = NoSymbol;
403 int valid_keysym;
404 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
405 414
406#if ISO_14755 415#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
408 return; 417 return;
409#endif 418#endif
… …
416 */ 425 */
417 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
420 429
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
489 { 704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
505#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 722#else
508 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
509#endif 724#endif
725 max_it (lnsppg, 1);
726
510 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
511 { 728 {
512 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
513 return; 730 return;
514 } 731 }
515 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
516 { 733 {
517 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
518 return; 735 return;
519 } 736 }
520 } 737 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
523 { 740 {
524 if (keysym == XK_Up) 741 if (keysym == XK_Up)
525 { 742 {
526 scr_page (UP, 1); 743 scr_page (1);
527 return; 744 return;
528 } 745 }
529 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
530 { 747 {
531 scr_page (DN, 1); 748 scr_page (-1);
532 return; 749 return;
533 } 750 }
534 } 751 }
535#endif 752#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
538 { 755 {
539 if (keysym == XK_Home) 756 if (keysym == XK_Home)
540 { 757 {
541 scr_move_to (0, 1); 758 scr_changeview (top_row);
542 return; 759 return;
543 } 760 }
544 else if (keysym == XK_End) 761 else if (keysym == XK_End)
545 { 762 {
546 scr_move_to (1, 1); 763 scr_changeview (0);
547 return; 764 return;
548 } 765 }
549 } 766 }
550#endif 767#endif
551 } 768 }
552 769
553 if (shft) 770 if (shft)
554 { 771 {
555 /* Shift + F1 - F10 generates F11 - F20 */
556 if (keysym >= XK_F1 && keysym <= XK_F10)
557 {
558 keysym += (XK_F11 - XK_F1);
559 shft = 0; /* turn off Shift */
560 }
561 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
562 { 773 {
563 switch (keysym) 774 switch (keysym)
564 { 775 {
565 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
566 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
567 selection_request (ev.time); 778 selection_request (ev.time);
568 return; 779 return;
569#if TODO 780#if TODO
570 /* rxvt extras */ 781 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 783 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 785 return;
577#endif 786#endif
578 } 787 }
579 } 788 }
580 } 789 }
581 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
582#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 807 // ISO 14755 support
584 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 809 {
586 int hv; 810 int hv;
587 811
588 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 843 scr_overlay_off ();
620# endif 844# endif
621 iso14755buf = 0; 845 iso14755buf = 0;
622 } 846 }
623 } 847 }
848 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
627 { 852 {
628 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 854# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
638 { 863 {
639 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
640 return; 865 return;
641 } 866 }
642#endif 867#endif
643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
771 }
772 break;
773 }
774
775 if (newlen)
776 len = strlen (kbuf);
777
778 /*
779 * Pass meta for all function keys, if 'meta' option set
780 */
781#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0)
783 kbuf[len - 1] |= 0x80;
784#endif
785
786 }
787 else if (ctrl && keysym == XK_minus)
788 {
789 len = 1;
790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
797 else
798 {
799#ifdef META8_OPTION
800 /* set 8-bit on */
801 if (meta && (meta_char == 0x80))
802 {
803 char *ch;
804
805 for (ch = kbuf; ch < kbuf + len; ch++)
806 *ch |= 0x80;
807
808 meta = 0;
809 }
810#endif
811 /* nil */ ;
812 }
813 } 868 }
814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817 869
818 if (len <= 0) 870 if (len <= 0)
819 return; /* not mapped */ 871 return; /* not mapped */
820 872
821 if (option (Opt_scrollTtyKeypress))
822 if (view_start)
823 {
824 view_start = 0;
825 want_refresh = 1;
826 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
854} 874}
855 875
856void 876void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
858{ 878{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 880 KeySym keysym;
861 881
… …
881 commit_iso14755 (); 901 commit_iso14755 ();
882 902
883 return; 903 return;
884 } 904 }
885 905
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 907 if (i[0] == keysym)
888 { 908 {
889 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 910 commit_iso14755 ();
891 911
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
930#endif 950#endif
931} 951}
932 952
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 953void
967rxvt_term::flush () 954rxvt_term::flush ()
968{ 955{
969 flush_ev.stop (); 956 flush_ev.stop ();
970 957
971#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
973 { 960 {
974// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 962 scr_touch (false);
976 } 963 }
977#endif 964#endif
978 965
979 if (want_refresh) 966 if (want_refresh)
… …
1016 while (row < end_row); 1003 while (row < end_row);
1017 } 1004 }
1018 1005
1019 scr_refresh (); 1006 scr_refresh ();
1020 scrollBar.show (1); 1007 scrollBar.show (1);
1021#ifdef USE_XIM 1008#if USE_XIM
1022 IMSendSpot (); 1009 im_send_spot ();
1023#endif 1010#endif
1024 } 1011 }
1025 1012
1026 display->flush (); 1013 display->flush ();
1027} 1014}
1028 1015
1029/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1030void 1017void
1031rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1032{ 1019{
1033 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1031 refresh_count = 0;
1045 flush (); 1032 flush ();
1046} 1033}
1047 1034
1048#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1049void 1051void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1053{
1052 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1055 want_refresh = 1;
… …
1072 1074
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1076void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1078{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1081 {
1080 want_refresh = 1; 1082 want_refresh = 1;
1081 refresh_check (); 1083 refresh_check ();
1082 } 1084 }
1083 else 1085 else
… …
1087 1089
1088#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1089void 1091void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1093{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1093 { 1095 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1097 want_refresh = 1;
1096 refresh_check (); 1098 refresh_check ();
1097 } 1099 }
… …
1102 1104
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1106void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1108{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1108 { 1110 {
1109 want_refresh = 1; 1111 want_refresh = 1;
1110 refresh_check (); 1112 refresh_check ();
1111 } 1113 }
1112 1114
… …
1127 { 1129 {
1128 // this should really be sched_yield(), but the linux guys thought 1130 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1131 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1132 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1133 // allowed by the sus... as is returning ENOSYS.
1134 // since the linux guys additionally thought that breaking the only
1135 // known workaround against their unusable sched_yield hack is cool,
1136 // we just nanosleep a bit and hope for the best.
1132 1137
1133 struct timespec ts = { 0, 0 }; 1138 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1139 nanosleep (&ts, 0);
1135 1140
1136 w.stop (); 1141 w.stop ();
1137 } 1142 }
1138 1143
… …
1141 { 1146 {
1142 } 1147 }
1143} event_handler; 1148} event_handler;
1144#endif 1149#endif
1145 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1146bool 1184bool
1147rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1148{ 1186{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1150 1188
1151 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1190
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1154 n = 0;
1155 } 1192 {
1156 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1160 1198
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1200
1163 if (r > 0) 1201 if (r > 0)
1164 { 1202 {
1165 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1166 return true; 1204 return true;
… …
1188{ 1226{
1189 make_current (); 1227 make_current ();
1190 1228
1191 if (revents & ev::READ) 1229 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1230 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1231 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1232 cmd_parse ();
1195 break;
1196 1233
1197 if (revents & ev::WRITE) 1234 if (revents & ev::WRITE)
1198 pty_write (); 1235 pty_write ();
1199 1236
1200 refresh_check (); 1237 refresh_check ();
1201} 1238}
1202 1239
1203void 1240void ecb_cold
1204rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1205{ 1242{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1244 recolour_cursor ();
1208 1245
… …
1213 pointer_ev.start (pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1214#endif 1251#endif
1215} 1252}
1216 1253
1217#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1218void 1255void ecb_cold
1219rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1220{ 1257{
1221 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1222 return; 1259 return;
1223 1260
… …
1225 XFlush (dpy); 1262 XFlush (dpy);
1226 1263
1227 hidden_pointer = 1; 1264 hidden_pointer = 1;
1228} 1265}
1229 1266
1230void 1267void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1269{
1233 make_current (); 1270 make_current ();
1234 1271
1235 pointer_blank (); 1272 pointer_blank ();
… …
1241{ 1278{
1242 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1243 int x, y; 1280 int x, y;
1244 int code = 32; 1281 int code = 32;
1245 1282
1246 x = Pixel2Col (ev.x); 1283 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1284 y = Pixel2Row (ev.y) + 1;
1285
1248 if (ev.type == MotionNotify) 1286 if (ev.type == MotionNotify)
1249 { 1287 {
1250 if (x == mouse_row && y == mouse_col) 1288 if (x == mouse_row && y == mouse_col)
1251 return; 1289 return;
1290
1252 mouse_row = x; 1291 mouse_row = x;
1253 mouse_col = y; 1292 mouse_col = y;
1254 code += 32; 1293 code += 32;
1255 } 1294 }
1256 1295
… …
1259 else 1298 else
1260 { 1299 {
1261 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1302 if (button_number >= 3)
1264 button_number += (64 - 3); 1303 button_number += 64 - 3;
1265 } 1304 }
1266 1305
1267 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1268 { 1307 {
1269 /* 1308 /*
… …
1301 fputc ('A', stderr); 1340 fputc ('A', stderr);
1302 if (key_state & 32) 1341 if (key_state & 32)
1303 fputc ('2', stderr); 1342 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1344 button_number,
1306 x + 1, 1345 x,
1307 y + 1); 1346 y);
1308#endif 1347#endif
1309 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1310 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1363 code + button_number + key_state,
1312 (32 + x + 1), 1364 32 + x,
1313 (32 + y + 1)); 1365 32 + y);
1314} 1366}
1315 1367
1316/*{{{ process an X event */ 1368/*{{{ process an X event */
1317void 1369void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1319{ 1371{
1320 make_current (); 1372 make_current ();
1321 1373
1322 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1472 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1473 focus_out ();
1422 break; 1474 break;
1423 1475
1424 case ConfigureNotify: 1476 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1429 { 1478 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1432 1514
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1516 {
1435 seen_resize = 1; 1517 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1519 }
1438 else 1520 else
1439 { 1521 {
1440#ifdef HAVE_BG_PIXMAP 1522#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1523 if (moved)
1444 update_background (); 1524 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1525#endif
1449 } 1526 }
1450 1527
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1529 }
1453 break; 1530 break;
1454 1531
1455 case PropertyNotify: 1532 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1534 break;
1462 1535
1463 case SelectionClear: 1536 case SelectionClear:
1464 selection_clear (); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1538 break;
1471 1539
1472 case SelectionRequest: 1540 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1474 break; 1542 break;
1475 1543
1476 case MapNotify: 1544 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1545#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1546 // This is needed at startup for the case of no window manager
1479 * non-reparenting window manager. In those cases we never get first 1547 // or a non-reparenting window manager and also because we
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1548 // defer bg image updates if the window is not mapped. The
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1549 // short delay is to optimize for multiple ConfigureNotify
1482 * reparenting. 1550 // events at startup when the window manager reparents the
1483 * We should not render background immidiately, as there could be several 1551 // window, so as to perform the computation after we have
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1552 // received all of them.
1485 * by scheduling background redraw as soon as we can, but giving a short 1553 if (bg_img == 0)
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025); 1554 update_background_ev.start (0.025);
1492#endif 1555#endif
1493 mapped = 1; 1556 mapped = 1;
1494#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1558 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1511 { 1574 {
1512 do 1575 do
1513 { 1576 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1579 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1581
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1583
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1585 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1588 }
1526 1589
1527 want_refresh = 1; 1590 want_refresh = 1;
1528 } 1591 }
1529 else 1592 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1599 ;
1537 1600
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1602 {
1540 scrollBar.state = STATE_IDLE; 1603 scrollBar.state = SB_STATE_IDLE;
1541 scrollBar.show (0); 1604 scrollBar.show (0);
1542 } 1605 }
1543 } 1606 }
1544 break; 1607 break;
1545 1608
… …
1587 1650
1588#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1654 {
1655 page_dirn scroll_selection_dir;
1592 int dist; 1656 int dist;
1593 1657
1594 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1596 */ 1660 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1612 } 1676 }
1613 else 1677 else
1614 { 1678 {
1615 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1681 }
1618 1682
1619 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1685 + 1;
1622 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1624 } 1689 }
1625 else 1690 else
1626 { 1691 {
1627 /* we are within the text window, so we 1692 /* we are within the text window, so we
1628 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1633#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1634 } 1699 }
1635#endif 1700#endif
1636 } 1701 }
1637 } 1702 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1704 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1642 ; 1707 ;
1643 1708
1644 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1713 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1715 scrollBar.size ());
1651 want_refresh = 1; 1716 want_refresh = 1;
1652 scrollBar.show (1); 1717 scrollBar.show (1);
1653 } 1718 }
1654 break; 1719 break;
1655 } 1720 }
1656 1721
1657#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1724 cursor_blink_reset ();
1667 }
1668#endif 1725#endif
1669 1726
1670#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1729 {
… …
1682#endif 1739#endif
1683 1740
1684 refresh_check (); 1741 refresh_check ();
1685} 1742}
1686 1743
1687void 1744#if ENABLE_FRILLS
1745void ecb_cold
1746rxvt_term::set_urgency (bool enable)
1747{
1748 if (enable == urgency_hint)
1749 return;
1750
1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1752 {
1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1754 XSetWMHints (dpy, parent, h);
1755 urgency_hint = enable;
1756 XFree (h);
1757 }
1758}
1759#endif
1760
1761void ecb_cold
1688rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1689{ 1763{
1690 if (!focus) 1764 if (!focus)
1691 { 1765 {
1692 focus = 1; 1766 focus = 1;
1693 want_refresh = 1; 1767 want_refresh = 1;
1694 1768
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1769#if USE_XIM
1698 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1699 { 1771 {
1700 IMSetPosition (); 1772 im_set_position ();
1701 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1702 } 1774 }
1703#endif 1775#endif
1704#if CURSOR_BLINK 1776#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1784 scr_recolour ();
1713 } 1785 }
1714#endif 1786#endif
1715#if ENABLE_FRILLS 1787#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1788 if (option (Opt_urgentOnBell))
1717 { 1789 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1790#endif
1725 }
1726}
1727 1791
1728void 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 }
1794}
1795
1796void ecb_cold
1729rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1730{ 1798{
1731 if (focus) 1799 if (focus)
1732 { 1800 {
1733 focus = 0; 1801 focus = 0;
1734 want_refresh = 1; 1802 want_refresh = 1;
1735 1803
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1804#if ENABLE_FRILLS
1737 1805 if (option (Opt_urgentOnBell))
1806 set_urgency (0);
1807#endif
1738#if ENABLE_FRILLS || ISO_14755 1808#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1809 if (iso14755buf)
1740 { 1810 {
1741 iso14755buf = 0; 1811 iso14755buf = 0;
1742# if ISO_14755 1812# if ISO_14755
… …
1759 { 1829 {
1760 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1831 scr_recolour ();
1762 } 1832 }
1763#endif 1833#endif
1764 }
1765}
1766 1834
1767void 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 }
1837}
1838
1839void ecb_cold
1768rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1769{ 1841{
1770#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1772 { 1844 {
… …
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 } 1848 }
1777#endif 1849#endif
1778} 1850}
1779 1851
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1853void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1855{
1784 make_current (); 1856 make_current ();
1785 1857
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return; 1860 return;
1789 1861
1790# if ENABLE_TRANSPARENCY
1791 switch (ev.type) 1862 switch (ev.type)
1792 { 1863 {
1793 case PropertyNotify: 1864 case PropertyNotify:
1794 /* 1865 /*
1795 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1796 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1797 */ 1868 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1871 {
1801 bgPixmap.set_root_pixmap (); 1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1802 update_background (); 1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1803 } 1880 }
1804 1881
1805 break; 1882 break;
1806 } 1883 }
1807# endif
1808 1884
1809 refresh_check (); 1885 refresh_check ();
1810} 1886}
1811#endif 1887#endif
1812 1888
… …
1835 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1836 return; 1912 return;
1837 } 1913 }
1838#endif 1914#endif
1839 1915
1840 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1841 1917
1842 if (reportmode) 1918 if (reportmode)
1843 { 1919 {
1844 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1845 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1922 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1923#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1924 if (ev.button == MEvent.button && clickintime)
1849 { 1925 {
1850 /* same button, within alloted time */ 1926 /* same button, within allowed time */
1851 MEvent.clicks++; 1927 MEvent.clicks++;
1852 1928
1853 if (MEvent.clicks > 1) 1929 if (MEvent.clicks > 1)
1854 { 1930 {
1855 /* only report double clicks */ 1931 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 2012 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 2013 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 2014 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 2015 direction = DN; /* down */
1940 2016
1941 scrollBar.state = STATE_IDLE; 2017 scrollBar.state = SB_STATE_IDLE;
1942 /* 2018 /*
1943 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 2020 * move up if mouse is above slider
1945 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1946 * 2022 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2062#endif
1987 if (scr_page (direction, 1)) 2063 if (scr_page (direction, 1))
1988 { 2064 {
1989 if (direction == UP) 2065 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2066 scrollBar.state = SB_STATE_UP;
1991 else 2067 else
1992 scrollBar.state = STATE_DOWN; 2068 scrollBar.state = SB_STATE_DOWN;
1993 } 2069 }
1994 } 2070 }
1995 else 2071 else
1996 switch (ev.button) 2072 switch (ev.button)
1997 { 2073 {
1998 case Button2: 2074 case Button2:
1999 switch (scrollBar.align) 2075 switch (scrollBar.align)
2000 { 2076 {
2001 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2002 csrO = 0; 2078 csrO = 0;
2003 break; 2079 break;
2004 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2082 break;
2007 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2085 break;
2010 } 2086 }
2011 2087
2012 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2092
2017 scrollBar.state = STATE_MOTION; 2093 scrollBar.state = SB_STATE_MOTION;
2018 break; 2094 break;
2019 2095
2020 case Button1: 2096 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2024 2100
2025 case Button3: 2101 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2103 {
2028 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2031# else 2107# else
2032 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2033# endif 2109# endif
2034 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2037# else 2113# else
2038 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2039# endif 2115# endif
2040 else 2116 else
2041 scrollBar.state = STATE_MOTION; 2117 scrollBar.state = SB_STATE_MOTION;
2042 } 2118 }
2043 else 2119 else
2044 { 2120 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2122 (nrow
2047 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2048 / scrollBar.size ())); 2124 / scrollBar.size ()));
2049 } 2125 }
2050 2126
2051 break; 2127 break;
2052 } 2128 }
… …
2063 2139
2064 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2141 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2143
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2145 {
2070 scrollBar.state = STATE_IDLE; 2146 scrollBar.state = SB_STATE_IDLE;
2071 scrollBar.show (0); 2147 scrollBar.show (0);
2072 } 2148 }
2073 2149
2074#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
… …
2095#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2096 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2097 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2098 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2099 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2100 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2101 { 2177 {
2102 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2103 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2104 mouse_report (ev); 2180 mouse_report (ev);
2105 } 2181 }
… …
2125 case Button3: 2201 case Button3:
2126 selection_make (ev.time); 2202 selection_make (ev.time);
2127 break; 2203 break;
2128 2204
2129 case Button2: 2205 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2208 break;
2133 2209
2134#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2135 case Button4: 2211 case Button4:
2136 case Button5: 2212 case Button5:
2137 { 2213 {
2138 int i; 2214 int lines;
2139 page_dirn v; 2215 page_dirn dirn;
2140 2216
2141 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2142 2218
2143 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2144 i = 1; 2220 lines = 1;
2145 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2222 lines = nrow - 1;
2147 else 2223 else
2148 i = 5; 2224 lines = 5;
2149 2225
2150# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2151 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2152 { 2228 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2231
2157 if (!slip_wheel_ev.is_active ()) 2232 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159 } 2234 }
2160 else 2235 else
2161# endif 2236# endif
2162 { 2237 {
2163 scr_page (v, i); 2238 scr_page (dirn, lines);
2164 scrollBar.show (1); 2239 scrollBar.show (1);
2165 } 2240 }
2166 } 2241 }
2167 break; 2242 break;
2168#endif 2243#endif
… …
2170 } 2245 }
2171} 2246}
2172 2247
2173/*}}} */ 2248/*}}} */
2174 2249
2175bool 2250void ecb_hot
2176rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2177{ 2252{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2181 2255
2182 for (;;) 2256 for (;;)
2183 { 2257 {
2184 if (expect_false (ch == NOCHAR)) 2258 if (ecb_unlikely (ch == NOCHAR))
2185 { 2259 {
2186 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2261 ch = next_char ();
2188 2262
2189 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2190 break; 2264 break;
2191 } 2265 }
2192 2266
2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2268 {
2195 if (expect_false (!seen_input)) 2269 if (ecb_unlikely (!seen_input))
2196 { 2270 {
2197 seen_input = 1; 2271 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2287 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2289
2216 for (;;) 2290 for (;;)
2217 { 2291 {
2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2293 break;
2220 2294
2221 *str++ = ch; 2295 *str++ = ch;
2222 2296
2223 if (expect_false (ch == C0_LF || str >= eol)) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2298 {
2225 if (ch == C0_LF) 2299 if (ch == C0_LF)
2226 nlines++; 2300 nlines++;
2227 2301
2228 refresh_count++; 2302 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2351 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2352 * if skipScroll is enabled.
2279 */ 2353 */
2280 if (refreshnow) 2354 if (refreshnow)
2281 { 2355 {
2282 flag = true;
2283 scr_refresh (); 2356 scr_refresh ();
2284 want_refresh = 1; 2357 want_refresh = 1;
2285 } 2358 }
2286
2287 } 2359 }
2288 else 2360 else
2289 { 2361 {
2290 try 2362 try
2291 { 2363 {
… …
2299 } 2371 }
2300 2372
2301 ch = NOCHAR; 2373 ch = NOCHAR;
2302 } 2374 }
2303 } 2375 }
2304
2305 return flag;
2306} 2376}
2307 2377
2308// read the next character 2378// read the next character
2309wchar_t 2379wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2311{ 2381{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2383 {
2314 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2317 2387
2318 wchar_t wc; 2388 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2390
… …
2325 break; 2395 break;
2326 } 2396 }
2327 2397
2328 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2329 { 2399 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 } 2404 }
2333 2405
2334 // assume wchar == unicode 2406 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
… …
2338 2410
2339 return NOCHAR; 2411 return NOCHAR;
2340} 2412}
2341 2413
2342// read the next octet 2414// read the next octet
2343uint32_t 2415uint32_t ecb_hot
2344rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2345{ 2417{
2346 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2347 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2348 : NOCHAR; 2420 : NOCHAR;
2349} 2421}
2350 2422
2351static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2352 2424
2353/* rxvt_cmd_getc () - Return next input character */ 2425wchar_t ecb_hot
2354/*
2355 * Return the next input character after first passing any keyboard input
2356 * to the command.
2357 */
2358wchar_t
2359rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2360{ 2427{
2361 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2362 2429
2363 if (c == NOCHAR) 2430 if (c == NOCHAR)
2364 throw out_of_input; 2431 throw out_of_input;
2365 2432
2366 return c; 2433 return c;
2367} 2434}
2368 2435
2369uint32_t 2436uint32_t ecb_hot
2370rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2371{ 2438{
2372 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2373 2440
2374 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2378} 2445}
2379 2446
2380/*{{{ print pipe */ 2447/*{{{ print pipe */
2381/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2382#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2383FILE * 2450FILE * ecb_cold
2384rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2385{ 2452{
2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2387 2454
2388 if (stream == NULL) 2455 if (stream == NULL)
2389 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2390 2457
2391 return stream; 2458 return stream;
2392} 2459}
2393 2460
2394int 2461int ecb_cold
2395rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2396{ 2463{
2397 fflush (stream); 2464 fflush (stream);
2398 return pclose (stream); 2465 return pclose (stream);
2399} 2466}
2400 2467
2401/* 2468/*
2402 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2403 */ 2470 */
2404void 2471void ecb_cold
2405rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2406{ 2473{
2407 FILE *fd = popen_printer (); 2474 FILE *fd = popen_printer ();
2408 2475
2409 if (!fd) 2476 if (!fd)
… …
2455 pclose_printer (fd); 2522 pclose_printer (fd);
2456} 2523}
2457#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
2458/*}}} */ 2525/*}}} */
2459 2526
2460/* *INDENT-OFF* */
2461enum { 2527enum {
2462 C1_40 = 0x40, 2528 C1_40 = 0x40,
2463 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2464 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2465 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2466 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2467}; 2533};
2468/* *INDENT-ON* */
2469 2534
2470/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2471void 2536void ecb_hot
2472rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2473{ 2538{
2474 switch (ch) 2539 switch (ch)
2475 { 2540 {
2476 case C0_ESC: 2541 case C0_ESC:
… …
2522} 2587}
2523/*}}} */ 2588/*}}} */
2524 2589
2525 2590
2526/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
2527void 2592void ecb_cold
2528rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
2529{ 2594{
2530 int row, col; 2595 int row, col;
2531 2596
2532 switch (ch) 2597 switch (ch)
… …
2566 break; 2631 break;
2567 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2569 break; 2634 break;
2570 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
2571 set_privmode (PrivMode_vt52, 0); 2636 priv_modes &= ~PrivMode_vt52;
2572 break; 2637 break;
2573 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
2574 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
2575 /* unimplemented */ 2640 /* unimplemented */
2576 break; 2641 break;
… …
2582} 2647}
2583/*}}} */ 2648/*}}} */
2584 2649
2585 2650
2586/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
2587void 2652void ecb_hot
2588rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
2589{ 2654{
2590 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
2591 2656
2592 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
2595 return; 2660 return;
2596 } 2661 }
2597 2662
2598 switch (ch) 2663 switch (ch)
2599 { 2664 {
2600 /* case 1: do_tek_mode (); break; */
2601 case '#': 2665 case '#':
2602 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
2603 scr_E (); 2667 scr_E ();
2604 break; 2668 break;
2605 case '(': 2669 case '(':
… …
2628#if !ENABLE_MINIMAL 2692#if !ENABLE_MINIMAL
2629 case '9': 2693 case '9':
2630 scr_forwardindex (); 2694 scr_forwardindex ();
2631 break; 2695 break;
2632#endif 2696#endif
2697 // DECPAM/DECPNM
2633 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
2634 case '>': 2701 case '>':
2635 set_privmode (PrivMode_aplKP, ch == '='); 2702 priv_modes &= ~PrivMode_aplKP;
2636 break; 2703 break;
2637 2704
2638 case C1_40: 2705 case C1_40:
2639 cmd_getc (); 2706 cmd_getc ();
2640 break; 2707 break;
… …
2644 2711
2645 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
2646 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
2647 { 2714 {
2648 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
2649 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2650 } 2717 }
2651 break; 2718 break;
2652 2719
2653 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
2654 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
2655 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2656 break; 2725 break;
2657 2726
2658 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
2659 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
2660 scr_set_tab (1); 2729 scr_set_tab (1);
… …
2664 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
2665 scr_index (DN); 2734 scr_index (DN);
2666 break; 2735 break;
2667 2736
2668 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
2669 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
2670 2739
2671 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
2672 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
2673 2742
2674 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
2675 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
2676 process_dcs_seq (); 2745 process_dcs_seq ();
2677 break; 2746 break;
… …
2679 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2748 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680 case C1_SCI: /* ESC Z */ 2749 case C1_SCI: /* ESC Z */
2681 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2750 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682 break; /* steal obsolete ESC [ c */ 2751 break; /* steal obsolete ESC [ c */
2683 2752
2684 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2753 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685 case C1_CSI: /* ESC [ */ 2754 case C1_CSI: /* ESC [ */
2686 process_csi_seq (); 2755 process_csi_seq ();
2687 break; 2756 break;
2688 2757
2689 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2758 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690 case C1_OSC: /* ESC ] */ 2759 case C1_OSC: /* ESC ] */
2691 process_osc_seq (); 2760 process_osc_seq ();
2692 break; 2761 break;
2693 2762
2694 /* 8.3.106: RESET TO INITIAL STATE */ 2763 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695 case 'c': 2764 case 'c':
2696 mbstate.reset (); 2765 mbstate.reset ();
2697 scr_poweron (); 2766 scr_poweron ();
2698 scrollBar.show (1); 2767 scrollBar.show (1);
2699 break; 2768 break;
… …
2710 } 2779 }
2711} 2780}
2712/*}}} */ 2781/*}}} */
2713 2782
2714/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2715/* *INDENT-OFF* */
2716enum { 2784enum {
2717 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
2718 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2719 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2720 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2723 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2724 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2725 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2726}; 2794};
2727 2795
2728#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2796#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2729 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2730 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2731#define get_byte_array_bit(array, bit) \ 2799#define get_byte_array_bit(array, bit) \
2732 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2800 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2733 2801
2734const unsigned char csi_defaults[] = 2802static const unsigned char csi_defaults[] =
2735 { 2803 {
2736 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2737 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2738 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2739 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2740 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2741 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2742 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2743 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2744 }; 2812 };
2745/* *INDENT-ON* */
2746 2813
2747void 2814void ecb_hot
2748rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2749{ 2816{
2750 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2751 unsigned int nargs, p; 2818 unsigned int nargs, p;
2752 int n, ndef; 2819 int n, ndef;
2753 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2754 2821
2755 nargs = 0; 2822 nargs = 0;
2756 2823
2757 priv = 0; 2824 priv = 0;
2758 ch = cmd_getc (); 2825 ch = cmd_getc ();
2759 if (ch >= '<' && ch <= '?') 2826 if ((ch >= '<' && ch <= '?') || ch == '!')
2760 { 2827 {
2761 /* '<' '=' '>' '?' */ 2828 /* '<' '=' '>' '?' '!' */
2762 priv = ch; 2829 priv = ch;
2763 ch = cmd_getc (); 2830 ch = cmd_getc ();
2764 } 2831 }
2765 2832
2833 prev_ch = 0;
2766 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2767 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2768 { 2836 {
2769 if (isdigit (ch)) 2837 if (isdigit (ch))
2770 { 2838 {
… …
2780 n = -1; 2848 n = -1;
2781 } 2849 }
2782 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2783 process_nonprinting (ch); 2851 process_nonprinting (ch);
2784 2852
2853 prev_ch = ch;
2785 ch = cmd_getc (); 2854 ch = cmd_getc ();
2786 } 2855 }
2787 2856
2788 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2789 return; 2858 return;
… …
2820 2889
2821 case '?': 2890 case '?':
2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2823 process_terminal_mode (ch, priv, nargs, arg); 2892 process_terminal_mode (ch, priv, nargs, arg);
2824 break; 2893 break;
2894
2895 case '!':
2896 if (ch == CSI_70)
2897 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset ();
2900
2901 static const int pm_h[] = { 7, 25 };
2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2903
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2825 } 2906 }
2907 break;
2908 }
2909
2826 return; 2910 return;
2827 } 2911 }
2828 2912
2829 switch (ch) 2913 switch (ch)
2830 { 2914 {
… …
2844 } 2928 }
2845 break; 2929 break;
2846#endif 2930#endif
2847 2931
2848 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2849 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2850 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
2851 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
2852 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2853 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2854 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
2855 break; 2939 break;
2856 2940
2857 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2858 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3008 scr_insert_mode (1); 3092 scr_insert_mode (1);
3009 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3010 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3011 break; 3095 break;
3012 3096
3097 case CSI_71: // DESCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3013 /* 3102 /*
3014 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3015 */ 3104 */
3016 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3017 if (nargs == 1) 3106 if (nargs == 1)
… …
3045 } 3134 }
3046} 3135}
3047/*}}} */ 3136/*}}} */
3048 3137
3049#if !ENABLE_MINIMAL 3138#if !ENABLE_MINIMAL
3050/* ARGSUSED */
3051void 3139void
3052rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3053{ 3141{
3054 int x, y; 3142 int x, y;
3055 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
… …
3064 { 3152 {
3065 /* 3153 /*
3066 * commands 3154 * commands
3067 */ 3155 */
3068 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3069 XMapWindow (dpy, parent[0]); 3157 XMapWindow (dpy, parent);
3070 break; 3158 break;
3071 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3072 XIconifyWindow (dpy, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3073 break; 3161 break;
3074 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3075 XMoveWindow (dpy, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3076 break; 3164 break;
3077 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3079 break; 3167 break;
3080 case 5: /* raise window */ 3168 case 5: /* raise window */
3081 XRaiseWindow (dpy, parent[0]); 3169 XRaiseWindow (dpy, parent);
3082 break; 3170 break;
3083 case 6: /* lower window */ 3171 case 6: /* lower window */
3084 XLowerWindow (dpy, parent[0]); 3172 XLowerWindow (dpy, parent);
3085 break; 3173 break;
3086 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3087 scr_touch (true); 3175 scr_touch (true);
3088 break; 3176 break;
3089 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3092 break; 3180 break;
3093 3181
3094 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3095 default: 3183 default:
3096 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3097 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3098 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3099 break; 3187 break;
3100 3188
3101 /* 3189 /*
3102 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3103 */ 3191 */
3104 case 11: /* report window state */ 3192 case 11: /* report window state */
3105 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3107 break; 3195 break;
3108 case 13: /* report window position */ 3196 case 13: /* report window position */
3109 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3110 XTranslateCoordinates (dpy, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3111 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3112 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3113 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3114 break; 3202 break;
3115 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3116 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3118 break; 3206 break;
3119 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3120 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3121 break; 3209 break;
… …
3123 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3124 break; 3212 break;
3125 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3126 { 3214 {
3127 char *s; 3215 char *s;
3128 XGetIconName (dpy, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3130 XFree (s); 3218 XFree (s);
3131 } 3219 }
3132 break; 3220 break;
3133 case 21: /* report window title */ 3221 case 21: /* report window title */
3134 { 3222 {
3135 char *s; 3223 char *s;
3136 XFetchName (dpy, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3226 XFree (s);
3139 } 3227 }
3140 break; 3228 break;
3141 } 3229 }
… …
3151rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3152{ 3240{
3153 unicode_t ch; 3241 unicode_t ch;
3154 bool seen_esc = false; 3242 bool seen_esc = false;
3155 unsigned int n = 0; 3243 unsigned int n = 0;
3156 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3157 3245
3158 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3159 { 3247 {
3160 if (seen_esc) 3248 if (seen_esc)
3161 { 3249 {
… …
3176 else if (ch < 0x20) 3264 else if (ch < 0x20)
3177 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3178 3266
3179 seen_esc = false; 3267 seen_esc = false;
3180 3268
3181 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3182 // stop at some sane length 3270 // stop at some sane length
3183 return NULL; 3271 return NULL;
3184 3272
3185 string[n++] = ch; 3273 string[n++] = ch;
3186 } 3274 }
… …
3197 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3198 */ 3286 */
3199void 3287void
3200rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3201{ 3289{
3202 char *s;
3203 unicode_t eh;
3204
3205 /* 3290 /*
3206 * Not handled yet 3291 * Not handled yet
3207 */ 3292 */
3293
3294 unicode_t eh;
3208 s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3209 if (s) 3296 if (s)
3210 free (s); 3297 free (s);
3211 3298
3212 return; 3299 return;
3213} 3300}
… …
3217 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3218 */ 3305 */
3219void 3306void
3220rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3221{ 3308{
3222 unicode_t ch, eh;
3223 int arg; 3309 int arg;
3224 3310
3225 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3226 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3227 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3228 3314
3229 if (ch == ';') 3315 if (ch == ';')
3230 { 3316 {
3317 unicode_t eh;
3231 char *s = get_to_st (eh); 3318 char *s = get_to_st (eh);
3232 3319
3233 if (s) 3320 if (s)
3234 { 3321 {
3235 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, eh);
… …
3259 3346
3260/* 3347/*
3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3262 */ 3349 */
3263void 3350void
3264rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3351rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265{ 3352{
3266 int color; 3353 int color;
3267 char *buf, *name; 3354 char *buf, *name;
3268 bool query = str[0] == '?' && !str[1]; 3355 bool query = str[0] == '?' && !str[1];
3269 int saveop = op; 3356 int saveop = op;
… …
3296 unsigned long bytes_after; 3383 unsigned long bytes_after;
3297 unsigned char *value = 0; 3384 unsigned char *value = 0;
3298 const char *str = ""; 3385 const char *str = "";
3299 3386
3300 if (prop 3387 if (prop
3301 && XGetWindowProperty (dpy, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3302 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3303 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3304 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3305 && actual_type != None 3392 && actual_type != None
3306 && actual_format == 8) 3393 && actual_format == 8)
3307 str = (const char *)(value); 3394 str = (const char *)(value);
3308 3395
3309 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3310 3397
3311 XFree (value); 3398 XFree (value);
3312 } 3399 }
3313 else 3400 else
3314 { 3401 {
3315 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3402 char *eq = strchr (str, '=');
3316 3403
3317 if (eq) 3404 if (eq)
3318 { 3405 {
3319 *eq = 0; 3406 *eq = 0;
3320 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3321 } 3408 }
3322 else 3409 else
3323 XDeleteProperty (dpy, parent[0], 3410 XDeleteProperty (dpy, parent,
3324 display->atom (str)); 3411 display->atom (str));
3325 } 3412 }
3326 break; 3413 break;
3327 3414
3328 case XTerm_Color: 3415 case XTerm_Color:
… …
3360 process_color_seq (op, Color_pointer_fg, str, resp); 3447 process_color_seq (op, Color_pointer_fg, str, resp);
3361 break; 3448 break;
3362 case XTerm_Color_pointer_bg: 3449 case XTerm_Color_pointer_bg:
3363 process_color_seq (op, Color_pointer_bg, str, resp); 3450 process_color_seq (op, Color_pointer_bg, str, resp);
3364 break; 3451 break;
3452#ifdef OPTION_HC
3453 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp);
3455 break;
3456 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp);
3458 break;
3459#endif
3365#ifndef NO_BOLD_UNDERLINE_REVERSE 3460#ifndef NO_BOLD_UNDERLINE_REVERSE
3366 case XTerm_Color_RV:
3367 process_color_seq (op, Color_RV, str, resp);
3368 break;
3369 case Rxvt_Color_BD:
3370 case URxvt_Color_BD: 3461 case URxvt_Color_BD:
3371 process_color_seq (op, Color_BD, str, resp); 3462 process_color_seq (op, Color_BD, str, resp);
3372 break; 3463 break;
3373 case Rxvt_Color_UL:
3374 case URxvt_Color_UL: 3464 case URxvt_Color_UL:
3375 process_color_seq (op, Color_UL, str, resp); 3465 process_color_seq (op, Color_UL, str, resp);
3376 break; 3466 break;
3377 case URxvt_Color_IT: 3467 case URxvt_Color_IT:
3378 process_color_seq (op, Color_IT, str, resp); 3468 process_color_seq (op, Color_IT, str, resp);
3379 break; 3469 break;
3380#endif 3470#endif
3381#if ENABLE_TRANSPARENCY 3471 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp);
3473 break;
3474
3475#if BG_IMAGE_FROM_ROOT
3382 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3383 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3384 { 3478 {
3385 bool changed = false; 3479 bool changed = false;
3386 3480
3387 if (ISSET_PIXCOLOR (Color_tint)) 3481 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391 3483
3392 if (changed) 3484 if (changed)
3393 update_background (); 3485 update_background ();
3394 } 3486 }
3395 3487
… …
3399#if BG_IMAGE_FROM_FILE 3491#if BG_IMAGE_FROM_FILE
3400 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3401 if (!strcmp (str, "?")) 3493 if (!strcmp (str, "?"))
3402 { 3494 {
3403 char str[256]; 3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3404 3500
3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3501 sprintf (str, "[%dx%d+%d+%d]",
3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3502 h_scale, v_scale,
3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3503 h_align, v_align);
3408 process_xterm_seq (XTerm_title, str, CHAR_ST); 3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3409 } 3505 }
3410 else 3506 else
3411 { 3507 {
3412 int changed = 0; 3508 bool changed = false;
3413 3509
3414 if (*str != ';') 3510 if (*str != ';')
3415 { 3511 {
3416 /* reset to default scaling :*/ 3512 try
3417 bgPixmap.unset_geometry (); 3513 {
3418 if (bgPixmap.set_file (str)) /* change pixmap */ 3514 fimage.set_file_geometry (this, str);
3419 changed++; 3515 changed = true;
3420 str = strchr (str, ';'); 3516 }
3421 if (str == NULL) 3517 catch (const class rxvt_failure_exception &e)
3422 bgPixmap.set_defaultGeometry (); 3518 {
3519 }
3423 } 3520 }
3424 3521 else
3425 while (str)
3426 { 3522 {
3427 str++; 3523 str++;
3428 if (bgPixmap.set_geometry (str)) 3524 if (fimage.set_geometry (str, true))
3429 changed++; 3525 changed = true;
3430 str = strchr (str, ';');
3431 } 3526 }
3432 3527
3433 if (changed) 3528 if (changed)
3529 {
3530 if (bg_window_position_sensitive ())
3531 {
3532 int x, y;
3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3434 update_background (); 3537 update_background ();
3538 }
3435 } 3539 }
3436 break; 3540 break;
3437#endif 3541#endif
3438 3542
3439 case XTerm_logfile: 3543 case XTerm_logfile:
… …
3509 break; 3613 break;
3510#endif 3614#endif
3511 3615
3512#if ENABLE_PERL 3616#if ENABLE_PERL
3513 case URxvt_perl: 3617 case URxvt_perl:
3514 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3515 ; // no responses yet
3516 break; 3619 break;
3517#endif 3620#endif
3518 } 3621 }
3519} 3622}
3520/*----------------------------------------------------------------------*/ 3623/*----------------------------------------------------------------------*/
… …
3527 * 's' = save 3630 * 's' = save
3528 * 'r' = restore 3631 * 'r' = restore
3529 * 't' = toggle 3632 * 't' = toggle
3530 * so no need for fancy checking 3633 * so no need for fancy checking
3531 */ 3634 */
3532int 3635int ecb_cold
3533rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
3534{ 3637{
3535 int state; 3638 int state;
3536 3639
3537 if (mode == 's') 3640 if (mode == 's')
3538 { 3641 {
3539 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
3540 return -1; 3646 return -1;
3541 } 3647 }
3542 else 3648 else
3543 { 3649 {
3544 if (mode == 'r') 3650 if (mode == 'r')
3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3546 else 3652 else
3547 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3548 set_privmode (bit, state); 3654
3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
3549 } 3659 }
3550 3660
3551 return state; 3661 return state;
3552} 3662}
3553 3663
3554/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
3555void 3665void
3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3557{ 3667{
3558 unsigned int i, j; 3668 unsigned int i, j;
3559 int state; 3669 int state;
3560 3670
3561 static const struct 3671 static const struct
3562 { 3672 {
3563 const int argval; 3673 const int argval;
3564 const unsigned long bit; 3674 const unsigned long bit;
3565 } argtopriv[] = { 3675 } argtopriv[] = {
3566 { 1, PrivMode_aplCUR }, 3676 { 1, PrivMode_aplCUR }, // DECCKM
3567 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
3568 { 3, PrivMode_132 }, 3678 { 3, PrivMode_132 }, // DECCOLM
3569 { 4, PrivMode_smoothScroll }, 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
3570 { 5, PrivMode_rVideo }, 3680 { 5, PrivMode_rVideo }, // DECSCNM
3571 { 6, PrivMode_relOrigin }, 3681 { 6, PrivMode_relOrigin }, // DECOM
3572 { 7, PrivMode_Autowrap }, 3682 { 7, PrivMode_Autowrap }, // DECAWM
3573 // 8, bi-directional support mode 3683 // 8, auto-repeat keys // DECARM
3574 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3575 // 18, 19 printing-related 3685 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region
3576 { 25, PrivMode_VisibleCursor }, 3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3577#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
3578 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
3579#endif 3690#endif
3580 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3692 // 38, tektronix mode // DECTEK
3581 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
3582 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
3583 // 45 margin bell NYI 3695 // 45 margin bell NYI
3584 // 46 start logging 3696 // 46 start logging
3585 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
3586 { 66, PrivMode_aplKP }, 3698 { 66, PrivMode_aplKP }, // DECNKM
3587#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
3588 { 67, PrivMode_BackSpace }, 3700 { 67, PrivMode_BackSpace }, // DECBKM
3589#endif 3701#endif
3590 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
3591 { 1002, PrivMode_MouseBtnEvent }, 3703 { 1002, PrivMode_MouseBtnEvent },
3592 { 1003, PrivMode_MouseAnyEvent }, 3704 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS
3706 { 1005, PrivMode_ExtModeMouse },
3707#endif
3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3594 { 1011, PrivMode_Keypress }, // rxvt extension 3709 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3712#endif
3595 // 1035 enable modifiers for alt, numlock NYI 3713 // 1035 enable modifiers for alt, numlock NYI
3596 // 1036 send ESC for meta keys NYI 3714 // 1036 send ESC for meta keys NYI
3597 // 1037 send DEL for keypad delete NYI 3715 // 1037 send DEL for keypad delete NYI
3598 { 1047, PrivMode_Screen }, 3716 { 1047, PrivMode_Screen },
3599 // 1048 save and restore cursor 3717 // 1048 save and restore cursor, implemented in code
3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste }, 3720 { 2004, PrivMode_BracketPaste },
3603 }; 3721 };
3604 3722
… …
3614 for (i = 0; i < nargs; i++) 3732 for (i = 0; i < nargs; i++)
3615 { 3733 {
3616 state = -1; 3734 state = -1;
3617 3735
3618 /* basic handling */ 3736 /* basic handling */
3619 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3737 for (j = 0; j < ecb_array_length (argtopriv); j++)
3620 if (argtopriv[j].argval == arg[i]) 3738 if (argtopriv[j].argval == arg[i])
3621 { 3739 {
3622 state = privcases (mode, argtopriv[j].bit); 3740 state = privcases (mode, argtopriv[j].bit);
3623 break; 3741 break;
3624 } 3742 }
… …
3632 3750
3633 scr_touch (true); 3751 scr_touch (true);
3634 break; 3752 break;
3635#endif 3753#endif
3636 case 1048: /* alternative cursor save */ 3754 case 1048: /* alternative cursor save */
3637 case 1049:
3638 if (option (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
3639 if (mode == 0) 3756 if (mode == 0)
3640 scr_cursor (RESTORE); 3757 scr_cursor (RESTORE);
3641 else if (mode == 1) 3758 else if (mode == 1)
3642 scr_cursor (SAVE); 3759 scr_cursor (SAVE);
… …
3651 case 2: /* VT52 mode */ 3768 case 2: /* VT52 mode */
3652 /* oddball mode. should be set regardless of set/reset 3769 /* oddball mode. should be set regardless of set/reset
3653 * parameter. Return from VT52 mode with an ESC < from 3770 * parameter. Return from VT52 mode with an ESC < from
3654 * within VT52 mode 3771 * within VT52 mode
3655 */ 3772 */
3656 set_privmode (PrivMode_vt52, 1); 3773 priv_modes |= PrivMode_vt52;
3657 break; 3774 break;
3658 case 3: /* 80/132 */ 3775 case 3: /* 80/132 */
3659 if (priv_modes & PrivMode_132OK) 3776 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3777 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3663 }
3664 break; 3778 break;
3665 case 4: /* smooth scrolling */ 3779 case 4: /* smooth scrolling */
3666 set_option (Opt_jumpScroll, !state); 3780 set_option (Opt_jumpScroll, !state);
3667 break; 3781 break;
3668 case 5: /* reverse video */ 3782 case 5: /* reverse video */
… …
3679 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3794 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3681 break; 3795 break;
3682#ifdef scrollBar_esc 3796#ifdef scrollBar_esc
3683 case scrollBar_esc: 3797 case scrollBar_esc:
3684 if (scrollBar.map (state)) 3798 scrollBar.map (state);
3685 {
3686 resize_all_windows (0, 0, 0); 3799 resize_all_windows (0, 0, 0);
3687 scr_touch (true); 3800 scr_touch (true);
3688 }
3689 break; 3801 break;
3690#endif 3802#endif
3691 case 25: /* visible/invisible cursor */ 3803 case 25: /* visible/invisible cursor */
3692 scr_cursor_visible (state); 3804 scr_cursor_visible (state);
3693 break; 3805 break;
… …
3706 case 1003: 3818 case 1003:
3707 if (state) 3819 if (state)
3708 { 3820 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3821 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3822 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3823 mouse_row = mouse_col = 0;
3711 vt_emask_mouse = PointerMotionMask; 3824 vt_emask_mouse = PointerMotionMask;
3712 } 3825 }
3713 else 3826 else
3714 vt_emask_mouse = NoEventMask; 3827 vt_emask_mouse = NoEventMask;
3828
3715 vt_select_input (); 3829 vt_select_input ();
3716 break; 3830 break;
3717 case 1010: /* scroll to bottom on TTY output inhibit */ 3831 case 1010: /* scroll to bottom on TTY output inhibit */
3718 set_option (Opt_scrollTtyOutput, !state); 3832 set_option (Opt_scrollTtyOutput, !state);
3719 break; 3833 break;
3720 case 1011: /* scroll to bottom on key press */ 3834 case 1011: /* scroll to bottom on key press */
3721 set_option (Opt_scrollTtyKeypress, state); 3835 set_option (Opt_scrollTtyKeypress, state);
3722 break; 3836 break;
3723 case 1047: /* secondary screen w/ clearing last */ 3837 case 1047: /* secondary screen w/ clearing last */
3724 if (option (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3839 if (!state)
3726 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841
3727 scr_change_screen (state); 3842 scr_change_screen (state);
3728 break; 3843 break;
3729 case 1049: /* secondary screen w/ clearing first */ 3844 case 1049: /* secondary screen w/ clearing first */
3845 if (option (Opt_secondaryScreen))
3846 if (state)
3847 scr_cursor (SAVE);
3848
3730 scr_change_screen (state); 3849 scr_change_screen (state);
3850
3731 if (option (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3852 if (state)
3733 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854 else
3855 scr_cursor (RESTORE);
3734 break; 3856 break;
3735 default: 3857 default:
3736 break; 3858 break;
3737 } 3859 }
3738 } 3860 }
3739} 3861}
3740/*}}} */ 3862/*}}} */
3741 3863
3742/*{{{ process sgr sequences */ 3864/*{{{ process sgr sequences */
3743void 3865void ecb_hot
3744rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3866rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3745{ 3867{
3746 unsigned int i; 3868 unsigned int i;
3747 short rendset; 3869 short rendset;
3748 int rendstyle; 3870 int rendstyle;
… …
3889 break; 4011 break;
3890#endif 4012#endif
3891 } 4013 }
3892 } 4014 }
3893} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 4))
4021 return;
4022
4023 set_option (Opt_cursorUnderline, style >= 3);
4024
4025#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1));
4027 cursor_blink_reset ();
4028#endif
4029
4030 want_refresh = 1;
4031}
3894/*}}} */ 4032/*}}} */
3895 4033
3896/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3897void
3898rxvt_term::process_graphics ()
3899{
3900 unicode_t ch, cmd = cmd_getc ();
3901
3902 if (cmd == 'Q')
3903 {
3904 /* query graphics */
3905 tt_printf ("\033G0\012"); /* no graphics */
3906 return;
3907 }
3908 /* swallow other graphics sequences until terminating ':' */
3909 do
3910 ch = cmd_getc ();
3911 while (ch != ':');
3912}
3913/*}}} */
3914
3915/* ------------------------------------------------------------------------- */ 4034/* ---------------------------------------------------------------------- */
4035/* Write data to the pty as typed by the user, pasted with the mouse,
4036 * or generated by us in response to a query ESC sequence.
4037 */
3916 4038
3917/* 4039/*
3918 * Send printf () formatted output to the command. 4040 * Send printf () formatted output to the command.
3919 * Only use for small amounts of data. 4041 * Only use for small amounts of data.
3920 */ 4042 */
… …
3928 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4050 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3929 va_end (arg_ptr); 4051 va_end (arg_ptr);
3930 tt_write (buf, strlen (buf)); 4052 tt_write (buf, strlen (buf));
3931} 4053}
3932 4054
3933/* ---------------------------------------------------------------------- */
3934/* Write data to the pty as typed by the user, pasted with the mouse, 4055/* Write data to the pty as typed by the user. */
3935 * or generated by us in response to a query ESC sequence. 4056void
3936 */ 4057rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3937const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4058{
4059 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4060 return;
4061
4062 if (option (Opt_scrollTtyKeypress))
4063 if (view_start)
4064 {
4065 view_start = 0;
4066 want_refresh = 1;
4067 }
4068
4069 tt_write_ (data, len);
4070}
3938 4071
3939void 4072void
3940rxvt_term::tt_write (const char *data, unsigned int len) 4073rxvt_term::tt_write (const char *data, unsigned int len)
3941{ 4074{
3942 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3943 return; 4076 return;
3944 4077
4078 tt_write_ (data, len);
4079}
4080
4081static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4082
4083void
4084rxvt_term::tt_write_ (const char *data, unsigned int len)
4085{
3945 if (pty->pty < 0) 4086 if (pty->pty < 0)
3946 return; 4087 return;
3947 4088
3948 if (v_buflen == 0) 4089 if (v_buflen == 0)
3949 { 4090 {
3950 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4091 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3951 4092
4093 max_it (written, 0);
4094
3952 if ((unsigned int)written == len) 4095 if (written == len)
3953 return; 4096 return;
3954 4097
3955 data += written; 4098 data += written;
3956 len -= written; 4099 len -= written;
3957 } 4100 }
3958 4101
3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4102 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3960 4103
3961 memcpy (v_buffer + v_buflen, data, len); 4104 memcpy (v_buffer + v_buflen, data, len);
3962 v_buflen += len; 4105 v_buflen += len;
3963 4106
3964 pty_ev.set (ev::READ | ev::WRITE); 4107 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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