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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.598 by sf-exg, Sun Sep 18 20:32:17 2022 UTC

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

Diff Legend

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