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

Diff Legend

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