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.241 by root, Fri Jan 6 05:28:55 2006 UTC

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