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.324 by sasha, Fri Jun 8 20:04:12 2007 UTC

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

Diff Legend

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