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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 UTC

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

Diff Legend

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