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.602 by sf-exg, Sat May 6 08:01:35 2023 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-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 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);
177 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
179 } 176 }
180 else 177 else
181# endif 178# endif
… …
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 - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !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 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
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; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
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)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 837# endif
520 return; 838 return;
521 } 839 }
522 else 840 else
523 { 841 {
524# if ENABLE_OVERLAY 842# if ISO_14755
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 856 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 857# endif
539 } 858 }
540#endif 859#endif
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#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 } 868 }
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 869
887 if (len <= 0) 870 if (len <= 0)
888 return; /* not mapped */ 871 return; /* not mapped */
889 872
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
923} 874}
924 875
925void 876void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
927{ 878{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 880 KeySym keysym;
930 881
… …
934#if ENABLE_FRILLS || ISO_14755 885#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 886 // ISO 14755 support
936 if (iso14755buf) 887 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 888 if (iso14755buf & ISO_14755_52)
938 { 889 {
939# if ENABLE_OVERLAY 890# if ISO_14755
940 scr_overlay_off (); 891 scr_overlay_off ();
941# endif 892# endif
942# if ISO_14755 893# if ISO_14755
943 // iso14755 part 5.2 handling: release time 894 // iso14755 part 5.2 handling: release time
944 // first: controls 895 // first: controls
… …
950 commit_iso14755 (); 901 commit_iso14755 ();
951 902
952 return; 903 return;
953 } 904 }
954 905
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 907 if (i[0] == keysym)
957 { 908 {
958 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 910 commit_iso14755 ();
960 911
… …
967 918
968 return; 919 return;
969 } 920 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 921 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 922 {
972# if ENABLE_OVERLAY 923# if ISO_14755
973 scr_overlay_off (); 924 scr_overlay_off ();
974# endif 925# endif
975 if (iso14755buf & ISO_14755_51) 926 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 927 commit_iso14755 ();
977#if ISO_14755 928#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
999#endif 950#endif
1000} 951}
1001 952
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 953void
1036rxvt_term::flush () 954rxvt_term::flush ()
1037{ 955{
1038 flush_ev.stop (); 956 flush_ev.stop ();
1039 957
1040#ifdef ENABLE_TRANSPARENCY 958#ifdef HAVE_IMG
1041 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 960 {
1043 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 962 scr_touch (false);
1046 } 963 }
1047#endif 964#endif
1048 965
1049 if (want_refresh) 966 if (want_refresh)
… …
1085 } 1002 }
1086 while (row < end_row); 1003 while (row < end_row);
1087 } 1004 }
1088 1005
1089 scr_refresh (); 1006 scr_refresh ();
1090 scrollbar_show (1); 1007 scrollBar.show (1);
1091#ifdef USE_XIM 1008#if USE_XIM
1092 IMSendSpot (); 1009 im_send_spot ();
1093#endif 1010#endif
1094 } 1011 }
1095 1012
1096 display->flush (); 1013 display->flush ();
1097} 1014}
1098 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1099void 1017void
1100rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1101{ 1019{
1102 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start ();
1103 1022
1104 display->flush (); 1023 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1024}
1109 1025
1110void 1026void
1111rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1028{
1113 make_current (); 1029 make_current ();
1114 1030
1115 refresh_count = 0; 1031 refresh_count = 0;
1116 flush (); 1032 flush ();
1117} 1033}
1118 1034
1119#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1120void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1056{
1123 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1058 want_refresh = 1;
1125 1059 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1060}
1128#endif 1061#endif
1129 1062
1130#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1131void 1064void
1132rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1066{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1068 {
1136 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1137 want_refresh = 1; 1070 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1139 } 1072 }
1073 else
1074 w.stop ();
1140} 1075}
1141#endif 1076#endif
1142 1077
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1079void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1081{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1149 { 1084 {
1150 want_refresh = 1; 1085 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1152 } 1087 }
1088 else
1089 w.stop ();
1153} 1090}
1154#endif 1091#endif
1155 1092
1156#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1157void 1094void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1096{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1161 { 1098 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1100 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1165 } 1102 }
1103 else
1104 w.stop ();
1166} 1105}
1167#endif 1106#endif
1168 1107
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1109void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1111{
1173 if (mouse_slip_wheel_speed == 0 1112 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 { 1113 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1114 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1182 } 1122 }
1183} 1123}
1184#endif 1124#endif
1185 1125
1186#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1187static struct event_handler 1127static struct event_handler
1188{ 1128{
1189 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1190 1130
1191 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1192 { 1132 {
1193 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1134 // 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 1135 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1197 1140
1198 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1200 1143
1201 w.stop (); 1144 w.stop ();
1202 } 1145 }
1203 1146
… …
1206 { 1149 {
1207 } 1150 }
1208} event_handler; 1151} event_handler;
1209#endif 1152#endif
1210 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1211bool 1187bool
1212rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1213{ 1189{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1215 1191
1216 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1193
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1219 n = 0;
1220 } 1195 {
1221 1196 // 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; 1197 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1225 1201
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1203
1228 if (r > 0) 1204 if (r > 0)
1229 { 1205 {
1230 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1231 return true; 1207 return true;
… …
1247 1223
1248 return false; 1224 return false;
1249} 1225}
1250 1226
1251void 1227void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1229{
1254 make_current (); 1230 make_current ();
1255 1231
1256 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1235 cmd_parse ();
1260 break;
1261 1236
1262 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1263 pty_write (); 1238 pty_write ();
1264}
1265 1239
1266void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1267rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1268{ 1245{
1269 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor (); 1247 recolor_cursor ();
1271 1248
1272#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1250 hidden_pointer = 0;
1274 1251
1275 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1277#endif 1254#endif
1278} 1255}
1279 1256
1280#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1281void 1258void ecb_cold
1282rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1283{ 1260{
1284 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1285 return; 1262 return;
1286 1263
… …
1288 XFlush (dpy); 1265 XFlush (dpy);
1289 1266
1290 hidden_pointer = 1; 1267 hidden_pointer = 1;
1291} 1268}
1292 1269
1293void 1270void ecb_cold
1294rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1272{
1296 make_current (); 1273 make_current ();
1297 1274
1298 pointer_blank (); 1275 pointer_blank ();
1299} 1276}
1300#endif 1277#endif
1301 1278
1302void 1279void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1281{
1305 int button_number, key_state = 0; 1282 int button_number, state = 0;
1306 int x, y; 1283 int x, y;
1284 bool release = ev.type == ButtonRelease;
1307 1285
1308 x = ev.x; 1286 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1309 y = ev.y; 1287 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1310 pixel_position (&x, &y);
1311 1288
1312 if (MEvent.button == AnyButton) 1289 if (ev.type == MotionNotify)
1313 button_number = 3; 1290 {
1314 else 1291 if (x == mouse_row && y == mouse_col)
1292 return;
1293
1294 mouse_row = x;
1295 mouse_col = y;
1296 state += 32;
1315 { 1297 }
1298
1316 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1300 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1318 if (button_number >= 3) 1304 else if (button_number >= 3)
1319 button_number += (64 - 3); 1305 button_number += 64 - 3;
1320 }
1321 1306
1322 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1323 { 1308 {
1324 /* 1309 /*
1325 * do not report ButtonRelease 1310 * do not report ButtonRelease
1326 * no state info allowed 1311 * no state info allowed
1327 */ 1312 */
1328 key_state = 0; 1313 if (release)
1329 if (button_number == 3)
1330 return; 1314 return;
1331 } 1315 }
1332 else 1316 else
1333 { 1317 {
1334 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1336 * 8 = Meta 1320 * 8 = Meta
1337 * 16 = Control 1321 * 16 = Control
1338 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1339 * 32 = Double Click 1323 * 32 = Double Click
1340 */ 1324 */
1341 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1342 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1343 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1344#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1345 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1346#endif 1330#endif
1347 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1348 1334
1349#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1350 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1351 if (key_state & 16) 1337 if (state & 16)
1352 fputc ('C', stderr); 1338 fputc ('C', stderr);
1353 if (key_state & 4) 1339 if (state & 4)
1354 fputc ('S', stderr); 1340 fputc ('S', stderr);
1355 if (key_state & 8) 1341 if (state & 8)
1356 fputc ('A', stderr); 1342 fputc ('A', stderr);
1357 if (key_state & 32) 1343 if (state & 32)
1358 fputc ('2', stderr); 1344 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1346 button_number,
1361 x + 1, 1347 x,
1362 y + 1); 1348 y);
1363#endif 1349#endif
1364 1350
1351#if ENABLE_FRILLS
1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1359 tt_printf ("\033[%d;%d;%dM",
1360 code,
1361 x,
1362 y);
1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1375 else
1376#endif
1365 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1378 code,
1367 (32 + x + 1), 1379 32 + x,
1368 (32 + y + 1)); 1380 32 + y);
1369} 1381}
1370 1382
1371/*{{{ process an X event */ 1383/*{{{ process an X event */
1372void 1384void ecb_hot
1373rxvt_term::x_cb (XEvent &ev) 1385rxvt_term::x_cb (XEvent &ev)
1374{ 1386{
1375 make_current (); 1387 make_current ();
1376 1388
1377 dLocal (Display *, dpy); 1389 dLocal (Display *, dpy);
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1445 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1446 focus_out ();
1435 } 1447 }
1436#endif 1448#endif
1437 } 1449 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1450 break;
1443 1451
1444 /* 1452 /*
1445 * XXX: this is not the _current_ arrangement 1453 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1454 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1487 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1488 focus_out ();
1481 break; 1489 break;
1482 1490
1483 case ConfigureNotify: 1491 case ConfigureNotify:
1484 if (ev.xconfigure.window == parent[0]) 1492 if (ev.xconfigure.window == parent)
1485 { 1493 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1495 ;
1496
1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1498
1499 if (want_position_change)
1500 {
1501 int x, y;
1502
1503 if (ev.xconfigure.send_event)
1504 {
1505 x = ev.xconfigure.x;
1506 y = ev.xconfigure.y;
1507 }
1508 else
1509 get_window_origin (x, y);
1510
1511 if (x != parent_x || y != parent_y)
1512 {
1513 parent_x = x;
1514 parent_y = y;
1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1516 }
1517 }
1488 1518
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1520 {
1491 seen_resize = 1; 1521 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 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 } 1523 }
1501 1524
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 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 } 1526 }
1509 break; 1527 break;
1510 1528
1511 case PropertyNotify: 1529 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1530 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; 1531 break;
1518 1532
1519 case SelectionClear: 1533 case SelectionClear:
1520 selection_clear (); 1534 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; 1535 break;
1527 1536
1528 case SelectionRequest: 1537 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1530 break; 1539 break;
1531 1540
1532 case MapNotify: 1541 case MapNotify:
1533 mapped = 1; 1542 mapped = 1;
1534#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1544 text_blink_ev.start ();
1536#endif 1545#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1547 break;
1539 1548
1540 case UnmapNotify: 1549 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1544#endif 1553#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1555 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1556
1554 case GraphicsExpose: 1557 case GraphicsExpose:
1555 case Expose: 1558 case Expose:
1556 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1557 { 1560 {
1558 do 1561 do
1562 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, false);
1565 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1567
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1569
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, false);
1574 }
1568 1575
1569 want_refresh = 1; 1576 want_refresh = 1;
1570 } 1577 }
1571 else 1578 else
1572 { 1579 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1582 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1583 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1585 ;
1579 1586
1580 if (isScrollbarWindow (ev.xany.window)) 1587 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1588 {
1582 scrollBar.setIdle (); 1589 scrollBar.state = SB_STATE_IDLE;
1583 scrollbar_show (0); 1590 scrollBar.show (0);
1584 } 1591 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1592 }
1591 break; 1593 break;
1592 1594
1593 case MotionNotify: 1595 case MotionNotify:
1594#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1597 if (hidden_pointer)
1596 pointer_unblank (); 1598 pointer_unblank ();
1597#endif 1599#endif
1600 if (!bypass_keystate
1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1602 || priv_modes & PrivMode_MouseAnyEvent))
1603 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1605 break;
1600 1606
1601 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
1602 { 1608 {
… …
1613 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1614 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1615 &ev.xbutton.state); 1621 &ev.xbutton.state);
1616#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1617 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1618 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1619 { 1626 {
1620#endif
1621#if ISO_14755 1627#if ISO_14755
1622 // 5.4 1628 // 5.4
1623 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1624 { 1630 {
1625 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1631 1637
1632#ifdef SELECTION_SCROLLING 1638#ifdef SELECTION_SCROLLING
1633 if (ev.xbutton.y < int_bwidth 1639 if (ev.xbutton.y < int_bwidth
1634 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1640 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1635 { 1641 {
1642 page_dirn scroll_selection_dir;
1636 int dist; 1643 int dist;
1637 1644
1638 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1640 */ 1647 */
1641 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1650
1644 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1646 */ 1653 */
1647 selection_save_x = ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
… …
1655 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1656 } 1663 }
1657 else 1664 else
1658 { 1665 {
1659 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1660 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1661 } 1668 }
1662 1669
1663 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1664 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1665 + 1; 1672 + 1;
1666 min_it (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1667 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1675 scroll_selection_lines *= scroll_selection_dir;
1668 } 1676 }
1669 else 1677 else
1670 { 1678 {
1671 /* we are within the text window, so we 1679 /* we are within the text window, so we
1672 * shouldn't be scrolling 1680 * shouldn't be scrolling
1673 */ 1681 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1676 } 1683 }
1677#endif 1684#endif
1678#ifdef MOUSE_THRESHOLD
1679 } 1685 }
1680#endif
1681 } 1686 }
1682 } 1687 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1689 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1691 MotionNotify, &ev))
1687 ; 1692 ;
1688 1693
1689 XQueryPointer (dpy, scrollBar.win, 1694 XQueryPointer (dpy, scrollBar.win,
1690 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1698 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1700 scrollBar.size ());
1696 want_refresh = 1; 1701 want_refresh = 1;
1697 scrollbar_show (1); 1702 scrollBar.show (1);
1698 } 1703 }
1699 break; 1704 break;
1700 } 1705 }
1701 1706
1702#if defined(CURSOR_BLINK) 1707#if defined(CURSOR_BLINK)
1703 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1708 if (ev.type == KeyPress)
1704 { 1709 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 1710#endif
1714 1711
1715#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 { 1714 {
… …
1723 1720
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1722 pointer_blank ();
1726 } 1723 }
1727#endif 1724#endif
1728}
1729 1725
1730void 1726 refresh_check ();
1727}
1728
1729#if ENABLE_FRILLS
1730void ecb_cold
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable;
1741 XFree (h);
1742 }
1743}
1744#endif
1745
1746void ecb_cold
1731rxvt_term::focus_in () 1747rxvt_term::focus_in ()
1732{ 1748{
1733 if (!focus) 1749 if (!focus)
1734 { 1750 {
1735 focus = 1; 1751 focus = 1;
1736 want_refresh = 1; 1752 want_refresh = 1;
1737 1753
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1754#if USE_XIM
1741 if (Input_Context != NULL) 1755 if (Input_Context != NULL)
1742 { 1756 {
1743 IMSetPosition (); 1757 im_set_position ();
1744 XSetICFocus (Input_Context); 1758 XSetICFocus (Input_Context);
1745 } 1759 }
1746#endif 1760#endif
1747#if CURSOR_BLINK 1761#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1762 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1763 cursor_blink_ev.again ();
1750#endif 1764#endif
1751#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1753 { 1767 {
1754 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1769 scr_recolor ();
1756 } 1770 }
1757#endif 1771#endif
1758#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1760 { 1774 set_urgency (0);
1761 XWMHints *h;
1762 1775
1763 h = XGetWMHints(dpy, parent[0]); 1776 if (priv_modes & PrivMode_FocusEvent)
1764 if (h != NULL) 1777 tt_printf ("\x1b[I");
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1778#endif
1771 }
1772}
1773 1779
1774void 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 }
1782}
1783
1784void ecb_cold
1775rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1776{ 1786{
1777 if (focus) 1787 if (focus)
1778 { 1788 {
1779 focus = 0; 1789 focus = 0;
1780 want_refresh = 1; 1790 want_refresh = 1;
1781 1791
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1792#if ENABLE_FRILLS
1793 if (option (Opt_urgentOnBell))
1794 set_urgency (0);
1783 1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1798#endif
1784#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1800 if (iso14755buf)
1786 { 1801 {
1787 iso14755buf = 0; 1802 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1803# if ISO_14755
1789 scr_overlay_off (); 1804 scr_overlay_off ();
1790# endif 1805# endif
1791 } 1806 }
1792#endif 1807#endif
1793#if USE_XIM 1808#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1810 XUnsetICFocus (Input_Context);
1796#endif 1811#endif
1797#if CURSOR_BLINK 1812#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1813 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1814 cursor_blink_ev.stop ();
1815
1800 hidden_cursor = 0; 1816 hidden_cursor = 0;
1801#endif 1817#endif
1802#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1804 { 1820 {
1805 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1822 scr_recolor ();
1807 } 1823 }
1808#endif 1824#endif
1809 }
1810}
1811 1825
1812void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1813rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1814{ 1832{
1815#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1817 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1818 rgba c; 1839 rgba c;
1819 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1842 }
1822#endif 1843#endif
1823} 1844}
1824 1845
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1846#if ENABLE_PERL
1826void 1847void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1849{
1829 make_current (); 1850 make_current ();
1830 1851
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1852 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1853 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1854 return;
1834 1855
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1856 switch (ev.type)
1837 { 1857 {
1838 case PropertyNotify: 1858 case PropertyNotify:
1839 /* 1859 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1860 * 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. 1861 * use the property to determine the pixmap. We use it later on.
1842 */ 1862 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1865 {
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867 }
1846 1868
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1869 break;
1852 } 1870 }
1853# endif 1871
1872 refresh_check ();
1854} 1873}
1855#endif 1874#endif
1856 1875
1857void 1876void
1858rxvt_term::button_press (XButtonEvent &ev) 1877rxvt_term::button_press (XButtonEvent &ev)
… …
1879 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1880 return; 1899 return;
1881 } 1900 }
1882#endif 1901#endif
1883 1902
1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1885 1904
1886 if (reportmode) 1905 if (reportmode)
1887 { 1906 {
1888 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1889 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
1890 MEvent.state = ev.state; 1909 MEvent.state = ev.state;
1891#ifdef MOUSE_REPORT_DOUBLECLICK 1910#ifdef MOUSE_REPORT_DOUBLECLICK
1892 if (ev.button == MEvent.button && clickintime) 1911 if (ev.button == MEvent.button && clickintime)
1893 { 1912 {
1894 /* same button, within alloted time */ 1913 /* same button, within allowed time */
1895 MEvent.clicks++; 1914 MEvent.clicks++;
1896 1915
1897 if (MEvent.clicks > 1) 1916 if (MEvent.clicks > 1)
1898 { 1917 {
1899 /* only report double clicks */ 1918 /* only report double clicks */
… …
1913 mouse_report (ev); 1932 mouse_report (ev);
1914 } 1933 }
1915#else 1934#else
1916 MEvent.button = ev.button; 1935 MEvent.button = ev.button;
1917 mouse_report (ev); 1936 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1937#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1938
1920 } 1939 }
1921 else 1940 else
1922 { 1941 {
1923 if (ev.button != MEvent.button) 1942 if (ev.button != MEvent.button)
… …
1971 } 1990 }
1972 1991
1973 /* 1992 /*
1974 * Scrollbar window processing of button press 1993 * Scrollbar window processing of button press
1975 */ 1994 */
1976 if (isScrollbarWindow (ev.window)) 1995 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1996 {
1978 scrollBar.setIdle (); 1997 page_dirn direction = NO_DIR;
1998
1999 if (scrollBar.upButton (ev.y))
2000 direction = UP; /* up */
2001 else if (scrollBar.dnButton (ev.y))
2002 direction = DN; /* down */
2003
2004 scrollBar.state = SB_STATE_IDLE;
1979 /* 2005 /*
1980 * Rxvt-style scrollbar: 2006 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 2007 * move up if mouse is above slider
1982 * move dn if mouse is below slider 2008 * move dn if mouse is below slider
1983 * 2009 *
… …
1992 /* 2018 /*
1993 * Mouse report disabled scrollbar: 2019 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 2020 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 2021 * click on scrollbar - send pageup/down
1996 */ 2022 */
1997 if ((scrollBar.style == R_SB_NEXT 2023 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 2024 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 2025 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"); 2026 tt_printf ("\033[B");
2007 else 2027 else
2008 switch (ev.button) 2028 switch (ev.button)
2009 { 2029 {
2010 case Button2: 2030 case Button2:
… …
2017 tt_printf ("\033[5~"); 2037 tt_printf ("\033[5~");
2018 break; 2038 break;
2019 } 2039 }
2020 } 2040 }
2021 else 2041 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2042#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2043 {
2029 if (scrollbarnext_upButton (ev.y)) 2044 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 { 2045 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2047 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2048 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2049#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2050 if (scr_page (direction, 1))
2047 { 2051 {
2048 if (upordown < 0) 2052 if (direction == UP)
2049 scrollBar.setUp (); 2053 scrollBar.state = SB_STATE_UP;
2050 else 2054 else
2051 scrollBar.setDn (); 2055 scrollBar.state = SB_STATE_DOWN;
2052 } 2056 }
2053 } 2057 }
2054 else 2058 else
2055 switch (ev.button) 2059 switch (ev.button)
2056 { 2060 {
2057 case Button2: 2061 case Button2:
2058 switch (scrollbar_align) 2062 switch (scrollBar.align)
2059 { 2063 {
2060 case R_SB_ALIGN_TOP: 2064 case SB_ALIGN_TOP:
2061 csrO = 0; 2065 csrO = 0;
2062 break; 2066 break;
2063 case R_SB_ALIGN_CENTRE: 2067 case SB_ALIGN_CENTRE:
2064 csrO = (scrollBar.bot - scrollBar.top) / 2; 2068 csrO = (scrollBar.bot - scrollBar.top) / 2;
2065 break; 2069 break;
2066 case R_SB_ALIGN_BOTTOM: 2070 case SB_ALIGN_BOTTOM:
2067 csrO = scrollBar.bot - scrollBar.top; 2071 csrO = scrollBar.bot - scrollBar.top;
2068 break; 2072 break;
2069 } 2073 }
2070 2074
2071 if (scrollBar.style == R_SB_XTERM 2075 if (scrollBar.style == SB_STYLE_XTERM
2072 || scrollbar_above_slider (ev.y) 2076 || scrollBar.above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2077 || scrollBar.below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2078 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2075 2079
2076 scrollBar.setMotion (); 2080 scrollBar.state = SB_STATE_MOTION;
2077 break; 2081 break;
2078 2082
2079 case Button1: 2083 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2084 if (scrollBar.align == SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2085 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2086 /* FALLTHROUGH */
2083 2087
2084 case Button3: 2088 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2089 if (scrollBar.style != SB_STYLE_XTERM)
2086 { 2090 {
2087 if (scrollbar_above_slider (ev.y)) 2091 if (scrollBar.above_slider (ev.y))
2088# ifdef RXVT_SCROLL_FULL 2092# ifdef RXVT_SCROLL_FULL
2089 scr_page (UP, nrow - 1); 2093 scr_page (UP, nrow - 1);
2090# else 2094# else
2091 scr_page (UP, nrow / 4); 2095 scr_page (UP, nrow / 4);
2092# endif 2096# endif
2093 else if (scrollbar_below_slider (ev.y)) 2097 else if (scrollBar.below_slider (ev.y))
2094# ifdef RXVT_SCROLL_FULL 2098# ifdef RXVT_SCROLL_FULL
2095 scr_page (DN, nrow - 1); 2099 scr_page (DN, nrow - 1);
2096# else 2100# else
2097 scr_page (DN, nrow / 4); 2101 scr_page (DN, nrow / 4);
2098# endif 2102# endif
2099 else 2103 else
2100 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2101 } 2105 }
2102 else 2106 else
2103 { 2107 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2108 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2109 (nrow
2106 * scrollbar_position (ev.y) 2110 * scrollBar.position (ev.y)
2107 / scrollbar_size ())); 2111 / scrollBar.size ()));
2108 } 2112 }
2109 2113
2110 break; 2114 break;
2111 } 2115 }
2112 } 2116 }
… …
2122 2126
2123 csrO = 0; /* reset csr Offset */ 2127 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2128 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2129 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2130
2127 if (scrollbar_isUpDn ()) 2131 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2128 { 2132 {
2129 scrollBar.setIdle (); 2133 scrollBar.state = SB_STATE_IDLE;
2130 scrollbar_show (0); 2134 scrollBar.show (0);
2131 } 2135 }
2132 2136
2133#ifdef SELECTION_SCROLLING 2137#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
2136#endif 2139#endif
2137 2140
2138 if (ev.window == vt) 2141 if (ev.window == vt)
2139 { 2142 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2143 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2148 2151
2149 if (reportmode) 2152 if (reportmode)
2150 { 2153 {
2151 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2152 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2153 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2154 return; 2157 return;
2155#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2156 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2157 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2158 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2159 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2160 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2161 { 2164 {
2162 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2163 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2164 mouse_report (ev); 2167 mouse_report (ev);
2165 } 2168 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2168 mouse_report (ev); 2171 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2173 return;
2171 } 2174 }
2172 2175
2173 /* 2176 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2177 * dumb hack to compensate for the failure of click-and-drag
… …
2185 case Button3: 2188 case Button3:
2186 selection_make (ev.time); 2189 selection_make (ev.time);
2187 break; 2190 break;
2188 2191
2189 case Button2: 2192 case Button2:
2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 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); 2194 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2195 break;
2193 2196
2194#ifdef MOUSE_WHEEL 2197#ifdef MOUSE_WHEEL
2195 case Button4: 2198 case Button4:
2196 case Button5: 2199 case Button5:
2197 { 2200 {
2198 int i; 2201 int lines;
2199 page_dirn v; 2202 page_dirn dirn;
2200 2203
2201 v = ev.button == Button4 ? UP : DN; 2204 dirn = ev.button == Button4 ? UP : DN;
2202 2205
2203 if (ev.state & ShiftMask) 2206 if (ev.state & ShiftMask)
2204 i = 1; 2207 lines = 1;
2205 else if (option (Opt_mouseWheelScrollPage)) 2208 else if (option (Opt_mouseWheelScrollPage))
2206 i = nrow - 1; 2209 lines = nrow - 1;
2207 else 2210 else
2208 i = 5; 2211 lines = 5;
2209 2212
2210# ifdef MOUSE_SLIP_WHEELING 2213# ifdef MOUSE_SLIP_WHEELING
2211 if (ev.state & ControlMask) 2214 if (ev.state & ControlMask)
2212 { 2215 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2216 mouse_slip_wheel_speed += dirn;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2217 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2218
2217 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2221 }
2222 else 2222 else
2223# endif
2223 { 2224 {
2224# endif
2225 scr_page (v, i); 2225 scr_page (dirn, lines);
2226 scrollbar_show (1); 2226 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2227 }
2229# endif
2230 } 2228 }
2231 break; 2229 break;
2232#endif 2230#endif
2233 } 2231 }
2234 } 2232 }
2235} 2233}
2236 2234
2237/*}}} */ 2235/*}}} */
2238 2236
2239bool 2237void ecb_hot
2240rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2241{ 2239{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2245 2242
2246 for (;;) 2243 for (;;)
2247 { 2244 {
2248 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2249 { 2246 {
2250 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2248 ch = next_char ();
2252 2249
2253 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2254 break; 2251 break;
2255 } 2252 }
2256 2253
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2255 {
2259 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2260 { 2257 {
2261 seen_input = 1; 2258 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2274 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2276
2280 for (;;) 2277 for (;;)
2281 { 2278 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2280 break;
2284 2281
2285 *str++ = ch; 2282 *str++ = ch;
2286 2283
2287 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2288 { 2285 {
2289 if (ch == C0_LF) 2286 if (ch == C0_LF)
2290 nlines++; 2287 nlines++;
2291 2288
2292 refresh_count++; 2289 refresh_count++;
2293 2290
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2292 {
2296 refresh_count = 0; 2293 refresh_count = 0;
2297 2294
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2296 {
2300 refreshnow = true; 2297 refreshnow = true;
2301 ch = NOCHAR; 2298 ch = NOCHAR;
2302 break; 2299 break;
2303 } 2300 }
… …
2341 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2343 */ 2340 */
2344 if (refreshnow) 2341 if (refreshnow)
2345 { 2342 {
2346 flag = true;
2347 scr_refresh (); 2343 scr_refresh ();
2348 want_refresh = 1; 2344 want_refresh = 1;
2349 } 2345 }
2350
2351 } 2346 }
2352 else 2347 else
2353 { 2348 {
2354 try 2349 try
2355 { 2350 {
… …
2363 } 2358 }
2364 2359
2365 ch = NOCHAR; 2360 ch = NOCHAR;
2366 } 2361 }
2367 } 2362 }
2368
2369 return flag;
2370} 2363}
2371 2364
2372// read the next character 2365// read the next character
2373wchar_t 2366wchar_t ecb_hot
2374rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2375{ 2368{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2370 {
2378 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2380 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2381 2374
2382 wchar_t wc; 2375 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2377
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2382 break;
2390 } 2383 }
2391 2384
2392 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // 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 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2394 2392
2395 // assume wchar == unicode 2393 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2398 } 2396 }
2399 2397
2400 return NOCHAR; 2398 return NOCHAR;
2401} 2399}
2402 2400
2403// read the next octet 2401// read the next octet
2404uint32_t 2402uint32_t ecb_hot
2405rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2406{ 2404{
2407 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2408 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR; 2407 : NOCHAR;
2410} 2408}
2411 2409
2412static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2413 2411
2414/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2415/* 2413rxvt_term::cmd_getc ()
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))
2421{ 2414{
2422 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2423 2416
2424 if (c == NOCHAR) 2417 if (c == NOCHAR)
2425 throw out_of_input; 2418 throw out_of_input;
2426 2419
2427 return c; 2420 return c;
2428} 2421}
2429 2422
2430uint32_t 2423uint32_t ecb_hot
2431rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2432{ 2425{
2433 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2434 2427
2435 if (c == NOCHAR) 2428 if (c == NOCHAR)
2436 throw out_of_input; 2429 throw out_of_input;
… …
2439} 2432}
2440 2433
2441/*{{{ print pipe */ 2434/*{{{ print pipe */
2442/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2444FILE * 2437FILE * ecb_cold
2445rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2446{ 2439{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2441
2449 if (stream == NULL) 2442 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2444
2452 return stream; 2445 return stream;
2453} 2446}
2454 2447
2455int 2448int ecb_cold
2456rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2457{ 2450{
2458 fflush (stream); 2451 fflush (stream);
2459 return pclose (stream); 2452 return pclose (stream);
2460} 2453}
2461 2454
2462/* 2455/*
2463 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2464 */ 2457 */
2465void 2458void ecb_cold
2466rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2467{ 2460{
2468 int done; 2461 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2462
2471 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2472 return; 2464 return;
2473 2465
2474 /* 2466 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2468 * is received.
2477 */ 2469 */
2478 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2479 { 2471 {
2480 unsigned char buf[8]; 2472 unsigned char buf[8];
2481 unicode_t ch; 2473 unicode_t ch;
2482 unsigned int i, len; 2474 unsigned int i, len;
2483 2475
… …
2514 } 2506 }
2515 } 2507 }
2516 2508
2517 pclose_printer (fd); 2509 pclose_printer (fd);
2518} 2510}
2519#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2520/*}}} */ 2512/*}}} */
2521 2513
2522/* *INDENT-OFF* */
2523enum { 2514enum {
2524 C1_40 = 0x40, 2515 C1_40 = 0x40,
2525 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 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, 2517 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, 2518 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, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2529}; 2520};
2530/* *INDENT-ON* */
2531 2521
2532/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2533void 2523void ecb_hot
2534rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2535{ 2525{
2536 switch (ch) 2526 switch (ch)
2537 { 2527 {
2538 case C0_ESC: 2528 case C0_ESC:
… …
2568 scr_charset_choose (0); 2558 scr_charset_choose (0);
2569 break; 2559 break;
2570 2560
2571#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2572 // 8-bit controls 2562 // 8-bit controls
2573 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2574 process_dcs_seq (); 2564 process_dcs_seq ();
2575 break; 2565 break;
2576 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2577 process_csi_seq (); 2567 process_csi_seq ();
2578 break; 2568 break;
2579 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2580 process_osc_seq (); 2570 process_osc_seq ();
2581 break; 2571 break;
2582#endif 2572#endif
2583 } 2573 }
2584} 2574}
2585/*}}} */ 2575/*}}} */
2586 2576
2587 2577
2588/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2589void 2579void ecb_cold
2590rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2591{ 2581{
2592 int row, col; 2582 int row, col;
2593 2583
2594 switch (ch) 2584 switch (ch)
… …
2628 break; 2618 break;
2629 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2621 break;
2632 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
2634 break; 2624 break;
2635 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2637 /* unimplemented */ 2627 /* unimplemented */
2638 break; 2628 break;
… …
2644} 2634}
2645/*}}} */ 2635/*}}} */
2646 2636
2647 2637
2648/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2649void 2639void ecb_hot
2650rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2651{ 2641{
2652 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2653 2643
2654 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2657 return; 2647 return;
2658 } 2648 }
2659 2649
2660 switch (ch) 2650 switch (ch)
2661 { 2651 {
2662 /* case 1: do_tek_mode (); break; */
2663 case '#': 2652 case '#':
2664 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2665 scr_E (); 2654 scr_E ();
2666 break; 2655 break;
2667 case '(': 2656 case '(':
… …
2690#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2691 case '9': 2680 case '9':
2692 scr_forwardindex (); 2681 scr_forwardindex ();
2693 break; 2682 break;
2694#endif 2683#endif
2684 // DECPAM/DECPNM
2695 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2696 case '>': 2688 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
2698 break; 2690 break;
2699 2691
2700 case C1_40: 2692 case C1_40:
2701 cmd_getc (); 2693 cmd_getc ();
2702 break; 2694 break;
… …
2706 2698
2707 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2708 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2709 { 2701 {
2710 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2712 } 2704 }
2713 break; 2705 break;
2714 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2715 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2716 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2717 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2718 break; 2713 break;
2714#endif
2719 2715
2720 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2721 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2722 scr_set_tab (1); 2718 scr_set_tab (1);
2723 break; 2719 break;
… …
2726 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2727 scr_index (DN); 2723 scr_index (DN);
2728 break; 2724 break;
2729 2725
2730 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2731 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2732 2728
2733 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2734 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2735 2731
2736 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2737 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2738 process_dcs_seq (); 2734 process_dcs_seq ();
2739 break; 2735 break;
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2745 2741
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2744 process_csi_seq ();
2749 break; 2745 break;
2750 2746
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2749 process_osc_seq ();
2754 break; 2750 break;
2755 2751
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2753 case 'c':
2758 mbstate.reset (); 2754 mbstate.reset ();
2759 scr_poweron (); 2755 scr_poweron ();
2760 scrollbar_show (1); 2756 scrollBar.show (1);
2761 break; 2757 break;
2762 2758
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2760 case 'n':
2765 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
2772 } 2768 }
2773} 2769}
2774/*}}} */ 2770/*}}} */
2775 2771
2776/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2777/* *INDENT-OFF* */
2778enum { 2773enum {
2779 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2780 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 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 , 2776 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, 2777 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, 2780 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 , 2781 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 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2788}; 2783};
2789 2784
2790#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2791 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2792 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2793#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2794 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2795 2790
2796const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2797 { 2792 {
2798 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 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, */ 2794 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, */ 2795 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, [, \, ], ^, _, */ 2796 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, */ 2797 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, */ 2798 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, */ 2799 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, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2806 }; 2801 };
2807/* *INDENT-ON* */
2808 2802
2809void 2803void ecb_hot
2810rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2811{ 2805{
2812 unicode_t ch, priv, i; 2806 unicode_t ch, priv, prev_ch, i;
2813 unsigned int nargs, p; 2807 unsigned int nargs, p;
2814 int n, ndef; 2808 int n, ndef;
2815 int arg[ESC_ARGS]; 2809 int arg[ESC_ARGS] = { };
2816 2810
2817 for (nargs = ESC_ARGS; nargs > 0;) 2811 nargs = 0;
2818 arg[--nargs] = 0;
2819 2812
2820 priv = 0; 2813 priv = 0;
2821 ch = cmd_getc (); 2814 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2816 {
2823 { /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2818 priv = ch;
2825 ch = cmd_getc (); 2819 ch = cmd_getc ();
2826 } 2820 }
2827 2821
2822 prev_ch = 0;
2828 /* read any numerical arguments */ 2823 /* read any numerical arguments */
2829 for (n = -1; ch < CSI_ICH; ) 2824 for (n = -1; ch < CSI_ICH; )
2830 { 2825 {
2831 if (isdigit (ch)) 2826 if (isdigit (ch))
2832 { 2827 {
… …
2842 n = -1; 2837 n = -1;
2843 } 2838 }
2844 else if (IS_CONTROL (ch)) 2839 else if (IS_CONTROL (ch))
2845 process_nonprinting (ch); 2840 process_nonprinting (ch);
2846 2841
2842 prev_ch = ch;
2847 ch = cmd_getc (); 2843 ch = cmd_getc ();
2848 } 2844 }
2849 2845
2850 if (ch > CSI_7F) 2846 if (ch > CSI_7F)
2851 return; 2847 return;
… …
2867 switch (priv) 2863 switch (priv)
2868 { 2864 {
2869 case '>': 2865 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2867 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2870 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2871 // 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 2872 // 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). 2873 // versions.
2878 // 2874 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2875 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2876 }
2881 break; 2877 break;
2878
2882 case '?': 2879 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2884 break;
2885
2886 case '!':
2887 if (ch == CSI_70)
2888 {
2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2890 scr_soft_reset ();
2891
2892 static const int pm_h[] = { 7, 25 };
2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2894
2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2886 } 2897 }
2898 break;
2899 }
2900
2887 return; 2901 return;
2888 } 2902 }
2889 2903
2890 switch (ch) 2904 switch (ch)
2891 { 2905 {
… …
2905 } 2919 }
2906 break; 2920 break;
2907#endif 2921#endif
2908 2922
2909 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2923 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2910 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2924 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2911 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2912 /* FALLTHROUGH */ 2926 /* FALLTHROUGH */
2913 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2927 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2914 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2915 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2916 break; 2930 break;
2917 2931
2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2920#ifdef ISO6429 2934#ifdef ISO6429
2921 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2922#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2923 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2924#endif 2938#endif
… …
3015 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3016 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3017 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3018 break; 3032 break;
3019 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3021 break; 3039 break;
3040 }
3022 } 3041 }
3023 break; 3042 break;
3024 3043
3025 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3026 switch (arg[0]) 3045 switch (arg[0])
… …
3069 scr_insert_mode (1); 3088 scr_insert_mode (1);
3070 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3071 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3072 break; 3091 break;
3073 3092
3093 case CSI_71: // DECSCUSR: set cursor style
3094 if (prev_ch == ' ')
3095 set_cursor_style (arg[0]);
3096 break;
3097
3074 /* 3098 /*
3075 * PRIVATE USE beyond this point. All CSI_7? sequences here 3099 * PRIVATE USE beyond this point. All CSI_7? sequences here
3076 */ 3100 */
3077 case CSI_72: /* DECSTBM: set top and bottom margins */ 3101 case CSI_72: /* DECSTBM: set top and bottom margins */
3078 if (nargs == 1) 3102 if (nargs == 1)
… …
3106 } 3130 }
3107} 3131}
3108/*}}} */ 3132/*}}} */
3109 3133
3110#if !ENABLE_MINIMAL 3134#if !ENABLE_MINIMAL
3111/* ARGSUSED */
3112void 3135void
3113rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3136rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3114{ 3137{
3115 int x, y; 3138 int x, y;
3116 XWindowAttributes wattr; 3139 XWindowAttributes wattr;
… …
3125 { 3148 {
3126 /* 3149 /*
3127 * commands 3150 * commands
3128 */ 3151 */
3129 case 1: /* deiconify window */ 3152 case 1: /* deiconify window */
3130 XMapWindow (dpy, parent[0]); 3153 XMapWindow (dpy, parent);
3131 break; 3154 break;
3132 case 2: /* iconify window */ 3155 case 2: /* iconify window */
3133 XIconifyWindow (dpy, parent[0], display->screen); 3156 XIconifyWindow (dpy, parent, display->screen);
3134 break; 3157 break;
3135 case 3: /* set position (pixels) */ 3158 case 3: /* set position (pixels) */
3136 XMoveWindow (dpy, parent[0], args[1], args[2]); 3159 XMoveWindow (dpy, parent, args[1], args[2]);
3137 break; 3160 break;
3138 case 4: /* set size (pixels) */ 3161 case 4: /* set size (pixels) */
3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3162 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3140 break; 3163 break;
3141 case 5: /* raise window */ 3164 case 5: /* raise window */
3142 XRaiseWindow (dpy, parent[0]); 3165 XRaiseWindow (dpy, parent);
3143 break; 3166 break;
3144 case 6: /* lower window */ 3167 case 6: /* lower window */
3145 XLowerWindow (dpy, parent[0]); 3168 XLowerWindow (dpy, parent);
3146 break; 3169 break;
3147 case 7: /* refresh window */ 3170 case 7: /* refresh window */
3148 scr_touch (true); 3171 scr_touch (true);
3149 break; 3172 break;
3150 case 8: /* set size (chars) */ 3173 case 8: /* set size (chars) */
… …
3153 break; 3176 break;
3154 3177
3155 //case 9: NYI, TODO, restore maximized window or maximize window 3178 //case 9: NYI, TODO, restore maximized window or maximize window
3156 default: 3179 default:
3157 if (args[0] >= 24) /* set height (chars) */ 3180 if (args[0] >= 24) /* set height (chars) */
3158 set_widthheight ((unsigned int)width, 3181 set_widthheight ((unsigned int)vt_width,
3159 (unsigned int) (args[1] * fheight)); 3182 (unsigned int) (args[1] * fheight));
3160 break; 3183 break;
3161 3184
3162 /* 3185 /*
3163 * reports - some output format copied from XTerm 3186 * reports - some output format copied from XTerm
3164 */ 3187 */
3165 case 11: /* report window state */ 3188 case 11: /* report window state */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3189 XGetWindowAttributes (dpy, parent, &wattr);
3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3190 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3168 break; 3191 break;
3169 case 13: /* report window position */ 3192 case 13: /* report window position */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3171 XTranslateCoordinates (dpy, parent[0], wattr.root, 3194 XTranslateCoordinates (dpy, parent, wattr.root,
3172 -wattr.border_width, -wattr.border_width, 3195 -wattr.border_width, -wattr.border_width,
3173 &x, &y, &wdummy); 3196 &x, &y, &wdummy);
3174 tt_printf ("\033[3;%d;%dt", x, y); 3197 tt_printf ("\033[3;%d;%dt", x, y);
3175 break; 3198 break;
3176 case 14: /* report window size (pixels) */ 3199 case 14: /* report window size (pixels) */
3177 XGetWindowAttributes (dpy, parent[0], &wattr); 3200 XGetWindowAttributes (dpy, parent, &wattr);
3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3201 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3179 break; 3202 break;
3180 case 18: /* report text area size (chars) */ 3203 case 18: /* report text area size (chars) */
3181 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3204 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3182 break; 3205 break;
… …
3184 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3207 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3185 break; 3208 break;
3186 case 20: /* report icon label */ 3209 case 20: /* report icon label */
3187 { 3210 {
3188 char *s; 3211 char *s;
3189 XGetIconName (dpy, parent[0], &s); 3212 XGetIconName (dpy, parent, &s);
3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3191 XFree (s); 3214 XFree (s);
3192 } 3215 }
3193 break; 3216 break;
3194 case 21: /* report window title */ 3217 case 21: /* report window title */
3195 { 3218 {
3196 char *s; 3219 char *s;
3197 XFetchName (dpy, parent[0], &s); 3220 XFetchName (dpy, parent, &s);
3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3221 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3199 XFree (s); 3222 XFree (s);
3200 } 3223 }
3201 break; 3224 break;
3202 } 3225 }
… …
3207/* 3230/*
3208 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3209 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3210 */ 3233 */
3211char * 3234char *
3212rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3213{ 3236{
3214 unicode_t ch; 3237 unicode_t ch;
3215 bool seen_esc = false; 3238 bool seen_esc = false;
3216 unsigned int n = 0; 3239 unsigned int n = 0;
3217 wchar_t string[STRING_MAX]; 3240 wchar_t string[CBUFSIZ];
3218 3241
3219 while ((ch = cmd_getc ()) != NOCHAR) 3242 while ((ch = cmd_getc ()) != NOCHAR)
3220 { 3243 {
3221 if (seen_esc) 3244 if (seen_esc)
3222 { 3245 {
… …
3237 else if (ch < 0x20) 3260 else if (ch < 0x20)
3238 return NULL; /* other control character - exit */ 3261 return NULL; /* other control character - exit */
3239 3262
3240 seen_esc = false; 3263 seen_esc = false;
3241 3264
3242 if (n >= STRING_MAX - 1) 3265 if (n >= sizeof (string) - 1)
3243 // stop at some sane length 3266 // stop at some sane length
3244 return NULL; 3267 return NULL;
3245 3268
3246 string[n++] = ch; 3269 string[n++] = ch;
3247 } 3270 }
3248 3271
3249 string[n++] = '\0'; 3272 string[n++] = '\0';
3250 3273
3251 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3252 3279
3253 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3254} 3281}
3255 3282
3256/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3259 */ 3286 */
3260void 3287void
3261rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3262{ 3289{
3263 char *s;
3264 unicode_t eh;
3265
3266 /* 3290 /*
3267 * Not handled yet 3291 * Not handled yet
3268 */ 3292 */
3293
3294 string_term st;
3269 s = get_to_st (eh); 3295 char *s = get_to_st (st);
3270 if (s) 3296 if (s)
3271 free (s); 3297 free (s);
3272 3298
3273 return; 3299 return;
3274} 3300}
… …
3278 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3279 */ 3305 */
3280void 3306void
3281rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3282{ 3308{
3283 unicode_t ch, eh;
3284 int arg; 3309 int arg;
3285 3310
3286 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3289 3314
3290 if (ch == ';') 3315 if (ch == ';')
3291 { 3316 {
3317 string_term st;
3292 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3293 3319
3294 if (s) 3320 if (s)
3295 { 3321 {
3296 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3297 free (s); 3323 free (s);
3298 } 3324 }
3299 } 3325 }
3300} 3326}
3301 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3378 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3379 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3380 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3383 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3384 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3385 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3302void 3431void
3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3304{ 3433{
3305 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3306 { 3435 {
3307 rgba c; 3436 rgba c;
3308 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3309 3439
3310#if XFT 3440#if XFT
3311 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3313 else 3443 else
3314#endif 3444#endif
3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3316 } 3451 }
3317 else 3452 else
3318 set_window_color (color, str); 3453 set_window_color (color, str);
3319} 3454}
3320 3455
3321/* 3456/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3458 */
3324void 3459void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3326{ 3461{
3327 int color; 3462 int color;
3328 char *buf, *name; 3463 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3465 int saveop = op;
… …
3357 unsigned long bytes_after; 3492 unsigned long bytes_after;
3358 unsigned char *value = 0; 3493 unsigned char *value = 0;
3359 const char *str = ""; 3494 const char *str = "";
3360 3495
3361 if (prop 3496 if (prop
3362 && XGetWindowProperty (dpy, parent[0], 3497 && XGetWindowProperty (dpy, parent,
3363 prop, 0, 1<<16, 0, AnyPropertyType, 3498 prop, 0, 1<<16, 0, AnyPropertyType,
3364 &actual_type, &actual_format, 3499 &actual_type, &actual_format,
3365 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3366 && actual_type != None 3501 && actual_type != None
3367 && actual_format == 8) 3502 && actual_format == 8)
3368 str = (const char *)(value); 3503 str = (const char *)(value);
3369 3504
3370 tt_printf ("\033]%d;%s%c", op, str, resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3371 3506
3372 XFree (value); 3507 XFree (value);
3373 } 3508 }
3374 else 3509 else
3375 { 3510 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3511 char *eq = strchr (str, '=');
3377 3512
3378 if (eq) 3513 if (eq)
3379 { 3514 {
3380 *eq = 0; 3515 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3516 set_utf8_property (display->atom (str), eq + 1);
3382 } 3517 }
3383 else 3518 else
3384 XDeleteProperty (dpy, parent[0], 3519 XDeleteProperty (dpy, parent,
3385 display->atom (str)); 3520 display->atom (str));
3386 } 3521 }
3387 break; 3522 break;
3388 3523
3389 case XTerm_Color: 3524 case XTerm_Color:
… …
3399 break; 3534 break;
3400 3535
3401 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3402 *buf++ = '\0'; 3537 *buf++ = '\0';
3403 3538
3404 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3405 } 3540 }
3406 break; 3541 break;
3542 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3543 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3409 break; 3545 break;
3546 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3547 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3412 break; 3549 break;
3413#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3415 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3416 break; 3553 break;
3417#endif 3554#endif
3418 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3419 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3420 break; 3557 break;
3421 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3422 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3423 break; 3560 break;
3561#ifdef OPTION_HC
3562 case XTerm_Color_HC:
3563 process_color_seq (op, Color_HC, str, st);
3564 break;
3565 case XTerm_Color_HTC:
3566 process_color_seq (op, Color_HTC, str, st);
3567 break;
3568#endif
3424#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#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: 3570 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3431 break; 3572 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3435 break; 3575 break;
3436 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3438 break; 3578 break;
3439#endif 3579#endif
3440#if ENABLE_TRANSPARENCY && TINTING
3441 case URxvt_Color_tint: 3580 case URxvt_Color_border:
3442 process_color_seq (op, Color_tint, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3443
3444 check_our_parents ();
3445
3446 if (am_transparent)
3447 want_full_refresh = want_refresh = 1;
3448
3449 break;
3450#endif
3451
3452 case Rxvt_Pixmap:
3453 {
3454 if (*str != ';')
3455 {
3456#if XPM_BACKGROUND
3457 scale_pixmap (""); /* reset to default scaling */
3458 set_bgPixmap (str); /* change pixmap */
3459 scr_touch (true);
3460#endif
3461 }
3462
3463 int changed = 0;
3464
3465 while ((str = strchr (str, ';')) != NULL)
3466 {
3467 str++;
3468#if XPM_BACKGROUND
3469 changed += scale_pixmap (str);
3470#endif
3471 }
3472
3473 if (changed)
3474 {
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break;
3486
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; 3582 break;
3493 3583
3494 case XTerm_logfile: 3584 case XTerm_logfile:
3495 // TODO, when secure mode? 3585 // TODO, when secure mode?
3496 break; 3586 break;
… …
3514 case URxvt_boldFont: 3604 case URxvt_boldFont:
3515 case URxvt_italicFont: 3605 case URxvt_italicFont:
3516 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3517#endif 3607#endif
3518 if (query) 3608 if (query)
3519 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3521 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3522 resp); 3612 st.v);
3523 else 3613 else
3524 { 3614 {
3525 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3526 3616
3527 res = strdup (str); 3617 res = strdup (str);
… …
3530 } 3620 }
3531 break; 3621 break;
3532 3622
3533 case URxvt_version: 3623 case URxvt_version:
3534 if (query) 3624 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3536 op, 3626 op,
3537 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp); 3628 st.v);
3539 break; 3629 break;
3540 3630
3541#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3542 case URxvt_locale: 3639 case URxvt_locale:
3543 if (query) 3640 if (query)
3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3545 else 3642 else
3546 { 3643 {
3547 set_locale (str); 3644 set_locale (str);
3548 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3549 init_xlocale (); 3646 init_xlocale ();
… …
3564 break; 3661 break;
3565#endif 3662#endif
3566 3663
3567#if ENABLE_PERL 3664#if ENABLE_PERL
3568 case URxvt_perl: 3665 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3570 ; // no responses yet
3571 break; 3667 break;
3572#endif 3668#endif
3573 } 3669 }
3574} 3670}
3575/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3582 * 's' = save 3678 * 's' = save
3583 * 'r' = restore 3679 * 'r' = restore
3584 * 't' = toggle 3680 * 't' = toggle
3585 * so no need for fancy checking 3681 * so no need for fancy checking
3586 */ 3682 */
3587int 3683int ecb_cold
3588rxvt_term::privcases (int mode, unsigned long bit) 3684rxvt_term::privcases (int mode, unsigned long bit)
3589{ 3685{
3590 int state; 3686 int state;
3591 3687
3592 if (mode == 's') 3688 if (mode == 's')
3593 { 3689 {
3594 SavedModes |= (priv_modes & bit); 3690 if (priv_modes & bit)
3691 SavedModes |= bit;
3692 else
3693 SavedModes &= ~bit;
3595 return -1; 3694 return -1;
3596 } 3695 }
3597 else 3696 else
3598 { 3697 {
3599 if (mode == 'r') 3698 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3699 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3700 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3701 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3702
3703 if (state)
3704 priv_modes |= bit;
3705 else
3706 priv_modes &= ~bit;
3604 } 3707 }
3605 3708
3606 return state; 3709 return state;
3607} 3710}
3608 3711
3609/* we're not using priv _yet_ */ 3712/* we're not using priv _yet_ */
3610void 3713void
3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3714rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3612{ 3715{
3613 unsigned int i, j; 3716 unsigned int i, j;
3614 int state; 3717 int state;
3615 3718
3616 static const struct 3719 static const struct
3617 { 3720 {
3618 const int argval; 3721 const int argval;
3619 const unsigned long bit; 3722 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3723 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3724 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3725 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, 3726 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3727 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3728 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3729 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3730 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3731 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related
3633 { 25, PrivMode_VisibleCursor }, 3733 { 12, PrivMode_BlinkingCursor },
3734 // 18 end FF to printer after print screen
3735 // 19 Print screen prints full screen/scroll region
3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3739#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3740 { 35, PrivMode_ShiftKeys }, // rxvt extension
3741 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3742 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3743 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3744 // 45 margin bell NYI
3641 // 46 start logging 3745 // 46 start logging
3642 { 47, PrivMode_Screen }, 3746 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3747 { 66, PrivMode_aplKP }, // DECNKM
3644#ifndef NO_BACKSPACE_KEY 3748#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3749 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3750#endif
3647 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3752 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3753 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3758#endif
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3761#if ENABLE_FRILLS
3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3763#endif
3653 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3768 // 1048 save and restore cursor, implemented in code
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3772 { 2004, PrivMode_BracketPaste },
3773#endif
3660 }; 3774 };
3661 3775
3662 if (nargs == 0) 3776 if (nargs == 0)
3663 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3664 3796
3665 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3666 if (mode == 'l') 3798 if (mode == 'l')
3667 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3668 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3671 for (i = 0; i < nargs; i++) 3803 for (i = 0; i < nargs; i++)
3672 { 3804 {
3673 state = -1; 3805 state = -1;
3674 3806
3675 /* basic handling */ 3807 /* basic handling */
3676 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3808 for (j = 0; j < ecb_array_length (argtopriv); j++)
3677 if (argtopriv[j].argval == arg[i]) 3809 if (argtopriv[j].argval == arg[i])
3678 { 3810 {
3679 state = privcases (mode, argtopriv[j].bit); 3811 state = privcases (mode, argtopriv[j].bit);
3680 break; 3812 break;
3681 } 3813 }
… …
3689 3821
3690 scr_touch (true); 3822 scr_touch (true);
3691 break; 3823 break;
3692#endif 3824#endif
3693 case 1048: /* alternative cursor save */ 3825 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3826 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3827 if (mode == 0)
3697 scr_cursor (RESTORE); 3828 scr_cursor (RESTORE);
3698 else if (mode == 1) 3829 else if (mode == 1)
3699 scr_cursor (SAVE); 3830 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3839 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3840 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3841 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3842 * within VT52 mode
3712 */ 3843 */
3713 PrivMode (1, PrivMode_vt52); 3844 priv_modes |= PrivMode_vt52;
3714 break; 3845 break;
3715 case 3: /* 80/132 */ 3846 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3847 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3848 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3849 break;
3719 case 4: /* smooth scrolling */ 3850 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3851 set_option (Opt_jumpScroll, !state);
3721 break; 3852 break;
3722 case 5: /* reverse video */ 3853 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3860 scr_autowrap (state);
3730 break; 3861 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3862 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3863 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3864 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3865 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3866 break;
3736#ifdef scrollBar_esc 3867#ifdef scrollBar_esc
3737 case scrollBar_esc: 3868 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3869 scrollBar.map (state);
3739 {
3740 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3871 scr_touch (true);
3742 } 3872 break;
3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3743 break; 3877 break;
3744#endif 3878#endif
3745 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3746 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3747 break; 3881 break;
… …
3752 break; 3886 break;
3753 /* case 66: - application key pad */ 3887 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3888 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3889 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3890 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3891 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3892 break;
3759#if 0
3760 case 1001: 3893 case 1002:
3761 break; /* X11 mouse highlighting */ 3894 case 1003:
3762#endif 3895 if (state)
3896 {
3897 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3898 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3899 mouse_row = mouse_col = 0;
3900 vt_emask_mouse = PointerMotionMask;
3901 }
3902 else
3903 vt_emask_mouse = NoEventMask;
3904
3905 vt_select_input ();
3906 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3907 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3908 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3909 break;
3766 case 1011: /* scroll to bottom on key press */ 3910 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3911 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3912 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3913 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3914 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3915 if (!state)
3772 scr_erase_screen (2); 3916 scr_erase_screen (2);
3917
3773 scr_change_screen (state); 3918 scr_change_screen (state);
3774 break; 3919 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3920 case 1049: /* secondary screen w/ clearing first */
3921 if (option (Opt_secondaryScreen))
3922 if (state)
3923 scr_cursor (SAVE);
3924
3776 scr_change_screen (state); 3925 scr_change_screen (state);
3926
3777 if (option (Opt_secondaryScreen)) 3927 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3928 if (state)
3779 scr_erase_screen (2); 3929 scr_erase_screen (2);
3930 else
3931 scr_cursor (RESTORE);
3780 break; 3932 break;
3781 default: 3933 default:
3782 break; 3934 break;
3783 } 3935 }
3784 } 3936 }
3785} 3937}
3786/*}}} */ 3938/*}}} */
3787 3939
3788/*{{{ process sgr sequences */ 3940/*{{{ process sgr sequences */
3789void 3941void ecb_hot
3790rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3942rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3791{ 3943{
3792 unsigned int i; 3944 unsigned int i;
3793 short rendset; 3945 short rendset;
3794 int rendstyle; 3946 int rendstyle;
… …
3836 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3837 //case 20: // gothic 3989 //case 20: // gothic
3838 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3839 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3840 break; 3992 break;
3841 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3842 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3843 break; 3995 break;
3844 case 23: // disable italic 3996 case 23: // disable italic
3845 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3846 break; 3998 break;
3847 case 24: 3999 case 24: // underline off (vt220)
3848 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3849 break; 4001 break;
3850 case 25: 4002 case 25: // blink off (vt220)
3851 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3852 break; 4004 break;
3853 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3854 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3855 break; 4007 break;
3856 case 27: 4008 case 27: // reverse off (vt220)
3857 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3858 break; 4010 break;
3859 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3860 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3861 } 4013 }
… …
3876 case 35: 4028 case 35:
3877 case 36: 4029 case 36:
3878 case 37: 4030 case 37:
3879 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3880 break; 4032 break;
3881 case 38: // set fg color, ISO 8613-6
3882 if (nargs > i + 2 && arg[i + 1] == 5)
3883 {
3884 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3885 i += 2;
3886 }
3887 break;
3888 case 39: /* default fg */ 4033 case 39: /* default fg */
3889 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3890 break; 4035 break;
3891 4036
3892 case 40: 4037 case 40:
… …
3897 case 45: 4042 case 45:
3898 case 46: 4043 case 46:
3899 case 47: 4044 case 47:
3900 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3901 break; 4046 break;
3902 case 48: // set bg color, ISO 8613-6
3903 if (nargs > i + 2 && arg[i + 1] == 5)
3904 {
3905 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3906 i += 2;
3907 }
3908 break;
3909 case 49: /* default bg */ 4047 case 49: /* default bg */
3910 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
3911 break; 4078 break;
3912 4079
3913 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3914 4081
3915#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
3935 break; 4102 break;
3936#endif 4103#endif
3937 } 4104 }
3938 } 4105 }
3939} 4106}
4107
4108void
4109rxvt_term::set_cursor_style (int style)
4110{
4111 if (!IN_RANGE_INC (style, 0, 6))
4112 return;
4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4119
4120#ifdef CURSOR_BLINK
4121 set_option (Opt_cursorBlink, style & 1);
4122 cursor_blink_reset ();
4123#endif
4124
4125 want_refresh = 1;
4126}
3940/*}}} */ 4127/*}}} */
3941 4128
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/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
3961 4133
3962/* 4134/*
3963 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
3964 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
3965 */ 4137 */
… …
3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3974 va_end (arg_ptr); 4146 va_end (arg_ptr);
3975 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
3976} 4148}
3977 4149
3978/* ---------------------------------------------------------------------- */
3979/* Write data to the pty as typed by the user, pasted with the mouse, 4150/* Write data to the pty as typed by the user. */
3980 * or generated by us in response to a query ESC sequence. 4151void
3981 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4157 if (option (Opt_scrollTtyKeypress))
4158 if (view_start)
4159 {
4160 view_start = 0;
4161 want_refresh = 1;
4162 }
4163
4164 tt_write_ (data, len);
4165}
3983 4166
3984void 4167void
3985rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
3986{ 4169{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3988 return; 4171 return;
3989 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
3990 if (pty->pty < 0) 4181 if (pty->pty < 0)
3991 return; 4182 return;
3992 4183
3993 if (v_buflen == 0) 4184 if (v_buflen == 0)
3994 { 4185 {
3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4186 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3996 4187
4188 max_it (written, 0);
4189
3997 if ((unsigned int)written == len) 4190 if (written == len)
3998 return; 4191 return;
3999 4192
4000 data += written; 4193 data += written;
4001 len -= written; 4194 len -= written;
4002 } 4195 }
4003 4196
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4197 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4005 4198
4006 memcpy (v_buffer + v_buflen, data, len); 4199 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4200 v_buflen += len;
4008 4201
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4202 pty_ev.set (ev::READ | ev::WRITE);
4010} 4203}
4011 4204
4012void rxvt_term::pty_write () 4205void rxvt_term::pty_write ()
4013{ 4206{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4207 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4212
4020 if (v_buflen == 0) 4213 if (v_buflen == 0)
4021 { 4214 {
4022 free (v_buffer); 4215 free (v_buffer);
4023 v_buffer = 0; 4216 v_buffer = 0;
4024 v_buflen = 0;
4025 4217
4026 pty_ev.set (EVENT_READ); 4218 pty_ev.set (ev::READ);
4027 return; 4219 return;
4028 } 4220 }
4029 4221
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4222 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4223 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4224 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4225 pty_ev.set (ev::READ);
4034} 4226}
4035 4227
4036/*----------------------- end-of-file (C source) -----------------------*/ 4228/*----------------------- end-of-file (C source) -----------------------*/
4037 4229

Diff Legend

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