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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.292 by root, Sun Jan 29 21:45:47 2006 UTC

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

Diff Legend

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