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.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 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 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * 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,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
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 + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 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
284int 291static int ecb_cold
285rxvt_term::hex_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
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
305{ 416{
306 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 418 KeySym keysym;
309 int valid_keysym; 419 int valid_keysym;
310 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
311 422
312#if ISO_14755 423#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
314 return; 425 return;
315#endif 426#endif
… …
322 */ 433 */
323 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
326 437
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 438 kbuf[0] = 0;
334 439
335#ifdef USE_XIM 440#if USE_XIM
336 if (Input_Context) 441 if (Input_Context)
337 { 442 {
338 Status status_return; 443 Status status_return;
339 444
340#if 0 445#if 0
… …
391 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
392 } 497 }
393 498
394 if (valid_keysym) 499 if (valid_keysym)
395 { 500 {
501 KeySym orig_keysym = keysym;
502
503 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
505 {
506 keysym += (XK_F11 - XK_F1);
507 shft = 0; /* turn off Shift */
508 }
509
510 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
511 {
512 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
513 unsigned int newlen = 1;
514
515 if (ev.state & ModNumLockMask)
516 kp = false;
517
518 keysym = translate_keypad (keysym, kp);
519
520 switch (keysym)
521 {
522#ifndef NO_BACKSPACE_KEY
523 case XK_BackSpace:
524 if (priv_modes & PrivMode_HaveBackSpace)
525 {
526 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
527 ^ !!ctrl) ? '\b' : '\177';
528 kbuf[1] = '\0';
529 }
530 else
531 strcpy (kbuf, rs[Rs_backspace_key]);
532 break;
533#endif
534#ifndef NO_DELETE_KEY
535 case XK_Delete:
536 strcpy (kbuf, rs[Rs_delete_key]);
537 break;
538#endif
539 case XK_Tab:
540 if (shft)
541 strcpy (kbuf, "\033[Z");
542 else
543 {
544#ifdef CTRL_TAB_MAKES_META
545 if (ctrl)
546 meta = 1;
547#endif
548#ifdef MOD4_TAB_MAKES_META
549 if (ev.state & Mod4Mask)
550 meta = 1;
551#endif
552 newlen = 0;
553 }
554 break;
555
556 case XK_Up: /* "\033[A" */
557 case XK_Down: /* "\033[B" */
558 case XK_Right: /* "\033[C" */
559 case XK_Left: /* "\033[D" */
560 strcpy (kbuf, "\033[Z");
561 kbuf[2] = "DACB"[keysym - XK_Left];
562 /* do Shift first */
563 if (shft)
564 kbuf[2] = "dacb"[keysym - XK_Left];
565 else if (ctrl)
566 {
567 kbuf[1] = 'O';
568 kbuf[2] = "dacb"[keysym - XK_Left];
569 }
570 else if (priv_modes & PrivMode_aplCUR)
571 kbuf[1] = 'O';
572 break;
573
574 case XK_KP_Enter:
575 /* allow shift to override */
576 if (kp)
577 {
578 strcpy (kbuf, "\033OM");
579 break;
580 }
581
582 /* FALLTHROUGH */
583
584 case XK_Return:
585 if (priv_modes & PrivMode_LFNL)
586 {
587 kbuf[0] = '\015';
588 kbuf[1] = '\012';
589 kbuf[2] = '\0';
590 }
591 else
592 {
593 kbuf[0] = '\015';
594 kbuf[1] = '\0';
595 }
596 break;
597
598 case XK_KP_F1: /* "\033OP" */
599 case XK_KP_F2: /* "\033OQ" */
600 case XK_KP_F3: /* "\033OR" */
601 case XK_KP_F4: /* "\033OS" */
602 strcpy (kbuf, "\033OP");
603 kbuf[2] += (keysym - XK_KP_F1);
604 break;
605
606 case XK_KP_Multiply: /* "\033Oj" : "*" */
607 case XK_KP_Add: /* "\033Ok" : "+" */
608 case XK_KP_Separator: /* "\033Ol" : "," */
609 case XK_KP_Subtract: /* "\033Om" : "-" */
610 case XK_KP_Decimal: /* "\033On" : "." */
611 case XK_KP_Divide: /* "\033Oo" : "/" */
612 case XK_KP_0: /* "\033Op" : "0" */
613 case XK_KP_1: /* "\033Oq" : "1" */
614 case XK_KP_2: /* "\033Or" : "2" */
615 case XK_KP_3: /* "\033Os" : "3" */
616 case XK_KP_4: /* "\033Ot" : "4" */
617 case XK_KP_5: /* "\033Ou" : "5" */
618 case XK_KP_6: /* "\033Ov" : "6" */
619 case XK_KP_7: /* "\033Ow" : "7" */
620 case XK_KP_8: /* "\033Ox" : "8" */
621 case XK_KP_9: /* "\033Oy" : "9" */
622 /* allow shift to override */
623 if (kp)
624 {
625 strcpy (kbuf, "\033Oj");
626 kbuf[2] += (keysym - XK_KP_Multiply);
627 }
628 else
629 {
630 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
631 kbuf[1] = '\0';
632 }
633 break;
634
635 default:
636 {
637 int param = map_function_key (keysym);
638 if (param > 0)
639 sprintf (kbuf,"\033[%d~", param);
640 else
641 newlen = 0;
642 }
643 break;
644 }
645
646 if (newlen)
647 len = strlen (kbuf);
648
649 if (len > 0)
650 {
651 /*
652 * pass Shift/Control indicators for function keys ending with `~'
653 *
654 * eg,
655 * Prior = "ESC[5~"
656 * Shift+Prior = "ESC[5$"
657 * Ctrl+Prior = "ESC[5^"
658 * Ctrl+Shift+Prior = "ESC[5@"
659 */
660 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
661 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
662
663 /*
664 * Pass meta for all function keys, if 'meta' option set
665 */
666#ifdef META8_OPTION
667 if (meta && (meta_char == 0x80))
668 kbuf[len - 1] |= 0x80;
669#endif
670 }
671
672 }
673 else if (ctrl && keysym == XK_minus)
674 {
675 len = 1;
676 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
677 }
678 else if (keysym == XK_ISO_Left_Tab)
679 {
680 strcpy (kbuf, "\033[Z");
681 len = 3;
682 }
683 else
684 {
685#ifdef META8_OPTION
686 /* set 8-bit on */
687 if (meta && (meta_char == 0x80))
688 {
689 char *ch;
690
691 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80;
693
694 meta = 0;
695 }
696#endif
697 /* nil */ ;
698 }
699
700 keysym = orig_keysym;
701 }
702
703 /* escape prefix */
704 if (len && meta
705#ifdef META8_OPTION
706 && meta_char == C0_ESC
707#endif
708 )
709 {
710 *--kbuf = C0_ESC;
711 len++;
712 }
713
714 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
715 return;
716
717 if (valid_keysym)
718 {
396#ifdef KEYSYM_RESOURCE 719#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 721 return;
399#endif 722#endif
400 723
401 if (saveLines) 724 if (saveLines)
402 { 725 {
… …
411#ifdef PAGING_CONTEXT_LINES 734#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 735 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 736#else
414 lnsppg = nrow * 4 / 5; 737 lnsppg = nrow * 4 / 5;
415#endif 738#endif
739 max_it (lnsppg, 1);
740
416 if (keysym == XK_Prior) 741 if (keysym == XK_Prior)
417 { 742 {
418 scr_page (UP, lnsppg); 743 scr_page (lnsppg);
419 return; 744 return;
420 } 745 }
421 else if (keysym == XK_Next) 746 else if (keysym == XK_Next)
422 { 747 {
423 scr_page (DN, lnsppg); 748 scr_page (-lnsppg);
424 return; 749 return;
425 } 750 }
426 } 751 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 752#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 753 if (IS_SCROLL_MOD)
429 { 754 {
430 if (keysym == XK_Up) 755 if (keysym == XK_Up)
431 { 756 {
432 scr_page (UP, 1); 757 scr_page (1);
433 return; 758 return;
434 } 759 }
435 else if (keysym == XK_Down) 760 else if (keysym == XK_Down)
436 { 761 {
437 scr_page (DN, 1); 762 scr_page (-1);
438 return; 763 return;
439 } 764 }
440 } 765 }
441#endif 766#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 767#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 768 if (IS_SCROLL_MOD)
444 { 769 {
445 if (keysym == XK_Home) 770 if (keysym == XK_Home)
446 { 771 {
447 scr_move_to (0, 1); 772 scr_changeview (top_row);
448 return; 773 return;
449 } 774 }
450 else if (keysym == XK_End) 775 else if (keysym == XK_End)
451 { 776 {
452 scr_move_to (1, 1); 777 scr_changeview (0);
453 return; 778 return;
454 } 779 }
455 } 780 }
456#endif 781#endif
457 } 782 }
458 783
459 if (shft) 784 if (shft)
460 { 785 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 786 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 787 {
469 switch (keysym) 788 switch (keysym)
470 { 789 {
471 /* normal XTerm key bindings */ 790 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 791 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 792 selection_request (ev.time);
474 return; 793 return;
475#if TODO 794#if TODO
476 /* rxvt extras */ 795 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 796 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 797 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 798 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 799 return;
483#endif 800#endif
484 } 801 }
485 } 802 }
486 } 803 }
487 804
805 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
806 {
807 if (keysym == XK_v)
808 selection_request (ev.time, Sel_Clipboard);
809 else if (selection.len > 0)
810 {
811 free (selection.clip_text);
812 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
813 selection.clip_len = selection.len;
814 selection_grab (CurrentTime, true);
815 }
816
817 return;
818 }
819
488#if ENABLE_FRILLS || ISO_14755 820#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 821 // ISO 14755 support
490 if (shft && ctrl) 822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 823 {
492 int hv; 824 int hv;
493 825
494 if (iso14755buf & ISO_14755_51 826 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 827 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 851# endif
520 return; 852 return;
521 } 853 }
522 else 854 else
523 { 855 {
524# if ENABLE_OVERLAY 856# if ISO_14755
525 scr_overlay_off (); 857 scr_overlay_off ();
526# endif 858# endif
527 iso14755buf = 0; 859 iso14755buf = 0;
528 } 860 }
529 } 861 }
862 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 863 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 864 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 865 if (!(iso14755buf & ISO_14755_STARTED))
533 { 866 {
534 iso14755buf |= ISO_14755_STARTED; 867 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 868# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 869 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 870 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 871# endif
539 } 872 }
540#endif 873#endif
… …
544 { 877 {
545 scr_printscreen (ctrl | shft); 878 scr_printscreen (ctrl | shft);
546 return; 879 return;
547 } 880 }
548#endif 881#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 882 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 883
887 if (len <= 0) 884 if (len <= 0)
888 return; /* not mapped */ 885 return; /* not mapped */
889 886
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 887 tt_write_user_input (kbuf, (unsigned int)len);
923} 888}
924 889
925void 890void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 891rxvt_term::key_release (XKeyEvent &ev)
927{ 892{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 893#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 894 KeySym keysym;
930 895
… …
934#if ENABLE_FRILLS || ISO_14755 899#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 900 // ISO 14755 support
936 if (iso14755buf) 901 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 902 if (iso14755buf & ISO_14755_52)
938 { 903 {
939# if ENABLE_OVERLAY 904# if ISO_14755
940 scr_overlay_off (); 905 scr_overlay_off ();
941# endif 906# endif
942# if ISO_14755 907# if ISO_14755
943 // iso14755 part 5.2 handling: release time 908 // iso14755 part 5.2 handling: release time
944 // first: controls 909 // first: controls
… …
950 commit_iso14755 (); 915 commit_iso14755 ();
951 916
952 return; 917 return;
953 } 918 }
954 919
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 920 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 921 if (i[0] == keysym)
957 { 922 {
958 iso14755buf = ISO_14755_51 | i[1]; 923 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 924 commit_iso14755 ();
960 925
… …
967 932
968 return; 933 return;
969 } 934 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 935 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 936 {
972# if ENABLE_OVERLAY 937# if ISO_14755
973 scr_overlay_off (); 938 scr_overlay_off ();
974# endif 939# endif
975 if (iso14755buf & ISO_14755_51) 940 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 941 commit_iso14755 ();
977#if ISO_14755 942#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 962 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 963 mouse_slip_wheel_speed = 0;
999#endif 964#endif
1000} 965}
1001 966
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 967void
1036rxvt_term::flush () 968rxvt_term::flush ()
1037{ 969{
1038 flush_ev.stop (); 970 flush_ev.stop ();
1039 971
1040#ifdef ENABLE_TRANSPARENCY 972#ifdef HAVE_IMG
1041 if (want_full_refresh) 973 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 974 {
1043 want_full_refresh = 0; 975 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 976 scr_touch (false);
1046 } 977 }
1047#endif 978#endif
1048 979
1049 if (want_refresh) 980 if (want_refresh)
… …
1085 } 1016 }
1086 while (row < end_row); 1017 while (row < end_row);
1087 } 1018 }
1088 1019
1089 scr_refresh (); 1020 scr_refresh ();
1090 scrollbar_show (1); 1021 scrollBar.show (1);
1091#ifdef USE_XIM 1022#if USE_XIM
1092 IMSendSpot (); 1023 im_send_spot ();
1093#endif 1024#endif
1094 } 1025 }
1095 1026
1096 display->flush (); 1027 display->flush ();
1097} 1028}
1098 1029
1030/* checks whether a refresh is requested and starts the refresh timer */
1099void 1031void
1100rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1101{ 1033{
1102 make_current (); 1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1036
1104 display->flush (); 1037 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1038}
1109 1039
1110void 1040void
1111rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1042{
1113 make_current (); 1043 make_current ();
1114 1044
1115 refresh_count = 0; 1045 refresh_count = 0;
1116 flush (); 1046 flush ();
1117} 1047}
1118 1048
1119#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1120void 1050void
1051rxvt_term::cursor_blink_reset ()
1052{
1053 if (hidden_cursor)
1054 {
1055 hidden_cursor = 0;
1056 want_refresh = 1;
1057 }
1058
1059 if (option (Opt_cursorBlink))
1060 cursor_blink_ev.again ();
1061 else
1062 cursor_blink_ev.stop ();
1063}
1064
1065void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1066rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1067{
1123 hidden_cursor = !hidden_cursor; 1068 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1069 want_refresh = 1;
1125 1070 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1071}
1128#endif 1072#endif
1129 1073
1130#ifdef TEXT_BLINK 1074#ifdef TEXT_BLINK
1131void 1075void
1132rxvt_term::text_blink_cb (time_watcher &w) 1076rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1077{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1078 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1079 {
1136 hidden_text = !hidden_text; 1080 hidden_text = !hidden_text;
1137 want_refresh = 1; 1081 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1082 refresh_check ();
1139 } 1083 }
1084 else
1085 w.stop ();
1140} 1086}
1141#endif 1087#endif
1142 1088
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1090void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1092{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1149 { 1095 {
1150 want_refresh = 1; 1096 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1152 } 1098 }
1099 else
1100 w.stop ();
1153} 1101}
1154#endif 1102#endif
1155 1103
1156#ifdef SELECTION_SCROLLING 1104#ifdef SELECTION_SCROLLING
1157void 1105void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1106rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1107{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1108 if (scr_page (scroll_selection_lines))
1161 { 1109 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1110 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1111 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 refresh_check ();
1165 } 1113 }
1114 else
1115 w.stop ();
1166} 1116}
1167#endif 1117#endif
1168 1118
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1119#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1120void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1121rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1122{
1173 if (mouse_slip_wheel_speed == 0 1123 if (scr_page (mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1124 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1125 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1126 refresh_check ();
1127 }
1128
1129 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1130 {
1131 mouse_slip_wheel_speed = 0;
1132 w.stop ();
1182 } 1133 }
1183} 1134}
1184#endif 1135#endif
1185 1136
1186#if LINUX_YIELD_HACK 1137#if LINUX_YIELD_HACK
1187static struct event_handler 1138static struct event_handler
1188{ 1139{
1189 check_watcher yield_ev; 1140 ev::prepare yield_ev;
1190 1141
1191 void yield_cb (check_watcher &w) 1142 void yield_cb (ev::prepare &w, int revents)
1192 { 1143 {
1193 // this should really be sched_yield(), but the linux guys thought 1144 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1145 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1146 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1147 // allowed by the sus... as is returning ENOSYS.
1148 // since the linux guys additionally thought that breaking the only
1149 // known workaround against their unusable sched_yield hack is cool,
1150 // we just nanosleep a bit and hope for the best.
1197 1151
1198 struct timespec ts = { 0, 0 }; 1152 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1153 nanosleep (&ts, 0);
1200 1154
1201 w.stop (); 1155 w.stop ();
1202 } 1156 }
1203 1157
… …
1206 { 1160 {
1207 } 1161 }
1208} event_handler; 1162} event_handler;
1209#endif 1163#endif
1210 1164
1165/* make sure all the cmd data is at beginning of cmdbuf */
1166void
1167rxvt_term::cmdbuf_reify ()
1168{
1169 if (cmdbuf_ptr == cmdbuf_base)
1170 return;
1171
1172 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1173
1174 memmove (cmdbuf_base, cmdbuf_ptr, used);
1175 cmdbuf_ptr = cmdbuf_base;
1176 cmdbuf_endp = cmdbuf_ptr + used;
1177
1178}
1179
1180#if defined (KEYSYM_RESOURCE)
1181void
1182rxvt_term::cmdbuf_append (const char *str, size_t count)
1183{
1184 cmdbuf_reify ();
1185
1186 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1187
1188 if (count > avail)
1189 return;
1190
1191 memcpy (cmdbuf_endp, str, count);
1192 cmdbuf_endp += count;
1193
1194 cmd_parse ();
1195}
1196#endif
1197
1211bool 1198bool
1212rxvt_term::pty_fill () 1199rxvt_term::pty_fill ()
1213{ 1200{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1201 cmdbuf_reify ();
1215 1202
1216 if (CBUFSIZ == n) 1203 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1204
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1205 if (!avail)
1219 n = 0;
1220 } 1206 {
1221 1207 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1208 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1209 cmdbuf_endp = cmdbuf_ptr;
1210 avail = CBUFSIZ;
1211 }
1225 1212
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1213 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1214
1228 if (r > 0) 1215 if (r > 0)
1229 { 1216 {
1230 cmdbuf_endp += r; 1217 cmdbuf_endp += r;
1231 return true; 1218 return true;
… …
1247 1234
1248 return false; 1235 return false;
1249} 1236}
1250 1237
1251void 1238void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1239rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1240{
1254 make_current (); 1241 make_current ();
1255 1242
1256 if (revents & EVENT_READ) 1243 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1244 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1245 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1246 cmd_parse ();
1260 break;
1261 1247
1262 if (revents & EVENT_WRITE) 1248 if (revents & ev::WRITE)
1263 pty_write (); 1249 pty_write ();
1264}
1265 1250
1266void 1251 refresh_check ();
1252}
1253
1254void ecb_cold
1267rxvt_term::pointer_unblank () 1255rxvt_term::pointer_unblank ()
1268{ 1256{
1269 XDefineCursor (dpy, vt, TermWin_cursor); 1257 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor (); 1258 recolour_cursor ();
1271 1259
1272#ifdef POINTER_BLANK 1260#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1261 hidden_pointer = 0;
1274 1262
1275 if (option (Opt_pointerBlank)) 1263 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1264 pointer_ev.start (pointerBlankDelay);
1277#endif 1265#endif
1278} 1266}
1279 1267
1280#ifdef POINTER_BLANK 1268#ifdef POINTER_BLANK
1281void 1269void ecb_cold
1282rxvt_term::pointer_blank () 1270rxvt_term::pointer_blank ()
1283{ 1271{
1284 if (!option (Opt_pointerBlank)) 1272 if (!option (Opt_pointerBlank))
1285 return; 1273 return;
1286 1274
… …
1288 XFlush (dpy); 1276 XFlush (dpy);
1289 1277
1290 hidden_pointer = 1; 1278 hidden_pointer = 1;
1291} 1279}
1292 1280
1293void 1281void ecb_cold
1294rxvt_term::pointer_cb (time_watcher &w) 1282rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1283{
1296 make_current (); 1284 make_current ();
1297 1285
1298 pointer_blank (); 1286 pointer_blank ();
1299} 1287}
… …
1302void 1290void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1291rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1292{
1305 int button_number, key_state = 0; 1293 int button_number, key_state = 0;
1306 int x, y; 1294 int x, y;
1295 int code = 32;
1307 1296
1308 x = ev.x; 1297 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1298 y = Pixel2Row (ev.y) + 1;
1310 pixel_position (&x, &y); 1299
1300 if (ev.type == MotionNotify)
1301 {
1302 if (x == mouse_row && y == mouse_col)
1303 return;
1304
1305 mouse_row = x;
1306 mouse_col = y;
1307 code += 32;
1308 }
1311 1309
1312 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1313 button_number = 3; 1311 button_number = 3;
1314 else 1312 else
1315 { 1313 {
1316 button_number = MEvent.button - Button1; 1314 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1315 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1316 if (button_number >= 3)
1319 button_number += (64 - 3); 1317 button_number += 64 - 3;
1320 } 1318 }
1321 1319
1322 if (priv_modes & PrivMode_MouseX10) 1320 if (priv_modes & PrivMode_MouseX10)
1323 { 1321 {
1324 /* 1322 /*
… …
1356 fputc ('A', stderr); 1354 fputc ('A', stderr);
1357 if (key_state & 32) 1355 if (key_state & 32)
1358 fputc ('2', stderr); 1356 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1357 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1358 button_number,
1361 x + 1, 1359 x,
1362 y + 1); 1360 y);
1363#endif 1361#endif
1364 1362
1363#if ENABLE_FRILLS
1364 if (priv_modes & PrivMode_ExtMouseRight)
1365 tt_printf ("\033[%d;%d;%dM",
1366 code + button_number + key_state,
1367 x,
1368 y);
1369 else if (priv_modes & PrivMode_ExtModeMouse)
1370 tt_printf ("\033[M%c%lc%lc",
1371 code + button_number + key_state,
1372 wint_t (32 + x),
1373 wint_t (32 + y));
1374 else
1375#endif
1365 tt_printf ("\033[M%c%c%c", 1376 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1377 code + button_number + key_state,
1367 (32 + x + 1), 1378 32 + x,
1368 (32 + y + 1)); 1379 32 + y);
1369} 1380}
1370 1381
1371/*{{{ process an X event */ 1382/*{{{ process an X event */
1372void 1383void ecb_hot
1373rxvt_term::x_cb (XEvent &ev) 1384rxvt_term::x_cb (XEvent &ev)
1374{ 1385{
1375 make_current (); 1386 make_current ();
1376 1387
1377 dLocal (Display *, dpy); 1388 dLocal (Display *, dpy);
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1444 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1445 focus_out ();
1435 } 1446 }
1436#endif 1447#endif
1437 } 1448 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1449 break;
1443 1450
1444 /* 1451 /*
1445 * XXX: this is not the _current_ arrangement 1452 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1453 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1486 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1487 focus_out ();
1481 break; 1488 break;
1482 1489
1483 case ConfigureNotify: 1490 case ConfigureNotify:
1484 if (ev.xconfigure.window == parent[0]) 1491 if (ev.xconfigure.window == parent)
1485 { 1492 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1493 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1494 ;
1495
1496 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1497
1498 bool moved = false;
1499#ifdef HAVE_BG_PIXMAP
1500 if (bg_window_position_sensitive ())
1501 {
1502 want_position_change = true;
1503 if (bg_img == 0)
1504 moved = true;
1505 }
1506#endif
1507
1508 if (want_position_change)
1509 {
1510 int x, y;
1511
1512 if (ev.xconfigure.send_event)
1513 {
1514 x = ev.xconfigure.x;
1515 y = ev.xconfigure.y;
1516 }
1517 else
1518 get_window_origin (x, y);
1519
1520 if (x != parent_x || y != parent_y)
1521 {
1522 parent_x = x;
1523 parent_y = y;
1524 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1525 moved = true;
1526 }
1527 }
1488 1528
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1529 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1530 {
1491 seen_resize = 1; 1531 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1532 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1500 } 1533 }
1534 else
1535 {
1536#ifdef HAVE_BG_PIXMAP
1537 if (moved)
1538 update_background ();
1539#endif
1540 }
1501 1541
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1543 }
1509 break; 1544 break;
1510 1545
1511 case PropertyNotify: 1546 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1547 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1514 && ev.xproperty.state == PropertyNewValue)
1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1516
1517 break; 1548 break;
1518 1549
1519 case SelectionClear: 1550 case SelectionClear:
1520 selection_clear (); 1551 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1521 break;
1522
1523 case SelectionNotify:
1524 if (selection_wait == Sel_normal)
1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1526 break; 1552 break;
1527 1553
1528 case SelectionRequest: 1554 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1555 selection_send (ev.xselectionrequest);
1530 break; 1556 break;
1531 1557
1532 case MapNotify: 1558 case MapNotify:
1559#ifdef HAVE_BG_PIXMAP
1560 // This is needed at startup for the case of no window manager
1561 // or a non-reparenting window manager and also because we
1562 // defer bg image updates if the window is not mapped. The
1563 // short delay is to optimize for multiple ConfigureNotify
1564 // events at startup when the window manager reparents the
1565 // window, so as to perform the computation after we have
1566 // received all of them.
1567 if (bg_img == 0)
1568 update_background_ev.start (0.025);
1569#endif
1533 mapped = 1; 1570 mapped = 1;
1534#ifdef TEXT_BLINK 1571#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1572 text_blink_ev.start ();
1536#endif 1573#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1574 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1575 break;
1539 1576
1540 case UnmapNotify: 1577 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1579#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1580 text_blink_ev.stop ();
1544#endif 1581#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1582 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1583 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1584
1554 case GraphicsExpose: 1585 case GraphicsExpose:
1555 case Expose: 1586 case Expose:
1556 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1557 { 1588 {
1558 do 1589 do
1590 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1591 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1592 ev.xexpose.width, ev.xexpose.height, false);
1593 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1594 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1595
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1597
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1598 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1600 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1601 ev.xexpose.width, ev.xexpose.height, false);
1602 }
1568 1603
1569 want_refresh = 1; 1604 want_refresh = 1;
1570 } 1605 }
1571 else 1606 else
1572 { 1607 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1611 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1613 ;
1579 1614
1580 if (isScrollbarWindow (ev.xany.window)) 1615 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1616 {
1582 scrollBar.setIdle (); 1617 scrollBar.state = SB_STATE_IDLE;
1583 scrollbar_show (0); 1618 scrollBar.show (0);
1584 } 1619 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1620 }
1591 break; 1621 break;
1592 1622
1593 case MotionNotify: 1623 case MotionNotify:
1594#ifdef POINTER_BLANK 1624#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1625 if (hidden_pointer)
1596 pointer_unblank (); 1626 pointer_unblank ();
1597#endif 1627#endif
1628 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1629 || priv_modes & PrivMode_MouseAnyEvent)
1630 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1631 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1632 break;
1600 1633
1601 if (ev.xany.window == vt) 1634 if (ev.xany.window == vt)
1602 { 1635 {
… …
1631 1664
1632#ifdef SELECTION_SCROLLING 1665#ifdef SELECTION_SCROLLING
1633 if (ev.xbutton.y < int_bwidth 1666 if (ev.xbutton.y < int_bwidth
1634 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1667 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1635 { 1668 {
1669 page_dirn scroll_selection_dir;
1636 int dist; 1670 int dist;
1637 1671
1638 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1640 */ 1674 */
1641 if (!sel_scroll_ev.active) 1675 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1676 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1677
1644 /* save the event params so we can highlight 1678 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1679 * the selection in the pending-scroll loop
1646 */ 1680 */
1647 selection_save_x = ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
… …
1655 dist = int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1656 } 1690 }
1657 else 1691 else
1658 { 1692 {
1659 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1660 dist = ev.xbutton.y - (int_bwidth + height); 1694 dist = ev.xbutton.y - (int_bwidth + vt_height);
1661 } 1695 }
1662 1696
1663 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1664 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1665 + 1; 1699 + 1;
1666 min_it (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1667 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1702 scroll_selection_lines *= scroll_selection_dir;
1668 } 1703 }
1669 else 1704 else
1670 { 1705 {
1671 /* we are within the text window, so we 1706 /* we are within the text window, so we
1672 * shouldn't be scrolling 1707 * shouldn't be scrolling
1673 */ 1708 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1709 sel_scroll_ev.stop();
1676 } 1710 }
1677#endif 1711#endif
1678#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1679 } 1713 }
1680#endif 1714#endif
1681 } 1715 }
1682 } 1716 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1718 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1719 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1720 MotionNotify, &ev))
1687 ; 1721 ;
1688 1722
1689 XQueryPointer (dpy, scrollBar.win, 1723 XQueryPointer (dpy, scrollBar.win,
1690 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1726 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1727 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1729 scrollBar.size ());
1696 want_refresh = 1; 1730 want_refresh = 1;
1697 scrollbar_show (1); 1731 scrollBar.show (1);
1698 } 1732 }
1699 break; 1733 break;
1700 } 1734 }
1701 1735
1702#if defined(CURSOR_BLINK) 1736#if defined(CURSOR_BLINK)
1703 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1737 if (ev.type == KeyPress)
1704 { 1738 cursor_blink_reset ();
1705 if (hidden_cursor)
1706 {
1707 hidden_cursor = 0;
1708 want_refresh = 1;
1709 }
1710
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1712 }
1713#endif 1739#endif
1714 1740
1715#if defined(POINTER_BLANK) 1741#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1742 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 { 1743 {
… …
1723 1749
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1750 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1751 pointer_blank ();
1726 } 1752 }
1727#endif 1753#endif
1728}
1729 1754
1730void 1755 refresh_check ();
1756}
1757
1758#if ENABLE_FRILLS
1759void ecb_cold
1760rxvt_term::set_urgency (bool enable)
1761{
1762 if (enable == urgency_hint)
1763 return;
1764
1765 if (XWMHints *h = XGetWMHints (dpy, parent))
1766 {
1767 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1768 XSetWMHints (dpy, parent, h);
1769 urgency_hint = enable;
1770 XFree (h);
1771 }
1772}
1773#endif
1774
1775void ecb_cold
1731rxvt_term::focus_in () 1776rxvt_term::focus_in ()
1732{ 1777{
1733 if (!focus) 1778 if (!focus)
1734 { 1779 {
1735 focus = 1; 1780 focus = 1;
1736 want_refresh = 1; 1781 want_refresh = 1;
1737 1782
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1783#if USE_XIM
1741 if (Input_Context != NULL) 1784 if (Input_Context != NULL)
1742 { 1785 {
1743 IMSetPosition (); 1786 im_set_position ();
1744 XSetICFocus (Input_Context); 1787 XSetICFocus (Input_Context);
1745 } 1788 }
1746#endif 1789#endif
1747#if CURSOR_BLINK 1790#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1792 cursor_blink_ev.again ();
1750#endif 1793#endif
1751#if OFF_FOCUS_FADING 1794#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1795 if (rs[Rs_fade])
1753 { 1796 {
1754 pix_colors = pix_colors_focused; 1797 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1798 scr_recolour ();
1756 } 1799 }
1757#endif 1800#endif
1758#if ENABLE_FRILLS 1801#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1802 if (option (Opt_urgentOnBell))
1760 { 1803 set_urgency (0);
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1804#endif
1771 }
1772}
1773 1805
1774void 1806 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1807 }
1808}
1809
1810void ecb_cold
1775rxvt_term::focus_out () 1811rxvt_term::focus_out ()
1776{ 1812{
1777 if (focus) 1813 if (focus)
1778 { 1814 {
1779 focus = 0; 1815 focus = 0;
1780 want_refresh = 1; 1816 want_refresh = 1;
1781 1817
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1818#if ENABLE_FRILLS
1783 1819 if (option (Opt_urgentOnBell))
1820 set_urgency (0);
1821#endif
1784#if ENABLE_FRILLS || ISO_14755 1822#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1823 if (iso14755buf)
1786 { 1824 {
1787 iso14755buf = 0; 1825 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1826# if ISO_14755
1789 scr_overlay_off (); 1827 scr_overlay_off ();
1790# endif 1828# endif
1791 } 1829 }
1792#endif 1830#endif
1793#if USE_XIM 1831#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1833 XUnsetICFocus (Input_Context);
1796#endif 1834#endif
1797#if CURSOR_BLINK 1835#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1836 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1837 cursor_blink_ev.stop ();
1838
1800 hidden_cursor = 0; 1839 hidden_cursor = 0;
1801#endif 1840#endif
1802#if OFF_FOCUS_FADING 1841#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1842 if (rs[Rs_fade])
1804 { 1843 {
1805 pix_colors = pix_colors_unfocused; 1844 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1845 scr_recolour ();
1807 } 1846 }
1808#endif 1847#endif
1809 }
1810}
1811 1848
1812void 1849 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1850 }
1851}
1852
1853void ecb_cold
1813rxvt_term::update_fade_color (unsigned int idx) 1854rxvt_term::update_fade_color (unsigned int idx)
1814{ 1855{
1815#if OFF_FOCUS_FADING 1856#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1857 if (rs[Rs_fade])
1817 { 1858 {
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1861 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1862 }
1822#endif 1863#endif
1823} 1864}
1824 1865
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1866#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void 1867void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1868rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1869{
1829 make_current (); 1870 make_current ();
1830 1871
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1872 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1873 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1874 return;
1834 1875
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1876 switch (ev.type)
1837 { 1877 {
1838 case PropertyNotify: 1878 case PropertyNotify:
1839 /* 1879 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1880 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1881 * use the property to determine the pixmap. We use it later on.
1842 */ 1882 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1883 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1884 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1885 {
1846 1886#if BG_IMAGE_FROM_ROOT
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent)) 1887 if (option (Opt_transparent))
1850 check_our_parents (); 1888 {
1851 break; 1889 rxvt_img::new_from_root (this)->replace (root_img);
1852 } 1890 update_background ();
1891 }
1853# endif 1892#endif
1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1894 }
1895
1896 break;
1897 }
1898
1899 refresh_check ();
1854} 1900}
1855#endif 1901#endif
1856 1902
1857void 1903void
1858rxvt_term::button_press (XButtonEvent &ev) 1904rxvt_term::button_press (XButtonEvent &ev)
… …
1889 /* save the xbutton state (for ButtonRelease) */ 1935 /* save the xbutton state (for ButtonRelease) */
1890 MEvent.state = ev.state; 1936 MEvent.state = ev.state;
1891#ifdef MOUSE_REPORT_DOUBLECLICK 1937#ifdef MOUSE_REPORT_DOUBLECLICK
1892 if (ev.button == MEvent.button && clickintime) 1938 if (ev.button == MEvent.button && clickintime)
1893 { 1939 {
1894 /* same button, within alloted time */ 1940 /* same button, within allowed time */
1895 MEvent.clicks++; 1941 MEvent.clicks++;
1896 1942
1897 if (MEvent.clicks > 1) 1943 if (MEvent.clicks > 1)
1898 { 1944 {
1899 /* only report double clicks */ 1945 /* only report double clicks */
… …
1913 mouse_report (ev); 1959 mouse_report (ev);
1914 } 1960 }
1915#else 1961#else
1916 MEvent.button = ev.button; 1962 MEvent.button = ev.button;
1917 mouse_report (ev); 1963 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1964#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1965
1920 } 1966 }
1921 else 1967 else
1922 { 1968 {
1923 if (ev.button != MEvent.button) 1969 if (ev.button != MEvent.button)
… …
1971 } 2017 }
1972 2018
1973 /* 2019 /*
1974 * Scrollbar window processing of button press 2020 * Scrollbar window processing of button press
1975 */ 2021 */
1976 if (isScrollbarWindow (ev.window)) 2022 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 2023 {
1978 scrollBar.setIdle (); 2024 page_dirn direction = NO_DIR;
2025
2026 if (scrollBar.upButton (ev.y))
2027 direction = UP; /* up */
2028 else if (scrollBar.dnButton (ev.y))
2029 direction = DN; /* down */
2030
2031 scrollBar.state = SB_STATE_IDLE;
1979 /* 2032 /*
1980 * Rxvt-style scrollbar: 2033 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 2034 * move up if mouse is above slider
1982 * move dn if mouse is below slider 2035 * move dn if mouse is below slider
1983 * 2036 *
… …
1992 /* 2045 /*
1993 * Mouse report disabled scrollbar: 2046 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 2047 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 2048 * click on scrollbar - send pageup/down
1996 */ 2049 */
1997 if ((scrollBar.style == R_SB_NEXT 2050 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 2051 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 2052 else if (direction == DN)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 2053 tt_printf ("\033[B");
2007 else 2054 else
2008 switch (ev.button) 2055 switch (ev.button)
2009 { 2056 {
2010 case Button2: 2057 case Button2:
… …
2017 tt_printf ("\033[5~"); 2064 tt_printf ("\033[5~");
2018 break; 2065 break;
2019 } 2066 }
2020 } 2067 }
2021 else 2068 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2069#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2070 {
2029 if (scrollbarnext_upButton (ev.y)) 2071 if (direction != NO_DIR)
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown)
2042 { 2072 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2074 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2075 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2076#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2077 if (scr_page (direction, 1))
2047 { 2078 {
2048 if (upordown < 0) 2079 if (direction == UP)
2049 scrollBar.setUp (); 2080 scrollBar.state = SB_STATE_UP;
2050 else 2081 else
2051 scrollBar.setDn (); 2082 scrollBar.state = SB_STATE_DOWN;
2052 } 2083 }
2053 } 2084 }
2054 else 2085 else
2055 switch (ev.button) 2086 switch (ev.button)
2056 { 2087 {
2057 case Button2: 2088 case Button2:
2058 switch (scrollbar_align) 2089 switch (scrollBar.align)
2059 { 2090 {
2060 case R_SB_ALIGN_TOP: 2091 case SB_ALIGN_TOP:
2061 csrO = 0; 2092 csrO = 0;
2062 break; 2093 break;
2063 case R_SB_ALIGN_CENTRE: 2094 case SB_ALIGN_CENTRE:
2064 csrO = (scrollBar.bot - scrollBar.top) / 2; 2095 csrO = (scrollBar.bot - scrollBar.top) / 2;
2065 break; 2096 break;
2066 case R_SB_ALIGN_BOTTOM: 2097 case SB_ALIGN_BOTTOM:
2067 csrO = scrollBar.bot - scrollBar.top; 2098 csrO = scrollBar.bot - scrollBar.top;
2068 break; 2099 break;
2069 } 2100 }
2070 2101
2071 if (scrollBar.style == R_SB_XTERM 2102 if (scrollBar.style == SB_STYLE_XTERM
2072 || scrollbar_above_slider (ev.y) 2103 || scrollBar.above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2104 || scrollBar.below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2105 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2075 2106
2076 scrollBar.setMotion (); 2107 scrollBar.state = SB_STATE_MOTION;
2077 break; 2108 break;
2078 2109
2079 case Button1: 2110 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2111 if (scrollBar.align == SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2112 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2113 /* FALLTHROUGH */
2083 2114
2084 case Button3: 2115 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2116 if (scrollBar.style != SB_STYLE_XTERM)
2086 { 2117 {
2087 if (scrollbar_above_slider (ev.y)) 2118 if (scrollBar.above_slider (ev.y))
2088# ifdef RXVT_SCROLL_FULL 2119# ifdef RXVT_SCROLL_FULL
2089 scr_page (UP, nrow - 1); 2120 scr_page (UP, nrow - 1);
2090# else 2121# else
2091 scr_page (UP, nrow / 4); 2122 scr_page (UP, nrow / 4);
2092# endif 2123# endif
2093 else if (scrollbar_below_slider (ev.y)) 2124 else if (scrollBar.below_slider (ev.y))
2094# ifdef RXVT_SCROLL_FULL 2125# ifdef RXVT_SCROLL_FULL
2095 scr_page (DN, nrow - 1); 2126 scr_page (DN, nrow - 1);
2096# else 2127# else
2097 scr_page (DN, nrow / 4); 2128 scr_page (DN, nrow / 4);
2098# endif 2129# endif
2099 else 2130 else
2100 scrollBar.setMotion (); 2131 scrollBar.state = SB_STATE_MOTION;
2101 } 2132 }
2102 else 2133 else
2103 { 2134 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2135 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2136 (nrow
2106 * scrollbar_position (ev.y) 2137 * scrollBar.position (ev.y)
2107 / scrollbar_size ())); 2138 / scrollBar.size ()));
2108 } 2139 }
2109 2140
2110 break; 2141 break;
2111 } 2142 }
2112 } 2143 }
… …
2122 2153
2123 csrO = 0; /* reset csr Offset */ 2154 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2155 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2156 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2157
2127 if (scrollbar_isUpDn ()) 2158 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2128 { 2159 {
2129 scrollBar.setIdle (); 2160 scrollBar.state = SB_STATE_IDLE;
2130 scrollbar_show (0); 2161 scrollBar.show (0);
2131 } 2162 }
2132 2163
2133#ifdef SELECTION_SCROLLING 2164#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2165 sel_scroll_ev.stop();
2136#endif 2166#endif
2137 2167
2138 if (ev.window == vt) 2168 if (ev.window == vt)
2139 { 2169 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2170 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2164 mouse_report (ev); 2194 mouse_report (ev);
2165 } 2195 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2196#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2197 MEvent.button = AnyButton;
2168 mouse_report (ev); 2198 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2199#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2200 return;
2171 } 2201 }
2172 2202
2173 /* 2203 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2204 * dumb hack to compensate for the failure of click-and-drag
… …
2185 case Button3: 2215 case Button3:
2186 selection_make (ev.time); 2216 selection_make (ev.time);
2187 break; 2217 break;
2188 2218
2189 case Button2: 2219 case Button2:
2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2220 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2221 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2222 break;
2193 2223
2194#ifdef MOUSE_WHEEL 2224#ifdef MOUSE_WHEEL
2195 case Button4: 2225 case Button4:
2196 case Button5: 2226 case Button5:
2197 { 2227 {
2198 int i; 2228 int lines;
2199 page_dirn v; 2229 page_dirn dirn;
2200 2230
2201 v = ev.button == Button4 ? UP : DN; 2231 dirn = ev.button == Button4 ? UP : DN;
2202 2232
2203 if (ev.state & ShiftMask) 2233 if (ev.state & ShiftMask)
2204 i = 1; 2234 lines = 1;
2205 else if (option (Opt_mouseWheelScrollPage)) 2235 else if (option (Opt_mouseWheelScrollPage))
2206 i = nrow - 1; 2236 lines = nrow - 1;
2207 else 2237 else
2208 i = 5; 2238 lines = 5;
2209 2239
2210# ifdef MOUSE_SLIP_WHEELING 2240# ifdef MOUSE_SLIP_WHEELING
2211 if (ev.state & ControlMask) 2241 if (ev.state & ControlMask)
2212 { 2242 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2243 mouse_slip_wheel_speed += dirn;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2244 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2245
2217 if (slip_wheel_ev.at < NOW) 2246 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2247 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2248 }
2222 else 2249 else
2250# endif
2223 { 2251 {
2224# endif
2225 scr_page (v, i); 2252 scr_page (dirn, lines);
2226 scrollbar_show (1); 2253 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2254 }
2229# endif
2230 } 2255 }
2231 break; 2256 break;
2232#endif 2257#endif
2233 } 2258 }
2234 } 2259 }
2235} 2260}
2236 2261
2237/*}}} */ 2262/*}}} */
2238 2263
2239bool 2264void ecb_hot
2240rxvt_term::cmd_parse () 2265rxvt_term::cmd_parse ()
2241{ 2266{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2267 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2268 char *seq_begin; // remember start of esc-sequence here
2245 2269
2246 for (;;) 2270 for (;;)
2247 { 2271 {
2248 if (ch == NOCHAR) 2272 if (ecb_unlikely (ch == NOCHAR))
2249 { 2273 {
2250 seq_begin = cmdbuf_ptr; 2274 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2275 ch = next_char ();
2252 2276
2253 if (ch == NOCHAR) 2277 if (ch == NOCHAR)
2254 break; 2278 break;
2255 } 2279 }
2256 2280
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2281 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2282 {
2259 if (!seen_input) 2283 if (ecb_unlikely (!seen_input))
2260 { 2284 {
2261 seen_input = 1; 2285 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2286 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2287 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2288 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2301 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2302 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2303
2280 for (;;) 2304 for (;;)
2281 { 2305 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2306 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2307 break;
2284 2308
2285 *str++ = ch; 2309 *str++ = ch;
2286 2310
2287 if (ch == C0_LF || str >= eol) 2311 if (ecb_unlikely (ch == C0_LF || str >= eol))
2288 { 2312 {
2289 if (ch == C0_LF) 2313 if (ch == C0_LF)
2290 nlines++; 2314 nlines++;
2291 2315
2292 refresh_count++; 2316 refresh_count++;
2293 2317
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2318 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2319 {
2296 refresh_count = 0; 2320 refresh_count = 0;
2297 2321
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2322 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2323 {
2300 refreshnow = true; 2324 refreshnow = true;
2301 ch = NOCHAR; 2325 ch = NOCHAR;
2302 break; 2326 break;
2303 } 2327 }
… …
2341 * What the heck we'll cheat and only refresh less than every page-full. 2365 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2366 * if skipScroll is enabled.
2343 */ 2367 */
2344 if (refreshnow) 2368 if (refreshnow)
2345 { 2369 {
2346 flag = true;
2347 scr_refresh (); 2370 scr_refresh ();
2348 want_refresh = 1; 2371 want_refresh = 1;
2349 } 2372 }
2350
2351 } 2373 }
2352 else 2374 else
2353 { 2375 {
2354 try 2376 try
2355 { 2377 {
… …
2363 } 2385 }
2364 2386
2365 ch = NOCHAR; 2387 ch = NOCHAR;
2366 } 2388 }
2367 } 2389 }
2368
2369 return flag;
2370} 2390}
2371 2391
2372// read the next character 2392// read the next character
2373wchar_t 2393wchar_t ecb_hot
2374rxvt_term::next_char () NOTHROW 2394rxvt_term::next_char () NOTHROW
2375{ 2395{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2396 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2397 {
2378 // assume 7-bit to be ascii ALWAYS 2398 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2399 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2400 return *cmdbuf_ptr++;
2381 2401
2382 wchar_t wc; 2402 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2403 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2404
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2408 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2409 break;
2390 } 2410 }
2391 2411
2392 if (len == (size_t)-1) 2412 if (len == (size_t)-1)
2413 {
2414 mbstate.reset (); // reset now undefined conversion state
2415 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2416 // in which case we "erroneously" return the next byte which might be valid.
2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2417 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2418 }
2394 2419
2395 // assume wchar == unicode 2420 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2421 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2422 return wc & UNICODE_MASK;
2398 } 2423 }
2399 2424
2400 return NOCHAR; 2425 return NOCHAR;
2401} 2426}
2402 2427
2403// read the next octet 2428// read the next octet
2404uint32_t 2429uint32_t ecb_hot
2405rxvt_term::next_octet () NOTHROW 2430rxvt_term::next_octet () NOTHROW
2406{ 2431{
2407 return cmdbuf_ptr < cmdbuf_endp 2432 return cmdbuf_ptr < cmdbuf_endp
2408 ? (unsigned char)*cmdbuf_ptr++ 2433 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR; 2434 : NOCHAR;
2410} 2435}
2411 2436
2412static class out_of_input out_of_input; 2437static class out_of_input out_of_input;
2413 2438
2414/* rxvt_cmd_getc () - Return next input character */ 2439wchar_t ecb_hot
2415/*
2416 * Return the next input character after first passing any keyboard input
2417 * to the command.
2418 */
2419wchar_t
2420rxvt_term::cmd_getc () THROW ((class out_of_input)) 2440rxvt_term::cmd_getc () THROW ((class out_of_input))
2421{ 2441{
2422 wchar_t c = next_char (); 2442 wchar_t c = next_char ();
2423 2443
2424 if (c == NOCHAR) 2444 if (c == NOCHAR)
2425 throw out_of_input; 2445 throw out_of_input;
2426 2446
2427 return c; 2447 return c;
2428} 2448}
2429 2449
2430uint32_t 2450uint32_t ecb_hot
2431rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2451rxvt_term::cmd_get8 () THROW ((class out_of_input))
2432{ 2452{
2433 uint32_t c = next_octet (); 2453 uint32_t c = next_octet ();
2434 2454
2435 if (c == NOCHAR) 2455 if (c == NOCHAR)
… …
2439} 2459}
2440 2460
2441/*{{{ print pipe */ 2461/*{{{ print pipe */
2442/*----------------------------------------------------------------------*/ 2462/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2463#ifdef PRINTPIPE
2444FILE * 2464FILE * ecb_cold
2445rxvt_term::popen_printer () 2465rxvt_term::popen_printer ()
2446{ 2466{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2467 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2468
2449 if (stream == NULL) 2469 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2470 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2471
2452 return stream; 2472 return stream;
2453} 2473}
2454 2474
2455int 2475int ecb_cold
2456rxvt_term::pclose_printer (FILE *stream) 2476rxvt_term::pclose_printer (FILE *stream)
2457{ 2477{
2458 fflush (stream); 2478 fflush (stream);
2459 return pclose (stream); 2479 return pclose (stream);
2460} 2480}
2461 2481
2462/* 2482/*
2463 * simulate attached vt100 printer 2483 * simulate attached vt100 printer
2464 */ 2484 */
2465void 2485void ecb_cold
2466rxvt_term::process_print_pipe () 2486rxvt_term::process_print_pipe ()
2467{ 2487{
2468 int done; 2488 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2489
2471 if ((fd = popen_printer ()) == NULL) 2490 if (!fd)
2472 return; 2491 return;
2473 2492
2474 /* 2493 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2494 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2495 * is received.
2477 */ 2496 */
2478 for (done = 0; !done;) 2497 for (int done = 0; !done; )
2479 { 2498 {
2480 unsigned char buf[8]; 2499 unsigned char buf[8];
2481 unicode_t ch; 2500 unicode_t ch;
2482 unsigned int i, len; 2501 unsigned int i, len;
2483 2502
… …
2514 } 2533 }
2515 } 2534 }
2516 2535
2517 pclose_printer (fd); 2536 pclose_printer (fd);
2518} 2537}
2519#endif /* PRINTPIPE */ 2538#endif /* PRINTPIPE */
2520/*}}} */ 2539/*}}} */
2521 2540
2522/* *INDENT-OFF* */
2523enum { 2541enum {
2524 C1_40 = 0x40, 2542 C1_40 = 0x40,
2525 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2543 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2526 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2544 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2527 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2545 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2528 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2546 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2529}; 2547};
2530/* *INDENT-ON* */
2531 2548
2532/*{{{ process non-printing single characters */ 2549/*{{{ process non-printing single characters */
2533void 2550void ecb_hot
2534rxvt_term::process_nonprinting (unicode_t ch) 2551rxvt_term::process_nonprinting (unicode_t ch)
2535{ 2552{
2536 switch (ch) 2553 switch (ch)
2537 { 2554 {
2538 case C0_ESC: 2555 case C0_ESC:
… …
2584} 2601}
2585/*}}} */ 2602/*}}} */
2586 2603
2587 2604
2588/*{{{ process VT52 escape sequences */ 2605/*{{{ process VT52 escape sequences */
2589void 2606void ecb_cold
2590rxvt_term::process_escape_vt52 (unicode_t ch) 2607rxvt_term::process_escape_vt52 (unicode_t ch)
2591{ 2608{
2592 int row, col; 2609 int row, col;
2593 2610
2594 switch (ch) 2611 switch (ch)
… …
2628 break; 2645 break;
2629 case 'Z': /* identify the terminal type */ 2646 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2647 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2648 break;
2632 case '<': /* turn off VT52 mode */ 2649 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2650 priv_modes &= ~PrivMode_vt52;
2634 break; 2651 break;
2635 case 'F': /* use special graphics character set */ 2652 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2653 case 'G': /* use regular character set */
2637 /* unimplemented */ 2654 /* unimplemented */
2638 break; 2655 break;
… …
2644} 2661}
2645/*}}} */ 2662/*}}} */
2646 2663
2647 2664
2648/*{{{ process escape sequences */ 2665/*{{{ process escape sequences */
2649void 2666void ecb_hot
2650rxvt_term::process_escape_seq () 2667rxvt_term::process_escape_seq ()
2651{ 2668{
2652 unicode_t ch = cmd_getc (); 2669 unicode_t ch = cmd_getc ();
2653 2670
2654 if (priv_modes & PrivMode_vt52) 2671 if (priv_modes & PrivMode_vt52)
… …
2657 return; 2674 return;
2658 } 2675 }
2659 2676
2660 switch (ch) 2677 switch (ch)
2661 { 2678 {
2662 /* case 1: do_tek_mode (); break; */
2663 case '#': 2679 case '#':
2664 if (cmd_getc () == '8') 2680 if (cmd_getc () == '8')
2665 scr_E (); 2681 scr_E ();
2666 break; 2682 break;
2667 case '(': 2683 case '(':
… …
2690#if !ENABLE_MINIMAL 2706#if !ENABLE_MINIMAL
2691 case '9': 2707 case '9':
2692 scr_forwardindex (); 2708 scr_forwardindex ();
2693 break; 2709 break;
2694#endif 2710#endif
2711 // DECPAM/DECPNM
2695 case '=': 2712 case '=':
2713 priv_modes |= PrivMode_aplKP;
2714 break;
2696 case '>': 2715 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2716 priv_modes &= ~PrivMode_aplKP;
2698 break; 2717 break;
2699 2718
2700 case C1_40: 2719 case C1_40:
2701 cmd_getc (); 2720 cmd_getc ();
2702 break; 2721 break;
… …
2706 2725
2707 /* 8.3.87: NEXT LINE */ 2726 /* 8.3.87: NEXT LINE */
2708 case C1_NEL: /* ESC E */ 2727 case C1_NEL: /* ESC E */
2709 { 2728 {
2710 wchar_t nlcr[] = { C0_LF, C0_CR }; 2729 wchar_t nlcr[] = { C0_LF, C0_CR };
2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2730 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2712 } 2731 }
2713 break; 2732 break;
2714 2733
2715 /* kidnapped escape sequence: Should be 8.3.48 */ 2734 /* kidnapped escape sequence: Should be 8.3.48 */
2716 case C1_ESA: /* ESC G */ 2735 case C1_ESA: /* ESC G */
2717 process_graphics (); 2736 // used by original rxvt for rob nations own graphics mode
2737 if (cmd_getc () == 'Q')
2738 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2718 break; 2739 break;
2719 2740
2720 /* 8.3.63: CHARACTER TABULATION SET */ 2741 /* 8.3.63: CHARACTER TABULATION SET */
2721 case C1_HTS: /* ESC H */ 2742 case C1_HTS: /* ESC H */
2722 scr_set_tab (1); 2743 scr_set_tab (1);
… …
2726 case C1_RI: /* ESC M */ 2747 case C1_RI: /* ESC M */
2727 scr_index (DN); 2748 scr_index (DN);
2728 break; 2749 break;
2729 2750
2730 /* 8.3.142: SINGLE-SHIFT TWO */ 2751 /* 8.3.142: SINGLE-SHIFT TWO */
2731 /*case C1_SS2: scr_single_shift (2); break; */ 2752 /* case C1_SS2: break; */
2732 2753
2733 /* 8.3.143: SINGLE-SHIFT THREE */ 2754 /* 8.3.143: SINGLE-SHIFT THREE */
2734 /*case C1_SS3: scr_single_shift (3); break; */ 2755 /* case C1_SS3: break; */
2735 2756
2736 /* 8.3.27: DEVICE CONTROL STRING */ 2757 /* 8.3.27: DEVICE CONTROL STRING */
2737 case C1_DCS: /* ESC P */ 2758 case C1_DCS: /* ESC P */
2738 process_dcs_seq (); 2759 process_dcs_seq ();
2739 break; 2760 break;
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2762 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2763 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2764 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2765 break; /* steal obsolete ESC [ c */
2745 2766
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2767 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2768 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2769 process_csi_seq ();
2749 break; 2770 break;
2750 2771
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2772 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2773 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2774 process_osc_seq ();
2754 break; 2775 break;
2755 2776
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2777 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2778 case 'c':
2758 mbstate.reset (); 2779 mbstate.reset ();
2759 scr_poweron (); 2780 scr_poweron ();
2760 scrollbar_show (1); 2781 scrollBar.show (1);
2761 break; 2782 break;
2762 2783
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2784 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2785 case 'n':
2765 scr_charset_choose (2); 2786 scr_charset_choose (2);
… …
2772 } 2793 }
2773} 2794}
2774/*}}} */ 2795/*}}} */
2775 2796
2776/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2797/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2777/* *INDENT-OFF* */
2778enum { 2798enum {
2779 CSI_ICH = 0x40, 2799 CSI_ICH = 0x40,
2780 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2800 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2781 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2801 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2782 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2802 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2785 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2805 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2786 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2806 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2787 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2807 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2788}; 2808};
2789 2809
2790#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2810#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2791 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2811 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2792 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2812 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2793#define get_byte_array_bit(array, bit) \ 2813#define get_byte_array_bit(array, bit) \
2794 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2814 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2795 2815
2796const unsigned char csi_defaults[] = 2816static const unsigned char csi_defaults[] =
2797 { 2817 {
2798 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2818 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2799 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2819 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2800 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2820 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2801 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2821 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2802 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2822 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2803 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2823 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2804 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2805 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2825 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2806 }; 2826 };
2807/* *INDENT-ON* */
2808 2827
2809void 2828void ecb_hot
2810rxvt_term::process_csi_seq () 2829rxvt_term::process_csi_seq ()
2811{ 2830{
2812 unicode_t ch, priv, i; 2831 unicode_t ch, priv, prev_ch, i;
2813 unsigned int nargs, p; 2832 unsigned int nargs, p;
2814 int n, ndef; 2833 int n, ndef;
2815 int arg[ESC_ARGS]; 2834 int arg[ESC_ARGS] = { };
2816 2835
2817 for (nargs = ESC_ARGS; nargs > 0;) 2836 nargs = 0;
2818 arg[--nargs] = 0;
2819 2837
2820 priv = 0; 2838 priv = 0;
2821 ch = cmd_getc (); 2839 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2840 if ((ch >= '<' && ch <= '?') || ch == '!')
2841 {
2823 { /* '<' '=' '>' '?' */ 2842 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2843 priv = ch;
2825 ch = cmd_getc (); 2844 ch = cmd_getc ();
2826 } 2845 }
2827 2846
2847 prev_ch = 0;
2828 /* read any numerical arguments */ 2848 /* read any numerical arguments */
2829 for (n = -1; ch < CSI_ICH; ) 2849 for (n = -1; ch < CSI_ICH; )
2830 { 2850 {
2831 if (isdigit (ch)) 2851 if (isdigit (ch))
2832 { 2852 {
… …
2842 n = -1; 2862 n = -1;
2843 } 2863 }
2844 else if (IS_CONTROL (ch)) 2864 else if (IS_CONTROL (ch))
2845 process_nonprinting (ch); 2865 process_nonprinting (ch);
2846 2866
2867 prev_ch = ch;
2847 ch = cmd_getc (); 2868 ch = cmd_getc ();
2848 } 2869 }
2849 2870
2850 if (ch > CSI_7F) 2871 if (ch > CSI_7F)
2851 return; 2872 return;
… …
2867 switch (priv) 2888 switch (priv)
2868 { 2889 {
2869 case '>': 2890 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2891 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2892 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2893 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2894 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2895 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2896 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2897 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2898 // versions.
2878 // 2899 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2900 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2901 }
2881 break; 2902 break;
2903
2882 case '?': 2904 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2905 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2906 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2907 break;
2908
2909 case '!':
2910 if (ch == CSI_70)
2911 {
2912 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2913 scr_soft_reset ();
2914
2915 static const int pm_h[] = { 7, 25 };
2916 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2917
2918 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2919 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2886 } 2920 }
2921 break;
2922 }
2923
2887 return; 2924 return;
2888 } 2925 }
2889 2926
2890 switch (ch) 2927 switch (ch)
2891 { 2928 {
… …
2905 } 2942 }
2906 break; 2943 break;
2907#endif 2944#endif
2908 2945
2909 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2946 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2910 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2947 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2911 arg[0] = -arg[0]; 2948 arg[0] = -arg[0];
2912 /* FALLTHROUGH */ 2949 /* FALLTHROUGH */
2913 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2950 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2914 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2951 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2915 scr_gotorc (arg[0], 0, RELATIVE); 2952 scr_gotorc (arg[0], 0, RELATIVE);
2916 break; 2953 break;
2917 2954
2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2955 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2956 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3069 scr_insert_mode (1); 3106 scr_insert_mode (1);
3070 else if (arg[0] == 20) 3107 else if (arg[0] == 20)
3071 priv_modes |= PrivMode_LFNL; 3108 priv_modes |= PrivMode_LFNL;
3072 break; 3109 break;
3073 3110
3111 case CSI_71: // DESCUSR: set cursor style
3112 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]);
3114 break;
3115
3074 /* 3116 /*
3075 * PRIVATE USE beyond this point. All CSI_7? sequences here 3117 * PRIVATE USE beyond this point. All CSI_7? sequences here
3076 */ 3118 */
3077 case CSI_72: /* DECSTBM: set top and bottom margins */ 3119 case CSI_72: /* DECSTBM: set top and bottom margins */
3078 if (nargs == 1) 3120 if (nargs == 1)
… …
3106 } 3148 }
3107} 3149}
3108/*}}} */ 3150/*}}} */
3109 3151
3110#if !ENABLE_MINIMAL 3152#if !ENABLE_MINIMAL
3111/* ARGSUSED */
3112void 3153void
3113rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3154rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3114{ 3155{
3115 int x, y; 3156 int x, y;
3116 XWindowAttributes wattr; 3157 XWindowAttributes wattr;
… …
3125 { 3166 {
3126 /* 3167 /*
3127 * commands 3168 * commands
3128 */ 3169 */
3129 case 1: /* deiconify window */ 3170 case 1: /* deiconify window */
3130 XMapWindow (dpy, parent[0]); 3171 XMapWindow (dpy, parent);
3131 break; 3172 break;
3132 case 2: /* iconify window */ 3173 case 2: /* iconify window */
3133 XIconifyWindow (dpy, parent[0], display->screen); 3174 XIconifyWindow (dpy, parent, display->screen);
3134 break; 3175 break;
3135 case 3: /* set position (pixels) */ 3176 case 3: /* set position (pixels) */
3136 XMoveWindow (dpy, parent[0], args[1], args[2]); 3177 XMoveWindow (dpy, parent, args[1], args[2]);
3137 break; 3178 break;
3138 case 4: /* set size (pixels) */ 3179 case 4: /* set size (pixels) */
3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3180 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3140 break; 3181 break;
3141 case 5: /* raise window */ 3182 case 5: /* raise window */
3142 XRaiseWindow (dpy, parent[0]); 3183 XRaiseWindow (dpy, parent);
3143 break; 3184 break;
3144 case 6: /* lower window */ 3185 case 6: /* lower window */
3145 XLowerWindow (dpy, parent[0]); 3186 XLowerWindow (dpy, parent);
3146 break; 3187 break;
3147 case 7: /* refresh window */ 3188 case 7: /* refresh window */
3148 scr_touch (true); 3189 scr_touch (true);
3149 break; 3190 break;
3150 case 8: /* set size (chars) */ 3191 case 8: /* set size (chars) */
… …
3153 break; 3194 break;
3154 3195
3155 //case 9: NYI, TODO, restore maximized window or maximize window 3196 //case 9: NYI, TODO, restore maximized window or maximize window
3156 default: 3197 default:
3157 if (args[0] >= 24) /* set height (chars) */ 3198 if (args[0] >= 24) /* set height (chars) */
3158 set_widthheight ((unsigned int)width, 3199 set_widthheight ((unsigned int)vt_width,
3159 (unsigned int) (args[1] * fheight)); 3200 (unsigned int) (args[1] * fheight));
3160 break; 3201 break;
3161 3202
3162 /* 3203 /*
3163 * reports - some output format copied from XTerm 3204 * reports - some output format copied from XTerm
3164 */ 3205 */
3165 case 11: /* report window state */ 3206 case 11: /* report window state */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3207 XGetWindowAttributes (dpy, parent, &wattr);
3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3208 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3168 break; 3209 break;
3169 case 13: /* report window position */ 3210 case 13: /* report window position */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3211 XGetWindowAttributes (dpy, parent, &wattr);
3171 XTranslateCoordinates (dpy, parent[0], wattr.root, 3212 XTranslateCoordinates (dpy, parent, wattr.root,
3172 -wattr.border_width, -wattr.border_width, 3213 -wattr.border_width, -wattr.border_width,
3173 &x, &y, &wdummy); 3214 &x, &y, &wdummy);
3174 tt_printf ("\033[3;%d;%dt", x, y); 3215 tt_printf ("\033[3;%d;%dt", x, y);
3175 break; 3216 break;
3176 case 14: /* report window size (pixels) */ 3217 case 14: /* report window size (pixels) */
3177 XGetWindowAttributes (dpy, parent[0], &wattr); 3218 XGetWindowAttributes (dpy, parent, &wattr);
3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3219 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3179 break; 3220 break;
3180 case 18: /* report text area size (chars) */ 3221 case 18: /* report text area size (chars) */
3181 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3182 break; 3223 break;
… …
3184 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3225 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3185 break; 3226 break;
3186 case 20: /* report icon label */ 3227 case 20: /* report icon label */
3187 { 3228 {
3188 char *s; 3229 char *s;
3189 XGetIconName (dpy, parent[0], &s); 3230 XGetIconName (dpy, parent, &s);
3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3191 XFree (s); 3232 XFree (s);
3192 } 3233 }
3193 break; 3234 break;
3194 case 21: /* report window title */ 3235 case 21: /* report window title */
3195 { 3236 {
3196 char *s; 3237 char *s;
3197 XFetchName (dpy, parent[0], &s); 3238 XFetchName (dpy, parent, &s);
3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3239 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3199 XFree (s); 3240 XFree (s);
3200 } 3241 }
3201 break; 3242 break;
3202 } 3243 }
… …
3212rxvt_term::get_to_st (unicode_t &ends_how) 3253rxvt_term::get_to_st (unicode_t &ends_how)
3213{ 3254{
3214 unicode_t ch; 3255 unicode_t ch;
3215 bool seen_esc = false; 3256 bool seen_esc = false;
3216 unsigned int n = 0; 3257 unsigned int n = 0;
3217 wchar_t string[STRING_MAX]; 3258 wchar_t string[CBUFSIZ];
3218 3259
3219 while ((ch = cmd_getc ()) != NOCHAR) 3260 while ((ch = cmd_getc ()) != NOCHAR)
3220 { 3261 {
3221 if (seen_esc) 3262 if (seen_esc)
3222 { 3263 {
… …
3237 else if (ch < 0x20) 3278 else if (ch < 0x20)
3238 return NULL; /* other control character - exit */ 3279 return NULL; /* other control character - exit */
3239 3280
3240 seen_esc = false; 3281 seen_esc = false;
3241 3282
3242 if (n >= STRING_MAX - 1) 3283 if (n >= sizeof (string) - 1)
3243 // stop at some sane length 3284 // stop at some sane length
3244 return NULL; 3285 return NULL;
3245 3286
3246 string[n++] = ch; 3287 string[n++] = ch;
3247 } 3288 }
… …
3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3299 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3259 */ 3300 */
3260void 3301void
3261rxvt_term::process_dcs_seq () 3302rxvt_term::process_dcs_seq ()
3262{ 3303{
3263 char *s;
3264 unicode_t eh;
3265
3266 /* 3304 /*
3267 * Not handled yet 3305 * Not handled yet
3268 */ 3306 */
3307
3308 unicode_t eh;
3269 s = get_to_st (eh); 3309 char *s = get_to_st (eh);
3270 if (s) 3310 if (s)
3271 free (s); 3311 free (s);
3272 3312
3273 return; 3313 return;
3274} 3314}
… …
3278 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3318 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3279 */ 3319 */
3280void 3320void
3281rxvt_term::process_osc_seq () 3321rxvt_term::process_osc_seq ()
3282{ 3322{
3283 unicode_t ch, eh;
3284 int arg; 3323 int arg;
3285 3324
3286 ch = cmd_getc (); 3325 unicode_t ch = cmd_getc ();
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3326 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3327 arg = arg * 10 + (ch - '0');
3289 3328
3290 if (ch == ';') 3329 if (ch == ';')
3291 { 3330 {
3331 unicode_t eh;
3292 char *s = get_to_st (eh); 3332 char *s = get_to_st (eh);
3293 3333
3294 if (s) 3334 if (s)
3295 { 3335 {
3296 process_xterm_seq (arg, s, eh); 3336 process_xterm_seq (arg, s, eh);
… …
3320 3360
3321/* 3361/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3362 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3363 */
3324void 3364void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3365rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3366{
3327 int color; 3367 int color;
3328 char *buf, *name; 3368 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3369 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3370 int saveop = op;
… …
3357 unsigned long bytes_after; 3397 unsigned long bytes_after;
3358 unsigned char *value = 0; 3398 unsigned char *value = 0;
3359 const char *str = ""; 3399 const char *str = "";
3360 3400
3361 if (prop 3401 if (prop
3362 && XGetWindowProperty (dpy, parent[0], 3402 && XGetWindowProperty (dpy, parent,
3363 prop, 0, 1<<16, 0, AnyPropertyType, 3403 prop, 0, 1<<16, 0, AnyPropertyType,
3364 &actual_type, &actual_format, 3404 &actual_type, &actual_format,
3365 &nitems, &bytes_after, &value) == Success 3405 &nitems, &bytes_after, &value) == Success
3366 && actual_type != None 3406 && actual_type != None
3367 && actual_format == 8) 3407 && actual_format == 8)
3368 str = (const char *)(value); 3408 str = (const char *)(value);
3369 3409
3370 tt_printf ("\033]%d;%s%c", op, str, resp); 3410 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3371 3411
3372 XFree (value); 3412 XFree (value);
3373 } 3413 }
3374 else 3414 else
3375 { 3415 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3416 char *eq = strchr (str, '=');
3377 3417
3378 if (eq) 3418 if (eq)
3379 { 3419 {
3380 *eq = 0; 3420 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3421 set_utf8_property (display->atom (str), eq + 1);
3382 } 3422 }
3383 else 3423 else
3384 XDeleteProperty (dpy, parent[0], 3424 XDeleteProperty (dpy, parent,
3385 display->atom (str)); 3425 display->atom (str));
3386 } 3426 }
3387 break; 3427 break;
3388 3428
3389 case XTerm_Color: 3429 case XTerm_Color:
… …
3402 *buf++ = '\0'; 3442 *buf++ = '\0';
3403 3443
3404 process_color_seq (op, color, name, resp); 3444 process_color_seq (op, color, name, resp);
3405 } 3445 }
3406 break; 3446 break;
3447 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3448 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3449 process_color_seq (op, Color_fg, str, resp);
3409 break; 3450 break;
3451 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3452 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3453 process_color_seq (op, Color_bg, str, resp);
3412 break; 3454 break;
3413#ifndef NO_CURSORCOLOR 3455#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3456 case XTerm_Color_cursor:
… …
3419 process_color_seq (op, Color_pointer_fg, str, resp); 3461 process_color_seq (op, Color_pointer_fg, str, resp);
3420 break; 3462 break;
3421 case XTerm_Color_pointer_bg: 3463 case XTerm_Color_pointer_bg:
3422 process_color_seq (op, Color_pointer_bg, str, resp); 3464 process_color_seq (op, Color_pointer_bg, str, resp);
3423 break; 3465 break;
3466#ifdef OPTION_HC
3467 case XTerm_Color_HC:
3468 process_color_seq (op, Color_HC, str, resp);
3469 break;
3470 case XTerm_Color_HTC:
3471 process_color_seq (op, Color_HTC, str, resp);
3472 break;
3473#endif
3424#ifndef NO_BOLD_UNDERLINE_REVERSE 3474#ifndef NO_BOLD_UNDERLINE_REVERSE
3425 case XTerm_Color_RV:
3426 process_color_seq (op, Color_RV, str, resp);
3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD: 3475 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp); 3476 process_color_seq (op, Color_BD, str, resp);
3431 break; 3477 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL: 3478 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp); 3479 process_color_seq (op, Color_UL, str, resp);
3435 break; 3480 break;
3436 case URxvt_Color_IT: 3481 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3482 process_color_seq (op, Color_IT, str, resp);
3438 break; 3483 break;
3439#endif 3484#endif
3440#if ENABLE_TRANSPARENCY && TINTING 3485 case URxvt_Color_border:
3486 process_color_seq (op, Color_border, str, resp);
3487 break;
3488
3489#if BG_IMAGE_FROM_ROOT
3441 case URxvt_Color_tint: 3490 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3491 process_color_seq (op, Color_tint, str, resp);
3492 {
3493 bool changed = false;
3443 3494
3444 check_our_parents (); 3495 if (ISSET_PIXCOLOR (Color_tint))
3496 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 3497
3446 if (am_transparent) 3498 if (changed)
3447 want_full_refresh = want_refresh = 1; 3499 update_background ();
3500 }
3448 3501
3449 break; 3502 break;
3450#endif 3503#endif
3451 3504
3505#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3506 case Rxvt_Pixmap:
3507 if (!strcmp (str, "?"))
3453 { 3508 {
3509 char str[256];
3510 int h_scale = fimage.h_scale;
3511 int v_scale = fimage.v_scale;
3512 int h_align = fimage.h_align;
3513 int v_align = fimage.v_align;
3514
3515 sprintf (str, "[%dx%d+%d+%d]",
3516 h_scale, v_scale,
3517 h_align, v_align);
3518 process_xterm_seq (XTerm_title, str, CHAR_ST);
3519 }
3520 else
3521 {
3522 bool changed = false;
3523
3454 if (*str != ';') 3524 if (*str != ';')
3455 { 3525 {
3456#if XPM_BACKGROUND 3526 try
3457 scale_pixmap (""); /* reset to default scaling */ 3527 {
3458 set_bgPixmap (str); /* change pixmap */ 3528 fimage.set_file_geometry (this, str);
3459 scr_touch (true); 3529 changed = true;
3460#endif 3530 }
3531 catch (const class rxvt_failure_exception &e)
3532 {
3533 }
3461 } 3534 }
3462 3535 else
3463 int changed = 0;
3464
3465 while ((str = strchr (str, ';')) != NULL)
3466 { 3536 {
3467 str++; 3537 str++;
3468#if XPM_BACKGROUND 3538 if (fimage.set_geometry (str, true))
3469 changed += scale_pixmap (str); 3539 changed = true;
3470#endif
3471 } 3540 }
3472 3541
3473 if (changed) 3542 if (changed)
3474 { 3543 {
3475#ifdef XPM_BACKGROUND 3544 if (bg_window_position_sensitive ())
3476 resize_pixmap (); 3545 {
3477 scr_touch (true); 3546 int x, y;
3478#endif 3547 get_window_origin (x, y);
3548 parent_x = x;
3549 parent_y = y;
3550 }
3551 update_background ();
3479 } 3552 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 } 3553 }
3485 break; 3554 break;
3486 3555#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3556
3494 case XTerm_logfile: 3557 case XTerm_logfile:
3495 // TODO, when secure mode? 3558 // TODO, when secure mode?
3496 break; 3559 break;
3497 3560
… …
3564 break; 3627 break;
3565#endif 3628#endif
3566 3629
3567#if ENABLE_PERL 3630#if ENABLE_PERL
3568 case URxvt_perl: 3631 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3632 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3633 break;
3572#endif 3634#endif
3573 } 3635 }
3574} 3636}
3575/*----------------------------------------------------------------------*/ 3637/*----------------------------------------------------------------------*/
… …
3582 * 's' = save 3644 * 's' = save
3583 * 'r' = restore 3645 * 'r' = restore
3584 * 't' = toggle 3646 * 't' = toggle
3585 * so no need for fancy checking 3647 * so no need for fancy checking
3586 */ 3648 */
3587int 3649int ecb_cold
3588rxvt_term::privcases (int mode, unsigned long bit) 3650rxvt_term::privcases (int mode, unsigned long bit)
3589{ 3651{
3590 int state; 3652 int state;
3591 3653
3592 if (mode == 's') 3654 if (mode == 's')
3593 { 3655 {
3594 SavedModes |= (priv_modes & bit); 3656 if (priv_modes & bit)
3657 SavedModes |= bit;
3658 else
3659 SavedModes &= ~bit;
3595 return -1; 3660 return -1;
3596 } 3661 }
3597 else 3662 else
3598 { 3663 {
3599 if (mode == 'r') 3664 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3665 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3666 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3667 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3668
3669 if (state)
3670 priv_modes |= bit;
3671 else
3672 priv_modes &= ~bit;
3604 } 3673 }
3605 3674
3606 return state; 3675 return state;
3607} 3676}
3608 3677
3609/* we're not using priv _yet_ */ 3678/* we're not using priv _yet_ */
3610void 3679void
3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3680rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3612{ 3681{
3613 unsigned int i, j; 3682 unsigned int i, j;
3614 int state; 3683 int state;
3615 3684
3616 static const struct 3685 static const struct
3617 { 3686 {
3618 const int argval; 3687 const int argval;
3619 const unsigned long bit; 3688 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3689 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3690 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3691 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, 3692 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3693 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3694 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3695 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3696 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3697 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3698 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3699 // 18 end FF to printer after print screen
3700 // 19 Print screen prints full screen/scroll region
3633 { 25, PrivMode_VisibleCursor }, 3701 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3703 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3704#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3705 { 35, PrivMode_ShiftKeys }, // rxvt extension
3706 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3707 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3708 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3709 // 45 margin bell NYI
3641 // 46 start logging 3710 // 46 start logging
3642 { 47, PrivMode_Screen }, 3711 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3712 { 66, PrivMode_aplKP }, // DECNKM
3644#ifndef NO_BACKSPACE_KEY 3713#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3714 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3715#endif
3647 { 1000, PrivMode_MouseX11 }, 3716 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3717 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3718 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3719#if ENABLE_FRILLS
3720 { 1005, PrivMode_ExtModeMouse },
3721#endif
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3722 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3723 { 1011, PrivMode_Keypress }, // rxvt extension
3724#if ENABLE_FRILLS
3725 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3726#endif
3653 // 1035 enable modifiers for alt, numlock NYI 3727 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3728 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3729 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3730 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3731 // 1048 save and restore cursor, implemented in code
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3732 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3733 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3734 { 2004, PrivMode_BracketPaste },
3660 }; 3735 };
3661 3736
3662 if (nargs == 0) 3737 if (nargs == 0)
3663 return; 3738 return;
3664 3739
… …
3671 for (i = 0; i < nargs; i++) 3746 for (i = 0; i < nargs; i++)
3672 { 3747 {
3673 state = -1; 3748 state = -1;
3674 3749
3675 /* basic handling */ 3750 /* basic handling */
3676 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3751 for (j = 0; j < ecb_array_length (argtopriv); j++)
3677 if (argtopriv[j].argval == arg[i]) 3752 if (argtopriv[j].argval == arg[i])
3678 { 3753 {
3679 state = privcases (mode, argtopriv[j].bit); 3754 state = privcases (mode, argtopriv[j].bit);
3680 break; 3755 break;
3681 } 3756 }
… …
3689 3764
3690 scr_touch (true); 3765 scr_touch (true);
3691 break; 3766 break;
3692#endif 3767#endif
3693 case 1048: /* alternative cursor save */ 3768 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3770 if (mode == 0)
3697 scr_cursor (RESTORE); 3771 scr_cursor (RESTORE);
3698 else if (mode == 1) 3772 else if (mode == 1)
3699 scr_cursor (SAVE); 3773 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3782 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3783 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3784 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3785 * within VT52 mode
3712 */ 3786 */
3713 PrivMode (1, PrivMode_vt52); 3787 priv_modes |= PrivMode_vt52;
3714 break; 3788 break;
3715 case 3: /* 80/132 */ 3789 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3790 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3791 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3792 break;
3719 case 4: /* smooth scrolling */ 3793 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3794 set_option (Opt_jumpScroll, !state);
3721 break; 3795 break;
3722 case 5: /* reverse video */ 3796 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3803 scr_autowrap (state);
3730 break; 3804 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3805 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3806 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3807 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3808 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3809 break;
3736#ifdef scrollBar_esc 3810#ifdef scrollBar_esc
3737 case scrollBar_esc: 3811 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3812 scrollBar.map (state);
3739 {
3740 resize_all_windows (0, 0, 0); 3813 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3814 scr_touch (true);
3742 }
3743 break; 3815 break;
3744#endif 3816#endif
3745 case 25: /* visible/invisible cursor */ 3817 case 25: /* visible/invisible cursor */
3746 scr_cursor_visible (state); 3818 scr_cursor_visible (state);
3747 break; 3819 break;
… …
3752 break; 3824 break;
3753 /* case 66: - application key pad */ 3825 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3826 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3827 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3828 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3829 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3830 break;
3759#if 0
3760 case 1001: 3831 case 1002:
3761 break; /* X11 mouse highlighting */ 3832 case 1003:
3762#endif 3833 if (state)
3834 {
3835 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3836 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3837 mouse_row = mouse_col = 0;
3838 vt_emask_mouse = PointerMotionMask;
3839 }
3840 else
3841 vt_emask_mouse = NoEventMask;
3842
3843 vt_select_input ();
3844 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3845 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3846 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3847 break;
3766 case 1011: /* scroll to bottom on key press */ 3848 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3849 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3850 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3851 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3852 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3853 if (!state)
3772 scr_erase_screen (2); 3854 scr_erase_screen (2);
3855
3773 scr_change_screen (state); 3856 scr_change_screen (state);
3774 break; 3857 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3858 case 1049: /* secondary screen w/ clearing first */
3859 if (option (Opt_secondaryScreen))
3860 if (state)
3861 scr_cursor (SAVE);
3862
3776 scr_change_screen (state); 3863 scr_change_screen (state);
3864
3777 if (option (Opt_secondaryScreen)) 3865 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3866 if (state)
3779 scr_erase_screen (2); 3867 scr_erase_screen (2);
3868 else
3869 scr_cursor (RESTORE);
3780 break; 3870 break;
3781 default: 3871 default:
3782 break; 3872 break;
3783 } 3873 }
3784 } 3874 }
3785} 3875}
3786/*}}} */ 3876/*}}} */
3787 3877
3788/*{{{ process sgr sequences */ 3878/*{{{ process sgr sequences */
3789void 3879void ecb_hot
3790rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3880rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3791{ 3881{
3792 unsigned int i; 3882 unsigned int i;
3793 short rendset; 3883 short rendset;
3794 int rendstyle; 3884 int rendstyle;
… …
3935 break; 4025 break;
3936#endif 4026#endif
3937 } 4027 }
3938 } 4028 }
3939} 4029}
4030
4031void
4032rxvt_term::set_cursor_style (int style)
4033{
4034 if (!IN_RANGE_INC (style, 0, 4))
4035 return;
4036
4037 set_option (Opt_cursorUnderline, style >= 3);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1));
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3940/*}}} */ 4046/*}}} */
3941 4047
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void
3944rxvt_term::process_graphics ()
3945{
3946 unicode_t ch, cmd = cmd_getc ();
3947
3948 if (cmd == 'Q')
3949 { /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */
3951 return;
3952 }
3953 /* swallow other graphics sequences until terminating ':' */
3954 do
3955 ch = cmd_getc ();
3956 while (ch != ':');
3957}
3958/*}}} */
3959
3960/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
3961 4052
3962/* 4053/*
3963 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
3964 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
3965 */ 4056 */
… …
3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3974 va_end (arg_ptr); 4065 va_end (arg_ptr);
3975 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
3976} 4067}
3977 4068
3978/* ---------------------------------------------------------------------- */
3979/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
3980 * or generated by us in response to a query ESC sequence. 4070void
3981 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
3983 4085
3984void 4086void
3985rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
3986{ 4088{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3988 return; 4090 return;
3989 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
3990 if (pty->pty < 0) 4100 if (pty->pty < 0)
3991 return; 4101 return;
3992 4102
3993 if (v_buflen == 0) 4103 if (v_buflen == 0)
3994 { 4104 {
3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4105 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3996 4106
4107 max_it (written, 0);
4108
3997 if ((unsigned int)written == len) 4109 if (written == len)
3998 return; 4110 return;
3999 4111
4000 data += written; 4112 data += written;
4001 len -= written; 4113 len -= written;
4002 } 4114 }
4003 4115
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4116 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4005 4117
4006 memcpy (v_buffer + v_buflen, data, len); 4118 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4119 v_buflen += len;
4008 4120
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4121 pty_ev.set (ev::READ | ev::WRITE);
4010} 4122}
4011 4123
4012void rxvt_term::pty_write () 4124void rxvt_term::pty_write ()
4013{ 4125{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4126 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4131
4020 if (v_buflen == 0) 4132 if (v_buflen == 0)
4021 { 4133 {
4022 free (v_buffer); 4134 free (v_buffer);
4023 v_buffer = 0; 4135 v_buffer = 0;
4024 v_buflen = 0;
4025 4136
4026 pty_ev.set (EVENT_READ); 4137 pty_ev.set (ev::READ);
4027 return; 4138 return;
4028 } 4139 }
4029 4140
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4141 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4142 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4143 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4144 pty_ev.set (ev::READ);
4034} 4145}
4035 4146
4036/*----------------------- end-of-file (C source) -----------------------*/ 4147/*----------------------- end-of-file (C source) -----------------------*/
4037 4148

Diff Legend

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