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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 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-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 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, 0);
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 - 4 && 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 meta = 0;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
706 {
707#ifdef KEYSYM_RESOURCE
708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
709 return;
710#endif
711
348 if (TermWin.saveLines) 712 if (saveLines)
349 { 713 {
350#ifdef UNSHIFTED_SCROLLKEYS 714#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 715 if (!ctrl && !meta)
352#else 716#else
353 if (IS_SCROLL_MOD) 717 if (IS_SCROLL_MOD)
354#endif 718#endif
355 { 719 {
356 int lnsppg; 720 int lnsppg;
357 721
358#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 724#else
361 lnsppg = TermWin.nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
362#endif 726#endif
727 max_it (lnsppg, 1);
728
363 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
364 { 730 {
365 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
366 return; 732 return;
367 } 733 }
368 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
369 { 735 {
370 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
371 return; 737 return;
372 } 738 }
373 } 739 }
374#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
375 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
376 { 742 {
377 if (keysym == XK_Up) 743 if (keysym == XK_Up)
378 { 744 {
379 scr_page (UP, 1); 745 scr_page (1);
380 return; 746 return;
381 } 747 }
382 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
383 { 749 {
384 scr_page (DN, 1); 750 scr_page (-1);
385 return; 751 return;
386 } 752 }
387 } 753 }
388#endif 754#endif
389#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
390 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
391 { 757 {
392 if (keysym == XK_Home) 758 if (keysym == XK_Home)
393 { 759 {
394 scr_move_to (0, 1); 760 scr_changeview (top_row);
395 return; 761 return;
396 } 762 }
397 else if (keysym == XK_End) 763 else if (keysym == XK_End)
398 { 764 {
399 scr_move_to (1, 0); 765 scr_changeview (0);
400 return; 766 return;
401 } 767 }
402 } 768 }
403#endif 769#endif
404 } 770 }
405 771
406 if (shft) 772 if (shft)
407 { 773 {
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)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
415 { 775 {
416 switch (keysym) 776 switch (keysym)
417 { 777 {
418 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 780 selection_request (ev.time);
421 return; 781 return;
422#if TODO // TODO 782#if TODO
423 /* rxvt extras */ 783 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP);
426 return; 785 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
428 change_font (FONT_DN);
429 return; 787 return;
430#endif 788#endif
431 } 789 }
432 } 790 }
433 } 791 }
434 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
435#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
436 // ISO 14755 support 809 // ISO 14755 support
437 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
438 { 811 {
439 int hv; 812 int hv;
440 813
441 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
442 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
444 { 817 {
445 commit_iso14755 (); 818 commit_iso14755 ();
446 iso14755buf = ISO_14755_51; 819 iso14755buf = ISO_14755_51;
447# if ISO_14755 820# if ISO_14755
448 iso14755_51 (0); 821 iso14755_51 (0);
822# endif
823 return;
824 }
825 else if (keysym == XK_BackSpace)
826 {
827 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
828# if ISO_14755
829 iso14755_51 (iso14755buf & ISO_14755_MASK);
449# endif 830# endif
450 return; 831 return;
451 } 832 }
452 else if ((hv = hex_keyval (ev)) >= 0) 833 else if ((hv = hex_keyval (ev)) >= 0)
453 { 834 {
… …
458# endif 839# endif
459 return; 840 return;
460 } 841 }
461 else 842 else
462 { 843 {
463# if ENABLE_OVERLAY 844# if ISO_14755
464 scr_overlay_off (); 845 scr_overlay_off ();
465# endif 846# endif
466 iso14755buf = 0; 847 iso14755buf = 0;
467 } 848 }
468 } 849 }
850 else if (option (Opt_iso14755) &&
469 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
470 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
471 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
472 { 854 {
473 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
474# if ENABLE_OVERLAY 856# if ISO_14755
475 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
476 scr_overlay_set (0, 0, "ISO 14755 mode"); 858 scr_overlay_set (0, 0, "ISO 14755 mode");
477# endif 859# endif
478 } 860 }
479#endif 861#endif
480 862
481#ifdef PRINTPIPE 863#ifdef PRINTPIPE
482 if (keysym == XK_Print) 864 if (keysym == XK_Print)
483 { 865 {
484 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
485 return; 867 return;
486 } 868 }
487#endif 869#endif
870 }
488 871
872 if (len <= 0)
873 return; /* not mapped */
874
875 tt_write_user_input (kbuf, (unsigned int)len);
876}
877
878void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
891 {
892# if ISO_14755
893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
490 { 901 {
491#ifdef KEYSYM_RESOURCE 902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym)
493 { 910 {
494 unsigned int l; 911 iso14755buf = ISO_14755_51 | i[1];
495 const unsigned char *kbuf0; 912 commit_iso14755 ();
496 913
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; 914 return;
513 } 915 }
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 916
554#ifdef XK_KP_Left 917 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 918# endif
599 case XK_Prior: 919 iso14755buf = 0;
600 strcpy (kbuf, "\033[5~"); 920
601 break; 921 return;
602# ifdef XK_KP_Next 922 }
603 case XK_KP_Next: 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
604 /* allow shift to override */ 924 {
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 925# if ISO_14755
606 { 926 scr_overlay_off ();
607 strcpy (kbuf, "\033Os");
608 break;
609 }
610 /* FALLTHROUGH */
611# endif 927# endif
612 case XK_Next: 928 if (iso14755buf & ISO_14755_51)
613 strcpy (kbuf, "\033[6~"); 929 commit_iso14755 ();
614 break; 930#if ISO_14755
931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
934
935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
937 }
615#endif 938# 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 939 else
811 { 940 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 } 941 }
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 942#endif
857 )
858 {
859 const unsigned char ch = C0_ESC;
860 tt_write (&ch, 1);
861 }
862 943
863#if defined(DEBUG_CMD) 944 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; 945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
909} 953}
910#endif /* MENUBAR_MAX */
911 954
912void 955void
913rxvt_term::flush () 956rxvt_term::flush ()
914{ 957{
915 flush_ev.stop (); 958 flush_ev.stop ();
916 959
917#ifdef TRANSPARENT 960#ifdef HAVE_IMG
918 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
919 { 962 {
920 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
921 scr_clear ();
922 scr_touch (false); 964 scr_touch (false);
923 } 965 }
924#endif 966#endif
925 967
926 if (want_refresh) 968 if (want_refresh)
927 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
928 scr_refresh (refresh_type); 1008 scr_refresh ();
929 scrollbar_show (1); 1009 scrollBar.show (1);
930#ifdef USE_XIM 1010#if USE_XIM
931 IMSendSpot (); 1011 im_send_spot ();
932#endif 1012#endif
933 } 1013 }
934 1014
935 display->flush (); 1015 display->flush ();
936} 1016}
937 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
938void 1019void
939rxvt_term::check_cb (check_watcher &w) 1020rxvt_term::refresh_check ()
940{ 1021{
941 SET_R (this); 1022 if (want_refresh && !flush_ev.is_active ())
942 SET_LOCALE (locale); 1023 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
943 1024
944 display->flush (); 1025 display->flush ();
945
946 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01);
948} 1026}
949 1027
950void 1028void
951rxvt_term::flush_cb (time_watcher &w) 1029rxvt_term::flush_cb (ev::timer &w, int revents)
952{ 1030{
953 SET_R (this); 1031 make_current ();
954 SET_LOCALE (locale);
955 1032
956 refresh_limit = 1;
957 refresh_count = 0; 1033 refresh_count = 0;
958 flush (); 1034 flush ();
959} 1035}
960 1036
961#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
962void 1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (hidden_cursor)
1042 {
1043 hidden_cursor = 0;
1044 want_refresh = 1;
1045 }
1046
1047 if (option (Opt_cursorBlink))
1048 cursor_blink_ev.again ();
1049 else
1050 cursor_blink_ev.stop ();
1051}
1052
1053void
963rxvt_term::cursor_blink_cb (time_watcher &w) 1054rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
964{ 1055{
965 hidden_cursor = !hidden_cursor; 1056 hidden_cursor = !hidden_cursor;
966 want_refresh = 1; 1057 want_refresh = 1;
967 1058 refresh_check ();
968 w.start (w.at + BLINK_INTERVAL);
969} 1059}
970#endif 1060#endif
971 1061
972#ifdef TEXT_BLINK 1062#ifdef TEXT_BLINK
973void 1063void
974rxvt_term::text_blink_cb (time_watcher &w) 1064rxvt_term::text_blink_cb (ev::timer &w, int revents)
975{ 1065{
976 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1066 if (scr_refresh_rend (RS_Blink, RS_Blink))
977 { 1067 {
978 hidden_text = !hidden_text; 1068 hidden_text = !hidden_text;
979 want_refresh = 1; 1069 want_refresh = 1;
980 w.start (w.at + TEXT_BLINK_INTERVAL); 1070 refresh_check ();
981 } 1071 }
1072 else
1073 w.stop ();
982} 1074}
983#endif 1075#endif
984 1076
985#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1077#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
986void 1078void
987rxvt_term::cont_scroll_cb (time_watcher &w) 1079rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
988{ 1080{
989 if ((scrollbar_isUp() || scrollbar_isDn()) && 1081 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
990 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1082 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
991 { 1083 {
992 refresh_type |= SMOOTH_REFRESH;
993 want_refresh = 1; 1084 want_refresh = 1;
994 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1085 refresh_check ();
995 } 1086 }
1087 else
1088 w.stop ();
996} 1089}
997#endif 1090#endif
998 1091
999#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1000void 1093void
1001rxvt_term::sel_scroll_cb (time_watcher &w) 1094rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1002{ 1095{
1003 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1096 if (scr_page (scroll_selection_lines))
1004 { 1097 {
1005 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1098 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1099 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1100 refresh_check ();
1009 } 1101 }
1102 else
1103 w.stop ();
1010} 1104}
1011#endif 1105#endif
1012 1106
1013#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1107#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1014void 1108void
1015rxvt_term::slip_wheel_cb (time_watcher &w) 1109rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1016{ 1110{
1017 if (mouse_slip_wheel_speed == 0 1111 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 { 1112 {
1021 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1113 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1115 }
1116
1117 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1024 } 1118 {
1119 mouse_slip_wheel_speed = 0;
1120 w.stop ();
1121 }
1122}
1123#endif
1124
1125#if LINUX_YIELD_HACK
1126static struct event_handler
1127{
1128 ev::prepare yield_ev;
1129
1130 void yield_cb (ev::prepare &w, int revents)
1131 {
1132 // this should really be sched_yield(), but the linux guys thought
1133 // that giving a process calling sched_yield () less cpu time than
1134 // ones with high nice levels is a useful thing to do. It surely is is
1135 // allowed by the sus... as is returning ENOSYS.
1136 // since the linux guys additionally thought that breaking the only
1137 // known workaround against their unusable sched_yield hack is cool,
1138 // we just nanosleep a bit and hope for the best.
1139
1140 struct timespec ts = { 0, 1000 };
1141 nanosleep (&ts, 0);
1142
1143 w.stop ();
1144 }
1145
1146 event_handler ()
1147 : yield_ev (this, &event_handler::yield_cb)
1148 {
1149 }
1150} event_handler;
1151#endif
1152
1153/* make sure all the cmd data is at beginning of cmdbuf */
1154void
1155rxvt_term::cmdbuf_reify ()
1156{
1157 if (cmdbuf_ptr == cmdbuf_base)
1158 return;
1159
1160 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1161
1162 memmove (cmdbuf_base, cmdbuf_ptr, used);
1163 cmdbuf_ptr = cmdbuf_base;
1164 cmdbuf_endp = cmdbuf_ptr + used;
1165
1166}
1167
1168#if defined (KEYSYM_RESOURCE)
1169void
1170rxvt_term::cmdbuf_append (const char *str, size_t count)
1171{
1172 cmdbuf_reify ();
1173
1174 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1175
1176 if (count > avail)
1177 return;
1178
1179 memcpy (cmdbuf_endp, str, count);
1180 cmdbuf_endp += count;
1181
1182 cmd_parse ();
1025} 1183}
1026#endif 1184#endif
1027 1185
1028bool 1186bool
1029rxvt_term::pty_fill () 1187rxvt_term::pty_fill ()
1030{ 1188{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1189 cmdbuf_reify ();
1032 1190
1033 if (CBUFSIZ == n) 1191 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1034 { 1192
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1193 if (!avail)
1036 n = 0;
1037 } 1194 {
1038 1195 // 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; 1196 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1197 cmdbuf_endp = cmdbuf_ptr;
1198 avail = CBUFSIZ;
1199 }
1042 1200
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1201 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1044 1202
1045 if (n > 0) 1203 if (r > 0)
1046 { 1204 {
1047 cmdbuf_endp += n; 1205 cmdbuf_endp += r;
1048 return true; 1206 return true;
1049 } 1207 }
1050 else if (n < 0 && errno != EAGAIN) 1208 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1209 {
1210#if LINUX_YIELD_HACK
1211 if (display->is_local)
1212 event_handler.yield_ev.start ();
1213#endif
1214 }
1215 else
1216 {
1217 pty_ev.stop ();
1218
1219 if (!option (Opt_hold))
1051 destroy (); 1220 destroy ();
1052 1221 }
1222
1053 return false; 1223 return false;
1054} 1224}
1055 1225
1056void 1226void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1227rxvt_term::pty_cb (ev::io &w, int revents)
1058{ 1228{
1059 SET_R (this); 1229 make_current ();
1060 SET_LOCALE (locale);
1061 1230
1062 if (revents & EVENT_WRITE) 1231 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 1232 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1233 for (int i = CBUFCNT; i-- && pty_fill (); )
1067 if (cmd_parse ()) 1234 cmd_parse ();
1068 break;
1069}
1070 1235
1071void 1236 if (revents & ev::WRITE)
1237 pty_write ();
1238
1239 refresh_check ();
1240}
1241
1242void ecb_cold
1072rxvt_term::pointer_unblank () 1243rxvt_term::pointer_unblank ()
1073{ 1244{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1245 XDefineCursor (dpy, vt, TermWin_cursor);
1075 recolour_cursor (); 1246 recolour_cursor ();
1076 1247
1077#ifdef POINTER_BLANK 1248#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1249 hidden_pointer = 0;
1079 1250
1080 if (options & Opt_pointerBlank) 1251 if (option (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1252 pointer_ev.start (pointerBlankDelay);
1082#endif 1253#endif
1083} 1254}
1084 1255
1085#ifdef POINTER_BLANK 1256#ifdef POINTER_BLANK
1086void 1257void ecb_cold
1087rxvt_term::pointer_blank () 1258rxvt_term::pointer_blank ()
1088{ 1259{
1089 if (! (options & Opt_pointerBlank)) 1260 if (!option (Opt_pointerBlank))
1090 return; 1261 return;
1091 1262
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1263 XDefineCursor (dpy, vt, display->blank_cursor);
1093 XFlush (display->display); 1264 XFlush (dpy);
1094 1265
1095 hidden_pointer = 1; 1266 hidden_pointer = 1;
1096} 1267}
1097 1268
1098void 1269void ecb_cold
1099rxvt_term::pointer_cb (time_watcher &w) 1270rxvt_term::pointer_cb (ev::timer &w, int revents)
1100{ 1271{
1101 SET_R (this); 1272 make_current ();
1102 SET_LOCALE (locale);
1103 1273
1104 pointer_blank (); 1274 pointer_blank ();
1105} 1275}
1106#endif 1276#endif
1107 1277
1108void 1278void
1109rxvt_term::mouse_report (XButtonEvent &ev) 1279rxvt_term::mouse_report (XButtonEvent &ev)
1110{ 1280{
1111 int button_number, key_state = 0; 1281 int button_number, key_state = 0;
1112 int x, y; 1282 int x, y;
1283 int code = 32;
1113 1284
1114 x = ev.x; 1285 x = Pixel2Col (ev.x) + 1;
1115 y = ev.y; 1286 y = Pixel2Row (ev.y) + 1;
1116 pixel_position (&x, &y); 1287
1288 if (ev.type == MotionNotify)
1289 {
1290 if (x == mouse_row && y == mouse_col)
1291 return;
1292
1293 mouse_row = x;
1294 mouse_col = y;
1295 code += 32;
1296 }
1117 1297
1118 if (MEvent.button == AnyButton) 1298 if (MEvent.button == AnyButton)
1119 button_number = 3; 1299 button_number = 3;
1120 else 1300 else
1121 { 1301 {
1122 button_number = MEvent.button - Button1; 1302 button_number = MEvent.button - Button1;
1123 /* add 0x3D for wheel events, like xterm does */ 1303 /* add 0x3D for wheel events, like xterm does */
1124 if (button_number >= 3) 1304 if (button_number >= 3)
1125 button_number += (64 - 3); 1305 button_number += 64 - 3;
1126 } 1306 }
1127 1307
1128 if (priv_modes & PrivMode_MouseX10) 1308 if (priv_modes & PrivMode_MouseX10)
1129 { 1309 {
1130 /* 1310 /*
… …
1162 fputc ('A', stderr); 1342 fputc ('A', stderr);
1163 if (key_state & 32) 1343 if (key_state & 32)
1164 fputc ('2', stderr); 1344 fputc ('2', stderr);
1165 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1166 button_number, 1346 button_number,
1167 x + 1, 1347 x,
1168 y + 1); 1348 y);
1169#endif 1349#endif
1170 1350
1351#if ENABLE_FRILLS
1352 if (priv_modes & PrivMode_ExtMouseRight)
1353 tt_printf ("\033[%d;%d;%dM",
1354 code + button_number + key_state,
1355 x,
1356 y);
1357 else if (priv_modes & PrivMode_ExtModeMouse)
1358 tt_printf ("\033[M%c%lc%lc",
1359 code + button_number + key_state,
1360 wint_t (32 + x),
1361 wint_t (32 + y));
1362 else
1363#endif
1171 tt_printf ("\033[M%c%c%c", 1364 tt_printf ("\033[M%c%c%c",
1172 (32 + button_number + key_state), 1365 code + button_number + key_state,
1173 (32 + x + 1), 1366 32 + x,
1174 (32 + y + 1)); 1367 32 + y);
1175} 1368}
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 1369
1187/*{{{ process an X event */ 1370/*{{{ process an X event */
1188void 1371void ecb_hot
1189rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1190{ 1373{
1191 SET_R (this); 1374 make_current ();
1192 SET_LOCALE (locale);
1193 1375
1194#if defined(CURSOR_BLINK) 1376 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 1377
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1378 if (ev.xany.window == vt
1204 } 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1205#endif 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1381 return;
1206 1382
1207#if defined(POINTER_BLANK) 1383 // 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; 1384 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1386 unsigned int unused_mask;
1224 1387
1225 switch (ev.type) 1388 switch (ev.type)
1226 { 1389 {
1227 case KeyPress: 1390 case KeyPress:
1228#if ISO_14755 1391 key_press (ev.xkey);
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
1231 lookup_key (ev.xkey);
1232
1233 break; 1392 break;
1234 1393
1235 case KeyRelease: 1394 case KeyRelease:
1236 { 1395 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; 1396 break;
1304 }
1305 1397
1306 case ButtonPress: 1398 case ButtonPress:
1307 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1308 break; 1400 break;
1309 1401
… …
1311 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1312 break; 1404 break;
1313 1405
1314 case ClientMessage: 1406 case ClientMessage:
1315 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1408 && !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 { 1409 {
1325 /* Get Dnd data */ 1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1326 Atom ActualType; 1411 {
1327 int ActualFormat; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1328 unsigned char *data; 1413 {
1329 unsigned long Size, RemainingBytes; 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1330 1415 {
1331 XGetWindowProperty (display->display, display->root, 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1332 xa[XA_DNDSELECTION], 1417 destroy ();
1333 0L, 1000000L, 1418 }
1334 False, AnyPropertyType, 1419#if ENABLE_EWMH
1335 &ActualType, &ActualFormat, 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1336 &Size, &RemainingBytes, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1337 &data); 1423 &ev);
1338 XChangeProperty (display->display, display->root, 1424#endif
1339 XA_CUT_BUFFER0, XA_STRING, 1425 }
1340 8, PropModeReplace, 1426 }
1341 data, strlen (data)); 1427#if ENABLE_XEMBED
1342 XFree (data); 1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1429 {
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1345 } 1436 }
1346#endif /* OFFIX_DND */
1347 break;
1348
1349 case MappingNotify:
1350 XRefreshKeyboardMapping (&ev.xmapping);
1351 break; 1437 break;
1352 1438
1353 /* 1439 /*
1354 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1355 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1374 break; 1460 break;
1375 } 1461 }
1376 break; 1462 break;
1377 1463
1378 case FocusIn: 1464 case FocusIn:
1379 if (!TermWin.focus) 1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out ();
1476 break;
1477
1478 case ConfigureNotify:
1479 if (ev.xconfigure.window == parent)
1380 { 1480 {
1381 TermWin.focus = 1; 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1382 want_refresh = 1; 1482 ;
1383#ifdef USE_XIM 1483
1384 if (Input_Context != NULL) 1484 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1485
1486 bool moved = false;
1487#ifdef HAVE_BG_PIXMAP
1488 if (bg_window_position_sensitive ())
1385 { 1489 {
1386 IMSetStatusPosition (); 1490 want_position_change = true;
1387 XSetICFocus (Input_Context); 1491 if (bg_img == 0)
1492 moved = true;
1388 } 1493 }
1389#endif 1494#endif
1390#ifdef CURSOR_BLINK 1495
1391 if (options & Opt_cursorBlink) 1496 if (want_position_change)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 { 1497 {
1397 pix_colors = pix_colors_focused; 1498 int x, y;
1398 scr_recolour (); 1499
1500 if (ev.xconfigure.send_event)
1501 {
1502 x = ev.xconfigure.x;
1503 y = ev.xconfigure.y;
1504 }
1505 else
1506 get_window_origin (x, y);
1507
1508 if (x != parent_x || y != parent_y)
1509 {
1510 parent_x = x;
1511 parent_y = y;
1512 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1513 moved = true;
1514 }
1399 } 1515 }
1400#endif
1401 1516
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) 1517 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1518 {
1451 seen_resize = 1; 1519 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1520 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1521 }
1454 1522 else
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent)
1457 { 1523 {
1458 check_our_parents (); 1524#ifdef HAVE_BG_PIXMAP
1459 if (am_transparent) 1525 if (moved)
1460 want_refresh = want_full_refresh = 1; 1526 update_background ();
1527#endif
1461 } 1528 }
1462#endif 1529
1530 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1531 }
1464 break; 1532 break;
1465 1533
1466 case PropertyNotify: 1534 case PropertyNotify:
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1535 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; 1536 break;
1472 1537
1473 case SelectionClear: 1538 case SelectionClear:
1474 selection_clear (); 1539 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; 1540 break;
1482 1541
1483 case SelectionRequest: 1542 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1543 selection_send (ev.xselectionrequest);
1485 break; 1544 break;
1486 1545
1546 case MapNotify:
1547#ifdef HAVE_BG_PIXMAP
1548 // This is needed at startup for the case of no window manager
1549 // or a non-reparenting window manager and also because we
1550 // defer bg image updates if the window is not mapped. The
1551 // short delay is to optimize for multiple ConfigureNotify
1552 // events at startup when the window manager reparents the
1553 // window, so as to perform the computation after we have
1554 // received all of them.
1555 if (bg_img == 0)
1556 update_background_ev.start (0.025);
1557#endif
1558 mapped = 1;
1559#ifdef TEXT_BLINK
1560 text_blink_ev.start ();
1561#endif
1562 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1563 break;
1564
1487 case UnmapNotify: 1565 case UnmapNotify:
1488 TermWin.mapped = 0; 1566 mapped = 0;
1489#ifdef TEXT_BLINK 1567#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1568 text_blink_ev.stop ();
1491#endif 1569#endif
1570 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1571 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 1572
1507 case GraphicsExpose: 1573 case GraphicsExpose:
1508 case Expose: 1574 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == vt)
1510 { 1576 {
1511 do 1577 do
1578 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1581 }
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1582 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1583
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1584 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1585
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1587 {
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1588 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1589 ev.xexpose.width, ev.xexpose.height, false);
1590 }
1521 1591
1522 scr_refresh (refresh_type); 1592 want_refresh = 1;
1523 } 1593 }
1524 else 1594 else
1525 { 1595 {
1526 XEvent unused_event; 1596 XEvent unused_event;
1527 1597
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1599 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1600 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1601 ;
1532 1602
1533 if (isScrollbarWindow (ev.xany.window)) 1603 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1604 {
1535 scrollBar.setIdle (); 1605 scrollBar.state = SB_STATE_IDLE;
1536 scrollbar_show (0); 1606 scrollBar.show (0);
1537 } 1607 }
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 } 1608 }
1548 break; 1609 break;
1549 1610
1550 case MotionNotify: 1611 case MotionNotify:
1551#ifdef POINTER_BLANK 1612#ifdef POINTER_BLANK
1552 if (hidden_pointer) 1613 if (hidden_pointer)
1553 pointer_unblank (); 1614 pointer_unblank ();
1554#endif 1615#endif
1555#if MENUBAR 1616 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1556 if (isMenuBarWindow (ev.xany.window)) 1617 || priv_modes & PrivMode_MouseAnyEvent)
1557 {
1558 menubar_control (ev.xbutton); 1618 mouse_report (ev.xbutton);
1559 break;
1560 }
1561#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1619 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1620 break;
1564 1621
1565 if (ev.xany.window == TermWin.vt) 1622 if (ev.xany.window == vt)
1566 { 1623 {
1624 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1628 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1629 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1570 ; 1630 ;
1571 1631
1572 XQueryPointer (display->display, TermWin.vt, 1632 XQueryPointer (dpy, vt,
1573 &unused_root, &unused_child, 1633 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1634 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1635 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1636 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1637#ifdef MOUSE_THRESHOLD
… …
1589#endif 1649#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1650 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1651 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1652
1593#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1656 {
1657 page_dirn scroll_selection_dir;
1597 int dist; 1658 int dist;
1598 1659
1599 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
1601 */ 1662 */
1602 if (!sel_scroll_ev.active) 1663 if (!sel_scroll_ev.is_active ())
1603 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1664 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1604 1665
1605 /* save the event params so we can highlight 1666 /* save the event params so we can highlight
1606 * the selection in the pending-scroll loop 1667 * the selection in the pending-scroll loop
1607 */ 1668 */
1608 selection_save_x = ev.xbutton.x; 1669 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1670 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1671 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1672
1612 /* calc number of lines to scroll */ 1673 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1674 if (ev.xbutton.y < int_bwidth)
1614 { 1675 {
1615 scroll_selection_dir = UP; 1676 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1617 } 1678 }
1618 else 1679 else
1619 { 1680 {
1620 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1682 dist = ev.xbutton.y - (int_bwidth + vt_height);
1622 } 1683 }
1623 1684
1624 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1687 + 1;
1627 MIN_IT (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1690 scroll_selection_lines *= scroll_selection_dir;
1629 } 1691 }
1630 else 1692 else
1631 { 1693 {
1632 /* we are within the text window, so we 1694 /* we are within the text window, so we
1633 * shouldn't be scrolling 1695 * shouldn't be scrolling
1634 */ 1696 */
1635 if (sel_scroll_ev.active)
1636 sel_scroll_ev.stop(); 1697 sel_scroll_ev.stop();
1637 } 1698 }
1638#endif 1699#endif
1639#ifdef MOUSE_THRESHOLD 1700#ifdef MOUSE_THRESHOLD
1640 } 1701 }
1641#endif 1702#endif
1642 } 1703 }
1643 } 1704 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1645 { 1706 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1647 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1648 ; 1709 ;
1649 1710
1650 XQueryPointer (display->display, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1651 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1715 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1656 scrollbar_size ()); 1717 scrollBar.size ());
1657 scr_refresh (refresh_type);
1658 refresh_limit = 0; 1718 want_refresh = 1;
1659 scrollbar_show (1); 1719 scrollBar.show (1);
1660 } 1720 }
1661 break; 1721 break;
1662 } 1722 }
1663}
1664 1723
1665#if TRANSPARENT 1724#if defined(CURSOR_BLINK)
1666void 1725 if (ev.type == KeyPress)
1726 cursor_blink_reset ();
1727#endif
1728
1729#if defined(POINTER_BLANK)
1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1731 {
1732 if (ev.type == MotionNotify
1733 || ev.type == ButtonPress
1734 || ev.type == ButtonRelease)
1735 if (hidden_pointer)
1736 pointer_unblank ();
1737
1738 if (ev.type == KeyPress && hidden_pointer == 0)
1739 pointer_blank ();
1740 }
1741#endif
1742
1743 refresh_check ();
1744}
1745
1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1764rxvt_term::focus_in ()
1765{
1766 if (!focus)
1767 {
1768 focus = 1;
1769 want_refresh = 1;
1770
1771#if USE_XIM
1772 if (Input_Context != NULL)
1773 {
1774 im_set_position ();
1775 XSetICFocus (Input_Context);
1776 }
1777#endif
1778#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.again ();
1781#endif
1782#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade])
1784 {
1785 pix_colors = pix_colors_focused;
1786 scr_recolour ();
1787 }
1788#endif
1789#if ENABLE_FRILLS
1790 if (option (Opt_urgentOnBell))
1791 set_urgency (0);
1792#endif
1793
1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 }
1796}
1797
1798void ecb_cold
1799rxvt_term::focus_out ()
1800{
1801 if (focus)
1802 {
1803 focus = 0;
1804 want_refresh = 1;
1805
1806#if ENABLE_FRILLS
1807 if (option (Opt_urgentOnBell))
1808 set_urgency (0);
1809#endif
1810#if ENABLE_FRILLS || ISO_14755
1811 if (iso14755buf)
1812 {
1813 iso14755buf = 0;
1814# if ISO_14755
1815 scr_overlay_off ();
1816# endif
1817 }
1818#endif
1819#if USE_XIM
1820 if (Input_Context != NULL)
1821 XUnsetICFocus (Input_Context);
1822#endif
1823#if CURSOR_BLINK
1824 if (option (Opt_cursorBlink))
1825 cursor_blink_ev.stop ();
1826
1827 hidden_cursor = 0;
1828#endif
1829#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade])
1831 {
1832 pix_colors = pix_colors_unfocused;
1833 scr_recolour ();
1834 }
1835#endif
1836
1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1838 }
1839}
1840
1841void ecb_cold
1842rxvt_term::update_fade_color (unsigned int idx)
1843{
1844#if OFF_FOCUS_FADING
1845 if (rs[Rs_fade])
1846 {
1847 rgba c;
1848 pix_colors [Color_fade].get (c);
1849 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1850 }
1851#endif
1852}
1853
1854#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1855void ecb_hot
1667rxvt_term::rootwin_cb (XEvent &ev) 1856rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1857{
1669 SET_R (this); 1858 make_current ();
1670 SET_LOCALE (locale); 1859
1860 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1861 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1862 return;
1671 1863
1672 switch (ev.type) 1864 switch (ev.type)
1673 { 1865 {
1674 case PropertyNotify: 1866 case PropertyNotify:
1675 /* 1867 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1868 * 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. 1869 * use the property to determine the pixmap. We use it later on.
1678 */ 1870 */
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]) 1871 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1683 return; 1872 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1873 {
1874#if BG_IMAGE_FROM_ROOT
1875 if (option (Opt_transparent))
1876 {
1877 rxvt_img::new_from_root (this)->replace (root_img);
1878 update_background ();
1879 }
1880#endif
1881 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1882 }
1684 1883
1685 /* FALLTHROUGH */
1686 case ReparentNotify:
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1688 want_refresh = want_full_refresh = 1;
1689 break; 1884 break;
1690 } 1885 }
1886
1887 refresh_check ();
1691} 1888}
1692#endif 1889#endif
1693 1890
1694void 1891void
1695rxvt_term::button_press (XButtonEvent &ev) 1892rxvt_term::button_press (XButtonEvent &ev)
1696{ 1893{
1697 int reportmode = 0, clickintime; 1894 int reportmode = 0, clickintime;
1698 1895
1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1896 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1897
1700 if (!bypass_keystate) 1898 if (!bypass_keystate)
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1899 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1900
1703 /* 1901 /*
1704 * VT window processing of button press 1902 * VT window processing of button press
1705 */ 1903 */
1706 if (ev.window == TermWin.vt) 1904 if (ev.window == vt)
1707 { 1905 {
1906 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1907 return;
1908
1708#if ISO_14755 1909#if ISO_14755
1709 // 5.4 1910 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1911 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1912 {
1712 iso14755_54 (ev.x, ev.y); 1913 iso14755_54 (ev.x, ev.y);
… …
1722 /* save the xbutton state (for ButtonRelease) */ 1923 /* save the xbutton state (for ButtonRelease) */
1723 MEvent.state = ev.state; 1924 MEvent.state = ev.state;
1724#ifdef MOUSE_REPORT_DOUBLECLICK 1925#ifdef MOUSE_REPORT_DOUBLECLICK
1725 if (ev.button == MEvent.button && clickintime) 1926 if (ev.button == MEvent.button && clickintime)
1726 { 1927 {
1727 /* same button, within alloted time */ 1928 /* same button, within allowed time */
1728 MEvent.clicks++; 1929 MEvent.clicks++;
1930
1729 if (MEvent.clicks > 1) 1931 if (MEvent.clicks > 1)
1730 { 1932 {
1731 /* only report double clicks */ 1933 /* only report double clicks */
1732 MEvent.clicks = 2; 1934 MEvent.clicks = 2;
1733 mouse_report (ev); 1935 mouse_report (ev);
… …
1745 mouse_report (ev); 1947 mouse_report (ev);
1746 } 1948 }
1747#else 1949#else
1748 MEvent.button = ev.button; 1950 MEvent.button = ev.button;
1749 mouse_report (ev); 1951 mouse_report (ev);
1750#endif /* MOUSE_REPORT_DOUBLECLICK */ 1952#endif /* MOUSE_REPORT_DOUBLECLICK */
1751 1953
1752 } 1954 }
1753 else 1955 else
1754 { 1956 {
1755 if (ev.button != MEvent.button) 1957 if (ev.button != MEvent.button)
… …
1759 { 1961 {
1760 case Button1: 1962 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1963 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1964 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1965#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1966 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1967#else
1766 selection.rect = false; 1968 selection.rect = false;
1767#endif 1969#endif
1768 1970
1769 /* allow shift+left click to extend selection */ 1971 /* allow shift+left click to extend selection */
1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1972 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1771 { 1973 {
1772 if (MEvent.button == Button1 && clickintime) 1974 if (MEvent.button == Button1 && clickintime)
1773 selection_rotate (ev.x, ev.y); 1975 selection_rotate (ev.x, ev.y);
1774 else 1976 else
1775 selection_extend (ev.x, ev.y, 1); 1977 selection_extend (ev.x, ev.y, 1);
… …
1803 } 2005 }
1804 2006
1805 /* 2007 /*
1806 * Scrollbar window processing of button press 2008 * Scrollbar window processing of button press
1807 */ 2009 */
1808 if (isScrollbarWindow (ev.window)) 2010 if (scrollBar.state && ev.window == scrollBar.win)
1809 { 2011 {
1810 scrollBar.setIdle (); 2012 page_dirn direction = NO_DIR;
2013
2014 if (scrollBar.upButton (ev.y))
2015 direction = UP; /* up */
2016 else if (scrollBar.dnButton (ev.y))
2017 direction = DN; /* down */
2018
2019 scrollBar.state = SB_STATE_IDLE;
1811 /* 2020 /*
1812 * Rxvt-style scrollbar: 2021 * Rxvt-style scrollbar:
1813 * move up if mouse is above slider 2022 * move up if mouse is above slider
1814 * move dn if mouse is below slider 2023 * move dn if mouse is below slider
1815 * 2024 *
… …
1824 /* 2033 /*
1825 * Mouse report disabled scrollbar: 2034 * Mouse report disabled scrollbar:
1826 * arrow buttons - send up/down 2035 * arrow buttons - send up/down
1827 * click on scrollbar - send pageup/down 2036 * click on scrollbar - send pageup/down
1828 */ 2037 */
1829 if ((scrollBar.style == R_SB_NEXT 2038 if (direction == UP)
1830 && scrollbarnext_upButton (ev.y))
1831 || (scrollBar.style == R_SB_RXVT
1832 && scrollbarrxvt_upButton (ev.y)))
1833 tt_printf ("\033[A"); 2039 tt_printf ("\033[A");
1834 else if ((scrollBar.style == R_SB_NEXT 2040 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"); 2041 tt_printf ("\033[B");
1839 else 2042 else
1840 switch (ev.button) 2043 switch (ev.button)
1841 { 2044 {
1842 case Button2: 2045 case Button2:
… …
1849 tt_printf ("\033[5~"); 2052 tt_printf ("\033[5~");
1850 break; 2053 break;
1851 } 2054 }
1852 } 2055 }
1853 else 2056 else
1854#endif /* NO_SCROLLBAR_REPORT */ 2057#endif /* NO_SCROLLBAR_REPORT */
1855
1856 {
1857 char upordown = 0;
1858
1859 if (scrollBar.style == R_SB_NEXT)
1860 { 2058 {
1861 if (scrollbarnext_upButton (ev.y)) 2059 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 { 2060 {
1875#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2061#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2062 if (!cont_scroll_ev.is_active ())
1876 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2063 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1877#endif 2064#endif
1878 if (scr_page (upordown < 0 ? UP : DN, 1)) 2065 if (scr_page (direction, 1))
1879 { 2066 {
1880 if (upordown < 0) 2067 if (direction == UP)
1881 scrollBar.setUp (); 2068 scrollBar.state = SB_STATE_UP;
1882 else 2069 else
1883 scrollBar.setDn (); 2070 scrollBar.state = SB_STATE_DOWN;
1884 } 2071 }
1885 } 2072 }
1886 else 2073 else
1887 switch (ev.button) 2074 switch (ev.button)
1888 { 2075 {
1889 case Button2: 2076 case Button2:
1890 switch (scrollbar_align) 2077 switch (scrollBar.align)
1891 { 2078 {
1892 case R_SB_ALIGN_TOP: 2079 case SB_ALIGN_TOP:
1893 csrO = 0; 2080 csrO = 0;
1894 break; 2081 break;
1895 case R_SB_ALIGN_CENTRE: 2082 case SB_ALIGN_CENTRE:
1896 csrO = (scrollBar.bot - scrollBar.top) / 2; 2083 csrO = (scrollBar.bot - scrollBar.top) / 2;
1897 break; 2084 break;
1898 case R_SB_ALIGN_BOTTOM: 2085 case SB_ALIGN_BOTTOM:
1899 csrO = scrollBar.bot - scrollBar.top; 2086 csrO = scrollBar.bot - scrollBar.top;
1900 break; 2087 break;
1901 } 2088 }
1902 2089
1903 if (scrollBar.style == R_SB_XTERM 2090 if (scrollBar.style == SB_STYLE_XTERM
1904 || scrollbar_above_slider (ev.y) 2091 || scrollBar.above_slider (ev.y)
1905 || scrollbar_below_slider (ev.y)) 2092 || scrollBar.below_slider (ev.y))
1906 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2093 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1907 2094
1908 scrollBar.setMotion (); 2095 scrollBar.state = SB_STATE_MOTION;
1909 break; 2096 break;
1910 2097
1911 case Button1: 2098 case Button1:
1912 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2099 if (scrollBar.align == SB_ALIGN_CENTRE)
1913 csrO = ev.y - scrollBar.top; 2100 csrO = ev.y - scrollBar.top;
1914 /* FALLTHROUGH */ 2101 /* FALLTHROUGH */
1915 2102
1916 case Button3: 2103 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 2104 if (scrollBar.style != SB_STYLE_XTERM)
1918 { 2105 {
1919 if (scrollbar_above_slider (ev.y)) 2106 if (scrollBar.above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2107# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 2108 scr_page (UP, nrow - 1);
1922# else 2109# else
1923 scr_page (UP, TermWin.nrow / 4); 2110 scr_page (UP, nrow / 4);
1924# endif 2111# endif
1925 else if (scrollbar_below_slider (ev.y)) 2112 else if (scrollBar.below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 2113# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2114 scr_page (DN, nrow - 1);
1928# else 2115# else
1929 scr_page (DN, TermWin.nrow / 4); 2116 scr_page (DN, nrow / 4);
1930# endif 2117# endif
1931 else 2118 else
1932 scrollBar.setMotion (); 2119 scrollBar.state = SB_STATE_MOTION;
1933 } 2120 }
1934 else 2121 else
1935 { 2122 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2123 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2124 (nrow
1938 * scrollbar_position (ev.y) 2125 * scrollBar.position (ev.y)
1939 / scrollbar_size ())); 2126 / scrollBar.size ()));
1940 } 2127 }
1941 2128
1942 break; 2129 break;
1943 } 2130 }
1944 } 2131 }
2132
1945 return; 2133 return;
1946 } 2134 }
1947#if MENUBAR
1948 /*
1949 * Menubar window processing of button press
1950 */
1951 if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2135}
1955 2136
1956void 2137void
1957rxvt_term::button_release (XButtonEvent &ev) 2138rxvt_term::button_release (XButtonEvent &ev)
1958{ 2139{
… …
1960 2141
1961 csrO = 0; /* reset csr Offset */ 2142 csrO = 0; /* reset csr Offset */
1962 if (!bypass_keystate) 2143 if (!bypass_keystate)
1963 reportmode = !! (priv_modes & PrivMode_mouse_report); 2144 reportmode = !! (priv_modes & PrivMode_mouse_report);
1964 2145
1965 if (scrollbar_isUpDn ()) 2146 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1966 { 2147 {
1967 scrollBar.setIdle (); 2148 scrollBar.state = SB_STATE_IDLE;
1968 scrollbar_show (0); 2149 scrollBar.show (0);
1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1970 refresh_type &= ~SMOOTH_REFRESH;
1971#endif
1972 } 2150 }
1973 2151
1974#ifdef SELECTION_SCROLLING 2152#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2153 sel_scroll_ev.stop();
1977#endif 2154#endif
1978 2155
1979 if (ev.window == TermWin.vt) 2156 if (ev.window == vt)
1980 { 2157 {
2158 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2159 return;
2160
1981#if ISO_14755 2161#if ISO_14755
1982 // 5.4 2162 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2163 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2164 return;
1985#endif 2165#endif
2166
1986 if (reportmode) 2167 if (reportmode)
1987 { 2168 {
1988 /* mouse report from vt window */ 2169 /* mouse report from vt window */
1989 /* don't report release of wheel "buttons" */ 2170 /* don't report release of wheel "buttons" */
1990 if (ev.button >= 4) 2171 if (ev.button >= 4)
… …
2001 mouse_report (ev); 2182 mouse_report (ev);
2002 } 2183 }
2003#else /* MOUSE_REPORT_DOUBLECLICK */ 2184#else /* MOUSE_REPORT_DOUBLECLICK */
2004 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2005 mouse_report (ev); 2186 mouse_report (ev);
2006#endif /* MOUSE_REPORT_DOUBLECLICK */ 2187#endif /* MOUSE_REPORT_DOUBLECLICK */
2007 return; 2188 return;
2008 } 2189 }
2009 2190
2010 /* 2191 /*
2011 * dumb hack to compensate for the failure of click-and-drag 2192 * dumb hack to compensate for the failure of click-and-drag
… …
2020 { 2201 {
2021 case Button1: 2202 case Button1:
2022 case Button3: 2203 case Button3:
2023 selection_make (ev.time); 2204 selection_make (ev.time);
2024 break; 2205 break;
2206
2025 case Button2: 2207 case Button2:
2026 selection_request (ev.time, ev.x, ev.y); 2208 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2209 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2027 break; 2210 break;
2211
2028#ifdef MOUSE_WHEEL 2212#ifdef MOUSE_WHEEL
2029 case Button4: 2213 case Button4:
2030 case Button5: 2214 case Button5:
2031 { 2215 {
2032 int i; 2216 int lines;
2033 page_dirn v; 2217 page_dirn dirn;
2034 2218
2035 v = ev.button == Button4 ? UP : DN; 2219 dirn = ev.button == Button4 ? UP : DN;
2036 2220
2037 if (ev.state & ShiftMask) 2221 if (ev.state & ShiftMask)
2038 i = 1; 2222 lines = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2223 else if (option (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2224 lines = nrow - 1;
2041 else 2225 else
2042 i = 5; 2226 lines = 5;
2043 2227
2044# ifdef MOUSE_SLIP_WHEELING 2228# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2229 if (ev.state & ControlMask)
2046 { 2230 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2231 mouse_slip_wheel_speed += dirn;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2232 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2050 2233
2051 if (slip_wheel_ev.at < NOW) 2234 if (!slip_wheel_ev.is_active ())
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2235 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2053
2054 slip_wheel_ev.start ();
2055 } 2236 }
2056 else 2237 else
2238# endif
2057 { 2239 {
2058# endif
2059# ifdef JUMP_MOUSE_WHEEL
2060 scr_page (v, i); 2240 scr_page (dirn, lines);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1); 2241 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 } 2242 }
2073#endif
2074 } 2243 }
2075 break; 2244 break;
2076#endif 2245#endif
2077 } 2246 }
2078 } 2247 }
2079#ifdef MENUBAR
2080 else if (isMenuBarWindow (ev.window))
2081 menubar_control (ev);
2082#endif
2083} 2248}
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 2249
2554/*}}} */ 2250/*}}} */
2555 2251
2556bool 2252void ecb_hot
2557rxvt_term::cmd_parse () 2253rxvt_term::cmd_parse ()
2558{ 2254{
2559 bool flag = false;
2560 unicode_t ch = NOCHAR; 2255 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2256 char *seq_begin; // remember start of esc-sequence here
2562 2257
2563 for (;;) 2258 for (;;)
2564 { 2259 {
2565 if (ch == NOCHAR) 2260 if (ecb_unlikely (ch == NOCHAR))
2566 { 2261 {
2567 seq_begin = cmdbuf_ptr; 2262 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2263 ch = next_char ();
2569 }
2570 2264
2571 if (ch == NOCHAR) // TODO: improve 2265 if (ch == NOCHAR)
2572 break; 2266 break;
2267 }
2573 2268
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2269 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2575 { 2270 {
2576 if (!seen_input) 2271 if (ecb_unlikely (!seen_input))
2577 { 2272 {
2578 seen_input = 1; 2273 seen_input = 1;
2579 // many badly-written programs (e.g. jed) contain a race condition: 2274 // many badly-written programs (e.g. jed) contain a race condition:
2580 // they first read the screensize and then install a SIGWINCH handler. 2275 // they first read the screensize and then install a SIGWINCH handler.
2581 // some window managers resize the window early, and these programs 2276 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2277 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2278 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2279 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2280 // resized.
2586 if (seen_resize) 2281 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2282 kill (-cmd_pid, SIGWINCH);
2588 } 2283 }
2589 2284
2590 /* Read a text string from the input buffer */ 2285 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2286 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2287 bool refreshnow = false;
2593 int nlines = 0; 2288 int nlines = 0;
2594 unicode_t *str = buf; 2289 wchar_t *str = buf;
2290 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2291
2596 for (;;) 2292 for (;;)
2597 { 2293 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2294 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2599 break; 2295 break;
2600 2296
2601 *str++ = ch; 2297 *str++ = ch;
2602 2298
2603 if (ch == C0_LF) 2299 if (ecb_unlikely (ch == C0_LF || str >= eol))
2604 { 2300 {
2301 if (ch == C0_LF)
2605 nlines++; 2302 nlines++;
2303
2606 refresh_count++; 2304 refresh_count++;
2607 2305
2608 if (!(options & Opt_jumpScroll) 2306 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2610 { 2307 {
2308 refresh_count = 0;
2309
2310 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2311 {
2611 refreshnow = true; 2312 refreshnow = true;
2612 ch = NOCHAR; 2313 ch = NOCHAR;
2613 break; 2314 break;
2315 }
2614 } 2316 }
2615 2317
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2318 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2319 if (nlines >= nrow - 1)
2618 { 2320 {
2321 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2322 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2619 scr_add_lines (buf, nlines, str - buf); 2323 scr_add_lines (buf, str - buf, nlines);
2324
2620 nlines = 0; 2325 nlines = 0;
2621 str = buf; 2326 str = buf;
2327 eol = str + min (ncol, UBUFSIZ);
2622 } 2328 }
2623 }
2624 2329
2625 if (str >= buf + UBUFSIZ) 2330 if (str >= eol)
2626 { 2331 {
2332 if (eol >= buf + UBUFSIZ)
2333 {
2627 ch = NOCHAR; 2334 ch = NOCHAR;
2628 break; 2335 break;
2336 }
2337 else
2338 eol = min (eol + ncol, buf + UBUFSIZ);
2339 }
2340
2629 } 2341 }
2630 2342
2631 seq_begin = cmdbuf_ptr; 2343 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2344 ch = next_char ();
2633 } 2345 }
2634 2346
2347 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2348 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2635 scr_add_lines (buf, nlines, str - buf); 2349 scr_add_lines (buf, str - buf, nlines);
2636 2350
2637 /* 2351 /*
2638 * If there have been a lot of new lines, then update the screen 2352 * 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. 2353 * 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 2354 * if skipScroll is enabled.
2641 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2355 */
2643 if (refreshnow) 2356 if (refreshnow)
2644 { 2357 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++;
2647 else
2648 {
2649 flag = true;
2650 scr_refresh (refresh_type); 2358 scr_refresh ();
2651 } 2359 want_refresh = 1;
2652 } 2360 }
2653
2654 } 2361 }
2655 else 2362 else
2656 { 2363 {
2657 try 2364 try
2658 { 2365 {
… …
2666 } 2373 }
2667 2374
2668 ch = NOCHAR; 2375 ch = NOCHAR;
2669 } 2376 }
2670 } 2377 }
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} 2378}
2683 2379
2684// read the next character 2380// read the next character
2685unicode_t 2381wchar_t ecb_hot
2686rxvt_term::next_char () 2382rxvt_term::next_char () NOTHROW
2687{ 2383{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2384 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2385 {
2690 // assume 7-bit to be ascii ALWAYS 2386 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2387 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2692 return *cmdbuf_ptr++; 2388 return *cmdbuf_ptr++;
2693 2389
2694 wchar_t wc; 2390 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2391 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2392
2697 if (len == (size_t)-2) 2393 if (len == (size_t)-2)
2698 { 2394 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2395 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2396 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2397 break;
2702 } 2398 }
2703 2399
2704 if (len == (size_t)-1) 2400 if (len == (size_t)-1)
2401 {
2402 mbstate.reset (); // reset now undefined conversion state
2403 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2404 // 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 2405 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2406 }
2706 2407
2707 // assume wchar == unicode 2408 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2409 cmdbuf_ptr += len;
2709 return wc; 2410 return wc & UNICODE_MASK;
2710 } 2411 }
2711 2412
2712 return NOCHAR; 2413 return NOCHAR;
2713} 2414}
2714 2415
2715/* rxvt_cmd_getc () - Return next input character */ 2416// read the next octet
2716/* 2417uint32_t ecb_hot
2717 * Return the next input character after first passing any keyboard input 2418rxvt_term::next_octet () NOTHROW
2718 * to the command.
2719 */
2720unicode_t
2721rxvt_term::cmd_getc ()
2722{ 2419{
2420 return cmdbuf_ptr < cmdbuf_endp
2421 ? (unsigned char)*cmdbuf_ptr++
2422 : NOCHAR;
2423}
2424
2425static class out_of_input out_of_input;
2426
2427wchar_t ecb_hot
2428rxvt_term::cmd_getc () THROW ((class out_of_input))
2429{
2723 unicode_t c = next_char (); 2430 wchar_t c = next_char ();
2724 2431
2725 if (c == NOCHAR) 2432 if (c == NOCHAR)
2726 throw out_of_input; 2433 throw out_of_input;
2727 2434
2728 return c; 2435 return c;
2729} 2436}
2730 2437
2731unicode_t 2438uint32_t ecb_hot
2732rxvt_term::cmd_get8 () 2439rxvt_term::cmd_get8 () THROW ((class out_of_input))
2733{ 2440{
2734 unicode_t c = next_octet (); 2441 uint32_t c = next_octet ();
2735 2442
2736 if (c == NOCHAR) 2443 if (c == NOCHAR)
2737 throw out_of_input; 2444 throw out_of_input;
2738 2445
2739 return c; 2446 return c;
2740} 2447}
2741 2448
2742/*{{{ print pipe */ 2449/*{{{ print pipe */
2743/*----------------------------------------------------------------------*/ 2450/*----------------------------------------------------------------------*/
2744#ifdef PRINTPIPE 2451#ifdef PRINTPIPE
2745FILE * 2452FILE * ecb_cold
2746rxvt_term::popen_printer () 2453rxvt_term::popen_printer ()
2747{ 2454{
2748 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2455 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2749 2456
2750 if (stream == NULL) 2457 if (stream == NULL)
2751 rxvt_warn ("can't open printer pipe, not printing.\n"); 2458 rxvt_warn ("can't open printer pipe, not printing.\n");
2752 2459
2753 return stream; 2460 return stream;
2754} 2461}
2755 2462
2756int 2463int ecb_cold
2757rxvt_term::pclose_printer (FILE *stream) 2464rxvt_term::pclose_printer (FILE *stream)
2758{ 2465{
2759 fflush (stream); 2466 fflush (stream);
2760 return pclose (stream); 2467 return pclose (stream);
2761} 2468}
2762 2469
2763/* 2470/*
2764 * simulate attached vt100 printer 2471 * simulate attached vt100 printer
2765 */ 2472 */
2766void 2473void ecb_cold
2767rxvt_term::process_print_pipe () 2474rxvt_term::process_print_pipe ()
2768{ 2475{
2769 int done; 2476 FILE *fd = popen_printer ();
2770 FILE *fd;
2771 2477
2772 if ((fd = popen_printer ()) == NULL) 2478 if (!fd)
2773 return; 2479 return;
2774 2480
2775 /* 2481 /*
2776 * Send all input to the printer until either ESC[4i or ESC[?4i 2482 * Send all input to the printer until either ESC[4i or ESC[?4i
2777 * is received. 2483 * is received.
2778 */ 2484 */
2779 for (done = 0; !done;) 2485 for (int done = 0; !done; )
2780 { 2486 {
2781 unsigned char buf[8]; 2487 unsigned char buf[8];
2782 unicode_t ch; 2488 unicode_t ch;
2783 unsigned int i, len; 2489 unsigned int i, len;
2784 2490
… …
2803 { 2509 {
2804 if ((buf[len++] = cmd_getc ()) == 'i') 2510 if ((buf[len++] = cmd_getc ()) == 'i')
2805 break; /* done = 1 */ 2511 break; /* done = 1 */
2806 } 2512 }
2807 } 2513 }
2808 2514
2809 for (i = 0; i < len; i++) 2515 for (i = 0; i < len; i++)
2810 if (putc (buf[i], fd) == EOF) 2516 if (putc (buf[i], fd) == EOF)
2811 { 2517 {
2812 done = 1; 2518 done = 1;
2813 break; 2519 break;
… …
2815 } 2521 }
2816 } 2522 }
2817 2523
2818 pclose_printer (fd); 2524 pclose_printer (fd);
2819} 2525}
2820#endif /* PRINTPIPE */ 2526#endif /* PRINTPIPE */
2821/*}}} */ 2527/*}}} */
2822 2528
2823/* *INDENT-OFF* */
2824enum { 2529enum {
2825 C1_40 = 0x40, 2530 C1_40 = 0x40,
2826 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2531 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, 2532 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, 2533 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, 2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2830}; 2535};
2831/* *INDENT-ON* */
2832 2536
2833/*{{{ process non-printing single characters */ 2537/*{{{ process non-printing single characters */
2834void 2538void ecb_hot
2835rxvt_term::process_nonprinting (unicode_t ch) 2539rxvt_term::process_nonprinting (unicode_t ch)
2836{ 2540{
2837 switch (ch) 2541 switch (ch)
2838 { 2542 {
2839 case C0_ESC: 2543 case C0_ESC:
2840 process_escape_seq (); 2544 process_escape_seq ();
2841 break; 2545 break;
2842 case C0_ENQ: /* terminal Status */ 2546 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 2547 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2548 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 2549 else
2847 tt_write ((unsigned char *)VT100_ANS, 2550 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 2551 break;
2850 case C0_BEL: /* bell */ 2552 case C0_BEL: /* bell */
2851 scr_bell (); 2553 scr_bell ();
2852 break; 2554 break;
2853 case C0_BS: /* backspace */ 2555 case C0_BS: /* backspace */
… …
2877 process_dcs_seq (); 2579 process_dcs_seq ();
2878 break; 2580 break;
2879 case 0x9b: /* CSI */ 2581 case 0x9b: /* CSI */
2880 process_csi_seq (); 2582 process_csi_seq ();
2881 break; 2583 break;
2882 case 0x9d: /* CSI */ 2584 case 0x9d: /* OSC */
2883 process_osc_seq (); 2585 process_osc_seq ();
2884 break; 2586 break;
2885#endif 2587#endif
2886 } 2588 }
2887} 2589}
2888/*}}} */ 2590/*}}} */
2889 2591
2890 2592
2891/*{{{ process VT52 escape sequences */ 2593/*{{{ process VT52 escape sequences */
2892void 2594void ecb_cold
2893rxvt_term::process_escape_vt52 (unicode_t ch) 2595rxvt_term::process_escape_vt52 (unicode_t ch)
2894{ 2596{
2895 int row, col; 2597 int row, col;
2896 2598
2897 switch (ch) 2599 switch (ch)
… …
2931 break; 2633 break;
2932 case 'Z': /* identify the terminal type */ 2634 case 'Z': /* identify the terminal type */
2933 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2635 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2934 break; 2636 break;
2935 case '<': /* turn off VT52 mode */ 2637 case '<': /* turn off VT52 mode */
2936 PrivMode (0, PrivMode_vt52); 2638 priv_modes &= ~PrivMode_vt52;
2937 break; 2639 break;
2938 case 'F': /* use special graphics character set */ 2640 case 'F': /* use special graphics character set */
2939 case 'G': /* use regular character set */ 2641 case 'G': /* use regular character set */
2940 /* unimplemented */ 2642 /* unimplemented */
2941 break; 2643 break;
… …
2947} 2649}
2948/*}}} */ 2650/*}}} */
2949 2651
2950 2652
2951/*{{{ process escape sequences */ 2653/*{{{ process escape sequences */
2952void 2654void ecb_hot
2953rxvt_term::process_escape_seq () 2655rxvt_term::process_escape_seq ()
2954{ 2656{
2955 unicode_t ch = cmd_getc (); 2657 unicode_t ch = cmd_getc ();
2956 2658
2957 if (priv_modes & PrivMode_vt52) 2659 if (priv_modes & PrivMode_vt52)
… …
2960 return; 2662 return;
2961 } 2663 }
2962 2664
2963 switch (ch) 2665 switch (ch)
2964 { 2666 {
2965 /* case 1: do_tek_mode (); break; */
2966 case '#': 2667 case '#':
2967 if (cmd_getc () == '8') 2668 if (cmd_getc () == '8')
2968 scr_E (); 2669 scr_E ();
2969 break; 2670 break;
2970 case '(': 2671 case '(':
… …
2977 scr_charset_set (2, (unsigned int)cmd_getc ()); 2678 scr_charset_set (2, (unsigned int)cmd_getc ());
2978 break; 2679 break;
2979 case '+': 2680 case '+':
2980 scr_charset_set (3, (unsigned int)cmd_getc ()); 2681 scr_charset_set (3, (unsigned int)cmd_getc ());
2981 break; 2682 break;
2982#if ENABLE_FRILLS 2683#if !ENABLE_MINIMAL
2983 case '6': 2684 case '6':
2984 scr_backindex (); 2685 scr_backindex ();
2985 break; 2686 break;
2986#endif 2687#endif
2987 case '7': 2688 case '7':
2988 scr_cursor (SAVE); 2689 scr_cursor (SAVE);
2989 break; 2690 break;
2990 case '8': 2691 case '8':
2991 scr_cursor (RESTORE); 2692 scr_cursor (RESTORE);
2992 break; 2693 break;
2993#if ENABLE_FRILLS 2694#if !ENABLE_MINIMAL
2994 case '9': 2695 case '9':
2995 scr_forwardindex (); 2696 scr_forwardindex ();
2996 break; 2697 break;
2997#endif 2698#endif
2699 // DECPAM/DECPNM
2998 case '=': 2700 case '=':
2701 priv_modes |= PrivMode_aplKP;
2702 break;
2999 case '>': 2703 case '>':
3000 PrivMode ((ch == '='), PrivMode_aplKP); 2704 priv_modes &= ~PrivMode_aplKP;
3001 break; 2705 break;
3002 2706
3003 case C1_40: 2707 case C1_40:
3004 cmd_getc (); 2708 cmd_getc ();
3005 break; 2709 break;
… …
3008 break; 2712 break;
3009 2713
3010 /* 8.3.87: NEXT LINE */ 2714 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 2715 case C1_NEL: /* ESC E */
3012 { 2716 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 2717 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 2718 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3015 } 2719 }
3016 break; 2720 break;
3017 2721
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 2722 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 2723 case C1_ESA: /* ESC G */
3020 process_graphics (); 2724 // used by original rxvt for rob nations own graphics mode
2725 if (cmd_getc () == 'Q')
2726 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3021 break; 2727 break;
3022 2728
3023 /* 8.3.63: CHARACTER TABULATION SET */ 2729 /* 8.3.63: CHARACTER TABULATION SET */
3024 case C1_HTS: /* ESC H */ 2730 case C1_HTS: /* ESC H */
3025 scr_set_tab (1); 2731 scr_set_tab (1);
… …
3029 case C1_RI: /* ESC M */ 2735 case C1_RI: /* ESC M */
3030 scr_index (DN); 2736 scr_index (DN);
3031 break; 2737 break;
3032 2738
3033 /* 8.3.142: SINGLE-SHIFT TWO */ 2739 /* 8.3.142: SINGLE-SHIFT TWO */
3034 /*case C1_SS2: scr_single_shift (2); break; */ 2740 /* case C1_SS2: break; */
3035 2741
3036 /* 8.3.143: SINGLE-SHIFT THREE */ 2742 /* 8.3.143: SINGLE-SHIFT THREE */
3037 /*case C1_SS3: scr_single_shift (3); break; */ 2743 /* case C1_SS3: break; */
3038 2744
3039 /* 8.3.27: DEVICE CONTROL STRING */ 2745 /* 8.3.27: DEVICE CONTROL STRING */
3040 case C1_DCS: /* ESC P */ 2746 case C1_DCS: /* ESC P */
3041 process_dcs_seq (); 2747 process_dcs_seq ();
3042 break; 2748 break;
3043 2749
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2750 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 2751 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 2752 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 2753 break; /* steal obsolete ESC [ c */
3049 2754
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2755 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3051 case C1_CSI: /* ESC [ */ 2756 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 2757 process_csi_seq ();
3053 break; 2758 break;
3054 2759
3055 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2760 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3056 case C1_OSC: /* ESC ] */ 2761 case C1_OSC: /* ESC ] */
3057 process_osc_seq (); 2762 process_osc_seq ();
3058 break; 2763 break;
3059 2764
3060 /* 8.3.106: RESET TO INITIAL STATE */ 2765 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3061 case 'c': 2766 case 'c':
3062 mbstate.reset (); 2767 mbstate.reset ();
3063 scr_poweron (); 2768 scr_poweron ();
3064 scrollbar_show (1); 2769 scrollBar.show (1);
3065 break; 2770 break;
3066 2771
3067 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2772 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3068 case 'n': 2773 case 'n':
3069 scr_charset_choose (2); 2774 scr_charset_choose (2);
… …
3076 } 2781 }
3077} 2782}
3078/*}}} */ 2783/*}}} */
3079 2784
3080/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2785/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3081/* *INDENT-OFF* */
3082enum { 2786enum {
3083 CSI_ICH = 0x40, 2787 CSI_ICH = 0x40,
3084 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2788 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 , 2789 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, 2790 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, 2793 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 , 2794 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 2795 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3092}; 2796};
3093 2797
3094#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2798#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3095 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2799 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3096 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2800 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3097#define get_byte_array_bit(array, bit) \ 2801#define get_byte_array_bit(array, bit) \
3098 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2802 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3099 2803
3100const unsigned char csi_defaults[] = 2804static const unsigned char csi_defaults[] =
3101 { 2805 {
3102 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2806 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, */ 2807 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, */ 2808 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, [, \, ], ^, _, */ 2809 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, */ 2810 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, */ 2811 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, */ 2812 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, {, |, }, ~, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3110 }; 2814 };
3111/* *INDENT-ON* */
3112 2815
3113void 2816void ecb_hot
3114rxvt_term::process_csi_seq () 2817rxvt_term::process_csi_seq ()
3115{ 2818{
3116 unicode_t ch, priv, i; 2819 unicode_t ch, priv, prev_ch, i;
3117 unsigned int nargs, p; 2820 unsigned int nargs, p;
3118 int n, ndef; 2821 int n, ndef;
3119 int arg[ESC_ARGS]; 2822 int arg[ESC_ARGS] = { };
3120 2823
3121 for (nargs = ESC_ARGS; nargs > 0;) 2824 nargs = 0;
3122 arg[--nargs] = 0;
3123 2825
3124 priv = 0; 2826 priv = 0;
3125 ch = cmd_getc (); 2827 ch = cmd_getc ();
3126 if (ch >= '<' && ch <= '?') 2828 if ((ch >= '<' && ch <= '?') || ch == '!')
2829 {
3127 { /* '<' '=' '>' '?' */ 2830 /* '<' '=' '>' '?' '!' */
3128 priv = ch; 2831 priv = ch;
3129 ch = cmd_getc (); 2832 ch = cmd_getc ();
3130 } 2833 }
3131 2834
2835 prev_ch = 0;
3132 /* read any numerical arguments */ 2836 /* read any numerical arguments */
3133 for (n = -1; ch < CSI_ICH; ) 2837 for (n = -1; ch < CSI_ICH; )
3134 { 2838 {
3135 if (isdigit (ch)) 2839 if (isdigit (ch))
3136 { 2840 {
… …
3146 n = -1; 2850 n = -1;
3147 } 2851 }
3148 else if (IS_CONTROL (ch)) 2852 else if (IS_CONTROL (ch))
3149 process_nonprinting (ch); 2853 process_nonprinting (ch);
3150 2854
2855 prev_ch = ch;
3151 ch = cmd_getc (); 2856 ch = cmd_getc ();
3152 } 2857 }
3153 2858
3154 if (ch > CSI_7F) 2859 if (ch > CSI_7F)
3155 return; 2860 return;
… …
3161 ndef = get_byte_array_bit (csi_defaults, i); 2866 ndef = get_byte_array_bit (csi_defaults, i);
3162 for (p = 0; p < nargs; p++) 2867 for (p = 0; p < nargs; p++)
3163 if (arg[p] == -1) 2868 if (arg[p] == -1)
3164 arg[p] = ndef; 2869 arg[p] = ndef;
3165 2870
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 /* 2871 /*
3174 * private mode handling 2872 * private mode handling
3175 */ 2873 */
3176 if (priv) 2874 if (priv)
3177 { 2875 {
3178 switch (priv) 2876 switch (priv)
3179 { 2877 {
3180 case '>': 2878 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 2879 if (ch == CSI_DA) /* secondary device attributes */
2880 {
2881 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2882 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2883 //
2884 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2885 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2886 // versions.
2887 //
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2888 tt_printf ("\033[>%d;95;0c", 'U');
2889 }
3183 break; 2890 break;
2891
3184 case '?': 2892 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2893 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 2894 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 2895 break;
2896
2897 case '!':
2898 if (ch == CSI_70)
2899 {
2900 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2901 scr_soft_reset ();
2902
2903 static const int pm_h[] = { 7, 25 };
2904 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2905
2906 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2907 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3188 } 2908 }
2909 break;
2910 }
2911
3189 return; 2912 return;
3190 } 2913 }
3191 2914
3192 switch (ch) 2915 switch (ch)
3193 { 2916 {
… …
3207 } 2930 }
3208 break; 2931 break;
3209#endif 2932#endif
3210 2933
3211 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2934 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3212 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2935 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3213 arg[0] = -arg[0]; 2936 arg[0] = -arg[0];
3214 /* FALLTHROUGH */ 2937 /* FALLTHROUGH */
3215 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2938 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3216 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2939 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3217 scr_gotorc (arg[0], 0, RELATIVE); 2940 scr_gotorc (arg[0], 0, RELATIVE);
3218 break; 2941 break;
3219 2942
3220 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2943 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3221 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2944 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3292 3015
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3016 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3017 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3018 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3019 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3020 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3021 break;
3299 3022
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3023 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3024 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 3025 break;
3304 3026
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3027 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 3028 process_sgr_mode (nargs, arg);
3307 break; 3029 break;
… …
3314 break; 3036 break;
3315 case 6: /* CPR requested */ 3037 case 6: /* CPR requested */
3316 scr_report_position (); 3038 scr_report_position ();
3317 break; 3039 break;
3318 case 7: /* unofficial extension */ 3040 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3041 if (option (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3042 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3043 break;
3322 case 8: /* unofficial extension */ 3044 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3045 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3046 break;
… …
3372 scr_insert_mode (1); 3094 scr_insert_mode (1);
3373 else if (arg[0] == 20) 3095 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL; 3096 priv_modes |= PrivMode_LFNL;
3375 break; 3097 break;
3376 3098
3099 case CSI_71: // DESCUSR: set cursor style
3100 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]);
3102 break;
3103
3377 /* 3104 /*
3378 * PRIVATE USE beyond this point. All CSI_7? sequences here 3105 * PRIVATE USE beyond this point. All CSI_7? sequences here
3379 */ 3106 */
3380 case CSI_72: /* DECSTBM: set top and bottom margins */ 3107 case CSI_72: /* DECSTBM: set top and bottom margins */
3381 if (nargs == 1) 3108 if (nargs == 1)
… …
3391 break; 3118 break;
3392 case CSI_75: 3119 case CSI_75:
3393 scr_cursor (RESTORE); 3120 scr_cursor (RESTORE);
3394 break; 3121 break;
3395 3122
3396#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3397 case CSI_74: 3124 case CSI_74:
3398 process_window_ops (arg, nargs); 3125 process_window_ops (arg, nargs);
3399 break; 3126 break;
3400#endif 3127#endif
3401 3128
… …
3408 break; 3135 break;
3409 } 3136 }
3410} 3137}
3411/*}}} */ 3138/*}}} */
3412 3139
3413#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3414/* ARGSUSED */
3415void 3141void
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3142rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3143{
3418 int x, y; 3144 int x, y;
3419 XWindowAttributes wattr; 3145 XWindowAttributes wattr;
3420 Window wdummy; 3146 Window wdummy;
3147
3148 dLocal (Display *, dpy);
3421 3149
3422 if (nargs == 0) 3150 if (nargs == 0)
3423 return; 3151 return;
3424 3152
3425 switch (args[0]) 3153 switch (args[0])
3426 { 3154 {
3427 /* 3155 /*
3428 * commands 3156 * commands
3429 */ 3157 */
3430 case 1: /* deiconify window */ 3158 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3159 XMapWindow (dpy, parent);
3432 break; 3160 break;
3433 case 2: /* iconify window */ 3161 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3162 XIconifyWindow (dpy, parent, display->screen);
3435 DefaultScreen (display->display));
3436 break; 3163 break;
3437 case 3: /* set position (pixels) */ 3164 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3165 XMoveWindow (dpy, parent, args[1], args[2]);
3439 break; 3166 break;
3440 case 4: /* set size (pixels) */ 3167 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3168 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3169 break;
3443 case 5: /* raise window */ 3170 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3171 XRaiseWindow (dpy, parent);
3445 break; 3172 break;
3446 case 6: /* lower window */ 3173 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3174 XLowerWindow (dpy, parent);
3448 break; 3175 break;
3449 case 7: /* refresh window */ 3176 case 7: /* refresh window */
3450 scr_touch (true); 3177 scr_touch (true);
3451 break; 3178 break;
3452 case 8: /* set size (chars) */ 3179 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3180 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3181 (unsigned int) (args[1] * fheight));
3455 break; 3182 break;
3456 3183
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3184 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3185 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3186 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3187 set_widthheight ((unsigned int)vt_width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3188 (unsigned int) (args[1] * fheight));
3462 break; 3189 break;
3463
3464 3190
3465 /* 3191 /*
3466 * reports - some output format copied from XTerm 3192 * reports - some output format copied from XTerm
3467 */ 3193 */
3468 case 11: /* report window state */ 3194 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3196 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3197 break;
3472 case 13: /* report window position */ 3198 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3200 XTranslateCoordinates (dpy, parent, wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3201 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3202 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3203 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3204 break;
3479 case 14: /* report window size (pixels) */ 3205 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3207 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3208 break;
3483 case 18: /* report text area size (chars) */ 3209 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3210 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3211 break;
3486 case 19: /* report window size (chars) */ 3212 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3213 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3214 break;
3489 case 20: /* report icon label */ 3215 case 20: /* report icon label */
3490 { 3216 {
3491 char *s; 3217 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3218 XGetIconName (dpy, parent, &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3219 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3220 XFree (s);
3495 } 3221 }
3496 break; 3222 break;
3497 case 21: /* report window title */ 3223 case 21: /* report window title */
3498 { 3224 {
3499 char *s; 3225 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3226 XFetchName (dpy, parent, &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3227 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3228 XFree (s);
3503 } 3229 }
3504 break; 3230 break;
3505 } 3231 }
3506} 3232}
… …
3509/*----------------------------------------------------------------------*/ 3235/*----------------------------------------------------------------------*/
3510/* 3236/*
3511 * get input up until STRING TERMINATOR (or BEL) 3237 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3238 * ends_how is terminator used. returned input must be free()'d
3513 */ 3239 */
3514unsigned char * 3240char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3241rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3242{
3517 unicode_t seen_esc = 0, ch; 3243 unicode_t ch;
3244 bool seen_esc = false;
3518 unsigned int n = 0; 3245 unsigned int n = 0;
3519 unsigned char *s; 3246 wchar_t string[CBUFSIZ];
3520 unsigned char string[STRING_MAX];
3521 3247
3522 while ((ch = cmd_getc ()) != NOCHAR) 3248 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3249 {
3524 if (seen_esc) 3250 if (seen_esc)
3525 { 3251 {
… …
3528 else 3254 else
3529 return NULL; 3255 return NULL;
3530 } 3256 }
3531 else if (ch == C0_ESC) 3257 else if (ch == C0_ESC)
3532 { 3258 {
3533 seen_esc = 1; 3259 seen_esc = true;
3534 continue; 3260 continue;
3535 } 3261 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3262 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3263 break;
3264 else if (ch == C0_SYN)
3265 ch = cmd_get8 ();
3538 else if (ch < 0x20) 3266 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3267 return NULL; /* other control character - exit */
3540 3268
3541 seen_esc = 0; 3269 seen_esc = false;
3542 3270
3543 if (n >= sizeof (string) - 1) 3271 if (n >= sizeof (string) - 1)
3544 // stop at some sane length 3272 // stop at some sane length
3545 return NULL; 3273 return NULL;
3546 3274
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3550 string[n++] = ch; 3275 string[n++] = ch;
3551 } 3276 }
3552 3277
3553 string[n++] = '\0'; 3278 string[n++] = '\0';
3554 3279
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3280 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3281
3560 return s; 3282 return rxvt_wcstombs (string);
3561} 3283}
3562 3284
3563/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
3564/* 3286/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3288 */
3567void 3289void
3568rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3569{ 3291{
3570 unsigned char *s;
3571 unicode_t eh;
3572
3573 /* 3292 /*
3574 * Not handled yet 3293 * Not handled yet
3575 */ 3294 */
3295
3296 unicode_t eh;
3576 s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3577 if (s) 3298 if (s)
3578 free (s); 3299 free (s);
3579 3300
3580 return; 3301 return;
3581} 3302}
… …
3585 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3586 */ 3307 */
3587void 3308void
3588rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3589{ 3310{
3590 unicode_t ch, eh;
3591 int arg; 3311 int arg;
3592 3312
3593 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3596 3316
3597 if (ch == ';') 3317 if (ch == ';')
3598 { 3318 {
3319 unicode_t eh;
3599 unsigned char *s = get_to_st (eh); 3320 char *s = get_to_st (eh);
3600 3321
3601 if (s) 3322 if (s)
3602 { 3323 {
3603 process_xterm_seq (arg, (char *)s, eh); 3324 process_xterm_seq (arg, s, eh);
3604 free (s); 3325 free (s);
3605 } 3326 }
3606 } 3327 }
3607} 3328}
3608 3329
3609void 3330void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3331rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3332{
3612 if (str[0] == '?' && !str[1]) 3333 if (str[0] == '?' && !str[1])
3613 { 3334 {
3614 unsigned short r, g, b; 3335 rgba c;
3615 pix_colors_focused[color].get (display, r, g, b); 3336 pix_colors_focused[color].get (c);
3337
3338#if XFT
3339 if (c.a != rgba::MAX_CC)
3340 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3341 else
3342#endif
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3343 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3617 } 3344 }
3618 else 3345 else
3619 set_window_color (color, str); 3346 set_window_color (color, str);
3620} 3347}
3621 3348
3622/* 3349/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3350 * 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 */ 3351 */
3647void 3352void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3353rxvt_term::process_xterm_seq (int op, char *str, char resp)
3649{ 3354{
3650 int changed = 0;
3651 int color; 3355 int color;
3652 char *buf, *name; 3356 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3357 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3358 int saveop = op;
3655 3359
3360 dLocal (Display *, dpy);
3361
3656 assert (str != NULL); 3362 assert (str != NULL);
3363
3364 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3365 return;
3366
3657 switch (op) 3367 switch (op)
3658 { 3368 {
3659 case XTerm_name: 3369 case XTerm_name:
3660 set_title (str); 3370 set_title (str);
3661 /* FALLTHROUGH */ 3371 /* FALLTHROUGH */
… …
3666 set_title (str); 3376 set_title (str);
3667 break; 3377 break;
3668 case XTerm_property: 3378 case XTerm_property:
3669 if (str[0] == '?') 3379 if (str[0] == '?')
3670 { 3380 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3381 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3382 Atom actual_type;
3673 int actual_format; 3383 int actual_format;
3674 unsigned long nitems; 3384 unsigned long nitems;
3675 unsigned long bytes_after; 3385 unsigned long bytes_after;
3676 unsigned char *value = 0; 3386 unsigned char *value = 0;
3677 const char *str = ""; 3387 const char *str = "";
3678 3388
3679 if (prop 3389 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3390 && XGetWindowProperty (dpy, parent,
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3391 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3392 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3393 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3394 && actual_type != None
3685 && actual_format == 8) 3395 && actual_format == 8)
3686 str = (const char *)(value); 3396 str = (const char *)(value);
3687 3397
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3398 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3689 3399
3690 XFree (value); 3400 XFree (value);
3691 } 3401 }
3692 else 3402 else
3693 { 3403 {
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3404 char *eq = strchr (str, '=');
3695 3405
3696 if (eq) 3406 if (eq)
3697 { 3407 {
3698 *eq = 0; 3408 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3409 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 } 3410 }
3704 else 3411 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3412 XDeleteProperty (dpy, parent,
3706 display->atom (str)); 3413 display->atom (str));
3707 } 3414 }
3708 break; 3415 break;
3709 3416
3710 case XTerm_Color: 3417 case XTerm_Color:
… …
3712 { 3419 {
3713 if ((name = strchr (buf, ';')) == NULL) 3420 if ((name = strchr (buf, ';')) == NULL)
3714 break; 3421 break;
3715 3422
3716 *name++ = '\0'; 3423 *name++ = '\0';
3717 color = atoi (buf); 3424 color = atoi (buf) + minCOLOR;
3718 3425
3719 if (color < 0 || color >= TOTAL_COLORS) 3426 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3720 break; 3427 break;
3721 3428
3722 if ((buf = strchr (name, ';')) != NULL) 3429 if ((buf = strchr (name, ';')) != NULL)
3723 *buf++ = '\0'; 3430 *buf++ = '\0';
3724 3431
3725 if (name[0] == '?' && !name[1]) 3432 process_color_seq (op, color, name, resp);
3433 }
3434 break;
3435 case Rxvt_restoreFG:
3436 case XTerm_Color00:
3437 process_color_seq (op, Color_fg, str, resp);
3438 break;
3439 case Rxvt_restoreBG:
3440 case XTerm_Color01:
3441 process_color_seq (op, Color_bg, str, resp);
3442 break;
3443#ifndef NO_CURSORCOLOR
3444 case XTerm_Color_cursor:
3445 process_color_seq (op, Color_cursor, str, resp);
3446 break;
3447#endif
3448 case XTerm_Color_pointer_fg:
3449 process_color_seq (op, Color_pointer_fg, str, resp);
3450 break;
3451 case XTerm_Color_pointer_bg:
3452 process_color_seq (op, Color_pointer_bg, str, resp);
3453 break;
3454#ifdef OPTION_HC
3455 case XTerm_Color_HC:
3456 process_color_seq (op, Color_HC, str, resp);
3457 break;
3458 case XTerm_Color_HTC:
3459 process_color_seq (op, Color_HTC, str, resp);
3460 break;
3461#endif
3462#ifndef NO_BOLD_UNDERLINE_REVERSE
3463 case URxvt_Color_BD:
3464 process_color_seq (op, Color_BD, str, resp);
3465 break;
3466 case URxvt_Color_UL:
3467 process_color_seq (op, Color_UL, str, resp);
3468 break;
3469 case URxvt_Color_IT:
3470 process_color_seq (op, Color_IT, str, resp);
3471 break;
3472#endif
3473 case URxvt_Color_border:
3474 process_color_seq (op, Color_border, str, resp);
3475 break;
3476
3477#if BG_IMAGE_FROM_ROOT
3478 case URxvt_Color_tint:
3479 process_color_seq (op, Color_tint, str, resp);
3480 {
3481 bool changed = false;
3482
3483 if (ISSET_PIXCOLOR (Color_tint))
3484 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3485
3486 if (changed)
3487 update_background ();
3488 }
3489
3490 break;
3491#endif
3492
3493#if BG_IMAGE_FROM_FILE
3494 case Rxvt_Pixmap:
3495 if (!strcmp (str, "?"))
3496 {
3497 char str[256];
3498 int h_scale = fimage.h_scale;
3499 int v_scale = fimage.v_scale;
3500 int h_align = fimage.h_align;
3501 int v_align = fimage.v_align;
3502
3503 sprintf (str, "[%dx%d+%d+%d]",
3504 h_scale, v_scale,
3505 h_align, v_align);
3506 process_xterm_seq (XTerm_title, str, CHAR_ST);
3507 }
3508 else
3509 {
3510 bool changed = false;
3511
3512 if (*str != ';')
3726 { 3513 {
3727 unsigned short r, g, b; 3514 try
3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3515 {
3729 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3516 fimage.set_file_geometry (this, str);
3517 changed = true;
3518 }
3519 catch (const class rxvt_failure_exception &e)
3520 {
3521 }
3730 } 3522 }
3731 else 3523 else
3732 set_window_color (color + minCOLOR, name); 3524 {
3525 str++;
3526 if (fimage.set_geometry (str, true))
3527 changed = true;
3528 }
3529
3530 if (changed)
3531 {
3532 if (bg_window_position_sensitive ())
3533 {
3534 int x, y;
3535 get_window_origin (x, y);
3536 parent_x = x;
3537 parent_y = y;
3538 }
3539 update_background ();
3540 }
3733 } 3541 }
3734 break; 3542 break;
3735 case XTerm_Color00:
3736 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3737 break;
3738 case XTerm_Color01:
3739 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3740 break;
3741#ifndef NO_CURSORCOLOR
3742 case XTerm_Color_cursor:
3743 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3744 break;
3745#endif 3543#endif
3746 case XTerm_Color_pointer_fg:
3747 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3748 break;
3749 case XTerm_Color_pointer_bg:
3750 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3751 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break;
3762 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, 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;
3807 3544
3808 case XTerm_logfile: 3545 case XTerm_logfile:
3809 // TODO, when secure mode? 3546 // TODO, when secure mode?
3810 break; 3547 break;
3811 3548
3549#if 0
3550 case Rxvt_dumpscreen: /* no error notices */
3551 {
3552 int fd;
3553 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3554 {
3555 scr_dump (fd);
3556 close (fd);
3557 }
3558 }
3559 break;
3560#endif
3812 case XTerm_font: 3561 case XTerm_font:
3813 op = URxvt_font; 3562 op = URxvt_font;
3814 case URxvt_font: 3563 case URxvt_font:
3815#if ENABLE_STYLES 3564#if ENABLE_STYLES
3816 case URxvt_boldFont: 3565 case URxvt_boldFont:
3817 case URxvt_italicFont: 3566 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3567 case URxvt_boldItalicFont:
3819#endif 3568#endif
3820 if (query) 3569 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3570 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3571 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3572 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3573 resp);
3825 else 3574 else
3826 { 3575 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3576 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3577
… …
3830 allocated.push_back ((void *)res); 3579 allocated.push_back ((void *)res);
3831 set_fonts (); 3580 set_fonts ();
3832 } 3581 }
3833 break; 3582 break;
3834 3583
3835#if ENABLE_FRILLS 3584 case URxvt_version:
3836 case XTerm_locale:
3837 if (query) 3585 if (query)
3586 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3587 op,
3588 rs[Rs_name], VERSION[0], VERSION[2],
3589 resp);
3590 break;
3591
3592#if !ENABLE_MINIMAL
3593 case URxvt_locale:
3594 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3595 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3839 else 3596 else
3840 { 3597 {
3841 set_locale (str); 3598 set_locale (str);
3842# ifdef USE_XIM 3599 pty->set_utf8_mode (enc_utf8);
3843 im_cb (); 3600 init_xlocale ();
3844# endif
3845 } 3601 }
3846 break; 3602 break;
3847#endif
3848 3603
3849#ifdef MENUBAR 3604 case URxvt_view_up:
3850 case XTerm_Menu: 3605 case URxvt_view_down:
3851 if (options & Opt_insecure) 3606 {
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3607 int lines = atoi (str);
3608
3609 if (lines)
3610 scr_page (op == URxvt_view_up ? UP : DN, lines);
3611 else
3612 scr_erase_savelines ();
3613 }
3614
3853 break; 3615 break;
3854#endif 3616#endif
3855#if 0 3617
3856 case XTerm_dumpscreen: /* no error notices */ 3618#if ENABLE_PERL
3857 { 3619 case URxvt_perl:
3858 int fd; 3620 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; 3621 break;
3866#endif 3622#endif
3867 } 3623 }
3868} 3624}
3869/*----------------------------------------------------------------------*/ 3625/*----------------------------------------------------------------------*/
… …
3876 * 's' = save 3632 * 's' = save
3877 * 'r' = restore 3633 * 'r' = restore
3878 * 't' = toggle 3634 * 't' = toggle
3879 * so no need for fancy checking 3635 * so no need for fancy checking
3880 */ 3636 */
3881int 3637int ecb_cold
3882rxvt_term::privcases (int mode, unsigned long bit) 3638rxvt_term::privcases (int mode, unsigned long bit)
3883{ 3639{
3884 int state; 3640 int state;
3885 3641
3886 if (mode == 's') 3642 if (mode == 's')
3887 { 3643 {
3888 SavedModes |= (priv_modes & bit); 3644 if (priv_modes & bit)
3645 SavedModes |= bit;
3646 else
3647 SavedModes &= ~bit;
3889 return -1; 3648 return -1;
3890 } 3649 }
3891 else 3650 else
3892 { 3651 {
3893 if (mode == 'r') 3652 if (mode == 'r')
3894 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3653 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3895 else 3654 else
3896 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3655 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3897 PrivMode (state, bit); 3656
3657 if (state)
3658 priv_modes |= bit;
3659 else
3660 priv_modes &= ~bit;
3898 } 3661 }
3899 3662
3900 return state; 3663 return state;
3901} 3664}
3902 3665
3903/* we're not using priv _yet_ */ 3666/* we're not using priv _yet_ */
3904void 3667void
3905rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3668rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3906{ 3669{
3907 unsigned int i, j; 3670 unsigned int i, j;
3908 int state; 3671 int state;
3909 3672
3910 static const struct 3673 static const struct
3911 { 3674 {
3912 const int argval; 3675 const int argval;
3913 const unsigned long bit; 3676 const unsigned long bit;
3914 }
3915
3916 argtopriv[] = { 3677 } argtopriv[] = {
3917 { 1, PrivMode_aplCUR }, 3678 { 1, PrivMode_aplCUR }, // DECCKM
3918 { 2, PrivMode_vt52 }, 3679 { 2, PrivMode_vt52 }, // DECANM
3919 { 3, PrivMode_132 }, 3680 { 3, PrivMode_132 }, // DECCOLM
3920 { 4, PrivMode_smoothScroll }, 3681 { 4, PrivMode_smoothScroll }, // DECSCLM
3921 { 5, PrivMode_rVideo }, 3682 { 5, PrivMode_rVideo }, // DECSCNM
3922 { 6, PrivMode_relOrigin }, 3683 { 6, PrivMode_relOrigin }, // DECOM
3923 { 7, PrivMode_Autowrap }, 3684 { 7, PrivMode_Autowrap }, // DECAWM
3924 // 8, bi-directional support mode 3685 // 8, auto-repeat keys // DECARM
3925 { 9, PrivMode_MouseX10 }, 3686 { 9, PrivMode_MouseX10 },
3926#ifdef menuBar_esc 3687 // 18 end FF to printer after print screen
3927 { menuBar_esc, PrivMode_menuBar }, 3688 // 19 Print screen prints full screen/scroll region
3928#endif
3929 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor }, 3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3931#ifdef scrollBar_esc 3690#ifdef scrollBar_esc
3932 { scrollBar_esc, PrivMode_scrollBar }, 3691 { scrollBar_esc, PrivMode_scrollBar },
3933#endif 3692#endif
3934 { 35, PrivMode_ShiftKeys }, // rxvt extension 3693 { 35, PrivMode_ShiftKeys }, // rxvt extension
3694 // 38, tektronix mode // DECTEK
3935 { 40, PrivMode_132OK }, 3695 { 40, PrivMode_132OK },
3936 // 41 xterm more fixes NYI 3696 // 41 xterm more fixes NYI
3937 // 45 margin bell NYI 3697 // 45 margin bell NYI
3938 // 46 start logging 3698 // 46 start logging
3939 { 47, PrivMode_Screen }, 3699 { 47, PrivMode_Screen },
3940 { 66, PrivMode_aplKP }, 3700 { 66, PrivMode_aplKP }, // DECNKM
3941#ifndef NO_BACKSPACE_KEY 3701#ifndef NO_BACKSPACE_KEY
3942 { 67, PrivMode_BackSpace }, 3702 { 67, PrivMode_BackSpace }, // DECBKM
3943#endif 3703#endif
3944 { 1000, PrivMode_MouseX11 }, 3704 { 1000, PrivMode_MouseX11 },
3945 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3705 { 1002, PrivMode_MouseBtnEvent },
3946 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3706 { 1003, PrivMode_MouseAnyEvent },
3947 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3707#if ENABLE_FRILLS
3708 { 1005, PrivMode_ExtModeMouse },
3709#endif
3948 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3949 { 1011, PrivMode_Keypress }, // rxvt extension 3711 { 1011, PrivMode_Keypress }, // rxvt extension
3712#if ENABLE_FRILLS
3713 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3714#endif
3950 // 1035 enable modifiers for alt, numlock NYI 3715 // 1035 enable modifiers for alt, numlock NYI
3951 // 1036 send ESC for meta keys NYI 3716 // 1036 send ESC for meta keys NYI
3952 // 1037 send DEL for keypad delete NYI 3717 // 1037 send DEL for keypad delete NYI
3953 { 1047, PrivMode_Screen }, 3718 { 1047, PrivMode_Screen },
3954 // 1048 save and restore cursor 3719 // 1048 save and restore cursor, implemented in code
3955 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3720 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3956 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3721 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3722 { 2004, PrivMode_BracketPaste },
3957 }; 3723 };
3958 3724
3959 if (nargs == 0) 3725 if (nargs == 0)
3960 return; 3726 return;
3961 3727
… …
3968 for (i = 0; i < nargs; i++) 3734 for (i = 0; i < nargs; i++)
3969 { 3735 {
3970 state = -1; 3736 state = -1;
3971 3737
3972 /* basic handling */ 3738 /* basic handling */
3973 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3739 for (j = 0; j < ecb_array_length (argtopriv); j++)
3974 if (argtopriv[j].argval == arg[i]) 3740 if (argtopriv[j].argval == arg[i])
3975 { 3741 {
3976 state = privcases (mode, argtopriv[j].bit); 3742 state = privcases (mode, argtopriv[j].bit);
3977 break; 3743 break;
3978 } 3744 }
3979 3745
3980 /* extra handling for values with state unkept */ 3746 /* extra handling for values with state unkept */
3981 switch (arg[i]) 3747 switch (arg[i])
3982 { 3748 {
3749#if ENABLE_STYLES
3750 case 1021:
3751 set_option (Opt_intensityStyles, mode);
3752
3753 scr_touch (true);
3754 break;
3755#endif
3983 case 1048: /* alternative cursor save */ 3756 case 1048: /* alternative cursor save */
3984 case 1049:
3985 if (options & Opt_secondaryScreen) 3757 if (option (Opt_secondaryScreen))
3986 if (mode == 0) 3758 if (mode == 0)
3987 scr_cursor (RESTORE); 3759 scr_cursor (RESTORE);
3988 else if (mode == 1) 3760 else if (mode == 1)
3989 scr_cursor (SAVE); 3761 scr_cursor (SAVE);
3990 break; 3762 break;
… …
3998 case 2: /* VT52 mode */ 3770 case 2: /* VT52 mode */
3999 /* oddball mode. should be set regardless of set/reset 3771 /* oddball mode. should be set regardless of set/reset
4000 * parameter. Return from VT52 mode with an ESC < from 3772 * parameter. Return from VT52 mode with an ESC < from
4001 * within VT52 mode 3773 * within VT52 mode
4002 */ 3774 */
4003 PrivMode (1, PrivMode_vt52); 3775 priv_modes |= PrivMode_vt52;
4004 break; 3776 break;
4005 case 3: /* 80/132 */ 3777 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 3778 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3779 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4008 break; 3780 break;
4009 case 4: /* smooth scrolling */ 3781 case 4: /* smooth scrolling */
4010 if (state)
4011 options &= ~Opt_jumpScroll;
4012 else
4013 options |= Opt_jumpScroll; 3782 set_option (Opt_jumpScroll, !state);
4014 break; 3783 break;
4015 case 5: /* reverse video */ 3784 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 3785 scr_rvideo_mode (state);
4017 break; 3786 break;
4018 case 6: /* relative/absolute origins */ 3787 case 6: /* relative/absolute origins */
… …
4022 scr_autowrap (state); 3791 scr_autowrap (state);
4023 break; 3792 break;
4024 /* case 8: - auto repeat, can't do on a per window basis */ 3793 /* case 8: - auto repeat, can't do on a per window basis */
4025 case 9: /* X10 mouse reporting */ 3794 case 9: /* X10 mouse reporting */
4026 if (state) /* orthogonal */ 3795 if (state) /* orthogonal */
4027 priv_modes &= ~PrivMode_MouseX11; 3796 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4028 break; 3797 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 3798#ifdef scrollBar_esc
4037 case scrollBar_esc: 3799 case scrollBar_esc:
4038 if (scrollbar_mapping (state)) 3800 scrollBar.map (state);
4039 {
4040 resize_all_windows (0, 0, 0); 3801 resize_all_windows (0, 0, 0);
4041 scr_touch (true); 3802 scr_touch (true);
4042 }
4043 break; 3803 break;
4044#endif 3804#endif
4045 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
4046 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
4047 break; 3807 break;
… …
4052 break; 3812 break;
4053 /* case 66: - application key pad */ 3813 /* case 66: - application key pad */
4054 /* case 67: - backspace key */ 3814 /* case 67: - backspace key */
4055 case 1000: /* X11 mouse reporting */ 3815 case 1000: /* X11 mouse reporting */
4056 if (state) /* orthogonal */ 3816 if (state) /* orthogonal */
4057 priv_modes &= ~PrivMode_MouseX10; 3817 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4058 break; 3818 break;
4059#if 0
4060 case 1001: 3819 case 1002:
4061 break; /* X11 mouse highlighting */ 3820 case 1003:
4062#endif 3821 if (state)
3822 {
3823 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3824 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3825 mouse_row = mouse_col = 0;
3826 vt_emask_mouse = PointerMotionMask;
3827 }
3828 else
3829 vt_emask_mouse = NoEventMask;
3830
3831 vt_select_input ();
3832 break;
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 3833 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state)
4065 options &= ~Opt_scrollTtyOutput;
4066 else
4067 options |= Opt_scrollTtyOutput; 3834 set_option (Opt_scrollTtyOutput, !state);
4068 break; 3835 break;
4069 case 1011: /* scroll to bottom on key press */ 3836 case 1011: /* scroll to bottom on key press */
4070 if (state)
4071 options |= Opt_scrollTtyKeypress; 3837 set_option (Opt_scrollTtyKeypress, state);
4072 else
4073 options &= ~Opt_scrollTtyKeypress;
4074 break; 3838 break;
4075 case 1047: /* secondary screen w/ clearing last */ 3839 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 3840 if (option (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 3841 if (!state)
4078 scr_erase_screen (2); 3842 scr_erase_screen (2);
3843
4079 scr_change_screen (state); 3844 scr_change_screen (state);
4080 break; 3845 break;
4081 case 1049: /* secondary screen w/ clearing first */ 3846 case 1049: /* secondary screen w/ clearing first */
3847 if (option (Opt_secondaryScreen))
3848 if (state)
3849 scr_cursor (SAVE);
3850
4082 scr_change_screen (state); 3851 scr_change_screen (state);
3852
4083 if (options & Opt_secondaryScreen) 3853 if (option (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 3854 if (state)
4085 scr_erase_screen (2); 3855 scr_erase_screen (2);
3856 else
3857 scr_cursor (RESTORE);
4086 break; 3858 break;
4087 default: 3859 default:
4088 break; 3860 break;
4089 } 3861 }
4090 } 3862 }
4091} 3863}
4092/*}}} */ 3864/*}}} */
4093 3865
4094/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
4095void 3867void ecb_hot
4096rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4097{ 3869{
4098 unsigned int i; 3870 unsigned int i;
4099 short rendset; 3871 short rendset;
4100 int rendstyle; 3872 int rendstyle;
… …
4216 scr_color (Color_bg, Color_bg); 3988 scr_color (Color_bg, Color_bg);
4217 break; 3989 break;
4218 3990
4219 //case 50: // not variable spacing 3991 //case 50: // not variable spacing
4220 3992
4221#ifndef NO_BRIGHTCOLOR 3993#if !ENABLE_MINIMAL
4222 case 90: 3994 case 90:
4223 case 91: /* set bright fg color */ 3995 case 91: /* set bright fg color */
4224 case 92: 3996 case 92:
4225 case 93: 3997 case 93:
4226 case 94: 3998 case 94:
… …
4238 case 106: 4010 case 106:
4239 case 107: 4011 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4012 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 4013 break;
4242#endif 4014#endif
4243
4244 } 4015 }
4245 } 4016 }
4017}
4018
4019void
4020rxvt_term::set_cursor_style (int style)
4021{
4022 if (!IN_RANGE_INC (style, 0, 4))
4023 return;
4024
4025 set_option (Opt_cursorUnderline, style >= 3);
4026
4027#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1));
4029 cursor_blink_reset ();
4030#endif
4031
4032 want_refresh = 1;
4246} 4033}
4247/*}}} */ 4034/*}}} */
4248 4035
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/* ------------------------------------------------------------------------- */ 4036/* ---------------------------------------------------------------------- */
4037/* Write data to the pty as typed by the user, pasted with the mouse,
4038 * or generated by us in response to a query ESC sequence.
4039 */
4268 4040
4269/* 4041/*
4270 * Send printf () formatted output to the command. 4042 * Send printf () formatted output to the command.
4271 * Only use for small amounts of data. 4043 * Only use for small amounts of data.
4272 */ 4044 */
4273void 4045void
4274rxvt_term::tt_printf (const char *fmt,...) 4046rxvt_term::tt_printf (const char *fmt,...)
4275{ 4047{
4276 va_list arg_ptr; 4048 va_list arg_ptr;
4277 unsigned char buf[256]; 4049 char buf[256];
4278 4050
4279 va_start (arg_ptr, fmt); 4051 va_start (arg_ptr, fmt);
4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4052 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4281 va_end (arg_ptr); 4053 va_end (arg_ptr);
4282 tt_write (buf, strlen (buf)); 4054 tt_write (buf, strlen (buf));
4283} 4055}
4284 4056
4285/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 4057/* Write data to the pty as typed by the user. */
4287 * or generated by us in response to a query ESC sequence.
4288 */
4289void 4058void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4059rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4291{ 4060{
4061 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4062 return;
4063
4064 if (option (Opt_scrollTtyKeypress))
4065 if (view_start)
4066 {
4067 view_start = 0;
4068 want_refresh = 1;
4069 }
4070
4071 tt_write_ (data, len);
4072}
4073
4074void
4075rxvt_term::tt_write (const char *data, unsigned int len)
4076{
4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4078 return;
4079
4080 tt_write_ (data, len);
4081}
4082
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4083static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4293 4084
4294 if (len) 4085void
4086rxvt_term::tt_write_ (const char *data, unsigned int len)
4087{
4088 if (pty->pty < 0)
4089 return;
4090
4091 if (v_buflen == 0)
4092 {
4093 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4094
4095 max_it (written, 0);
4096
4097 if (written == len)
4098 return;
4099
4100 data += written;
4101 len -= written;
4295 { 4102 }
4103
4104 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4105
4106 memcpy (v_buffer + v_buflen, data, len);
4107 v_buflen += len;
4108
4109 pty_ev.set (ev::READ | ev::WRITE);
4110}
4111
4112void rxvt_term::pty_write ()
4113{
4114 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4115
4116 if (written > 0)
4117 {
4118 v_buflen -= written;
4119
4296 if (v_buflen == 0) 4120 if (v_buflen == 0)
4297 { 4121 {
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); 4122 free (v_buffer);
4325 v_buffer = 0; 4123 v_buffer = 0;
4326 v_buflen = 0;
4327 4124
4328 pty_ev.set (EVENT_READ); 4125 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; 4126 return;
4341 } 4127 }
4128
4129 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4130 }
4131 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4132 pty_ev.set (ev::READ);
4343} 4133}
4344 4134
4345/*----------------------- end-of-file (C source) -----------------------*/ 4135/*----------------------- end-of-file (C source) -----------------------*/
4346 4136

Diff Legend

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