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

Diff Legend

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