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.364 by ayin, Mon Nov 12 14:53:13 2007 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
83 XK_Right, 0x2192, 84 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193, 86 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90 89
91 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
92 XK_Next, 0x21df, 91 XK_Next, 0x21df,
93 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
109 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
110 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
111 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
114 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
117 XK_Break, 0x238a, 119 XK_Break, 0x238a,
118 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
121 124
122 XK_space, 0x2423, 125 XK_space, 0x2423,
123 126
124#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
130 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
131#endif 134#endif
132 0, 135 0,
133}; 136};
134 137
135void 138void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
137{ 140{
138 x = Pixel2Col (x); 141 x = Pixel2Col (x);
139 y = Pixel2Row (y); 142 y = Pixel2Row (y);
140 143
… …
148 151
149 text_t t = l.t[x]; 152 text_t t = l.t[x];
150 153
151 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
152 { 155 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
155 break; 158 break;
156 } 159 }
157 160
158 x--; 161 x--;
159 } 162 }
160} 163}
161 164
162void 165void ecb_cold
163rxvt_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)
164{ 167{
165 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 170 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 171
172# if ENABLE_COMBINING 172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
174 { 174 {
175 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
176 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
178 } 178 }
179 else 179 else
180# endif 180# endif
… …
183 183
184 alloc = 0; 184 alloc = 0;
185 chr = &ch2; 185 chr = &ch2;
186 len = 1; 186 len = 1;
187 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 191
189 char attr[80]; // plenty 192 char attr[80]; // plenty
190 193
191 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",
192 (int)r, 195 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
202 212
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
205 214
206 if (y >= 0) 215 if (y >= 0)
207 { 216 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 218 x = 0;
210 } 219 }
211 220
212 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);
213 224
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 226
216 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
217 { 228 {
218 char buf[9]; 229 char buf[9];
219 230
220 ch = *chr++; 231 ch = *chr++;
221 232
222 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 236# if !UNICODE_3
226 if (ch >= 0x10000) 237 if (ch >= 0x10000)
227 ch = 0xfffd; 238 ch = 0xfffd;
228# endif 239# endif
229 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
230 241
231 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 244 }
234 245
235// { 246// {
236// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
239// } 250// }
240 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
241 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 255 free (fname[i]);
256 }
244 257
245# if ENABLE_COMBINING 258# if ENABLE_COMBINING
246 if (alloc) 259 if (alloc)
247 delete [] alloc; 260 delete [] alloc;
248# endif 261# endif
249} 262}
250#endif 263#endif
251 264
252void 265void ecb_cold
253rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
254{ 267{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 269
260 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
261 { 271 {
262 char mb[16]; 272 char mb[MB_LEN_MAX];
263 int len; 273 int len;
264 274
265 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
268 else 278 else
269 { 279 {
270 mb[0] = ch[0]; 280 mb[0] = ch;
271 len = 1; 281 len = 1;
272 } 282 }
273 283
274 if (len > 0) 284 if (len > 0)
275 tt_write (mb, len); 285 tt_write (mb, len);
… …
278 } 288 }
279 289
280 iso14755buf = 0; 290 iso14755buf = 0;
281} 291}
282 292
283int 293static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
285{ 295{
286 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
289 { 299 {
290 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
291 301
… …
297 307
298 return -1; 308 return -1;
299} 309}
300#endif 310#endif
301 311
302void 312static inline KeySym ecb_cold
313translate_keypad (KeySym keysym, bool kp)
314{
315#ifdef XK_KP_Home
316 static const KeySym keypadtrans[] = {
317 XK_KP_7, // XK_KP_Home
318 XK_KP_4, // XK_KP_Left
319 XK_KP_8, // XK_KP_Up
320 XK_KP_6, // XK_KP_Right
321 XK_KP_2, // XK_KP_Down
322 XK_KP_9, // XK_KP_Prior
323 XK_KP_3, // XK_KP_Next
324 XK_KP_1, // XK_KP_End
325 XK_KP_5, // XK_KP_Begin
326 };
327
328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
329 {
330 unsigned int index = keysym - XK_KP_Home;
331 keysym = kp ? keypadtrans[index] : XK_Home + index;
332 }
333 else if (keysym == XK_KP_Insert)
334 keysym = kp ? XK_KP_0 : XK_Insert;
335# ifndef NO_DELETE_KEY
336 else if (keysym == XK_KP_Delete)
337 keysym = kp ? XK_KP_Decimal : XK_Delete;
338# endif
339#endif
340 return keysym;
341}
342
343static inline int ecb_cold
344map_function_key (KeySym keysym)
345{
346 int param = 0;
347
348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
349 {
350 param = 11 + keysym - XK_F1;
351 if (keysym >= XK_F17)
352 param += 4;
353 else if (keysym >= XK_F15)
354 param += 3;
355 else if (keysym >= XK_F11)
356 param += 2;
357 else if (keysym >= XK_F6)
358 param += 1;
359 }
360 else
361 switch (keysym)
362 {
363 case XK_Find:
364 param = 1;
365 break;
366 case XK_Insert:
367 param = 2;
368 break;
369#ifdef DXK_Remove
370 case DXK_Remove:
371#endif
372 case XK_Execute:
373 param = 3;
374 break;
375 case XK_Select:
376 param = 4;
377 break;
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390 case XK_Help:
391 param = 28;
392 break;
393 case XK_Menu:
394 param = 29;
395 break;
396 }
397 return param;
398}
399
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
303rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
304{ 411{
305 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
306 unsigned int newlen; 413 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
310 416
311#if ISO_14755 417#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
313 return; 419 return;
314#endif 420#endif
… …
321 */ 427 */
322 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
325 431
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 432 kbuf[0] = 0;
333 433
334#ifdef USE_XIM 434#if USE_XIM
335 if (Input_Context) 435 if (Input_Context)
336 { 436 {
337 Status status_return; 437 Status status_return;
338 438
339#if 0 439#if 0
… …
377 } 477 }
378 } 478 }
379 else 479 else
380 len = 0; 480 len = 0;
381 } 481 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 482 }
386 else 483 else
387#endif 484#endif
388 { 485 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
391 } 490 {
491 KeySym orig_keysym = keysym;
392 492
393 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)
394 { 706 {
395#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 709 return;
398#endif 710#endif
399 711
400 if (saveLines) 712 if (saveLines)
401 { 713 {
… …
410#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 724#else
413 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
414#endif 726#endif
727 max_it (lnsppg, 1);
728
415 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
416 { 730 {
417 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
418 return; 732 return;
419 } 733 }
420 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
421 { 735 {
422 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
423 return; 737 return;
424 } 738 }
425 } 739 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
428 { 742 {
429 if (keysym == XK_Up) 743 if (keysym == XK_Up)
430 { 744 {
431 scr_page (UP, 1); 745 scr_page (1);
432 return; 746 return;
433 } 747 }
434 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
435 { 749 {
436 scr_page (DN, 1); 750 scr_page (-1);
437 return; 751 return;
438 } 752 }
439 } 753 }
440#endif 754#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
443 { 757 {
444 if (keysym == XK_Home) 758 if (keysym == XK_Home)
445 { 759 {
446 scr_move_to (0, 1); 760 scr_changeview (top_row);
447 return; 761 return;
448 } 762 }
449 else if (keysym == XK_End) 763 else if (keysym == XK_End)
450 { 764 {
451 scr_move_to (1, 1); 765 scr_changeview (0);
452 return; 766 return;
453 } 767 }
454 } 768 }
455#endif 769#endif
456 } 770 }
457 771
458 if (shft) 772 if (shft)
459 { 773 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 775 {
468 switch (keysym) 776 switch (keysym)
469 { 777 {
470 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 780 selection_request (ev.time);
473 return; 781 return;
474#if TODO 782#if TODO
475 /* rxvt extras */ 783 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 785 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 787 return;
482#endif 788#endif
483 } 789 }
484 } 790 }
485 } 791 }
486 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;
806 }
807
487#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 809 // ISO 14755 support
489 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 811 {
491 int hv; 812 int hv;
492 813
493 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 845 scr_overlay_off ();
525# endif 846# endif
526 iso14755buf = 0; 847 iso14755buf = 0;
527 } 848 }
528 } 849 }
850 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
532 { 854 {
533 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 856# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 865 {
544 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
545 return; 867 return;
546 } 868 }
547#endif 869#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 }
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0)
800 kbuf[len - 1] |= 0x80;
801#endif
802
803 }
804 else if (ctrl && keysym == XK_minus)
805 {
806 len = 1;
807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
814 else
815 {
816#ifdef META8_OPTION
817 /* set 8-bit on */
818 if (meta && (meta_char == 0x80))
819 {
820 char *ch;
821
822 for (ch = kbuf; ch < kbuf + len; ch++)
823 *ch |= 0x80;
824
825 meta = 0;
826 }
827#endif
828 /* nil */ ;
829 }
830 } 870 }
831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834 871
835 if (len <= 0) 872 if (len <= 0)
836 return; /* not mapped */ 873 return; /* not mapped */
837 874
838 if (option (Opt_scrollTtyKeypress))
839 if (view_start)
840 {
841 view_start = 0;
842 want_refresh = 1;
843 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
871} 876}
872 877
873void 878void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
875{ 880{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 882 KeySym keysym;
878 883
… …
898 commit_iso14755 (); 903 commit_iso14755 ();
899 904
900 return; 905 return;
901 } 906 }
902 907
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 909 if (i[0] == keysym)
905 { 910 {
906 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 912 commit_iso14755 ();
908 913
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
947#endif 952#endif
948} 953}
949 954
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 955void
984rxvt_term::flush () 956rxvt_term::flush ()
985{ 957{
986 flush_ev.stop (); 958 flush_ev.stop ();
987 959
988#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
990 { 962 {
991// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 964 scr_touch (false);
993 } 965 }
994#endif 966#endif
995 967
996 if (want_refresh) 968 if (want_refresh)
… …
1032 } 1004 }
1033 while (row < end_row); 1005 while (row < end_row);
1034 } 1006 }
1035 1007
1036 scr_refresh (); 1008 scr_refresh ();
1037 scrollbar_show (1); 1009 scrollBar.show (1);
1038#ifdef USE_XIM 1010#if USE_XIM
1039 IMSendSpot (); 1011 im_send_spot ();
1040#endif 1012#endif
1041 } 1013 }
1042 1014
1043 display->flush (); 1015 display->flush ();
1044} 1016}
1045 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
1046void 1019void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1020rxvt_term::refresh_check ()
1048{ 1021{
1049 make_current (); 1022 if (want_refresh && !flush_ev.is_active ())
1023 flush_ev.start ();
1050 1024
1051 display->flush (); 1025 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055} 1026}
1056 1027
1057void 1028void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1029rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1030{
… …
1063 flush (); 1034 flush ();
1064} 1035}
1065 1036
1066#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1067void 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
1056void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1058{
1070 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1060 want_refresh = 1;
1061 refresh_check ();
1072} 1062}
1073#endif 1063#endif
1074 1064
1075#ifdef TEXT_BLINK 1065#ifdef TEXT_BLINK
1076void 1066void
… …
1078{ 1068{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1070 {
1081 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
1082 want_refresh = 1; 1072 want_refresh = 1;
1073 refresh_check ();
1083 } 1074 }
1075 else
1076 w.stop ();
1084} 1077}
1085#endif 1078#endif
1086 1079
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1081void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1083{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1086 {
1093 want_refresh = 1; 1087 want_refresh = 1;
1088 refresh_check ();
1089 }
1094 else 1090 else
1095 w.stop (); 1091 w.stop ();
1096} 1092}
1097#endif 1093#endif
1098 1094
1099#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1100void 1096void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1098{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1104 { 1100 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1102 want_refresh = 1;
1103 refresh_check ();
1107 } 1104 }
1108 else 1105 else
1109 w.stop (); 1106 w.stop ();
1110} 1107}
1111#endif 1108#endif
1112 1109
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1111void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1113{
1117 if (mouse_slip_wheel_speed == 0 1114 if (scr_page (mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1115 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1116 want_refresh = 1;
1117 refresh_check ();
1118 }
1119
1120 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1121 {
1126 else 1122 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1123 w.stop ();
1124 }
1128} 1125}
1129#endif 1126#endif
1130 1127
1131#if LINUX_YIELD_HACK 1128#if LINUX_YIELD_HACK
1132static struct event_handler 1129static struct event_handler
… …
1137 { 1134 {
1138 // this should really be sched_yield(), but the linux guys thought 1135 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1136 // that giving a process calling sched_yield () less cpu time than
1140 // 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
1141 // allowed by the sus... as is returning ENOSYS. 1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1142 1142
1143 struct timespec ts = { 0, 0 }; 1143 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1144 nanosleep (&ts, 0);
1145 1145
1146 w.stop (); 1146 w.stop ();
1147 } 1147 }
1148 1148
… …
1151 { 1151 {
1152 } 1152 }
1153} event_handler; 1153} event_handler;
1154#endif 1154#endif
1155 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
1156bool 1189bool
1157rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1158{ 1191{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1160 1193
1161 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1162 { 1195
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1164 n = 0;
1165 } 1197 {
1166 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1168 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1170 1203
1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1172 1205
1173 if (r > 0) 1206 if (r > 0)
1174 { 1207 {
1175 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1176 return true; 1209 return true;
… …
1198{ 1231{
1199 make_current (); 1232 make_current ();
1200 1233
1201 if (revents & ev::READ) 1234 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1237 cmd_parse ();
1205 break;
1206 1238
1207 if (revents & ev::WRITE) 1239 if (revents & ev::WRITE)
1208 pty_write (); 1240 pty_write ();
1209}
1210 1241
1211void 1242 refresh_check ();
1243}
1244
1245void ecb_cold
1212rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1213{ 1247{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1249 recolor_cursor ();
1216 1250
1217#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1218 hidden_pointer = 0; 1252 hidden_pointer = 0;
1219 1253
1220 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1221 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1222#endif 1256#endif
1223} 1257}
1224 1258
1225#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1226void 1260void ecb_cold
1227rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1228{ 1262{
1229 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1230 return; 1264 return;
1231 1265
… …
1233 XFlush (dpy); 1267 XFlush (dpy);
1234 1268
1235 hidden_pointer = 1; 1269 hidden_pointer = 1;
1236} 1270}
1237 1271
1238void 1272void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1274{
1241 make_current (); 1275 make_current ();
1242 1276
1243 pointer_blank (); 1277 pointer_blank ();
… …
1245#endif 1279#endif
1246 1280
1247void 1281void
1248rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1249{ 1283{
1250 int button_number, key_state = 0; 1284 int button_number, state = 0;
1251 int x, y; 1285 int x, y;
1252 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1253 1287
1254 x = Pixel2Col (ev.x); 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1255 y = Pixel2Row (ev.y); 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1290
1256 if (ev.type == MotionNotify) { 1291 if (ev.type == MotionNotify)
1292 {
1257 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1258 return; 1294 return;
1295
1259 mouse_row = x; 1296 mouse_row = x;
1260 mouse_col = y; 1297 mouse_col = y;
1261 code += 32; 1298 state += 32;
1262 } 1299 }
1263 1300
1264 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1265 button_number = 3; 1302 button_number = 3;
1266 else 1303 else
1267 { 1304 {
1268 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1269 /* 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;
1270 if (button_number >= 3) 1310 else if (button_number >= 3)
1271 button_number += (64 - 3); 1311 button_number += 64 - 3;
1272 } 1312 }
1273 1313
1274 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1275 { 1315 {
1276 /* 1316 /*
1277 * do not report ButtonRelease 1317 * do not report ButtonRelease
1278 * no state info allowed 1318 * no state info allowed
1279 */ 1319 */
1280 key_state = 0; 1320 if (release)
1281 if (button_number == 3)
1282 return; 1321 return;
1283 } 1322 }
1284 else 1323 else
1285 { 1324 {
1286 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1288 * 8 = Meta 1327 * 8 = Meta
1289 * 16 = Control 1328 * 16 = Control
1290 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1291 * 32 = Double Click 1330 * 32 = Double Click
1292 */ 1331 */
1293 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1294 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1295 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1296#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1297 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1298#endif 1337#endif
1299 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1300 1341
1301#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1302 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1303 if (key_state & 16) 1344 if (state & 16)
1304 fputc ('C', stderr); 1345 fputc ('C', stderr);
1305 if (key_state & 4) 1346 if (state & 4)
1306 fputc ('S', stderr); 1347 fputc ('S', stderr);
1307 if (key_state & 8) 1348 if (state & 8)
1308 fputc ('A', stderr); 1349 fputc ('A', stderr);
1309 if (key_state & 32) 1350 if (state & 32)
1310 fputc ('2', stderr); 1351 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1353 button_number,
1313 x + 1, 1354 x,
1314 y + 1); 1355 y);
1315#endif 1356#endif
1316 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
1317 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1385 code,
1319 (32 + x + 1), 1386 32 + x,
1320 (32 + y + 1)); 1387 32 + y);
1321} 1388}
1322 1389
1323/*{{{ process an X event */ 1390/*{{{ process an X event */
1324void 1391void ecb_hot
1325rxvt_term::x_cb (XEvent &ev) 1392rxvt_term::x_cb (XEvent &ev)
1326{ 1393{
1327 make_current (); 1394 make_current ();
1328 1395
1329 dLocal (Display *, dpy); 1396 dLocal (Display *, dpy);
… …
1427 && ev.xfocus.mode != NotifyGrab) 1494 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1495 focus_out ();
1429 break; 1496 break;
1430 1497
1431 case ConfigureNotify: 1498 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0]) 1499 if (ev.xconfigure.window == parent)
1436 { 1500 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 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 }
1439 1525
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1527 {
1442 seen_resize = 1; 1528 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1530 }
1445 else 1531
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1450#endif
1451 }
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1533 }
1454 break; 1534 break;
1455 1535
1456 case PropertyNotify: 1536 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1537 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1538 break;
1463 1539
1464 case SelectionClear: 1540 case SelectionClear:
1465 selection_clear (); 1541 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1542 break;
1472 1543
1473 case SelectionRequest: 1544 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1475 break; 1546 break;
1476 1547
1477 case MapNotify: 1548 case MapNotify:
1478 mapped = 1; 1549 mapped = 1;
1479#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1551 text_blink_ev.start ();
1481#endif 1552#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break; 1554 break;
1484 1555
1485 case UnmapNotify: 1556 case UnmapNotify:
… …
1495 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1496 { 1567 {
1497 do 1568 do
1498 { 1569 {
1499 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1500 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1501 } 1572 }
1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503 1574
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1576
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 { 1578 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1510 } 1581 }
1582
1511 want_refresh = 1; 1583 want_refresh = 1;
1512 } 1584 }
1513 else 1585 else
1514 { 1586 {
1515 XEvent unused_event; 1587 XEvent unused_event;
… …
1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1589 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1590 ;
1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1592 ;
1521 1593
1522 if (isScrollbarWindow (ev.xany.window)) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1595 {
1524 scrollBar.setIdle (); 1596 scrollBar.state = SB_STATE_IDLE;
1525 scrollbar_show (0); 1597 scrollBar.show (0);
1526 } 1598 }
1527 } 1599 }
1528 break; 1600 break;
1529 1601
1530 case MotionNotify: 1602 case MotionNotify:
1531#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1532 if (hidden_pointer) 1604 if (hidden_pointer)
1533 pointer_unblank (); 1605 pointer_unblank ();
1534#endif 1606#endif
1607 if (!bypass_keystate
1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1608 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1536 || priv_modes & PrivMode_MouseAnyEvent) 1609 || priv_modes & PrivMode_MouseAnyEvent))
1537 mouse_report (ev.xbutton); 1610 mouse_report (ev.xbutton);
1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1611 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1539 break; 1612 break;
1540 1613
1541 if (ev.xany.window == vt) 1614 if (ev.xany.window == vt)
… …
1553 &unused_root_x, &unused_root_y, 1626 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1627 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1628 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1557 /* deal with a `jumpy' mouse */ 1630 /* deal with a `jumpy' mouse */
1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1631 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1632#endif
1559 { 1633 {
1560#endif
1561#if ISO_14755 1634#if ISO_14755
1562 // 5.4 1635 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1636 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 { 1637 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1638 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1571 1644
1572#ifdef SELECTION_SCROLLING 1645#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < int_bwidth 1646 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1647 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1648 {
1649 page_dirn scroll_selection_dir;
1576 int dist; 1650 int dist;
1577 1651
1578 /* don't clobber the current delay if we are 1652 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1653 * already in the middle of scrolling.
1580 */ 1654 */
1581 if (!sel_scroll_ev.active) 1655 if (!sel_scroll_ev.is_active ())
1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1656 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1583 1657
1584 /* save the event params so we can highlight 1658 /* save the event params so we can highlight
1585 * the selection in the pending-scroll loop 1659 * the selection in the pending-scroll loop
1586 */ 1660 */
… …
1595 dist = int_bwidth - ev.xbutton.y; 1669 dist = int_bwidth - ev.xbutton.y;
1596 } 1670 }
1597 else 1671 else
1598 { 1672 {
1599 scroll_selection_dir = DN; 1673 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (int_bwidth + height); 1674 dist = ev.xbutton.y - (int_bwidth + vt_height);
1601 } 1675 }
1602 1676
1603 scroll_selection_lines = Pixel2Height (dist) 1677 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1678 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1679 + 1;
1606 min_it (scroll_selection_lines, 1680 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1681 SELECTION_SCROLL_MAX_LINES);
1682 scroll_selection_lines *= scroll_selection_dir;
1608 } 1683 }
1609 else 1684 else
1610 { 1685 {
1611 /* we are within the text window, so we 1686 /* we are within the text window, so we
1612 * shouldn't be scrolling 1687 * shouldn't be scrolling
1613 */ 1688 */
1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop(); 1689 sel_scroll_ev.stop();
1616 } 1690 }
1617#endif 1691#endif
1618#ifdef MOUSE_THRESHOLD
1619 } 1692 }
1620#endif
1621 } 1693 }
1622 } 1694 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1695 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1696 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1697 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1698 MotionNotify, &ev))
1627 ; 1699 ;
1628 1700
1629 XQueryPointer (dpy, scrollBar.win, 1701 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1702 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1703 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1704 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1705 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1706 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1707 scrollBar.size ());
1636 want_refresh = 1; 1708 want_refresh = 1;
1637 scrollbar_show (1); 1709 scrollBar.show (1);
1638 } 1710 }
1639 break; 1711 break;
1640 } 1712 }
1641 1713
1642#if defined(CURSOR_BLINK) 1714#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1715 if (ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again (); 1716 cursor_blink_reset ();
1652 }
1653#endif 1717#endif
1654 1718
1655#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 { 1721 {
… …
1663 1727
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1728 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1729 pointer_blank ();
1666 } 1730 }
1667#endif 1731#endif
1668}
1669 1732
1670void 1733 refresh_check ();
1734}
1735
1736#if ENABLE_FRILLS
1737void ecb_cold
1738rxvt_term::set_urgency (bool enable)
1739{
1740 if (enable == urgency_hint)
1741 return;
1742
1743 if (XWMHints *h = XGetWMHints (dpy, parent))
1744 {
1745 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1746 XSetWMHints (dpy, parent, h);
1747 urgency_hint = enable;
1748 XFree (h);
1749 }
1750}
1751#endif
1752
1753void ecb_cold
1671rxvt_term::focus_in () 1754rxvt_term::focus_in ()
1672{ 1755{
1673 if (!focus) 1756 if (!focus)
1674 { 1757 {
1675 focus = 1; 1758 focus = 1;
1676 want_refresh = 1; 1759 want_refresh = 1;
1677 1760
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM 1761#if USE_XIM
1681 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1682 { 1763 {
1683 IMSetPosition (); 1764 im_set_position ();
1684 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1685 } 1766 }
1686#endif 1767#endif
1687#if CURSOR_BLINK 1768#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1770 cursor_blink_ev.again ();
1690#endif 1771#endif
1691#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1693 { 1774 {
1694 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1695 scr_recolour (); 1776 scr_recolor ();
1696 } 1777 }
1697#endif 1778#endif
1698#if ENABLE_FRILLS 1779#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell)) 1780 if (option (Opt_urgentOnBell))
1700 { 1781 set_urgency (0);
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1708 }
1709}
1710 1782
1711void 1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1788 }
1789}
1790
1791void ecb_cold
1712rxvt_term::focus_out () 1792rxvt_term::focus_out ()
1713{ 1793{
1714 if (focus) 1794 if (focus)
1715 { 1795 {
1716 focus = 0; 1796 focus = 0;
1717 want_refresh = 1; 1797 want_refresh = 1;
1718 1798
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1799#if ENABLE_FRILLS
1800 if (option (Opt_urgentOnBell))
1801 set_urgency (0);
1720 1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1805#endif
1721#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf) 1807 if (iso14755buf)
1723 { 1808 {
1724 iso14755buf = 0; 1809 iso14755buf = 0;
1725# if ISO_14755 1810# if ISO_14755
… …
1739#endif 1824#endif
1740#if OFF_FOCUS_FADING 1825#if OFF_FOCUS_FADING
1741 if (rs[Rs_fade]) 1826 if (rs[Rs_fade])
1742 { 1827 {
1743 pix_colors = pix_colors_unfocused; 1828 pix_colors = pix_colors_unfocused;
1744 scr_recolour (); 1829 scr_recolor ();
1745 } 1830 }
1746#endif 1831#endif
1747 }
1748}
1749 1832
1750void 1833 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1834 }
1835}
1836
1837void ecb_cold
1751rxvt_term::update_fade_color (unsigned int idx) 1838rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1752{ 1839{
1753#if OFF_FOCUS_FADING 1840#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1841 if (rs[Rs_fade])
1755 { 1842 {
1843 if (!first_time)
1844 pix_colors_focused [idx].free (this);
1845
1756 rgba c; 1846 rgba c;
1757 pix_colors [Color_fade].get (c); 1847 pix_colors [Color_fade].get (c);
1758 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);
1759 } 1849 }
1760#endif 1850#endif
1761} 1851}
1762 1852
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL 1853#if ENABLE_PERL
1764void 1854void ecb_hot
1765rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1766{ 1856{
1767 make_current (); 1857 make_current ();
1768 1858
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1859 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1860 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return; 1861 return;
1772 1862
1773# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1863 switch (ev.type)
1775 { 1864 {
1776 case PropertyNotify: 1865 case PropertyNotify:
1777 /* 1866 /*
1778 * 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,
1779 * 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.
1780 */ 1869 */
1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1872 {
1784 bgPixmap.set_root_pixmap (); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1785 update_background ();
1786 } 1874 }
1875
1787 break; 1876 break;
1788 } 1877 }
1789# endif 1878
1879 refresh_check ();
1790} 1880}
1791#endif 1881#endif
1792 1882
1793void 1883void
1794rxvt_term::button_press (XButtonEvent &ev) 1884rxvt_term::button_press (XButtonEvent &ev)
… …
1815 iso14755_54 (ev.x, ev.y); 1905 iso14755_54 (ev.x, ev.y);
1816 return; 1906 return;
1817 } 1907 }
1818#endif 1908#endif
1819 1909
1820 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1910 clickintime = ev.time - MEvent.time < multiClickTime;
1821 1911
1822 if (reportmode) 1912 if (reportmode)
1823 { 1913 {
1824 /* mouse report from vt window */ 1914 /* mouse report from vt window */
1825 /* save the xbutton state (for ButtonRelease) */ 1915 /* save the xbutton state (for ButtonRelease) */
1826 MEvent.state = ev.state; 1916 MEvent.state = ev.state;
1827#ifdef MOUSE_REPORT_DOUBLECLICK 1917#ifdef MOUSE_REPORT_DOUBLECLICK
1828 if (ev.button == MEvent.button && clickintime) 1918 if (ev.button == MEvent.button && clickintime)
1829 { 1919 {
1830 /* same button, within alloted time */ 1920 /* same button, within allowed time */
1831 MEvent.clicks++; 1921 MEvent.clicks++;
1832 1922
1833 if (MEvent.clicks > 1) 1923 if (MEvent.clicks > 1)
1834 { 1924 {
1835 /* only report double clicks */ 1925 /* only report double clicks */
… …
1849 mouse_report (ev); 1939 mouse_report (ev);
1850 } 1940 }
1851#else 1941#else
1852 MEvent.button = ev.button; 1942 MEvent.button = ev.button;
1853 mouse_report (ev); 1943 mouse_report (ev);
1854#endif /* MOUSE_REPORT_DOUBLECLICK */ 1944#endif /* MOUSE_REPORT_DOUBLECLICK */
1855 1945
1856 } 1946 }
1857 else 1947 else
1858 { 1948 {
1859 if (ev.button != MEvent.button) 1949 if (ev.button != MEvent.button)
… …
1907 } 1997 }
1908 1998
1909 /* 1999 /*
1910 * Scrollbar window processing of button press 2000 * Scrollbar window processing of button press
1911 */ 2001 */
1912 if (isScrollbarWindow (ev.window)) 2002 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 2003 {
1914 scrollBar.setIdle (); 2004 page_dirn direction = NO_DIR;
2005
2006 if (scrollBar.upButton (ev.y))
2007 direction = UP; /* up */
2008 else if (scrollBar.dnButton (ev.y))
2009 direction = DN; /* down */
2010
2011 scrollBar.state = SB_STATE_IDLE;
1915 /* 2012 /*
1916 * Rxvt-style scrollbar: 2013 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 2014 * move up if mouse is above slider
1918 * move dn if mouse is below slider 2015 * move dn if mouse is below slider
1919 * 2016 *
… …
1928 /* 2025 /*
1929 * Mouse report disabled scrollbar: 2026 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 2027 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 2028 * click on scrollbar - send pageup/down
1932 */ 2029 */
1933 if ((scrollBar.style == R_SB_NEXT 2030 if (direction == UP)
1934 && scrollbarnext_upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 2031 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 2032 else if (direction == DN)
1939 && scrollbarnext_dnButton (ev.y))
1940 || (scrollBar.style == R_SB_RXVT
1941 && scrollbarrxvt_dnButton (ev.y)))
1942 tt_printf ("\033[B"); 2033 tt_printf ("\033[B");
1943 else 2034 else
1944 switch (ev.button) 2035 switch (ev.button)
1945 { 2036 {
1946 case Button2: 2037 case Button2:
… …
1953 tt_printf ("\033[5~"); 2044 tt_printf ("\033[5~");
1954 break; 2045 break;
1955 } 2046 }
1956 } 2047 }
1957 else 2048 else
1958#endif /* NO_SCROLLBAR_REPORT */ 2049#endif /* NO_SCROLLBAR_REPORT */
1959
1960 {
1961 char upordown = 0;
1962
1963 if (scrollBar.style == R_SB_NEXT)
1964 { 2050 {
1965 if (scrollbarnext_upButton (ev.y)) 2051 if (direction != NO_DIR)
1966 upordown = -1; /* up */
1967 else if (scrollbarnext_dnButton (ev.y))
1968 upordown = 1; /* down */
1969 }
1970 else if (scrollBar.style == R_SB_RXVT)
1971 {
1972 if (scrollbarrxvt_upButton (ev.y))
1973 upordown = -1; /* up */
1974 else if (scrollbarrxvt_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 if (upordown)
1978 { 2052 {
1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2053#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2054 if (!cont_scroll_ev.is_active ())
1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2055 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1981#endif 2056#endif
1982 if (scr_page (upordown < 0 ? UP : DN, 1)) 2057 if (scr_page (direction, 1))
1983 { 2058 {
1984 if (upordown < 0) 2059 if (direction == UP)
1985 scrollBar.setUp (); 2060 scrollBar.state = SB_STATE_UP;
1986 else 2061 else
1987 scrollBar.setDn (); 2062 scrollBar.state = SB_STATE_DOWN;
1988 } 2063 }
1989 } 2064 }
1990 else 2065 else
1991 switch (ev.button) 2066 switch (ev.button)
1992 { 2067 {
1993 case Button2: 2068 case Button2:
1994 switch (scrollbar_align) 2069 switch (scrollBar.align)
1995 { 2070 {
1996 case R_SB_ALIGN_TOP: 2071 case SB_ALIGN_TOP:
1997 csrO = 0; 2072 csrO = 0;
1998 break; 2073 break;
1999 case R_SB_ALIGN_CENTRE: 2074 case SB_ALIGN_CENTRE:
2000 csrO = (scrollBar.bot - scrollBar.top) / 2; 2075 csrO = (scrollBar.bot - scrollBar.top) / 2;
2001 break; 2076 break;
2002 case R_SB_ALIGN_BOTTOM: 2077 case SB_ALIGN_BOTTOM:
2003 csrO = scrollBar.bot - scrollBar.top; 2078 csrO = scrollBar.bot - scrollBar.top;
2004 break; 2079 break;
2005 } 2080 }
2006 2081
2007 if (scrollBar.style == R_SB_XTERM 2082 if (scrollBar.style == SB_STYLE_XTERM
2008 || scrollbar_above_slider (ev.y) 2083 || scrollBar.above_slider (ev.y)
2009 || scrollbar_below_slider (ev.y)) 2084 || scrollBar.below_slider (ev.y))
2010 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2085 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2011 2086
2012 scrollBar.setMotion (); 2087 scrollBar.state = SB_STATE_MOTION;
2013 break; 2088 break;
2014 2089
2015 case Button1: 2090 case Button1:
2016 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2091 if (scrollBar.align == SB_ALIGN_CENTRE)
2017 csrO = ev.y - scrollBar.top; 2092 csrO = ev.y - scrollBar.top;
2018 /* FALLTHROUGH */ 2093 /* FALLTHROUGH */
2019 2094
2020 case Button3: 2095 case Button3:
2021 if (scrollBar.style != R_SB_XTERM) 2096 if (scrollBar.style != SB_STYLE_XTERM)
2022 { 2097 {
2023 if (scrollbar_above_slider (ev.y)) 2098 if (scrollBar.above_slider (ev.y))
2024# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2025 scr_page (UP, nrow - 1); 2100 scr_page (UP, nrow - 1);
2026# else 2101# else
2027 scr_page (UP, nrow / 4); 2102 scr_page (UP, nrow / 4);
2028# endif 2103# endif
2029 else if (scrollbar_below_slider (ev.y)) 2104 else if (scrollBar.below_slider (ev.y))
2030# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2031 scr_page (DN, nrow - 1); 2106 scr_page (DN, nrow - 1);
2032# else 2107# else
2033 scr_page (DN, nrow / 4); 2108 scr_page (DN, nrow / 4);
2034# endif 2109# endif
2035 else 2110 else
2036 scrollBar.setMotion (); 2111 scrollBar.state = SB_STATE_MOTION;
2037 } 2112 }
2038 else 2113 else
2039 { 2114 {
2040 scr_page ((ev.button == Button1 ? DN : UP), 2115 scr_page ((ev.button == Button1 ? DN : UP),
2041 (nrow 2116 (nrow
2042 * scrollbar_position (ev.y) 2117 * scrollBar.position (ev.y)
2043 / scrollbar_size ())); 2118 / scrollBar.size ()));
2044 } 2119 }
2045 2120
2046 break; 2121 break;
2047 } 2122 }
2048 } 2123 }
… …
2058 2133
2059 csrO = 0; /* reset csr Offset */ 2134 csrO = 0; /* reset csr Offset */
2060 if (!bypass_keystate) 2135 if (!bypass_keystate)
2061 reportmode = !! (priv_modes & PrivMode_mouse_report); 2136 reportmode = !! (priv_modes & PrivMode_mouse_report);
2062 2137
2063 if (scrollbar_isUpDn ()) 2138 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2064 { 2139 {
2065 scrollBar.setIdle (); 2140 scrollBar.state = SB_STATE_IDLE;
2066 scrollbar_show (0); 2141 scrollBar.show (0);
2067 } 2142 }
2068 2143
2069#ifdef SELECTION_SCROLLING 2144#ifdef SELECTION_SCROLLING
2070 if (sel_scroll_ev.active)
2071 sel_scroll_ev.stop(); 2145 sel_scroll_ev.stop();
2072#endif 2146#endif
2073 2147
2074 if (ev.window == vt) 2148 if (ev.window == vt)
2075 { 2149 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2150 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2084 2158
2085 if (reportmode) 2159 if (reportmode)
2086 { 2160 {
2087 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2088 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2089 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2090 return; 2164 return;
2091#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2092 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2093 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2094 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2095 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2096 > MULTICLICK_TIME / 2))) 2170 > multiClickTime / 2)))
2097 { 2171 {
2098 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2099 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2100 mouse_report (ev); 2174 mouse_report (ev);
2101 } 2175 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2103 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2104 mouse_report (ev);
2105#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2106 return; 2181 return;
2107 } 2182 }
2108 2183
2109 /* 2184 /*
2110 * dumb hack to compensate for the failure of click-and-drag 2185 * dumb hack to compensate for the failure of click-and-drag
… …
2121 case Button3: 2196 case Button3:
2122 selection_make (ev.time); 2197 selection_make (ev.time);
2123 break; 2198 break;
2124 2199
2125 case Button2: 2200 case Button2:
2126 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?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2202 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2128 break; 2203 break;
2129 2204
2130#ifdef MOUSE_WHEEL 2205#ifdef MOUSE_WHEEL
2131 case Button4: 2206 case Button4:
2132 case Button5: 2207 case Button5:
2133 { 2208 {
2134 int i; 2209 int lines;
2135 page_dirn v; 2210 page_dirn dirn;
2136 2211
2137 v = ev.button == Button4 ? UP : DN; 2212 dirn = ev.button == Button4 ? UP : DN;
2138 2213
2139 if (ev.state & ShiftMask) 2214 if (ev.state & ShiftMask)
2140 i = 1; 2215 lines = 1;
2141 else if (option (Opt_mouseWheelScrollPage)) 2216 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1; 2217 lines = nrow - 1;
2143 else 2218 else
2144 i = 5; 2219 lines = 5;
2145 2220
2146# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2147 if (ev.state & ControlMask) 2222 if (ev.state & ControlMask)
2148 { 2223 {
2149 mouse_slip_wheel_speed += v ? -1 : 1; 2224 mouse_slip_wheel_speed += dirn;
2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2225 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152 2226
2227 if (!slip_wheel_ev.is_active ())
2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2228 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2154 } 2229 }
2155 else 2230 else
2231# endif
2156 { 2232 {
2157# endif
2158 scr_page (v, i); 2233 scr_page (dirn, lines);
2159 scrollbar_show (1); 2234 scrollBar.show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2235 }
2162# endif
2163 } 2236 }
2164 break; 2237 break;
2165#endif 2238#endif
2166 } 2239 }
2167 } 2240 }
2168} 2241}
2169 2242
2170/*}}} */ 2243/*}}} */
2171 2244
2172bool 2245void ecb_hot
2173rxvt_term::cmd_parse () 2246rxvt_term::cmd_parse ()
2174{ 2247{
2175 bool flag = false;
2176 wchar_t ch = NOCHAR; 2248 wchar_t ch = NOCHAR;
2177 char *seq_begin; // remember start of esc-sequence here 2249 char *seq_begin; // remember start of esc-sequence here
2178 2250
2179 for (;;) 2251 for (;;)
2180 { 2252 {
2181 if (ch == NOCHAR) 2253 if (ecb_unlikely (ch == NOCHAR))
2182 { 2254 {
2183 seq_begin = cmdbuf_ptr; 2255 seq_begin = cmdbuf_ptr;
2184 ch = next_char (); 2256 ch = next_char ();
2185 2257
2186 if (ch == NOCHAR) 2258 if (ch == NOCHAR)
2187 break; 2259 break;
2188 } 2260 }
2189 2261
2190 if (!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))
2191 { 2263 {
2192 if (!seen_input) 2264 if (ecb_unlikely (!seen_input))
2193 { 2265 {
2194 seen_input = 1; 2266 seen_input = 1;
2195 // many badly-written programs (e.g. jed) contain a race condition: 2267 // many badly-written programs (e.g. jed) contain a race condition:
2196 // they first read the screensize and then install a SIGWINCH handler. 2268 // they first read the screensize and then install a SIGWINCH handler.
2197 // some window managers resize the window early, and these programs 2269 // some window managers resize the window early, and these programs
… …
2210 wchar_t *str = buf; 2282 wchar_t *str = buf;
2211 wchar_t *eol = str + min (ncol, UBUFSIZ); 2283 wchar_t *eol = str + min (ncol, UBUFSIZ);
2212 2284
2213 for (;;) 2285 for (;;)
2214 { 2286 {
2215 if (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)))
2216 break; 2288 break;
2217 2289
2218 *str++ = ch; 2290 *str++ = ch;
2219 2291
2220 if (ch == C0_LF || str >= eol) 2292 if (ecb_unlikely (ch == C0_LF || str >= eol))
2221 { 2293 {
2222 if (ch == C0_LF) 2294 if (ch == C0_LF)
2223 nlines++; 2295 nlines++;
2224 2296
2225 refresh_count++; 2297 refresh_count++;
2226 2298
2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2299 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2228 { 2300 {
2229 refresh_count = 0; 2301 refresh_count = 0;
2230 2302
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2303 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2232 { 2304 {
2233 refreshnow = true; 2305 refreshnow = true;
2234 ch = NOCHAR; 2306 ch = NOCHAR;
2235 break; 2307 break;
2236 } 2308 }
… …
2274 * What the heck we'll cheat and only refresh less than every page-full. 2346 * What the heck we'll cheat and only refresh less than every page-full.
2275 * if skipScroll is enabled. 2347 * if skipScroll is enabled.
2276 */ 2348 */
2277 if (refreshnow) 2349 if (refreshnow)
2278 { 2350 {
2279 flag = true;
2280 scr_refresh (); 2351 scr_refresh ();
2281 want_refresh = 1; 2352 want_refresh = 1;
2282 } 2353 }
2283
2284 } 2354 }
2285 else 2355 else
2286 { 2356 {
2287 try 2357 try
2288 { 2358 {
… …
2296 } 2366 }
2297 2367
2298 ch = NOCHAR; 2368 ch = NOCHAR;
2299 } 2369 }
2300 } 2370 }
2301
2302 return flag;
2303} 2371}
2304 2372
2305// read the next character 2373// read the next character
2306wchar_t 2374wchar_t ecb_hot
2307rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2308{ 2376{
2309 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2310 { 2378 {
2311 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2312 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2313 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2314 2382
2315 wchar_t wc; 2383 wchar_t wc;
2316 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);
2317 2385
… …
2321 cmdbuf_ptr = cmdbuf_endp; 2389 cmdbuf_ptr = cmdbuf_endp;
2322 break; 2390 break;
2323 } 2391 }
2324 2392
2325 if (len == (size_t)-1) 2393 if (len == (size_t)-1)
2394 {
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.
2326 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
2399 }
2327 2400
2328 // assume wchar == unicode 2401 // assume wchar == unicode
2329 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2330 return wc & UNICODE_MASK; 2403 return wc & UNICODE_MASK;
2331 } 2404 }
2332 2405
2333 return NOCHAR; 2406 return NOCHAR;
2334} 2407}
2335 2408
2336// read the next octet 2409// read the next octet
2337uint32_t 2410uint32_t ecb_hot
2338rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2339{ 2412{
2340 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2341 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2342 : NOCHAR; 2415 : NOCHAR;
2343} 2416}
2344 2417
2345static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2346 2419
2347/* rxvt_cmd_getc () - Return next input character */ 2420wchar_t ecb_hot
2348/* 2421rxvt_term::cmd_getc ()
2349 * Return the next input character after first passing any keyboard input
2350 * to the command.
2351 */
2352wchar_t
2353rxvt_term::cmd_getc () THROW ((class out_of_input))
2354{ 2422{
2355 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2356 2424
2357 if (c == NOCHAR) 2425 if (c == NOCHAR)
2358 throw out_of_input; 2426 throw out_of_input;
2359 2427
2360 return c; 2428 return c;
2361} 2429}
2362 2430
2363uint32_t 2431uint32_t ecb_hot
2364rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2365{ 2433{
2366 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2367 2435
2368 if (c == NOCHAR) 2436 if (c == NOCHAR)
2369 throw out_of_input; 2437 throw out_of_input;
… …
2372} 2440}
2373 2441
2374/*{{{ print pipe */ 2442/*{{{ print pipe */
2375/*----------------------------------------------------------------------*/ 2443/*----------------------------------------------------------------------*/
2376#ifdef PRINTPIPE 2444#ifdef PRINTPIPE
2377FILE * 2445FILE * ecb_cold
2378rxvt_term::popen_printer () 2446rxvt_term::popen_printer ()
2379{ 2447{
2380 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2448 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2381 2449
2382 if (stream == NULL) 2450 if (stream == NULL)
2383 rxvt_warn ("can't open printer pipe, not printing.\n"); 2451 rxvt_warn ("can't open printer pipe, not printing.\n");
2384 2452
2385 return stream; 2453 return stream;
2386} 2454}
2387 2455
2388int 2456int ecb_cold
2389rxvt_term::pclose_printer (FILE *stream) 2457rxvt_term::pclose_printer (FILE *stream)
2390{ 2458{
2391 fflush (stream); 2459 fflush (stream);
2392 return pclose (stream); 2460 return pclose (stream);
2393} 2461}
2394 2462
2395/* 2463/*
2396 * simulate attached vt100 printer 2464 * simulate attached vt100 printer
2397 */ 2465 */
2398void 2466void ecb_cold
2399rxvt_term::process_print_pipe () 2467rxvt_term::process_print_pipe ()
2400{ 2468{
2401 int done; 2469 FILE *fd = popen_printer ();
2402 FILE *fd;
2403 2470
2404 if ((fd = popen_printer ()) == NULL) 2471 if (!fd)
2405 return; 2472 return;
2406 2473
2407 /* 2474 /*
2408 * Send all input to the printer until either ESC[4i or ESC[?4i 2475 * Send all input to the printer until either ESC[4i or ESC[?4i
2409 * is received. 2476 * is received.
2410 */ 2477 */
2411 for (done = 0; !done;) 2478 for (int done = 0; !done; )
2412 { 2479 {
2413 unsigned char buf[8]; 2480 unsigned char buf[8];
2414 unicode_t ch; 2481 unicode_t ch;
2415 unsigned int i, len; 2482 unsigned int i, len;
2416 2483
… …
2447 } 2514 }
2448 } 2515 }
2449 2516
2450 pclose_printer (fd); 2517 pclose_printer (fd);
2451} 2518}
2452#endif /* PRINTPIPE */ 2519#endif /* PRINTPIPE */
2453/*}}} */ 2520/*}}} */
2454 2521
2455/* *INDENT-OFF* */
2456enum { 2522enum {
2457 C1_40 = 0x40, 2523 C1_40 = 0x40,
2458 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,
2459 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,
2460 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,
2461 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,
2462}; 2528};
2463/* *INDENT-ON* */
2464 2529
2465/*{{{ process non-printing single characters */ 2530/*{{{ process non-printing single characters */
2466void 2531void ecb_hot
2467rxvt_term::process_nonprinting (unicode_t ch) 2532rxvt_term::process_nonprinting (unicode_t ch)
2468{ 2533{
2469 switch (ch) 2534 switch (ch)
2470 { 2535 {
2471 case C0_ESC: 2536 case C0_ESC:
… …
2501 scr_charset_choose (0); 2566 scr_charset_choose (0);
2502 break; 2567 break;
2503 2568
2504#ifdef EIGHT_BIT_CONTROLS 2569#ifdef EIGHT_BIT_CONTROLS
2505 // 8-bit controls 2570 // 8-bit controls
2506 case 0x90: /* DCS */ 2571 case 0x90: /* DCS */
2507 process_dcs_seq (); 2572 process_dcs_seq ();
2508 break; 2573 break;
2509 case 0x9b: /* CSI */ 2574 case 0x9b: /* CSI */
2510 process_csi_seq (); 2575 process_csi_seq ();
2511 break; 2576 break;
2512 case 0x9d: /* OSC */ 2577 case 0x9d: /* OSC */
2513 process_osc_seq (); 2578 process_osc_seq ();
2514 break; 2579 break;
2515#endif 2580#endif
2516 } 2581 }
2517} 2582}
2518/*}}} */ 2583/*}}} */
2519 2584
2520 2585
2521/*{{{ process VT52 escape sequences */ 2586/*{{{ process VT52 escape sequences */
2522void 2587void ecb_cold
2523rxvt_term::process_escape_vt52 (unicode_t ch) 2588rxvt_term::process_escape_vt52 (unicode_t ch)
2524{ 2589{
2525 int row, col; 2590 int row, col;
2526 2591
2527 switch (ch) 2592 switch (ch)
… …
2561 break; 2626 break;
2562 case 'Z': /* identify the terminal type */ 2627 case 'Z': /* identify the terminal type */
2563 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2628 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2564 break; 2629 break;
2565 case '<': /* turn off VT52 mode */ 2630 case '<': /* turn off VT52 mode */
2566 PrivMode (0, PrivMode_vt52); 2631 priv_modes &= ~PrivMode_vt52;
2567 break; 2632 break;
2568 case 'F': /* use special graphics character set */ 2633 case 'F': /* use special graphics character set */
2569 case 'G': /* use regular character set */ 2634 case 'G': /* use regular character set */
2570 /* unimplemented */ 2635 /* unimplemented */
2571 break; 2636 break;
… …
2577} 2642}
2578/*}}} */ 2643/*}}} */
2579 2644
2580 2645
2581/*{{{ process escape sequences */ 2646/*{{{ process escape sequences */
2582void 2647void ecb_hot
2583rxvt_term::process_escape_seq () 2648rxvt_term::process_escape_seq ()
2584{ 2649{
2585 unicode_t ch = cmd_getc (); 2650 unicode_t ch = cmd_getc ();
2586 2651
2587 if (priv_modes & PrivMode_vt52) 2652 if (priv_modes & PrivMode_vt52)
… …
2590 return; 2655 return;
2591 } 2656 }
2592 2657
2593 switch (ch) 2658 switch (ch)
2594 { 2659 {
2595 /* case 1: do_tek_mode (); break; */
2596 case '#': 2660 case '#':
2597 if (cmd_getc () == '8') 2661 if (cmd_getc () == '8')
2598 scr_E (); 2662 scr_E ();
2599 break; 2663 break;
2600 case '(': 2664 case '(':
… …
2623#if !ENABLE_MINIMAL 2687#if !ENABLE_MINIMAL
2624 case '9': 2688 case '9':
2625 scr_forwardindex (); 2689 scr_forwardindex ();
2626 break; 2690 break;
2627#endif 2691#endif
2692 // DECPAM/DECPNM
2628 case '=': 2693 case '=':
2694 priv_modes |= PrivMode_aplKP;
2695 break;
2629 case '>': 2696 case '>':
2630 PrivMode ((ch == '='), PrivMode_aplKP); 2697 priv_modes &= ~PrivMode_aplKP;
2631 break; 2698 break;
2632 2699
2633 case C1_40: 2700 case C1_40:
2634 cmd_getc (); 2701 cmd_getc ();
2635 break; 2702 break;
… …
2639 2706
2640 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
2641 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
2642 { 2709 {
2643 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2644 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2645 } 2712 }
2646 break; 2713 break;
2647 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2648 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2649 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2650 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 */
2651 break; 2721 break;
2722#endif
2652 2723
2653 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2654 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2655 scr_set_tab (1); 2726 scr_set_tab (1);
2656 break; 2727 break;
… …
2659 case C1_RI: /* ESC M */ 2730 case C1_RI: /* ESC M */
2660 scr_index (DN); 2731 scr_index (DN);
2661 break; 2732 break;
2662 2733
2663 /* 8.3.142: SINGLE-SHIFT TWO */ 2734 /* 8.3.142: SINGLE-SHIFT TWO */
2664 /*case C1_SS2: scr_single_shift (2); break; */ 2735 /* case C1_SS2: break; */
2665 2736
2666 /* 8.3.143: SINGLE-SHIFT THREE */ 2737 /* 8.3.143: SINGLE-SHIFT THREE */
2667 /*case C1_SS3: scr_single_shift (3); break; */ 2738 /* case C1_SS3: break; */
2668 2739
2669 /* 8.3.27: DEVICE CONTROL STRING */ 2740 /* 8.3.27: DEVICE CONTROL STRING */
2670 case C1_DCS: /* ESC P */ 2741 case C1_DCS: /* ESC P */
2671 process_dcs_seq (); 2742 process_dcs_seq ();
2672 break; 2743 break;
… …
2674 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2745 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2675 case C1_SCI: /* ESC Z */ 2746 case C1_SCI: /* ESC Z */
2676 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2747 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2677 break; /* steal obsolete ESC [ c */ 2748 break; /* steal obsolete ESC [ c */
2678 2749
2679 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2750 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2680 case C1_CSI: /* ESC [ */ 2751 case C1_CSI: /* ESC [ */
2681 process_csi_seq (); 2752 process_csi_seq ();
2682 break; 2753 break;
2683 2754
2684 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2755 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2685 case C1_OSC: /* ESC ] */ 2756 case C1_OSC: /* ESC ] */
2686 process_osc_seq (); 2757 process_osc_seq ();
2687 break; 2758 break;
2688 2759
2689 /* 8.3.106: RESET TO INITIAL STATE */ 2760 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2690 case 'c': 2761 case 'c':
2691 mbstate.reset (); 2762 mbstate.reset ();
2692 scr_poweron (); 2763 scr_poweron ();
2693 scrollbar_show (1); 2764 scrollBar.show (1);
2694 break; 2765 break;
2695 2766
2696 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2767 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2697 case 'n': 2768 case 'n':
2698 scr_charset_choose (2); 2769 scr_charset_choose (2);
… …
2705 } 2776 }
2706} 2777}
2707/*}}} */ 2778/*}}} */
2708 2779
2709/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2780/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2710/* *INDENT-OFF* */
2711enum { 2781enum {
2712 CSI_ICH = 0x40, 2782 CSI_ICH = 0x40,
2713 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,
2714 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 ,
2715 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,
… …
2718 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,
2719 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 ,
2720 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
2721}; 2791};
2722 2792
2723#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2793#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2724 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2794 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2725 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2795 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2726#define get_byte_array_bit(array, bit) \ 2796#define get_byte_array_bit(array, bit) \
2727 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2797 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2728 2798
2729const unsigned char csi_defaults[] = 2799static const unsigned char csi_defaults[] =
2730 { 2800 {
2731 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, */
2732 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, */
2733 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, */
2734 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, [, \, ], ^, _, */
2735 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, */
2736 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, */
2737 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, */
2738 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, {, |, }, ~, */
2739 }; 2809 };
2740/* *INDENT-ON* */
2741 2810
2742void 2811void ecb_hot
2743rxvt_term::process_csi_seq () 2812rxvt_term::process_csi_seq ()
2744{ 2813{
2745 unicode_t ch, priv, i; 2814 unicode_t ch, priv, prev_ch, i;
2746 unsigned int nargs, p; 2815 unsigned int nargs, p;
2747 int n, ndef; 2816 int n, ndef;
2748 int arg[ESC_ARGS] = { }; 2817 int arg[ESC_ARGS] = { };
2749 2818
2750 nargs = 0; 2819 nargs = 0;
2751 2820
2752 priv = 0; 2821 priv = 0;
2753 ch = cmd_getc (); 2822 ch = cmd_getc ();
2754 if (ch >= '<' && ch <= '?') 2823 if ((ch >= '<' && ch <= '?') || ch == '!')
2824 {
2755 { /* '<' '=' '>' '?' */ 2825 /* '<' '=' '>' '?' '!' */
2756 priv = ch; 2826 priv = ch;
2757 ch = cmd_getc (); 2827 ch = cmd_getc ();
2758 } 2828 }
2759 2829
2830 prev_ch = 0;
2760 /* read any numerical arguments */ 2831 /* read any numerical arguments */
2761 for (n = -1; ch < CSI_ICH; ) 2832 for (n = -1; ch < CSI_ICH; )
2762 { 2833 {
2763 if (isdigit (ch)) 2834 if (isdigit (ch))
2764 { 2835 {
… …
2774 n = -1; 2845 n = -1;
2775 } 2846 }
2776 else if (IS_CONTROL (ch)) 2847 else if (IS_CONTROL (ch))
2777 process_nonprinting (ch); 2848 process_nonprinting (ch);
2778 2849
2850 prev_ch = ch;
2779 ch = cmd_getc (); 2851 ch = cmd_getc ();
2780 } 2852 }
2781 2853
2782 if (ch > CSI_7F) 2854 if (ch > CSI_7F)
2783 return; 2855 return;
… …
2809 // versions. 2881 // versions.
2810 // 2882 //
2811 tt_printf ("\033[>%d;95;0c", 'U'); 2883 tt_printf ("\033[>%d;95;0c", 'U');
2812 } 2884 }
2813 break; 2885 break;
2886
2814 case '?': 2887 case '?':
2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2816 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);
2817 break; 2892 break;
2893
2894 case '!':
2895 if (ch == CSI_70)
2896 {
2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2898 scr_soft_reset ();
2899
2900 static const int pm_h[] = { 7, 25 };
2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2902
2903 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2818 } 2905 }
2906 break;
2907 }
2908
2819 return; 2909 return;
2820 } 2910 }
2821 2911
2822 switch (ch) 2912 switch (ch)
2823 { 2913 {
… …
2837 } 2927 }
2838 break; 2928 break;
2839#endif 2929#endif
2840 2930
2841 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2931 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2842 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2932 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2843 arg[0] = -arg[0]; 2933 arg[0] = -arg[0];
2844 /* FALLTHROUGH */ 2934 /* FALLTHROUGH */
2845 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2935 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2846 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2847 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2848 break; 2938 break;
2849 2939
2850 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2851 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2852#ifdef ISO6429 2942#ifdef ISO6429
2853 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2854#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2855 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2856#endif 2946#endif
… …
2947 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
2948 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
2949 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2950 break; 3040 break;
2951 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';
2952 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2953 break; 3047 break;
3048 }
2954 } 3049 }
2955 break; 3050 break;
2956 3051
2957 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2958 switch (arg[0]) 3053 switch (arg[0])
… …
3001 scr_insert_mode (1); 3096 scr_insert_mode (1);
3002 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3003 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3004 break; 3099 break;
3005 3100
3101 case CSI_71: // DECSCUSR: set cursor style
3102 if (prev_ch == ' ')
3103 set_cursor_style (arg[0]);
3104 break;
3105
3006 /* 3106 /*
3007 * PRIVATE USE beyond this point. All CSI_7? sequences here 3107 * PRIVATE USE beyond this point. All CSI_7? sequences here
3008 */ 3108 */
3009 case CSI_72: /* DECSTBM: set top and bottom margins */ 3109 case CSI_72: /* DECSTBM: set top and bottom margins */
3010 if (nargs == 1) 3110 if (nargs == 1)
… …
3038 } 3138 }
3039} 3139}
3040/*}}} */ 3140/*}}} */
3041 3141
3042#if !ENABLE_MINIMAL 3142#if !ENABLE_MINIMAL
3043/* ARGSUSED */
3044void 3143void
3045rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3144rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3046{ 3145{
3047 int x, y; 3146 int x, y;
3048 XWindowAttributes wattr; 3147 XWindowAttributes wattr;
… …
3057 { 3156 {
3058 /* 3157 /*
3059 * commands 3158 * commands
3060 */ 3159 */
3061 case 1: /* deiconify window */ 3160 case 1: /* deiconify window */
3062 XMapWindow (dpy, parent[0]); 3161 XMapWindow (dpy, parent);
3063 break; 3162 break;
3064 case 2: /* iconify window */ 3163 case 2: /* iconify window */
3065 XIconifyWindow (dpy, parent[0], display->screen); 3164 XIconifyWindow (dpy, parent, display->screen);
3066 break; 3165 break;
3067 case 3: /* set position (pixels) */ 3166 case 3: /* set position (pixels) */
3068 XMoveWindow (dpy, parent[0], args[1], args[2]); 3167 XMoveWindow (dpy, parent, args[1], args[2]);
3069 break; 3168 break;
3070 case 4: /* set size (pixels) */ 3169 case 4: /* set size (pixels) */
3071 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3170 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3072 break; 3171 break;
3073 case 5: /* raise window */ 3172 case 5: /* raise window */
3074 XRaiseWindow (dpy, parent[0]); 3173 XRaiseWindow (dpy, parent);
3075 break; 3174 break;
3076 case 6: /* lower window */ 3175 case 6: /* lower window */
3077 XLowerWindow (dpy, parent[0]); 3176 XLowerWindow (dpy, parent);
3078 break; 3177 break;
3079 case 7: /* refresh window */ 3178 case 7: /* refresh window */
3080 scr_touch (true); 3179 scr_touch (true);
3081 break; 3180 break;
3082 case 8: /* set size (chars) */ 3181 case 8: /* set size (chars) */
… …
3085 break; 3184 break;
3086 3185
3087 //case 9: NYI, TODO, restore maximized window or maximize window 3186 //case 9: NYI, TODO, restore maximized window or maximize window
3088 default: 3187 default:
3089 if (args[0] >= 24) /* set height (chars) */ 3188 if (args[0] >= 24) /* set height (chars) */
3090 set_widthheight ((unsigned int)width, 3189 set_widthheight ((unsigned int)vt_width,
3091 (unsigned int) (args[1] * fheight)); 3190 (unsigned int) (args[1] * fheight));
3092 break; 3191 break;
3093 3192
3094 /* 3193 /*
3095 * reports - some output format copied from XTerm 3194 * reports - some output format copied from XTerm
3096 */ 3195 */
3097 case 11: /* report window state */ 3196 case 11: /* report window state */
3098 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3099 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3198 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3100 break; 3199 break;
3101 case 13: /* report window position */ 3200 case 13: /* report window position */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3201 XGetWindowAttributes (dpy, parent, &wattr);
3103 XTranslateCoordinates (dpy, parent[0], wattr.root, 3202 XTranslateCoordinates (dpy, parent, wattr.root,
3104 -wattr.border_width, -wattr.border_width, 3203 -wattr.border_width, -wattr.border_width,
3105 &x, &y, &wdummy); 3204 &x, &y, &wdummy);
3106 tt_printf ("\033[3;%d;%dt", x, y); 3205 tt_printf ("\033[3;%d;%dt", x, y);
3107 break; 3206 break;
3108 case 14: /* report window size (pixels) */ 3207 case 14: /* report window size (pixels) */
3109 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3110 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3209 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3111 break; 3210 break;
3112 case 18: /* report text area size (chars) */ 3211 case 18: /* report text area size (chars) */
3113 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3212 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3114 break; 3213 break;
… …
3116 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3215 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3117 break; 3216 break;
3118 case 20: /* report icon label */ 3217 case 20: /* report icon label */
3119 { 3218 {
3120 char *s; 3219 char *s;
3121 XGetIconName (dpy, parent[0], &s); 3220 XGetIconName (dpy, parent, &s);
3122 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 */
3123 XFree (s); 3222 XFree (s);
3124 } 3223 }
3125 break; 3224 break;
3126 case 21: /* report window title */ 3225 case 21: /* report window title */
3127 { 3226 {
3128 char *s; 3227 char *s;
3129 XFetchName (dpy, parent[0], &s); 3228 XFetchName (dpy, parent, &s);
3130 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 */
3131 XFree (s); 3230 XFree (s);
3132 } 3231 }
3133 break; 3232 break;
3134 } 3233 }
… …
3139/* 3238/*
3140 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3141 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3142 */ 3241 */
3143char * 3242char *
3144rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3145{ 3244{
3146 unicode_t ch; 3245 unicode_t ch;
3147 bool seen_esc = false; 3246 bool seen_esc = false;
3148 unsigned int n = 0; 3247 unsigned int n = 0;
3149 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3150 3249
3151 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3152 { 3251 {
3153 if (seen_esc) 3252 if (seen_esc)
3154 { 3253 {
… …
3169 else if (ch < 0x20) 3268 else if (ch < 0x20)
3170 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3171 3270
3172 seen_esc = false; 3271 seen_esc = false;
3173 3272
3174 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3175 // stop at some sane length 3274 // stop at some sane length
3176 return NULL; 3275 return NULL;
3177 3276
3178 string[n++] = ch; 3277 string[n++] = ch;
3179 } 3278 }
3180 3279
3181 string[n++] = '\0'; 3280 string[n++] = '\0';
3182 3281
3183 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';
3184 3287
3185 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3186} 3289}
3187 3290
3188/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3190 * 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)'
3191 */ 3294 */
3192void 3295void
3193rxvt_term::process_dcs_seq () 3296rxvt_term::process_dcs_seq ()
3194{ 3297{
3195 char *s;
3196 unicode_t eh;
3197
3198 /* 3298 /*
3199 * Not handled yet 3299 * Not handled yet
3200 */ 3300 */
3301
3302 string_term st;
3201 s = get_to_st (eh); 3303 char *s = get_to_st (st);
3202 if (s) 3304 if (s)
3203 free (s); 3305 free (s);
3204 3306
3205 return; 3307 return;
3206} 3308}
… …
3210 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3312 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3211 */ 3313 */
3212void 3314void
3213rxvt_term::process_osc_seq () 3315rxvt_term::process_osc_seq ()
3214{ 3316{
3215 unicode_t ch, eh;
3216 int arg; 3317 int arg;
3217 3318
3218 ch = cmd_getc (); 3319 unicode_t ch = cmd_getc ();
3219 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3220 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3221 3322
3222 if (ch == ';') 3323 if (ch == ';')
3223 { 3324 {
3325 string_term st;
3224 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3225 3327
3226 if (s) 3328 if (s)
3227 { 3329 {
3228 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3229 free (s); 3331 free (s);
3230 } 3332 }
3231 } 3333 }
3232} 3334}
3233 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
3234void 3439void
3235rxvt_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)
3236{ 3441{
3237 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3238 { 3443 {
3239 rgba c; 3444 rgba c;
3240 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3241 3447
3242#if XFT 3448#if XFT
3243 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3244 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);
3245 else 3451 else
3246#endif 3452#endif
3247 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);
3248 } 3459 }
3249 else 3460 else
3250 set_window_color (color, str); 3461 set_window_color (color, str);
3251} 3462}
3252 3463
3253/* 3464/*
3254 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3255 */ 3466 */
3256void 3467void
3257rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3258{ 3469{
3259 int color; 3470 int color;
3260 char *buf, *name; 3471 char *buf, *name;
3261 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3262 int saveop = op; 3473 int saveop = op;
… …
3289 unsigned long bytes_after; 3500 unsigned long bytes_after;
3290 unsigned char *value = 0; 3501 unsigned char *value = 0;
3291 const char *str = ""; 3502 const char *str = "";
3292 3503
3293 if (prop 3504 if (prop
3294 && XGetWindowProperty (dpy, parent[0], 3505 && XGetWindowProperty (dpy, parent,
3295 prop, 0, 1<<16, 0, AnyPropertyType, 3506 prop, 0, 1<<16, 0, AnyPropertyType,
3296 &actual_type, &actual_format, 3507 &actual_type, &actual_format,
3297 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3298 && actual_type != None 3509 && actual_type != None
3299 && actual_format == 8) 3510 && actual_format == 8)
3300 str = (const char *)(value); 3511 str = (const char *)(value);
3301 3512
3302 tt_printf ("\033]%d;%s%c", op, str, resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3303 3514
3304 XFree (value); 3515 XFree (value);
3305 } 3516 }
3306 else 3517 else
3307 { 3518 {
3308 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3519 char *eq = strchr (str, '=');
3309 3520
3310 if (eq) 3521 if (eq)
3311 { 3522 {
3312 *eq = 0; 3523 *eq = 0;
3313 set_utf8_property (display->atom (str), eq + 1); 3524 set_utf8_property (display->atom (str), eq + 1);
3314 } 3525 }
3315 else 3526 else
3316 XDeleteProperty (dpy, parent[0], 3527 XDeleteProperty (dpy, parent,
3317 display->atom (str)); 3528 display->atom (str));
3318 } 3529 }
3319 break; 3530 break;
3320 3531
3321 case XTerm_Color: 3532 case XTerm_Color:
… …
3331 break; 3542 break;
3332 3543
3333 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3334 *buf++ = '\0'; 3545 *buf++ = '\0';
3335 3546
3336 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3337 } 3548 }
3338 break; 3549 break;
3550 case Rxvt_restoreFG:
3339 case XTerm_Color00: 3551 case XTerm_Color00:
3340 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3341 break; 3553 break;
3554 case Rxvt_restoreBG:
3342 case XTerm_Color01: 3555 case XTerm_Color01:
3343 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3344 break; 3557 break;
3345#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3346 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3347 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3348 break; 3561 break;
3349#endif 3562#endif
3350 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3351 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3352 break; 3565 break;
3353 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3354 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3355 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
3356#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3357 case XTerm_Color_RV:
3358 process_color_seq (op, Color_RV, str, resp);
3359 break;
3360 case Rxvt_Color_BD:
3361 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3362 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3363 break; 3580 break;
3364 case Rxvt_Color_UL:
3365 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3366 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3367 break; 3583 break;
3368 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3369 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3370 break; 3586 break;
3371#endif 3587#endif
3372#if ENABLE_TRANSPARENCY
3373 case URxvt_Color_tint: 3588 case URxvt_Color_border:
3374 process_color_seq (op, Color_tint, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3375 {
3376 bool changed = false;
3377 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3379 else
3380 changed = bgPixmap.unset_tint ();
3381 if (changed)
3382 update_background ();
3383 }
3384
3385 break;
3386#endif
3387
3388#if BG_IMAGE_FROM_FILE
3389 case Rxvt_Pixmap:
3390 if (!strcmp (str, "?"))
3391 {
3392 char str[256];
3393
3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST);
3398 }
3399 else
3400 {
3401 int changed = 0;
3402
3403 if (*str != ';')
3404 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */
3408 changed++;
3409 str = strchr (str, ';');
3410 if (str == NULL)
3411 bgPixmap.set_defaultGeometry ();
3412 }
3413 while (str)
3414 {
3415 str++;
3416 if (bgPixmap.set_geometry (str))
3417 changed++;
3418 str = strchr (str, ';');
3419 }
3420 if (changed)
3421 update_background ();
3422 }
3423 break;
3424#endif
3425
3426 case Rxvt_restoreFG:
3427 set_window_color (Color_fg, str);
3428 break;
3429 case Rxvt_restoreBG:
3430 set_window_color (Color_bg, str);
3431 break; 3590 break;
3432 3591
3433 case XTerm_logfile: 3592 case XTerm_logfile:
3434 // TODO, when secure mode? 3593 // TODO, when secure mode?
3435 break; 3594 break;
… …
3453 case URxvt_boldFont: 3612 case URxvt_boldFont:
3454 case URxvt_italicFont: 3613 case URxvt_italicFont:
3455 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3456#endif 3615#endif
3457 if (query) 3616 if (query)
3458 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3459 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3460 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3461 resp); 3620 st.v);
3462 else 3621 else
3463 { 3622 {
3464 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3465 3624
3466 res = strdup (str); 3625 res = strdup (str);
… …
3469 } 3628 }
3470 break; 3629 break;
3471 3630
3472 case URxvt_version: 3631 case URxvt_version:
3473 if (query) 3632 if (query)
3474 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3475 op, 3634 op,
3476 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3477 resp); 3636 st.v);
3478 break; 3637 break;
3479 3638
3480#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
3481 case URxvt_locale: 3647 case URxvt_locale:
3482 if (query) 3648 if (query)
3483 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);
3484 else 3650 else
3485 { 3651 {
3486 set_locale (str); 3652 set_locale (str);
3487 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3488 init_xlocale (); 3654 init_xlocale ();
… …
3503 break; 3669 break;
3504#endif 3670#endif
3505 3671
3506#if ENABLE_PERL 3672#if ENABLE_PERL
3507 case URxvt_perl: 3673 case URxvt_perl:
3508 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3509 ; // no responses yet
3510 break; 3675 break;
3511#endif 3676#endif
3512 } 3677 }
3513} 3678}
3514/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3521 * 's' = save 3686 * 's' = save
3522 * 'r' = restore 3687 * 'r' = restore
3523 * 't' = toggle 3688 * 't' = toggle
3524 * so no need for fancy checking 3689 * so no need for fancy checking
3525 */ 3690 */
3526int 3691int ecb_cold
3527rxvt_term::privcases (int mode, unsigned long bit) 3692rxvt_term::privcases (int mode, unsigned long bit)
3528{ 3693{
3529 int state; 3694 int state;
3530 3695
3531 if (mode == 's') 3696 if (mode == 's')
3532 { 3697 {
3533 SavedModes |= (priv_modes & bit); 3698 if (priv_modes & bit)
3699 SavedModes |= bit;
3700 else
3701 SavedModes &= ~bit;
3534 return -1; 3702 return -1;
3535 } 3703 }
3536 else 3704 else
3537 { 3705 {
3538 if (mode == 'r') 3706 if (mode == 'r')
3539 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3707 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3540 else 3708 else
3541 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3709 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3542 PrivMode (state, bit); 3710
3711 if (state)
3712 priv_modes |= bit;
3713 else
3714 priv_modes &= ~bit;
3543 } 3715 }
3544 3716
3545 return state; 3717 return state;
3546} 3718}
3547 3719
3548/* we're not using priv _yet_ */ 3720/* we're not using priv _yet_ */
3549void 3721void
3550rxvt_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)
3551{ 3723{
3552 unsigned int i, j; 3724 unsigned int i, j;
3553 int state; 3725 int state;
3554 3726
3555 static const struct 3727 static const struct
3556 { 3728 {
3557 const int argval; 3729 const int argval;
3558 const unsigned long bit; 3730 const unsigned long bit;
3559 } argtopriv[] = { 3731 } argtopriv[] = {
3560 { 1, PrivMode_aplCUR }, 3732 { 1, PrivMode_aplCUR }, // DECCKM
3561 { 2, PrivMode_vt52 }, 3733 { 2, PrivMode_vt52 }, // DECANM
3562 { 3, PrivMode_132 }, 3734 { 3, PrivMode_132 }, // DECCOLM
3563 { 4, PrivMode_smoothScroll }, 3735 { 4, PrivMode_smoothScroll }, // DECSCLM
3564 { 5, PrivMode_rVideo }, 3736 { 5, PrivMode_rVideo }, // DECSCNM
3565 { 6, PrivMode_relOrigin }, 3737 { 6, PrivMode_relOrigin }, // DECOM
3566 { 7, PrivMode_Autowrap }, 3738 { 7, PrivMode_Autowrap }, // DECAWM
3567 // 8, bi-directional support mode 3739 // 8, auto-repeat keys // DECARM
3568 { 9, PrivMode_MouseX10 }, 3740 { 9, PrivMode_MouseX10 },
3569 // 18, 19 printing-related
3570 { 25, PrivMode_VisibleCursor }, 3741 { 12, PrivMode_BlinkingCursor },
3742 // 18 end FF to printer after print screen
3743 // 19 Print screen prints full screen/scroll region
3744 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3571#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3572 { scrollBar_esc, PrivMode_scrollBar }, 3746 { scrollBar_esc, PrivMode_scrollBar },
3573#endif 3747#endif
3574 { 35, PrivMode_ShiftKeys }, // rxvt extension 3748 { 35, PrivMode_ShiftKeys }, // rxvt extension
3749 // 38, tektronix mode // DECTEK
3575 { 40, PrivMode_132OK }, 3750 { 40, PrivMode_132OK },
3576 // 41 xterm more fixes NYI 3751 // 41 xterm more fixes NYI
3577 // 45 margin bell NYI 3752 // 45 margin bell NYI
3578 // 46 start logging 3753 // 46 start logging
3579 { 47, PrivMode_Screen }, 3754 { 47, PrivMode_Screen },
3580 { 66, PrivMode_aplKP }, 3755 { 66, PrivMode_aplKP }, // DECNKM
3581#ifndef NO_BACKSPACE_KEY 3756#ifndef NO_BACKSPACE_KEY
3582 { 67, PrivMode_BackSpace }, 3757 { 67, PrivMode_BackSpace }, // DECBKM
3583#endif 3758#endif
3584 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3586 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3587 { 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
3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3589 { 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
3590 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3591 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3592 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3593 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3594 // 1048 save and restore cursor 3776 // 1048 save and restore cursor, implemented in code
3595 { 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 */
3596 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3780 { 2004, PrivMode_BracketPaste },
3781#endif
3597 }; 3782 };
3598 3783
3599 if (nargs == 0) 3784 if (nargs == 0)
3600 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 }
3601 3804
3602 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3603 if (mode == 'l') 3806 if (mode == 'l')
3604 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3605 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3608 for (i = 0; i < nargs; i++) 3811 for (i = 0; i < nargs; i++)
3609 { 3812 {
3610 state = -1; 3813 state = -1;
3611 3814
3612 /* basic handling */ 3815 /* basic handling */
3613 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3816 for (j = 0; j < ecb_array_length (argtopriv); j++)
3614 if (argtopriv[j].argval == arg[i]) 3817 if (argtopriv[j].argval == arg[i])
3615 { 3818 {
3616 state = privcases (mode, argtopriv[j].bit); 3819 state = privcases (mode, argtopriv[j].bit);
3617 break; 3820 break;
3618 } 3821 }
… …
3626 3829
3627 scr_touch (true); 3830 scr_touch (true);
3628 break; 3831 break;
3629#endif 3832#endif
3630 case 1048: /* alternative cursor save */ 3833 case 1048: /* alternative cursor save */
3631 case 1049:
3632 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3633 if (mode == 0) 3835 if (mode == 0)
3634 scr_cursor (RESTORE); 3836 scr_cursor (RESTORE);
3635 else if (mode == 1) 3837 else if (mode == 1)
3636 scr_cursor (SAVE); 3838 scr_cursor (SAVE);
… …
3645 case 2: /* VT52 mode */ 3847 case 2: /* VT52 mode */
3646 /* oddball mode. should be set regardless of set/reset 3848 /* oddball mode. should be set regardless of set/reset
3647 * parameter. Return from VT52 mode with an ESC < from 3849 * parameter. Return from VT52 mode with an ESC < from
3648 * within VT52 mode 3850 * within VT52 mode
3649 */ 3851 */
3650 PrivMode (1, PrivMode_vt52); 3852 priv_modes |= PrivMode_vt52;
3651 break; 3853 break;
3652 case 3: /* 80/132 */ 3854 case 3: /* 80/132 */
3653 if (priv_modes & PrivMode_132OK) 3855 if (priv_modes & PrivMode_132OK)
3654 set_widthheight (((state ? 132 : 80) * fwidth), height); 3856 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3655 break; 3857 break;
3656 case 4: /* smooth scrolling */ 3858 case 4: /* smooth scrolling */
3657 set_option (Opt_jumpScroll, !state); 3859 set_option (Opt_jumpScroll, !state);
3658 break; 3860 break;
3659 case 5: /* reverse video */ 3861 case 5: /* reverse video */
… …
3670 if (state) /* orthogonal */ 3872 if (state) /* orthogonal */
3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3873 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3672 break; 3874 break;
3673#ifdef scrollBar_esc 3875#ifdef scrollBar_esc
3674 case scrollBar_esc: 3876 case scrollBar_esc:
3675 if (scrollbar_mapping (state)) 3877 scrollBar.map (state);
3676 {
3677 resize_all_windows (0, 0, 0); 3878 resize_all_windows (0, 0, 0);
3678 scr_touch (true); 3879 scr_touch (true);
3679 } 3880 break;
3881#endif
3882#ifdef CURSOR_BLINK
3883 case 12:
3884 cursor_blink_reset ();
3680 break; 3885 break;
3681#endif 3886#endif
3682 case 25: /* visible/invisible cursor */ 3887 case 25: /* visible/invisible cursor */
3683 scr_cursor_visible (state); 3888 scr_cursor_visible (state);
3684 break; 3889 break;
… …
3691 /* case 67: - backspace key */ 3896 /* case 67: - backspace key */
3692 case 1000: /* X11 mouse reporting */ 3897 case 1000: /* X11 mouse reporting */
3693 if (state) /* orthogonal */ 3898 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3900 break;
3696#if 0
3697 case 1001:
3698 break; /* X11 mouse highlighting */
3699#endif
3700 case 1002: 3901 case 1002:
3701 case 1003: 3902 case 1003:
3702 if (state) { 3903 if (state)
3904 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3905 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 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;
3705 vt_emask_mouse = PointerMotionMask; 3908 vt_emask_mouse = PointerMotionMask;
3909 }
3706 } else 3910 else
3707 vt_emask_mouse = NoEventMask; 3911 vt_emask_mouse = NoEventMask;
3912
3708 vt_select_input (); 3913 vt_select_input ();
3709 break; 3914 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3915 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3916 set_option (Opt_scrollTtyOutput, !state);
3712 break; 3917 break;
3713 case 1011: /* scroll to bottom on key press */ 3918 case 1011: /* scroll to bottom on key press */
3714 set_option (Opt_scrollTtyKeypress, state); 3919 set_option (Opt_scrollTtyKeypress, state);
3715 break; 3920 break;
3716 case 1047: /* secondary screen w/ clearing last */ 3921 case 1047: /* secondary screen w/ clearing last */
3717 if (option (Opt_secondaryScreen)) 3922 if (option (Opt_secondaryScreen))
3718 if (current_screen != PRIMARY) 3923 if (!state)
3719 scr_erase_screen (2); 3924 scr_erase_screen (2);
3925
3720 scr_change_screen (state); 3926 scr_change_screen (state);
3721 break; 3927 break;
3722 case 1049: /* secondary screen w/ clearing first */ 3928 case 1049: /* secondary screen w/ clearing first */
3929 if (option (Opt_secondaryScreen))
3930 if (state)
3931 scr_cursor (SAVE);
3932
3723 scr_change_screen (state); 3933 scr_change_screen (state);
3934
3724 if (option (Opt_secondaryScreen)) 3935 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3936 if (state)
3726 scr_erase_screen (2); 3937 scr_erase_screen (2);
3938 else
3939 scr_cursor (RESTORE);
3727 break; 3940 break;
3728 default: 3941 default:
3729 break; 3942 break;
3730 } 3943 }
3731 } 3944 }
3732} 3945}
3733/*}}} */ 3946/*}}} */
3734 3947
3735/*{{{ process sgr sequences */ 3948/*{{{ process sgr sequences */
3736void 3949void ecb_hot
3737rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3950rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3738{ 3951{
3739 unsigned int i; 3952 unsigned int i;
3740 short rendset; 3953 short rendset;
3741 int rendstyle; 3954 int rendstyle;
… …
3783 //case 19: // ninth alt font 3996 //case 19: // ninth alt font
3784 //case 20: // gothic 3997 //case 20: // gothic
3785 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3998 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3786 rendset = 0, rendstyle = RS_Bold; 3999 rendset = 0, rendstyle = RS_Bold;
3787 break; 4000 break;
3788 case 22: // normal intensity 4001 case 22: // bold off (vt220)
3789 rendset = 0, rendstyle = RS_Bold; 4002 rendset = 0, rendstyle = RS_Bold;
3790 break; 4003 break;
3791 case 23: // disable italic 4004 case 23: // disable italic
3792 rendset = 0, rendstyle = RS_Italic; 4005 rendset = 0, rendstyle = RS_Italic;
3793 break; 4006 break;
3794 case 24: 4007 case 24: // underline off (vt220)
3795 rendset = 0, rendstyle = RS_Uline; 4008 rendset = 0, rendstyle = RS_Uline;
3796 break; 4009 break;
3797 case 25: 4010 case 25: // blink off (vt220)
3798 rendset = 0, rendstyle = RS_Blink; 4011 rendset = 0, rendstyle = RS_Blink;
3799 break; 4012 break;
3800 case 26: // variable spacing (iso 8613) 4013 case 26: // variable spacing (iso 8613)
3801 rendset = 0, rendstyle = RS_Blink; 4014 rendset = 0, rendstyle = RS_Blink;
3802 break; 4015 break;
3803 case 27: 4016 case 27: // reverse off (vt220)
3804 rendset = 0, rendstyle = RS_RVid; 4017 rendset = 0, rendstyle = RS_RVid;
3805 break; 4018 break;
3806 //case 28: // visible. NYI 4019 //case 28: // visible. NYI
3807 //case 29: // not crossed-out 4020 //case 29: // not crossed-out
3808 } 4021 }
… …
3823 case 35: 4036 case 35:
3824 case 36: 4037 case 36:
3825 case 37: 4038 case 37:
3826 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3827 break; 4040 break;
3828 case 38: // set fg color, ISO 8613-6
3829 if (nargs > i + 2 && arg[i + 1] == 5)
3830 {
3831 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3832 i += 2;
3833 }
3834 break;
3835 case 39: /* default fg */ 4041 case 39: /* default fg */
3836 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
3837 break; 4043 break;
3838 4044
3839 case 40: 4045 case 40:
… …
3844 case 45: 4050 case 45:
3845 case 46: 4051 case 46:
3846 case 47: 4052 case 47:
3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3848 break; 4054 break;
3849 case 48: // set bg color, ISO 8613-6
3850 if (nargs > i + 2 && arg[i + 1] == 5)
3851 {
3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3853 i += 2;
3854 }
3855 break;
3856 case 49: /* default bg */ 4055 case 49: /* default bg */
3857 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 }
3858 break; 4086 break;
3859 4087
3860 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
3861 4089
3862#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL
… …
3882 break; 4110 break;
3883#endif 4111#endif
3884 } 4112 }
3885 } 4113 }
3886} 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}
3887/*}}} */ 4135/*}}} */
3888 4136
3889/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3890void
3891rxvt_term::process_graphics ()
3892{
3893 unicode_t ch, cmd = cmd_getc ();
3894
3895 if (cmd == 'Q')
3896 { /* query graphics */
3897 tt_printf ("\033G0\012"); /* no graphics */
3898 return;
3899 }
3900 /* swallow other graphics sequences until terminating ':' */
3901 do
3902 ch = cmd_getc ();
3903 while (ch != ':');
3904}
3905/*}}} */
3906
3907/* ------------------------------------------------------------------------- */ 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 */
3908 4141
3909/* 4142/*
3910 * Send printf () formatted output to the command. 4143 * Send printf () formatted output to the command.
3911 * Only use for small amounts of data. 4144 * Only use for small amounts of data.
3912 */ 4145 */
… …
3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4153 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3921 va_end (arg_ptr); 4154 va_end (arg_ptr);
3922 tt_write (buf, strlen (buf)); 4155 tt_write (buf, strlen (buf));
3923} 4156}
3924 4157
3925/* ---------------------------------------------------------------------- */
3926/* 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. */
3927 * or generated by us in response to a query ESC sequence. 4159void
3928 */ 4160rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3929const 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}
3930 4174
3931void 4175void
3932rxvt_term::tt_write (const char *data, unsigned int len) 4176rxvt_term::tt_write (const char *data, unsigned int len)
3933{ 4177{
3934 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)))
3935 return; 4179 return;
3936 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{
3937 if (pty->pty < 0) 4189 if (pty->pty < 0)
3938 return; 4190 return;
3939 4191
3940 if (v_buflen == 0) 4192 if (v_buflen == 0)
3941 { 4193 {
3942 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));
3943 4195
4196 max_it (written, 0);
4197
3944 if ((unsigned int)written == len) 4198 if (written == len)
3945 return; 4199 return;
3946 4200
3947 data += written; 4201 data += written;
3948 len -= written; 4202 len -= written;
3949 } 4203 }
3950 4204
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4205 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3952 4206
3953 memcpy (v_buffer + v_buflen, data, len); 4207 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len; 4208 v_buflen += len;
3955 4209
3956 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