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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.253 by root, Mon Jan 9 23:30:01 2006 UTC

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

Diff Legend

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