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.266 by root, Mon Jan 16 08:57:02 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;
… …
199 scr_move_to (0, 1); 443 scr_move_to (0, 1);
200 return; 444 return;
201 } 445 }
202 else if (keysym == XK_End) 446 else if (keysym == XK_End)
203 { 447 {
204 scr_move_to (1, 0); 448 scr_move_to (1, 1);
205 return; 449 return;
206 } 450 }
207 } 451 }
208#endif 452#endif
209 } 453 }
… …
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
683void 1023void
684rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
685{ 1025{
686 SET_R (this); 1026 make_current ();
687 SET_LOCALE (locale);
688 1027
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0;
689 flush (); 1041 flush ();
690} 1042}
691 1043
692#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
693void 1045void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1063 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1064 }
713} 1065}
714#endif 1066#endif
715 1067
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void
1070rxvt_term::cont_scroll_cb (time_watcher &w)
1071{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 }
1079}
1080#endif
1081
1082#ifdef SELECTION_SCROLLING
1083void
1084rxvt_term::sel_scroll_cb (time_watcher &w)
1085{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 }
1093}
1094#endif
1095
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void
1098rxvt_term::slip_wheel_cb (time_watcher &w)
1099{
1100 if (mouse_slip_wheel_speed == 0
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 }
1111}
1112#endif
1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
716bool 1132bool
717rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
718{ 1134{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1136
1137 if (CBUFSIZ == n)
1138 {
1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1140 n = 0;
1141 }
720 1142
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1145 cmdbuf_endp = cmdbuf_ptr + n;
724 1146
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1148
727 if (n > 0) 1149 if (r > 0)
728 { 1150 {
729 cmdbuf_endp += n; 1151 cmdbuf_endp += r;
730 return true; 1152 return true;
731 } 1153 }
732 else if (n < 0 && errno != EAGAIN) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 {
1156#if HAVE_SCHED_YIELD
1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1159#endif
1160 }
1161 else
1162 {
1163 pty_ev.stop ();
1164
1165 if (!OPTION (Opt_hold))
733 destroy (); 1166 destroy ();
1167 }
734 1168
735 return false; 1169 return false;
736} 1170}
737 1171
738void 1172void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1174{
741 SET_R (this); 1175 make_current ();
742 SET_LOCALE (locale); 1176
1177 if (revents & EVENT_READ)
1178 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ())
1180 if (cmd_parse ())
1181 break;
743 1182
744 if (revents & EVENT_WRITE) 1183 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1184 pty_write ();
746 else if (revents & EVENT_READ) 1185}
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 1186
760 if (cmd_parse ()) 1187void
761 break; 1188rxvt_term::pointer_unblank ()
762 } 1189{
763 } 1190 XDefineCursor (display->display, vt, TermWin_cursor);
1191 recolour_cursor ();
1192
1193#ifdef POINTER_BLANK
1194 hidden_pointer = 0;
1195
1196 if (OPTION (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay);
1198#endif
764} 1199}
765 1200
766#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
767void 1202void
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 () 1203rxvt_term::pointer_blank ()
781{ 1204{
782 if (! (Options & Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
783 return; 1206 return;
784 1207
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1209 XFlush (display->display);
787 1210
788 hidden_pointer = 1; 1211 hidden_pointer = 1;
789} 1212}
790 1213
791void 1214void
792rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
793{ 1216{
794 SET_R (this); 1217 make_current ();
795 SET_LOCALE (locale);
796 1218
797 pointer_blank (); 1219 pointer_blank ();
798} 1220}
799#endif 1221#endif
800 1222
… …
807 x = ev.x; 1229 x = ev.x;
808 y = ev.y; 1230 y = ev.y;
809 pixel_position (&x, &y); 1231 pixel_position (&x, &y);
810 1232
811 if (MEvent.button == AnyButton) 1233 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1234 button_number = 3;
814 }
815 else 1235 else
816 { 1236 {
817 button_number = MEvent.button - Button1; 1237 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1238 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1239 if (button_number >= 3)
820 button_number += (64 - 3); 1240 button_number += (64 - 3);
821 } 1241 }
822 1242
823 if (PrivateModes & PrivMode_MouseX10) 1243 if (priv_modes & PrivMode_MouseX10)
824 { 1244 {
825 /* 1245 /*
826 * do not report ButtonRelease 1246 * do not report ButtonRelease
827 * no state info allowed 1247 * no state info allowed
828 */ 1248 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1263 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1264 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1265#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1266 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1267#endif
848
849 } 1268 }
850 1269
851#ifdef DEBUG_MOUSEREPORT 1270#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1271 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1272 if (key_state & 16)
854 fputc ('C', stderr); 1273 fputc ('C', stderr);
855 if (key_state & 4) 1274 if (key_state & 4)
856 fputc ('S', stderr); 1275 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1279 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1280 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1281 button_number,
863 x + 1, 1282 x + 1,
864 y + 1); 1283 y + 1);
865#else 1284#endif
1285
866 tt_printf ("\033[M%c%c%c", 1286 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1287 (32 + button_number + key_state),
868 (32 + x + 1), 1288 (32 + x + 1),
869 (32 + y + 1)); 1289 (32 + y + 1));
870#endif
871} 1290}
872 1291
873#ifdef USING_W11LIB 1292#ifdef USING_W11LIB
874void 1293void
875rxvt_W11_process_x_event (XEvent *ev) 1294rxvt_W11_process_x_event (XEvent *ev)
… …
882 1301
883/*{{{ process an X event */ 1302/*{{{ process an X event */
884void 1303void
885rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
886{ 1305{
887 SET_R (this); 1306 make_current ();
888 SET_LOCALE (locale);
889 1307
890#if defined(CURSOR_BLINK) 1308 dDisp;
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1309
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1310 if (ev.xany.window == vt
900 } 1311 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
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; 1313 return;
920#endif
921 1314
1315 // for XQueryPointer
922 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1318 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 1319
975 switch (ev.type) 1320 switch (ev.type)
976 { 1321 {
977 case KeyPress: 1322 case KeyPress:
1323#if ISO_14755
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
978 lookup_key (ev.xkey); 1326 lookup_key (ev.xkey);
1327
1328 break;
1329
1330 case KeyRelease:
1331 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
979 break; 1394 break;
980 1395
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
986 else 1401#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; 1402 break;
995 } 1403 }
996#endif
997 1404
998 case ButtonPress: 1405 case ButtonPress:
999 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1000 break; 1407 break;
1001 1408
… …
1003 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1004 break; 1411 break;
1005 1412
1006 case ClientMessage: 1413 case ClientMessage:
1007 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1010#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1016 { 1441 {
1017 /* Get Dnd data */ 1442 /* Get Dnd data */
1018 Atom ActualType; 1443 Atom ActualType;
1019 int ActualFormat; 1444 int ActualFormat;
1020 unsigned char *data; 1445 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1022 1447
1023 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1450 0L, 1000000L,
1026 False, AnyPropertyType, 1451 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1029 &data); 1454 &data);
1030 XChangeProperty (display->display, display->root, 1455 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1456 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1459 }
1037#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1038 break; 1461 break;
1039 1462
1040 case MappingNotify: 1463 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1464 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1465 break;
1043 1466
1044 /* 1467 /*
1045 * XXX: this is not the _current_ arrangement 1468 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1469 * Here's my conclusion:
… …
1065 break; 1488 break;
1066 } 1489 }
1067 break; 1490 break;
1068 1491
1069 case FocusIn: 1492 case FocusIn:
1070 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1071 { 1502 {
1072 TermWin.focus = 1; 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1504 ;
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 1505
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 {
1508 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 }
1511
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent))
1514 check_our_parents ();
1515#endif
1083 } 1516 }
1084 break; 1517 break;
1085 1518
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: 1519 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1521 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1523
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; 1524 break;
1138 1525
1139 case SelectionClear: 1526 case SelectionClear:
1140 selection_clear (); 1527 selection_clear ();
1141 break; 1528 break;
1142 1529
1143 case SelectionNotify: 1530 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1531 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1533 break;
1148 1534
1149 case SelectionRequest: 1535 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1151 break; 1537 break;
1152 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1153 case UnmapNotify: 1547 case UnmapNotify:
1154 TermWin.mapped = 0; 1548 mapped = 0;
1155#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1157#endif 1551#endif
1158 break; 1552 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; 1553 break;
1166 1554
1167#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1168 case ReparentNotify: 1556 case ReparentNotify:
1169 rootwin_cb (ev); 1557 rootwin_cb (ev);
1170 break; 1558 break;
1171#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1172 1560
1173 case GraphicsExpose: 1561 case GraphicsExpose:
1174 case Expose: 1562 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1176 { 1564 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1565 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1569
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1575
1185 // ev.xexpose.width, TermWin.height, False);
1186#endif
1187 want_refresh = 1; 1576 want_refresh = 1;
1188 } 1577 }
1189 else 1578 else
1190 { 1579 {
1191 XEvent unused_event; 1580 XEvent unused_event;
1192 1581
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1583 ;
1195 &unused_event)) ; 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1585 ;
1197 GraphicsExpose, 1586
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1200 { 1588 {
1201 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
1202 scrollbar_show (0); 1590 scrollbar_show (0);
1203 } 1591 }
1204#ifdef MENUBAR 1592#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1594 menubar_expose ();
1207#endif 1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1208 } 1601 }
1209 break; 1602 break;
1210 1603
1211 case MotionNotify: 1604 case MotionNotify:
1212#ifdef POINTER_BLANK 1605#ifdef POINTER_BLANK
… …
1218 { 1611 {
1219 menubar_control (ev.xbutton); 1612 menubar_control (ev.xbutton);
1220 break; 1613 break;
1221 } 1614 }
1222#endif 1615#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1617 break;
1225 1618
1226 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1227 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1625 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1231 ; 1627 ;
1232 1628
1233 XQueryPointer (display->display, TermWin.vt, 1629 XQueryPointer (disp, vt,
1234 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1633 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1637 {
1242#endif 1638#endif
1639#if ISO_14755
1640 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1644 break;
1645 }
1646#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1245#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1653 {
1249 int dist; 1654 int dist;
1250
1251 pending_scroll_selection=1;
1252 1655
1253 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
1255 */ 1658 */
1256 if (scroll_selection_delay<=0) 1659 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1661
1259 /* save the event params so we can highlight 1662 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1663 * the selection in the pending-scroll loop
1261 */ 1664 */
1262 selection_save_x=ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1668
1267 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1269 { 1671 {
1270 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1272 } 1674 }
1273 else 1675 else
1274 { 1676 {
1275 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1678 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1679 }
1680
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1681 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1;
1281 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1283 } 1686 }
1284 else 1687 else
1285 { 1688 {
1286 /* we are within the text window, so we 1689 /* we are within the text window, so we
1287 * shouldn't be scrolling 1690 * shouldn't be scrolling
1288 */ 1691 */
1289 pending_scroll_selection = 0; 1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop();
1290 } 1694 }
1291#endif 1695#endif
1292#ifdef MOUSE_THRESHOLD 1696#ifdef MOUSE_THRESHOLD
1293
1294 } 1697 }
1295#endif 1698#endif
1296
1297 } 1699 }
1298 } 1700 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1702 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1303 XQueryPointer (display->display, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1711 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1713 scrollbar_size ());
1310 scr_refresh (refresh_type); 1714 want_refresh = 1;
1311 refresh_limit = 0; 1715 refresh_limit = 0;
1312 scrollbar_show (1); 1716 scrollbar_show (1);
1313 } 1717 }
1314 break; 1718 break;
1315 } 1719 }
1316}
1317 1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749}
1750
1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1818}
1819
1820#if TRANSPARENT
1318void 1821void
1319rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1823{
1321 SET_R (this); 1824 make_current ();
1322 SET_LOCALE (locale);
1323 1825
1324 switch (ev.type) 1826 switch (ev.type)
1325 { 1827 {
1326 case PropertyNotify: 1828 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 /* 1829 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1830 * 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. 1831 * use the property to determine the pixmap. We use it later on.
1339 */ 1832 */
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]) 1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1835 return;
1345 }
1346 1836
1347 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1348 case ReparentNotify: 1838 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1351 break; 1841 break;
1352#endif
1353 } 1842 }
1354} 1843}
1844#endif
1355 1845
1356void 1846void
1357rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1358{ 1848{
1359 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1360 1850
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1362 if (!bypass_keystate) 1853 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1855
1364 /* 1856 /*
1365 * VT window processing of button press 1857 * VT window processing of button press
1366 */ 1858 */
1367 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1368 { 1860 {
1861#if ISO_14755
1862 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 {
1865 iso14755_54 (ev.x, ev.y);
1866 return;
1867 }
1868#endif
1869
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1870 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1871
1370 if (reportmode) 1872 if (reportmode)
1371 { 1873 {
1372 /* mouse report from vt window */ 1874 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1875 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1876 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1377 { 1879 {
1378 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1379 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1380 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1381 { 1884 {
1382 /* only report double clicks */ 1885 /* only report double clicks */
1383 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1384 mouse_report (ev); 1887 mouse_report (ev);
… …
1403 } 1906 }
1404 else 1907 else
1405 { 1908 {
1406 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1408 switch (ev.button) 1913 switch (ev.button)
1409 { 1914 {
1410 case Button1: 1915 case Button1:
1916 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */
1918#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask);
1920#else
1921 selection.rect = false;
1922#endif
1923
1411 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1413 { 1926 {
1414 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1416 else 1929 else
1417 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1418 } 1931 }
1419 else 1932 else
1420 { 1933 {
1421 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1422 MEvent.clicks++; 1935 MEvent.clicks++;
1423 else 1936 else
1424 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1425 1938
1426 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1427 } 1940 }
1428 1941
1429 MEvent.button = Button1; 1942 MEvent.button = Button1;
1430 break; 1943 break;
1431 1944
1432 case Button3: 1945 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1435 else 1948 else
1436 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1950
1437 MEvent.button = Button3; 1951 MEvent.button = Button3;
1438 break; 1952 break;
1439 } 1953 }
1440 } 1954 }
1955
1441 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1442 return; 1957 return;
1443 } 1958 }
1444 1959
1445 /* 1960 /*
… …
1511 upordown = 1; /* down */ 2026 upordown = 1; /* down */
1512 } 2027 }
1513 if (upordown) 2028 if (upordown)
1514 { 2029 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 2032#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 2034 {
1520 if (upordown < 0) 2035 if (upordown < 0)
1521 scrollBar.setUp (); 2036 scrollBar.setUp ();
… …
1537 break; 2052 break;
1538 case R_SB_ALIGN_BOTTOM: 2053 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 2054 csrO = scrollBar.bot - scrollBar.top;
1540 break; 2055 break;
1541 } 2056 }
2057
1542 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2062
1547 scrollBar.setMotion (); 2063 scrollBar.setMotion ();
1548 break; 2064 break;
1549 2065
1550 case Button1: 2066 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2071 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1557 { 2073 {
1558 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1561# else 2077# else
1562 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1563# endif 2079# endif
1564 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1567# else 2083# else
1568 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1569# endif 2085# endif
1570 else 2086 else
1571 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1572 } 2088 }
1573 else 2089 else
1574 { 2090 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2092 (nrow
1577 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2094 / scrollbar_size ()));
1579 } 2095 }
2096
1580 break; 2097 break;
1581 } 2098 }
1582 } 2099 }
2100
1583 return; 2101 return;
1584 } 2102 }
2103
1585#if MENUBAR 2104#if MENUBAR
1586 /* 2105 /*
1587 * Menubar window processing of button press 2106 * Menubar window processing of button press
1588 */ 2107 */
1589 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
1596{ 2115{
1597 int reportmode = 0; 2116 int reportmode = 0;
1598 2117
1599 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2119 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2121
1603 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1604 { 2123 {
1605 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1606 scrollbar_show (0); 2125 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 2127 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 2128#endif
1610
1611 } 2129 }
2130
1612#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop();
1614#endif 2134#endif
2135
1615 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1616 { 2137 {
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
1617 if (reportmode) 2143 if (reportmode)
1618 { 2144 {
1619 /* mouse report from vt window */ 2145 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2146 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2147 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2161 MEvent.button = AnyButton;
1636 mouse_report (ev); 2162 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2163#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2164 return;
1639 } 2165 }
2166
1640 /* 2167 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2168 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2169 * when overriding mouse reporting
1643 */ 2170 */
1644 if (PrivateModes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2172 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
1648 2178
1649 switch (ev.button) 2179 switch (ev.button)
1650 { 2180 {
1651 case Button1: 2181 case Button1:
1652 case Button3: 2182 case Button3:
… …
1660 case Button5: 2190 case Button5:
1661 { 2191 {
1662 int i; 2192 int i;
1663 page_dirn v; 2193 page_dirn v;
1664 2194
1665 v = (ev.button == Button4) ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2196
1666 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
1667 i = 1; 2198 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2200 i = nrow - 1;
1670 else 2201 else
1671 i = 5; 2202 i = 5;
2203
1672# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
1674 { 2206 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210
2211 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2213
2214 slip_wheel_ev.start ();
2215 }
2216 else
2217 {
2218# endif
2219 scr_page (v, i);
2220 scrollbar_show (1);
2221# ifdef MOUSE_SLIP_WHEELING
1677 } 2222 }
1678# endif 2223# 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 } 2224 }
1693 break; 2225 break;
1694#endif 2226#endif
1695
1696 } 2227 }
1697 } 2228 }
1698#ifdef MENUBAR 2229#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2230 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2231 menubar_control (ev);
1701#endif 2232#endif
1702} 2233}
1703 2234
1704#ifdef TRANSPARENT 2235#ifdef TRANSPARENT
1705#if TINTING 2236#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2237/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2238
1709static void 2239typedef 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 2240
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2242{
1717 /* No saturation */ 2243 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2244 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
1721 2249
1722 b = ((uint16_t *) ptr)[x]; 2250 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2251
1724 g = (b & 0x3e0) * gm; 2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2253
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2254 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2255 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2256 mask_g = visual->green_mask;
1729 } 2257 mask_b = visual->blue_mask;
1730 ptr += bpl; 2258
1731 } 2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2332 } else {
1733 for (y = h; --y >= 0;) { 2333 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2334 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2335
1737 b = ((uint16_t *) ptr)[x]; 2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2337
1739 g = (b & 0x3e0) * gm; 2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2341 }
1743 b |= (!(b >> 5) - 1); 2342
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2345 {
1747 } 2346 unsigned int tmp;
1748 ptr += bpl; 2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
1749 } 2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2399 }
1751} 2400 break;
1752 2401 }
1753/* RGB 16 */ 2402 case 16:
1754static void 2403 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2404 unsigned short *p1, *pf, *p, *pl;
1756{ 2405 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2407 while (p1 < pf)
1759 2408 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2409 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2410 pl = p1 + srcImage->width;
1762 /* No saturation */ 2411 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 } 2412 {
1777 } else { 2413 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2414 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2415 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 } 2416 }
1793 ptr += bpl; 2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
1794 } 2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2437 }
1796} 2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2445
1798/* RGB 24 */ 2446 while (p1 < pf)
1799static void 2447 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2448 p = p1;
1801{ 2449 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2450 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 } 2451 {
1830 } else { 2452 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2453 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2454 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2455 (*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 } 2456 }
1861 ptr += bpl; 2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2458 }
2459 break;
2460 }
1863 } 2461 }
1864}
1865 2462
1866/* RGB 32 */ 2463 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} 2464}
1937
1938#endif 2465#endif
1939 2466
1940/* 2467/*
1941 * Check our parents are still who we think they are. 2468 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2469 * Do transparency updates if required
… …
1949 Atom atype; 2476 Atom atype;
1950 unsigned char *prop = NULL; 2477 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2478 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2479 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
1954 2482
1955 pchanged = 0; 2483 pchanged = 0;
1956 2484
1957 if (!(Options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
1959 2487
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
1962 2490
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
1964 2492
1965 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
1966 { 2494 {
1967 if (am_transparent) 2495 if (am_transparent)
1968 { 2496 {
1969 pchanged = 1; 2497 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
1972 } 2500 }
1973 2501
1974 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
1975 } 2503 }
1976 2504
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2505 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2506 XSync (disp, False);
1979 2507
1980 /* 2508 /*
1981 * Make the frame window set by the window manager have 2509 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2510 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2511 * windows for each client, so we have to take care about that.
1984 */ 2512 */
1985 i = (xa[XA_XROOTPMAPID] 2513 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2516 &nitems, &bytes_after, &prop) == Success);
1989 2517
1990 if (!i || prop == NULL) 2518 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2519 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2522 &nitems, &bytes_after, &prop) == Success);
1995 2523
1996 if (!i || prop == NULL) 2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
1997 have_pixmap = 0; 2529 have_pixmap = 0;
1998 else 2530 else
1999 { 2531 {
2000 have_pixmap = 1; 2532 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2533 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2534 XFree (prop);
2003 } 2535 }
2004 2536
2005 if (have_pixmap) 2537 if (have_pixmap)
2006 { 2538 {
… …
2012 Window cr; 2544 Window cr;
2013 XImage *image; 2545 XImage *image;
2014 GC gc; 2546 GC gc;
2015 XGCValues gcvalue; 2547 XGCValues gcvalue;
2016 2548
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2553 nx = ny = 0;
2022 2554
… …
2032 nh += sy; 2564 nh += sy;
2033 ny = -sy; 2565 ny = -sy;
2034 sy = 0; 2566 sy = 0;
2035 } 2567 }
2036 2568
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2039 allowedxerror = -1; 2573 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2575
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2577 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2578 allowedxerror = 0;
2045 2579
2046 if (image == NULL) 2580 if (image == NULL)
2047 { 2581 {
2048 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2049 { 2583 {
2050 pchanged = 1; 2584 pchanged = 1;
2051 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2052 { 2586 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2054 TermWin.pixmap = None; 2588 pixmap = None;
2055 } 2589 }
2056 } 2590 }
2057 2591
2058 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2059 } 2593 }
2060 else 2594 else
2061 { 2595 {
2062 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2064 2598
2065#if TINTING 2599#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2600 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2601 {
2068 unsigned short shade, rm, gm, bm; 2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2604
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2606
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2607 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 } 2608 }
2083#endif 2609#endif
2084 2610
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2086 szHint.width, szHint.height, image->depth); 2612 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2615 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2616 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2617 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2093 TermWin.pixmap); 2619 XClearWindow (disp, parent[0]);
2094 2620
2095 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2622 pchanged = 1;
2097 2623
2098 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2099 } 2625 }
2100 } 2626 }
2101 2627
2102 if (!am_pixmap_trans) 2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2103 { 2631 {
2104 unsigned int n; 2632 unsigned int n;
2105 /* 2633 /*
2106 * InheritPixmap transparency 2634 * InheritPixmap transparency
2107 */ 2635 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2637 {
2111 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2114 XFree (list); 2641 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2642
2117 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2118 { 2644 {
2119 if (oldp != None) 2645 if (oldp != None)
2120 pchanged = 1; 2646 pchanged = 1;
2121 2647
2122 break; 2648 break;
2123 } 2649 }
2124 2650
2125 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2126 pchanged = 1; 2652 pchanged = 1;
2127 } 2653 }
2128 2654
2129 n = 0; 2655 n = 0;
2130 2656
2131 if (pchanged) 2657 if (pchanged)
2132 { 2658 {
2133 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2134 { 2660 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2661 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) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2663 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2665 break;
2141 } 2666 }
2142 } 2667 }
2143 } 2668 }
2144 2669
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2146 { 2671 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2674 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2152 } 2676 }
2153 else 2677 else
2154 { 2678 {
2155#if WAIT_FOR_WM 2679#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2680 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2681 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2682 sleep (1);
2159#endif 2683#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2163 2689
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2165 am_transparent = 1; 2691 am_transparent = 1;
2166 } 2692 }
2167 2693
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2170 } 2710 }
2171 2711
2172 return pchanged; 2712 return pchanged;
2173} 2713}
2174#endif 2714#endif
… …
2177 2717
2178bool 2718bool
2179rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2180{ 2720{
2181 bool flag = false; 2721 bool flag = false;
2182 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2184 2724
2185 for (;;) 2725 for (;;)
2186 { 2726 {
2187 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2188 { 2728 {
2189 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2190 ch = next_char (); 2730 ch = next_char ();
2191 }
2192 2731
2193 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2194 break; 2733 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 { 2734 }
2735
2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2737 {
2738 if (!seen_input)
2739 {
2740 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs
2744 // then sometimes get the size wrong.
2745 // unfortunately other programs are even more buggy and dislike
2746 // being sent SIGWINCH, so only do it when we were in fact being
2747 // resized.
2748 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH);
2750 }
2751
2198 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2754 bool refreshnow = false;
2201 int nlines = 0; 2755 int nlines = 0;
2202 unicode_t *str = buf; 2756 wchar_t *str = buf;
2203 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2758
2206 for (;;) 2759 for (;;)
2207 { 2760 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2762 break;
2213 2763
2214 *str++ = ch; 2764 *str++ = ch;
2215 2765
2216 if (ch == '\n') 2766 if (ch == C0_LF || str >= eol)
2217 { 2767 {
2768 if (ch == C0_LF)
2218 nlines++; 2769 nlines++;
2770
2219 refresh_count++; 2771 refresh_count++;
2220 2772
2221 if (! (Options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2775 {
2224 refreshnow = true; 2776 refreshnow = true;
2225 flag = true; 2777 refresh_count = 0;
2226 ch = NOCHAR; 2778 ch = NOCHAR;
2227 break; 2779 break;
2228 } 2780 }
2229 2781
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2783 if (nlines >= nrow - 1)
2232 { 2784 {
2785 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2786 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2233 scr_add_lines (buf, nlines, str - buf); 2787 scr_add_lines (buf, str - buf, nlines);
2788
2234 nlines = 0; 2789 nlines = 0;
2235 str = buf; 2790 str = buf;
2791 eol = str + min (ncol, UBUFSIZ);
2236 } 2792 }
2793
2794 if (str >= eol)
2795 {
2796 if (eol >= buf + UBUFSIZ)
2797 {
2798 ch = NOCHAR;
2799 break;
2800 }
2801 else
2802 eol = min (eol + ncol, buf + UBUFSIZ);
2803 }
2804
2237 } 2805 }
2238 2806
2239 if (str >= buf + UBUFSIZ) 2807 seq_begin = cmdbuf_ptr;
2240 { 2808 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2809 }
2245 2810
2811 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2246 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2247 2814
2248 /* 2815 /*
2249 * If there have been a lot of new lines, then update the screen 2816 * 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. 2817 * 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 2818 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2819 * 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 */ 2820 */
2257 if (refreshnow) 2821 if (refreshnow)
2258 { 2822 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2824 refresh_limit++;
2261 2825 else
2826 {
2827 flag = true;
2262 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2829 want_refresh = 1;
2830 }
2263 } 2831 }
2264 2832
2265 } 2833 }
2266 else 2834 else
2267 { 2835 {
… …
2282 2850
2283 return flag; 2851 return flag;
2284} 2852}
2285 2853
2286// read the next character 2854// read the next character
2287unicode_t 2855wchar_t
2288rxvt_term::next_char () 2856rxvt_term::next_char ()
2289{ 2857{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2291 { 2859 {
2292 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2295 2863
2296 wchar_t wc; 2864 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298 2866
2299 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2300 { 2868 {
2301 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2303 break; 2871 break;
2304 } 2872 }
2305 2873
2306 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2876
2309 // assume wchar == unicode 2877 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2311 return wc; 2879 return wc & UNICODE_MASK;
2312 } 2880 }
2313 2881
2314 return NOCHAR; 2882 return NOCHAR;
2883}
2884
2885// read the next octet
2886uint32_t
2887rxvt_term::next_octet ()
2888{
2889 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR;
2315} 2892}
2316 2893
2317/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2318/* 2895/*
2319 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2320 * to the command. 2897 * to the command.
2321 */ 2898 */
2322unicode_t 2899wchar_t
2323rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2324{ 2901{
2325 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2903
2904 if (c == NOCHAR)
2905 throw out_of_input;
2906
2907 return c;
2908}
2909
2910uint32_t
2911rxvt_term::cmd_get8 ()
2912{
2913 uint32_t c = next_octet ();
2326 2914
2327 if (c == NOCHAR) 2915 if (c == NOCHAR)
2328 throw out_of_input; 2916 throw out_of_input;
2329 2917
2330 return c; 2918 return c;
… …
2430 case C0_ESC: 3018 case C0_ESC:
2431 process_escape_seq (); 3019 process_escape_seq ();
2432 break; 3020 break;
2433 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2437 else 3024 else
2438 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2439 (unsigned int)STRLEN (VT100_ANS));
2440 break; 3026 break;
2441 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2442 scr_bell (); 3028 scr_bell ();
2443 break; 3029 break;
2444 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
2460 break; 3046 break;
2461 case C0_SI: /* shift in - acs */ 3047 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 3048 scr_charset_choose (0);
2463 break; 3049 break;
2464 3050
3051#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 3052 // 8-bit controls
2466 case 0x90: /* DCS */ 3053 case 0x90: /* DCS */
2467 process_dcs_seq (); 3054 process_dcs_seq ();
2468 break; 3055 break;
2469 case 0x9b: /* CSI */ 3056 case 0x9b: /* CSI */
2470 process_csi_seq (); 3057 process_csi_seq ();
2471 break; 3058 break;
2472 case 0x9d: /* CSI */ 3059 case 0x9d: /* CSI */
2473 process_osc_seq (); 3060 process_osc_seq ();
2474 break; 3061 break;
3062#endif
2475 } 3063 }
2476} 3064}
2477/*}}} */ 3065/*}}} */
2478 3066
2479 3067
… …
2541void 3129void
2542rxvt_term::process_escape_seq () 3130rxvt_term::process_escape_seq ()
2543{ 3131{
2544 unicode_t ch = cmd_getc (); 3132 unicode_t ch = cmd_getc ();
2545 3133
2546 if (PrivateModes & PrivMode_vt52) 3134 if (priv_modes & PrivMode_vt52)
2547 { 3135 {
2548 process_escape_vt52 (ch); 3136 process_escape_vt52 (ch);
2549 return; 3137 return;
2550 } 3138 }
2551 3139
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3154 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3155 break;
2568 case '+': 3156 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3157 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3158 break;
2571#ifndef NO_FRILLS 3159#if ENABLE_FRILLS
2572 case '6': 3160 case '6':
2573 scr_backindex (); 3161 scr_backindex ();
2574 break; 3162 break;
2575#endif 3163#endif
2576 case '7': 3164 case '7':
2577 scr_cursor (SAVE); 3165 scr_cursor (SAVE);
2578 break; 3166 break;
2579 case '8': 3167 case '8':
2580 scr_cursor (RESTORE); 3168 scr_cursor (RESTORE);
2581 break; 3169 break;
2582#ifndef NO_FRILLS 3170#if ENABLE_FRILLS
2583 case '9': 3171 case '9':
2584 scr_forwardindex (); 3172 scr_forwardindex ();
2585 break; 3173 break;
2586#endif 3174#endif
2587 case '=': 3175 case '=':
… …
2597 break; 3185 break;
2598 3186
2599 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
2601 { 3189 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2604 } 3192 }
2605 break; 3193 break;
2606 3194
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
2608 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
2630 process_dcs_seq (); 3218 process_dcs_seq ();
2631 break; 3219 break;
2632 3220
2633 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2634 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
2635 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2636 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2637 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
2638 3225
2639 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2640 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
2641 process_csi_seq (); 3228 process_csi_seq ();
… …
2668 3255
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3256/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3257/* *INDENT-OFF* */
2671enum { 3258enum {
2672 CSI_ICH = 0x40, 3259 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3260 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 , 3261 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, 3262 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, 3263 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, 3264 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, 3265 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2766 { 3353 {
2767 switch (priv) 3354 switch (priv)
2768 { 3355 {
2769 case '>': 3356 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3357 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3358 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3359 break;
2773 case '?': 3360 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3362 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3363 break;
… …
2881 3468
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3469 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3470 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3471 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3474 break;
2888 3475
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2891 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3478 break;
2893 3479
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
2896 break; 3482 break;
… …
2903 break; 3489 break;
2904 case 6: /* CPR requested */ 3490 case 6: /* CPR requested */
2905 scr_report_position (); 3491 scr_report_position ();
2906 break; 3492 break;
2907 case 7: /* unofficial extension */ 3493 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3494 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3495 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3496 break;
2911 case 8: /* unofficial extension */ 3497 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3499 break;
2914 } 3500 }
… …
2950 break; 3536 break;
2951 3537
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3538 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3539 if (arg[0] == 4)
2954 scr_insert_mode (0); 3540 scr_insert_mode (0);
3541 else if (arg[0] == 20)
3542 priv_modes &= ~PrivMode_LFNL;
2955 break; 3543 break;
2956 3544
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3545 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3546 if (arg[0] == 4)
2959 scr_insert_mode (1); 3547 scr_insert_mode (1);
3548 else if (arg[0] == 20)
3549 priv_modes |= PrivMode_LFNL;
2960 break; 3550 break;
2961 3551
2962 /* 3552 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3553 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3554 */
… …
2976 break; 3566 break;
2977 case CSI_75: 3567 case CSI_75:
2978 scr_cursor (RESTORE); 3568 scr_cursor (RESTORE);
2979 break; 3569 break;
2980 3570
2981#ifndef NO_FRILLS 3571#if ENABLE_FRILLS
2982 case CSI_74: 3572 case CSI_74:
2983 process_window_ops (arg, nargs); 3573 process_window_ops (arg, nargs);
2984 break; 3574 break;
2985#endif 3575#endif
2986 3576
… …
2993 break; 3583 break;
2994 } 3584 }
2995} 3585}
2996/*}}} */ 3586/*}}} */
2997 3587
2998#ifndef NO_FRILLS 3588#if ENABLE_FRILLS
2999/* ARGSUSED */ 3589/* ARGSUSED */
3000void 3590void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3591rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3592{
3003 int x, y; 3593 int x, y;
3004 XWindowAttributes wattr; 3594 XWindowAttributes wattr;
3005 Window wdummy; 3595 Window wdummy;
3596 dDisp;
3006 3597
3007 if (nargs == 0) 3598 if (nargs == 0)
3008 return; 3599 return;
3009 3600
3010 switch (args[0]) 3601 switch (args[0])
3011 { 3602 {
3012 /* 3603 /*
3013 * commands 3604 * commands
3014 */ 3605 */
3015 case 1: /* deiconify window */ 3606 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3607 XMapWindow (disp, parent[0]);
3017 break; 3608 break;
3018 case 2: /* iconify window */ 3609 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3610 XIconifyWindow (disp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3611 break;
3022 case 3: /* set position (pixels) */ 3612 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3613 XMoveWindow (disp, parent[0], args[1], args[2]);
3024 break; 3614 break;
3025 case 4: /* set size (pixels) */ 3615 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3617 break;
3028 case 5: /* raise window */ 3618 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3619 XRaiseWindow (disp, parent[0]);
3030 break; 3620 break;
3031 case 6: /* lower window */ 3621 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3622 XLowerWindow (disp, parent[0]);
3033 break; 3623 break;
3034 case 7: /* refresh window */ 3624 case 7: /* refresh window */
3035 scr_touch (true); 3625 scr_touch (true);
3036 break; 3626 break;
3037 case 8: /* set size (chars) */ 3627 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3628 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3629 (unsigned int) (args[1] * fheight));
3040 break; 3630 break;
3041 3631
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3632 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3633 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3634 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3635 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3047 break; 3637 break;
3048 3638
3049 3639
3050 /* 3640 /*
3051 * reports - some output format copied from XTerm 3641 * reports - some output format copied from XTerm
3052 */ 3642 */
3053 case 11: /* report window state */ 3643 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3644 XGetWindowAttributes (disp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3646 break;
3057 case 13: /* report window position */ 3647 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (disp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3649 XTranslateCoordinates (disp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3650 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3651 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3652 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3653 break;
3064 case 14: /* report window size (pixels) */ 3654 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3657 break;
3068 case 18: /* report text area size (chars) */ 3658 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3659 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3660 break;
3071 case 19: /* report window size (chars) */ 3661 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3662 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3663 break;
3074 case 20: /* report icon label */ 3664 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3665 {
3077 char *s; 3666 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3667 XGetIconName (disp, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669 XFree (s);
3080 } 3670 }
3081 break; 3671 break;
3082 case 21: /* report window title */ 3672 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3673 {
3085 char *s; 3674 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3675 XFetchName (disp, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s);
3088 } 3678 }
3089 break; 3679 break;
3090 } 3680 }
3091} 3681}
3092#endif 3682#endif
3093 3683
3094/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3095/* 3685/*
3096 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3687 * ends_how is terminator used. returned input must be free()'d
3098 */ 3688 */
3099unsigned char * 3689char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3691{
3102 int seen_esc = 0; /* seen escape? */ 3692 unicode_t ch;
3693 bool seen_esc = false;
3103 unsigned int n = 0; 3694 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3695 wchar_t string[STRING_MAX];
3107 3696
3108 while ((ch = cmd_getc ())) 3697 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3698 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3699 if (seen_esc)
3700 {
3114 if (ch == 0x5c) /* 7bit ST */ 3701 if (ch == 0x5c) /* 7bit ST */
3115 break; 3702 break;
3116 else 3703 else
3117 return NULL; 3704 return NULL;
3118 3705 }
3119 if (ch == C0_ESC) 3706 else if (ch == C0_ESC)
3120 { 3707 {
3121 seen_esc = 1; 3708 seen_esc = true;
3122 continue; 3709 continue;
3123 } 3710 }
3124 else if (ch == '\t') 3711 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3712 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3713 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3714 return NULL; /* other control character - exit */
3128 3715
3129 if (n >= sizeof (string) - 1) 3716 seen_esc = false;
3717
3718 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3719 // stop at some sane length
3131 return NULL; 3720 return NULL;
3132 3721
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3133 string[n++] = ch; 3725 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3726 }
3136 3727
3137 string[n++] = '\0'; 3728 string[n++] = '\0';
3138 3729
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3731
3144 return s; 3732 return rxvt_wcstombs (string);
3145} 3733}
3146 3734
3147/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3148/* 3736/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3150 */ 3738 */
3151void 3739void
3152rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3153{ 3741{
3154 unsigned char *s; 3742 char *s;
3155 unicode_t eh; 3743 unicode_t eh;
3156 3744
3157 /* 3745 /*
3158 * Not handled yet 3746 * Not handled yet
3159 */ 3747 */
… …
3178 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3179 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3180 3768
3181 if (ch == ';') 3769 if (ch == ';')
3182 { 3770 {
3183 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3184 3772
3185 if (s) 3773 if (s)
3186 { 3774 {
3187 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3188 free (s); 3776 free (s);
3189 } 3777 }
3190 } 3778 }
3191} 3779}
3192 3780
3193void 3781void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3195{ 3783{
3196 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3197 { 3785 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3786 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3788 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3789 }
3205 else 3790 else
3206 set_window_color (color, str); 3791 set_window_color (color, str);
3207} 3792}
3208 3793
3209/* 3794/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * 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 */ 3796 */
3234void 3797void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3236{ 3799{
3237 int changed = 0; 3800 int changed = 0;
3238 int color; 3801 int color;
3239 char *buf, *name; 3802 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
3804 int saveop = op;
3805 dDisp;
3241 3806
3242 assert (str != NULL); 3807 assert (str != NULL);
3243 switch (op) 3808 switch (op)
3244 { 3809 {
3245 case XTerm_name: 3810 case XTerm_name:
… …
3252 set_title (str); 3817 set_title (str);
3253 break; 3818 break;
3254 case XTerm_property: 3819 case XTerm_property:
3255 if (str[0] == '?') 3820 if (str[0] == '?')
3256 { 3821 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3822 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3823 Atom actual_type;
3259 int actual_format; 3824 int actual_format;
3260 unsigned long nitems; 3825 unsigned long nitems;
3261 unsigned long bytes_after; 3826 unsigned long bytes_after;
3262 unsigned char *value = 0; 3827 unsigned char *value = 0;
3263 const char *str = ""; 3828 const char *str = "";
3264 3829
3265 if (prop 3830 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3831 && XGetWindowProperty (disp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3832 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3833 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3834 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3835 && actual_type != None
3271 && actual_format == 8) 3836 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3845 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3846
3282 if (eq) 3847 if (eq)
3283 { 3848 {
3284 *eq = 0; 3849 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3850 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 } 3851 }
3290 else 3852 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3853 XDeleteProperty (disp, parent[0],
3292 display->atom (str)); 3854 display->atom (str));
3293 } 3855 }
3294 break; 3856 break;
3295 3857
3296 case XTerm_Color: 3858 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3859 for (buf = (char *)str; buf && *buf;)
3298 { 3860 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3861 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3862 break;
3301 3863
3302 *name++ = '\0'; 3864 *name++ = '\0';
3303 color = atoi (buf); 3865 color = atoi (buf) + minCOLOR;
3304 3866
3305 if (color < 0 || color >= TOTAL_COLORS) 3867 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3306 break; 3868 break;
3307 3869
3308 if ((buf = STRCHR (name, ';')) != NULL) 3870 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3871 *buf++ = '\0';
3310 3872
3311 if (name[0] == '?' && !name[1]) 3873 if (name[0] == '?' && !name[1])
3312 { 3874 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3875 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3876 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); 3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3878 }
3320 else 3879 else
3321 set_window_color (color + minCOLOR, name); 3880 set_window_color (color, name);
3322 } 3881 }
3323 break; 3882 break;
3324 case XTerm_Color00: 3883 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3884 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3326 break; 3885 break;
3327 case XTerm_Color01: 3886 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3887 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3329 break; 3888 break;
3330#ifndef NO_CURSORCOLOR 3889#ifndef NO_CURSORCOLOR
3331 case XTerm_Color_cursor: 3890 case XTerm_Color_cursor:
3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3333 break; 3892 break;
… …
3337 break; 3896 break;
3338 case XTerm_Color_pointer_bg: 3897 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3340 break; 3899 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3900#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: 3901 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3902 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3350 break; 3903 break;
3904 case Rxvt_Color_BD:
3905 case URxvt_Color_BD:
3906 process_color_seq (op, Color_BD, str, resp);
3907 break;
3908 case Rxvt_Color_UL:
3909 case URxvt_Color_UL:
3910 process_color_seq (op, Color_UL, str, resp);
3911 break;
3912 case URxvt_Color_IT:
3913 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3914 break;
3351#endif 3915#endif
3916#if TRANSPARENT && TINTING
3917 case URxvt_Color_tint:
3918 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3919 check_our_parents ();
3920 if (am_transparent)
3921 want_full_refresh = want_refresh = 1;
3922 break;
3923#endif
3352 3924
3353 case XTerm_Pixmap: 3925 case Rxvt_Pixmap:
3354 if (*str != ';') 3926 if (*str != ';')
3355 { 3927 {
3356#if XPM_BACKGROUND 3928#if XPM_BACKGROUND
3357 scale_pixmap (""); /* reset to default scaling */ 3929 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3930 set_bgPixmap (str); /* change pixmap */
3359#endif
3360 scr_touch (true); 3931 scr_touch (true);
3932#endif
3361 } 3933 }
3934
3362 while ((str = STRCHR (str, ';')) != NULL) 3935 while ((str = strchr (str, ';')) != NULL)
3363 { 3936 {
3364 str++; 3937 str++;
3365#if XPM_BACKGROUND 3938#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3939 changed += scale_pixmap (str);
3367#endif 3940#endif
3368
3369 } 3941 }
3942
3370 if (changed) 3943 if (changed)
3371 { 3944 {
3372#ifdef XPM_BACKGROUND 3945#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3946 resize_pixmap ();
3374#endif
3375 scr_touch (true); 3947 scr_touch (true);
3948#endif
3376 } 3949 }
3377 break; 3950 break;
3378 3951
3379 case XTerm_restoreFG: 3952 case Rxvt_restoreFG:
3380 set_window_color (Color_fg, str); 3953 set_window_color (Color_fg, str);
3381 break; 3954 break;
3382 case XTerm_restoreBG: 3955 case Rxvt_restoreBG:
3383 set_window_color (Color_bg, str); 3956 set_window_color (Color_bg, str);
3384 break; 3957 break;
3385 3958
3386 case XTerm_logfile: 3959 case XTerm_logfile:
3387 // TODO, when secure mode? 3960 // TODO, when secure mode?
3388 break; 3961 break;
3389 3962
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 3963#ifdef MENUBAR
3431 case XTerm_Menu: 3964 case URxvt_Menu:
3432 if (Options & Opt_insecure) 3965 if (OPTION (Opt_insecure))
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3967 break;
3435#endif 3968#endif
3436#if 0 3969#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3970 case Rxvt_dumpscreen: /* no error notices */
3438 { 3971 {
3439 int fd; 3972 int fd;
3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3441 { 3974 {
3442 scr_dump (fd); 3975 scr_dump (fd);
3443 close (fd); 3976 close (fd);
3444 } 3977 }
3445 } 3978 }
3979 break;
3980#endif
3981 case XTerm_font:
3982 op = URxvt_font;
3983 case URxvt_font:
3984#if ENABLE_STYLES
3985 case URxvt_boldFont:
3986 case URxvt_italicFont:
3987 case URxvt_boldItalicFont:
3988#endif
3989 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", saveop,
3991 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3992 ? fontset[op - URxvt_font]->fontdesc : "",
3993 resp);
3994 else
3995 {
3996 const char *&res = rs[Rs_font + (op - URxvt_font)];
3997
3998 res = strdup (str);
3999 allocated.push_back ((void *)res);
4000 set_fonts ();
4001 }
4002 break;
4003
4004#if ENABLE_FRILLS
4005 case URxvt_locale:
4006 if (query)
4007 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4008 else
4009 {
4010 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8);
4012 init_xlocale ();
4013 }
4014 break;
4015
4016 case URxvt_view_up:
4017 case URxvt_view_down:
4018 {
4019 int lines = atoi (str);
4020
4021 if (lines)
4022 scr_page (op == URxvt_view_up ? UP : DN, lines);
4023 else
4024 scr_erase_savelines ();
4025 }
4026
4027 break;
4028#endif
4029
4030#if ENABLE_PERL
4031 case URxvt_perl:
4032 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4033 ; // no responses yet
3446 break; 4034 break;
3447#endif 4035#endif
3448 } 4036 }
3449} 4037}
3450/*----------------------------------------------------------------------*/ 4038/*----------------------------------------------------------------------*/
… …
3464{ 4052{
3465 int state; 4053 int state;
3466 4054
3467 if (mode == 's') 4055 if (mode == 's')
3468 { 4056 {
3469 SavedModes |= (PrivateModes & bit); 4057 SavedModes |= (priv_modes & bit);
3470 return -1; 4058 return -1;
3471 } 4059 }
3472 else 4060 else
3473 { 4061 {
3474 if (mode == 'r') 4062 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4063 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 4064 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4065 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 4066 PrivMode (state, bit);
3479 } 4067 }
3480 4068
3481 return state; 4069 return state;
3482} 4070}
… …
3500 { 3, PrivMode_132 }, 4088 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4089 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4090 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4091 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4092 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4094 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4095#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 4096 { menuBar_esc, PrivMode_menuBar },
3508#endif 4097#endif
4098 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 4100#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4101 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4102#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4103 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4104 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4105 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4106 // 45 margin bell NYI
3519 // 46 start logging 4107 // 46 start logging
… …
3559 } 4147 }
3560 4148
3561 /* extra handling for values with state unkept */ 4149 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4150 switch (arg[i])
3563 { 4151 {
4152#if ENABLE_STYLES
4153 case 1021:
4154 set_option (Opt_intensityStyles, mode);
4155
4156 scr_touch (true);
4157 break;
4158#endif
3564 case 1048: /* alternative cursor save */ 4159 case 1048: /* alternative cursor save */
4160 case 1049:
3565 if (Options & Opt_secondaryScreen) 4161 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4162 if (mode == 0)
3567 scr_cursor (RESTORE); 4163 scr_cursor (RESTORE);
3568 else if (mode == 1) 4164 else if (mode == 1)
3569 scr_cursor (SAVE); 4165 scr_cursor (SAVE);
3570 break; 4166 break;
… …
3581 * within VT52 mode 4177 * within VT52 mode
3582 */ 4178 */
3583 PrivMode (1, PrivMode_vt52); 4179 PrivMode (1, PrivMode_vt52);
3584 break; 4180 break;
3585 case 3: /* 80/132 */ 4181 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4182 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4183 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4184 break;
3589 case 4: /* smooth scrolling */ 4185 case 4: /* smooth scrolling */
3590 if (state) 4186 set_option (Opt_jumpScroll, !state);
3591 Options &= ~Opt_jumpScroll;
3592 else
3593 Options |= Opt_jumpScroll;
3594 break; 4187 break;
3595 case 5: /* reverse video */ 4188 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4189 scr_rvideo_mode (state);
3597 break; 4190 break;
3598 case 6: /* relative/absolute origins */ 4191 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4195 scr_autowrap (state);
3603 break; 4196 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4197 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4198 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4199 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4200 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4201 break;
3609#ifdef menuBar_esc 4202#ifdef menuBar_esc
3610 case menuBar_esc: 4203 case menuBar_esc:
3611#ifdef MENUBAR 4204#ifdef MENUBAR
3612 map_menuBar (state); 4205 map_menuBar (state);
… …
3632 break; 4225 break;
3633 /* case 66: - application key pad */ 4226 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4227 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4228 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4229 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4230 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4231 break;
3639#if 0 4232#if 0
3640 case 1001: 4233 case 1001:
3641 break; /* X11 mouse highlighting */ 4234 break; /* X11 mouse highlighting */
3642#endif 4235#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4236 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state)
3645 Options &= ~Opt_scrollTtyOutput;
3646 else
3647 Options |= Opt_scrollTtyOutput; 4237 set_option (Opt_scrollTtyOutput, !state);
3648 break; 4238 break;
3649 case 1011: /* scroll to bottom on key press */ 4239 case 1011: /* scroll to bottom on key press */
3650 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4240 set_option (Opt_scrollTtyKeypress, state);
3652 else
3653 Options &= ~Opt_scrollTtyKeypress;
3654 break; 4241 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4242 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4243 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4244 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4245 scr_erase_screen (2);
3659 scr_change_screen (state); 4246 scr_change_screen (state);
3660 break; 4247 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4248 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4249 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4250 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4252 scr_erase_screen (2);
3666 break; 4253 break;
3667 default: 4254 default:
3668 break; 4255 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4281 rendset = 0, rendstyle = ~RS_None;
3695 break; 4282 break;
3696 case 1: 4283 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4284 rendset = 1, rendstyle = RS_Bold;
3698 break; 4285 break;
4286 //case 2: // low intensity
4287 case 3:
4288 rendset = 1, rendstyle = RS_Italic;
4289 break;
3699 case 4: 4290 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4291 rendset = 1, rendstyle = RS_Uline;
3701 break; 4292 break;
3702 case 5: 4293 case 5: // slowly blinking
4294 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4295 rendset = 1, rendstyle = RS_Blink;
3704 break; 4296 break;
4297 //case 6: // scoansi light background
3705 case 7: 4298 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4299 rendset = 1, rendstyle = RS_RVid;
3707 break; 4300 break;
3708 case 8: 4301 case 8:
3709 // invisible. NYI 4302 // invisible. NYI
3710 break; 4303 break;
3711 case 22: 4304 //case 9: // crossed out
4305 //case 10: // scoansi acs off, primary font
4306 //case 11: // scoansi acs on, first alt font
4307 //case 12: // scoansi acs on, |0x80, second alt font
4308 //...
4309 //case 19: // ninth alt font
4310 //case 20: // gothic
4311 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4312 rendset = 0, rendstyle = RS_Bold;
4313 break;
4314 case 22: // normal intensity
4315 rendset = 0, rendstyle = RS_Bold;
4316 break;
4317 case 23: // disable italic
4318 rendset = 0, rendstyle = RS_Italic;
3713 break; 4319 break;
3714 case 24: 4320 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4321 rendset = 0, rendstyle = RS_Uline;
3716 break; 4322 break;
3717 case 25: 4323 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4324 rendset = 0, rendstyle = RS_Blink;
3719 break; 4325 break;
4326 case 26: // variable spacing (iso 8613)
4327 rendset = 0, rendstyle = RS_Blink;
4328 break;
3720 case 27: 4329 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4330 rendset = 0, rendstyle = RS_RVid;
3722 break; 4331 break;
3723 case 28:
3724 // visible. NYI 4332 //case 28: // visible. NYI
3725 break; 4333 //case 29: // not crossed-out
3726 } 4334 }
3727 4335
3728 if (rendset != -1) 4336 if (rendset != -1)
3729 { 4337 {
3730 scr_rendition (rendset, rendstyle); 4338 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4349 case 35:
3742 case 36: 4350 case 36:
3743 case 37: 4351 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4353 break;
3746#ifdef TTY_256COLOR 4354 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4355 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4356 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4357 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4358 i += 2;
3752 } 4359 }
3753 break; 4360 break;
3754#endif
3755 case 39: /* default fg */ 4361 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4362 scr_color (Color_fg, Color_fg);
3757 break; 4363 break;
3758 4364
3759 case 40: 4365 case 40:
… …
3764 case 45: 4370 case 45:
3765 case 46: 4371 case 46:
3766 case 47: 4372 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4373 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4374 break;
3769#ifdef TTY_256COLOR 4375 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4376 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4377 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4378 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4379 i += 2;
3775 } 4380 }
3776 break; 4381 break;
3777#endif
3778 case 49: /* default bg */ 4382 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4383 scr_color (Color_bg, Color_bg);
3780 break; 4384 break;
3781 4385
3782#ifndef NO_BRIGHTCOLOR 4386 //case 50: // not variable spacing
4387
4388#if ENABLE_FRILLS
3783 case 90: 4389 case 90:
3784 case 91: /* set bright fg color */ 4390 case 91: /* set bright fg color */
3785 case 92: 4391 case 92:
3786 case 93: 4392 case 93:
3787 case 94: 4393 case 94:
3788 case 95: 4394 case 95:
3789 case 96: 4395 case 96:
3790 case 97: 4396 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4397 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4398 break;
3794 case 100: 4399 case 100:
3795 case 101: /* set bright bg color */ 4400 case 101: /* set bright bg color */
3796 case 102: 4401 case 102:
3797 case 103: 4402 case 103:
3798 case 104: 4403 case 104:
3799 case 105: 4404 case 105:
3800 case 106: 4405 case 106:
3801 case 107: 4406 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4407 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4408 break;
3805#endif 4409#endif
3806
3807 } 4410 }
3808 } 4411 }
3809} 4412}
3810/*}}} */ 4413/*}}} */
3811 4414
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4415/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4416void
3814rxvt_term::process_graphics () 4417rxvt_term::process_graphics ()
3815{ 4418{
3816 unicode_t ch, cmd = cmd_getc (); 4419 unicode_t ch, cmd = cmd_getc ();
3817 4420
3818 if (cmd == 'Q') 4421 if (cmd == 'Q')
3819 { /* query graphics */ 4422 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4423 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4424 return;
3822 } 4425 }
3823 /* swallow other graphics sequences until terminating ':' */ 4426 /* swallow other graphics sequences until terminating ':' */
3824 do 4427 do
3825 ch = cmd_getc (); 4428 ch = cmd_getc ();
… …
3835 */ 4438 */
3836void 4439void
3837rxvt_term::tt_printf (const char *fmt,...) 4440rxvt_term::tt_printf (const char *fmt,...)
3838{ 4441{
3839 va_list arg_ptr; 4442 va_list arg_ptr;
3840 unsigned char buf[256]; 4443 char buf[256];
3841 4444
3842 va_start (arg_ptr, fmt); 4445 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4446 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4447 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4448 tt_write (buf, strlen (buf));
3846} 4449}
3847 4450
3848/* ---------------------------------------------------------------------- */ 4451/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4452/* 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. 4453 * or generated by us in response to a query ESC sequence.
3851 */ 4454 */
4455const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4456
3852void 4457void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4458rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 4459{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return;
3856 4462
3857 if (len) 4463 if (pty.pty < 0)
4464 return;
4465
4466 if (v_buflen == 0)
4467 {
4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4469
4470 if ((unsigned int)written == len)
4471 return;
4472
4473 data += written;
4474 len -= written;
3858 { 4475 }
4476
4477 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4478
4479 memcpy (v_buffer + v_buflen, data, len);
4480 v_buflen += len;
4481
4482 pty_ev.set (EVENT_READ | EVENT_WRITE);
4483}
4484
4485void rxvt_term::pty_write ()
4486{
4487 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488
4489 if (written > 0)
4490 {
4491 v_buflen -= written;
4492
3859 if (v_buflen == 0) 4493 if (v_buflen == 0)
3860 { 4494 {
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); 4495 free (v_buffer);
3888 v_buffer = 0; 4496 v_buffer = 0;
3889 v_buflen = 0; 4497 v_buflen = 0;
3890 4498
3891 pty_ev.set (EVENT_READ); 4499 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; 4500 return;
3904 } 4501 }
4502
4503 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4504 }
4505 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4506 pty_ev.set (EVENT_READ);
3906} 4507}
3907 4508
3908/*----------------------- end-of-file (C source) -----------------------*/ 4509/*----------------------- end-of-file (C source) -----------------------*/
3909 4510

Diff Legend

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