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.436 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.566 by sf-exg, Sat Sep 12 14:03:35 2015 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 - 5 && 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 }
789 }
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;
580 } 804 }
581 805
582#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 807 // ISO 14755 support
584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
639 { 863 {
640 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
641 return; 865 return;
642 } 866 }
643#endif 867#endif
644
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
682 newlen = 0;
683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
771 newlen = 0;
772 }
773 break;
774 }
775
776 if (newlen)
777 len = strlen (kbuf);
778
779 /*
780 * Pass meta for all function keys, if 'meta' option set
781 */
782#ifdef META8_OPTION
783 if (meta && (meta_char == 0x80) && len > 0)
784 kbuf[len - 1] |= 0x80;
785#endif
786
787 }
788 else if (ctrl && keysym == XK_minus)
789 {
790 len = 1;
791 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
792 }
793 else if (keysym == XK_ISO_Left_Tab)
794 {
795 strcpy (kbuf, "\033[Z");
796 len = 3;
797 }
798 else
799 {
800#ifdef META8_OPTION
801 /* set 8-bit on */
802 if (meta && (meta_char == 0x80))
803 {
804 char *ch;
805
806 for (ch = kbuf; ch < kbuf + len; ch++)
807 *ch |= 0x80;
808
809 meta = 0;
810 }
811#endif
812 /* nil */ ;
813 }
814 } 868 }
815
816 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
817 return;
818 869
819 if (len <= 0) 870 if (len <= 0)
820 return; /* not mapped */ 871 return; /* not mapped */
821 872
822 if (option (Opt_scrollTtyKeypress))
823 if (view_start)
824 {
825 view_start = 0;
826 want_refresh = 1;
827 }
828
829 /*
830 * these modifications only affect the static keybuffer
831 * pass Shift/Control indicators for function keys ending with `~'
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */
844 if (meta
845#ifdef META8_OPTION
846 && meta_char == C0_ESC
847#endif
848 )
849 {
850 const char ch = C0_ESC;
851 tt_write (&ch, 1);
852 }
853
854 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
855} 874}
856 875
857void 876void ecb_cold
858rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
859{ 878{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym; 880 KeySym keysym;
862 881
… …
882 commit_iso14755 (); 901 commit_iso14755 ();
883 902
884 return; 903 return;
885 } 904 }
886 905
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 907 if (i[0] == keysym)
889 { 908 {
890 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 910 commit_iso14755 ();
892 911
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
931#endif 950#endif
932} 951}
933 952
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 953void
968rxvt_term::flush () 954rxvt_term::flush ()
969{ 955{
970 flush_ev.stop (); 956 flush_ev.stop ();
971 957
972#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
973 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
974 { 960 {
975// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 962 scr_touch (false);
977 } 963 }
978#endif 964#endif
979 965
980 if (want_refresh) 966 if (want_refresh)
… …
1017 while (row < end_row); 1003 while (row < end_row);
1018 } 1004 }
1019 1005
1020 scr_refresh (); 1006 scr_refresh ();
1021 scrollBar.show (1); 1007 scrollBar.show (1);
1022#ifdef USE_XIM 1008#if USE_XIM
1023 IMSendSpot (); 1009 im_send_spot ();
1024#endif 1010#endif
1025 } 1011 }
1026 1012
1027 display->flush (); 1013 display->flush ();
1028} 1014}
1029 1015
1030/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1031void 1017void
1032rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1033{ 1019{
1034 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1045 refresh_count = 0; 1031 refresh_count = 0;
1046 flush (); 1032 flush ();
1047} 1033}
1048 1034
1049#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1050void 1054void
1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052{ 1056{
1053 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1054 want_refresh = 1; 1058 want_refresh = 1;
… …
1073 1077
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1079void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1081{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1084 {
1081 want_refresh = 1; 1085 want_refresh = 1;
1082 refresh_check (); 1086 refresh_check ();
1083 } 1087 }
1084 else 1088 else
… …
1088 1092
1089#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1090void 1094void
1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1092{ 1096{
1093 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1094 { 1098 {
1095 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1096 want_refresh = 1; 1100 want_refresh = 1;
1097 refresh_check (); 1101 refresh_check ();
1098 } 1102 }
… …
1103 1107
1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1105void 1109void
1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1107{ 1111{
1108 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1109 { 1113 {
1110 want_refresh = 1; 1114 want_refresh = 1;
1111 refresh_check (); 1115 refresh_check ();
1112 } 1116 }
1113 1117
… …
1129 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only 1137 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool, 1138 // known workaround against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best. 1139 // we just nanosleep a bit and hope for the best.
1136 1140
1137 struct timespec ts = { 0, 1000 }; 1141 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1139 1143
… …
1145 { 1149 {
1146 } 1150 }
1147} event_handler; 1151} event_handler;
1148#endif 1152#endif
1149 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1150bool 1187bool
1151rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1152{ 1189{
1153 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1154 1191
1155 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1156 { 1193
1157 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1158 n = 0;
1159 } 1195 {
1160 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1161 memmove (cmdbuf_base, cmdbuf_ptr, n);
1162 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1163 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1164 1201
1165 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1166 1203
1167 if (r > 0) 1204 if (r > 0)
1168 { 1205 {
1169 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1170 return true; 1207 return true;
… …
1201 pty_write (); 1238 pty_write ();
1202 1239
1203 refresh_check (); 1240 refresh_check ();
1204} 1241}
1205 1242
1206void 1243void ecb_cold
1207rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1208{ 1245{
1209 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1210 recolour_cursor (); 1247 recolor_cursor ();
1211 1248
1212#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1213 hidden_pointer = 0; 1250 hidden_pointer = 0;
1214 1251
1215 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1216 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1217#endif 1254#endif
1218} 1255}
1219 1256
1220#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1221void 1258void ecb_cold
1222rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1223{ 1260{
1224 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1225 return; 1262 return;
1226 1263
… …
1228 XFlush (dpy); 1265 XFlush (dpy);
1229 1266
1230 hidden_pointer = 1; 1267 hidden_pointer = 1;
1231} 1268}
1232 1269
1233void 1270void ecb_cold
1234rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1235{ 1272{
1236 make_current (); 1273 make_current ();
1237 1274
1238 pointer_blank (); 1275 pointer_blank ();
… …
1244{ 1281{
1245 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1246 int x, y; 1283 int x, y;
1247 int code = 32; 1284 int code = 32;
1248 1285
1249 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1251 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1252 { 1290 {
1253 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1254 return; 1292 return;
1293
1255 mouse_row = x; 1294 mouse_row = x;
1256 mouse_col = y; 1295 mouse_col = y;
1257 code += 32; 1296 code += 32;
1258 } 1297 }
1259 1298
… …
1262 else 1301 else
1263 { 1302 {
1264 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1305 if (button_number >= 3)
1267 button_number += (64 - 3); 1306 button_number += 64 - 3;
1268 } 1307 }
1269 1308
1270 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1271 { 1310 {
1272 /* 1311 /*
… …
1304 fputc ('A', stderr); 1343 fputc ('A', stderr);
1305 if (key_state & 32) 1344 if (key_state & 32)
1306 fputc ('2', stderr); 1345 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1347 button_number,
1309 x + 1, 1348 x,
1310 y + 1); 1349 y);
1311#endif 1350#endif
1312 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1313 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1366 code + button_number + key_state,
1315 (32 + x + 1), 1367 32 + x,
1316 (32 + y + 1)); 1368 32 + y);
1317} 1369}
1318 1370
1319/*{{{ process an X event */ 1371/*{{{ process an X event */
1320void 1372void ecb_hot
1321rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1322{ 1374{
1323 make_current (); 1375 make_current ();
1324 1376
1325 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1423 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1476 focus_out ();
1425 break; 1477 break;
1426 1478
1427 case ConfigureNotify: 1479 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1431 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1432 { 1481 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1435 1517
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1519 {
1438 seen_resize = 1; 1520 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1522 }
1441 else 1523 else
1442 { 1524 {
1443#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped) 1526 if (moved)
1447 update_background (); 1527 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif 1528#endif
1452 } 1529 }
1453 1530
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1532 }
1456 break; 1533 break;
1457 1534
1458 case PropertyNotify: 1535 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1461 && ev.xproperty.state == PropertyNewValue)
1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463
1464 break; 1537 break;
1465 1538
1466 case SelectionClear: 1539 case SelectionClear:
1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break; 1541 break;
1469 1542
1470 case SelectionNotify:
1471 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1473 break;
1474
1475 case SelectionRequest: 1543 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1477 break; 1545 break;
1478 1546
1479 case MapNotify: 1547 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1482 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1485 * reparenting. 1553 // events at startup when the window manager reparents the
1486 * We should not render background immidiately, as there could be several 1554 // window, so as to perform the computation after we have
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1488 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1495#endif 1558#endif
1496 mapped = 1; 1559 mapped = 1;
1497#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1513 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1514 { 1577 {
1515 do 1578 do
1516 { 1579 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1582 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1584
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1586
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1588 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1591 }
1529 1592
1530 want_refresh = 1; 1593 want_refresh = 1;
1531 } 1594 }
1532 else 1595 else
… …
1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1539 ; 1602 ;
1540 1603
1541 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1542 { 1605 {
1543 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1544 scrollBar.show (0); 1607 scrollBar.show (0);
1545 } 1608 }
1546 } 1609 }
1547 break; 1610 break;
1548 1611
1549 case MotionNotify: 1612 case MotionNotify:
1550#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1614 if (hidden_pointer)
1552 pointer_unblank (); 1615 pointer_unblank ();
1553#endif 1616#endif
1617 if (!bypass_keystate
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1556 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1558 break; 1622 break;
1559 1623
1560 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1572 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1573 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1574 &ev.xbutton.state); 1638 &ev.xbutton.state);
1575#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1576 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1577 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1578 { 1643 {
1579#endif
1580#if ISO_14755 1644#if ISO_14755
1581 // 5.4 1645 // 5.4
1582 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1583 { 1647 {
1584 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1590 1654
1591#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1592 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1593 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1594 { 1658 {
1659 page_dirn scroll_selection_dir;
1595 int dist; 1660 int dist;
1596 1661
1597 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1598 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1599 */ 1664 */
… …
1614 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1615 } 1680 }
1616 else 1681 else
1617 { 1682 {
1618 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1619 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1620 } 1685 }
1621 1686
1622 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1623 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1624 + 1; 1689 + 1;
1625 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1626 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1627 } 1693 }
1628 else 1694 else
1629 { 1695 {
1630 /* we are within the text window, so we 1696 /* we are within the text window, so we
1631 * shouldn't be scrolling 1697 * shouldn't be scrolling
1632 */ 1698 */
1633 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1634 } 1700 }
1635#endif 1701#endif
1636#ifdef MOUSE_THRESHOLD
1637 } 1702 }
1638#endif
1639 } 1703 }
1640 } 1704 }
1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1642 { 1706 {
1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1644 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1645 ; 1709 ;
1646 1710
1647 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1648 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1649 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1650 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1651 &unused_mask); 1715 &unused_mask);
1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1653 scrollBar.size ()); 1717 scrollBar.size ());
1654 want_refresh = 1; 1718 want_refresh = 1;
1655 scrollBar.show (1); 1719 scrollBar.show (1);
1656 } 1720 }
1657 break; 1721 break;
1658 } 1722 }
1659 1723
1660#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1661 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1662 {
1663 if (hidden_cursor)
1664 {
1665 hidden_cursor = 0;
1666 want_refresh = 1;
1667 }
1668
1669 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1670 }
1671#endif 1727#endif
1672 1728
1673#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675 { 1731 {
… …
1686 1742
1687 refresh_check (); 1743 refresh_check ();
1688} 1744}
1689 1745
1690#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1691void 1747void ecb_cold
1692rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1693{ 1749{
1694 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1695 return; 1751 return;
1696 1752
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1698 { 1754 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h); 1756 XSetWMHints (dpy, parent, h);
1701 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1702 } 1759 }
1703} 1760}
1704#endif 1761#endif
1705 1762
1706void 1763void ecb_cold
1707rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1708{ 1765{
1709 if (!focus) 1766 if (!focus)
1710 { 1767 {
1711 focus = 1; 1768 focus = 1;
1712 want_refresh = 1; 1769 want_refresh = 1;
1713 1770
1714#if USE_XIM 1771#if USE_XIM
1715 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1716 { 1773 {
1717 IMSetPosition (); 1774 im_set_position ();
1718 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1719 } 1776 }
1720#endif 1777#endif
1721#if CURSOR_BLINK 1778#if CURSOR_BLINK
1722 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1724#endif 1781#endif
1725#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1726 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1727 { 1784 {
1728 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1729 scr_recolour (); 1786 scr_recolor ();
1730 } 1787 }
1731#endif 1788#endif
1732#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1734 set_urgency (0); 1791 set_urgency (0);
… …
1736 1793
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1738 } 1795 }
1739} 1796}
1740 1797
1741void 1798void ecb_cold
1742rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1743{ 1800{
1744 if (focus) 1801 if (focus)
1745 { 1802 {
1746 focus = 0; 1803 focus = 0;
… …
1771#endif 1828#endif
1772#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1774 { 1831 {
1775 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1833 scr_recolor ();
1777 } 1834 }
1778#endif 1835#endif
1779 1836
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 } 1838 }
1782} 1839}
1783 1840
1784void 1841void ecb_cold
1785rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1786{ 1843{
1787#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1789 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1790 rgba c; 1850 rgba c;
1791 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 } 1853 }
1794#endif 1854#endif
1795} 1855}
1796 1856
1797#if ENABLE_TRANSPARENCY || ENABLE_PERL 1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1798void 1858void ecb_hot
1799rxvt_term::rootwin_cb (XEvent &ev) 1859rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1860{
1801 make_current (); 1861 make_current ();
1802 1862
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1863 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1864 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1865 return;
1806 1866
1807# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1867 switch (ev.type)
1809 { 1868 {
1810 case PropertyNotify: 1869 case PropertyNotify:
1811 /* 1870 /*
1812 * if user used some Esetroot compatible prog to set the root bg, 1871 * if user used some Esetroot compatible prog to set the root bg,
1813 * use the property to determine the pixmap. We use it later on. 1872 * use the property to determine the pixmap. We use it later on.
1814 */ 1873 */
1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 { 1876 {
1818 bgPixmap.set_root_pixmap (); 1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1819 update_background (); 1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1820 } 1885 }
1821 1886
1822 break; 1887 break;
1823 } 1888 }
1824# endif
1825 1889
1826 refresh_check (); 1890 refresh_check ();
1827} 1891}
1828#endif 1892#endif
1829 1893
… …
1852 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1853 return; 1917 return;
1854 } 1918 }
1855#endif 1919#endif
1856 1920
1857 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1858 1922
1859 if (reportmode) 1923 if (reportmode)
1860 { 1924 {
1861 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1862 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
1863 MEvent.state = ev.state; 1927 MEvent.state = ev.state;
1864#ifdef MOUSE_REPORT_DOUBLECLICK 1928#ifdef MOUSE_REPORT_DOUBLECLICK
1865 if (ev.button == MEvent.button && clickintime) 1929 if (ev.button == MEvent.button && clickintime)
1866 { 1930 {
1867 /* same button, within alloted time */ 1931 /* same button, within allowed time */
1868 MEvent.clicks++; 1932 MEvent.clicks++;
1869 1933
1870 if (MEvent.clicks > 1) 1934 if (MEvent.clicks > 1)
1871 { 1935 {
1872 /* only report double clicks */ 1936 /* only report double clicks */
… …
1953 if (scrollBar.upButton (ev.y)) 2017 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */ 2018 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y)) 2019 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */ 2020 direction = DN; /* down */
1957 2021
1958 scrollBar.state = STATE_IDLE; 2022 scrollBar.state = SB_STATE_IDLE;
1959 /* 2023 /*
1960 * Rxvt-style scrollbar: 2024 * Rxvt-style scrollbar:
1961 * move up if mouse is above slider 2025 * move up if mouse is above slider
1962 * move dn if mouse is below slider 2026 * move dn if mouse is below slider
1963 * 2027 *
… …
2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2066 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2003#endif 2067#endif
2004 if (scr_page (direction, 1)) 2068 if (scr_page (direction, 1))
2005 { 2069 {
2006 if (direction == UP) 2070 if (direction == UP)
2007 scrollBar.state = STATE_UP; 2071 scrollBar.state = SB_STATE_UP;
2008 else 2072 else
2009 scrollBar.state = STATE_DOWN; 2073 scrollBar.state = SB_STATE_DOWN;
2010 } 2074 }
2011 } 2075 }
2012 else 2076 else
2013 switch (ev.button) 2077 switch (ev.button)
2014 { 2078 {
2015 case Button2: 2079 case Button2:
2016 switch (scrollBar.align) 2080 switch (scrollBar.align)
2017 { 2081 {
2018 case R_SB_ALIGN_TOP: 2082 case SB_ALIGN_TOP:
2019 csrO = 0; 2083 csrO = 0;
2020 break; 2084 break;
2021 case R_SB_ALIGN_CENTRE: 2085 case SB_ALIGN_CENTRE:
2022 csrO = (scrollBar.bot - scrollBar.top) / 2; 2086 csrO = (scrollBar.bot - scrollBar.top) / 2;
2023 break; 2087 break;
2024 case R_SB_ALIGN_BOTTOM: 2088 case SB_ALIGN_BOTTOM:
2025 csrO = scrollBar.bot - scrollBar.top; 2089 csrO = scrollBar.bot - scrollBar.top;
2026 break; 2090 break;
2027 } 2091 }
2028 2092
2029 if (scrollBar.style == R_SB_XTERM 2093 if (scrollBar.style == SB_STYLE_XTERM
2030 || scrollbar_above_slider (ev.y) 2094 || scrollBar.above_slider (ev.y)
2031 || scrollbar_below_slider (ev.y)) 2095 || scrollBar.below_slider (ev.y))
2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2096 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2033 2097
2034 scrollBar.state = STATE_MOTION; 2098 scrollBar.state = SB_STATE_MOTION;
2035 break; 2099 break;
2036 2100
2037 case Button1: 2101 case Button1:
2038 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2102 if (scrollBar.align == SB_ALIGN_CENTRE)
2039 csrO = ev.y - scrollBar.top; 2103 csrO = ev.y - scrollBar.top;
2040 /* FALLTHROUGH */ 2104 /* FALLTHROUGH */
2041 2105
2042 case Button3: 2106 case Button3:
2043 if (scrollBar.style != R_SB_XTERM) 2107 if (scrollBar.style != SB_STYLE_XTERM)
2044 { 2108 {
2045 if (scrollbar_above_slider (ev.y)) 2109 if (scrollBar.above_slider (ev.y))
2046# ifdef RXVT_SCROLL_FULL 2110# ifdef RXVT_SCROLL_FULL
2047 scr_page (UP, nrow - 1); 2111 scr_page (UP, nrow - 1);
2048# else 2112# else
2049 scr_page (UP, nrow / 4); 2113 scr_page (UP, nrow / 4);
2050# endif 2114# endif
2051 else if (scrollbar_below_slider (ev.y)) 2115 else if (scrollBar.below_slider (ev.y))
2052# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2053 scr_page (DN, nrow - 1); 2117 scr_page (DN, nrow - 1);
2054# else 2118# else
2055 scr_page (DN, nrow / 4); 2119 scr_page (DN, nrow / 4);
2056# endif 2120# endif
2057 else 2121 else
2058 scrollBar.state = STATE_MOTION; 2122 scrollBar.state = SB_STATE_MOTION;
2059 } 2123 }
2060 else 2124 else
2061 { 2125 {
2062 scr_page ((ev.button == Button1 ? DN : UP), 2126 scr_page ((ev.button == Button1 ? DN : UP),
2063 (nrow 2127 (nrow
2064 * scrollbar_position (ev.y) 2128 * scrollBar.position (ev.y)
2065 / scrollBar.size ())); 2129 / scrollBar.size ()));
2066 } 2130 }
2067 2131
2068 break; 2132 break;
2069 } 2133 }
… …
2080 2144
2081 csrO = 0; /* reset csr Offset */ 2145 csrO = 0; /* reset csr Offset */
2082 if (!bypass_keystate) 2146 if (!bypass_keystate)
2083 reportmode = !! (priv_modes & PrivMode_mouse_report); 2147 reportmode = !! (priv_modes & PrivMode_mouse_report);
2084 2148
2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2149 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2086 { 2150 {
2087 scrollBar.state = STATE_IDLE; 2151 scrollBar.state = SB_STATE_IDLE;
2088 scrollBar.show (0); 2152 scrollBar.show (0);
2089 } 2153 }
2090 2154
2091#ifdef SELECTION_SCROLLING 2155#ifdef SELECTION_SCROLLING
2092 sel_scroll_ev.stop(); 2156 sel_scroll_ev.stop();
… …
2112#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2113 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2114 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2115 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2116 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2117 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2118 { 2182 {
2119 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2120 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2121 mouse_report (ev); 2185 mouse_report (ev);
2122 } 2186 }
… …
2142 case Button3: 2206 case Button3:
2143 selection_make (ev.time); 2207 selection_make (ev.time);
2144 break; 2208 break;
2145 2209
2146 case Button2: 2210 case Button2:
2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2211 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2212 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149 break; 2213 break;
2150 2214
2151#ifdef MOUSE_WHEEL 2215#ifdef MOUSE_WHEEL
2152 case Button4: 2216 case Button4:
2153 case Button5: 2217 case Button5:
2154 { 2218 {
2155 int i; 2219 int lines;
2156 page_dirn v; 2220 page_dirn dirn;
2157 2221
2158 v = ev.button == Button4 ? UP : DN; 2222 dirn = ev.button == Button4 ? UP : DN;
2159 2223
2160 if (ev.state & ShiftMask) 2224 if (ev.state & ShiftMask)
2161 i = 1; 2225 lines = 1;
2162 else if (option (Opt_mouseWheelScrollPage)) 2226 else if (option (Opt_mouseWheelScrollPage))
2163 i = nrow - 1; 2227 lines = nrow - 1;
2164 else 2228 else
2165 i = 5; 2229 lines = 5;
2166 2230
2167# ifdef MOUSE_SLIP_WHEELING 2231# ifdef MOUSE_SLIP_WHEELING
2168 if (ev.state & ControlMask) 2232 if (ev.state & ControlMask)
2169 { 2233 {
2170 mouse_slip_wheel_speed += v ? -1 : 1; 2234 mouse_slip_wheel_speed += dirn;
2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2235 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2173 2236
2174 if (!slip_wheel_ev.is_active ()) 2237 if (!slip_wheel_ev.is_active ())
2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2238 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2176 } 2239 }
2177 else 2240 else
2178# endif 2241# endif
2179 { 2242 {
2180 scr_page (v, i); 2243 scr_page (dirn, lines);
2181 scrollBar.show (1); 2244 scrollBar.show (1);
2182 } 2245 }
2183 } 2246 }
2184 break; 2247 break;
2185#endif 2248#endif
… …
2187 } 2250 }
2188} 2251}
2189 2252
2190/*}}} */ 2253/*}}} */
2191 2254
2192void 2255void ecb_hot
2193rxvt_term::cmd_parse () 2256rxvt_term::cmd_parse ()
2194{ 2257{
2195 wchar_t ch = NOCHAR; 2258 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2259 char *seq_begin; // remember start of esc-sequence here
2197 2260
2198 for (;;) 2261 for (;;)
2199 { 2262 {
2200 if (expect_false (ch == NOCHAR)) 2263 if (ecb_unlikely (ch == NOCHAR))
2201 { 2264 {
2202 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2266 ch = next_char ();
2204 2267
2205 if (ch == NOCHAR) 2268 if (ch == NOCHAR)
2206 break; 2269 break;
2207 } 2270 }
2208 2271
2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2272 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2210 { 2273 {
2211 if (expect_false (!seen_input)) 2274 if (ecb_unlikely (!seen_input))
2212 { 2275 {
2213 seen_input = 1; 2276 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2277 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2278 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2279 // some window managers resize the window early, and these programs
… …
2229 wchar_t *str = buf; 2292 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2293 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2294
2232 for (;;) 2295 for (;;)
2233 { 2296 {
2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2297 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2235 break; 2298 break;
2236 2299
2237 *str++ = ch; 2300 *str++ = ch;
2238 2301
2239 if (expect_false (ch == C0_LF || str >= eol)) 2302 if (ecb_unlikely (ch == C0_LF || str >= eol))
2240 { 2303 {
2241 if (ch == C0_LF) 2304 if (ch == C0_LF)
2242 nlines++; 2305 nlines++;
2243 2306
2244 refresh_count++; 2307 refresh_count++;
… …
2316 } 2379 }
2317 } 2380 }
2318} 2381}
2319 2382
2320// read the next character 2383// read the next character
2321wchar_t 2384wchar_t ecb_hot
2322rxvt_term::next_char () NOTHROW 2385rxvt_term::next_char () NOTHROW
2323{ 2386{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2387 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2388 {
2326 // assume 7-bit to be ascii ALWAYS 2389 // assume 7-bit to be ascii ALWAYS
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328 return *cmdbuf_ptr++; 2391 return *cmdbuf_ptr++;
2329 2392
2330 wchar_t wc; 2393 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2394 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2395
… …
2338 } 2401 }
2339 2402
2340 if (len == (size_t)-1) 2403 if (len == (size_t)-1)
2341 { 2404 {
2342 mbstate.reset (); // reset now undefined conversion state 2405 mbstate.reset (); // reset now undefined conversion state
2406 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2407 // in which case we "erroneously" return the next byte which might be valid.
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2408 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2409 }
2345 2410
2346 // assume wchar == unicode 2411 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2412 cmdbuf_ptr += len;
… …
2350 2415
2351 return NOCHAR; 2416 return NOCHAR;
2352} 2417}
2353 2418
2354// read the next octet 2419// read the next octet
2355uint32_t 2420uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2421rxvt_term::next_octet () NOTHROW
2357{ 2422{
2358 return cmdbuf_ptr < cmdbuf_endp 2423 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2424 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2425 : NOCHAR;
2361} 2426}
2362 2427
2363static class out_of_input out_of_input; 2428static class out_of_input out_of_input;
2364 2429
2365/* rxvt_cmd_getc () - Return next input character */ 2430wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2431rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2432{
2373 wchar_t c = next_char (); 2433 wchar_t c = next_char ();
2374 2434
2375 if (c == NOCHAR) 2435 if (c == NOCHAR)
2376 throw out_of_input; 2436 throw out_of_input;
2377 2437
2378 return c; 2438 return c;
2379} 2439}
2380 2440
2381uint32_t 2441uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2442rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2443{
2384 uint32_t c = next_octet (); 2444 uint32_t c = next_octet ();
2385 2445
2386 if (c == NOCHAR) 2446 if (c == NOCHAR)
… …
2390} 2450}
2391 2451
2392/*{{{ print pipe */ 2452/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2453/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2454#ifdef PRINTPIPE
2395FILE * 2455FILE * ecb_cold
2396rxvt_term::popen_printer () 2456rxvt_term::popen_printer ()
2397{ 2457{
2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2458 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2459
2400 if (stream == NULL) 2460 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2461 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2462
2403 return stream; 2463 return stream;
2404} 2464}
2405 2465
2406int 2466int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2467rxvt_term::pclose_printer (FILE *stream)
2408{ 2468{
2409 fflush (stream); 2469 fflush (stream);
2410 return pclose (stream); 2470 return pclose (stream);
2411} 2471}
2412 2472
2413/* 2473/*
2414 * simulate attached vt100 printer 2474 * simulate attached vt100 printer
2415 */ 2475 */
2416void 2476void ecb_cold
2417rxvt_term::process_print_pipe () 2477rxvt_term::process_print_pipe ()
2418{ 2478{
2419 FILE *fd = popen_printer (); 2479 FILE *fd = popen_printer ();
2420 2480
2421 if (!fd) 2481 if (!fd)
… …
2467 pclose_printer (fd); 2527 pclose_printer (fd);
2468} 2528}
2469#endif /* PRINTPIPE */ 2529#endif /* PRINTPIPE */
2470/*}}} */ 2530/*}}} */
2471 2531
2472/* *INDENT-OFF* */
2473enum { 2532enum {
2474 C1_40 = 0x40, 2533 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2534 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2535 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2536 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2537 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2538};
2480/* *INDENT-ON* */
2481 2539
2482/*{{{ process non-printing single characters */ 2540/*{{{ process non-printing single characters */
2483void 2541void ecb_hot
2484rxvt_term::process_nonprinting (unicode_t ch) 2542rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2543{
2486 switch (ch) 2544 switch (ch)
2487 { 2545 {
2488 case C0_ESC: 2546 case C0_ESC:
… …
2518 scr_charset_choose (0); 2576 scr_charset_choose (0);
2519 break; 2577 break;
2520 2578
2521#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2522 // 8-bit controls 2580 // 8-bit controls
2523 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2524 process_dcs_seq (); 2582 process_dcs_seq ();
2525 break; 2583 break;
2526 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2527 process_csi_seq (); 2585 process_csi_seq ();
2528 break; 2586 break;
2529 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2530 process_osc_seq (); 2588 process_osc_seq ();
2531 break; 2589 break;
2532#endif 2590#endif
2533 } 2591 }
2534} 2592}
2535/*}}} */ 2593/*}}} */
2536 2594
2537 2595
2538/*{{{ process VT52 escape sequences */ 2596/*{{{ process VT52 escape sequences */
2539void 2597void ecb_cold
2540rxvt_term::process_escape_vt52 (unicode_t ch) 2598rxvt_term::process_escape_vt52 (unicode_t ch)
2541{ 2599{
2542 int row, col; 2600 int row, col;
2543 2601
2544 switch (ch) 2602 switch (ch)
… …
2578 break; 2636 break;
2579 case 'Z': /* identify the terminal type */ 2637 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2638 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2639 break;
2582 case '<': /* turn off VT52 mode */ 2640 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2641 priv_modes &= ~PrivMode_vt52;
2584 break; 2642 break;
2585 case 'F': /* use special graphics character set */ 2643 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2644 case 'G': /* use regular character set */
2587 /* unimplemented */ 2645 /* unimplemented */
2588 break; 2646 break;
… …
2594} 2652}
2595/*}}} */ 2653/*}}} */
2596 2654
2597 2655
2598/*{{{ process escape sequences */ 2656/*{{{ process escape sequences */
2599void 2657void ecb_hot
2600rxvt_term::process_escape_seq () 2658rxvt_term::process_escape_seq ()
2601{ 2659{
2602 unicode_t ch = cmd_getc (); 2660 unicode_t ch = cmd_getc ();
2603 2661
2604 if (priv_modes & PrivMode_vt52) 2662 if (priv_modes & PrivMode_vt52)
… …
2607 return; 2665 return;
2608 } 2666 }
2609 2667
2610 switch (ch) 2668 switch (ch)
2611 { 2669 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2670 case '#':
2614 if (cmd_getc () == '8') 2671 if (cmd_getc () == '8')
2615 scr_E (); 2672 scr_E ();
2616 break; 2673 break;
2617 case '(': 2674 case '(':
… …
2640#if !ENABLE_MINIMAL 2697#if !ENABLE_MINIMAL
2641 case '9': 2698 case '9':
2642 scr_forwardindex (); 2699 scr_forwardindex ();
2643 break; 2700 break;
2644#endif 2701#endif
2702 // DECPAM/DECPNM
2645 case '=': 2703 case '=':
2704 priv_modes |= PrivMode_aplKP;
2705 break;
2646 case '>': 2706 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2707 priv_modes &= ~PrivMode_aplKP;
2648 break; 2708 break;
2649 2709
2650 case C1_40: 2710 case C1_40:
2651 cmd_getc (); 2711 cmd_getc ();
2652 break; 2712 break;
… …
2656 2716
2657 /* 8.3.87: NEXT LINE */ 2717 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2718 case C1_NEL: /* ESC E */
2659 { 2719 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2720 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2722 }
2663 break; 2723 break;
2664 2724
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2725 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2726 case C1_ESA: /* ESC G */
2667 process_graphics (); 2727 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q')
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2730 break;
2669 2731
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2732 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2733 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2734 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2738 case C1_RI: /* ESC M */
2677 scr_index (DN); 2739 scr_index (DN);
2678 break; 2740 break;
2679 2741
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2742 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2743 /* case C1_SS2: break; */
2682 2744
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2745 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2746 /* case C1_SS3: break; */
2685 2747
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2748 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2749 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2750 process_dcs_seq ();
2689 break; 2751 break;
… …
2722 } 2784 }
2723} 2785}
2724/*}}} */ 2786/*}}} */
2725 2787
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2788/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2789enum {
2729 CSI_ICH = 0x40, 2790 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2791 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2792 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2793 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2796 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2797 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2798 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2799};
2739 2800
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2801#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2802 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2803 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2804#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2805 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2806
2746const unsigned char csi_defaults[] = 2807static const unsigned char csi_defaults[] =
2747 { 2808 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2809 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2810 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2811 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2812 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2813 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2814 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2815 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2817 };
2757/* *INDENT-ON* */
2758 2818
2759void 2819void ecb_hot
2760rxvt_term::process_csi_seq () 2820rxvt_term::process_csi_seq ()
2761{ 2821{
2762 unicode_t ch, priv, i; 2822 unicode_t ch, priv, prev_ch, i;
2763 unsigned int nargs, p; 2823 unsigned int nargs, p;
2764 int n, ndef; 2824 int n, ndef;
2765 int arg[ESC_ARGS] = { }; 2825 int arg[ESC_ARGS] = { };
2766 2826
2767 nargs = 0; 2827 nargs = 0;
… …
2773 /* '<' '=' '>' '?' '!' */ 2833 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2834 priv = ch;
2775 ch = cmd_getc (); 2835 ch = cmd_getc ();
2776 } 2836 }
2777 2837
2838 prev_ch = 0;
2778 /* read any numerical arguments */ 2839 /* read any numerical arguments */
2779 for (n = -1; ch < CSI_ICH; ) 2840 for (n = -1; ch < CSI_ICH; )
2780 { 2841 {
2781 if (isdigit (ch)) 2842 if (isdigit (ch))
2782 { 2843 {
… …
2792 n = -1; 2853 n = -1;
2793 } 2854 }
2794 else if (IS_CONTROL (ch)) 2855 else if (IS_CONTROL (ch))
2795 process_nonprinting (ch); 2856 process_nonprinting (ch);
2796 2857
2858 prev_ch = ch;
2797 ch = cmd_getc (); 2859 ch = cmd_getc ();
2798 } 2860 }
2799 2861
2800 if (ch > CSI_7F) 2862 if (ch > CSI_7F)
2801 return; 2863 return;
… …
2840 { 2902 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset (); 2904 scr_soft_reset ();
2843 2905
2844 static const int pm_h[] = { 7, 25 }; 2906 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2907 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2846 2908
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2909 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2910 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2849 } 2911 }
2850 break; 2912 break;
2851 } 2913 }
2852 2914
2853 return; 2915 return;
… …
2871 } 2933 }
2872 break; 2934 break;
2873#endif 2935#endif
2874 2936
2875 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2937 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2876 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2938 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2877 arg[0] = -arg[0]; 2939 arg[0] = -arg[0];
2878 /* FALLTHROUGH */ 2940 /* FALLTHROUGH */
2879 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2941 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2880 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2881 scr_gotorc (arg[0], 0, RELATIVE); 2943 scr_gotorc (arg[0], 0, RELATIVE);
2882 break; 2944 break;
2883 2945
2884 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2885 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3035 scr_insert_mode (1); 3097 scr_insert_mode (1);
3036 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3037 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3038 break; 3100 break;
3039 3101
3102 case CSI_71: // DECSCUSR: set cursor style
3103 if (prev_ch == ' ')
3104 set_cursor_style (arg[0]);
3105 break;
3106
3040 /* 3107 /*
3041 * PRIVATE USE beyond this point. All CSI_7? sequences here 3108 * PRIVATE USE beyond this point. All CSI_7? sequences here
3042 */ 3109 */
3043 case CSI_72: /* DECSTBM: set top and bottom margins */ 3110 case CSI_72: /* DECSTBM: set top and bottom margins */
3044 if (nargs == 1) 3111 if (nargs == 1)
… …
3072 } 3139 }
3073} 3140}
3074/*}}} */ 3141/*}}} */
3075 3142
3076#if !ENABLE_MINIMAL 3143#if !ENABLE_MINIMAL
3077/* ARGSUSED */
3078void 3144void
3079rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3145rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3080{ 3146{
3081 int x, y; 3147 int x, y;
3082 XWindowAttributes wattr; 3148 XWindowAttributes wattr;
… …
3091 { 3157 {
3092 /* 3158 /*
3093 * commands 3159 * commands
3094 */ 3160 */
3095 case 1: /* deiconify window */ 3161 case 1: /* deiconify window */
3096 XMapWindow (dpy, parent[0]); 3162 XMapWindow (dpy, parent);
3097 break; 3163 break;
3098 case 2: /* iconify window */ 3164 case 2: /* iconify window */
3099 XIconifyWindow (dpy, parent[0], display->screen); 3165 XIconifyWindow (dpy, parent, display->screen);
3100 break; 3166 break;
3101 case 3: /* set position (pixels) */ 3167 case 3: /* set position (pixels) */
3102 XMoveWindow (dpy, parent[0], args[1], args[2]); 3168 XMoveWindow (dpy, parent, args[1], args[2]);
3103 break; 3169 break;
3104 case 4: /* set size (pixels) */ 3170 case 4: /* set size (pixels) */
3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3171 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3106 break; 3172 break;
3107 case 5: /* raise window */ 3173 case 5: /* raise window */
3108 XRaiseWindow (dpy, parent[0]); 3174 XRaiseWindow (dpy, parent);
3109 break; 3175 break;
3110 case 6: /* lower window */ 3176 case 6: /* lower window */
3111 XLowerWindow (dpy, parent[0]); 3177 XLowerWindow (dpy, parent);
3112 break; 3178 break;
3113 case 7: /* refresh window */ 3179 case 7: /* refresh window */
3114 scr_touch (true); 3180 scr_touch (true);
3115 break; 3181 break;
3116 case 8: /* set size (chars) */ 3182 case 8: /* set size (chars) */
… …
3119 break; 3185 break;
3120 3186
3121 //case 9: NYI, TODO, restore maximized window or maximize window 3187 //case 9: NYI, TODO, restore maximized window or maximize window
3122 default: 3188 default:
3123 if (args[0] >= 24) /* set height (chars) */ 3189 if (args[0] >= 24) /* set height (chars) */
3124 set_widthheight ((unsigned int)width, 3190 set_widthheight ((unsigned int)vt_width,
3125 (unsigned int) (args[1] * fheight)); 3191 (unsigned int) (args[1] * fheight));
3126 break; 3192 break;
3127 3193
3128 /* 3194 /*
3129 * reports - some output format copied from XTerm 3195 * reports - some output format copied from XTerm
3130 */ 3196 */
3131 case 11: /* report window state */ 3197 case 11: /* report window state */
3132 XGetWindowAttributes (dpy, parent[0], &wattr); 3198 XGetWindowAttributes (dpy, parent, &wattr);
3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3199 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3134 break; 3200 break;
3135 case 13: /* report window position */ 3201 case 13: /* report window position */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3137 XTranslateCoordinates (dpy, parent[0], wattr.root, 3203 XTranslateCoordinates (dpy, parent, wattr.root,
3138 -wattr.border_width, -wattr.border_width, 3204 -wattr.border_width, -wattr.border_width,
3139 &x, &y, &wdummy); 3205 &x, &y, &wdummy);
3140 tt_printf ("\033[3;%d;%dt", x, y); 3206 tt_printf ("\033[3;%d;%dt", x, y);
3141 break; 3207 break;
3142 case 14: /* report window size (pixels) */ 3208 case 14: /* report window size (pixels) */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3210 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3145 break; 3211 break;
3146 case 18: /* report text area size (chars) */ 3212 case 18: /* report text area size (chars) */
3147 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3213 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3148 break; 3214 break;
… …
3150 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3216 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3151 break; 3217 break;
3152 case 20: /* report icon label */ 3218 case 20: /* report icon label */
3153 { 3219 {
3154 char *s; 3220 char *s;
3155 XGetIconName (dpy, parent[0], &s); 3221 XGetIconName (dpy, parent, &s);
3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3222 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3157 XFree (s); 3223 XFree (s);
3158 } 3224 }
3159 break; 3225 break;
3160 case 21: /* report window title */ 3226 case 21: /* report window title */
3161 { 3227 {
3162 char *s; 3228 char *s;
3163 XFetchName (dpy, parent[0], &s); 3229 XFetchName (dpy, parent, &s);
3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s); 3231 XFree (s);
3166 } 3232 }
3167 break; 3233 break;
3168 } 3234 }
… …
3178rxvt_term::get_to_st (unicode_t &ends_how) 3244rxvt_term::get_to_st (unicode_t &ends_how)
3179{ 3245{
3180 unicode_t ch; 3246 unicode_t ch;
3181 bool seen_esc = false; 3247 bool seen_esc = false;
3182 unsigned int n = 0; 3248 unsigned int n = 0;
3183 wchar_t string[STRING_MAX]; 3249 wchar_t string[CBUFSIZ];
3184 3250
3185 while ((ch = cmd_getc ()) != NOCHAR) 3251 while ((ch = cmd_getc ()) != NOCHAR)
3186 { 3252 {
3187 if (seen_esc) 3253 if (seen_esc)
3188 { 3254 {
… …
3203 else if (ch < 0x20) 3269 else if (ch < 0x20)
3204 return NULL; /* other control character - exit */ 3270 return NULL; /* other control character - exit */
3205 3271
3206 seen_esc = false; 3272 seen_esc = false;
3207 3273
3208 if (n >= STRING_MAX - 1) 3274 if (n >= sizeof (string) - 1)
3209 // stop at some sane length 3275 // stop at some sane length
3210 return NULL; 3276 return NULL;
3211 3277
3212 string[n++] = ch; 3278 string[n++] = ch;
3213 } 3279 }
… …
3224 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3290 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3225 */ 3291 */
3226void 3292void
3227rxvt_term::process_dcs_seq () 3293rxvt_term::process_dcs_seq ()
3228{ 3294{
3229 char *s;
3230 unicode_t eh;
3231
3232 /* 3295 /*
3233 * Not handled yet 3296 * Not handled yet
3234 */ 3297 */
3298
3299 unicode_t eh;
3235 s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3236 if (s) 3301 if (s)
3237 free (s); 3302 free (s);
3238 3303
3239 return; 3304 return;
3240} 3305}
… …
3244 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3309 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3245 */ 3310 */
3246void 3311void
3247rxvt_term::process_osc_seq () 3312rxvt_term::process_osc_seq ()
3248{ 3313{
3249 unicode_t ch, eh;
3250 int arg; 3314 int arg;
3251 3315
3252 ch = cmd_getc (); 3316 unicode_t ch = cmd_getc ();
3253 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3317 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3254 arg = arg * 10 + (ch - '0'); 3318 arg = arg * 10 + (ch - '0');
3255 3319
3256 if (ch == ';') 3320 if (ch == ';')
3257 { 3321 {
3322 unicode_t eh;
3258 char *s = get_to_st (eh); 3323 char *s = get_to_st (eh);
3259 3324
3260 if (s) 3325 if (s)
3261 { 3326 {
3262 process_xterm_seq (arg, s, eh); 3327 process_xterm_seq (arg, s, eh);
… …
3323 unsigned long bytes_after; 3388 unsigned long bytes_after;
3324 unsigned char *value = 0; 3389 unsigned char *value = 0;
3325 const char *str = ""; 3390 const char *str = "";
3326 3391
3327 if (prop 3392 if (prop
3328 && XGetWindowProperty (dpy, parent[0], 3393 && XGetWindowProperty (dpy, parent,
3329 prop, 0, 1<<16, 0, AnyPropertyType, 3394 prop, 0, 1<<16, 0, AnyPropertyType,
3330 &actual_type, &actual_format, 3395 &actual_type, &actual_format,
3331 &nitems, &bytes_after, &value) == Success 3396 &nitems, &bytes_after, &value) == Success
3332 && actual_type != None 3397 && actual_type != None
3333 && actual_format == 8) 3398 && actual_format == 8)
3334 str = (const char *)(value); 3399 str = (const char *)(value);
3335 3400
3336 tt_printf ("\033]%d;%s%c", op, str, resp); 3401 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3337 3402
3338 XFree (value); 3403 XFree (value);
3339 } 3404 }
3340 else 3405 else
3341 { 3406 {
… …
3345 { 3410 {
3346 *eq = 0; 3411 *eq = 0;
3347 set_utf8_property (display->atom (str), eq + 1); 3412 set_utf8_property (display->atom (str), eq + 1);
3348 } 3413 }
3349 else 3414 else
3350 XDeleteProperty (dpy, parent[0], 3415 XDeleteProperty (dpy, parent,
3351 display->atom (str)); 3416 display->atom (str));
3352 } 3417 }
3353 break; 3418 break;
3354 3419
3355 case XTerm_Color: 3420 case XTerm_Color:
… …
3387 process_color_seq (op, Color_pointer_fg, str, resp); 3452 process_color_seq (op, Color_pointer_fg, str, resp);
3388 break; 3453 break;
3389 case XTerm_Color_pointer_bg: 3454 case XTerm_Color_pointer_bg:
3390 process_color_seq (op, Color_pointer_bg, str, resp); 3455 process_color_seq (op, Color_pointer_bg, str, resp);
3391 break; 3456 break;
3457#ifdef OPTION_HC
3458 case XTerm_Color_HC:
3459 process_color_seq (op, Color_HC, str, resp);
3460 break;
3461 case XTerm_Color_HTC:
3462 process_color_seq (op, Color_HTC, str, resp);
3463 break;
3464#endif
3392#ifndef NO_BOLD_UNDERLINE_REVERSE 3465#ifndef NO_BOLD_UNDERLINE_REVERSE
3393 case XTerm_Color_RV:
3394 process_color_seq (op, Color_RV, str, resp);
3395 break;
3396 case Rxvt_Color_BD:
3397 case URxvt_Color_BD: 3466 case URxvt_Color_BD:
3398 process_color_seq (op, Color_BD, str, resp); 3467 process_color_seq (op, Color_BD, str, resp);
3399 break; 3468 break;
3400 case Rxvt_Color_UL:
3401 case URxvt_Color_UL: 3469 case URxvt_Color_UL:
3402 process_color_seq (op, Color_UL, str, resp); 3470 process_color_seq (op, Color_UL, str, resp);
3403 break; 3471 break;
3404 case URxvt_Color_IT: 3472 case URxvt_Color_IT:
3405 process_color_seq (op, Color_IT, str, resp); 3473 process_color_seq (op, Color_IT, str, resp);
3406 break; 3474 break;
3407#endif 3475#endif
3408 case URxvt_Color_border: 3476 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp); 3477 process_color_seq (op, Color_border, str, resp);
3410 break; 3478 break;
3411#if ENABLE_TRANSPARENCY 3479
3480#if BG_IMAGE_FROM_ROOT
3412 case URxvt_Color_tint: 3481 case URxvt_Color_tint:
3413 process_color_seq (op, Color_tint, str, resp); 3482 process_color_seq (op, Color_tint, str, resp);
3414 { 3483 {
3415 bool changed = false; 3484 bool changed = false;
3416 3485
3417 if (ISSET_PIXCOLOR (Color_tint)) 3486 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421 3488
3422 if (changed) 3489 if (changed)
3423 update_background (); 3490 update_background ();
3424 } 3491 }
3425 3492
… …
3429#if BG_IMAGE_FROM_FILE 3496#if BG_IMAGE_FROM_FILE
3430 case Rxvt_Pixmap: 3497 case Rxvt_Pixmap:
3431 if (!strcmp (str, "?")) 3498 if (!strcmp (str, "?"))
3432 { 3499 {
3433 char str[256]; 3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3434 3505
3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3506 sprintf (str, "[%dx%d+%d+%d]",
3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3507 h_scale, v_scale,
3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3508 h_align, v_align);
3438 process_xterm_seq (XTerm_title, str, CHAR_ST); 3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3439 } 3510 }
3440 else 3511 else
3441 { 3512 {
3442 int changed = 0; 3513 bool changed = false;
3443 3514
3444 if (*str != ';') 3515 if (*str != ';')
3445 { 3516 {
3446 /* reset to default scaling :*/ 3517 try
3447 bgPixmap.unset_geometry (); 3518 {
3448 if (bgPixmap.set_file (str)) /* change pixmap */ 3519 fimage.set_file_geometry (this, str);
3449 changed++; 3520 changed = true;
3450 str = strchr (str, ';'); 3521 }
3451 if (str == NULL) 3522 catch (const class rxvt_failure_exception &e)
3452 bgPixmap.set_defaultGeometry (); 3523 {
3524 }
3453 } 3525 }
3454 3526 else
3455 while (str)
3456 { 3527 {
3457 str++; 3528 str++;
3458 if (bgPixmap.set_geometry (str)) 3529 if (fimage.set_geometry (str, true))
3459 changed++; 3530 changed = true;
3460 str = strchr (str, ';');
3461 } 3531 }
3462 3532
3463 if (changed) 3533 if (changed)
3534 {
3535 if (bg_window_position_sensitive ())
3536 {
3537 int x, y;
3538 get_window_origin (x, y);
3539 parent_x = x;
3540 parent_y = y;
3541 }
3464 update_background (); 3542 update_background ();
3543 }
3465 } 3544 }
3466 break; 3545 break;
3467#endif 3546#endif
3468 3547
3469 case XTerm_logfile: 3548 case XTerm_logfile:
… …
3556 * 's' = save 3635 * 's' = save
3557 * 'r' = restore 3636 * 'r' = restore
3558 * 't' = toggle 3637 * 't' = toggle
3559 * so no need for fancy checking 3638 * so no need for fancy checking
3560 */ 3639 */
3561int 3640int ecb_cold
3562rxvt_term::privcases (int mode, unsigned long bit) 3641rxvt_term::privcases (int mode, unsigned long bit)
3563{ 3642{
3564 int state; 3643 int state;
3565 3644
3566 if (mode == 's') 3645 if (mode == 's')
3567 { 3646 {
3568 SavedModes |= (priv_modes & bit); 3647 if (priv_modes & bit)
3648 SavedModes |= bit;
3649 else
3650 SavedModes &= ~bit;
3569 return -1; 3651 return -1;
3570 } 3652 }
3571 else 3653 else
3572 { 3654 {
3573 if (mode == 'r') 3655 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3656 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3657 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3658 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 set_privmode (bit, state); 3659
3660 if (state)
3661 priv_modes |= bit;
3662 else
3663 priv_modes &= ~bit;
3578 } 3664 }
3579 3665
3580 return state; 3666 return state;
3581} 3667}
3582 3668
3583/* we're not using priv _yet_ */ 3669/* we're not using priv _yet_ */
3584void 3670void
3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3671rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3586{ 3672{
3587 unsigned int i, j; 3673 unsigned int i, j;
3588 int state; 3674 int state;
3589 3675
3590 static const struct 3676 static const struct
3591 { 3677 {
3592 const int argval; 3678 const int argval;
3593 const unsigned long bit; 3679 const unsigned long bit;
3594 } argtopriv[] = { 3680 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, // DECCKM 3681 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3682 { 2, PrivMode_vt52 }, // DECANM
3597 { 3, PrivMode_132 }, // DECCOLM 3683 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, // DECSCLM 3684 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3604 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region 3692 // 19 Print screen prints full screen/scroll region
3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3607#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3608 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
3609#endif 3696#endif
3610 { 35, PrivMode_ShiftKeys }, // rxvt extension 3697 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK 3698 // 38, tektronix mode // DECTEK
3612 { 40, PrivMode_132OK }, 3699 { 40, PrivMode_132OK },
3613 // 41 xterm more fixes NYI 3700 // 41 xterm more fixes NYI
3614 // 45 margin bell NYI 3701 // 45 margin bell NYI
3615 // 46 start logging 3702 // 46 start logging
3616 { 47, PrivMode_Screen }, 3703 { 47, PrivMode_Screen },
3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3704 { 66, PrivMode_aplKP }, // DECNKM
3618#ifndef NO_BACKSPACE_KEY 3705#ifndef NO_BACKSPACE_KEY
3619 { 67, PrivMode_BackSpace }, // DECBKM 3706 { 67, PrivMode_BackSpace }, // DECBKM
3620#endif 3707#endif
3621 { 1000, PrivMode_MouseX11 }, 3708 { 1000, PrivMode_MouseX11 },
3622 { 1002, PrivMode_MouseBtnEvent }, 3709 { 1002, PrivMode_MouseBtnEvent },
3623 { 1003, PrivMode_MouseAnyEvent }, 3710 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS
3712 { 1005, PrivMode_ExtModeMouse },
3713#endif
3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3625 { 1011, PrivMode_Keypress }, // rxvt extension 3715 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3718#endif
3626 // 1035 enable modifiers for alt, numlock NYI 3719 // 1035 enable modifiers for alt, numlock NYI
3627 // 1036 send ESC for meta keys NYI 3720 // 1036 send ESC for meta keys NYI
3628 // 1037 send DEL for keypad delete NYI 3721 // 1037 send DEL for keypad delete NYI
3629 { 1047, PrivMode_Screen }, 3722 { 1047, PrivMode_Screen },
3630 // 1048 save and restore cursor 3723 // 1048 save and restore cursor, implemented in code
3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste }, 3726 { 2004, PrivMode_BracketPaste },
3634 }; 3727 };
3635 3728
… …
3645 for (i = 0; i < nargs; i++) 3738 for (i = 0; i < nargs; i++)
3646 { 3739 {
3647 state = -1; 3740 state = -1;
3648 3741
3649 /* basic handling */ 3742 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3743 for (j = 0; j < ecb_array_length (argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3744 if (argtopriv[j].argval == arg[i])
3652 { 3745 {
3653 state = privcases (mode, argtopriv[j].bit); 3746 state = privcases (mode, argtopriv[j].bit);
3654 break; 3747 break;
3655 } 3748 }
… …
3681 case 2: /* VT52 mode */ 3774 case 2: /* VT52 mode */
3682 /* oddball mode. should be set regardless of set/reset 3775 /* oddball mode. should be set regardless of set/reset
3683 * parameter. Return from VT52 mode with an ESC < from 3776 * parameter. Return from VT52 mode with an ESC < from
3684 * within VT52 mode 3777 * within VT52 mode
3685 */ 3778 */
3686 set_privmode (PrivMode_vt52, 1); 3779 priv_modes |= PrivMode_vt52;
3687 break; 3780 break;
3688 case 3: /* 80/132 */ 3781 case 3: /* 80/132 */
3689 if (priv_modes & PrivMode_132OK) 3782 if (priv_modes & PrivMode_132OK)
3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3783 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3691 break; 3784 break;
… …
3706 if (state) /* orthogonal */ 3799 if (state) /* orthogonal */
3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3800 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3708 break; 3801 break;
3709#ifdef scrollBar_esc 3802#ifdef scrollBar_esc
3710 case scrollBar_esc: 3803 case scrollBar_esc:
3711 if (scrollBar.map (state)) 3804 scrollBar.map (state);
3712 {
3713 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3714 scr_touch (true); 3806 scr_touch (true);
3715 } 3807 break;
3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3716 break; 3812 break;
3717#endif 3813#endif
3718 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3719 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3720 break; 3816 break;
… …
3733 case 1003: 3829 case 1003:
3734 if (state) 3830 if (state)
3735 { 3831 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3832 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3833 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3834 mouse_row = mouse_col = 0;
3738 vt_emask_mouse = PointerMotionMask; 3835 vt_emask_mouse = PointerMotionMask;
3739 } 3836 }
3740 else 3837 else
3741 vt_emask_mouse = NoEventMask; 3838 vt_emask_mouse = NoEventMask;
3742 3839
… …
3774 } 3871 }
3775} 3872}
3776/*}}} */ 3873/*}}} */
3777 3874
3778/*{{{ process sgr sequences */ 3875/*{{{ process sgr sequences */
3779void 3876void ecb_hot
3780rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3877rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3781{ 3878{
3782 unsigned int i; 3879 unsigned int i;
3783 short rendset; 3880 short rendset;
3784 int rendstyle; 3881 int rendstyle;
… …
3826 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3827 //case 20: // gothic 3924 //case 20: // gothic
3828 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3829 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3830 break; 3927 break;
3831 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3832 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3833 break; 3930 break;
3834 case 23: // disable italic 3931 case 23: // disable italic
3835 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3836 break; 3933 break;
3837 case 24: 3934 case 24: // underline off (vt220)
3838 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3839 break; 3936 break;
3840 case 25: 3937 case 25: // blink off (vt220)
3841 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3842 break; 3939 break;
3843 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3844 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3845 break; 3942 break;
3846 case 27: 3943 case 27: // reverse off (vt220)
3847 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3848 break; 3945 break;
3849 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3850 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3851 } 3948 }
… …
3925 break; 4022 break;
3926#endif 4023#endif
3927 } 4024 }
3928 } 4025 }
3929} 4026}
4027
4028void
4029rxvt_term::set_cursor_style (int style)
4030{
4031 if (!IN_RANGE_INC (style, 0, 6))
4032 return;
4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4039
4040#ifdef CURSOR_BLINK
4041 set_option (Opt_cursorBlink, style & 1);
4042 cursor_blink_reset ();
4043#endif
4044
4045 want_refresh = 1;
4046}
3930/*}}} */ 4047/*}}} */
3931 4048
3932/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3933void
3934rxvt_term::process_graphics ()
3935{
3936 unicode_t ch, cmd = cmd_getc ();
3937
3938 if (cmd == 'Q')
3939 {
3940 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */
3942 return;
3943 }
3944 /* swallow other graphics sequences until terminating ':' */
3945 do
3946 ch = cmd_getc ();
3947 while (ch != ':');
3948}
3949/*}}} */
3950
3951/* ------------------------------------------------------------------------- */ 4049/* ---------------------------------------------------------------------- */
4050/* Write data to the pty as typed by the user, pasted with the mouse,
4051 * or generated by us in response to a query ESC sequence.
4052 */
3952 4053
3953/* 4054/*
3954 * Send printf () formatted output to the command. 4055 * Send printf () formatted output to the command.
3955 * Only use for small amounts of data. 4056 * Only use for small amounts of data.
3956 */ 4057 */
… …
3964 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4065 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3965 va_end (arg_ptr); 4066 va_end (arg_ptr);
3966 tt_write (buf, strlen (buf)); 4067 tt_write (buf, strlen (buf));
3967} 4068}
3968 4069
3969/* ---------------------------------------------------------------------- */
3970/* Write data to the pty as typed by the user, pasted with the mouse, 4070/* Write data to the pty as typed by the user. */
3971 * or generated by us in response to a query ESC sequence. 4071void
3972 */ 4072rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4073{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return;
4076
4077 if (option (Opt_scrollTtyKeypress))
4078 if (view_start)
4079 {
4080 view_start = 0;
4081 want_refresh = 1;
4082 }
4083
4084 tt_write_ (data, len);
4085}
3974 4086
3975void 4087void
3976rxvt_term::tt_write (const char *data, unsigned int len) 4088rxvt_term::tt_write (const char *data, unsigned int len)
3977{ 4089{
3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4090 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3979 return; 4091 return;
3980 4092
4093 tt_write_ (data, len);
4094}
4095
4096static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4097
4098void
4099rxvt_term::tt_write_ (const char *data, unsigned int len)
4100{
3981 if (pty->pty < 0) 4101 if (pty->pty < 0)
3982 return; 4102 return;
3983 4103
3984 if (v_buflen == 0) 4104 if (v_buflen == 0)
3985 { 4105 {
3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4106 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3987 4107
4108 max_it (written, 0);
4109
3988 if ((unsigned int)written == len) 4110 if (written == len)
3989 return; 4111 return;
3990 4112
3991 data += written; 4113 data += written;
3992 len -= written; 4114 len -= written;
3993 } 4115 }
3994 4116
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4117 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996 4118
3997 memcpy (v_buffer + v_buflen, data, len); 4119 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4120 v_buflen += len;
3999 4121
4000 pty_ev.set (ev::READ | ev::WRITE); 4122 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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