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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.241 by root, Fri Jan 6 05:28:55 2006 UTC

… …
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-2005 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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
59// exception thrown when the command parser runs out of input data 69// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755
73
74#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
79
80#if ISO_14755
81static unsigned short iso14755_symtab[] = {
82 // keysym, unicode
83 XK_Left, 0x2190,
84 XK_KP_Left, 0x2190,
85 XK_Up, 0x2191,
86 XK_KP_Up, 0x2191,
87 XK_Right, 0x2192,
88 XK_KP_Right, 0x2192,
89 XK_Down, 0x2193,
90 XK_KP_Down, 0x2193,
91 XK_Linefeed, 0x21b4,
92 XK_Return, 0x21b5,
93 XK_KP_Enter, 0x21b5,
94
95 XK_Prior, 0x21de,
96 XK_Next, 0x21df,
97 XK_Tab, 0x21e5,
98 XK_ISO_Left_Tab, 0x21e6,
99 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7,
101
102 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0,
110 XK_Home, 0x21f1,
111 XK_End, 0x21f2,
112
113 XK_Execute, 0x2318,
114 XK_Begin, 0x2320,
115 XK_Delete, 0x2326,
116 XK_Clear, 0x2327,
117 XK_BackSpace, 0x232b,
118 XK_Insert, 0x2380,
119 XK_Control_L, 0x2388,
120 XK_Control_R, 0x2388,
121 XK_Pause, 0x2389,
122 XK_Break, 0x238a,
123 XK_Escape, 0x238b,
124 XK_Undo, 0x238c,
125 XK_Print, 0x2399,
126
127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
135 XK_KP_Space, 0x2422,
136#endif
137 0,
138};
139
140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
251rxvt_term::commit_iso14755 ()
252{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257
258 if (iso14755buf & ISO_14755_51)
259 {
260 char mb[16];
261 int len;
262
263 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20)
265 len = wcstombs (mb, ch, 16);
266 else
267 {
268 mb[0] = ch[0];
269 len = 1;
270 }
271
272 if (len > 0)
273 tt_write (mb, len);
274 else
275 scr_bell ();
276 }
277
278 iso14755buf = 0;
279}
280
281int
282rxvt_term::hex_keyval (XKeyEvent &ev)
283{
284 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++)
287 {
288 KeySym k = XLookupKeysym (&ev, index);
289
290 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
291 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
292 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
293 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
294 }
295
296 return -1;
297}
298#endif
61 299
62/*{{{ Convert the keypress event into a string */ 300/*{{{ Convert the keypress event into a string */
63void 301void
64rxvt_term::lookup_key (XKeyEvent &ev) 302rxvt_term::lookup_key (XKeyEvent &ev)
65{ 303{
… …
68 KeySym keysym; 306 KeySym keysym;
69#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
71#endif 309#endif
72 int valid_keysym; 310 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
74 312
75 /* 313 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
78 * 316 *
79 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
80 */ 318 */
81 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
84 322
85 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
86 { 324 {
87 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 334 Status status_return;
97 335
98#if 0 336#if 0
99#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
103 else 341 else
104#endif 342#endif
105#endif 343#endif
106 { 344 {
… …
108 346
109 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
113 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
116 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 357 SET_LOCALE (locale);
118 358
119 if (status_return == XLookupChars 359 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
142 } 382 }
143 else 383 else
144#endif 384#endif
145 { 385 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
148 } 388 }
149 389
150 if (valid_keysym) 390 if (valid_keysym)
151 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
152 if (TermWin.saveLines) 397 if (saveLines)
153 { 398 {
154#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 400 if (!ctrl && !meta)
156 {
157#else 401#else
158 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
159 { 404 {
160#endif
161 int lnsppg; 405 int lnsppg;
162 406
163#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 409#else
166 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
167#endif 411#endif
168 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
169 { 413 {
170 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
171 return; 415 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 459 {
216 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
218 } 462 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 464 {
221 switch (keysym) 465 switch (keysym)
222 { 466 {
223 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
226 return; 470 return;
471#if TODO
227 /* rxvt extras */ 472 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 474 change_font (FONT_UP);
230 return; 475 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 477 change_font (FONT_DN);
233 return; 478 return;
479#endif
234 } 480 }
235 } 481 }
236 } 482 }
237#ifdef PRINTPIPE 483
238 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
239 { 485 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
241 return;
242 } 487 {
243#endif 488 int hv;
244 489
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (iso14755buf & ISO_14755_51
246 { 491 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 492 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 493 {
250 unsigned int l; 494 commit_iso14755 ();
251 const unsigned char *kbuf0; 495 iso14755buf = ISO_14755_51;
252 496# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 498# endif
261 ) 499 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 500 }
266 501 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 502 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51;
505# if ISO_14755
506 iso14755_51 (iso14755buf & ISO_14755_MASK);
507# endif
268 return; 508 return;
269 } 509 }
270 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
271#endif 514# endif
515 iso14755buf = 0;
516 }
517 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
528#endif
529
530#ifdef PRINTPIPE
531 if (keysym == XK_Print)
532 {
533 scr_printscreen (ctrl | shft);
534 return;
535 }
536#endif
537
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 {
272 { 540 {
273 newlen = 1; 541 newlen = 1;
274 switch (keysym) 542 switch (keysym)
275 { 543 {
276#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 545 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
279 { 547 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
283 } 551 }
284 else 552 else
285 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
286 break; 554 break;
287#endif 555#endif
288#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
289 case XK_Delete: 567 case XK_Delete:
290 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
291 break; 569 break;
292#endif 570#endif
293 case XK_Tab: 571 case XK_Tab:
294 if (shft) 572 if (shft)
295 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
296 else 574 else
297 { 575 {
298#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 577 if (ctrl)
300 meta = 1; 578 meta = 1;
… …
306 newlen = 0; 584 newlen = 0;
307 } 585 }
308 break; 586 break;
309 587
310#ifdef XK_KP_Left 588#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 594 {
317 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 597 break;
320 } 598 }
321 else 599 else
322 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
325#endif 603#endif
326 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 610 /* do Shift first */
333 if (shft) 611 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 613 else if (ctrl)
336 { 614 {
337 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 617 }
340 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
342 break; 620 break;
343 621
344#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
346 case XK_KP_Prior: 624 case XK_KP_Prior:
347 /* allow shift to override */ 625 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 627 {
350 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
351 break; 629 break;
352 } 630 }
353 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
354# endif 632# endif
355 case XK_Prior: 633 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
357 break; 635 break;
358# ifdef XK_KP_Next 636# ifdef XK_KP_Next
359 case XK_KP_Next: 637 case XK_KP_Next:
360 /* allow shift to override */ 638 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 640 {
363 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
364 break; 642 break;
365 } 643 }
366 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
367# endif 645# endif
368 case XK_Next: 646 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
370 break; 648 break;
371#endif 649#endif
372 case XK_KP_Enter: 650 case XK_KP_Enter:
373 /* allow shift to override */ 651 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 653 {
376 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
377 } 666 }
378 else 667 else
379 { 668 {
380 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
382 } 671 }
383 break; 672 break;
384 673
385#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
386 case XK_KP_Begin: 675 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
388 break; 677 break;
389 678
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 679#endif
398 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
404 break; 686 break;
405 687
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 704 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 706 {
425 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 709 }
428 else 710 else
429 { 711 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
432 } 714 }
433 break; 715 break;
434 716
435 case XK_Find: 717 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
437 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
438 case XK_Insert: 731 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
440 break; 733 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 735 case DXK_Remove:
443 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
444#endif 737#endif
445 case XK_Execute: 738 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
447 break; 740 break;
448 case XK_Select: 741 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
450 break; 743 break;
451#ifdef XK_KP_End 744#ifdef XK_KP_End
452 case XK_KP_End: 745 case XK_KP_End:
453 /* allow shift to override */ 746 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 748 {
456 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
457 break; 750 break;
458 } 751 }
459 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
460#endif 753#endif
461 case XK_End: 754 case XK_End:
462 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
463 break; 756 break;
464#ifdef XK_KP_Home 757#ifdef XK_KP_Home
465 case XK_KP_Home: 758 case XK_KP_Home:
466 /* allow shift to override */ 759 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 761 {
469 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
470 break; 763 break;
471 } 764 }
472 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
473#endif 766#endif
474 case XK_Home: 767 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
476 break; 769 break;
477 770
478#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 773
… …
532#undef FKEY 825#undef FKEY
533 default: 826 default:
534 newlen = 0; 827 newlen = 0;
535 break; 828 break;
536 } 829 }
830
537 if (newlen) 831 if (newlen)
538 len = STRLEN (kbuf); 832 len = strlen (kbuf);
539 } 833 }
540 834
541 /* 835 /*
542 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
543 */ 837 */
… …
550 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
551 { 845 {
552 len = 1; 846 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
555 else 854 else
556 { 855 {
557#ifdef META8_OPTION 856#ifdef META8_OPTION
558 /* set 8-bit on */ 857 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
560 { 859 {
561 unsigned char *ch; 860 char *ch;
562 861
563 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 863 *ch |= 0x80;
565 864
566 meta = 0; 865 meta = 0;
… …
568#endif 867#endif
569 /* nil */ ; 868 /* nil */ ;
570 } 869 }
571 } 870 }
572 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
874
573 if (len <= 0) 875 if (len <= 0)
574 return; /* not mapped */ 876 return; /* not mapped */
575 877
576 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 879 if (view_start)
578 { 880 {
579 TermWin.view_start = 0; 881 view_start = 0;
580 want_refresh = 1; 882 want_refresh = 1;
581 } 883 }
582 884
583 /* 885 /*
584 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 901#ifdef META8_OPTION
600 && meta_char == C0_ESC 902 && meta_char == C0_ESC
601#endif 903#endif
602 ) 904 )
603 { 905 {
604 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
605 tt_write (&ch, 1); 907 tt_write (&ch, 1);
606 } 908 }
607 909
608#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
617#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
619} 921}
620/*}}} */ 922/*}}} */
621 923
622#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
625unsigned int 927unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 929{
628 unsigned int n, s; 930 unsigned int n, s;
629 931
630 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 934
633 if (n > 0 && s < count) 935 if (n > 0 && s < count)
634 { 936 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 937 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 939 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 940 cmdbuf_endp -= n;
639 s += n; 941 s += n;
640 } 942 }
… …
650 952
651 cmd_parse (); 953 cmd_parse ();
652 954
653 return 0; 955 return 0;
654} 956}
655#endif /* MENUBAR_MAX */ 957#endif
656 958
657void 959void
658rxvt_term::flush () 960rxvt_term::flush ()
659{ 961{
962 flush_ev.stop ();
963
660#ifdef TRANSPARENT 964#ifdef TRANSPARENT
661 if (want_full_refresh) 965 if (want_full_refresh)
662 { 966 {
663 want_full_refresh = 0; 967 want_full_refresh = 0;
664 scr_clear (); 968 scr_clear ();
665 scr_touch (false); 969 scr_touch (false);
666 want_refresh = 1;
667 } 970 }
668#endif 971#endif
669 972
670 if (want_refresh) 973 if (want_refresh)
671 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
672 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
673 scrollbar_show (1); 1015 scrollbar_show (1);
674#ifdef USE_XIM 1016#ifdef USE_XIM
675 IMSendSpot (); 1017 IMSendSpot ();
676#endif 1018#endif
… …
683rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
684{ 1026{
685 SET_R (this); 1027 SET_R (this);
686 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
687 1029
1030 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034}
1035
1036void
1037rxvt_term::flush_cb (time_watcher &w)
1038{
1039 SET_R (this);
1040 SET_LOCALE (locale);
1041
1042 refresh_limit = 1;
1043 refresh_count = 0;
688 flush (); 1044 flush ();
689} 1045}
690 1046
691#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
692void 1048void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1067 }
712} 1068}
713#endif 1069#endif
714 1070
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void
1073rxvt_term::cont_scroll_cb (time_watcher &w)
1074{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 }
1082}
1083#endif
1084
1085#ifdef SELECTION_SCROLLING
1086void
1087rxvt_term::sel_scroll_cb (time_watcher &w)
1088{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 }
1096}
1097#endif
1098
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void
1101rxvt_term::slip_wheel_cb (time_watcher &w)
1102{
1103 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 }
1115}
1116#endif
1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
715bool 1136bool
716rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
717{ 1138{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1140
720 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
721 { 1142 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1144 n = 0;
724 } 1145 }
725 1146
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
729 1150
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1152
732 if (n > 0) 1153 if (r > 0)
733 { 1154 {
734 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
735 return true; 1156 return true;
736 } 1157 }
737 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
738 destroy (); 1170 destroy ();
1171 }
739 1172
740 return false; 1173 return false;
741} 1174}
742 1175
743void 1176void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1178{
746 SET_R (this); 1179 SET_R (this);
747 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
748 1181
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1182 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1183 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1184 while (pty_fill ())
754 if (cmd_parse ()) 1185 if (cmd_parse ())
755 break; 1186 break;
1187
1188 if (revents & EVENT_WRITE)
1189 pty_write ();
1190}
1191
1192void
1193rxvt_term::pointer_unblank ()
1194{
1195 XDefineCursor (display->display, vt, TermWin_cursor);
1196 recolour_cursor ();
1197
1198#ifdef POINTER_BLANK
1199 hidden_pointer = 0;
1200
1201 if (OPTION (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif
756} 1204}
757 1205
758#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
759void 1207void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
773{ 1209{
774 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
775 return; 1211 return;
776 1212
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
778 XFlush (display->display); 1214 XFlush (display->display);
779 1215
780 hidden_pointer = 1; 1216 hidden_pointer = 1;
781} 1217}
782 1218
… …
799 x = ev.x; 1235 x = ev.x;
800 y = ev.y; 1236 y = ev.y;
801 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
802 1238
803 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1240 button_number = 3;
806 }
807 else 1241 else
808 { 1242 {
809 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1245 if (button_number >= 3)
812 button_number += (64 - 3); 1246 button_number += (64 - 3);
813 } 1247 }
814 1248
815 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
816 { 1250 {
817 /* 1251 /*
818 * do not report ButtonRelease 1252 * do not report ButtonRelease
819 * no state info allowed 1253 * no state info allowed
820 */ 1254 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1273#endif
840
841 } 1274 }
842 1275
843#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1278 if (key_state & 16)
846 fputc ('C', stderr); 1279 fputc ('C', stderr);
847 if (key_state & 4) 1280 if (key_state & 4)
848 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1285 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1287 button_number,
855 x + 1, 1288 x + 1,
856 y + 1); 1289 y + 1);
857#else 1290#endif
1291
858 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
860 (32 + x + 1), 1294 (32 + x + 1),
861 (32 + y + 1)); 1295 (32 + y + 1));
862#endif
863} 1296}
864 1297
865#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
866void 1299void
867rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
874 1307
875/*{{{ process an X event */ 1308/*{{{ process an X event */
876void 1309void
877rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
878{ 1311{
1312 dDisp;
1313
879 SET_R (this); 1314 SET_R (this);
880 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
881 1316
882#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
884 { 1319 {
885 if (hidden_cursor) 1320 if (hidden_cursor)
886 { 1321 {
887 hidden_cursor = 0; 1322 hidden_cursor = 0;
888 want_refresh = 1; 1323 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1327 }
893#endif 1328#endif
894 1329
895#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1332 {
898 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1336 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1340 pointer_blank ();
906 } 1341 }
907#endif 1342#endif
908 1343
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1346 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1347
967 switch (ev.type) 1348 switch (ev.type)
968 { 1349 {
969 case KeyPress: 1350 case KeyPress:
1351#if ISO_14755
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
970 lookup_key (ev.xkey); 1354 lookup_key (ev.xkey);
1355
1356 break;
1357
1358 case KeyRelease:
1359 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
971 break; 1421 break;
972 1422
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1427 mouse_slip_wheel_speed = 0;
978 else 1428#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1429 break;
987 } 1430 }
988#endif
989 1431
990 case ButtonPress: 1432 case ButtonPress:
991 button_press (ev.xbutton); 1433 button_press (ev.xbutton);
992 break; 1434 break;
993 1435
… …
995 button_release (ev.xbutton); 1437 button_release (ev.xbutton);
996 break; 1438 break;
997 1439
998 case ClientMessage: 1440 case ClientMessage:
999 if (ev.xclient.format == 32 1441 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1443 {
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 destroy (); 1445 destroy ();
1446#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev);
1451#endif
1452 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1002#ifdef OFFIX_DND 1462#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1463 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1465 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1466 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1467 || ev.xclient.data.l[0] == DndLink))
1008 { 1468 {
1009 /* Get Dnd data */ 1469 /* Get Dnd data */
1010 Atom ActualType; 1470 Atom ActualType;
1011 int ActualFormat; 1471 int ActualFormat;
1012 unsigned char *data; 1472 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1473 unsigned long Size, RemainingBytes;
1014 1474
1015 XGetWindowProperty (display->display, display->root, 1475 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1476 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1477 0L, 1000000L,
1018 False, AnyPropertyType, 1478 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1479 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1480 &Size, &RemainingBytes,
1021 &data); 1481 &data);
1022 XChangeProperty (display->display, display->root, 1482 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1483 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1486 }
1030#endif /* OFFIX_DND */ 1487#endif /* OFFIX_DND */
1031 break; 1488 break;
1032 1489
1033 case MappingNotify: 1490 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1491 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1492 break;
1036 1493
1037 /* 1494 /*
1038 * XXX: this is not the _current_ arrangement 1495 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1496 * Here's my conclusion:
… …
1058 break; 1515 break;
1059 } 1516 }
1060 break; 1517 break;
1061 1518
1062 case FocusIn: 1519 case FocusIn:
1063 if (!TermWin.focus) 1520 focus_in ();
1521 break;
1522
1523 case FocusOut:
1524 focus_out ();
1525 break;
1526
1527 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0])
1064 { 1529 {
1065 TermWin.focus = 1; 1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1531 ;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075 1532
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 {
1535 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 }
1538
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent))
1541 check_our_parents ();
1542#endif
1076 } 1543 }
1077 break; 1544 break;
1078 1545
1079 case FocusOut:
1080 if (TermWin.focus)
1081 {
1082 TermWin.focus = 0;
1083 want_refresh = 1;
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break;
1096
1097 case ConfigureNotify: 1546 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1099 { 1548 && ev.xproperty.state == PropertyNewValue)
1100 int height, width; 1549 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1550
1102 do
1103 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109
1110 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1);
1114 }
1115#ifdef DEBUG_SIZE
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent)
1123 {
1124 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif
1129 }
1130 break; 1551 break;
1131 1552
1132 case SelectionClear: 1553 case SelectionClear:
1133 selection_clear (); 1554 selection_clear ();
1134 break; 1555 break;
1135 1556
1136 case SelectionNotify: 1557 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1558 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1560 break;
1141 1561
1142 case SelectionRequest: 1562 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1563 selection_send (ev.xselectionrequest);
1144 break; 1564 break;
1145 1565
1146 case UnmapNotify: 1566 case UnmapNotify:
1147 TermWin.mapped = 0; 1567 mapped = 0;
1148#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1150#endif 1570#endif
1151 break; 1571 break;
1152 1572
1153 case MapNotify: 1573 case MapNotify:
1154 TermWin.mapped = 1; 1574 mapped = 1;
1155#ifdef TEXT_BLINK 1575#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif 1577#endif
1158 break; 1578 break;
1159 1579
… …
1163 break; 1583 break;
1164#endif /* TRANSPARENT */ 1584#endif /* TRANSPARENT */
1165 1585
1166 case GraphicsExpose: 1586 case GraphicsExpose:
1167 case Expose: 1587 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1588 if (ev.xany.window == vt)
1169 { 1589 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1590 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1591 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1592 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1594
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1600
1178 // ev.xexpose.width, TermWin.height, False); 1601 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1602 }
1182 else 1603 else
1183 { 1604 {
1184 XEvent unused_event; 1605 XEvent unused_event;
1185 1606
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1608 ;
1188 &unused_event)) ; 1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1610 ;
1190 GraphicsExpose, 1611
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1612 if (isScrollbarWindow (ev.xany.window))
1193 { 1613 {
1194 scrollBar.setIdle (); 1614 scrollBar.setIdle ();
1195 scrollbar_show (0); 1615 scrollbar_show (0);
1196 } 1616 }
1197#ifdef MENUBAR 1617#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1619 menubar_expose ();
1200#endif 1620#endif
1621
1622#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window);
1625#endif
1201 } 1626 }
1202 break; 1627 break;
1203 1628
1204 case MotionNotify: 1629 case MotionNotify:
1205#ifdef POINTER_BLANK 1630#ifdef POINTER_BLANK
… …
1211 { 1636 {
1212 menubar_control (ev.xbutton); 1637 menubar_control (ev.xbutton);
1213 break; 1638 break;
1214 } 1639 }
1215#endif 1640#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1642 break;
1218 1643
1219 if (ev.xany.window == TermWin.vt) 1644 if (ev.xany.window == vt)
1220 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1649 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1224 ; 1651 ;
1225 1652
1226 XQueryPointer (display->display, TermWin.vt, 1653 XQueryPointer (disp, vt,
1227 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1656 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1657 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1658#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1659 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1660 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1661 {
1235#endif 1662#endif
1663#if ISO_14755
1664 // 5.4
1665 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1666 {
1667 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1668 break;
1669 }
1670#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1671 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1672 ev.xbutton.state & Button3Mask ? 2 : 0);
1673
1238#ifdef SELECTION_SCROLLING 1674#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1675 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1676 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1677 {
1242 int dist; 1678 int dist;
1243
1244 pending_scroll_selection=1;
1245 1679
1246 /* don't clobber the current delay if we are 1680 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1681 * already in the middle of scrolling.
1248 */ 1682 */
1249 if (scroll_selection_delay<=0) 1683 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1684 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1685
1252 /* save the event params so we can highlight 1686 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1687 * the selection in the pending-scroll loop
1254 */ 1688 */
1255 selection_save_x=ev.xbutton.x; 1689 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1690 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1691 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1692
1260 /* calc number of lines to scroll */ 1693 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1694 if (ev.xbutton.y < int_bwidth)
1262 { 1695 {
1263 scroll_selection_dir = UP; 1696 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1697 dist = int_bwidth - ev.xbutton.y;
1265 } 1698 }
1266 else 1699 else
1267 { 1700 {
1268 scroll_selection_dir = DN; 1701 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1702 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1703 }
1704
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1705 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1706 / SELECTION_SCROLL_LINE_SPEEDUP
1707 + 1;
1274 MIN_IT (scroll_selection_lines, 1708 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1709 SELECTION_SCROLL_MAX_LINES);
1276 } 1710 }
1277 else 1711 else
1278 { 1712 {
1279 /* we are within the text window, so we 1713 /* we are within the text window, so we
1280 * shouldn't be scrolling 1714 * shouldn't be scrolling
1281 */ 1715 */
1282 pending_scroll_selection = 0; 1716 if (sel_scroll_ev.active)
1717 sel_scroll_ev.stop();
1283 } 1718 }
1284#endif 1719#endif
1285#ifdef MOUSE_THRESHOLD 1720#ifdef MOUSE_THRESHOLD
1286
1287 } 1721 }
1288#endif 1722#endif
1289
1290 } 1723 }
1291 } 1724 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1726 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1727 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1728 MotionNotify, &ev))
1729 ;
1730
1296 XQueryPointer (display->display, scrollBar.win, 1731 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1732 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1733 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1734 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1735 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1737 scrollbar_size ());
1303 scr_refresh (refresh_type); 1738 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1739 refresh_limit = 0;
… …
1307 break; 1742 break;
1308 } 1743 }
1309} 1744}
1310 1745
1311void 1746void
1747rxvt_term::focus_in ()
1748{
1749 if (!focus)
1750 {
1751 focus = 1;
1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1756#if USE_XIM
1757 if (Input_Context != NULL)
1758 {
1759 IMSetStatusPosition ();
1760 XSetICFocus (Input_Context);
1761 }
1762#endif
1763#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1766#endif
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 pix_colors = pix_colors_focused;
1771 scr_recolour ();
1772 }
1773#endif
1774 }
1775}
1776
1777void
1778rxvt_term::focus_out ()
1779{
1780 if (focus)
1781 {
1782 focus = 0;
1783 want_refresh = 1;
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786
1787#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf)
1789 {
1790 iso14755buf = 0;
1791# if ENABLE_OVERLAY
1792 scr_overlay_off ();
1793# endif
1794 }
1795#endif
1796#if USE_XIM
1797 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context);
1799#endif
1800#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink))
1802 cursor_blink_ev.stop ();
1803 hidden_cursor = 0;
1804#endif
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 pix_colors = pix_colors_unfocused;
1809 scr_recolour ();
1810 }
1811#endif
1812 }
1813}
1814
1815#if TRANSPARENT
1816void
1312rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1818{
1314 SET_R (this); 1819 SET_R (this);
1315 SET_LOCALE (locale); 1820 SET_LOCALE (locale);
1316 1821
1317 switch (ev.type) 1822 switch (ev.type)
1318 { 1823 {
1319 case PropertyNotify: 1824 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1825 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1826 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on. 1827 * use the property to determine the pixmap. We use it later on.
1332 */ 1828 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1829 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1337 return; 1831 return;
1338 }
1339 1832
1340 /* FALLTHROUGH */ 1833 /* FALLTHROUGH */
1341 case ReparentNotify: 1834 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1836 want_refresh = want_full_refresh = 1;
1344 break; 1837 break;
1345#endif
1346 } 1838 }
1347} 1839}
1840#endif
1348 1841
1349void 1842void
1350rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1351{ 1844{
1352 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1353 1846
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1355 if (!bypass_keystate) 1849 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1851
1357 /* 1852 /*
1358 * VT window processing of button press 1853 * VT window processing of button press
1359 */ 1854 */
1360 if (ev.window == TermWin.vt) 1855 if (ev.window == vt)
1361 { 1856 {
1857#if ISO_14755
1858 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 {
1861 iso14755_54 (ev.x, ev.y);
1862 return;
1863 }
1864#endif
1865
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1866 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1867
1363 if (reportmode) 1868 if (reportmode)
1364 { 1869 {
1365 /* mouse report from vt window */ 1870 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
… …
1396 } 1901 }
1397 else 1902 else
1398 { 1903 {
1399 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1906
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1401 switch (ev.button) 1908 switch (ev.button)
1402 { 1909 {
1403 case Button1: 1910 case Button1:
1911 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */
1913#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask);
1915#else
1916 selection.rect = false;
1917#endif
1918
1404 /* allow shift+left click to extend selection */ 1919 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1921 {
1407 if (MEvent.button == Button1 && clickintime) 1922 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1923 selection_rotate (ev.x, ev.y);
1409 else 1924 else
1410 selection_extend (ev.x, ev.y, 1); 1925 selection_extend (ev.x, ev.y, 1);
1411 } 1926 }
1412 else 1927 else
1413 { 1928 {
1414 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1415 MEvent.clicks++; 1930 MEvent.clicks++;
1416 else 1931 else
1417 MEvent.clicks = 1; 1932 MEvent.clicks = 1;
1418 1933
1419 selection_click (MEvent.clicks, ev.x, ev.y); 1934 selection_click (MEvent.clicks, ev.x, ev.y);
1420 } 1935 }
1421 1936
1422 MEvent.button = Button1; 1937 MEvent.button = Button1;
1423 break; 1938 break;
1424 1939
1425 case Button3: 1940 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1941 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1942 selection_rotate (ev.x, ev.y);
1428 else 1943 else
1429 selection_extend (ev.x, ev.y, 1); 1944 selection_extend (ev.x, ev.y, 1);
1945
1430 MEvent.button = Button3; 1946 MEvent.button = Button3;
1431 break; 1947 break;
1432 } 1948 }
1433 } 1949 }
1950
1434 MEvent.time = ev.time; 1951 MEvent.time = ev.time;
1435 return; 1952 return;
1436 } 1953 }
1437 1954
1438 /* 1955 /*
… …
1504 upordown = 1; /* down */ 2021 upordown = 1; /* down */
1505 } 2022 }
1506 if (upordown) 2023 if (upordown)
1507 { 2024 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2025#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2026 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 2027#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 2029 {
1513 if (upordown < 0) 2030 if (upordown < 0)
1514 scrollBar.setUp (); 2031 scrollBar.setUp ();
… …
1530 break; 2047 break;
1531 case R_SB_ALIGN_BOTTOM: 2048 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2049 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2050 break;
1534 } 2051 }
2052
1535 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2057
1540 scrollBar.setMotion (); 2058 scrollBar.setMotion ();
1541 break; 2059 break;
1542 2060
1543 case Button1: 2061 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2066 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
1550 { 2068 {
1551 if (scrollbar_above_slider (ev.y)) 2069 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2071 scr_page (UP, nrow - 1);
1554# else 2072# else
1555 scr_page (UP, TermWin.nrow / 4); 2073 scr_page (UP, nrow / 4);
1556# endif 2074# endif
1557 else if (scrollbar_below_slider (ev.y)) 2075 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2077 scr_page (DN, nrow - 1);
1560# else 2078# else
1561 scr_page (DN, TermWin.nrow / 4); 2079 scr_page (DN, nrow / 4);
1562# endif 2080# endif
1563 else 2081 else
1564 scrollBar.setMotion (); 2082 scrollBar.setMotion ();
1565 } 2083 }
1566 else 2084 else
1567 { 2085 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2087 (nrow
1570 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2089 / scrollbar_size ()));
1572 } 2090 }
2091
1573 break; 2092 break;
1574 } 2093 }
1575 } 2094 }
1576 return; 2095 return;
1577 } 2096 }
… …
1589{ 2108{
1590 int reportmode = 0; 2109 int reportmode = 0;
1591 2110
1592 csrO = 0; /* reset csr Offset */ 2111 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2112 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2113 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2114
1596 if (scrollbar_isUpDn ()) 2115 if (scrollbar_isUpDn ())
1597 { 2116 {
1598 scrollBar.setIdle (); 2117 scrollBar.setIdle ();
1599 scrollbar_show (0); 2118 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 2120 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 2121#endif
1603
1604 } 2122 }
2123
1605#ifdef SELECTION_SCROLLING 2124#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2125 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop();
1607#endif 2127#endif
2128
1608 if (ev.window == TermWin.vt) 2129 if (ev.window == vt)
1609 { 2130 {
2131#if ISO_14755
2132 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return;
2135#endif
1610 if (reportmode) 2136 if (reportmode)
1611 { 2137 {
1612 /* mouse report from vt window */ 2138 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2139 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2140 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
1629 mouse_report (ev); 2155 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2156#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2157 return;
1632 } 2158 }
2159
1633 /* 2160 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2161 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2162 * when overriding mouse reporting
1636 */ 2163 */
1637 if (PrivateModes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2165 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
2168
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
1641 2171
1642 switch (ev.button) 2172 switch (ev.button)
1643 { 2173 {
1644 case Button1: 2174 case Button1:
1645 case Button3: 2175 case Button3:
… …
1653 case Button5: 2183 case Button5:
1654 { 2184 {
1655 int i; 2185 int i;
1656 page_dirn v; 2186 page_dirn v;
1657 2187
1658 v = (ev.button == Button4) ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2189
1659 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
1660 i = 1; 2191 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2192 else if (OPTION (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2193 i = nrow - 1;
1663 else 2194 else
1664 i = 5; 2195 i = 5;
2196
1665# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2198 if (ev.state & ControlMask)
1667 { 2199 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2200 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203
2204 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2206
2207 slip_wheel_ev.start ();
1670 } 2208 }
2209 else
2210 {
1671# endif 2211# endif
1672# ifdef JUMP_MOUSE_WHEEL 2212# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2213 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2214 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2215 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING
1682 } 2225 }
1683# endif 2226#endif
1684
1685 } 2227 }
1686 break; 2228 break;
1687#endif 2229#endif
1688
1689 } 2230 }
1690 } 2231 }
1691#ifdef MENUBAR 2232#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2233 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2234 menubar_control (ev);
1694#endif 2235#endif
1695} 2236}
1696 2237
1697#ifdef TRANSPARENT 2238#ifdef TRANSPARENT
1698#if TINTING 2239#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2240/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2241
1702static void 2242typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2243
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2245{
1710 /* No saturation */ 2246 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2247 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i;
1714 2252
1715 b = ((uint16_t *) ptr)[x]; 2253 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2254
1717 g = (b & 0x3e0) * gm; 2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2256
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2257 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2258 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2259 mask_g = visual->green_mask;
1722 } 2260 mask_b = visual->blue_mask;
1723 ptr += bpl; 2261
1724 } 2262 /* boring lookup table pre-initialization */
2263 switch (srcImage->bits_per_pixel) {
2264 case 15:
2265 if ((mask_r != 0x7c00) ||
2266 (mask_g != 0x03e0) ||
2267 (mask_b != 0x001f))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2270 lookup_r = lookup;
2271 lookup_g = lookup+32;
2272 lookup_b = lookup+32+32;
2273 sh_r = 10;
2274 sh_g = 5;
2275 sh_b = 0;
2276 break;
2277 case 16:
2278 if ((mask_r != 0xf800) ||
2279 (mask_g != 0x07e0) ||
2280 (mask_b != 0x001f))
2281 return;
2282 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2283 lookup_r = lookup;
2284 lookup_g = lookup+32;
2285 lookup_b = lookup+32+64;
2286 sh_r = 11;
2287 sh_g = 5;
2288 sh_b = 0;
2289 break;
2290 case 24:
2291 if ((mask_r != 0xff0000) ||
2292 (mask_g != 0x00ff00) ||
2293 (mask_b != 0x0000ff))
2294 return;
2295 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2296 lookup_r = lookup;
2297 lookup_g = lookup+256;
2298 lookup_b = lookup+256+256;
2299 sh_r = 16;
2300 sh_g = 8;
2301 sh_b = 0;
2302 break;
2303 case 32:
2304 if ((mask_r != 0xff0000) ||
2305 (mask_g != 0x00ff00) ||
2306 (mask_b != 0x0000ff))
2307 return;
2308 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2309 lookup_r = lookup;
2310 lookup_g = lookup+256;
2311 lookup_b = lookup+256+256;
2312 sh_r = 16;
2313 sh_g = 8;
2314 sh_b = 0;
2315 break;
2316 default:
2317 return; /* we do not support this color depth */
2318 }
2319
2320 /* prepare limits for color transformation (each channel is handled separately) */
2321 if (shade < 0) {
2322 shade = -shade;
2323 if (shade < 0) shade = 0;
2324 if (shade > 100) shade = 100;
2325
2326 lower_lim_r = 65535-rm;
2327 lower_lim_g = 65535-gm;
2328 lower_lim_b = 65535-bm;
2329
2330 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2331 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2332 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2333
2334 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2335 } else {
1726 for (y = h; --y >= 0;) { 2336 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2337 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2338
1730 b = ((uint16_t *) ptr)[x]; 2339 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2340
1732 g = (b & 0x3e0) * gm; 2341 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2342 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2343 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2344 }
1736 b |= (!(b >> 5) - 1); 2345
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2346 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2347 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2348 {
1740 } 2349 unsigned int tmp;
1741 ptr += bpl; 2350
2351 tmp = lower_lim_r;
2352 lower_lim_r = lower_lim_b;
2353 lower_lim_b = tmp;
2354
2355 tmp = upper_lim_r;
2356 upper_lim_r = upper_lim_b;
2357 upper_lim_b = tmp;
2358 }
2359
2360 /* fill our lookup tables */
2361 for (i = 0; i <= mask_r>>sh_r; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2365 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2366 lookup_r[i] = (tmp/65535)<<sh_r;
2367 }
2368 for (i = 0; i <= mask_g>>sh_g; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2372 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2373 lookup_g[i] = (tmp/65535)<<sh_g;
2374 }
2375 for (i = 0; i <= mask_b>>sh_b; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2379 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2380 lookup_b[i] = (tmp/65535)<<sh_b;
2381 }
2382
2383 /* apply table to input image (replacing colors by newly calculated ones) */
2384 switch (srcImage->bits_per_pixel)
2385 {
2386 case 15:
2387 {
2388 unsigned short *p1, *pf, *p, *pl;
2389 p1 = (unsigned short *) srcImage->data;
2390 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
1742 } 2396 {
2397 *p = lookup_r[(*p & 0x7c00)>>10] |
2398 lookup_g[(*p & 0x03e0)>> 5] |
2399 lookup_b[(*p & 0x001f)];
2400 }
2401 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2402 }
1744} 2403 break;
1745 2404 }
1746/* RGB 16 */ 2405 case 16:
1747static void 2406 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2407 unsigned short *p1, *pf, *p, *pl;
1749{ 2408 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2409 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2410 while (p1 < pf)
1752 2411 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2412 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2413 pl = p1 + srcImage->width;
1755 /* No saturation */ 2414 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2415 {
1770 } else { 2416 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2417 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2418 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2419 }
1786 ptr += bpl; 2420 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2421 }
2422 break;
2423 }
2424 case 24:
2425 {
2426 unsigned char *p1, *pf, *p, *pl;
2427 p1 = (unsigned char *) srcImage->data;
2428 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2429 while (p1 < pf)
2430 {
2431 p = p1;
2432 pl = p1 + srcImage->width * 3;
2433 for (; p < pl; p += 3)
1787 } 2434 {
2435 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2436 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2437 p[2] = lookup_r[(p[2] & 0x0000ff)];
2438 }
2439 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2440 }
1789} 2441 break;
2442 }
2443 case 32:
2444 {
2445 RUINT32T *p1, *pf, *p, *pl;
2446 p1 = (RUINT32T *) srcImage->data;
2447 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2448
1791/* RGB 24 */ 2449 while (p1 < pf)
1792static void 2450 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2451 p = p1;
1794{ 2452 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2453 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2454 {
1823 } else { 2455 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2456 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2457 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2458 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2459 }
1854 ptr += bpl; 2460 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2461 }
2462 break;
2463 }
1856 } 2464 }
1857}
1858 2465
1859/* RGB 32 */ 2466 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2467}
1930
1931#endif 2468#endif
1932 2469
1933/* 2470/*
1934 * Check our parents are still who we think they are. 2471 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2472 * Do transparency updates if required
… …
1942 Atom atype; 2479 Atom atype;
1943 unsigned char *prop = NULL; 2480 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2481 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2482 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2483 XWindowAttributes wattr, wrootattr;
2484 dDisp;
1947 2485
1948 pchanged = 0; 2486 pchanged = 0;
1949 2487
1950 if (!(Options & Opt_transparent)) 2488 if (!OPTION (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2489 return pchanged; /* Don't try any more */
1952 2490
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2491 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2492 rootdepth = wrootattr.depth;
1955 2493
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2494 XGetWindowAttributes (disp, parent[0], &wattr);
1957 2495
1958 if (rootdepth != wattr.depth) 2496 if (rootdepth != wattr.depth)
1959 { 2497 {
1960 if (am_transparent) 2498 if (am_transparent)
1961 { 2499 {
1962 pchanged = 1; 2500 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2502 am_transparent = am_pixmap_trans = 0;
1965 } 2503 }
1966 2504
1967 return pchanged; /* Don't try any more */ 2505 return pchanged; /* Don't try any more */
1968 } 2506 }
1969 2507
1970 /* Get all X ops out of the queue so that our information is up-to-date. */ 2508 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False); 2509 XSync (disp, False);
1972 2510
1973 /* 2511 /*
1974 * Make the frame window set by the window manager have 2512 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2513 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that. 2514 * windows for each client, so we have to take care about that.
1977 */ 2515 */
1978 i = (xa[XA_XROOTPMAPID] 2516 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2519 &nitems, &bytes_after, &prop) == Success);
1982 2520
1983 if (!i || prop == NULL) 2521 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2522 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2525 &nitems, &bytes_after, &prop) == Success);
1988 2526
1989 if (!i || prop == NULL) 2527 if (!i || prop == NULL
2528#if TINTING
2529 || !rs[Rs_color + Color_tint]
2530#endif
2531 )
1990 have_pixmap = 0; 2532 have_pixmap = 0;
1991 else 2533 else
1992 { 2534 {
1993 have_pixmap = 1; 2535 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2536 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2547 Window cr;
2006 XImage *image; 2548 XImage *image;
2007 GC gc; 2549 GC gc;
2008 XGCValues gcvalue; 2550 XGCValues gcvalue;
2009 2551
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2552 XTranslateCoordinates (disp, parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2553 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2554 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2555 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2556 nx = ny = 0;
2015 2557
… …
2025 nh += sy; 2567 nh += sy;
2026 ny = -sy; 2568 ny = -sy;
2027 sy = 0; 2569 sy = 0;
2028 } 2570 }
2029 2571
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2572 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2573 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574
2575 XSync (disp, False);
2032 allowedxerror = -1; 2576 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2578
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2580 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2581 allowedxerror = 0;
2038 2582
2039 if (image == NULL) 2583 if (image == NULL)
2040 { 2584 {
2041 if (am_transparent && am_pixmap_trans) 2585 if (am_transparent && am_pixmap_trans)
2042 { 2586 {
2043 pchanged = 1; 2587 pchanged = 1;
2044 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2045 { 2589 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2590 XFreePixmap (disp, pixmap);
2047 TermWin.pixmap = None; 2591 pixmap = None;
2048 } 2592 }
2049 } 2593 }
2050 2594
2051 am_pixmap_trans = 0; 2595 am_pixmap_trans = 0;
2052 } 2596 }
2053 else 2597 else
2054 { 2598 {
2055 if (TermWin.pixmap != None) 2599 if (pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2600 XFreePixmap (disp, pixmap);
2057 2601
2058#if TINTING 2602#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2603 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2604 {
2061 unsigned short shade, rm, gm, bm; 2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2607
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2609
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2610 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2611 }
2076#endif 2612#endif
2077 2613
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2614 pixmap = XCreatePixmap (disp, vt,
2079 szHint.width, szHint.height, image->depth); 2615 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2617 XPutImage (disp, pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2618 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2619 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2620 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2086 TermWin.pixmap); 2622 XClearWindow (disp, parent[0]);
2087 2623
2088 if (!am_transparent || !am_pixmap_trans) 2624 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2625 pchanged = 1;
2090 2626
2091 am_transparent = am_pixmap_trans = 1; 2627 am_transparent = am_pixmap_trans = 1;
2092 } 2628 }
2093 } 2629 }
2094 2630
2095 if (!am_pixmap_trans) 2631 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2633 else
2096 { 2634 {
2097 unsigned int n; 2635 unsigned int n;
2098 /* 2636 /*
2099 * InheritPixmap transparency 2637 * InheritPixmap transparency
2100 */ 2638 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2640 {
2104 oldp = TermWin.parent[i]; 2641 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2642 XQueryTree (disp, parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2643 &parent[i], &list, &n);
2107 XFree (list); 2644 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2645
2110 if (TermWin.parent[i] == display->root) 2646 if (parent[i] == display->root)
2111 { 2647 {
2112 if (oldp != None) 2648 if (oldp != None)
2113 pchanged = 1; 2649 pchanged = 1;
2114 2650
2115 break; 2651 break;
2116 } 2652 }
2117 2653
2118 if (oldp != TermWin.parent[i]) 2654 if (oldp != parent[i])
2119 pchanged = 1; 2655 pchanged = 1;
2120 } 2656 }
2121 2657
2122 n = 0; 2658 n = 0;
2123 2659
2124 if (pchanged) 2660 if (pchanged)
2125 { 2661 {
2126 for (; n < (unsigned int)i; n++) 2662 for (; n < (unsigned int)i; n++)
2127 { 2663 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2664 XGetWindowAttributes (disp, parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2666 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2668 break;
2134 } 2669 }
2135 } 2670 }
2136 } 2671 }
2137 2672
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2673 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2139 { 2674 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2677 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2678 /* XXX: also turn off Opt_transparent? */
2145 } 2679 }
2146 else 2680 else
2147 { 2681 {
2148#if WAIT_FOR_WM 2682#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2683 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2684 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2685 sleep (1);
2152#endif 2686#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2687 for (n = 0; n < (unsigned int)i; n++)
2688 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]);
2691 }
2156 2692
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2158 am_transparent = 1; 2694 am_transparent = 1;
2159 } 2695 }
2160 2696
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2698 parent[i] = None;
2699 }
2700
2701 if (scrollBar.win)
2702 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle ();
2705 scrollbar_show (0);
2706 }
2707
2708 if (am_transparent)
2709 {
2710 want_refresh = want_full_refresh = 1;
2711 if (am_pixmap_trans)
2712 flush ();
2163 } 2713 }
2164 2714
2165 return pchanged; 2715 return pchanged;
2166} 2716}
2167#endif 2717#endif
… …
2171bool 2721bool
2172rxvt_term::cmd_parse () 2722rxvt_term::cmd_parse ()
2173{ 2723{
2174 bool flag = false; 2724 bool flag = false;
2175 unicode_t ch = NOCHAR; 2725 unicode_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2726 char *seq_begin; // remember start of esc-sequence here
2177 2727
2178 for (;;) 2728 for (;;)
2179 { 2729 {
2180 if (ch == NOCHAR) 2730 if (ch == NOCHAR)
2181 { 2731 {
2182 seq_begin = cmdbuf_ptr; 2732 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2733 ch = next_char ();
2184 }
2185 2734
2186 if (ch == NOCHAR) // TODO: improve 2735 if (ch == NOCHAR)
2187 break; 2736 break;
2737 }
2188 2738
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2739 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2740 {
2741 if (!seen_input)
2742 {
2743 seen_input = 1;
2744 // many badly-written programs (e.g. jed) contain a race condition:
2745 // they first read the screensize and then install a SIGWINCH handler.
2746 // some window managers resize the window early, and these programs
2747 // then sometimes get the size wrong.
2748 // unfortunately other programs are even more buggy and dislike
2749 // being sent SIGWINCH, so only do it when we were in fact being
2750 // resized.
2751 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH);
2753 }
2754
2191 /* Read a text string from the input buffer */ 2755 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2756 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2757 bool refreshnow = false;
2194 int nlines = 0; 2758 int nlines = 0;
2195 unicode_t *str = buf; 2759 unicode_t *str = buf;
2196 2760 unicode_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2761
2199 for (;;) 2762 for (;;)
2200 { 2763 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2765 break;
2206 2766
2207 *str++ = ch; 2767 *str++ = ch;
2208 2768
2209 if (ch == C0_LF) 2769 if (ch == C0_LF || str >= eol)
2210 { 2770 {
2771 if (ch == C0_LF)
2211 nlines++; 2772 nlines++;
2773
2212 refresh_count++; 2774 refresh_count++;
2213 2775
2214 if (! (Options & Opt_jumpScroll) 2776 if (!OPTION (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2777 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2778 {
2217 refreshnow = true; 2779 refreshnow = true;
2218 flag = true; 2780 refresh_count = 0;
2219 ch = NOCHAR; 2781 ch = NOCHAR;
2220 break; 2782 break;
2221 } 2783 }
2222 2784
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2785 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2786 if (nlines >= nrow - 1)
2225 { 2787 {
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2226 scr_add_lines (buf, nlines, str - buf); 2789 scr_add_lines (buf, nlines, str - buf);
2790
2227 nlines = 0; 2791 nlines = 0;
2228 str = buf; 2792 str = buf;
2793 eol = str + min (ncol, UBUFSIZ);
2229 } 2794 }
2795
2796 if (str >= eol)
2797 {
2798 if (eol >= buf + UBUFSIZ)
2799 {
2800 ch = NOCHAR;
2801 break;
2802 }
2803 else
2804 eol = min (eol + ncol, buf + UBUFSIZ);
2805 }
2806
2230 } 2807 }
2231 2808
2232 if (str >= buf + UBUFSIZ) 2809 seq_begin = cmdbuf_ptr;
2233 { 2810 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2811 }
2238 2812
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2239 scr_add_lines (buf, nlines, str - buf); 2814 scr_add_lines (buf, nlines, str - buf);
2240 2815
2241 /* 2816 /*
2242 * If there have been a lot of new lines, then update the screen 2817 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2818 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2819 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2820 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2821 */
2250 if (refreshnow) 2822 if (refreshnow)
2251 { 2823 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2825 refresh_limit++;
2254 else 2826 else
2827 {
2828 flag = true;
2255 scr_refresh (refresh_type); 2829 scr_refresh (refresh_type);
2830 flush_ev.stop ();
2831 }
2256 } 2832 }
2257 2833
2258 } 2834 }
2259 else 2835 else
2260 { 2836 {
… …
2274 } 2850 }
2275 2851
2276 return flag; 2852 return flag;
2277} 2853}
2278 2854
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2279// read the next character 2864// read the next character
2280unicode_t 2865unicode_t
2281rxvt_term::next_char () 2866rxvt_term::next_char ()
2282{ 2867{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2869 {
2285 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++; 2872 return *cmdbuf_ptr++;
2288 2873
2289 wchar_t wc; 2874 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291 2876
2292 if (len == (size_t)-2) 2877 if (len == (size_t)-2)
2293 { 2878 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2879 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
… …
2299 if (len == (size_t)-1) 2884 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 2886
2302 // assume wchar == unicode 2887 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2888 cmdbuf_ptr += len;
2304 return wc; 2889 return wc & UNICODE_MASK;
2305 } 2890 }
2306 2891
2307 return NOCHAR; 2892 return NOCHAR;
2308} 2893}
2309 2894
… …
2314 */ 2899 */
2315unicode_t 2900unicode_t
2316rxvt_term::cmd_getc () 2901rxvt_term::cmd_getc ()
2317{ 2902{
2318 unicode_t c = next_char (); 2903 unicode_t c = next_char ();
2904
2905 if (c == NOCHAR)
2906 throw out_of_input;
2907
2908 return c;
2909}
2910
2911unicode_t
2912rxvt_term::cmd_get8 ()
2913{
2914 unicode_t c = next_octet ();
2319 2915
2320 if (c == NOCHAR) 2916 if (c == NOCHAR)
2321 throw out_of_input; 2917 throw out_of_input;
2322 2918
2323 return c; 2919 return c;
… …
2423 case C0_ESC: 3019 case C0_ESC:
2424 process_escape_seq (); 3020 process_escape_seq ();
2425 break; 3021 break;
2426 case C0_ENQ: /* terminal Status */ 3022 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 3023 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3024 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 3025 else
2431 tt_write ((unsigned char *)VT100_ANS, 3026 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 3027 break;
2434 case C0_BEL: /* bell */ 3028 case C0_BEL: /* bell */
2435 scr_bell (); 3029 scr_bell ();
2436 break; 3030 break;
2437 case C0_BS: /* backspace */ 3031 case C0_BS: /* backspace */
… …
2453 break; 3047 break;
2454 case C0_SI: /* shift in - acs */ 3048 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 3049 scr_charset_choose (0);
2456 break; 3050 break;
2457 3051
3052#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 3053 // 8-bit controls
2459 case 0x90: /* DCS */ 3054 case 0x90: /* DCS */
2460 process_dcs_seq (); 3055 process_dcs_seq ();
2461 break; 3056 break;
2462 case 0x9b: /* CSI */ 3057 case 0x9b: /* CSI */
2463 process_csi_seq (); 3058 process_csi_seq ();
2464 break; 3059 break;
2465 case 0x9d: /* CSI */ 3060 case 0x9d: /* CSI */
2466 process_osc_seq (); 3061 process_osc_seq ();
2467 break; 3062 break;
3063#endif
2468 } 3064 }
2469} 3065}
2470/*}}} */ 3066/*}}} */
2471 3067
2472 3068
… …
2534void 3130void
2535rxvt_term::process_escape_seq () 3131rxvt_term::process_escape_seq ()
2536{ 3132{
2537 unicode_t ch = cmd_getc (); 3133 unicode_t ch = cmd_getc ();
2538 3134
2539 if (PrivateModes & PrivMode_vt52) 3135 if (priv_modes & PrivMode_vt52)
2540 { 3136 {
2541 process_escape_vt52 (ch); 3137 process_escape_vt52 (ch);
2542 return; 3138 return;
2543 } 3139 }
2544 3140
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3155 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3156 break;
2561 case '+': 3157 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3158 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3159 break;
2564#ifndef NO_FRILLS 3160#if ENABLE_FRILLS
2565 case '6': 3161 case '6':
2566 scr_backindex (); 3162 scr_backindex ();
2567 break; 3163 break;
2568#endif 3164#endif
2569 case '7': 3165 case '7':
2570 scr_cursor (SAVE); 3166 scr_cursor (SAVE);
2571 break; 3167 break;
2572 case '8': 3168 case '8':
2573 scr_cursor (RESTORE); 3169 scr_cursor (RESTORE);
2574 break; 3170 break;
2575#ifndef NO_FRILLS 3171#if ENABLE_FRILLS
2576 case '9': 3172 case '9':
2577 scr_forwardindex (); 3173 scr_forwardindex ();
2578 break; 3174 break;
2579#endif 3175#endif
2580 case '=': 3176 case '=':
… …
2623 process_dcs_seq (); 3219 process_dcs_seq ();
2624 break; 3220 break;
2625 3221
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3222 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 3223 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 3224 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 3225 break; /* steal obsolete ESC [ c */
2631 3226
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3227 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2633 case C1_CSI: /* ESC [ */ 3228 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 3229 process_csi_seq ();
… …
2661 3256
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3257/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3258/* *INDENT-OFF* */
2664enum { 3259enum {
2665 CSI_ICH = 0x40, 3260 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3261 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3262 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3263 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3264 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3265 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3266 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2759 { 3354 {
2760 switch (priv) 3355 switch (priv)
2761 { 3356 {
2762 case '>': 3357 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3358 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3360 break;
2766 case '?': 3361 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3363 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3364 break;
… …
2874 3469
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3470 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3471 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3472 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3473 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3474 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3475 break;
2881 3476
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3477 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3478 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3479 break;
2886 3480
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3481 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3482 process_sgr_mode (nargs, arg);
2889 break; 3483 break;
… …
2896 break; 3490 break;
2897 case 6: /* CPR requested */ 3491 case 6: /* CPR requested */
2898 scr_report_position (); 3492 scr_report_position ();
2899 break; 3493 break;
2900 case 7: /* unofficial extension */ 3494 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3495 if (OPTION (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3496 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3497 break;
2904 case 8: /* unofficial extension */ 3498 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3499 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3500 break;
2907 } 3501 }
… …
2943 break; 3537 break;
2944 3538
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3539 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3540 if (arg[0] == 4)
2947 scr_insert_mode (0); 3541 scr_insert_mode (0);
3542 else if (arg[0] == 20)
3543 priv_modes &= ~PrivMode_LFNL;
2948 break; 3544 break;
2949 3545
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3546 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3547 if (arg[0] == 4)
2952 scr_insert_mode (1); 3548 scr_insert_mode (1);
3549 else if (arg[0] == 20)
3550 priv_modes |= PrivMode_LFNL;
2953 break; 3551 break;
2954 3552
2955 /* 3553 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3554 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3555 */
… …
2969 break; 3567 break;
2970 case CSI_75: 3568 case CSI_75:
2971 scr_cursor (RESTORE); 3569 scr_cursor (RESTORE);
2972 break; 3570 break;
2973 3571
2974#ifndef NO_FRILLS 3572#if ENABLE_FRILLS
2975 case CSI_74: 3573 case CSI_74:
2976 process_window_ops (arg, nargs); 3574 process_window_ops (arg, nargs);
2977 break; 3575 break;
2978#endif 3576#endif
2979 3577
… …
2986 break; 3584 break;
2987 } 3585 }
2988} 3586}
2989/*}}} */ 3587/*}}} */
2990 3588
2991#ifndef NO_FRILLS 3589#if ENABLE_FRILLS
2992/* ARGSUSED */ 3590/* ARGSUSED */
2993void 3591void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3592rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3593{
2996 int x, y; 3594 int x, y;
2997 XWindowAttributes wattr; 3595 XWindowAttributes wattr;
2998 Window wdummy; 3596 Window wdummy;
3597 dDisp;
2999 3598
3000 if (nargs == 0) 3599 if (nargs == 0)
3001 return; 3600 return;
3002 3601
3003 switch (args[0]) 3602 switch (args[0])
3004 { 3603 {
3005 /* 3604 /*
3006 * commands 3605 * commands
3007 */ 3606 */
3008 case 1: /* deiconify window */ 3607 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3608 XMapWindow (disp, parent[0]);
3010 break; 3609 break;
3011 case 2: /* iconify window */ 3610 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3611 XIconifyWindow (disp, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3612 break;
3015 case 3: /* set position (pixels) */ 3613 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3614 XMoveWindow (disp, parent[0], args[1], args[2]);
3017 break; 3615 break;
3018 case 4: /* set size (pixels) */ 3616 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3618 break;
3021 case 5: /* raise window */ 3619 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3620 XRaiseWindow (disp, parent[0]);
3023 break; 3621 break;
3024 case 6: /* lower window */ 3622 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3623 XLowerWindow (disp, parent[0]);
3026 break; 3624 break;
3027 case 7: /* refresh window */ 3625 case 7: /* refresh window */
3028 scr_touch (true); 3626 scr_touch (true);
3029 break; 3627 break;
3030 case 8: /* set size (chars) */ 3628 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3629 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3033 break; 3631 break;
3034 3632
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3633 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3634 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3635 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3636 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3637 (unsigned int) (args[1] * fheight));
3040 break; 3638 break;
3041 3639
3042 3640
3043 /* 3641 /*
3044 * reports - some output format copied from XTerm 3642 * reports - some output format copied from XTerm
3045 */ 3643 */
3046 case 11: /* report window state */ 3644 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3647 break;
3050 case 13: /* report window position */ 3648 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3649 XGetWindowAttributes (disp, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3650 XTranslateCoordinates (disp, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3651 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3652 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3653 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3654 break;
3057 case 14: /* report window size (pixels) */ 3655 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3656 XGetWindowAttributes (disp, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3658 break;
3061 case 18: /* report text area size (chars) */ 3659 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3660 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3661 break;
3064 case 19: /* report window size (chars) */ 3662 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3663 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3664 break;
3067 case 20: /* report icon label */ 3665 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3666 {
3070 char *s; 3667 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3668 XGetIconName (disp, parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s);
3073 } 3671 }
3074 break; 3672 break;
3075 case 21: /* report window title */ 3673 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3674 {
3078 char *s; 3675 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3676 XFetchName (disp, parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s);
3081 } 3679 }
3082 break; 3680 break;
3083 } 3681 }
3084} 3682}
3085#endif 3683#endif
3086 3684
3087/*----------------------------------------------------------------------*/ 3685/*----------------------------------------------------------------------*/
3088/* 3686/*
3089 * get input up until STRING TERMINATOR (or BEL) 3687 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3688 * ends_how is terminator used. returned input must be free()'d
3091 */ 3689 */
3092unsigned char * 3690char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3691rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3692{
3095 int seen_esc = 0; /* seen escape? */ 3693 unicode_t ch;
3694 bool seen_esc = false;
3096 unsigned int n = 0; 3695 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3696 wchar_t string[STRING_MAX];
3100 3697
3101 while ((ch = cmd_getc ())) 3698 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3699 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3700 if (seen_esc)
3701 {
3107 if (ch == 0x5c) /* 7bit ST */ 3702 if (ch == 0x5c) /* 7bit ST */
3108 break; 3703 break;
3109 else 3704 else
3110 return NULL; 3705 return NULL;
3111 3706 }
3112 if (ch == C0_ESC) 3707 else if (ch == C0_ESC)
3113 { 3708 {
3114 seen_esc = 1; 3709 seen_esc = true;
3115 continue; 3710 continue;
3116 } 3711 }
3712 else if (ch == C0_BEL || ch == CHAR_ST)
3713 break;
3117 else if (ch == C0_HT) 3714 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3715 return NULL; /* other control character - exit */
3121 3716
3122 if (n >= sizeof (string) - 1) 3717 seen_esc = false;
3718
3719 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3720 // stop at some sane length
3124 return NULL; 3721 return NULL;
3125 3722
3723 if (ch == C0_SYN)
3724 string[n++] = cmd_get8 ();
3725 else
3126 string[n++] = ch; 3726 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3727 }
3129 3728
3130 string[n++] = '\0'; 3729 string[n++] = '\0';
3131 3730
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3731 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3732
3137 return s; 3733 return rxvt_wcstombs (string);
3138} 3734}
3139 3735
3140/*----------------------------------------------------------------------*/ 3736/*----------------------------------------------------------------------*/
3141/* 3737/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3738 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3739 */
3144void 3740void
3145rxvt_term::process_dcs_seq () 3741rxvt_term::process_dcs_seq ()
3146{ 3742{
3147 unsigned char *s; 3743 char *s;
3148 unicode_t eh; 3744 unicode_t eh;
3149 3745
3150 /* 3746 /*
3151 * Not handled yet 3747 * Not handled yet
3152 */ 3748 */
… …
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3767 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3768 arg = arg * 10 + (ch - '0');
3173 3769
3174 if (ch == ';') 3770 if (ch == ';')
3175 { 3771 {
3176 unsigned char *s = get_to_st (eh); 3772 char *s = get_to_st (eh);
3177 3773
3178 if (s) 3774 if (s)
3179 { 3775 {
3180 process_xterm_seq (arg, (char *)s, eh); 3776 process_xterm_seq (arg, s, eh);
3181 free (s); 3777 free (s);
3182 } 3778 }
3183 } 3779 }
3184} 3780}
3185 3781
3186void 3782void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3784{
3189 if (str[0] == '?' && !str[1]) 3785 if (str[0] == '?' && !str[1])
3190 { 3786 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3787 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3788 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3790 }
3198 else 3791 else
3199 set_window_color (color, str); 3792 set_window_color (color, str);
3200} 3793}
3201 3794
3202/* 3795/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3797 */
3227void 3798void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3799rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3229{ 3800{
3230 int changed = 0; 3801 int changed = 0;
3231 int color; 3802 int color;
3232 char *buf, *name; 3803 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3804 bool query = str[0] == '?' && !str[1];
3805 int saveop = op;
3806 dDisp;
3234 3807
3235 assert (str != NULL); 3808 assert (str != NULL);
3236 switch (op) 3809 switch (op)
3237 { 3810 {
3238 case XTerm_name: 3811 case XTerm_name:
… …
3245 set_title (str); 3818 set_title (str);
3246 break; 3819 break;
3247 case XTerm_property: 3820 case XTerm_property:
3248 if (str[0] == '?') 3821 if (str[0] == '?')
3249 { 3822 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3823 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3824 Atom actual_type;
3252 int actual_format; 3825 int actual_format;
3253 unsigned long nitems; 3826 unsigned long nitems;
3254 unsigned long bytes_after; 3827 unsigned long bytes_after;
3255 unsigned char *value = 0; 3828 unsigned char *value = 0;
3256 const char *str = ""; 3829 const char *str = "";
3257 3830
3258 if (prop 3831 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3832 && XGetWindowProperty (disp, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3833 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3834 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3835 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3836 && actual_type != None
3264 && actual_format == 8) 3837 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3846 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3847
3275 if (eq) 3848 if (eq)
3276 { 3849 {
3277 *eq = 0; 3850 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3851 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3852 }
3283 else 3853 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3854 XDeleteProperty (disp, parent[0],
3285 display->atom (str)); 3855 display->atom (str));
3286 } 3856 }
3287 break; 3857 break;
3288 3858
3289 case XTerm_Color: 3859 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3860 for (buf = (char *)str; buf && *buf;)
3291 { 3861 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3862 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3863 break;
3294 3864
3295 *name++ = '\0'; 3865 *name++ = '\0';
3296 color = atoi (buf); 3866 color = atoi (buf);
3297 3867
3298 if (color < 0 || color >= TOTAL_COLORS) 3868 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3869 break;
3300 3870
3301 if ((buf = STRCHR (name, ';')) != NULL) 3871 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3872 *buf++ = '\0';
3303 3873
3304 if (name[0] == '?' && !name[1]) 3874 if (name[0] == '?' && !name[1])
3305 { 3875 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3876 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3879 }
3313 else 3880 else
3314 set_window_color (color + minCOLOR, name); 3881 set_window_color (color + minCOLOR, name);
3315 } 3882 }
3316 break; 3883 break;
… …
3338 case XTerm_Color_UL: 3905 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3907 break;
3341 case XTerm_Color_RV: 3908 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3910 break;
3911 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3913 break;
3914#endif
3915#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3918 check_our_parents ();
3919 if (am_transparent)
3920 want_full_refresh = want_refresh = 1;
3343 break; 3921 break;
3344#endif 3922#endif
3345 3923
3346 case XTerm_Pixmap: 3924 case XTerm_Pixmap:
3347 if (*str != ';') 3925 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3352#endif 3930#endif
3353 scr_touch (true); 3931 scr_touch (true);
3354 } 3932 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3356 { 3934 {
3357 str++; 3935 str++;
3358#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
3360#endif 3938#endif
3361
3362 } 3939 }
3940
3363 if (changed) 3941 if (changed)
3364 { 3942 {
3365#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3944 resize_pixmap ();
3367#endif 3945#endif
… …
3378 3956
3379 case XTerm_logfile: 3957 case XTerm_logfile:
3380 // TODO, when secure mode? 3958 // TODO, when secure mode?
3381 break; 3959 break;
3382 3960
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR 3961#ifdef MENUBAR
3424 case XTerm_Menu: 3962 case URxvt_Menu:
3425 if (Options & Opt_insecure) 3963 if (OPTION (Opt_insecure))
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3965 break;
3428#endif 3966#endif
3429#if 0 3967#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3968 case XTerm_dumpscreen: /* no error notices */
… …
3434 { 3972 {
3435 scr_dump (fd); 3973 scr_dump (fd);
3436 close (fd); 3974 close (fd);
3437 } 3975 }
3438 } 3976 }
3977 break;
3978#endif
3979 case XTerm_font:
3980 op = URxvt_font;
3981 case URxvt_font:
3982#if ENABLE_STYLES
3983 case URxvt_boldFont:
3984 case URxvt_italicFont:
3985 case URxvt_boldItalicFont:
3986#endif
3987 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp);
3992 else
3993 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)];
3995
3996 res = strdup (str);
3997 allocated.push_back ((void *)res);
3998 set_fonts ();
3999 }
4000 break;
4001
4002#if ENABLE_FRILLS
4003 case URxvt_locale:
4004 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4006 else
4007 {
4008 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8);
4010 init_xlocale ();
4011 }
4012 break;
4013
4014 case URxvt_view_up:
4015 case URxvt_view_down:
4016 {
4017 int lines = atoi (str);
4018
4019 if (lines)
4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
4021 else
4022 scr_erase_savelines ();
4023 }
4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4031 ; // no responses yet
3439 break; 4032 break;
3440#endif 4033#endif
3441 } 4034 }
3442} 4035}
3443/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
3457{ 4050{
3458 int state; 4051 int state;
3459 4052
3460 if (mode == 's') 4053 if (mode == 's')
3461 { 4054 {
3462 SavedModes |= (PrivateModes & bit); 4055 SavedModes |= (priv_modes & bit);
3463 return -1; 4056 return -1;
3464 } 4057 }
3465 else 4058 else
3466 { 4059 {
3467 if (mode == 'r') 4060 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4061 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 4062 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4063 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 4064 PrivMode (state, bit);
3472 } 4065 }
3473 4066
3474 return state; 4067 return state;
3475} 4068}
… …
3493 { 3, PrivMode_132 }, 4086 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 4087 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4088 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4089 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4090 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4092 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4093#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 4094 { menuBar_esc, PrivMode_menuBar },
3501#endif 4095#endif
4096 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 4098#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4099 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4100#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4101 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4102 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4103 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4104 // 45 margin bell NYI
3512 // 46 start logging 4105 // 46 start logging
… …
3552 } 4145 }
3553 4146
3554 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4148 switch (arg[i])
3556 { 4149 {
4150#if ENABLE_STYLES
4151 case 1021:
4152 if (mode)
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156
4157 scr_touch (true);
4158 break;
4159#endif
3557 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049:
3558 if (Options & Opt_secondaryScreen) 4162 if (OPTION (Opt_secondaryScreen))
3559 if (mode == 0) 4163 if (mode == 0)
3560 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
3561 else if (mode == 1) 4165 else if (mode == 1)
3562 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
3563 break; 4167 break;
… …
3574 * within VT52 mode 4178 * within VT52 mode
3575 */ 4179 */
3576 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
3577 break; 4181 break;
3578 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4185 break;
3582 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
3583 if (state) 4187 if (!state)
3584 Options &= ~Opt_jumpScroll; 4188 SET_OPTION (Opt_jumpScroll);
3585 else 4189 else
3586 Options |= Opt_jumpScroll; 4190 CLR_OPTION (Opt_jumpScroll);
3587 break; 4191 break;
3588 case 5: /* reverse video */ 4192 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
3590 break; 4194 break;
3591 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4199 scr_autowrap (state);
3596 break; 4200 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4201 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4202 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4203 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4204 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4205 break;
3602#ifdef menuBar_esc 4206#ifdef menuBar_esc
3603 case menuBar_esc: 4207 case menuBar_esc:
3604#ifdef MENUBAR 4208#ifdef MENUBAR
3605 map_menuBar (state); 4209 map_menuBar (state);
… …
3625 break; 4229 break;
3626 /* case 66: - application key pad */ 4230 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4231 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4232 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4233 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4234 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4235 break;
3632#if 0 4236#if 0
3633 case 1001: 4237 case 1001:
3634 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
3635#endif 4239#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4241 if (!state)
3638 Options &= ~Opt_scrollTtyOutput; 4242 SET_OPTION (Opt_scrollTtyOutput);
3639 else 4243 else
3640 Options |= Opt_scrollTtyOutput; 4244 CLR_OPTION (Opt_scrollTtyOutput);
3641 break; 4245 break;
3642 case 1011: /* scroll to bottom on key press */ 4246 case 1011: /* scroll to bottom on key press */
3643 if (state) 4247 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4248 SET_OPTION (Opt_scrollTtyKeypress);
3645 else 4249 else
3646 Options &= ~Opt_scrollTtyKeypress; 4250 CLR_OPTION (Opt_scrollTtyKeypress);
3647 break; 4251 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4252 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4253 if (OPTION (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4254 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4255 scr_erase_screen (2);
3652 scr_change_screen (state); 4256 scr_change_screen (state);
3653 break; 4257 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4258 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4259 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4260 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4261 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4262 scr_erase_screen (2);
3659 break; 4263 break;
3660 default: 4264 default:
3661 break; 4265 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4291 rendset = 0, rendstyle = ~RS_None;
3688 break; 4292 break;
3689 case 1: 4293 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4294 rendset = 1, rendstyle = RS_Bold;
3691 break; 4295 break;
4296 //case 2: // low intensity
4297 case 3:
4298 rendset = 1, rendstyle = RS_Italic;
4299 break;
3692 case 4: 4300 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4301 rendset = 1, rendstyle = RS_Uline;
3694 break; 4302 break;
3695 case 5: 4303 case 5: // slowly blinking
4304 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4305 rendset = 1, rendstyle = RS_Blink;
3697 break; 4306 break;
3698 //case 6: // scoansi light background 4307 //case 6: // scoansi light background
3699 case 7: 4308 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4309 rendset = 1, rendstyle = RS_RVid;
3701 break; 4310 break;
3702 case 8: 4311 case 8:
3703 // invisible. NYI 4312 // invisible. NYI
3704 break; 4313 break;
4314 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4315 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4316 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4317 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4318 //...
4319 //case 19: // ninth alt font
4320 //case 20: // gothic
4321 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4322 rendset = 0, rendstyle = RS_Bold;
3710 break; 4323 break;
3711 case 22: 4324 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4325 rendset = 0, rendstyle = RS_Bold;
4326 break;
4327 case 23: // disable italic
4328 rendset = 0, rendstyle = RS_Italic;
3713 break; 4329 break;
3714 case 24: 4330 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4331 rendset = 0, rendstyle = RS_Uline;
3716 break; 4332 break;
3717 case 25: 4333 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4334 rendset = 0, rendstyle = RS_Blink;
3719 break; 4335 break;
4336 case 26: // variable spacing (iso 8613)
4337 rendset = 0, rendstyle = RS_Blink;
4338 break;
3720 case 27: 4339 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4340 rendset = 0, rendstyle = RS_RVid;
3722 break; 4341 break;
3723 case 28:
3724 // visible. NYI 4342 //case 28: // visible. NYI
3725 break; 4343 //case 29: // not crossed-out
3726 } 4344 }
3727 4345
3728 if (rendset != -1) 4346 if (rendset != -1)
3729 { 4347 {
3730 scr_rendition (rendset, rendstyle); 4348 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4359 case 35:
3742 case 36: 4360 case 36:
3743 case 37: 4361 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4363 break;
3746#ifdef TTY_256COLOR 4364 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4365 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4366 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4367 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4368 i += 2;
3752 } 4369 }
3753 break; 4370 break;
3754#endif
3755 case 39: /* default fg */ 4371 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4372 scr_color (Color_fg, Color_fg);
3757 break; 4373 break;
3758 4374
3759 case 40: 4375 case 40:
… …
3764 case 45: 4380 case 45:
3765 case 46: 4381 case 46:
3766 case 47: 4382 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4384 break;
3769#ifdef TTY_256COLOR 4385 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4386 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4387 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4388 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4389 i += 2;
3775 } 4390 }
3776 break; 4391 break;
3777#endif
3778 case 49: /* default bg */ 4392 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4393 scr_color (Color_bg, Color_bg);
3780 break; 4394 break;
3781 4395
3782#ifndef NO_BRIGHTCOLOR 4396 //case 50: // not variable spacing
4397
4398#if ENABLE_FRILLS
3783 case 90: 4399 case 90:
3784 case 91: /* set bright fg color */ 4400 case 91: /* set bright fg color */
3785 case 92: 4401 case 92:
3786 case 93: 4402 case 93:
3787 case 94: 4403 case 94:
3788 case 95: 4404 case 95:
3789 case 96: 4405 case 96:
3790 case 97: 4406 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4407 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4408 break;
3794 case 100: 4409 case 100:
3795 case 101: /* set bright bg color */ 4410 case 101: /* set bright bg color */
3796 case 102: 4411 case 102:
3797 case 103: 4412 case 103:
3798 case 104: 4413 case 104:
3799 case 105: 4414 case 105:
3800 case 106: 4415 case 106:
3801 case 107: 4416 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4417 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4418 break;
3805#endif 4419#endif
3806
3807 } 4420 }
3808 } 4421 }
3809} 4422}
3810/*}}} */ 4423/*}}} */
3811 4424
… …
3815{ 4428{
3816 unicode_t ch, cmd = cmd_getc (); 4429 unicode_t ch, cmd = cmd_getc ();
3817 4430
3818 if (cmd == 'Q') 4431 if (cmd == 'Q')
3819 { /* query graphics */ 4432 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4433 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4434 return;
3822 } 4435 }
3823 /* swallow other graphics sequences until terminating ':' */ 4436 /* swallow other graphics sequences until terminating ':' */
3824 do 4437 do
3825 ch = cmd_getc (); 4438 ch = cmd_getc ();
… …
3835 */ 4448 */
3836void 4449void
3837rxvt_term::tt_printf (const char *fmt,...) 4450rxvt_term::tt_printf (const char *fmt,...)
3838{ 4451{
3839 va_list arg_ptr; 4452 va_list arg_ptr;
3840 unsigned char buf[256]; 4453 char buf[256];
3841 4454
3842 va_start (arg_ptr, fmt); 4455 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4456 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4457 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4458 tt_write (buf, strlen (buf));
3846} 4459}
3847 4460
3848/* ---------------------------------------------------------------------- */ 4461/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4462/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4463 * or generated by us in response to a query ESC sequence.
3851 */ 4464 */
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466
3852void 4467void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4468rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 4469{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4470 if (pty.pty < 0)
4471 return;
3856 4472
3857 if (len) 4473 if (v_buflen == 0)
4474 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4476
4477 if ((unsigned int)written == len)
4478 return;
4479
4480 data += written;
4481 len -= written;
3858 { 4482 }
4483
4484 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4485
4486 memcpy (v_buffer + v_buflen, data, len);
4487 v_buflen += len;
4488
4489 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490}
4491
4492void rxvt_term::pty_write ()
4493{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495
4496 if (written > 0)
4497 {
4498 v_buflen -= written;
4499
3859 if (v_buflen == 0) 4500 if (v_buflen == 0)
3860 { 4501 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4502 free (v_buffer);
3888 v_buffer = 0; 4503 v_buffer = 0;
3889 v_buflen = 0; 4504 v_buflen = 0;
3890 4505
3891 pty_ev.set (EVENT_READ); 4506 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4507 return;
3904 } 4508 }
4509
4510 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4511 }
4512 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4513 pty_ev.set (EVENT_READ);
3906} 4514}
3907 4515
3908/*----------------------- end-of-file (C source) -----------------------*/ 4516/*----------------------- end-of-file (C source) -----------------------*/
3909 4517

Diff Legend

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