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

Diff Legend

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