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

Diff Legend

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