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

Diff Legend

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