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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.247 by root, Sat Jan 7 20:23:52 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-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
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_STR_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
… …
746{ 1102{
747 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
751 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1112 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1114 }
755} 1115}
756#endif 1116#endif
757 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
758bool 1136bool
759rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
760{ 1138{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1140
763 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
764 { 1142 {
765 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");
766 n = 0; 1144 n = 0;
767 } 1145 }
768 1146
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
772 1150
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1152
775 if (n > 0) 1153 if (r > 0)
776 { 1154 {
777 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
778 return true; 1156 return true;
779 } 1157 }
780 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))
781 destroy (); 1170 destroy ();
1171 }
782 1172
783 return false; 1173 return false;
784} 1174}
785 1175
786void 1176void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1178{
789 SET_R (this); 1179 SET_R (this);
790 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
791 1181
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1182 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1183 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1184 while (pty_fill ())
797 if (cmd_parse ()) 1185 if (cmd_parse ())
798 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
799} 1204}
800 1205
801#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
802void 1207void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
816{ 1209{
817 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
818 return; 1211 return;
819 1212
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
821 XFlush (display->display); 1214 XFlush (display->display);
822 1215
823 hidden_pointer = 1; 1216 hidden_pointer = 1;
824} 1217}
825 1218
… …
842 x = ev.x; 1235 x = ev.x;
843 y = ev.y; 1236 y = ev.y;
844 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
845 1238
846 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1240 button_number = 3;
849 }
850 else 1241 else
851 { 1242 {
852 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1245 if (button_number >= 3)
855 button_number += (64 - 3); 1246 button_number += (64 - 3);
856 } 1247 }
857 1248
858 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
859 { 1250 {
860 /* 1251 /*
861 * do not report ButtonRelease 1252 * do not report ButtonRelease
862 * no state info allowed 1253 * no state info allowed
863 */ 1254 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1273#endif
883
884 } 1274 }
885 1275
886#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1278 if (key_state & 16)
889 fputc ('C', stderr); 1279 fputc ('C', stderr);
890 if (key_state & 4) 1280 if (key_state & 4)
891 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1285 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1287 button_number,
898 x + 1, 1288 x + 1,
899 y + 1); 1289 y + 1);
900#else 1290#endif
1291
901 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
903 (32 + x + 1), 1294 (32 + x + 1),
904 (32 + y + 1)); 1295 (32 + y + 1));
905#endif
906} 1296}
907 1297
908#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
909void 1299void
910rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
917 1307
918/*{{{ process an X event */ 1308/*{{{ process an X event */
919void 1309void
920rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
921{ 1311{
1312 dDisp;
1313
922 SET_R (this); 1314 SET_R (this);
923 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
924 1316
925#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
927 { 1319 {
928 if (hidden_cursor) 1320 if (hidden_cursor)
929 { 1321 {
930 hidden_cursor = 0; 1322 hidden_cursor = 0;
931 want_refresh = 1; 1323 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1327 }
936#endif 1328#endif
937 1329
938#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1332 {
941 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1336 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1340 pointer_blank ();
949 } 1341 }
950#endif 1342#endif
951 1343
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1346 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1347
1010 switch (ev.type) 1348 switch (ev.type)
1011 { 1349 {
1012 case KeyPress: 1350 case KeyPress:
1351#if ISO_14755
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1013 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
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1014 break; 1422 break;
1015 1423
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1428 mouse_slip_wheel_speed = 0;
1028 } 1429#endif
1029 break; 1430 break;
1030 } 1431 }
1031#endif
1032 1432
1033 case ButtonPress: 1433 case ButtonPress:
1034 button_press (ev.xbutton); 1434 button_press (ev.xbutton);
1035 break; 1435 break;
1036 1436
… …
1038 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1039 break; 1439 break;
1040 1440
1041 case ClientMessage: 1441 case ClientMessage:
1042 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1044 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1045#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1051 { 1469 {
1052 /* Get Dnd data */ 1470 /* Get Dnd data */
1053 Atom ActualType; 1471 Atom ActualType;
1054 int ActualFormat; 1472 int ActualFormat;
1055 unsigned char *data; 1473 unsigned char *data;
1056 unsigned long Size, RemainingBytes; 1474 unsigned long Size, RemainingBytes;
1057 1475
1058 XGetWindowProperty (display->display, display->root, 1476 XGetWindowProperty (disp, display->root,
1059 xa[XA_DNDSELECTION], 1477 xa[XA_DNDSELECTION],
1060 0L, 1000000L, 1478 0L, 1000000L,
1061 False, AnyPropertyType, 1479 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1480 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1481 &Size, &RemainingBytes,
1064 &data); 1482 &data);
1065 XChangeProperty (display->display, display->root, 1483 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1484 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1072 } 1487 }
1073#endif /* OFFIX_DND */ 1488#endif /* OFFIX_DND */
1074 break; 1489 break;
1075 1490
1076 case MappingNotify: 1491 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1492 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1493 break;
1079 1494
1080 /* 1495 /*
1081 * XXX: this is not the _current_ arrangement 1496 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1497 * Here's my conclusion:
… …
1101 break; 1516 break;
1102 } 1517 }
1103 break; 1518 break;
1104 1519
1105 case FocusIn: 1520 case FocusIn:
1106 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1107 { 1530 {
1108 TermWin.focus = 1; 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1109 want_refresh = 1; 1532 ;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118 1533
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 {
1536 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 }
1539
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541 if (OPTION (Opt_transparent))
1542 check_our_parents ();
1543#endif
1119 } 1544 }
1120 break; 1545 break;
1121 1546
1122 case FocusOut:
1123 if (TermWin.focus)
1124 {
1125 TermWin.focus = 0;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break;
1139
1140 case ConfigureNotify: 1547 case PropertyNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1142 { 1549 && ev.xproperty.state == PropertyNewValue)
1143 int height, width; 1550 selection_property (ev.xproperty.window, ev.xproperty.atom);
1144 1551
1145 do
1146 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152
1153 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1);
1157 }
1158#ifdef DEBUG_SIZE
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent)
1166 {
1167 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif
1172 }
1173 break; 1552 break;
1174 1553
1175 case SelectionClear: 1554 case SelectionClear:
1176 selection_clear (); 1555 selection_clear ();
1177 break; 1556 break;
1178 1557
1179 case SelectionNotify: 1558 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1559 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1561 break;
1184 1562
1185 case SelectionRequest: 1563 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1187 break; 1565 break;
1188 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1189 case UnmapNotify: 1575 case UnmapNotify:
1190 TermWin.mapped = 0; 1576 mapped = 0;
1191#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1193#endif 1579#endif
1194 break; 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1195
1196 case MapNotify:
1197 TermWin.mapped = 1;
1198#ifdef TEXT_BLINK
1199 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1200#endif
1201 break; 1581 break;
1202 1582
1203#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1204 case ReparentNotify: 1584 case ReparentNotify:
1205 rootwin_cb (ev); 1585 rootwin_cb (ev);
1206 break; 1586 break;
1207#endif /* TRANSPARENT */ 1587#endif /* TRANSPARENT */
1208 1588
1209 case GraphicsExpose: 1589 case GraphicsExpose:
1210 case Expose: 1590 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1591 if (ev.xany.window == vt)
1212 { 1592 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1593 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1594 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1595 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1597
1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1599
1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1601 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1602 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1603
1221 // ev.xexpose.width, TermWin.height, False); 1604 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1605 }
1225 else 1606 else
1226 { 1607 {
1227 XEvent unused_event; 1608 XEvent unused_event;
1228 1609
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1230 ; 1611 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1612 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1613 ;
1233 1614
1234 if (isScrollbarWindow (ev.xany.window)) 1615 if (isScrollbarWindow (ev.xany.window))
1235 { 1616 {
1236 scrollBar.setIdle (); 1617 scrollBar.setIdle ();
… …
1238 } 1619 }
1239#ifdef MENUBAR 1620#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1622 menubar_expose ();
1242#endif 1623#endif
1624
1625#ifdef TRANSPARENT
1626 if (am_transparent && ev.xany.window == parent[0])
1627 XClearWindow (disp, ev.xany.window);
1628#endif
1243 } 1629 }
1244 break; 1630 break;
1245 1631
1246 case MotionNotify: 1632 case MotionNotify:
1247#ifdef POINTER_BLANK 1633#ifdef POINTER_BLANK
… …
1253 { 1639 {
1254 menubar_control (ev.xbutton); 1640 menubar_control (ev.xbutton);
1255 break; 1641 break;
1256 } 1642 }
1257#endif 1643#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1645 break;
1260 1646
1261 if (ev.xany.window == TermWin.vt) 1647 if (ev.xany.window == vt)
1262 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1652 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1266 ; 1654 ;
1267 1655
1268 XQueryPointer (display->display, TermWin.vt, 1656 XQueryPointer (disp, vt,
1269 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1659 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1660 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1662 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1663 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1664 {
1277#endif 1665#endif
1666#if ISO_14755
1667 // 5.4
1668 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1669 {
1670 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1671 break;
1672 }
1673#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1674 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1675 ev.xbutton.state & Button3Mask ? 2 : 0);
1676
1280#ifdef SELECTION_SCROLLING 1677#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1678 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1679 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1680 {
1284 int dist; 1681 int dist;
1285 1682
1286 /* don't clobber the current delay if we are 1683 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1684 * already in the middle of scrolling.
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1687 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1688
1292 /* save the event params so we can highlight 1689 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1690 * the selection in the pending-scroll loop
1294 */ 1691 */
1295 selection_save_x=ev.xbutton.x; 1692 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1693 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1694 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1695
1300 /* calc number of lines to scroll */ 1696 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1697 if (ev.xbutton.y < int_bwidth)
1302 { 1698 {
1303 scroll_selection_dir = UP; 1699 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1700 dist = int_bwidth - ev.xbutton.y;
1305 } 1701 }
1306 else 1702 else
1307 { 1703 {
1308 scroll_selection_dir = DN; 1704 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1705 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1706 }
1707
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1708 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1710 + 1;
1314 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1316 } 1713 }
1317 else 1714 else
1318 { 1715 {
1319 /* we are within the text window, so we 1716 /* we are within the text window, so we
1320 * shouldn't be scrolling 1717 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1719 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1720 sel_scroll_ev.stop();
1324 } 1721 }
1325#endif 1722#endif
1326#ifdef MOUSE_THRESHOLD 1723#ifdef MOUSE_THRESHOLD
1327
1328 } 1724 }
1329#endif 1725#endif
1330
1331 } 1726 }
1332 } 1727 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1728 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1729 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1730 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1731 MotionNotify, &ev))
1732 ;
1733
1337 XQueryPointer (display->display, scrollBar.win, 1734 XQueryPointer (disp, scrollBar.win,
1338 &unused_root, &unused_child, 1735 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1736 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1737 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1738 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1740 scrollbar_size ());
1344 scr_refresh (refresh_type); 1741 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1742 refresh_limit = 0;
… …
1348 break; 1745 break;
1349 } 1746 }
1350} 1747}
1351 1748
1352void 1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1816}
1817
1818#if TRANSPARENT
1819void
1353rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1821{
1355 SET_R (this); 1822 SET_R (this);
1356 SET_LOCALE (locale); 1823 SET_LOCALE (locale);
1357 1824
1358 switch (ev.type) 1825 switch (ev.type)
1359 { 1826 {
1360 case PropertyNotify: 1827 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1828 /*
1371 * if user used some Esetroot compatible prog to set the root bg, 1829 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on. 1830 * use the property to determine the pixmap. We use it later on.
1373 */ 1831 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1832 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1378 return; 1834 return;
1379 }
1380 1835
1381 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1382 case ReparentNotify: 1837 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1385 break; 1840 break;
1386#endif
1387 } 1841 }
1388} 1842}
1843#endif
1389 1844
1390void 1845void
1391rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1392{ 1847{
1393 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1394 1849
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1396 if (!bypass_keystate) 1852 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1854
1398 /* 1855 /*
1399 * VT window processing of button press 1856 * VT window processing of button press
1400 */ 1857 */
1401 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1402 { 1859 {
1860#if ISO_14755
1861 // 5.4
1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863 {
1864 iso14755_54 (ev.x, ev.y);
1865 return;
1866 }
1867#endif
1868
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1869 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1870
1404 if (reportmode) 1871 if (reportmode)
1405 { 1872 {
1406 /* mouse report from vt window */ 1873 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1874 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1875 MEvent.state = ev.state;
1409#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1410 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1411 { 1878 {
1412 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1413 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1414 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1415 { 1883 {
1416 /* only report double clicks */ 1884 /* only report double clicks */
1417 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1418 mouse_report (ev); 1886 mouse_report (ev);
… …
1437 } 1905 }
1438 else 1906 else
1439 { 1907 {
1440 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1442 switch (ev.button) 1912 switch (ev.button)
1443 { 1913 {
1444 case Button1: 1914 case Button1:
1915 /* allow meta + click to select rectangular areas */
1916 /* should be done in screen.C */
1917#if ENABLE_FRILLS
1918 selection.rect = !!(ev.state & ModMetaMask);
1919#else
1920 selection.rect = false;
1921#endif
1922
1445 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1925 {
1448 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1450 else 1928 else
1451 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1452 } 1930 }
1453 else 1931 else
1454 { 1932 {
1455 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1456 MEvent.clicks++; 1934 MEvent.clicks++;
1457 else 1935 else
1458 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1459 1937
1460 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1461 } 1939 }
1462 1940
1463 MEvent.button = Button1; 1941 MEvent.button = Button1;
1464 break; 1942 break;
1465 1943
1466 case Button3: 1944 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1469 else 1947 else
1470 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1949
1471 MEvent.button = Button3; 1950 MEvent.button = Button3;
1472 break; 1951 break;
1473 } 1952 }
1474 } 1953 }
1954
1475 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1476 return; 1956 return;
1477 } 1957 }
1478 1958
1479 /* 1959 /*
… …
1571 break; 2051 break;
1572 case R_SB_ALIGN_BOTTOM: 2052 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
1574 break; 2054 break;
1575 } 2055 }
2056
1576 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 2058 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 2059 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 2060 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 2061
1581 scrollBar.setMotion (); 2062 scrollBar.setMotion ();
1582 break; 2063 break;
1583 2064
1584 case Button1: 2065 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2066 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1589 case Button3: 2070 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != R_SB_XTERM)
1591 { 2072 {
1592 if (scrollbar_above_slider (ev.y)) 2073 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2075 scr_page (UP, nrow - 1);
1595# else 2076# else
1596 scr_page (UP, TermWin.nrow / 4); 2077 scr_page (UP, nrow / 4);
1597# endif 2078# endif
1598 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2081 scr_page (DN, nrow - 1);
1601# else 2082# else
1602 scr_page (DN, TermWin.nrow / 4); 2083 scr_page (DN, nrow / 4);
1603# endif 2084# endif
1604 else 2085 else
1605 scrollBar.setMotion (); 2086 scrollBar.setMotion ();
1606 } 2087 }
1607 else 2088 else
1608 { 2089 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2091 (nrow
1611 * scrollbar_position (ev.y) 2092 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2093 / scrollbar_size ()));
1613 } 2094 }
2095
1614 break; 2096 break;
1615 } 2097 }
1616 } 2098 }
2099
1617 return; 2100 return;
1618 } 2101 }
2102
1619#if MENUBAR 2103#if MENUBAR
1620 /* 2104 /*
1621 * Menubar window processing of button press 2105 * Menubar window processing of button press
1622 */ 2106 */
1623 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
1630{ 2114{
1631 int reportmode = 0; 2115 int reportmode = 0;
1632 2116
1633 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2118 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2120
1637 if (scrollbar_isUpDn ()) 2121 if (scrollbar_isUpDn ())
1638 { 2122 {
1639 scrollBar.setIdle (); 2123 scrollBar.setIdle ();
1640 scrollbar_show (0); 2124 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2125#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 2126 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 2127#endif
1644
1645 } 2128 }
2129
1646#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
1649#endif 2133#endif
2134
1650 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1651 { 2136 {
2137#if ISO_14755
2138 // 5.4
2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140 return;
2141#endif
1652 if (reportmode) 2142 if (reportmode)
1653 { 2143 {
1654 /* mouse report from vt window */ 2144 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2145 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2146 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2160 MEvent.button = AnyButton;
1671 mouse_report (ev); 2161 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2163 return;
1674 } 2164 }
2165
1675 /* 2166 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2167 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2168 * when overriding mouse reporting
1678 */ 2169 */
1679 if (PrivateModes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2171 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
1683 2177
1684 switch (ev.button) 2178 switch (ev.button)
1685 { 2179 {
1686 case Button1: 2180 case Button1:
1687 case Button3: 2181 case Button3:
… …
1699 2193
1700 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
1701 2195
1702 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
1703 i = 1; 2197 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2199 i = nrow - 1;
1706 else 2200 else
1707 i = 5; 2201 i = 5;
1708 2202
1709# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
1711 { 2205 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += v ? -1 : 1;
2207 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2209
2210 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2212
2213 slip_wheel_ev.start ();
1714 } 2214 }
2215 else
2216 {
1715# endif 2217# endif
1716# ifdef JUMP_MOUSE_WHEEL 2218# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2219 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2220 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2221 scrollbar_show (1);
2222# else
2223 while (i--)
2224 {
2225 scr_page (v, 1);
2226 scr_refresh (SMOOTH_REFRESH);
2227 scrollbar_show (1);
2228 }
2229# endif
2230# ifdef MOUSE_SLIP_WHEELING
1726 } 2231 }
1727# endif 2232#endif
1728
1729 } 2233 }
1730 break; 2234 break;
1731#endif 2235#endif
1732
1733 } 2236 }
1734 } 2237 }
1735#ifdef MENUBAR 2238#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2239 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2240 menubar_control (ev);
1738#endif 2241#endif
1739} 2242}
1740 2243
1741#ifdef TRANSPARENT 2244#ifdef TRANSPARENT
1742#if TINTING 2245#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2246/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2247
1746static void 2248typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2249
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2250void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2251{
1754 /* No saturation */ 2252 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2253 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2254 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2255 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2256 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2257 int i;
1758 2258
1759 b = ((uint16_t *) ptr)[x]; 2259 Visual *visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2260
1761 g = (b & 0x3e0) * gm; 2261 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2262
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2263 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2264 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2265 mask_g = visual->green_mask;
1766 } 2266 mask_b = visual->blue_mask;
1767 ptr += bpl; 2267
1768 } 2268 /* boring lookup table pre-initialization */
2269 switch (srcImage->bits_per_pixel) {
2270 case 15:
2271 if ((mask_r != 0x7c00) ||
2272 (mask_g != 0x03e0) ||
2273 (mask_b != 0x001f))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2276 lookup_r = lookup;
2277 lookup_g = lookup+32;
2278 lookup_b = lookup+32+32;
2279 sh_r = 10;
2280 sh_g = 5;
2281 sh_b = 0;
2282 break;
2283 case 16:
2284 if ((mask_r != 0xf800) ||
2285 (mask_g != 0x07e0) ||
2286 (mask_b != 0x001f))
2287 return;
2288 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2289 lookup_r = lookup;
2290 lookup_g = lookup+32;
2291 lookup_b = lookup+32+64;
2292 sh_r = 11;
2293 sh_g = 5;
2294 sh_b = 0;
2295 break;
2296 case 24:
2297 if ((mask_r != 0xff0000) ||
2298 (mask_g != 0x00ff00) ||
2299 (mask_b != 0x0000ff))
2300 return;
2301 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2302 lookup_r = lookup;
2303 lookup_g = lookup+256;
2304 lookup_b = lookup+256+256;
2305 sh_r = 16;
2306 sh_g = 8;
2307 sh_b = 0;
2308 break;
2309 case 32:
2310 if ((mask_r != 0xff0000) ||
2311 (mask_g != 0x00ff00) ||
2312 (mask_b != 0x0000ff))
2313 return;
2314 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2315 lookup_r = lookup;
2316 lookup_g = lookup+256;
2317 lookup_b = lookup+256+256;
2318 sh_r = 16;
2319 sh_g = 8;
2320 sh_b = 0;
2321 break;
2322 default:
2323 return; /* we do not support this color depth */
2324 }
2325
2326 /* prepare limits for color transformation (each channel is handled separately) */
2327 if (shade < 0) {
2328 shade = -shade;
2329 if (shade < 0) shade = 0;
2330 if (shade > 100) shade = 100;
2331
2332 lower_lim_r = 65535-rm;
2333 lower_lim_g = 65535-gm;
2334 lower_lim_b = 65535-bm;
2335
2336 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2337 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2338 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2339
2340 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2341 } else {
1770 for (y = h; --y >= 0;) { 2342 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2343 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2344
1774 b = ((uint16_t *) ptr)[x]; 2345 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2346
1776 g = (b & 0x3e0) * gm; 2347 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2348 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2349 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2350 }
1780 b |= (!(b >> 5) - 1); 2351
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2352 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2353 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2354 {
1784 } 2355 unsigned int tmp;
1785 ptr += bpl; 2356
2357 tmp = lower_lim_r;
2358 lower_lim_r = lower_lim_b;
2359 lower_lim_b = tmp;
2360
2361 tmp = upper_lim_r;
2362 upper_lim_r = upper_lim_b;
2363 upper_lim_b = tmp;
2364 }
2365
2366 /* fill our lookup tables */
2367 for (i = 0; i <= mask_r>>sh_r; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2371 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2372 lookup_r[i] = (tmp/65535)<<sh_r;
2373 }
2374 for (i = 0; i <= mask_g>>sh_g; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2378 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2379 lookup_g[i] = (tmp/65535)<<sh_g;
2380 }
2381 for (i = 0; i <= mask_b>>sh_b; i++)
2382 {
2383 RUINT32T tmp;
2384 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2385 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2386 lookup_b[i] = (tmp/65535)<<sh_b;
2387 }
2388
2389 /* apply table to input image (replacing colors by newly calculated ones) */
2390 switch (srcImage->bits_per_pixel)
2391 {
2392 case 15:
2393 {
2394 unsigned short *p1, *pf, *p, *pl;
2395 p1 = (unsigned short *) srcImage->data;
2396 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
1786 } 2402 {
2403 *p = lookup_r[(*p & 0x7c00)>>10] |
2404 lookup_g[(*p & 0x03e0)>> 5] |
2405 lookup_b[(*p & 0x001f)];
2406 }
2407 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2408 }
1788} 2409 break;
1789 2410 }
1790/* RGB 16 */ 2411 case 16:
1791static void 2412 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2413 unsigned short *p1, *pf, *p, *pl;
1793{ 2414 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2415 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2416 while (p1 < pf)
1796 2417 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2418 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2419 pl = p1 + srcImage->width;
1799 /* No saturation */ 2420 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2421 {
1814 } else { 2422 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2423 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2424 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2425 }
1830 ptr += bpl; 2426 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 case 24:
2431 {
2432 unsigned char *p1, *pf, *p, *pl;
2433 p1 = (unsigned char *) srcImage->data;
2434 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width * 3;
2439 for (; p < pl; p += 3)
1831 } 2440 {
2441 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2442 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2443 p[2] = lookup_r[(p[2] & 0x0000ff)];
2444 }
2445 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2446 }
1833} 2447 break;
2448 }
2449 case 32:
2450 {
2451 RUINT32T *p1, *pf, *p, *pl;
2452 p1 = (RUINT32T *) srcImage->data;
2453 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2454
1835/* RGB 24 */ 2455 while (p1 < pf)
1836static void 2456 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2457 p = p1;
1838{ 2458 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2459 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2460 {
1867 } else { 2461 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2462 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2463 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2464 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2465 }
1898 ptr += bpl; 2466 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2467 }
2468 break;
2469 }
1900 } 2470 }
1901}
1902 2471
1903/* RGB 32 */ 2472 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2473}
1974
1975#endif 2474#endif
1976 2475
1977/* 2476/*
1978 * Check our parents are still who we think they are. 2477 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2478 * Do transparency updates if required
… …
1986 Atom atype; 2485 Atom atype;
1987 unsigned char *prop = NULL; 2486 unsigned char *prop = NULL;
1988 Window root, oldp, *list; 2487 Window root, oldp, *list;
1989 Pixmap rootpixmap = None; 2488 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2490 dDisp;
1991 2491
1992 pchanged = 0; 2492 pchanged = 0;
1993 2493
1994 if (!(Options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
1996 2496
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
1999 2499
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2500 XGetWindowAttributes (disp, parent[0], &wattr);
2001 2501
2002 if (rootdepth != wattr.depth) 2502 if (rootdepth != wattr.depth)
2003 { 2503 {
2004 if (am_transparent) 2504 if (am_transparent)
2005 { 2505 {
2006 pchanged = 1; 2506 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2508 am_transparent = am_pixmap_trans = 0;
2009 } 2509 }
2010 2510
2011 return pchanged; /* Don't try any more */ 2511 return pchanged; /* Don't try any more */
2012 } 2512 }
2013 2513
2014 /* Get all X ops out of the queue so that our information is up-to-date. */ 2514 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False); 2515 XSync (disp, False);
2016 2516
2017 /* 2517 /*
2018 * Make the frame window set by the window manager have 2518 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2519 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that. 2520 * windows for each client, so we have to take care about that.
2021 */ 2521 */
2022 i = (xa[XA_XROOTPMAPID] 2522 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2523 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2525 &nitems, &bytes_after, &prop) == Success);
2026 2526
2027 if (!i || prop == NULL) 2527 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2528 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2529 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2530 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2531 &nitems, &bytes_after, &prop) == Success);
2032 2532
2033 if (!i || prop == NULL) 2533 if (!i || prop == NULL
2534#if TINTING
2535 || !rs[Rs_color + Color_tint]
2536#endif
2537 )
2034 have_pixmap = 0; 2538 have_pixmap = 0;
2035 else 2539 else
2036 { 2540 {
2037 have_pixmap = 1; 2541 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2542 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2553 Window cr;
2050 XImage *image; 2554 XImage *image;
2051 GC gc; 2555 GC gc;
2052 XGCValues gcvalue; 2556 XGCValues gcvalue;
2053 2557
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2558 XTranslateCoordinates (disp, parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2559 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2560 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2561 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2562 nx = ny = 0;
2059 2563
… …
2069 nh += sy; 2573 nh += sy;
2070 ny = -sy; 2574 ny = -sy;
2071 sy = 0; 2575 sy = 0;
2072 } 2576 }
2073 2577
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2580
2581 XSync (disp, False);
2076 allowedxerror = -1; 2582 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2584
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2585 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2586 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2587 allowedxerror = 0;
2082 2588
2083 if (image == NULL) 2589 if (image == NULL)
2084 { 2590 {
2085 if (am_transparent && am_pixmap_trans) 2591 if (am_transparent && am_pixmap_trans)
2086 { 2592 {
2087 pchanged = 1; 2593 pchanged = 1;
2088 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2089 { 2595 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2596 XFreePixmap (disp, pixmap);
2091 TermWin.pixmap = None; 2597 pixmap = None;
2092 } 2598 }
2093 } 2599 }
2094 2600
2095 am_pixmap_trans = 0; 2601 am_pixmap_trans = 0;
2096 } 2602 }
2097 else 2603 else
2098 { 2604 {
2099 if (TermWin.pixmap != None) 2605 if (pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2606 XFreePixmap (disp, pixmap);
2101 2607
2102#if TINTING 2608#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2609 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2610 {
2105 unsigned short shade, rm, gm, bm; 2611 unsigned short rm, gm, bm;
2612 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2613
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2614 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2615
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2616 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2617 }
2120#endif 2618#endif
2121 2619
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2620 pixmap = XCreatePixmap (disp, vt,
2123 szHint.width, szHint.height, image->depth); 2621 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2624 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2625 XFreeGC (disp, gc);
2128 XDestroyImage (image); 2626 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2130 TermWin.pixmap); 2628 XClearWindow (disp, parent[0]);
2131 2629
2132 if (!am_transparent || !am_pixmap_trans) 2630 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2631 pchanged = 1;
2134 2632
2135 am_transparent = am_pixmap_trans = 1; 2633 am_transparent = am_pixmap_trans = 1;
2136 } 2634 }
2137 } 2635 }
2138 2636
2139 if (!am_pixmap_trans) 2637 if (am_pixmap_trans)
2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2639 else
2140 { 2640 {
2141 unsigned int n; 2641 unsigned int n;
2142 /* 2642 /*
2143 * InheritPixmap transparency 2643 * InheritPixmap transparency
2144 */ 2644 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2147 { 2646 {
2148 oldp = TermWin.parent[i]; 2647 oldp = parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2648 XQueryTree (disp, parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2649 &parent[i], &list, &n);
2151 XFree (list); 2650 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2651
2154 if (TermWin.parent[i] == display->root) 2652 if (parent[i] == display->root)
2155 { 2653 {
2156 if (oldp != None) 2654 if (oldp != None)
2157 pchanged = 1; 2655 pchanged = 1;
2158 2656
2159 break; 2657 break;
2160 } 2658 }
2161 2659
2162 if (oldp != TermWin.parent[i]) 2660 if (oldp != parent[i])
2163 pchanged = 1; 2661 pchanged = 1;
2164 } 2662 }
2165 2663
2166 n = 0; 2664 n = 0;
2167 2665
2168 if (pchanged) 2666 if (pchanged)
2169 { 2667 {
2170 for (; n < (unsigned int)i; n++) 2668 for (; n < (unsigned int)i; n++)
2171 { 2669 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2670 XGetWindowAttributes (disp, parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2672 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2177 break; 2674 break;
2178 } 2675 }
2179 } 2676 }
2180 } 2677 }
2181 2678
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2183 { 2680 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2683 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2684 /* XXX: also turn off Opt_transparent? */
2189 } 2685 }
2190 else 2686 else
2191 { 2687 {
2192#if WAIT_FOR_WM 2688#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2689 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2690 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2691 sleep (1);
2196#endif 2692#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2693 for (n = 0; n < (unsigned int)i; n++)
2694 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2696 XClearWindow (disp, parent[n]);
2697 }
2200 2698
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2202 am_transparent = 1; 2700 am_transparent = 1;
2203 } 2701 }
2204 2702
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2704 parent[i] = None;
2705 }
2706
2707 if (scrollBar.win)
2708 {
2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2710 scrollBar.setIdle ();
2711 scrollbar_show (0);
2712 }
2713
2714 if (am_transparent)
2715 {
2716 want_refresh = want_full_refresh = 1;
2717 if (am_pixmap_trans)
2718 flush ();
2207 } 2719 }
2208 2720
2209 return pchanged; 2721 return pchanged;
2210} 2722}
2211#endif 2723#endif
… …
2214 2726
2215bool 2727bool
2216rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2217{ 2729{
2218 bool flag = false; 2730 bool flag = false;
2219 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2221 2733
2222 for (;;) 2734 for (;;)
2223 { 2735 {
2224 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2225 { 2737 {
2226 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2739 ch = next_char ();
2228 }
2229 2740
2230 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2231 break; 2742 break;
2743 }
2232 2744
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2746 {
2747 if (!seen_input)
2748 {
2749 seen_input = 1;
2750 // many badly-written programs (e.g. jed) contain a race condition:
2751 // they first read the screensize and then install a SIGWINCH handler.
2752 // some window managers resize the window early, and these programs
2753 // then sometimes get the size wrong.
2754 // unfortunately other programs are even more buggy and dislike
2755 // being sent SIGWINCH, so only do it when we were in fact being
2756 // resized.
2757 if (seen_resize && cmd_pid)
2758 kill (-cmd_pid, SIGWINCH);
2759 }
2760
2235 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2763 bool refreshnow = false;
2238 int nlines = 0; 2764 int nlines = 0;
2239 unicode_t *str = buf; 2765 wchar_t *str = buf;
2240 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2767
2243 for (;;) 2768 for (;;)
2244 { 2769 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2771 break;
2250 2772
2251 *str++ = ch; 2773 *str++ = ch;
2252 2774
2253 if (ch == C0_LF) 2775 if (ch == C0_LF || str >= eol)
2254 { 2776 {
2777 if (ch == C0_LF)
2255 nlines++; 2778 nlines++;
2779
2256 refresh_count++; 2780 refresh_count++;
2257 2781
2258 if (! (Options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2260 { 2784 {
2261 refreshnow = true; 2785 refreshnow = true;
2262 flag = true; 2786 refresh_count = 0;
2263 ch = NOCHAR; 2787 ch = NOCHAR;
2264 break; 2788 break;
2265 } 2789 }
2266 2790
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2792 if (nlines >= nrow - 1)
2269 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2270 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2271 nlines = 0; 2797 nlines = 0;
2272 str = buf; 2798 str = buf;
2799 eol = str + min (ncol, UBUFSIZ);
2273 } 2800 }
2801
2802 if (str >= eol)
2803 {
2804 if (eol >= buf + UBUFSIZ)
2805 {
2806 ch = NOCHAR;
2807 break;
2808 }
2809 else
2810 eol = min (eol + ncol, buf + UBUFSIZ);
2811 }
2812
2274 } 2813 }
2275 2814
2276 if (str >= buf + UBUFSIZ) 2815 seq_begin = cmdbuf_ptr;
2277 { 2816 ch = next_char ();
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2817 }
2282 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2283 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2284 2821
2285 /* 2822 /*
2286 * If there have been a lot of new lines, then update the screen 2823 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2824 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2825 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2827 */
2294 if (refreshnow) 2828 if (refreshnow)
2295 { 2829 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2831 refresh_limit++;
2298 else 2832 else
2833 {
2834 flag = true;
2299 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2837 }
2300 } 2838 }
2301 2839
2302 } 2840 }
2303 else 2841 else
2304 { 2842 {
… …
2318 } 2856 }
2319 2857
2320 return flag; 2858 return flag;
2321} 2859}
2322 2860
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330}
2331
2332// read the next character 2861// read the next character
2333unicode_t 2862wchar_t
2334rxvt_term::next_char () 2863rxvt_term::next_char ()
2335{ 2864{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2866 {
2338 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2341 2870
2342 wchar_t wc; 2871 wchar_t wc;
2343 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2344 2873
2345 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2346 { 2875 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2349 break; 2878 break;
2350 } 2879 }
2351 2880
2352 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354 2883
2355 // assume wchar == unicode 2884 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2357 return wc; 2886 return wc & UNICODE_MASK;
2358 } 2887 }
2359 2888
2360 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2361} 2899}
2362 2900
2363/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2364/* 2902/*
2365 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2366 * to the command. 2904 * to the command.
2367 */ 2905 */
2368unicode_t 2906wchar_t
2369rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2370{ 2908{
2371 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2372 2910
2373 if (c == NOCHAR) 2911 if (c == NOCHAR)
2374 throw out_of_input; 2912 throw out_of_input;
2375 2913
2376 return c; 2914 return c;
2377} 2915}
2378 2916
2379unicode_t 2917uint32_t
2380rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2381{ 2919{
2382 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2383 2921
2384 if (c == NOCHAR) 2922 if (c == NOCHAR)
2385 throw out_of_input; 2923 throw out_of_input;
2386 2924
2387 return c; 2925 return c;
… …
2487 case C0_ESC: 3025 case C0_ESC:
2488 process_escape_seq (); 3026 process_escape_seq ();
2489 break; 3027 break;
2490 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 3031 else
2495 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 3033 break;
2498 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2499 scr_bell (); 3035 scr_bell ();
2500 break; 3036 break;
2501 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
2600void 3136void
2601rxvt_term::process_escape_seq () 3137rxvt_term::process_escape_seq ()
2602{ 3138{
2603 unicode_t ch = cmd_getc (); 3139 unicode_t ch = cmd_getc ();
2604 3140
2605 if (PrivateModes & PrivMode_vt52) 3141 if (priv_modes & PrivMode_vt52)
2606 { 3142 {
2607 process_escape_vt52 (ch); 3143 process_escape_vt52 (ch);
2608 return; 3144 return;
2609 } 3145 }
2610 3146
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 3161 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 3162 break;
2627 case '+': 3163 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3164 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3165 break;
2630#ifndef NO_FRILLS 3166#if ENABLE_FRILLS
2631 case '6': 3167 case '6':
2632 scr_backindex (); 3168 scr_backindex ();
2633 break; 3169 break;
2634#endif 3170#endif
2635 case '7': 3171 case '7':
2636 scr_cursor (SAVE); 3172 scr_cursor (SAVE);
2637 break; 3173 break;
2638 case '8': 3174 case '8':
2639 scr_cursor (RESTORE); 3175 scr_cursor (RESTORE);
2640 break; 3176 break;
2641#ifndef NO_FRILLS 3177#if ENABLE_FRILLS
2642 case '9': 3178 case '9':
2643 scr_forwardindex (); 3179 scr_forwardindex ();
2644 break; 3180 break;
2645#endif 3181#endif
2646 case '=': 3182 case '=':
… …
2656 break; 3192 break;
2657 3193
2658 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
2660 { 3196 {
2661 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2663 } 3199 }
2664 break; 3200 break;
2665 3201
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
2689 process_dcs_seq (); 3225 process_dcs_seq ();
2690 break; 3226 break;
2691 3227
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
2697 3232
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2699 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 3235 process_csi_seq ();
… …
2825 { 3360 {
2826 switch (priv) 3361 switch (priv)
2827 { 3362 {
2828 case '>': 3363 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 3364 if (ch == CSI_DA) /* secondary device attributes */
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3365 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2831 break; 3366 break;
2832 case '?': 3367 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3368 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3369 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3370 break;
… …
2940 3475
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3476 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 3477 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 3481 break;
2947 3482
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3485 break;
2952 3486
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
2955 break; 3489 break;
… …
2962 break; 3496 break;
2963 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
2964 scr_report_position (); 3498 scr_report_position ();
2965 break; 3499 break;
2966 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3503 break;
2970 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3506 break;
2973 } 3507 }
… …
3009 break; 3543 break;
3010 3544
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3545 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3546 if (arg[0] == 4)
3013 scr_insert_mode (0); 3547 scr_insert_mode (0);
3548 else if (arg[0] == 20)
3549 priv_modes &= ~PrivMode_LFNL;
3014 break; 3550 break;
3015 3551
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3552 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3553 if (arg[0] == 4)
3018 scr_insert_mode (1); 3554 scr_insert_mode (1);
3555 else if (arg[0] == 20)
3556 priv_modes |= PrivMode_LFNL;
3019 break; 3557 break;
3020 3558
3021 /* 3559 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3560 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3561 */
… …
3035 break; 3573 break;
3036 case CSI_75: 3574 case CSI_75:
3037 scr_cursor (RESTORE); 3575 scr_cursor (RESTORE);
3038 break; 3576 break;
3039 3577
3040#ifndef NO_FRILLS 3578#if ENABLE_FRILLS
3041 case CSI_74: 3579 case CSI_74:
3042 process_window_ops (arg, nargs); 3580 process_window_ops (arg, nargs);
3043 break; 3581 break;
3044#endif 3582#endif
3045 3583
… …
3052 break; 3590 break;
3053 } 3591 }
3054} 3592}
3055/*}}} */ 3593/*}}} */
3056 3594
3057#ifndef NO_FRILLS 3595#if ENABLE_FRILLS
3058/* ARGSUSED */ 3596/* ARGSUSED */
3059void 3597void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3598rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3599{
3062 int x, y; 3600 int x, y;
3063 XWindowAttributes wattr; 3601 XWindowAttributes wattr;
3064 Window wdummy; 3602 Window wdummy;
3603 dDisp;
3065 3604
3066 if (nargs == 0) 3605 if (nargs == 0)
3067 return; 3606 return;
3068 3607
3069 switch (args[0]) 3608 switch (args[0])
3070 { 3609 {
3071 /* 3610 /*
3072 * commands 3611 * commands
3073 */ 3612 */
3074 case 1: /* deiconify window */ 3613 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3614 XMapWindow (disp, parent[0]);
3076 break; 3615 break;
3077 case 2: /* iconify window */ 3616 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3617 XIconifyWindow (disp, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3618 break;
3081 case 3: /* set position (pixels) */ 3619 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3620 XMoveWindow (disp, parent[0], args[1], args[2]);
3083 break; 3621 break;
3084 case 4: /* set size (pixels) */ 3622 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3624 break;
3087 case 5: /* raise window */ 3625 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3626 XRaiseWindow (disp, parent[0]);
3089 break; 3627 break;
3090 case 6: /* lower window */ 3628 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3629 XLowerWindow (disp, parent[0]);
3092 break; 3630 break;
3093 case 7: /* refresh window */ 3631 case 7: /* refresh window */
3094 scr_touch (true); 3632 scr_touch (true);
3095 break; 3633 break;
3096 case 8: /* set size (chars) */ 3634 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3635 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3099 break; 3637 break;
3100 3638
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3639 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3640 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3641 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3642 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3643 (unsigned int) (args[1] * fheight));
3106 break; 3644 break;
3107 3645
3108 3646
3109 /* 3647 /*
3110 * reports - some output format copied from XTerm 3648 * reports - some output format copied from XTerm
3111 */ 3649 */
3112 case 11: /* report window state */ 3650 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3653 break;
3116 case 13: /* report window position */ 3654 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3656 XTranslateCoordinates (disp, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3657 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3658 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3659 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3660 break;
3123 case 14: /* report window size (pixels) */ 3661 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3662 XGetWindowAttributes (disp, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3664 break;
3127 case 18: /* report text area size (chars) */ 3665 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3667 break;
3130 case 19: /* report window size (chars) */ 3668 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3669 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3670 break;
3133 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3672 {
3136 char *s; 3673 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3676 XFree (s);
3139 } 3677 }
3140 break; 3678 break;
3141 case 21: /* report window title */ 3679 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3680 {
3144 char *s; 3681 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3684 XFree (s);
3147 } 3685 }
3148 break; 3686 break;
3149 } 3687 }
3150} 3688}
3151#endif 3689#endif
3152 3690
3153/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3154/* 3692/*
3155 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3157 */ 3695 */
3158unsigned char * 3696char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3698{
3161 unicode_t prev = 0, ch; 3699 unicode_t ch;
3700 bool seen_esc = false;
3162 unsigned int n = 0; 3701 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3702 wchar_t string[STRING_MAX];
3165 3703
3166 while ((ch = cmd_getc ()) != NOCHAR) 3704 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3705 {
3168 if (prev == C0_ESC) 3706 if (seen_esc)
3169 { 3707 {
3170 if (ch == 0x5c) /* 7bit ST */ 3708 if (ch == 0x5c) /* 7bit ST */
3171 break; 3709 break;
3172 else 3710 else
3173 return NULL; 3711 return NULL;
3174 } 3712 }
3713 else if (ch == C0_ESC)
3714 {
3715 seen_esc = true;
3716 continue;
3717 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3718 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3719 break;
3177 else if (ch < 0x20) 3720 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3721 return NULL; /* other control character - exit */
3179 3722
3180 if (n >= sizeof (string) - 1) 3723 seen_esc = false;
3724
3725 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3726 // stop at some sane length
3182 return NULL; 3727 return NULL;
3183 3728
3184 if (ch == C0_SYN) 3729 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3730 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3731 else
3190 string[n++] = prev = ch; 3732 string[n++] = ch;
3191 } 3733 }
3192 3734
3193 string[n++] = '\0'; 3735 string[n++] = '\0';
3194 3736
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3738
3200 return s; 3739 return rxvt_wcstombs (string);
3201} 3740}
3202 3741
3203/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3204/* 3743/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3745 */
3207void 3746void
3208rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3209{ 3748{
3210 unsigned char *s; 3749 char *s;
3211 unicode_t eh; 3750 unicode_t eh;
3212 3751
3213 /* 3752 /*
3214 * Not handled yet 3753 * Not handled yet
3215 */ 3754 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3236 3775
3237 if (ch == ';') 3776 if (ch == ';')
3238 { 3777 {
3239 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3240 3779
3241 if (s) 3780 if (s)
3242 { 3781 {
3243 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3244 free (s); 3783 free (s);
3245 } 3784 }
3246 } 3785 }
3247} 3786}
3248 3787
3249void 3788void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3251{ 3790{
3252 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3253 { 3792 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3793 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3795 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3796 }
3261 else 3797 else
3262 set_window_color (color, str); 3798 set_window_color (color, str);
3263} 3799}
3264 3800
3265/* 3801/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3803 */
3290void 3804void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3806{
3293 int changed = 0; 3807 int changed = 0;
3294 int color; 3808 int color;
3295 char *buf, *name; 3809 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
3811 int saveop = op;
3812 dDisp;
3297 3813
3298 assert (str != NULL); 3814 assert (str != NULL);
3299 switch (op) 3815 switch (op)
3300 { 3816 {
3301 case XTerm_name: 3817 case XTerm_name:
… …
3308 set_title (str); 3824 set_title (str);
3309 break; 3825 break;
3310 case XTerm_property: 3826 case XTerm_property:
3311 if (str[0] == '?') 3827 if (str[0] == '?')
3312 { 3828 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3829 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3830 Atom actual_type;
3315 int actual_format; 3831 int actual_format;
3316 unsigned long nitems; 3832 unsigned long nitems;
3317 unsigned long bytes_after; 3833 unsigned long bytes_after;
3318 unsigned char *value = 0; 3834 unsigned char *value = 0;
3319 const char *str = ""; 3835 const char *str = "";
3320 3836
3321 if (prop 3837 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3838 && XGetWindowProperty (disp, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3839 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3840 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3841 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3842 && actual_type != None
3327 && actual_format == 8) 3843 && actual_format == 8)
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3852 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3853
3338 if (eq) 3854 if (eq)
3339 { 3855 {
3340 *eq = 0; 3856 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3857 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3858 }
3346 else 3859 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3860 XDeleteProperty (disp, parent[0],
3348 display->atom (str)); 3861 display->atom (str));
3349 } 3862 }
3350 break; 3863 break;
3351 3864
3352 case XTerm_Color: 3865 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3866 for (buf = (char *)str; buf && *buf;)
3354 { 3867 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3868 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3869 break;
3357 3870
3358 *name++ = '\0'; 3871 *name++ = '\0';
3359 color = atoi (buf); 3872 color = atoi (buf);
3360 3873
3361 if (color < 0 || color >= TOTAL_COLORS) 3874 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3875 break;
3363 3876
3364 if ((buf = STRCHR (name, ';')) != NULL) 3877 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3878 *buf++ = '\0';
3366 3879
3367 if (name[0] == '?' && !name[1]) 3880 if (name[0] == '?' && !name[1])
3368 { 3881 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3882 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3883 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3884 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3885 }
3376 else 3886 else
3377 set_window_color (color + minCOLOR, name); 3887 set_window_color (color + minCOLOR, name);
3378 } 3888 }
3379 break; 3889 break;
… …
3401 case XTerm_Color_UL: 3911 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3913 break;
3404 case XTerm_Color_RV: 3914 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3916 break;
3917 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break;
3920#endif
3921#if TRANSPARENT && TINTING
3922 case URxvt_Color_tint:
3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3924 check_our_parents ();
3925 if (am_transparent)
3926 want_full_refresh = want_refresh = 1;
3406 break; 3927 break;
3407#endif 3928#endif
3408 3929
3409 case XTerm_Pixmap: 3930 case XTerm_Pixmap:
3410 if (*str != ';') 3931 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3934 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3935 set_bgPixmap (str); /* change pixmap */
3415#endif 3936#endif
3416 scr_touch (true); 3937 scr_touch (true);
3417 } 3938 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3419 { 3940 {
3420 str++; 3941 str++;
3421#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
3423#endif 3944#endif
3424
3425 } 3945 }
3946
3426 if (changed) 3947 if (changed)
3427 { 3948 {
3428#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3950 resize_pixmap ();
3430#endif 3951#endif
… …
3441 3962
3442 case XTerm_logfile: 3963 case XTerm_logfile:
3443 // TODO, when secure mode? 3964 // TODO, when secure mode?
3444 break; 3965 break;
3445 3966
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3467 else
3468 {
3469 set_locale (str);
3470# ifdef USE_XIM
3471 im_cb ();
3472# endif
3473 }
3474 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR 3967#ifdef MENUBAR
3487 case XTerm_Menu: 3968 case URxvt_Menu:
3488 if (Options & Opt_insecure) 3969 if (OPTION (Opt_insecure))
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3971 break;
3491#endif 3972#endif
3492#if 0 3973#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3974 case XTerm_dumpscreen: /* no error notices */
… …
3497 { 3978 {
3498 scr_dump (fd); 3979 scr_dump (fd);
3499 close (fd); 3980 close (fd);
3500 } 3981 }
3501 } 3982 }
3983 break;
3984#endif
3985 case XTerm_font:
3986 op = URxvt_font;
3987 case URxvt_font:
3988#if ENABLE_STYLES
3989 case URxvt_boldFont:
3990 case URxvt_italicFont:
3991 case URxvt_boldItalicFont:
3992#endif
3993 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp);
3998 else
3999 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
4001
4002 res = strdup (str);
4003 allocated.push_back ((void *)res);
4004 set_fonts ();
4005 }
4006 break;
4007
4008#if ENABLE_FRILLS
4009 case URxvt_locale:
4010 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4012 else
4013 {
4014 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8);
4016 init_xlocale ();
4017 }
4018 break;
4019
4020 case URxvt_view_up:
4021 case URxvt_view_down:
4022 {
4023 int lines = atoi (str);
4024
4025 if (lines)
4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
4027 else
4028 scr_erase_savelines ();
4029 }
4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3502 break; 4038 break;
3503#endif 4039#endif
3504 } 4040 }
3505} 4041}
3506/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3520{ 4056{
3521 int state; 4057 int state;
3522 4058
3523 if (mode == 's') 4059 if (mode == 's')
3524 { 4060 {
3525 SavedModes |= (PrivateModes & bit); 4061 SavedModes |= (priv_modes & bit);
3526 return -1; 4062 return -1;
3527 } 4063 }
3528 else 4064 else
3529 { 4065 {
3530 if (mode == 'r') 4066 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 4068 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4069 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 4070 PrivMode (state, bit);
3535 } 4071 }
3536 4072
3537 return state; 4073 return state;
3538} 4074}
… …
3556 { 3, PrivMode_132 }, 4092 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 4093 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 4099#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 4100 { menuBar_esc, PrivMode_menuBar },
3564#endif 4101#endif
4102 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 4104#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 4105 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 4106#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 4107 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 4108 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 4109 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 4110 // 45 margin bell NYI
3575 // 46 start logging 4111 // 46 start logging
… …
3615 } 4151 }
3616 4152
3617 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
3618 switch (arg[i]) 4154 switch (arg[i])
3619 { 4155 {
4156#if ENABLE_STYLES
4157 case 1021:
4158 if (mode)
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162
4163 scr_touch (true);
4164 break;
4165#endif
3620 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4167 case 1049:
3621 if (Options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
3622 if (mode == 0) 4169 if (mode == 0)
3623 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
3624 else if (mode == 1) 4171 else if (mode == 1)
3625 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
3626 break; 4173 break;
… …
3637 * within VT52 mode 4184 * within VT52 mode
3638 */ 4185 */
3639 PrivMode (1, PrivMode_vt52); 4186 PrivMode (1, PrivMode_vt52);
3640 break; 4187 break;
3641 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
3644 break; 4191 break;
3645 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
3646 if (state) 4193 if (!state)
3647 Options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
3648 else 4195 else
3649 Options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
3650 break; 4197 break;
3651 case 5: /* reverse video */ 4198 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
3653 break; 4200 break;
3654 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4205 scr_autowrap (state);
3659 break; 4206 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 4207 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 4208 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4209 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4210 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4211 break;
3665#ifdef menuBar_esc 4212#ifdef menuBar_esc
3666 case menuBar_esc: 4213 case menuBar_esc:
3667#ifdef MENUBAR 4214#ifdef MENUBAR
3668 map_menuBar (state); 4215 map_menuBar (state);
… …
3688 break; 4235 break;
3689 /* case 66: - application key pad */ 4236 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4237 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4238 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4239 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4240 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4241 break;
3695#if 0 4242#if 0
3696 case 1001: 4243 case 1001:
3697 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
3698#endif 4245#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4247 if (!state)
3701 Options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
3702 else 4249 else
3703 Options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
3704 break; 4251 break;
3705 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
3706 if (state) 4253 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
3708 else 4255 else
3709 Options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
3710 break; 4257 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4261 scr_erase_screen (2);
3715 scr_change_screen (state); 4262 scr_change_screen (state);
3716 break; 4263 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4265 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4268 scr_erase_screen (2);
3722 break; 4269 break;
3723 default: 4270 default:
3724 break; 4271 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4297 rendset = 0, rendstyle = ~RS_None;
3751 break; 4298 break;
3752 case 1: 4299 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4300 rendset = 1, rendstyle = RS_Bold;
3754 break; 4301 break;
4302 //case 2: // low intensity
4303 case 3:
4304 rendset = 1, rendstyle = RS_Italic;
4305 break;
3755 case 4: 4306 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4307 rendset = 1, rendstyle = RS_Uline;
3757 break; 4308 break;
3758 case 5: 4309 case 5: // slowly blinking
4310 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4311 rendset = 1, rendstyle = RS_Blink;
3760 break; 4312 break;
3761 //case 6: // scoansi light background 4313 //case 6: // scoansi light background
3762 case 7: 4314 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4315 rendset = 1, rendstyle = RS_RVid;
3764 break; 4316 break;
3765 case 8: 4317 case 8:
3766 // invisible. NYI 4318 // invisible. NYI
3767 break; 4319 break;
4320 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4321 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4322 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4323 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4324 //...
4325 //case 19: // ninth alt font
4326 //case 20: // gothic
4327 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4328 rendset = 0, rendstyle = RS_Bold;
3773 break; 4329 break;
3774 case 22: 4330 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4331 rendset = 0, rendstyle = RS_Bold;
4332 break;
4333 case 23: // disable italic
4334 rendset = 0, rendstyle = RS_Italic;
3776 break; 4335 break;
3777 case 24: 4336 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4337 rendset = 0, rendstyle = RS_Uline;
3779 break; 4338 break;
3780 case 25: 4339 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4340 rendset = 0, rendstyle = RS_Blink;
3782 break; 4341 break;
4342 case 26: // variable spacing (iso 8613)
4343 rendset = 0, rendstyle = RS_Blink;
4344 break;
3783 case 27: 4345 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4346 rendset = 0, rendstyle = RS_RVid;
3785 break; 4347 break;
3786 case 28:
3787 // visible. NYI 4348 //case 28: // visible. NYI
3788 break; 4349 //case 29: // not crossed-out
3789 } 4350 }
3790 4351
3791 if (rendset != -1) 4352 if (rendset != -1)
3792 { 4353 {
3793 scr_rendition (rendset, rendstyle); 4354 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4365 case 35:
3805 case 36: 4366 case 36:
3806 case 37: 4367 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4368 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4369 break;
3809#ifdef TTY_256COLOR 4370 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4371 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4372 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4373 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4374 i += 2;
3815 } 4375 }
3816 break; 4376 break;
3817#endif
3818 case 39: /* default fg */ 4377 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4378 scr_color (Color_fg, Color_fg);
3820 break; 4379 break;
3821 4380
3822 case 40: 4381 case 40:
… …
3827 case 45: 4386 case 45:
3828 case 46: 4387 case 46:
3829 case 47: 4388 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4389 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4390 break;
3832#ifdef TTY_256COLOR 4391 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4392 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4393 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4394 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4395 i += 2;
3838 } 4396 }
3839 break; 4397 break;
3840#endif
3841 case 49: /* default bg */ 4398 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
3843 break; 4400 break;
3844 4401
3845#ifndef NO_BRIGHTCOLOR 4402 //case 50: // not variable spacing
4403
4404#if ENABLE_FRILLS
3846 case 90: 4405 case 90:
3847 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
3848 case 92: 4407 case 92:
3849 case 93: 4408 case 93:
3850 case 94: 4409 case 94:
3851 case 95: 4410 case 95:
3852 case 96: 4411 case 96:
3853 case 97: 4412 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4414 break;
3857 case 100: 4415 case 100:
3858 case 101: /* set bright bg color */ 4416 case 101: /* set bright bg color */
3859 case 102: 4417 case 102:
3860 case 103: 4418 case 103:
3861 case 104: 4419 case 104:
3862 case 105: 4420 case 105:
3863 case 106: 4421 case 106:
3864 case 107: 4422 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4424 break;
3868#endif 4425#endif
3869
3870 } 4426 }
3871 } 4427 }
3872} 4428}
3873/*}}} */ 4429/*}}} */
3874 4430
… …
3878{ 4434{
3879 unicode_t ch, cmd = cmd_getc (); 4435 unicode_t ch, cmd = cmd_getc ();
3880 4436
3881 if (cmd == 'Q') 4437 if (cmd == 'Q')
3882 { /* query graphics */ 4438 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4439 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4440 return;
3885 } 4441 }
3886 /* swallow other graphics sequences until terminating ':' */ 4442 /* swallow other graphics sequences until terminating ':' */
3887 do 4443 do
3888 ch = cmd_getc (); 4444 ch = cmd_getc ();
… …
3898 */ 4454 */
3899void 4455void
3900rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
3901{ 4457{
3902 va_list arg_ptr; 4458 va_list arg_ptr;
3903 unsigned char buf[256]; 4459 char buf[256];
3904 4460
3905 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4463 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4464 tt_write (buf, strlen (buf));
3909} 4465}
3910 4466
3911/* ---------------------------------------------------------------------- */ 4467/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4468/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
3914 */ 4470 */
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472
3915void 4473void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
3917{ 4475{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4476 if (pty.pty < 0)
4477 return;
3919 4478
3920 if (len) 4479 if (v_buflen == 0)
4480 {
4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4482
4483 if ((unsigned int)written == len)
4484 return;
4485
4486 data += written;
4487 len -= written;
3921 { 4488 }
4489
4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4491
4492 memcpy (v_buffer + v_buflen, data, len);
4493 v_buflen += len;
4494
4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
4496}
4497
4498void rxvt_term::pty_write ()
4499{
4500 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501
4502 if (written > 0)
4503 {
4504 v_buflen -= written;
4505
3922 if (v_buflen == 0) 4506 if (v_buflen == 0)
3923 { 4507 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4508 free (v_buffer);
3951 v_buffer = 0; 4509 v_buffer = 0;
3952 v_buflen = 0; 4510 v_buflen = 0;
3953 4511
3954 pty_ev.set (EVENT_READ); 4512 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4513 return;
3967 } 4514 }
4515
4516 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4517 }
4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4519 pty_ev.set (EVENT_READ);
3969} 4520}
3970 4521
3971/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
3972 4523

Diff Legend

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