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

Diff Legend

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