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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.262 by root, Sun Jan 15 06:02:40 2006 UTC

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

Diff Legend

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