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.331 by root, Mon Jun 18 13:38:12 2007 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 UTC

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

Diff Legend

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