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.318 by root, Sat Jan 13 15:26:56 2007 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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,
95 XK_Shift_L, 0x21e7, 94 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 95 XK_Shift_R, 0x21e7,
97 96
98 XK_Shift_Lock, 0x21eb, 97 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 98 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 99 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 100 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 101 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 102 XK_ISO_Level3_Lock, 0x21ef,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
131 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
132#endif 134#endif
133 0, 135 0,
134}; 136};
135 137
136void 138void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
138{ 140{
139 x = Pixel2Col (x); 141 x = Pixel2Col (x);
140 y = Pixel2Row (y); 142 y = Pixel2Row (y);
141 143
… …
149 151
150 text_t t = l.t[x]; 152 text_t t = l.t[x];
151 153
152 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
153 { 155 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
156 break; 158 break;
157 } 159 }
158 160
159 x--; 161 x--;
160 } 162 }
161} 163}
162 164
163void 165void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 170 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 171
173# if ENABLE_COMBINING 172# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
175 { 174 {
176 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
177 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
179 } 178 }
180 else 179 else
181# endif 180# endif
… …
184 183
185 alloc = 0; 184 alloc = 0;
186 chr = &ch2; 185 chr = &ch2;
187 len = 1; 186 len = 1;
188 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 191
190 char attr[80]; // plenty 192 char attr[80]; // plenty
191 193
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 195 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
201 203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
203 212
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
206 214
207 if (y >= 0) 215 if (y >= 0)
208 { 216 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 218 x = 0;
211 } 219 }
212 220
213 scr_overlay_new (x, y, width, len + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
214 224
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 226
217 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
218 { 228 {
219 char buf[9]; 229 char buf[9];
220 230
221 ch = *chr++; 231 ch = *chr++;
222 232
223 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 236# if !UNICODE_3
227 if (ch >= 0x10000) 237 if (ch >= 0x10000)
228 ch = 0xfffd; 238 ch = 0xfffd;
229# endif 239# endif
230 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
231 241
232 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 244 }
235 245
236// { 246// {
237// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
240// } 250// }
241 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
242 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 255 free (fname[i]);
256 }
245 257
246# if ENABLE_COMBINING 258# if ENABLE_COMBINING
247 if (alloc) 259 if (alloc)
248 delete [] alloc; 260 delete [] alloc;
249# endif 261# endif
250} 262}
251#endif 263#endif
252 264
253void 265void ecb_cold
254rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
255{ 267{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 269
261 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
262 { 271 {
263 char mb[16]; 272 char mb[MB_LEN_MAX];
264 int len; 273 int len;
265 274
266 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
269 else 278 else
270 { 279 {
271 mb[0] = ch[0]; 280 mb[0] = ch;
272 len = 1; 281 len = 1;
273 } 282 }
274 283
275 if (len > 0) 284 if (len > 0)
276 tt_write (mb, len); 285 tt_write (mb, len);
… …
279 } 288 }
280 289
281 iso14755buf = 0; 290 iso14755buf = 0;
282} 291}
283 292
284int 293static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
286{ 295{
287 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
290 { 299 {
291 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
292 301
… …
298 307
299 return -1; 308 return -1;
300} 309}
301#endif 310#endif
302 311
303void 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
304rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
305{ 411{
306 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
307 unsigned int newlen; 413 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
311 416
312#if ISO_14755 417#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
314 return; 419 return;
315#endif 420#endif
… …
322 */ 427 */
323 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
326 431
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 432 kbuf[0] = 0;
334 433
335#ifdef USE_XIM 434#if USE_XIM
336 if (Input_Context) 435 if (Input_Context)
337 { 436 {
338 Status status_return; 437 Status status_return;
339 438
340#if 0 439#if 0
… …
378 } 477 }
379 } 478 }
380 else 479 else
381 len = 0; 480 len = 0;
382 } 481 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 482 }
387 else 483 else
388#endif 484#endif
389 { 485 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
392 } 490 {
491 KeySym orig_keysym = keysym;
393 492
394 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)
395 { 706 {
396#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 709 return;
399#endif 710#endif
400 711
401 if (saveLines) 712 if (saveLines)
402 { 713 {
… …
411#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 724#else
414 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
415#endif 726#endif
727 max_it (lnsppg, 1);
728
416 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
417 { 730 {
418 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
419 return; 732 return;
420 } 733 }
421 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
422 { 735 {
423 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
424 return; 737 return;
425 } 738 }
426 } 739 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
429 { 742 {
430 if (keysym == XK_Up) 743 if (keysym == XK_Up)
431 { 744 {
432 scr_page (UP, 1); 745 scr_page (1);
433 return; 746 return;
434 } 747 }
435 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
436 { 749 {
437 scr_page (DN, 1); 750 scr_page (-1);
438 return; 751 return;
439 } 752 }
440 } 753 }
441#endif 754#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
444 { 757 {
445 if (keysym == XK_Home) 758 if (keysym == XK_Home)
446 { 759 {
447 scr_move_to (0, 1); 760 scr_changeview (top_row);
448 return; 761 return;
449 } 762 }
450 else if (keysym == XK_End) 763 else if (keysym == XK_End)
451 { 764 {
452 scr_move_to (1, 1); 765 scr_changeview (0);
453 return; 766 return;
454 } 767 }
455 } 768 }
456#endif 769#endif
457 } 770 }
458 771
459 if (shft) 772 if (shft)
460 { 773 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 775 {
469 switch (keysym) 776 switch (keysym)
470 { 777 {
471 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 780 selection_request (ev.time);
474 return; 781 return;
475#if TODO 782#if TODO
476 /* rxvt extras */ 783 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 785 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 787 return;
483#endif 788#endif
484 } 789 }
485 } 790 }
486 } 791 }
487 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
488#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 809 // ISO 14755 support
490 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 811 {
492 int hv; 812 int hv;
493 813
494 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 817 {
498 commit_iso14755 (); 818 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 819 iso14755buf = ISO_14755_51;
500# if ISO_14755 820# if ISO_14755
501 iso14755_51 (0); 821 iso14755_51 (0);
822# endif
823 return;
824 }
825 else if (keysym == XK_BackSpace)
826 {
827 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
828# if ISO_14755
829 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 830# endif
503 return; 831 return;
504 } 832 }
505 else if ((hv = hex_keyval (ev)) >= 0) 833 else if ((hv = hex_keyval (ev)) >= 0)
506 { 834 {
… …
511# endif 839# endif
512 return; 840 return;
513 } 841 }
514 else 842 else
515 { 843 {
516# if ENABLE_OVERLAY 844# if ISO_14755
517 scr_overlay_off (); 845 scr_overlay_off ();
518# endif 846# endif
519 iso14755buf = 0; 847 iso14755buf = 0;
520 } 848 }
521 } 849 }
850 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
525 { 854 {
526 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 856# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 858 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 859# endif
531 } 860 }
532#endif 861#endif
533 862
534#ifdef PRINTPIPE 863#ifdef PRINTPIPE
535 if (keysym == XK_Print) 864 if (keysym == XK_Print)
536 { 865 {
537 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
538 return; 867 return;
539 } 868 }
540#endif 869#endif
541
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 {
544 {
545 newlen = 1;
546 switch (keysym)
547 {
548#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace)
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0;
832 break;
833 }
834
835 if (newlen)
836 len = strlen (kbuf);
837 }
838
839 /*
840 * Pass meta for all function keys, if 'meta' option set
841 */
842#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0)
844 kbuf[len - 1] |= 0x80;
845#endif
846
847 }
848 else if (ctrl && keysym == XK_minus)
849 {
850 len = 1;
851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
858 else
859 {
860#ifdef META8_OPTION
861 /* set 8-bit on */
862 if (meta && (meta_char == 0x80))
863 {
864 char *ch;
865
866 for (ch = kbuf; ch < kbuf + len; ch++)
867 *ch |= 0x80;
868
869 meta = 0;
870 }
871#endif
872 /* nil */ ;
873 }
874 } 870 }
875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878 871
879 if (len <= 0) 872 if (len <= 0)
880 return; /* not mapped */ 873 return; /* not mapped */
881 874
882 if (OPTION (Opt_scrollTtyKeypress))
883 if (view_start)
884 {
885 view_start = 0;
886 want_refresh = 1;
887 }
888
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */
904 if (meta
905#ifdef META8_OPTION
906 && meta_char == C0_ESC
907#endif
908 )
909 {
910 const char ch = C0_ESC;
911 tt_write (&ch, 1);
912 }
913
914 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
915} 876}
916 877
917void 878void ecb_cold
918rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
919{ 880{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym; 882 KeySym keysym;
922 883
… …
926#if ENABLE_FRILLS || ISO_14755 887#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 888 // ISO 14755 support
928 if (iso14755buf) 889 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 890 if (iso14755buf & ISO_14755_52)
930 { 891 {
931# if ENABLE_OVERLAY 892# if ISO_14755
932 scr_overlay_off (); 893 scr_overlay_off ();
933# endif 894# endif
934# if ISO_14755 895# if ISO_14755
935 // iso14755 part 5.2 handling: release time 896 // iso14755 part 5.2 handling: release time
936 // first: controls 897 // first: controls
… …
942 commit_iso14755 (); 903 commit_iso14755 ();
943 904
944 return; 905 return;
945 } 906 }
946 907
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 909 if (i[0] == keysym)
949 { 910 {
950 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 912 commit_iso14755 ();
952 913
… …
959 920
960 return; 921 return;
961 } 922 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 924 {
964# if ENABLE_OVERLAY 925# if ISO_14755
965 scr_overlay_off (); 926 scr_overlay_off ();
966# endif 927# endif
967 if (iso14755buf & ISO_14755_51) 928 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 929 commit_iso14755 ();
969#if ISO_14755 930#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 932 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 934
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
991#endif 952#endif
992} 953}
993 954
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 955void
1028rxvt_term::flush () 956rxvt_term::flush ()
1029{ 957{
1030 flush_ev.stop (); 958 flush_ev.stop ();
1031 959
1032#ifdef TRANSPARENT 960#ifdef HAVE_IMG
1033 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 962 {
1035 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 964 scr_touch (false);
1038 } 965 }
1039#endif 966#endif
1040 967
1041 if (want_refresh) 968 if (want_refresh)
… …
1077 } 1004 }
1078 while (row < end_row); 1005 while (row < end_row);
1079 } 1006 }
1080 1007
1081 scr_refresh (); 1008 scr_refresh ();
1082 scrollbar_show (1); 1009 scrollBar.show (1);
1083#ifdef USE_XIM 1010#if USE_XIM
1084 IMSendSpot (); 1011 im_send_spot ();
1085#endif 1012#endif
1086 } 1013 }
1087 1014
1088 display->flush (); 1015 display->flush ();
1089} 1016}
1090 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
1091void 1019void
1092rxvt_term::check_cb (check_watcher &w) 1020rxvt_term::refresh_check ()
1021{
1022 if (want_refresh && !flush_ev.is_active ())
1023 flush_ev.start ();
1024
1025 display->flush ();
1026}
1027
1028void
1029rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1030{
1094 make_current (); 1031 make_current ();
1095 1032
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1033 refresh_count = 0;
1109 flush (); 1034 flush ();
1110} 1035}
1111 1036
1112#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1113void 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
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1058{
1116 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1060 want_refresh = 1;
1118 1061 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1062}
1121#endif 1063#endif
1122 1064
1123#ifdef TEXT_BLINK 1065#ifdef TEXT_BLINK
1124void 1066void
1125rxvt_term::text_blink_cb (time_watcher &w) 1067rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1068{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1070 {
1129 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
1130 want_refresh = 1; 1072 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1073 refresh_check ();
1132 } 1074 }
1075 else
1076 w.stop ();
1133} 1077}
1134#endif 1078#endif
1135 1079
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1081void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1083{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1086 {
1143 want_refresh = 1; 1087 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 refresh_check ();
1145 } 1089 }
1090 else
1091 w.stop ();
1146} 1092}
1147#endif 1093#endif
1148 1094
1149#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1150void 1096void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1098{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1154 { 1100 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1102 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1158 } 1104 }
1105 else
1106 w.stop ();
1159} 1107}
1160#endif 1108#endif
1161 1109
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1111void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1113{
1166 if (mouse_slip_wheel_speed == 0 1114 if (scr_page (mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1115 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1116 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1117 refresh_check ();
1118 }
1119
1120 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1121 {
1122 mouse_slip_wheel_speed = 0;
1123 w.stop ();
1175 } 1124 }
1176} 1125}
1177#endif 1126#endif
1178 1127
1179#if LINUX_YIELD_HACK 1128#if LINUX_YIELD_HACK
1180static struct event_handler 1129static struct event_handler
1181{ 1130{
1182 check_watcher yield_ev; 1131 ev::prepare yield_ev;
1183 1132
1184 void yield_cb (check_watcher &w) 1133 void yield_cb (ev::prepare &w, int revents)
1185 { 1134 {
1186 // this should really be sched_yield(), but the linux guys thought 1135 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1136 // that giving a process calling sched_yield () less cpu time than
1188 // 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
1189 // 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.
1190 1142
1191 struct timespec ts = { 0, 0 }; 1143 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1144 nanosleep (&ts, 0);
1193 1145
1194 w.stop (); 1146 w.stop ();
1195 } 1147 }
1196 1148
… …
1199 { 1151 {
1200 } 1152 }
1201} event_handler; 1153} event_handler;
1202#endif 1154#endif
1203 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
1204bool 1189bool
1205rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1206{ 1191{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1208 1193
1209 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1195
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1212 n = 0;
1213 } 1197 {
1214 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1218 1203
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1205
1221 if (r > 0) 1206 if (r > 0)
1222 { 1207 {
1223 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1224 return true; 1209 return true;
… …
1232 } 1217 }
1233 else 1218 else
1234 { 1219 {
1235 pty_ev.stop (); 1220 pty_ev.stop ();
1236 1221
1237 if (!OPTION (Opt_hold)) 1222 if (!option (Opt_hold))
1238 destroy (); 1223 destroy ();
1239 } 1224 }
1240 1225
1241 return false; 1226 return false;
1242} 1227}
1243 1228
1244void 1229void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1230rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1231{
1247 make_current (); 1232 make_current ();
1248 1233
1249 if (revents & EVENT_READ) 1234 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1237 cmd_parse ();
1253 break;
1254 1238
1255 if (revents & EVENT_WRITE) 1239 if (revents & ev::WRITE)
1256 pty_write (); 1240 pty_write ();
1257}
1258 1241
1259void 1242 refresh_check ();
1243}
1244
1245void ecb_cold
1260rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1261{ 1247{
1262 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1263 recolour_cursor (); 1249 recolor_cursor ();
1264 1250
1265#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1252 hidden_pointer = 0;
1267 1253
1268 if (OPTION (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1270#endif 1256#endif
1271} 1257}
1272 1258
1273#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1274void 1260void ecb_cold
1275rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1276{ 1262{
1277 if (!OPTION (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1278 return; 1264 return;
1279 1265
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1266 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1267 XFlush (dpy);
1282 1268
1283 hidden_pointer = 1; 1269 hidden_pointer = 1;
1284} 1270}
1285 1271
1286void 1272void ecb_cold
1287rxvt_term::pointer_cb (time_watcher &w) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1274{
1289 make_current (); 1275 make_current ();
1290 1276
1291 pointer_blank (); 1277 pointer_blank ();
1292} 1278}
1293#endif 1279#endif
1294 1280
1295void 1281void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1283{
1298 int button_number, key_state = 0; 1284 int button_number, state = 0;
1299 int x, y; 1285 int x, y;
1286 bool release = ev.type == ButtonRelease;
1300 1287
1301 x = ev.x; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1302 y = ev.y; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1303 pixel_position (&x, &y);
1304 1290
1305 if (MEvent.button == AnyButton) 1291 if (ev.type == MotionNotify)
1306 button_number = 3; 1292 {
1307 else 1293 if (x == mouse_row && y == mouse_col)
1294 return;
1295
1296 mouse_row = x;
1297 mouse_col = y;
1298 state += 32;
1308 { 1299 }
1300
1309 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1311 if (button_number >= 3) 1306 else if (button_number >= 3)
1312 button_number += (64 - 3); 1307 button_number += 64 - 3;
1313 }
1314 1308
1315 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1316 { 1310 {
1317 /* 1311 /*
1318 * do not report ButtonRelease 1312 * do not report ButtonRelease
1319 * no state info allowed 1313 * no state info allowed
1320 */ 1314 */
1321 key_state = 0; 1315 if (release)
1322 if (button_number == 3)
1323 return; 1316 return;
1324 } 1317 }
1325 else 1318 else
1326 { 1319 {
1327 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1329 * 8 = Meta 1322 * 8 = Meta
1330 * 16 = Control 1323 * 16 = Control
1331 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1332 * 32 = Double Click 1325 * 32 = Double Click
1333 */ 1326 */
1334 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1335 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1336 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1337#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1338 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1339#endif 1332#endif
1340 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1341 1336
1342#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1343 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1344 if (key_state & 16) 1339 if (state & 16)
1345 fputc ('C', stderr); 1340 fputc ('C', stderr);
1346 if (key_state & 4) 1341 if (state & 4)
1347 fputc ('S', stderr); 1342 fputc ('S', stderr);
1348 if (key_state & 8) 1343 if (state & 8)
1349 fputc ('A', stderr); 1344 fputc ('A', stderr);
1350 if (key_state & 32) 1345 if (state & 32)
1351 fputc ('2', stderr); 1346 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1348 button_number,
1354 x + 1, 1349 x,
1355 y + 1); 1350 y);
1356#endif 1351#endif
1357 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1358 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1380 code,
1360 (32 + x + 1), 1381 32 + x,
1361 (32 + y + 1)); 1382 32 + y);
1362} 1383}
1363 1384
1364/*{{{ process an X event */ 1385/*{{{ process an X event */
1365void 1386void ecb_hot
1366rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1367{ 1388{
1368 make_current (); 1389 make_current ();
1369 1390
1370 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1447 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1448 focus_out ();
1428 } 1449 }
1429#endif 1450#endif
1430 } 1451 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1452 break;
1436 1453
1437 /* 1454 /*
1438 * XXX: this is not the _current_ arrangement 1455 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1456 * Here's my conclusion:
… …
1458 break; 1475 break;
1459 } 1476 }
1460 break; 1477 break;
1461 1478
1462 case FocusIn: 1479 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1480 if (ev.xfocus.detail != NotifyInferior
1481 && ev.xfocus.detail != NotifyPointer
1482 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1483 focus_in ();
1465 break; 1484 break;
1466 1485
1467 case FocusOut: 1486 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1487 if (ev.xfocus.detail != NotifyInferior
1488 && ev.xfocus.detail != NotifyPointer
1489 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1490 focus_out ();
1470 break; 1491 break;
1471 1492
1472 case ConfigureNotify: 1493 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1494 if (ev.xconfigure.window == parent)
1474 { 1495 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1497 ;
1498
1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1502 {
1503 int x, y;
1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1519 }
1477 1520
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1522 {
1480 seen_resize = 1; 1523 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1525 }
1483 1526
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1490 } 1528 }
1491 break; 1529 break;
1492 1530
1493 case PropertyNotify: 1531 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1498
1499 break; 1533 break;
1500 1534
1501 case SelectionClear: 1535 case SelectionClear:
1502 selection_clear (); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1503 break;
1504
1505 case SelectionNotify:
1506 if (selection_wait == Sel_normal)
1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1508 break; 1537 break;
1509 1538
1510 case SelectionRequest: 1539 case SelectionRequest:
1511 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1512 break; 1541 break;
1513 1542
1514 case MapNotify: 1543 case MapNotify:
1515 mapped = 1; 1544 mapped = 1;
1516#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1546 text_blink_ev.start ();
1518#endif 1547#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1549 break;
1521 1550
1522 case UnmapNotify: 1551 case UnmapNotify:
… …
1524#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1525 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1526#endif 1555#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1557 break;
1529
1530#ifdef TRANSPARENT
1531 case ReparentNotify:
1532 rootwin_cb (ev);
1533 break;
1534#endif /* TRANSPARENT */
1535 1558
1536 case GraphicsExpose: 1559 case GraphicsExpose:
1537 case Expose: 1560 case Expose:
1538 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1539 { 1562 {
1540 do 1563 do
1564 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1567 }
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544 1569
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546 1571
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1548 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1549 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1576 }
1550 1577
1551 want_refresh = 1; 1578 want_refresh = 1;
1552 } 1579 }
1553 else 1580 else
1554 { 1581 {
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1558 ; 1585 ;
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1560 ; 1587 ;
1561 1588
1562 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1563 { 1590 {
1564 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1565 scrollbar_show (0); 1592 scrollBar.show (0);
1566 } 1593 }
1567
1568#ifdef TRANSPARENT
1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1571#endif
1572 } 1594 }
1573 break; 1595 break;
1574 1596
1575 case MotionNotify: 1597 case MotionNotify:
1576#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1577 if (hidden_pointer) 1599 if (hidden_pointer)
1578 pointer_unblank (); 1600 pointer_unblank ();
1579#endif 1601#endif
1602 if (!bypass_keystate
1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent))
1605 mouse_report (ev.xbutton);
1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1581 break; 1607 break;
1582 1608
1583 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1584 { 1610 {
… …
1595 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1596 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1597 &ev.xbutton.state); 1623 &ev.xbutton.state);
1598#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1599 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1600 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1601 { 1628 {
1602#endif
1603#if ISO_14755 1629#if ISO_14755
1604 // 5.4 1630 // 5.4
1605 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1606 { 1632 {
1607 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1613 1639
1614#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1615 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1616 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1617 { 1643 {
1644 page_dirn scroll_selection_dir;
1618 int dist; 1645 int dist;
1619 1646
1620 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1621 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1622 */ 1649 */
1623 if (!sel_scroll_ev.active) 1650 if (!sel_scroll_ev.is_active ())
1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1651 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1625 1652
1626 /* save the event params so we can highlight 1653 /* save the event params so we can highlight
1627 * the selection in the pending-scroll loop 1654 * the selection in the pending-scroll loop
1628 */ 1655 */
1629 selection_save_x = ev.xbutton.x; 1656 selection_save_x = ev.xbutton.x;
… …
1637 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1638 } 1665 }
1639 else 1666 else
1640 { 1667 {
1641 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1642 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1643 } 1670 }
1644 1671
1645 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1646 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1647 + 1; 1674 + 1;
1648 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1649 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1650 } 1678 }
1651 else 1679 else
1652 { 1680 {
1653 /* we are within the text window, so we 1681 /* we are within the text window, so we
1654 * shouldn't be scrolling 1682 * shouldn't be scrolling
1655 */ 1683 */
1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1658 } 1685 }
1659#endif 1686#endif
1660#ifdef MOUSE_THRESHOLD
1661 } 1687 }
1662#endif
1663 } 1688 }
1664 } 1689 }
1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1691 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1669 ; 1694 ;
1670 1695
1671 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1700 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1702 scrollBar.size ());
1678 want_refresh = 1; 1703 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1704 scrollBar.show (1);
1681 } 1705 }
1682 break; 1706 break;
1683 } 1707 }
1684 1708
1685#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1687 { 1711 cursor_blink_reset ();
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif 1712#endif
1697 1713
1698#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1716 {
1701 if (ev.type == MotionNotify 1717 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1718 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1719 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1720 if (hidden_pointer)
… …
1706 1722
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1724 pointer_blank ();
1709 } 1725 }
1710#endif 1726#endif
1711}
1712 1727
1713void 1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1714rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1715{ 1750{
1716 if (!focus) 1751 if (!focus)
1717 { 1752 {
1718 focus = 1; 1753 focus = 1;
1719 want_refresh = 1; 1754 want_refresh = 1;
1720 1755
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1756#if USE_XIM
1724 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1725 { 1758 {
1726 IMSetPosition (); 1759 im_set_position ();
1727 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1728 } 1761 }
1729#endif 1762#endif
1730#if CURSOR_BLINK 1763#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1733#endif 1766#endif
1734#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1736 { 1769 {
1737 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1771 scr_recolor ();
1739 } 1772 }
1740#endif 1773#endif
1741 } 1774#if ENABLE_FRILLS
1742} 1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1743 1777
1744void 1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 }
1784}
1785
1786void ecb_cold
1745rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1746{ 1788{
1747 if (focus) 1789 if (focus)
1748 { 1790 {
1749 focus = 0; 1791 focus = 0;
1750 want_refresh = 1; 1792 want_refresh = 1;
1751 1793
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1794#if ENABLE_FRILLS
1795 if (option (Opt_urgentOnBell))
1796 set_urgency (0);
1753 1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1800#endif
1754#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1802 if (iso14755buf)
1756 { 1803 {
1757 iso14755buf = 0; 1804 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1805# if ISO_14755
1759 scr_overlay_off (); 1806 scr_overlay_off ();
1760# endif 1807# endif
1761 } 1808 }
1762#endif 1809#endif
1763#if USE_XIM 1810#if USE_XIM
1764 if (Input_Context != NULL) 1811 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1812 XUnsetICFocus (Input_Context);
1766#endif 1813#endif
1767#if CURSOR_BLINK 1814#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1815 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1816 cursor_blink_ev.stop ();
1817
1770 hidden_cursor = 0; 1818 hidden_cursor = 0;
1771#endif 1819#endif
1772#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1774 { 1822 {
1775 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1824 scr_recolor ();
1777 } 1825 }
1778#endif 1826#endif
1779 }
1780}
1781 1827
1782void 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1829 }
1830}
1831
1832void ecb_cold
1783rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1784{ 1834{
1785#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1787 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1788 rgba c; 1841 rgba c;
1789 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1844 }
1792#endif 1845#endif
1793} 1846}
1794 1847
1795#if TRANSPARENT || ENABLE_PERL 1848#if ENABLE_PERL
1796void 1849void ecb_hot
1797rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1851{
1799 make_current (); 1852 make_current ();
1800 1853
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1856 return;
1804 1857
1805# if TRANSPARENT
1806 switch (ev.type) 1858 switch (ev.type)
1807 { 1859 {
1808 case PropertyNotify: 1860 case PropertyNotify:
1809 /* 1861 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1812 */ 1864 */
1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 return; 1867 {
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869 }
1816 1870
1817 /* FALLTHROUGH */
1818 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1;
1821 break; 1871 break;
1822 } 1872 }
1823# endif 1873
1874 refresh_check ();
1824} 1875}
1825#endif 1876#endif
1826 1877
1827void 1878void
1828rxvt_term::button_press (XButtonEvent &ev) 1879rxvt_term::button_press (XButtonEvent &ev)
… …
1849 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1850 return; 1901 return;
1851 } 1902 }
1852#endif 1903#endif
1853 1904
1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1855 1906
1856 if (reportmode) 1907 if (reportmode)
1857 { 1908 {
1858 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1859 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1863 { 1914 {
1864 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1865 MEvent.clicks++; 1916 MEvent.clicks++;
1866 1917
1867 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1868 { 1919 {
1869 /* only report double clicks */ 1920 /* only report double clicks */
… …
1883 mouse_report (ev); 1934 mouse_report (ev);
1884 } 1935 }
1885#else 1936#else
1886 MEvent.button = ev.button; 1937 MEvent.button = ev.button;
1887 mouse_report (ev); 1938 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1939#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1940
1890 } 1941 }
1891 else 1942 else
1892 { 1943 {
1893 if (ev.button != MEvent.button) 1944 if (ev.button != MEvent.button)
… …
1941 } 1992 }
1942 1993
1943 /* 1994 /*
1944 * Scrollbar window processing of button press 1995 * Scrollbar window processing of button press
1945 */ 1996 */
1946 if (isScrollbarWindow (ev.window)) 1997 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1998 {
1948 scrollBar.setIdle (); 1999 page_dirn direction = NO_DIR;
2000
2001 if (scrollBar.upButton (ev.y))
2002 direction = UP; /* up */
2003 else if (scrollBar.dnButton (ev.y))
2004 direction = DN; /* down */
2005
2006 scrollBar.state = SB_STATE_IDLE;
1949 /* 2007 /*
1950 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 2009 * move up if mouse is above slider
1952 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1953 * 2011 *
… …
1962 /* 2020 /*
1963 * Mouse report disabled scrollbar: 2021 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 2022 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 2023 * click on scrollbar - send pageup/down
1966 */ 2024 */
1967 if ((scrollBar.style == R_SB_NEXT 2025 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 2026 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 2027 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 2028 tt_printf ("\033[B");
1977 else 2029 else
1978 switch (ev.button) 2030 switch (ev.button)
1979 { 2031 {
1980 case Button2: 2032 case Button2:
… …
1987 tt_printf ("\033[5~"); 2039 tt_printf ("\033[5~");
1988 break; 2040 break;
1989 } 2041 }
1990 } 2042 }
1991 else 2043 else
1992#endif /* NO_SCROLLBAR_REPORT */ 2044#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 2045 {
1999 if (scrollbarnext_upButton (ev.y)) 2046 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 2047 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2049 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2051#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2052 if (scr_page (direction, 1))
2017 { 2053 {
2018 if (upordown < 0) 2054 if (direction == UP)
2019 scrollBar.setUp (); 2055 scrollBar.state = SB_STATE_UP;
2020 else 2056 else
2021 scrollBar.setDn (); 2057 scrollBar.state = SB_STATE_DOWN;
2022 } 2058 }
2023 } 2059 }
2024 else 2060 else
2025 switch (ev.button) 2061 switch (ev.button)
2026 { 2062 {
2027 case Button2: 2063 case Button2:
2028 switch (scrollbar_align) 2064 switch (scrollBar.align)
2029 { 2065 {
2030 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
2031 csrO = 0; 2067 csrO = 0;
2032 break; 2068 break;
2033 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
2034 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
2035 break; 2071 break;
2036 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
2037 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
2038 break; 2074 break;
2039 } 2075 }
2040 2076
2041 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
2042 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2045 2081
2046 scrollBar.setMotion (); 2082 scrollBar.state = SB_STATE_MOTION;
2047 break; 2083 break;
2048 2084
2049 case Button1: 2085 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
2053 2089
2054 case Button3: 2090 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
2056 { 2092 {
2057 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
2058# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2059 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
2060# else 2096# else
2061 scr_page (UP, nrow / 4); 2097 scr_page (UP, nrow / 4);
2062# endif 2098# endif
2063 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
2064# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
2065 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2066# else 2102# else
2067 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2068# endif 2104# endif
2069 else 2105 else
2070 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
2071 } 2107 }
2072 else 2108 else
2073 { 2109 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2111 (nrow
2076 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
2077 / scrollbar_size ())); 2113 / scrollBar.size ()));
2078 } 2114 }
2079 2115
2080 break; 2116 break;
2081 } 2117 }
2082 } 2118 }
… …
2092 2128
2093 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2130 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2132
2097 if (scrollbar_isUpDn ()) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2098 { 2134 {
2099 scrollBar.setIdle (); 2135 scrollBar.state = SB_STATE_IDLE;
2100 scrollbar_show (0); 2136 scrollBar.show (0);
2101 } 2137 }
2102 2138
2103#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
2106#endif 2141#endif
2107 2142
2108 if (ev.window == vt) 2143 if (ev.window == vt)
2109 { 2144 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2145 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2118 2153
2119 if (reportmode) 2154 if (reportmode)
2120 { 2155 {
2121 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2122 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2123 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2124 return; 2159 return;
2125#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2126 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2127 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2128 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2129 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2130 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2131 { 2166 {
2132 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2133 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2134 mouse_report (ev); 2169 mouse_report (ev);
2135 } 2170 }
2136#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2137 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2138 mouse_report (ev); 2173 mouse_report (ev);
2139#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2140 return; 2175 return;
2141 } 2176 }
2142 2177
2143 /* 2178 /*
2144 * dumb hack to compensate for the failure of click-and-drag 2179 * dumb hack to compensate for the failure of click-and-drag
… …
2155 case Button3: 2190 case Button3:
2156 selection_make (ev.time); 2191 selection_make (ev.time);
2157 break; 2192 break;
2158 2193
2159 case Button2: 2194 case Button2:
2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2197 break;
2163 2198
2164#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2165 case Button4: 2200 case Button4:
2166 case Button5: 2201 case Button5:
2167 { 2202 {
2168 int i; 2203 int lines;
2169 page_dirn v; 2204 page_dirn dirn;
2170 2205
2171 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2172 2207
2173 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2174 i = 1; 2209 lines = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2211 lines = nrow - 1;
2177 else 2212 else
2178 i = 5; 2213 lines = 5;
2179 2214
2180# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2181 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2182 { 2217 {
2183 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186 2220
2187 if (slip_wheel_ev.at < NOW) 2221 if (!slip_wheel_ev.is_active ())
2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189
2190 slip_wheel_ev.start ();
2191 } 2223 }
2192 else 2224 else
2225# endif
2193 { 2226 {
2194# endif
2195 scr_page (v, i); 2227 scr_page (dirn, lines);
2196 scrollbar_show (1); 2228 scrollBar.show (1);
2197# ifdef MOUSE_SLIP_WHEELING
2198 } 2229 }
2199# endif
2200 } 2230 }
2201 break; 2231 break;
2202#endif 2232#endif
2203 } 2233 }
2204 } 2234 }
2205} 2235}
2206 2236
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678
2679/*}}} */ 2237/*}}} */
2680 2238
2681bool 2239void ecb_hot
2682rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2683{ 2241{
2684 bool flag = false;
2685 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2686 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2687 2244
2688 for (;;) 2245 for (;;)
2689 { 2246 {
2690 if (ch == NOCHAR) 2247 if (ecb_unlikely (ch == NOCHAR))
2691 { 2248 {
2692 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2693 ch = next_char (); 2250 ch = next_char ();
2694 2251
2695 if (ch == NOCHAR) 2252 if (ch == NOCHAR)
2696 break; 2253 break;
2697 } 2254 }
2698 2255
2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2700 { 2257 {
2701 if (!seen_input) 2258 if (ecb_unlikely (!seen_input))
2702 { 2259 {
2703 seen_input = 1; 2260 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
… …
2719 wchar_t *str = buf; 2276 wchar_t *str = buf;
2720 wchar_t *eol = str + min (ncol, UBUFSIZ); 2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2721 2278
2722 for (;;) 2279 for (;;)
2723 { 2280 {
2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2725 break; 2282 break;
2726 2283
2727 *str++ = ch; 2284 *str++ = ch;
2728 2285
2729 if (ch == C0_LF || str >= eol) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2730 { 2287 {
2731 if (ch == C0_LF) 2288 if (ch == C0_LF)
2732 nlines++; 2289 nlines++;
2733 2290
2734 refresh_count++; 2291 refresh_count++;
2735 2292
2736 if (!OPTION (Opt_jumpScroll) 2293 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2294 {
2739 refreshnow = true;
2740 refresh_count = 0; 2295 refresh_count = 0;
2296
2297 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2298 {
2299 refreshnow = true;
2741 ch = NOCHAR; 2300 ch = NOCHAR;
2742 break; 2301 break;
2302 }
2743 } 2303 }
2744 2304
2745 // scr_add_lines only works for nlines <= nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2306 if (nlines >= nrow - 1)
2747 { 2307 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2336 scr_add_lines (buf, str - buf, nlines);
2777 2337
2778 /* 2338 /*
2779 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2341 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2342 */
2784 if (refreshnow) 2343 if (refreshnow)
2785 { 2344 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2345 scr_refresh ();
2793 want_refresh = 1; 2346 want_refresh = 1;
2794 }
2795 } 2347 }
2796
2797 } 2348 }
2798 else 2349 else
2799 { 2350 {
2800 try 2351 try
2801 { 2352 {
… …
2809 } 2360 }
2810 2361
2811 ch = NOCHAR; 2362 ch = NOCHAR;
2812 } 2363 }
2813 } 2364 }
2814
2815 return flag;
2816} 2365}
2817 2366
2818// read the next character 2367// read the next character
2819wchar_t 2368wchar_t ecb_hot
2820rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2821{ 2370{
2822 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2823 { 2372 {
2824 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2826 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2827 2376
2828 wchar_t wc; 2377 wchar_t wc;
2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2830 2379
… …
2834 cmdbuf_ptr = cmdbuf_endp; 2383 cmdbuf_ptr = cmdbuf_endp;
2835 break; 2384 break;
2836 } 2385 }
2837 2386
2838 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2388 {
2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2840 2394
2841 // assume wchar == unicode 2395 // assume wchar == unicode
2842 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2843 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2844 } 2398 }
2845 2399
2846 return NOCHAR; 2400 return NOCHAR;
2847} 2401}
2848 2402
2849// read the next octet 2403// read the next octet
2850uint32_t 2404uint32_t ecb_hot
2851rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2852{ 2406{
2853 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR; 2409 : NOCHAR;
2856} 2410}
2857 2411
2858static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2859 2413
2860/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2861/* 2415rxvt_term::cmd_getc ()
2862 * Return the next input character after first passing any keyboard input
2863 * to the command.
2864 */
2865wchar_t
2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2867{ 2416{
2868 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2869 2418
2870 if (c == NOCHAR) 2419 if (c == NOCHAR)
2871 throw out_of_input; 2420 throw out_of_input;
2872 2421
2873 return c; 2422 return c;
2874} 2423}
2875 2424
2876uint32_t 2425uint32_t ecb_hot
2877rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2878{ 2427{
2879 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2880 2429
2881 if (c == NOCHAR) 2430 if (c == NOCHAR)
2882 throw out_of_input; 2431 throw out_of_input;
… …
2885} 2434}
2886 2435
2887/*{{{ print pipe */ 2436/*{{{ print pipe */
2888/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2889#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2890FILE * 2439FILE * ecb_cold
2891rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2892{ 2441{
2893 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2894 2443
2895 if (stream == NULL) 2444 if (stream == NULL)
2896 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2897 2446
2898 return stream; 2447 return stream;
2899} 2448}
2900 2449
2901int 2450int ecb_cold
2902rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2903{ 2452{
2904 fflush (stream); 2453 fflush (stream);
2905 return pclose (stream); 2454 return pclose (stream);
2906} 2455}
2907 2456
2908/* 2457/*
2909 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2910 */ 2459 */
2911void 2460void ecb_cold
2912rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2913{ 2462{
2914 int done; 2463 FILE *fd = popen_printer ();
2915 FILE *fd;
2916 2464
2917 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2918 return; 2466 return;
2919 2467
2920 /* 2468 /*
2921 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2922 * is received. 2470 * is received.
2923 */ 2471 */
2924 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2925 { 2473 {
2926 unsigned char buf[8]; 2474 unsigned char buf[8];
2927 unicode_t ch; 2475 unicode_t ch;
2928 unsigned int i, len; 2476 unsigned int i, len;
2929 2477
… …
2948 { 2496 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2498 break; /* done = 1 */
2951 } 2499 }
2952 } 2500 }
2953 2501
2954 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2956 { 2504 {
2957 done = 1; 2505 done = 1;
2958 break; 2506 break;
… …
2960 } 2508 }
2961 } 2509 }
2962 2510
2963 pclose_printer (fd); 2511 pclose_printer (fd);
2964} 2512}
2965#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2966/*}}} */ 2514/*}}} */
2967 2515
2968/* *INDENT-OFF* */
2969enum { 2516enum {
2970 C1_40 = 0x40, 2517 C1_40 = 0x40,
2971 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2972 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2973 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2974 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2975}; 2522};
2976/* *INDENT-ON* */
2977 2523
2978/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2979void 2525void ecb_hot
2980rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2981{ 2527{
2982 switch (ch) 2528 switch (ch)
2983 { 2529 {
2984 case C0_ESC: 2530 case C0_ESC:
… …
3014 scr_charset_choose (0); 2560 scr_charset_choose (0);
3015 break; 2561 break;
3016 2562
3017#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
3018 // 8-bit controls 2564 // 8-bit controls
3019 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
3020 process_dcs_seq (); 2566 process_dcs_seq ();
3021 break; 2567 break;
3022 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
3023 process_csi_seq (); 2569 process_csi_seq ();
3024 break; 2570 break;
3025 case 0x9d: /* CSI */ 2571 case 0x9d: /* OSC */
3026 process_osc_seq (); 2572 process_osc_seq ();
3027 break; 2573 break;
3028#endif 2574#endif
3029 } 2575 }
3030} 2576}
3031/*}}} */ 2577/*}}} */
3032 2578
3033 2579
3034/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
3035void 2581void ecb_cold
3036rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
3037{ 2583{
3038 int row, col; 2584 int row, col;
3039 2585
3040 switch (ch) 2586 switch (ch)
… …
3074 break; 2620 break;
3075 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
3076 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3077 break; 2623 break;
3078 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
3079 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
3080 break; 2626 break;
3081 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
3082 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
3083 /* unimplemented */ 2629 /* unimplemented */
3084 break; 2630 break;
… …
3090} 2636}
3091/*}}} */ 2637/*}}} */
3092 2638
3093 2639
3094/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
3095void 2641void ecb_hot
3096rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
3097{ 2643{
3098 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
3099 2645
3100 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
3103 return; 2649 return;
3104 } 2650 }
3105 2651
3106 switch (ch) 2652 switch (ch)
3107 { 2653 {
3108 /* case 1: do_tek_mode (); break; */
3109 case '#': 2654 case '#':
3110 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
3111 scr_E (); 2656 scr_E ();
3112 break; 2657 break;
3113 case '(': 2658 case '(':
… …
3136#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
3137 case '9': 2682 case '9':
3138 scr_forwardindex (); 2683 scr_forwardindex ();
3139 break; 2684 break;
3140#endif 2685#endif
2686 // DECPAM/DECPNM
3141 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
3142 case '>': 2690 case '>':
3143 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
3144 break; 2692 break;
3145 2693
3146 case C1_40: 2694 case C1_40:
3147 cmd_getc (); 2695 cmd_getc ();
3148 break; 2696 break;
… …
3152 2700
3153 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
3154 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
3155 { 2703 {
3156 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3158 } 2706 }
3159 break; 2707 break;
3160 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
3161 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
3162 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
3163 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3164 break; 2715 break;
2716#endif
3165 2717
3166 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
3167 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
3168 scr_set_tab (1); 2720 scr_set_tab (1);
3169 break; 2721 break;
… …
3172 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
3173 scr_index (DN); 2725 scr_index (DN);
3174 break; 2726 break;
3175 2727
3176 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
3177 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
3178 2730
3179 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
3180 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
3181 2733
3182 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
3183 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
3184 process_dcs_seq (); 2736 process_dcs_seq ();
3185 break; 2737 break;
… …
3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3188 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3190 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
3191 2743
3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3193 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
3194 process_csi_seq (); 2746 process_csi_seq ();
3195 break; 2747 break;
3196 2748
3197 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3198 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
3199 process_osc_seq (); 2751 process_osc_seq ();
3200 break; 2752 break;
3201 2753
3202 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3203 case 'c': 2755 case 'c':
3204 mbstate.reset (); 2756 mbstate.reset ();
3205 scr_poweron (); 2757 scr_poweron ();
3206 scrollbar_show (1); 2758 scrollBar.show (1);
3207 break; 2759 break;
3208 2760
3209 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3210 case 'n': 2762 case 'n':
3211 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
3218 } 2770 }
3219} 2771}
3220/*}}} */ 2772/*}}} */
3221 2773
3222/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3223/* *INDENT-OFF* */
3224enum { 2775enum {
3225 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
3226 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3227 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3228 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3231 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3232 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3233 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3234}; 2785};
3235 2786
3236#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3237 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3238 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3239#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
3240 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3241 2792
3242const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
3243 { 2794 {
3244 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3245 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3246 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3247 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3248 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3249 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3250 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3251 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3252 }; 2803 };
3253/* *INDENT-ON* */
3254 2804
3255void 2805void ecb_hot
3256rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
3257{ 2807{
3258 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
3259 unsigned int nargs, p; 2809 unsigned int nargs, p;
3260 int n, ndef; 2810 int n, ndef;
3261 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS] = { };
3262 2812
3263 for (nargs = ESC_ARGS; nargs > 0;) 2813 nargs = 0;
3264 arg[--nargs] = 0;
3265 2814
3266 priv = 0; 2815 priv = 0;
3267 ch = cmd_getc (); 2816 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2818 {
3269 { /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
3270 priv = ch; 2820 priv = ch;
3271 ch = cmd_getc (); 2821 ch = cmd_getc ();
3272 } 2822 }
3273 2823
2824 prev_ch = 0;
3274 /* read any numerical arguments */ 2825 /* read any numerical arguments */
3275 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
3276 { 2827 {
3277 if (isdigit (ch)) 2828 if (isdigit (ch))
3278 { 2829 {
… …
3288 n = -1; 2839 n = -1;
3289 } 2840 }
3290 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
3291 process_nonprinting (ch); 2842 process_nonprinting (ch);
3292 2843
2844 prev_ch = ch;
3293 ch = cmd_getc (); 2845 ch = cmd_getc ();
3294 } 2846 }
3295 2847
3296 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
3297 return; 2849 return;
… …
3313 switch (priv) 2865 switch (priv)
3314 { 2866 {
3315 case '>': 2867 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2868 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2869 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2870 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2871 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2872 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2873 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2874 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2875 // versions.
3324 // 2876 //
3325 tt_printf ("\033[>%d;94;0c", 'U'); 2877 tt_printf ("\033[>%d;95;0c", 'U');
3326 } 2878 }
3327 break; 2879 break;
2880
3328 case '?': 2881 case '?':
3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3330 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
3331 break; 2886 break;
2887
2888 case '!':
2889 if (ch == CSI_70)
2890 {
2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2892 scr_soft_reset ();
2893
2894 static const int pm_h[] = { 7, 25 };
2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2896
2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3332 } 2899 }
2900 break;
2901 }
2902
3333 return; 2903 return;
3334 } 2904 }
3335 2905
3336 switch (ch) 2906 switch (ch)
3337 { 2907 {
… …
3351 } 2921 }
3352 break; 2922 break;
3353#endif 2923#endif
3354 2924
3355 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3356 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3357 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
3358 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
3359 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3360 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3361 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
3362 break; 2932 break;
3363 2933
3364 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3365 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3366#ifdef ISO6429 2936#ifdef ISO6429
3367 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
3368#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
3369 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
3370#endif 2940#endif
… …
3457 break; 3027 break;
3458 case 6: /* CPR requested */ 3028 case 6: /* CPR requested */
3459 scr_report_position (); 3029 scr_report_position ();
3460 break; 3030 break;
3461 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 3032 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 3034 break;
3465 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3467 break; 3041 break;
3042 }
3468 } 3043 }
3469 break; 3044 break;
3470 3045
3471 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3472 switch (arg[0]) 3047 switch (arg[0])
… …
3515 scr_insert_mode (1); 3090 scr_insert_mode (1);
3516 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3517 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3518 break; 3093 break;
3519 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3520 /* 3100 /*
3521 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3522 */ 3102 */
3523 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3524 if (nargs == 1) 3104 if (nargs == 1)
… …
3552 } 3132 }
3553} 3133}
3554/*}}} */ 3134/*}}} */
3555 3135
3556#if !ENABLE_MINIMAL 3136#if !ENABLE_MINIMAL
3557/* ARGSUSED */
3558void 3137void
3559rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3560{ 3139{
3561 int x, y; 3140 int x, y;
3562 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
… …
3571 { 3150 {
3572 /* 3151 /*
3573 * commands 3152 * commands
3574 */ 3153 */
3575 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3576 XMapWindow (dpy, parent[0]); 3155 XMapWindow (dpy, parent);
3577 break; 3156 break;
3578 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3579 XIconifyWindow (dpy, parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3580 break; 3159 break;
3581 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3582 XMoveWindow (dpy, parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3583 break; 3162 break;
3584 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3165 break;
3587 case 5: /* raise window */ 3166 case 5: /* raise window */
3588 XRaiseWindow (dpy, parent[0]); 3167 XRaiseWindow (dpy, parent);
3589 break; 3168 break;
3590 case 6: /* lower window */ 3169 case 6: /* lower window */
3591 XLowerWindow (dpy, parent[0]); 3170 XLowerWindow (dpy, parent);
3592 break; 3171 break;
3593 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3594 scr_touch (true); 3173 scr_touch (true);
3595 break; 3174 break;
3596 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
… …
3599 break; 3178 break;
3600 3179
3601 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3602 default: 3181 default:
3603 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3605 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3606 break; 3185 break;
3607 3186
3608 /* 3187 /*
3609 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3610 */ 3189 */
3611 case 11: /* report window state */ 3190 case 11: /* report window state */
3612 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3614 break; 3193 break;
3615 case 13: /* report window position */ 3194 case 13: /* report window position */
3616 XGetWindowAttributes (dpy, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3617 XTranslateCoordinates (dpy, parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3618 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3619 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3620 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3621 break; 3200 break;
3622 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3623 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3625 break; 3204 break;
3626 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3627 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3628 break; 3207 break;
… …
3630 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3631 break; 3210 break;
3632 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3633 { 3212 {
3634 char *s; 3213 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3216 XFree (s);
3638 } 3217 }
3639 break; 3218 break;
3640 case 21: /* report window title */ 3219 case 21: /* report window title */
3641 { 3220 {
3642 char *s; 3221 char *s;
3643 XFetchName (dpy, parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3224 XFree (s);
3646 } 3225 }
3647 break; 3226 break;
3648 } 3227 }
3649} 3228}
… …
3653/* 3232/*
3654 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3655 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3656 */ 3235 */
3657char * 3236char *
3658rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3659{ 3238{
3660 unicode_t ch; 3239 unicode_t ch;
3661 bool seen_esc = false; 3240 bool seen_esc = false;
3662 unsigned int n = 0; 3241 unsigned int n = 0;
3663 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3664 3243
3665 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3666 { 3245 {
3667 if (seen_esc) 3246 if (seen_esc)
3668 { 3247 {
… …
3683 else if (ch < 0x20) 3262 else if (ch < 0x20)
3684 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3685 3264
3686 seen_esc = false; 3265 seen_esc = false;
3687 3266
3688 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3689 // stop at some sane length 3268 // stop at some sane length
3690 return NULL; 3269 return NULL;
3691 3270
3692 string[n++] = ch; 3271 string[n++] = ch;
3693 } 3272 }
3694 3273
3695 string[n++] = '\0'; 3274 string[n++] = '\0';
3696 3275
3697 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3698 3281
3699 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3700} 3283}
3701 3284
3702/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3705 */ 3288 */
3706void 3289void
3707rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3708{ 3291{
3709 char *s;
3710 unicode_t eh;
3711
3712 /* 3292 /*
3713 * Not handled yet 3293 * Not handled yet
3714 */ 3294 */
3295
3296 string_term st;
3715 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3716 if (s) 3298 if (s)
3717 free (s); 3299 free (s);
3718 3300
3719 return; 3301 return;
3720} 3302}
… …
3724 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3725 */ 3307 */
3726void 3308void
3727rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3728{ 3310{
3729 unicode_t ch, eh;
3730 int arg; 3311 int arg;
3731 3312
3732 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3733 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3734 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3735 3316
3736 if (ch == ';') 3317 if (ch == ';')
3737 { 3318 {
3319 string_term st;
3738 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3739 3321
3740 if (s) 3322 if (s)
3741 { 3323 {
3742 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3743 free (s); 3325 free (s);
3744 } 3326 }
3745 } 3327 }
3746} 3328}
3747 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {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},
3380 {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},
3381 {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},
3382 {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},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {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},
3385 {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},
3386 {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},
3387 {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},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3748void 3433void
3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3750{ 3435{
3751 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3752 { 3437 {
3753 rgba c; 3438 rgba c;
3754 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3755 3441
3756#if XFT 3442#if XFT
3757 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3759 else 3445 else
3760#endif 3446#endif
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3762 } 3453 }
3763 else 3454 else
3764 set_window_color (color, str); 3455 set_window_color (color, str);
3765} 3456}
3766 3457
3767/* 3458/*
3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3769 */ 3460 */
3770void 3461void
3771rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3772{ 3463{
3773 int color; 3464 int color;
3774 char *buf, *name; 3465 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3467 int saveop = op;
3777 3468
3778 dLocal (Display *, dpy); 3469 dLocal (Display *, dpy);
3779 3470
3780 assert (str != NULL); 3471 assert (str != NULL);
3781 3472
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3473 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3474 return;
3784 3475
3785 switch (op) 3476 switch (op)
3786 { 3477 {
… …
3803 unsigned long bytes_after; 3494 unsigned long bytes_after;
3804 unsigned char *value = 0; 3495 unsigned char *value = 0;
3805 const char *str = ""; 3496 const char *str = "";
3806 3497
3807 if (prop 3498 if (prop
3808 && XGetWindowProperty (dpy, parent[0], 3499 && XGetWindowProperty (dpy, parent,
3809 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3810 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3811 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3812 && actual_type != None 3503 && actual_type != None
3813 && actual_format == 8) 3504 && actual_format == 8)
3814 str = (const char *)(value); 3505 str = (const char *)(value);
3815 3506
3816 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3817 3508
3818 XFree (value); 3509 XFree (value);
3819 } 3510 }
3820 else 3511 else
3821 { 3512 {
3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3513 char *eq = strchr (str, '=');
3823 3514
3824 if (eq) 3515 if (eq)
3825 { 3516 {
3826 *eq = 0; 3517 *eq = 0;
3827 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3828 } 3519 }
3829 else 3520 else
3830 XDeleteProperty (dpy, parent[0], 3521 XDeleteProperty (dpy, parent,
3831 display->atom (str)); 3522 display->atom (str));
3832 } 3523 }
3833 break; 3524 break;
3834 3525
3835 case XTerm_Color: 3526 case XTerm_Color:
… …
3845 break; 3536 break;
3846 3537
3847 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3848 *buf++ = '\0'; 3539 *buf++ = '\0';
3849 3540
3850 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3851 } 3542 }
3852 break; 3543 break;
3544 case Rxvt_restoreFG:
3853 case XTerm_Color00: 3545 case XTerm_Color00:
3854 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3855 break; 3547 break;
3548 case Rxvt_restoreBG:
3856 case XTerm_Color01: 3549 case XTerm_Color01:
3857 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3858 break; 3551 break;
3859#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3861 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3862 break; 3555 break;
3863#endif 3556#endif
3864 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3865 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3866 break; 3559 break;
3867 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3868 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3869 break; 3562 break;
3563#ifdef OPTION_HC
3564 case XTerm_Color_HC:
3565 process_color_seq (op, Color_HC, str, st);
3566 break;
3567 case XTerm_Color_HTC:
3568 process_color_seq (op, Color_HTC, str, st);
3569 break;
3570#endif
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV:
3872 process_color_seq (op, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3877 break; 3574 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3881 break; 3577 break;
3882 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3884 break; 3580 break;
3885#endif 3581#endif
3886#if TRANSPARENT && TINTING
3887 case URxvt_Color_tint: 3582 case URxvt_Color_border:
3888 process_color_seq (op, Color_tint, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3889
3890 check_our_parents ();
3891
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894
3895 break;
3896#endif
3897
3898 case Rxvt_Pixmap:
3899 {
3900 if (*str != ';')
3901 {
3902#if XPM_BACKGROUND
3903 scale_pixmap (""); /* reset to default scaling */
3904 set_bgPixmap (str); /* change pixmap */
3905 scr_touch (true);
3906#endif
3907 }
3908
3909 int changed = 0;
3910
3911 while ((str = strchr (str, ';')) != NULL)
3912 {
3913 str++;
3914#if XPM_BACKGROUND
3915 changed += scale_pixmap (str);
3916#endif
3917 }
3918
3919 if (changed)
3920 {
3921#ifdef XPM_BACKGROUND
3922 resize_pixmap ();
3923 scr_touch (true);
3924#endif
3925 }
3926 }
3927 break;
3928
3929 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str);
3931 break;
3932 case Rxvt_restoreBG:
3933 set_window_color (Color_bg, str);
3934 break; 3584 break;
3935 3585
3936 case XTerm_logfile: 3586 case XTerm_logfile:
3937 // TODO, when secure mode? 3587 // TODO, when secure mode?
3938 break; 3588 break;
… …
3956 case URxvt_boldFont: 3606 case URxvt_boldFont:
3957 case URxvt_italicFont: 3607 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3959#endif 3609#endif
3960 if (query) 3610 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3614 st.v);
3965 else 3615 else
3966 { 3616 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3968 3618
3969 res = strdup (str); 3619 res = strdup (str);
… …
3972 } 3622 }
3973 break; 3623 break;
3974 3624
3975 case URxvt_version: 3625 case URxvt_version:
3976 if (query) 3626 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3978 op, 3628 op,
3979 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp); 3630 st.v);
3981 break; 3631 break;
3982 3632
3983#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3984 case URxvt_locale: 3641 case URxvt_locale:
3985 if (query) 3642 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3987 else 3644 else
3988 { 3645 {
3989 set_locale (str); 3646 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3648 init_xlocale ();
… …
4006 break; 3663 break;
4007#endif 3664#endif
4008 3665
4009#if ENABLE_PERL 3666#if ENABLE_PERL
4010 case URxvt_perl: 3667 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
4012 ; // no responses yet
4013 break; 3669 break;
4014#endif 3670#endif
4015 } 3671 }
4016} 3672}
4017/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
4024 * 's' = save 3680 * 's' = save
4025 * 'r' = restore 3681 * 'r' = restore
4026 * 't' = toggle 3682 * 't' = toggle
4027 * so no need for fancy checking 3683 * so no need for fancy checking
4028 */ 3684 */
4029int 3685int ecb_cold
4030rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
4031{ 3687{
4032 int state; 3688 int state;
4033 3689
4034 if (mode == 's') 3690 if (mode == 's')
4035 { 3691 {
4036 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
4037 return -1; 3696 return -1;
4038 } 3697 }
4039 else 3698 else
4040 { 3699 {
4041 if (mode == 'r') 3700 if (mode == 'r')
4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4043 else 3702 else
4044 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4045 PrivMode (state, bit); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
4046 } 3709 }
4047 3710
4048 return state; 3711 return state;
4049} 3712}
4050 3713
4051/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
4052void 3715void
4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4054{ 3717{
4055 unsigned int i, j; 3718 unsigned int i, j;
4056 int state; 3719 int state;
4057 3720
4058 static const struct 3721 static const struct
4059 { 3722 {
4060 const int argval; 3723 const int argval;
4061 const unsigned long bit; 3724 const unsigned long bit;
4062 }
4063
4064 argtopriv[] = { 3725 } argtopriv[] = {
4065 { 1, PrivMode_aplCUR }, 3726 { 1, PrivMode_aplCUR }, // DECCKM
4066 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
4067 { 3, PrivMode_132 }, 3728 { 3, PrivMode_132 }, // DECCOLM
4068 { 4, PrivMode_smoothScroll }, 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
4069 { 5, PrivMode_rVideo }, 3730 { 5, PrivMode_rVideo }, // DECSCNM
4070 { 6, PrivMode_relOrigin }, 3731 { 6, PrivMode_relOrigin }, // DECOM
4071 { 7, PrivMode_Autowrap }, 3732 { 7, PrivMode_Autowrap }, // DECAWM
4072 // 8, bi-directional support mode 3733 // 8, auto-repeat keys // DECARM
4073 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
4074 // 18, 19 printing-related
4075 { 25, PrivMode_VisibleCursor }, 3735 { 12, PrivMode_BlinkingCursor },
3736 // 18 end FF to printer after print screen
3737 // 19 Print screen prints full screen/scroll region
3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4076#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
4077 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
4078#endif 3741#endif
4079 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3743 // 38, tektronix mode // DECTEK
4080 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
4081 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
4082 // 45 margin bell NYI 3746 // 45 margin bell NYI
4083 // 46 start logging 3747 // 46 start logging
4084 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
4085 { 66, PrivMode_aplKP }, 3749 { 66, PrivMode_aplKP }, // DECNKM
4086#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
4087 { 67, PrivMode_BackSpace }, 3751 { 67, PrivMode_BackSpace }, // DECBKM
4088#endif 3752#endif
4089 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
4090 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3754 { 1002, PrivMode_MouseBtnEvent },
4091 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3755 { 1003, PrivMode_MouseAnyEvent },
4092 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
4093 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4094 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
4095 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
4096 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
4097 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
4098 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
4099 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
4100 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4101 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3774 { 2004, PrivMode_BracketPaste },
3775#endif
4102 }; 3776 };
4103 3777
4104 if (nargs == 0) 3778 if (nargs == 0)
4105 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
4106 3798
4107 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
4108 if (mode == 'l') 3800 if (mode == 'l')
4109 mode = 0; /* reset */ 3801 mode = 0; /* reset */
4110 else if (mode == 'h') 3802 else if (mode == 'h')
… …
4113 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
4114 { 3806 {
4115 state = -1; 3807 state = -1;
4116 3808
4117 /* basic handling */ 3809 /* basic handling */
4118 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
4119 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
4120 { 3812 {
4121 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
4122 break; 3814 break;
4123 } 3815 }
… …
4131 3823
4132 scr_touch (true); 3824 scr_touch (true);
4133 break; 3825 break;
4134#endif 3826#endif
4135 case 1048: /* alternative cursor save */ 3827 case 1048: /* alternative cursor save */
4136 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3828 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3829 if (mode == 0)
4139 scr_cursor (RESTORE); 3830 scr_cursor (RESTORE);
4140 else if (mode == 1) 3831 else if (mode == 1)
4141 scr_cursor (SAVE); 3832 scr_cursor (SAVE);
4142 break; 3833 break;
… …
4150 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
4151 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
4152 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
4153 * within VT52 mode 3844 * within VT52 mode
4154 */ 3845 */
4155 PrivMode (1, PrivMode_vt52); 3846 priv_modes |= PrivMode_vt52;
4156 break; 3847 break;
4157 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
4158 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
4159 set_widthheight (((state ? 132 : 80) * fwidth), height); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4160 break; 3851 break;
4161 case 4: /* smooth scrolling */ 3852 case 4: /* smooth scrolling */
4162 set_option (Opt_jumpScroll, !state); 3853 set_option (Opt_jumpScroll, !state);
4163 break; 3854 break;
4164 case 5: /* reverse video */ 3855 case 5: /* reverse video */
… …
4171 scr_autowrap (state); 3862 scr_autowrap (state);
4172 break; 3863 break;
4173 /* case 8: - auto repeat, can't do on a per window basis */ 3864 /* case 8: - auto repeat, can't do on a per window basis */
4174 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
4175 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
4176 priv_modes &= ~PrivMode_MouseX11; 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4177 break; 3868 break;
4178#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
4179 case scrollBar_esc: 3870 case scrollBar_esc:
4180 if (scrollbar_mapping (state)) 3871 scrollBar.map (state);
4181 {
4182 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
4183 scr_touch (true); 3873 scr_touch (true);
4184 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
4185 break; 3879 break;
4186#endif 3880#endif
4187 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
4188 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
4189 break; 3883 break;
… …
4194 break; 3888 break;
4195 /* case 66: - application key pad */ 3889 /* case 66: - application key pad */
4196 /* case 67: - backspace key */ 3890 /* case 67: - backspace key */
4197 case 1000: /* X11 mouse reporting */ 3891 case 1000: /* X11 mouse reporting */
4198 if (state) /* orthogonal */ 3892 if (state) /* orthogonal */
4199 priv_modes &= ~PrivMode_MouseX10; 3893 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4200 break; 3894 break;
4201#if 0
4202 case 1001: 3895 case 1002:
4203 break; /* X11 mouse highlighting */ 3896 case 1003:
4204#endif 3897 if (state)
3898 {
3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3902 vt_emask_mouse = PointerMotionMask;
3903 }
3904 else
3905 vt_emask_mouse = NoEventMask;
3906
3907 vt_select_input ();
3908 break;
4205 case 1010: /* scroll to bottom on TTY output inhibit */ 3909 case 1010: /* scroll to bottom on TTY output inhibit */
4206 set_option (Opt_scrollTtyOutput, !state); 3910 set_option (Opt_scrollTtyOutput, !state);
4207 break; 3911 break;
4208 case 1011: /* scroll to bottom on key press */ 3912 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3913 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3914 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3915 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3916 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3917 if (!state)
4214 scr_erase_screen (2); 3918 scr_erase_screen (2);
3919
4215 scr_change_screen (state); 3920 scr_change_screen (state);
4216 break; 3921 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3922 case 1049: /* secondary screen w/ clearing first */
3923 if (option (Opt_secondaryScreen))
3924 if (state)
3925 scr_cursor (SAVE);
3926
4218 scr_change_screen (state); 3927 scr_change_screen (state);
3928
4219 if (OPTION (Opt_secondaryScreen)) 3929 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3930 if (state)
4221 scr_erase_screen (2); 3931 scr_erase_screen (2);
3932 else
3933 scr_cursor (RESTORE);
4222 break; 3934 break;
4223 default: 3935 default:
4224 break; 3936 break;
4225 } 3937 }
4226 } 3938 }
4227} 3939}
4228/*}}} */ 3940/*}}} */
4229 3941
4230/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
4231void 3943void ecb_hot
4232rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4233{ 3945{
4234 unsigned int i; 3946 unsigned int i;
4235 short rendset; 3947 short rendset;
4236 int rendstyle; 3948 int rendstyle;
… …
4278 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
4279 //case 20: // gothic 3991 //case 20: // gothic
4280 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4281 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
4282 break; 3994 break;
4283 case 22: // normal intensity 3995 case 22: // bold off (vt220)
4284 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
4285 break; 3997 break;
4286 case 23: // disable italic 3998 case 23: // disable italic
4287 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
4288 break; 4000 break;
4289 case 24: 4001 case 24: // underline off (vt220)
4290 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
4291 break; 4003 break;
4292 case 25: 4004 case 25: // blink off (vt220)
4293 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
4294 break; 4006 break;
4295 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
4296 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
4297 break; 4009 break;
4298 case 27: 4010 case 27: // reverse off (vt220)
4299 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
4300 break; 4012 break;
4301 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
4302 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
4303 } 4015 }
… …
4318 case 35: 4030 case 35:
4319 case 36: 4031 case 36:
4320 case 37: 4032 case 37:
4321 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4322 break; 4034 break;
4323 case 38: // set fg color, ISO 8613-6
4324 if (nargs > i + 2 && arg[i + 1] == 5)
4325 {
4326 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4327 i += 2;
4328 }
4329 break;
4330 case 39: /* default fg */ 4035 case 39: /* default fg */
4331 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
4332 break; 4037 break;
4333 4038
4334 case 40: 4039 case 40:
… …
4339 case 45: 4044 case 45:
4340 case 46: 4045 case 46:
4341 case 47: 4046 case 47:
4342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4343 break; 4048 break;
4344 case 48: // set bg color, ISO 8613-6
4345 if (nargs > i + 2 && arg[i + 1] == 5)
4346 {
4347 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4348 i += 2;
4349 }
4350 break;
4351 case 49: /* default bg */ 4049 case 49: /* default bg */
4352 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
4353 break; 4080 break;
4354 4081
4355 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
4356 4083
4357#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
4377 break; 4104 break;
4378#endif 4105#endif
4379 } 4106 }
4380 } 4107 }
4381} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
4382/*}}} */ 4129/*}}} */
4383 4130
4384/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4385void
4386rxvt_term::process_graphics ()
4387{
4388 unicode_t ch, cmd = cmd_getc ();
4389
4390 if (cmd == 'Q')
4391 { /* query graphics */
4392 tt_printf ("\033G0\012"); /* no graphics */
4393 return;
4394 }
4395 /* swallow other graphics sequences until terminating ':' */
4396 do
4397 ch = cmd_getc ();
4398 while (ch != ':');
4399}
4400/*}}} */
4401
4402/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
4403 4135
4404/* 4136/*
4405 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
4406 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
4407 */ 4139 */
… …
4415 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4416 va_end (arg_ptr); 4148 va_end (arg_ptr);
4417 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
4418} 4150}
4419 4151
4420/* ---------------------------------------------------------------------- */
4421/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
4422 * or generated by us in response to a query ESC sequence. 4153void
4423 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
4425 4168
4426void 4169void
4427rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
4428{ 4171{
4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return; 4173 return;
4431 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
4432 if (pty->pty < 0) 4183 if (pty->pty < 0)
4433 return; 4184 return;
4434 4185
4435 if (v_buflen == 0) 4186 if (v_buflen == 0)
4436 { 4187 {
4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4438 4189
4190 max_it (written, 0);
4191
4439 if ((unsigned int)written == len) 4192 if (written == len)
4440 return; 4193 return;
4441 4194
4442 data += written; 4195 data += written;
4443 len -= written; 4196 len -= written;
4444 } 4197 }
4445 4198
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4447 4200
4448 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len; 4202 v_buflen += len;
4450 4203
4451 pty_ev.set (EVENT_READ | EVENT_WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);
4452} 4205}
4453 4206
4454void rxvt_term::pty_write () 4207void rxvt_term::pty_write ()
4455{ 4208{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4209 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4461 4214
4462 if (v_buflen == 0) 4215 if (v_buflen == 0)
4463 { 4216 {
4464 free (v_buffer); 4217 free (v_buffer);
4465 v_buffer = 0; 4218 v_buffer = 0;
4466 v_buflen = 0;
4467 4219
4468 pty_ev.set (EVENT_READ); 4220 pty_ev.set (ev::READ);
4469 return; 4221 return;
4470 } 4222 }
4471 4223
4472 memmove (v_buffer, v_buffer + written, v_buflen); 4224 memmove (v_buffer, v_buffer + written, v_buflen);
4473 } 4225 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4226 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ); 4227 pty_ev.set (ev::READ);
4476} 4228}
4477 4229
4478/*----------------------- end-of-file (C source) -----------------------*/ 4230/*----------------------- end-of-file (C source) -----------------------*/
4479 4231

Diff Legend

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