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

Diff Legend

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