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.95 by pcg, Sun May 9 18:19:49 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 // I don't understand this, so I changed it :) 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, Expose, &unused_event)) 1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 ; 1602 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1604 ;
1190 1605
1191 if (isScrollbarWindow (ev.xany.window)) 1606 if (isScrollbarWindow (ev.xany.window))
1192 { 1607 {
1193 scrollBar.setIdle (); 1608 scrollBar.setIdle ();
… …
1195 } 1610 }
1196#ifdef MENUBAR 1611#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 menubar_expose (); 1613 menubar_expose ();
1199#endif 1614#endif
1615
1616#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window);
1619#endif
1200 } 1620 }
1201 break; 1621 break;
1202 1622
1203 case MotionNotify: 1623 case MotionNotify:
1204#ifdef POINTER_BLANK 1624#ifdef POINTER_BLANK
… …
1210 { 1630 {
1211 menubar_control (ev.xbutton); 1631 menubar_control (ev.xbutton);
1212 break; 1632 break;
1213 } 1633 }
1214#endif 1634#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1216 break; 1636 break;
1217 1637
1218 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1219 { 1639 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1641 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1223 ; 1643 ;
1224 1644
1225 XQueryPointer (display->display, TermWin.vt, 1645 XQueryPointer (disp, vt,
1226 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1648 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1649 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1651 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1652 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1653 {
1234#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
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1665
1237#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1240 { 1669 {
1241 int dist; 1670 int dist;
1242
1243 pending_scroll_selection=1;
1244 1671
1245 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1247 */ 1674 */
1248 if (scroll_selection_delay<=0) 1675 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1676 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1677
1251 /* save the event params so we can highlight 1678 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1679 * the selection in the pending-scroll loop
1253 */ 1680 */
1254 selection_save_x=ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1684
1259 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1261 { 1687 {
1262 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1264 } 1690 }
1265 else 1691 else
1266 { 1692 {
1267 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y - 1694 dist = ev.xbutton.y - (int_bwidth + height);
1269 (TermWin.int_bwidth + TermWin.height);
1270 } 1695 }
1696
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1697 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1699 + 1;
1273 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1275 } 1702 }
1276 else 1703 else
1277 { 1704 {
1278 /* we are within the text window, so we 1705 /* we are within the text window, so we
1279 * shouldn't be scrolling 1706 * shouldn't be scrolling
1280 */ 1707 */
1281 pending_scroll_selection = 0; 1708 if (sel_scroll_ev.active)
1709 sel_scroll_ev.stop();
1282 } 1710 }
1283#endif 1711#endif
1284#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1285
1286 } 1713 }
1287#endif 1714#endif
1288
1289 } 1715 }
1290 } 1716 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1718 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1719 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1294 MotionNotify, &ev)) ; 1720 MotionNotify, &ev))
1721 ;
1722
1295 XQueryPointer (display->display, scrollBar.win, 1723 XQueryPointer (disp, scrollBar.win,
1296 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1726 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1727 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1729 scrollbar_size ());
1302 scr_refresh (refresh_type); 1730 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1731 refresh_limit = 0;
… …
1306 break; 1734 break;
1307 } 1735 }
1308} 1736}
1309 1737
1310void 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
1311rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1810{
1313 SET_R (this); 1811 SET_R (this);
1314 SET_LOCALE (locale); 1812 SET_LOCALE (locale);
1315 1813
1316 switch (ev.type) 1814 switch (ev.type)
1317 { 1815 {
1318 case PropertyNotify: 1816 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1817 /*
1329 * 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,
1330 * 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.
1331 */ 1820 */
1332 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334
1335 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])
1336 return; 1823 return;
1337 }
1338 1824
1339 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1340 case ReparentNotify: 1826 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1343 break; 1829 break;
1344#endif
1345 } 1830 }
1346} 1831}
1832#endif
1347 1833
1348void 1834void
1349rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1350{ 1836{
1351 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1352 1838
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1354 if (!bypass_keystate) 1841 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1843
1356 /* 1844 /*
1357 * VT window processing of button press 1845 * VT window processing of button press
1358 */ 1846 */
1359 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1360 { 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
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1858 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1859
1362 if (reportmode) 1860 if (reportmode)
1363 { 1861 {
1364 /* mouse report from vt window */ 1862 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1863 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1864 MEvent.state = ev.state;
… …
1395 } 1893 }
1396 else 1894 else
1397 { 1895 {
1398 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1400 switch (ev.button) 1900 switch (ev.button)
1401 { 1901 {
1402 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
1403 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1405 { 1913 {
1406 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1408 else 1916 else
1409 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1410 } 1918 }
1411 else 1919 else
1412 { 1920 {
1413 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1414 MEvent.clicks++; 1922 MEvent.clicks++;
1415 else 1923 else
1416 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1417 1925
1418 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1419 } 1927 }
1420 1928
1421 MEvent.button = Button1; 1929 MEvent.button = Button1;
1422 break; 1930 break;
1423 1931
1424 case Button3: 1932 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1427 else 1935 else
1428 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1937
1429 MEvent.button = Button3; 1938 MEvent.button = Button3;
1430 break; 1939 break;
1431 } 1940 }
1432 } 1941 }
1942
1433 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1434 return; 1944 return;
1435 } 1945 }
1436 1946
1437 /* 1947 /*
… …
1503 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1504 } 2014 }
1505 if (upordown) 2015 if (upordown)
1506 { 2016 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2017#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2018 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 2019#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 2020 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 2021 {
1512 if (upordown < 0) 2022 if (upordown < 0)
1513 scrollBar.setUp (); 2023 scrollBar.setUp ();
… …
1529 break; 2039 break;
1530 case R_SB_ALIGN_BOTTOM: 2040 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 2041 csrO = scrollBar.bot - scrollBar.top;
1532 break; 2042 break;
1533 } 2043 }
2044
1534 if (scrollBar.style == R_SB_XTERM 2045 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 2046 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 2047 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 2048 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 2049
1539 scrollBar.setMotion (); 2050 scrollBar.setMotion ();
1540 break; 2051 break;
1541 2052
1542 case Button1: 2053 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2054 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1547 case Button3: 2058 case Button3:
1548 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1549 { 2060 {
1550 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1551# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1552 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1553# else 2064# else
1554 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1555# endif 2066# endif
1556 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1557# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1558 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1559# else 2070# else
1560 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1561# endif 2072# endif
1562 else 2073 else
1563 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1564 } 2075 }
1565 else 2076 else
1566 { 2077 {
1567 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 2079 (nrow
1569 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 2081 / scrollbar_size ()));
1571 } 2082 }
2083
1572 break; 2084 break;
1573 } 2085 }
1574 } 2086 }
1575 return; 2087 return;
1576 } 2088 }
… …
1588{ 2100{
1589 int reportmode = 0; 2101 int reportmode = 0;
1590 2102
1591 csrO = 0; /* reset csr Offset */ 2103 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 2104 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2105 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 2106
1595 if (scrollbar_isUpDn ()) 2107 if (scrollbar_isUpDn ())
1596 { 2108 {
1597 scrollBar.setIdle (); 2109 scrollBar.setIdle ();
1598 scrollbar_show (0); 2110 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH; 2112 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 2113#endif
1602
1603 } 2114 }
2115
1604#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 2117 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop();
1606#endif 2119#endif
2120
1607 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
1608 { 2122 {
2123#if ISO_14755
2124 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return;
2127#endif
1609 if (reportmode) 2128 if (reportmode)
1610 { 2129 {
1611 /* mouse report from vt window */ 2130 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 2146 MEvent.button = AnyButton;
1628 mouse_report (ev); 2147 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2148#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2149 return;
1631 } 2150 }
2151
1632 /* 2152 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2153 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2154 * when overriding mouse reporting
1635 */ 2155 */
1636 if (PrivateModes & PrivMode_mouse_report 2156 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2157 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2158 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2159 selection_extend (ev.x, ev.y, 0);
1640 2160
1641 switch (ev.button) 2161 switch (ev.button)
… …
1652 case Button5: 2172 case Button5:
1653 { 2173 {
1654 int i; 2174 int i;
1655 page_dirn v; 2175 page_dirn v;
1656 2176
1657 v = (ev.button == Button4) ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2178
1658 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
1659 i = 1; 2180 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
1661 i = TermWin.nrow - 1; 2182 i = nrow - 1;
1662 else 2183 else
1663 i = 5; 2184 i = 5;
2185
1664# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
1666 { 2188 {
1667 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)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2195
2196 slip_wheel_ev.start ();
1669 } 2197 }
2198 else
2199 {
1670# endif 2200# endif
1671# ifdef JUMP_MOUSE_WHEEL 2201# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1); 2202 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 2203 scr_refresh (SMOOTH_REFRESH);
1680 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
1681 } 2214 }
1682# endif 2215#endif
1683
1684 } 2216 }
1685 break; 2217 break;
1686#endif 2218#endif
1687
1688 } 2219 }
1689 } 2220 }
1690#ifdef MENUBAR 2221#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 2222 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 2223 menubar_control (ev);
1693#endif 2224#endif
1694} 2225}
1695 2226
1696#ifdef TRANSPARENT 2227#ifdef TRANSPARENT
1697#if TINTING 2228#if TINTING
1698/* shading taken from eterm-0.9.2 */ 2229/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2230
1701static void 2231typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 2232
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2233void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2234{
1709 /* No saturation */ 2235 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2236 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 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;
1713 2241
1714 b = ((uint16_t *) ptr)[x]; 2242 Visual *visual = display->visual;
1715 r = (b & 0x7c00) * rm; 2243
1716 g = (b & 0x3e0) * gm; 2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2245
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2246 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2247 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2248 mask_g = visual->green_mask;
1721 } 2249 mask_b = visual->blue_mask;
1722 ptr += bpl; 2250
1723 } 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;
1724 } else { 2324 } else {
1725 for (y = h; --y >= 0;) { 2325 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2326 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2327
1729 b = ((uint16_t *) ptr)[x]; 2328 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2329
1731 g = (b & 0x3e0) * gm; 2330 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2331 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2332 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2333 }
1735 b |= (!(b >> 5) - 1); 2334
1736 ((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 */
1737 | ((g >> 8) & 0x3e0) 2336 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2337 {
1739 } 2338 unsigned int tmp;
1740 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++)
1741 } 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);
1742 } 2391 }
1743} 2392 break;
1744 2393 }
1745/* RGB 16 */ 2394 case 16:
1746static void 2395 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2396 unsigned short *p1, *pf, *p, *pl;
1748{ 2397 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2399 while (p1 < pf)
1751 2400 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2401 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2402 pl = p1 + srcImage->width;
1754 /* No saturation */ 2403 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2404 {
1769 } else { 2405 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2406 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2407 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2408 }
1785 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)
1786 } 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);
1787 } 2429 }
1788} 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);
1789 2437
1790/* RGB 24 */ 2438 while (p1 < pf)
1791static void 2439 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2440 p = p1;
1793{ 2441 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2442 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2443 {
1822 } else { 2444 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2445 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2446 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2447 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2448 }
1853 ptr += bpl; 2449 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2450 }
2451 break;
2452 }
1855 } 2453 }
1856}
1857 2454
1858/* RGB 32 */ 2455 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2456}
1929
1930#endif 2457#endif
1931 2458
1932/* 2459/*
1933 * Check our parents are still who we think they are. 2460 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2461 * Do transparency updates if required
… …
1941 Atom atype; 2468 Atom atype;
1942 unsigned char *prop = NULL; 2469 unsigned char *prop = NULL;
1943 Window root, oldp, *list; 2470 Window root, oldp, *list;
1944 Pixmap rootpixmap = None; 2471 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
1946 2474
1947 pchanged = 0; 2475 pchanged = 0;
1948 2476
1949 if (!(Options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
1951 2479
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
1954 2482
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
1956 2484
1957 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
1958 { 2486 {
1959 if (am_transparent) 2487 if (am_transparent)
1960 { 2488 {
1961 pchanged = 1; 2489 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
1964 } 2492 }
1965 2493
1966 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
1967 } 2495 }
1968 2496
1969 /* 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. */
1970 XSync (display->display, False); 2498 XSync (disp, False);
1971 2499
1972 /* 2500 /*
1973 * Make the frame window set by the window manager have 2501 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame 2502 * the root background. Some window managers put multiple nested frame
1975 * 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.
1976 */ 2504 */
1977 i = (xa[XA_XROOTPMAPID] 2505 i = (xa[XA_XROOTPMAP_ID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success); 2508 &nitems, &bytes_after, &prop) == Success);
1981 2509
1982 if (!i || prop == NULL) 2510 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID] 2511 i = (xa[XA_ESETROOT_PMAP_ID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
1987 2515
1988 if (!i || prop == NULL) 2516 if (!i || prop == NULL
2517#if TINTING
2518 || !rs[Rs_color + Color_tint]
2519#endif
2520 )
1989 have_pixmap = 0; 2521 have_pixmap = 0;
1990 else 2522 else
1991 { 2523 {
1992 have_pixmap = 1; 2524 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2525 rootpixmap = *(Pixmap *)prop;
… …
2004 Window cr; 2536 Window cr;
2005 XImage *image; 2537 XImage *image;
2006 GC gc; 2538 GC gc;
2007 XGCValues gcvalue; 2539 XGCValues gcvalue;
2008 2540
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2010 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2013 nx = ny = 0; 2545 nx = ny = 0;
2014 2546
… …
2024 nh += sy; 2556 nh += sy;
2025 ny = -sy; 2557 ny = -sy;
2026 sy = 0; 2558 sy = 0;
2027 } 2559 }
2028 2560
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2031 allowedxerror = -1; 2565 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2567
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2569 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2570 allowedxerror = 0;
2037 2571
2038 if (image == NULL) 2572 if (image == NULL)
2039 { 2573 {
2040 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2041 { 2575 {
2042 pchanged = 1; 2576 pchanged = 1;
2043 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2044 { 2578 {
2045 XFreePixmap (display->display, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2046 TermWin.pixmap = None; 2580 pixmap = None;
2047 } 2581 }
2048 } 2582 }
2049 2583
2050 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2051 } 2585 }
2052 else 2586 else
2053 { 2587 {
2054 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2055 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2056 2590
2057#if TINTING 2591#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2593 {
2060 unsigned short shade, rm, gm, bm; 2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2596
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2063 2598
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 } 2600 }
2075#endif 2601#endif
2076 2602
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2078 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2608 XFreeGC (disp, gc);
2083 XDestroyImage (image); 2609 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2085 TermWin.pixmap); 2611 XClearWindow (disp, parent[0]);
2086 2612
2087 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2614 pchanged = 1;
2089 2615
2090 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2091 } 2617 }
2092 } 2618 }
2093 2619
2094 if (!am_pixmap_trans) 2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2095 { 2623 {
2096 unsigned int n; 2624 unsigned int n;
2097 /* 2625 /*
2098 * InheritPixmap transparency 2626 * InheritPixmap transparency
2099 */ 2627 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2102 { 2629 {
2103 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2106 XFree (list); 2633 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2634
2109 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2110 { 2636 {
2111 if (oldp != None) 2637 if (oldp != None)
2112 pchanged = 1; 2638 pchanged = 1;
2113 2639
2114 break; 2640 break;
2115 } 2641 }
2116 2642
2117 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2118 pchanged = 1; 2644 pchanged = 1;
2119 } 2645 }
2120 2646
2121 n = 0; 2647 n = 0;
2122 2648
2123 if (pchanged) 2649 if (pchanged)
2124 { 2650 {
2125 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2126 { 2652 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2653 XGetWindowAttributes (disp, parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2655 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2132 break; 2657 break;
2133 } 2658 }
2134 } 2659 }
2135 } 2660 }
2136 2661
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2138 { 2663 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2666 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2144 } 2668 }
2145 else 2669 else
2146 { 2670 {
2147#if WAIT_FOR_WM 2671#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing 2672 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2674 sleep (1);
2151#endif 2675#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2677 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]);
2680 }
2155 2681
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2157 am_transparent = 1; 2683 am_transparent = 1;
2158 } 2684 }
2159 2685
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2161 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 ();
2162 } 2702 }
2163 2703
2164 return pchanged; 2704 return pchanged;
2165} 2705}
2166#endif 2706#endif
… …
2170bool 2710bool
2171rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2172{ 2712{
2173 bool flag = false; 2713 bool flag = false;
2174 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2175 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2176 2716
2177 for (;;) 2717 for (;;)
2178 { 2718 {
2179 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2180 { 2720 {
2181 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2182 ch = next_char (); 2722 ch = next_char ();
2183 }
2184 2723
2185 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2186 break; 2725 break;
2726 }
2187 2727
2188 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)
2189 { 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
2190 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2746 bool refreshnow = false;
2193 int nlines = 0; 2747 int nlines = 0;
2194 unicode_t *str = buf; 2748 unicode_t *str = buf;
2195 2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2196 *str++ = ch;
2197 2750
2198 for (;;) 2751 for (;;)
2199 { 2752 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 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))
2204 break; 2754 break;
2205 2755
2206 *str++ = ch; 2756 *str++ = ch;
2207 2757
2208 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2209 { 2759 {
2760 if (ch == C0_LF)
2210 nlines++; 2761 nlines++;
2762
2211 refresh_count++; 2763 refresh_count++;
2212 2764
2213 if (! (Options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2215 { 2767 {
2216 refreshnow = true; 2768 refreshnow = true;
2217 flag = true; 2769 refresh_count = 0;
2218 ch = NOCHAR; 2770 ch = NOCHAR;
2219 break; 2771 break;
2220 } 2772 }
2221 2773
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2224 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2225 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2226 nlines = 0; 2780 nlines = 0;
2227 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2228 } 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
2229 } 2796 }
2230 2797
2231 if (str >= buf + UBUFSIZ) 2798 seq_begin = cmdbuf_ptr;
2232 { 2799 ch = next_char ();
2233 ch = NOCHAR;
2234 break;
2235 }
2236 } 2800 }
2237 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2238 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2239 2804
2240 /* 2805 /*
2241 * 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
2242 * 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.
2243 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2810 */
2249 if (refreshnow) 2811 if (refreshnow)
2250 { 2812 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2814 refresh_limit++;
2253 else 2815 else
2816 {
2817 flag = true;
2254 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2820 }
2255 } 2821 }
2256 2822
2257 } 2823 }
2258 else 2824 else
2259 { 2825 {
… …
2273 } 2839 }
2274 2840
2275 return flag; 2841 return flag;
2276} 2842}
2277 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
2278// read the next character 2853// read the next character
2279unicode_t 2854unicode_t
2280rxvt_term::next_char () 2855rxvt_term::next_char ()
2281{ 2856{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2283 { 2858 {
2284 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2285 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2286 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2287 2862
2288 wchar_t wc; 2863 wchar_t wc;
2289 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);
2290 2865
2291 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2292 { 2867 {
2293 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2294 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2298 if (len == (size_t)-1) 2873 if (len == (size_t)-1)
2299 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
2300 2875
2301 // assume wchar == unicode 2876 // assume wchar == unicode
2302 cmdbuf_ptr += len; 2877 cmdbuf_ptr += len;
2303 return wc; 2878 return wc & UNICODE_MASK;
2304 } 2879 }
2305 2880
2306 return NOCHAR; 2881 return NOCHAR;
2307} 2882}
2308 2883
… …
2313 */ 2888 */
2314unicode_t 2889unicode_t
2315rxvt_term::cmd_getc () 2890rxvt_term::cmd_getc ()
2316{ 2891{
2317 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 ();
2318 2904
2319 if (c == NOCHAR) 2905 if (c == NOCHAR)
2320 throw out_of_input; 2906 throw out_of_input;
2321 2907
2322 return c; 2908 return c;
… …
2422 case C0_ESC: 3008 case C0_ESC:
2423 process_escape_seq (); 3009 process_escape_seq ();
2424 break; 3010 break;
2425 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2429 else 3014 else
2430 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2431 (unsigned int)STRLEN (VT100_ANS));
2432 break; 3016 break;
2433 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2434 scr_bell (); 3018 scr_bell ();
2435 break; 3019 break;
2436 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
2452 break; 3036 break;
2453 case C0_SI: /* shift in - acs */ 3037 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 3038 scr_charset_choose (0);
2455 break; 3039 break;
2456 3040
3041#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 3042 // 8-bit controls
2458 case 0x90: /* DCS */ 3043 case 0x90: /* DCS */
2459 process_dcs_seq (); 3044 process_dcs_seq ();
2460 break; 3045 break;
2461 case 0x9b: /* CSI */ 3046 case 0x9b: /* CSI */
2462 process_csi_seq (); 3047 process_csi_seq ();
2463 break; 3048 break;
2464 case 0x9d: /* CSI */ 3049 case 0x9d: /* CSI */
2465 process_osc_seq (); 3050 process_osc_seq ();
2466 break; 3051 break;
3052#endif
2467 } 3053 }
2468} 3054}
2469/*}}} */ 3055/*}}} */
2470 3056
2471 3057
… …
2533void 3119void
2534rxvt_term::process_escape_seq () 3120rxvt_term::process_escape_seq ()
2535{ 3121{
2536 unicode_t ch = cmd_getc (); 3122 unicode_t ch = cmd_getc ();
2537 3123
2538 if (PrivateModes & PrivMode_vt52) 3124 if (priv_modes & PrivMode_vt52)
2539 { 3125 {
2540 process_escape_vt52 (ch); 3126 process_escape_vt52 (ch);
2541 return; 3127 return;
2542 } 3128 }
2543 3129
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 3144 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 3145 break;
2560 case '+': 3146 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 3147 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 3148 break;
2563#ifndef NO_FRILLS 3149#if ENABLE_FRILLS
2564 case '6': 3150 case '6':
2565 scr_backindex (); 3151 scr_backindex ();
2566 break; 3152 break;
2567#endif 3153#endif
2568 case '7': 3154 case '7':
2569 scr_cursor (SAVE); 3155 scr_cursor (SAVE);
2570 break; 3156 break;
2571 case '8': 3157 case '8':
2572 scr_cursor (RESTORE); 3158 scr_cursor (RESTORE);
2573 break; 3159 break;
2574#ifndef NO_FRILLS 3160#if ENABLE_FRILLS
2575 case '9': 3161 case '9':
2576 scr_forwardindex (); 3162 scr_forwardindex ();
2577 break; 3163 break;
2578#endif 3164#endif
2579 case '=': 3165 case '=':
… …
2622 process_dcs_seq (); 3208 process_dcs_seq ();
2623 break; 3209 break;
2624 3210
2625 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2626 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
2627 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2628 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2629 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
2630 3215
2631 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2632 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
2633 process_csi_seq (); 3218 process_csi_seq ();
… …
2758 { 3343 {
2759 switch (priv) 3344 switch (priv)
2760 { 3345 {
2761 case '>': 3346 case '>':
2762 if (ch == CSI_DA) /* secondary device attributes */ 3347 if (ch == CSI_DA) /* secondary device attributes */
2763 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2764 break; 3349 break;
2765 case '?': 3350 case '?':
2766 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2767 process_terminal_mode (ch, priv, nargs, arg); 3352 process_terminal_mode (ch, priv, nargs, arg);
2768 break; 3353 break;
… …
2873 3458
2874 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2875 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
2876 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
2877 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2879 break; 3464 break;
2880 3465
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2883 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3468 break;
2885 3469
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
2888 break; 3472 break;
… …
2895 break; 3479 break;
2896 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
2897 scr_report_position (); 3481 scr_report_position ();
2898 break; 3482 break;
2899 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3486 break;
2903 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3489 break;
2906 } 3490 }
… …
2942 break; 3526 break;
2943 3527
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3528 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3529 if (arg[0] == 4)
2946 scr_insert_mode (0); 3530 scr_insert_mode (0);
3531 else if (arg[0] == 20)
3532 priv_modes &= ~PrivMode_LFNL;
2947 break; 3533 break;
2948 3534
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3535 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3536 if (arg[0] == 4)
2951 scr_insert_mode (1); 3537 scr_insert_mode (1);
3538 else if (arg[0] == 20)
3539 priv_modes |= PrivMode_LFNL;
2952 break; 3540 break;
2953 3541
2954 /* 3542 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3543 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3544 */
… …
2968 break; 3556 break;
2969 case CSI_75: 3557 case CSI_75:
2970 scr_cursor (RESTORE); 3558 scr_cursor (RESTORE);
2971 break; 3559 break;
2972 3560
2973#ifndef NO_FRILLS 3561#if ENABLE_FRILLS
2974 case CSI_74: 3562 case CSI_74:
2975 process_window_ops (arg, nargs); 3563 process_window_ops (arg, nargs);
2976 break; 3564 break;
2977#endif 3565#endif
2978 3566
… …
2985 break; 3573 break;
2986 } 3574 }
2987} 3575}
2988/*}}} */ 3576/*}}} */
2989 3577
2990#ifndef NO_FRILLS 3578#if ENABLE_FRILLS
2991/* ARGSUSED */ 3579/* ARGSUSED */
2992void 3580void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3581rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3582{
2995 int x, y; 3583 int x, y;
2996 XWindowAttributes wattr; 3584 XWindowAttributes wattr;
2997 Window wdummy; 3585 Window wdummy;
3586 dDisp;
2998 3587
2999 if (nargs == 0) 3588 if (nargs == 0)
3000 return; 3589 return;
3001 3590
3002 switch (args[0]) 3591 switch (args[0])
3003 { 3592 {
3004 /* 3593 /*
3005 * commands 3594 * commands
3006 */ 3595 */
3007 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3009 break; 3598 break;
3010 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3600 XIconifyWindow (disp, parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3601 break;
3014 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3016 break; 3604 break;
3017 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3607 break;
3020 case 5: /* raise window */ 3608 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3022 break; 3610 break;
3023 case 6: /* lower window */ 3611 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3025 break; 3613 break;
3026 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3027 scr_touch (true); 3615 scr_touch (true);
3028 break; 3616 break;
3029 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3031 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3032 break; 3620 break;
3033 3621
3034 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3035 default: 3623 default:
3036 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3037 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3038 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3039 break; 3627 break;
3040 3628
3041 3629
3042 /* 3630 /*
3043 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3044 */ 3632 */
3045 case 11: /* report window state */ 3633 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3636 break;
3049 case 13: /* report window position */ 3637 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3643 break;
3056 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3647 break;
3060 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3062 break; 3650 break;
3063 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3065 break; 3653 break;
3066 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3655 {
3069 char *s; 3656 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3071 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);
3072 } 3660 }
3073 break; 3661 break;
3074 case 21: /* report window title */ 3662 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3663 {
3077 char *s; 3664 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3079 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);
3080 } 3668 }
3081 break; 3669 break;
3082 } 3670 }
3083} 3671}
3084#endif 3672#endif
3085 3673
3086/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3087/* 3675/*
3088 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3089 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3090 */ 3678 */
3091unsigned char * 3679char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3681{
3094 int seen_esc = 0; /* seen escape? */ 3682 unicode_t ch;
3683 bool seen_esc = false;
3095 unsigned int n = 0; 3684 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3685 wchar_t string[STRING_MAX];
3099 3686
3100 while ((ch = cmd_getc ())) 3687 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3688 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3689 if (seen_esc)
3690 {
3106 if (ch == 0x5c) /* 7bit ST */ 3691 if (ch == 0x5c) /* 7bit ST */
3107 break; 3692 break;
3108 else 3693 else
3109 return NULL; 3694 return NULL;
3110 3695 }
3111 if (ch == C0_ESC) 3696 else if (ch == C0_ESC)
3112 { 3697 {
3113 seen_esc = 1; 3698 seen_esc = true;
3114 continue; 3699 continue;
3115 } 3700 }
3701 else if (ch == C0_BEL || ch == CHAR_ST)
3702 break;
3116 else if (ch == C0_HT) 3703 else if (ch < 0x20)
3117 ch = ' '; /* translate '\t' to space */
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3119 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3120 3705
3121 if (n >= sizeof (string) - 1) 3706 seen_esc = false;
3707
3708 if (n >= STRING_MAX - 1)
3122 // stop at some sane length 3709 // stop at some sane length
3123 return NULL; 3710 return NULL;
3124 3711
3712 if (ch == C0_SYN)
3713 string[n++] = cmd_get8 ();
3714 else
3125 string[n++] = ch; 3715 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3716 }
3128 3717
3129 string[n++] = '\0'; 3718 string[n++] = '\0';
3130 3719
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3721
3136 return s; 3722 return rxvt_wcstombs (string);
3137} 3723}
3138 3724
3139/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3140/* 3726/*
3141 * 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)'
3142 */ 3728 */
3143void 3729void
3144rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3145{ 3731{
3146 unsigned char *s; 3732 char *s;
3147 unicode_t eh; 3733 unicode_t eh;
3148 3734
3149 /* 3735 /*
3150 * Not handled yet 3736 * Not handled yet
3151 */ 3737 */
… …
3170 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3171 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3172 3758
3173 if (ch == ';') 3759 if (ch == ';')
3174 { 3760 {
3175 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3176 3762
3177 if (s) 3763 if (s)
3178 { 3764 {
3179 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3180 free (s); 3766 free (s);
3181 } 3767 }
3182 } 3768 }
3183} 3769}
3184 3770
3185void 3771void
3186rxvt_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)
3187{ 3773{
3188 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3189 { 3775 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3776 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
3194 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);
3195 }
3196 } 3779 }
3197 else 3780 else
3198 set_window_color (color, str); 3781 set_window_color (color, str);
3199} 3782}
3200 3783
3201/* 3784/*
3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3203 * 0 = change iconName/title
3204 * 1 = change iconName
3205 * 2 = change title
3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
3209 * 12 = change text color
3210 * 13 = change mouse foreground color
3211 * 17 = change highlight character colour
3212 * 18 = change bold character color
3213 * 19 = change underlined character color
3214 * 46 = change logfile (not implemented)
3215 * 50 = change font
3216 *
3217 * rxvt extensions:
3218 * 20 = bg pixmap
3219 * 39 = change default fg color
3220 * 49 = change default bg color
3221 * 55 = dump scrollback buffer and all of screen
3222 * 701 = change locale
3223 * 702 = find font
3224 * 703 = menu
3225 */ 3786 */
3226void 3787void
3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3228{ 3789{
3229 int changed = 0; 3790 int changed = 0;
3230 int color; 3791 int color;
3231 char *buf, *name; 3792 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3794 int saveop = op;
3795 dDisp;
3233 3796
3234 assert (str != NULL); 3797 assert (str != NULL);
3235 switch (op) 3798 switch (op)
3236 { 3799 {
3237 case XTerm_name: 3800 case XTerm_name:
… …
3244 set_title (str); 3807 set_title (str);
3245 break; 3808 break;
3246 case XTerm_property: 3809 case XTerm_property:
3247 if (str[0] == '?') 3810 if (str[0] == '?')
3248 { 3811 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3812 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3813 Atom actual_type;
3251 int actual_format; 3814 int actual_format;
3252 unsigned long nitems; 3815 unsigned long nitems;
3253 unsigned long bytes_after; 3816 unsigned long bytes_after;
3254 unsigned char *value = 0; 3817 unsigned char *value = 0;
3255 const char *str = ""; 3818 const char *str = "";
3256 3819
3257 if (prop 3820 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3825 && actual_type != None
3263 && actual_format == 8) 3826 && actual_format == 8)
… …
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3835 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3836
3274 if (eq) 3837 if (eq)
3275 { 3838 {
3276 *eq = 0; 3839 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3840 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 3841 }
3282 else 3842 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3284 display->atom (str)); 3844 display->atom (str));
3285 } 3845 }
3286 break; 3846 break;
3287 3847
3288 case XTerm_Color: 3848 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3849 for (buf = (char *)str; buf && *buf;)
3290 { 3850 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3851 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3852 break;
3293 3853
3294 *name++ = '\0'; 3854 *name++ = '\0';
3295 color = atoi (buf); 3855 color = atoi (buf);
3296 3856
3297 if (color < 0 || color >= TOTAL_COLORS) 3857 if (color < 0 || color >= TOTAL_COLORS)
3298 break; 3858 break;
3299 3859
3300 if ((buf = STRCHR (name, ';')) != NULL) 3860 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3861 *buf++ = '\0';
3302 3862
3303 if (name[0] == '?' && !name[1]) 3863 if (name[0] == '?' && !name[1])
3304 { 3864 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3865 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3309 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);
3310 }
3311 } 3868 }
3312 else 3869 else
3313 set_window_color (color + minCOLOR, name); 3870 set_window_color (color + minCOLOR, name);
3314 } 3871 }
3315 break; 3872 break;
… …
3337 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break; 3896 break;
3340 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3341 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;
3342 break; 3910 break;
3343#endif 3911#endif
3344 3912
3345 case XTerm_Pixmap: 3913 case XTerm_Pixmap:
3346 if (*str != ';') 3914 if (*str != ';')
… …
3349 scale_pixmap (""); /* reset to default scaling */ 3917 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3918 set_bgPixmap (str); /* change pixmap */
3351#endif 3919#endif
3352 scr_touch (true); 3920 scr_touch (true);
3353 } 3921 }
3354 while ((str = STRCHR (str, ';')) != NULL) 3922 while ((str = strchr (str, ';')) != NULL)
3355 { 3923 {
3356 str++; 3924 str++;
3357#if XPM_BACKGROUND 3925#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3926 changed += scale_pixmap (str);
3359#endif 3927#endif
3360
3361 } 3928 }
3929
3362 if (changed) 3930 if (changed)
3363 { 3931 {
3364#ifdef XPM_BACKGROUND 3932#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 3933 resize_pixmap ();
3366#endif 3934#endif
… …
3377 3945
3378 case XTerm_logfile: 3946 case XTerm_logfile:
3379 // TODO, when secure mode? 3947 // TODO, when secure mode?
3380 break; 3948 break;
3381 3949
3382 case XTerm_font:
3383 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3387 TermWin.fontset->fontdesc
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp);
3391 }
3392 else
3393 change_font (str);
3394 break;
3395
3396#ifndef NO_FRILLS
3397 case XTerm_locale:
3398 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3403 else
3404 {
3405 set_locale (str);
3406# ifdef USE_XIM
3407 im_cb ();
3408# endif
3409 }
3410 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif
3421
3422#ifdef MENUBAR 3950#ifdef MENUBAR
3423 case XTerm_Menu: 3951 case URxvt_Menu:
3424 if (Options & Opt_insecure) 3952 if (OPTION (Opt_insecure))
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break; 3954 break;
3427#endif 3955#endif
3428#if 0 3956#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3957 case XTerm_dumpscreen: /* no error notices */
… …
3433 { 3961 {
3434 scr_dump (fd); 3962 scr_dump (fd);
3435 close (fd); 3963 close (fd);
3436 } 3964 }
3437 } 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
3438 break; 4021 break;
3439#endif 4022#endif
3440 } 4023 }
3441} 4024}
3442/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
3456{ 4039{
3457 int state; 4040 int state;
3458 4041
3459 if (mode == 's') 4042 if (mode == 's')
3460 { 4043 {
3461 SavedModes |= (PrivateModes & bit); 4044 SavedModes |= (priv_modes & bit);
3462 return -1; 4045 return -1;
3463 } 4046 }
3464 else 4047 else
3465 { 4048 {
3466 if (mode == 'r') 4049 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4050 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 4051 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4052 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 4053 PrivMode (state, bit);
3471 } 4054 }
3472 4055
3473 return state; 4056 return state;
3474} 4057}
… …
3492 { 3, PrivMode_132 }, 4075 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 4076 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 4077 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 4078 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 4079 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 4081 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 4082#ifdef menuBar_esc
3499 { menuBar_esc, PrivMode_menuBar }, 4083 { menuBar_esc, PrivMode_menuBar },
3500#endif 4084#endif
4085 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor },
3501#ifdef scrollBar_esc 4087#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 4088 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 4089#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 4090 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 4091 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 4092 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 4093 // 45 margin bell NYI
3511 // 46 start logging 4094 // 46 start logging
… …
3551 } 4134 }
3552 4135
3553 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
3554 switch (arg[i]) 4137 switch (arg[i])
3555 { 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
3556 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4150 case 1049:
3557 if (Options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
3558 if (mode == 0) 4152 if (mode == 0)
3559 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
3560 else if (mode == 1) 4154 else if (mode == 1)
3561 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
3562 break; 4156 break;
… …
3573 * within VT52 mode 4167 * within VT52 mode
3574 */ 4168 */
3575 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
3576 break; 4170 break;
3577 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
3580 break; 4174 break;
3581 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
3582 if (state) 4176 if (!state)
3583 Options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
3584 else 4178 else
3585 Options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
3586 break; 4180 break;
3587 case 5: /* reverse video */ 4181 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
3589 break; 4183 break;
3590 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4188 scr_autowrap (state);
3595 break; 4189 break;
3596 /* 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 */
3597 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4194 break;
3601#ifdef menuBar_esc 4195#ifdef menuBar_esc
3602 case menuBar_esc: 4196 case menuBar_esc:
3603#ifdef MENUBAR 4197#ifdef MENUBAR
3604 map_menuBar (state); 4198 map_menuBar (state);
… …
3624 break; 4218 break;
3625 /* case 66: - application key pad */ 4219 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4220 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4221 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4222 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4223 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4224 break;
3631#if 0 4225#if 0
3632 case 1001: 4226 case 1001:
3633 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
3634#endif 4228#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state) 4230 if (!state)
3637 Options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
3638 else 4232 else
3639 Options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
3640 break; 4234 break;
3641 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
3642 if (state) 4236 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
3644 else 4238 else
3645 Options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
3646 break; 4240 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
3649 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4244 scr_erase_screen (2);
3651 scr_change_screen (state); 4245 scr_change_screen (state);
3652 break; 4246 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4248 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
3656 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4251 scr_erase_screen (2);
3658 break; 4252 break;
3659 default: 4253 default:
3660 break; 4254 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4280 rendset = 0, rendstyle = ~RS_None;
3687 break; 4281 break;
3688 case 1: 4282 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4283 rendset = 1, rendstyle = RS_Bold;
3690 break; 4284 break;
4285 //case 2: // low intensity
4286 case 3:
4287 rendset = 1, rendstyle = RS_Italic;
4288 break;
3691 case 4: 4289 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4290 rendset = 1, rendstyle = RS_Uline;
3693 break; 4291 break;
3694 case 5: 4292 case 5: // slowly blinking
4293 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4294 rendset = 1, rendstyle = RS_Blink;
3696 break; 4295 break;
3697 //case 6: // scoansi light background 4296 //case 6: // scoansi light background
3698 case 7: 4297 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4298 rendset = 1, rendstyle = RS_RVid;
3700 break; 4299 break;
3701 case 8: 4300 case 8:
3702 // invisible. NYI 4301 // invisible. NYI
3703 break; 4302 break;
4303 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4304 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4305 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4306 //case 12: // scoansi acs on, |0x80, second alt font
3707 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)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4311 rendset = 0, rendstyle = RS_Bold;
3709 break; 4312 break;
3710 case 22: 4313 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4314 rendset = 0, rendstyle = RS_Bold;
4315 break;
4316 case 23: // disable italic
4317 rendset = 0, rendstyle = RS_Italic;
3712 break; 4318 break;
3713 case 24: 4319 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4320 rendset = 0, rendstyle = RS_Uline;
3715 break; 4321 break;
3716 case 25: 4322 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4323 rendset = 0, rendstyle = RS_Blink;
3718 break; 4324 break;
4325 case 26: // variable spacing (iso 8613)
4326 rendset = 0, rendstyle = RS_Blink;
4327 break;
3719 case 27: 4328 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4329 rendset = 0, rendstyle = RS_RVid;
3721 break; 4330 break;
3722 case 28:
3723 // visible. NYI 4331 //case 28: // visible. NYI
3724 break; 4332 //case 29: // not crossed-out
3725 } 4333 }
3726 4334
3727 if (rendset != -1) 4335 if (rendset != -1)
3728 { 4336 {
3729 scr_rendition (rendset, rendstyle); 4337 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4348 case 35:
3741 case 36: 4349 case 36:
3742 case 37: 4350 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4352 break;
3745#ifdef TTY_256COLOR 4353 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4354 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4355 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4356 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4357 i += 2;
3751 } 4358 }
3752 break; 4359 break;
3753#endif
3754 case 39: /* default fg */ 4360 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4361 scr_color (Color_fg, Color_fg);
3756 break; 4362 break;
3757 4363
3758 case 40: 4364 case 40:
… …
3763 case 45: 4369 case 45:
3764 case 46: 4370 case 46:
3765 case 47: 4371 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4373 break;
3768#ifdef TTY_256COLOR 4374 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4375 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4376 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4377 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4378 i += 2;
3774 } 4379 }
3775 break; 4380 break;
3776#endif
3777 case 49: /* default bg */ 4381 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
3779 break; 4383 break;
3780 4384
3781#ifndef NO_BRIGHTCOLOR 4385 //case 50: // not variable spacing
4386
4387#if ENABLE_FRILLS
3782 case 90: 4388 case 90:
3783 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
3784 case 92: 4390 case 92:
3785 case 93: 4391 case 93:
3786 case 94: 4392 case 94:
3787 case 95: 4393 case 95:
3788 case 96: 4394 case 96:
3789 case 97: 4395 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4396 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4397 break;
3793 case 100: 4398 case 100:
3794 case 101: /* set bright bg color */ 4399 case 101: /* set bright bg color */
3795 case 102: 4400 case 102:
3796 case 103: 4401 case 103:
3797 case 104: 4402 case 104:
3798 case 105: 4403 case 105:
3799 case 106: 4404 case 106:
3800 case 107: 4405 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4407 break;
3804#endif 4408#endif
3805
3806 } 4409 }
3807 } 4410 }
3808} 4411}
3809/*}}} */ 4412/*}}} */
3810 4413
… …
3814{ 4417{
3815 unicode_t ch, cmd = cmd_getc (); 4418 unicode_t ch, cmd = cmd_getc ();
3816 4419
3817 if (cmd == 'Q') 4420 if (cmd == 'Q')
3818 { /* query graphics */ 4421 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4422 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4423 return;
3821 } 4424 }
3822 /* swallow other graphics sequences until terminating ':' */ 4425 /* swallow other graphics sequences until terminating ':' */
3823 do 4426 do
3824 ch = cmd_getc (); 4427 ch = cmd_getc ();
… …
3834 */ 4437 */
3835void 4438void
3836rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
3837{ 4440{
3838 va_list arg_ptr; 4441 va_list arg_ptr;
3839 unsigned char buf[256]; 4442 char buf[256];
3840 4443
3841 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4446 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4447 tt_write (buf, strlen (buf));
3845} 4448}
3846 4449
3847/* ---------------------------------------------------------------------- */ 4450/* ---------------------------------------------------------------------- */
3848/* 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,
3849 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
3850 */ 4453 */
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455
3851void 4456void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
3853{ 4458{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4459 if (pty.pty < 0)
4460 return;
3855 4461
3856 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;
3857 { 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
3858 if (v_buflen == 0) 4489 if (v_buflen == 0)
3859 { 4490 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4491 free (v_buffer);
3887 v_buffer = 0; 4492 v_buffer = 0;
3888 v_buflen = 0; 4493 v_buflen = 0;
3889 4494
3890 pty_ev.set (EVENT_READ); 4495 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4496 return;
3903 } 4497 }
4498
4499 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4500 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ);
3905} 4503}
3906 4504
3907/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
3908 4506

Diff Legend

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