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

Diff Legend

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