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

Diff Legend

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