ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC

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

Diff Legend

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