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

Diff Legend

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