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.58 by pcg, Wed Feb 25 15:06:03 2004 UTC vs.
Revision 1.309 by root, Mon Feb 20 22:42:00 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
1780#if TRANSPARENT
1542void 1781void
1543rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1783{
1545 SET_R (this); 1784 make_current ();
1546 SET_LOCALE (locale);
1547 1785
1548 switch (ev.type) 1786 switch (ev.type)
1549 { 1787 {
1550 case PropertyNotify: 1788 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 /* 1789 /*
1561 * if user used some Esetroot compatible prog to set the root bg, 1790 * 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. 1791 * use the property to determine the pixmap. We use it later on.
1563 */ 1792 */
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]) 1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1568 return; 1795 return;
1569 }
1570 1796
1571 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1572 case ReparentNotify: 1798 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1576 break; 1801 break;
1577#endif
1578 } 1802 }
1579} 1803}
1804#endif
1580 1805
1581void 1806void
1582rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1583{ 1808{
1584 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1585 1810
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1587 if (!bypass_keystate) 1813 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1815
1589 /* 1816 /*
1590 * VT window processing of button press 1817 * VT window processing of button press
1591 */ 1818 */
1592 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1593 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1824#if ISO_14755
1825 // 5.4
1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1827 {
1828 iso14755_54 (ev.x, ev.y);
1829 return;
1830 }
1831#endif
1832
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1833 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1834
1595 if (reportmode) 1835 if (reportmode)
1596 { 1836 {
1597 /* mouse report from vt window */ 1837 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1838 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1839 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1602 { 1842 {
1603 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1604 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1605 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1606 { 1847 {
1607 /* only report double clicks */ 1848 /* only report double clicks */
1608 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1609 mouse_report (ev); 1850 mouse_report (ev);
… …
1628 } 1869 }
1629 else 1870 else
1630 { 1871 {
1631 if (ev.button != MEvent.button) 1872 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1873 MEvent.clicks = 0;
1874
1633 switch (ev.button) 1875 switch (ev.button)
1634 { 1876 {
1635 case Button1: 1877 case Button1:
1878 /* allow meta + click to select rectangular areas */
1879 /* should be done in screen.C */
1880#if ENABLE_FRILLS
1881 selection.rect = !!(ev.state & ModMetaMask);
1882#else
1883 selection.rect = false;
1884#endif
1885
1636 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1638 { 1888 {
1639 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1641 else 1891 else
1642 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1657 case Button3: 1907 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1660 else 1910 else
1661 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1912
1662 MEvent.button = Button3; 1913 MEvent.button = Button3;
1663 break; 1914 break;
1664 } 1915 }
1665 } 1916 }
1917
1666 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1667 return; 1919 return;
1668 } 1920 }
1669 1921
1670 /* 1922 /*
… …
1736 upordown = 1; /* down */ 1988 upordown = 1; /* down */
1737 } 1989 }
1738 if (upordown) 1990 if (upordown)
1739 { 1991 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 1994#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 1995 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 1996 {
1745 if (upordown < 0) 1997 if (upordown < 0)
1746 scrollBar.setUp (); 1998 scrollBar.setUp ();
… …
1762 break; 2014 break;
1763 case R_SB_ALIGN_BOTTOM: 2015 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 2016 csrO = scrollBar.bot - scrollBar.top;
1765 break; 2017 break;
1766 } 2018 }
2019
1767 if (scrollBar.style == R_SB_XTERM 2020 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 2021 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 2022 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 2024
1772 scrollBar.setMotion (); 2025 scrollBar.setMotion ();
1773 break; 2026 break;
1774 2027
1775 case Button1: 2028 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2029 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1780 case Button3: 2033 case Button3:
1781 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1782 { 2035 {
1783 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1786# else 2039# else
1787 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1788# endif 2041# endif
1789 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1792# else 2045# else
1793 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1794# endif 2047# endif
1795 else 2048 else
1796 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1797 } 2050 }
1798 else 2051 else
1799 { 2052 {
1800 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 2054 (nrow
1802 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 2056 / scrollbar_size ()));
1804 } 2057 }
2058
1805 break; 2059 break;
1806 } 2060 }
1807 } 2061 }
2062
1808 return; 2063 return;
1809 } 2064 }
1810#if MENUBAR
1811 /*
1812 * Menubar window processing of button press
1813 */
1814 if (isMenuBarWindow (ev.window))
1815 menubar_control (ev);
1816#endif
1817} 2065}
1818 2066
1819void 2067void
1820rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1821{ 2069{
1822 int reportmode = 0; 2070 int reportmode = 0;
1823 2071
1824 csrO = 0; /* reset csr Offset */ 2072 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 2073 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2074 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 2075
1828 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1829 { 2077 {
1830 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1831 scrollbar_show (0); 2079 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH;
1834#endif
1835
1836 } 2080 }
2081
1837#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop();
1839#endif 2085#endif
2086
1840 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1841 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2092#if ISO_14755
2093 // 5.4
2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2095 return;
2096#endif
2097
1842 if (reportmode) 2098 if (reportmode)
1843 { 2099 {
1844 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
1860 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
1861 mouse_report (ev); 2117 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 2119 return;
1864 } 2120 }
2121
1865 /* 2122 /*
1866 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 2124 * when overriding mouse reporting
1868 */ 2125 */
1869 if (PrivateModes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2127 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
1872 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
1873 2130
1874 switch (ev.button) 2131 switch (ev.button)
1875 { 2132 {
1876 case Button1: 2133 case Button1:
1877 case Button3: 2134 case Button3:
1878 selection_make (ev.time); 2135 selection_make (ev.time);
1879 break; 2136 break;
2137
1880 case Button2: 2138 case Button2:
1881 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1882 break; 2141 break;
2142
1883#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
1884 case Button4: 2144 case Button4:
1885 case Button5: 2145 case Button5:
1886 { 2146 {
1887 int i; 2147 int i;
1888 page_dirn v; 2148 page_dirn v;
1889 2149
1890 v = (ev.button == Button4) ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2151
1891 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
1892 i = 1; 2153 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
1894 i = TermWin.nrow - 1; 2155 i = nrow - 1;
1895 else 2156 else
1896 i = 5; 2157 i = 5;
2158
1897# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
1899 { 2161 {
1900 mouse_slip_wheel_speed += (v ? -1 : 1); 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165
2166 if (slip_wheel_ev.at < NOW)
1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2168
2169 slip_wheel_ev.start ();
2170 }
2171 else
2172 {
2173# endif
2174 scr_page (v, i);
2175 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
1902 } 2177 }
1903# endif 2178# 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 } 2179 }
1918 break; 2180 break;
1919#endif 2181#endif
1920
1921 } 2182 }
1922 } 2183 }
1923#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev);
1926#endif
1927} 2184}
1928
1929 2185
1930#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
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 & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
1931/* 2418/*
1932 * Check our parents are still who we think they are. 2419 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2420 * Do transparency updates if required
1934 */ 2421 */
1935int 2422int
1936rxvt_term::check_our_parents () 2423rxvt_term::check_our_parents ()
1937{ 2424{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2425 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2426 unsigned long nitems, bytes_after;
1940 Atom atype; 2427 Atom atype;
1941 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2429 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
1945 2432
1946 pchanged = 0; 2433 pchanged = 0;
1947 2434
1948 if (! (Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1950 2437
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1953 2440
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
1955 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1956 { 2444 {
1957 if (am_transparent) 2445 if (am_transparent)
1958 { 2446 {
1959 pchanged = 1; 2447 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1963 } 2450 }
2451
1964 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1965 } 2453 }
1966 2454
1967 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
1968 XSync (display->display, False); 2456 XSync (dpy, False);
1969 2457
1970 /* 2458 /*
1971 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1973 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
1974 */ 2462 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2463 i = (xa[XA_XROOTPMAP_ID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2466 &nitems, &bytes_after, &prop) == Success);
2467
1979 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
1980 have_pixmap = 0; 2479 have_pixmap = 0;
1981 else 2480 else
1982 { 2481 {
1983 have_pixmap = 1; 2482 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2483 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2484 XFree (prop);
1986 } 2485 }
2486
1987 if (have_pixmap) 2487 if (have_pixmap)
1988 { 2488 {
1989 /* 2489 /*
1990 * Copy display->root pixmap transparency 2490 * Copy display->root pixmap transparency
1991 */ 2491 */
1992 int sx, sy, nx, ny; 2492 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2493 unsigned int nw, nh;
1994 Window cr; 2494 Window cr;
1995 XImage *image; 2495 XImage *image;
1996 GC gc; 2496 GC gc;
1997 XGCValues gcvalue; 2497 XGCValues gcvalue;
1998 2498
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2503 nx = ny = 0;
2504
2004 if (sx < 0) 2505 if (sx < 0)
2005 { 2506 {
2006 nw += sx; 2507 nw += sx;
2007 nx = -sx; 2508 nx = -sx;
2008 sx = 0; 2509 sx = 0;
2009 } 2510 }
2511
2010 if (sy < 0) 2512 if (sy < 0)
2011 { 2513 {
2012 nh += sy; 2514 nh += sy;
2013 ny = -sy; 2515 ny = -sy;
2014 sy = 0; 2516 sy = 0;
2015 } 2517 }
2518
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2018 allowedxerror = -1; 2523 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2525
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2528 allowedxerror = 0;
2529
2024 if (image == NULL) 2530 if (image == NULL)
2025 { 2531 {
2026 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2027 { 2533 {
2028 pchanged = 1; 2534 pchanged = 1;
2029 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2030 { 2536 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2032 TermWin.pixmap = None; 2538 pixmap = None;
2033 } 2539 }
2034 } 2540 }
2541
2035 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2036 } 2543 }
2037 else 2544 else
2038 { 2545 {
2039 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2040 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2548
2042 (unsigned int)szHint.width, 2549#if TINTING
2043 (unsigned int)szHint.height, 2550 if (ISSET_PIXCOLOR (Color_tint))
2044 (unsigned int)image->depth); 2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2564 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2565 XFreeGC (dpy, gc);
2050 XDestroyImage (image); 2566 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2052 TermWin.pixmap); 2568 XClearWindow (dpy, parent[0]);
2569
2053 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2571 pchanged = 1;
2572
2055 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2056 } 2574 }
2057 } 2575 }
2576
2058 if (!am_pixmap_trans) 2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2059 { 2580 {
2060 unsigned int n; 2581 unsigned int n;
2061 /* 2582 /*
2062 * InheritPixmap transparency 2583 * InheritPixmap transparency
2063 */ 2584 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2586 {
2068 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2070 &TermWin.parent[i], &list, &n);
2071 XFree (list); 2589 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2590
2073 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2074 { 2592 {
2075 if (oldp != None) 2593 if (oldp != None)
2076 pchanged = 1; 2594 pchanged = 1;
2595
2077 break; 2596 break;
2078 } 2597 }
2598
2079 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2080 pchanged = 1; 2600 pchanged = 1;
2081 } 2601 }
2602
2082 n = 0; 2603 n = 0;
2604
2083 if (pchanged) 2605 if (pchanged)
2084 {
2085 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2086 { 2627 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2629 XClearWindow (dpy, parent[n]);
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657
2658/*}}} */
2659
2660bool
2661rxvt_term::cmd_parse ()
2662{
2663 bool flag = false;
2664 wchar_t ch = NOCHAR;
2665 char *seq_begin; // remember start of esc-sequence here
2666
2667 for (;;)
2668 {
2669 if (ch == NOCHAR)
2670 {
2671 seq_begin = cmdbuf_ptr;
2672 ch = next_char ();
2673
2674 if (ch == NOCHAR)
2675 break;
2676 }
2677
2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2679 {
2680 if (!seen_input)
2681 {
2682 seen_input = 1;
2683 // many badly-written programs (e.g. jed) contain a race condition:
2684 // they first read the screensize and then install a SIGWINCH handler.
2685 // some window managers resize the window early, and these programs
2686 // then sometimes get the size wrong.
2687 // unfortunately other programs are even more buggy and dislike
2688 // being sent SIGWINCH, so only do it when we were in fact being
2689 // resized.
2690 if (seen_resize && cmd_pid)
2691 kill (-cmd_pid, SIGWINCH);
2692 }
2693
2694 /* Read a text string from the input buffer */
2695 wchar_t buf[UBUFSIZ];
2696 bool refreshnow = false;
2697 int nlines = 0;
2698 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2700
2701 for (;;)
2702 {
2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2704 break;
2705
2706 *str++ = ch;
2707
2708 if (ch == C0_LF || str >= eol)
2090 { 2709 {
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2710 if (ch == C0_LF)
2711 nlines++;
2712
2713 refresh_count++;
2714
2715 if (!OPTION (Opt_jumpScroll)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 {
2718 refreshnow = true;
2719 refresh_count = 0;
2720 ch = NOCHAR;
2092 break; 2721 break;
2722 }
2723
2724 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1)
2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2729 scr_add_lines (buf, str - buf, nlines);
2730
2731 nlines = 0;
2732 str = buf;
2733 eol = str + min (ncol, UBUFSIZ);
2734 }
2735
2736 if (str >= eol)
2737 {
2738 if (eol >= buf + UBUFSIZ)
2739 {
2740 ch = NOCHAR;
2741 break;
2742 }
2743 else
2744 eol = min (eol + ncol, buf + UBUFSIZ);
2745 }
2746
2747 }
2748
2749 seq_begin = cmdbuf_ptr;
2750 ch = next_char ();
2751 }
2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines);
2756
2757 /*
2758 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */
2763 if (refreshnow)
2764 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true;
2770 scr_refresh ();
2771 want_refresh = 1;
2093 } 2772 }
2094 } 2773 }
2095 } 2774
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 } 2775 }
2107 else 2776 else
2108 { 2777 {
2109 /* wait (an arbitrary period) for the WM to do its thing 2778 try
2110 * needed for fvwm2.2.2 (and before?) */ 2779 {
2111# ifdef HAVE_NANOSLEEP 2780 process_nonprinting (ch);
2112 struct timespec rqt; 2781 }
2782 catch (const class out_of_input &o)
2783 {
2784 // we ran out of input, retry later
2785 cmdbuf_ptr = seq_begin;
2786 break;
2787 }
2113 2788
2114 rqt.tv_sec = 1; 2789 ch = NOCHAR;
2115 rqt.tv_nsec = 0; 2790 }
2116 nanosleep (&rqt, NULL); 2791 }
2117# else 2792
2118 sleep (1); 2793 return flag;
2119# endif 2794}
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2795
2121 for (n = 0; n < (unsigned int)i; n++) 2796// read the next character
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2797wchar_t
2123 ParentRelative); 2798rxvt_term::next_char () NOTHROW
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2799{
2125 ParentRelative); 2800 while (cmdbuf_ptr < cmdbuf_endp)
2126 am_transparent = 1; 2801 {
2802 // assume 7-bit to be ascii ALWAYS
2803 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2804 return *cmdbuf_ptr++;
2805
2806 wchar_t wc;
2807 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2808
2809 if (len == (size_t)-2)
2127 } 2810 {
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2811 // the mbstate stores incomplete sequences. didn't know this :/
2129 TermWin.parent[i] = None; 2812 cmdbuf_ptr = cmdbuf_endp;
2813 break;
2814 }
2815
2816 if (len == (size_t)-1)
2817 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2818
2819 // assume wchar == unicode
2820 cmdbuf_ptr += len;
2821 return wc & UNICODE_MASK;
2130 } 2822 }
2823
2824 return NOCHAR;
2825}
2826
2827// read the next octet
2828uint32_t
2829rxvt_term::next_octet () NOTHROW
2830{
2831 return cmdbuf_ptr < cmdbuf_endp
2832 ? (unsigned char)*cmdbuf_ptr++
2833 : NOCHAR;
2834}
2835
2836static class out_of_input out_of_input;
2837
2838/* rxvt_cmd_getc () - Return next input character */
2839/*
2840 * Return the next input character after first passing any keyboard input
2841 * to the command.
2842 */
2843wchar_t
2844rxvt_term::cmd_getc () THROW ((class out_of_input))
2845{
2846 wchar_t c = next_char ();
2847
2848 if (c == NOCHAR)
2849 throw out_of_input;
2850
2131 return pchanged; 2851 return c;
2132} 2852}
2133#endif
2134 2853
2135/*}}} */ 2854uint32_t
2855rxvt_term::cmd_get8 () THROW ((class out_of_input))
2856{
2857 uint32_t c = next_octet ();
2858
2859 if (c == NOCHAR)
2860 throw out_of_input;
2861
2862 return c;
2863}
2136 2864
2137/*{{{ print pipe */ 2865/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2866/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2867#ifdef PRINTPIPE
2140FILE * 2868FILE *
2141rxvt_term::popen_printer () 2869rxvt_term::popen_printer ()
2142{ 2870{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2871 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2872
2145 if (stream == NULL) 2873 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2874 rxvt_warn ("can't open printer pipe, not printing.\n");
2875
2147 return stream; 2876 return stream;
2148} 2877}
2149 2878
2150int 2879int
2151rxvt_term::pclose_printer (FILE *stream) 2880rxvt_term::pclose_printer (FILE *stream)
2152{ 2881{
2153 fflush (stream); 2882 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); 2883 return pclose (stream);
2160# endif
2161} 2884}
2162 2885
2163/* 2886/*
2164 * simulate attached vt100 printer 2887 * simulate attached vt100 printer
2165 */ 2888 */
2166void 2889void
2167rxvt_term::process_print_pipe () 2890rxvt_term::process_print_pipe ()
2168{ 2891{
2169 int done; 2892 int done;
2170 FILE *fd; 2893 FILE *fd;
2171 2894
2172 if ((fd = popen_printer ()) == NULL) 2895 if ((fd = popen_printer ()) == NULL)
2173 return; 2896 return;
2174 2897
2175 /* 2898 /*
2176 * Send all input to the printer until either ESC[4i or ESC[?4i 2899 * Send all input to the printer until either ESC[4i or ESC[?4i
2177 * is received. 2900 * is received.
2178 */ 2901 */
2179 for (done = 0; !done;) 2902 for (done = 0; !done;)
2180 { 2903 {
2181 unsigned char buf[8]; 2904 unsigned char buf[8];
2182 unsigned char ch; 2905 unicode_t ch;
2183 unsigned int i, len; 2906 unsigned int i, len;
2184 2907
2185 if ((ch = cmd_getc ()) != C0_ESC) 2908 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2909 {
2187 if (putc (ch, fd) == EOF) 2910 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2911 break; /* done = 1 */
… …
2203 { 2926 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2927 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2928 break; /* done = 1 */
2206 } 2929 }
2207 } 2930 }
2931
2208 for (i = 0; i < len; i++) 2932 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2933 if (putc (buf[i], fd) == EOF)
2210 { 2934 {
2211 done = 1; 2935 done = 1;
2212 break; 2936 break;
2213 } 2937 }
2214 } 2938 }
2215 } 2939 }
2940
2216 pclose_printer (fd); 2941 pclose_printer (fd);
2217} 2942}
2218#endif /* PRINTPIPE */ 2943#endif /* PRINTPIPE */
2219/*}}} */ 2944/*}}} */
2220 2945
2221/* *INDENT-OFF* */ 2946/* *INDENT-OFF* */
2222enum { 2947enum {
2223 C1_40 = 0x40, 2948 C1_40 = 0x40,
2224 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2949 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, 2950 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, 2951 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 2952 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2228}; 2953};
2229/* *INDENT-ON* */ 2954/* *INDENT-ON* */
2230 2955
2231/*{{{ process non-printing single characters */ 2956/*{{{ process non-printing single characters */
2232void 2957void
2233rxvt_term::process_nonprinting (unsigned char ch) 2958rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2959{
2235 switch (ch) 2960 switch (ch)
2236 { 2961 {
2962 case C0_ESC:
2963 process_escape_seq ();
2964 break;
2237 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2239 tt_write ( 2967 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 2968 else
2243 tt_write ((unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, strlen (VT100_ANS));
2244 (unsigned int)STRLEN (VT100_ANS));
2245 break; 2970 break;
2246 case C0_BEL: /* bell */ 2971 case C0_BEL: /* bell */
2247 scr_bell (); 2972 scr_bell ();
2248 break; 2973 break;
2249 case C0_BS: /* backspace */ 2974 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2989 scr_charset_choose (1);
2265 break; 2990 break;
2266 case C0_SI: /* shift in - acs */ 2991 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2992 scr_charset_choose (0);
2268 break; 2993 break;
2994
2995#ifdef EIGHT_BIT_CONTROLS
2996 // 8-bit controls
2997 case 0x90: /* DCS */
2998 process_dcs_seq ();
2999 break;
3000 case 0x9b: /* CSI */
3001 process_csi_seq ();
3002 break;
3003 case 0x9d: /* CSI */
3004 process_osc_seq ();
3005 break;
3006#endif
2269 } 3007 }
2270} 3008}
2271/*}}} */ 3009/*}}} */
2272 3010
2273 3011
2274/*{{{ process VT52 escape sequences */ 3012/*{{{ process VT52 escape sequences */
2275void 3013void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 3014rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 3015{
2278 int row, col; 3016 int row, col;
2279 3017
2280 switch (ch) 3018 switch (ch)
2281 { 3019 {
… …
2333 3071
2334/*{{{ process escape sequences */ 3072/*{{{ process escape sequences */
2335void 3073void
2336rxvt_term::process_escape_seq () 3074rxvt_term::process_escape_seq ()
2337{ 3075{
2338 unsigned char ch = cmd_getc (); 3076 unicode_t ch = cmd_getc ();
2339 3077
2340 if (PrivateModes & PrivMode_vt52) 3078 if (priv_modes & PrivMode_vt52)
2341 { 3079 {
2342 process_escape_vt52 (ch); 3080 process_escape_vt52 (ch);
2343 return; 3081 return;
2344 } 3082 }
2345 3083
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 3099 break;
2362 case '+': 3100 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 3102 break;
2365#ifdef MULTICHAR_SET 3103#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': 3104 case '6':
2372 scr_backindex (); 3105 scr_backindex ();
2373 break; 3106 break;
2374#endif 3107#endif
2375 case '7': 3108 case '7':
2376 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
2377 break; 3110 break;
2378 case '8': 3111 case '8':
2379 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
2380 break; 3113 break;
2381#ifndef NO_FRILLS 3114#if !ENABLE_MINIMAL
2382 case '9': 3115 case '9':
2383 scr_forwardindex (); 3116 scr_forwardindex ();
2384 break; 3117 break;
2385#endif 3118#endif
2386 case '=': 3119 case '=':
… …
2396 break; 3129 break;
2397 3130
2398 /* 8.3.87: NEXT LINE */ 3131 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 3132 case C1_NEL: /* ESC E */
2400 { 3133 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 3134 wchar_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 3135 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2403 } 3136 }
2404 break; 3137 break;
2405 3138
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 3139 /* kidnapped escape sequence: Should be 8.3.48 */
2407 case C1_ESA: /* ESC G */ 3140 case C1_ESA: /* ESC G */
… …
2417 case C1_RI: /* ESC M */ 3150 case C1_RI: /* ESC M */
2418 scr_index (DN); 3151 scr_index (DN);
2419 break; 3152 break;
2420 3153
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 3154 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 3155 /*case C1_SS2: scr_single_shift (2); break; */
2423 3156
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 3157 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 3158 /*case C1_SS3: scr_single_shift (3); break; */
2426 3159
2427 /* 8.3.27: DEVICE CONTROL STRING */ 3160 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 3161 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 3162 process_dcs_seq ();
2430 break; 3163 break;
2431 3164
2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3165 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2433 case C1_SCI: /* ESC Z */ 3166 case C1_SCI: /* ESC Z */
2434 tt_write ((const unsigned char *)ESCZ_ANSWER, 3167 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2436 break; /* steal obsolete ESC [ c */ 3168 break; /* steal obsolete ESC [ c */
2437 3169
2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3170 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2439 case C1_CSI: /* ESC [ */ 3171 case C1_CSI: /* ESC [ */
2440 process_csi_seq (); 3172 process_csi_seq ();
… …
2445 process_osc_seq (); 3177 process_osc_seq ();
2446 break; 3178 break;
2447 3179
2448 /* 8.3.106: RESET TO INITIAL STATE */ 3180 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 3181 case 'c':
3182 mbstate.reset ();
2450 scr_poweron (); 3183 scr_poweron ();
2451 scrollbar_show (1); 3184 scrollbar_show (1);
2452 break; 3185 break;
2453 3186
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3187 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 3199
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3200/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 3201/* *INDENT-OFF* */
2469enum { 3202enum {
2470 CSI_ICH = 0x40, 3203 CSI_ICH = 0x40,
2471 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3204 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 , 3205 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, 3206 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, 3207 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, 3208 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, 3209 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, */ 3224 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, [, \, ], ^, _, */ 3225 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, */ 3226 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, */ 3227 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, */ 3228 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, {, |, }, ~, */ 3229 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2497 }; 3230 };
2498/* *INDENT-ON* */ 3231/* *INDENT-ON* */
2499 3232
2500void 3233void
2501rxvt_term::process_csi_seq () 3234rxvt_term::process_csi_seq ()
2502{ 3235{
2503 unsigned char ch, priv, i; 3236 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 3237 unsigned int nargs, p;
2505 int n, ndef; 3238 int n, ndef;
2506 int arg[ESC_ARGS]; 3239 int arg[ESC_ARGS];
2507 3240
2508 for (nargs = ESC_ARGS; nargs > 0;) 3241 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 3242 arg[--nargs] = 0;
2510 3243
2511 priv = 0; 3244 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 3246 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 3247 { /* '<' '=' '>' '?' */
2515 priv = ch; 3248 priv = ch;
2516 ch = cmd_getc (); 3249 ch = cmd_getc ();
2517 } 3250 }
3251
2518 /* read any numerical arguments */ 3252 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 3253 for (n = -1; ch < CSI_ICH; )
2520 { 3254 {
2521 if (isdigit (ch)) 3255 if (isdigit (ch))
2522 { 3256 {
… …
2529 { 3263 {
2530 if (nargs < ESC_ARGS) 3264 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3265 arg[nargs++] = n;
2532 n = -1; 3266 n = -1;
2533 } 3267 }
2534 else if (ch == '\b') 3268 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); 3269 process_nonprinting (ch);
2546 } 3270
2547 ch = cmd_getc (); 3271 ch = cmd_getc ();
2548 } 3272 }
2549 3273
2550 if (ch > CSI_7F) 3274 if (ch > CSI_7F)
2551 return; 3275 return;
… …
2557 ndef = get_byte_array_bit (csi_defaults, i); 3281 ndef = get_byte_array_bit (csi_defaults, i);
2558 for (p = 0; p < nargs; p++) 3282 for (p = 0; p < nargs; p++)
2559 if (arg[p] == -1) 3283 if (arg[p] == -1)
2560 arg[p] = ndef; 3284 arg[p] = ndef;
2561 3285
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 /* 3286 /*
2570 * private mode handling 3287 * private mode handling
2571 */ 3288 */
2572 if (priv) 3289 if (priv)
2573 { 3290 {
2574 switch (priv) 3291 switch (priv)
2575 { 3292 {
2576 case '>': 3293 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3295 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3301 // that we do not support xterm mouse reporting (should be 95 when we do).
3302 //
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3303 tt_printf ("\033[>%d;94;0c", 'U');
3304 }
2579 break; 3305 break;
2580 case '?': 3306 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 3309 break;
… …
2688 3414
2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3415 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2690 arg[0] = -arg[0]; 3416 arg[0] = -arg[0];
2691 /* FALLTHROUGH */ 3417 /* FALLTHROUGH */
2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3418 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3419 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2694 break; 3420 break;
2695 3421
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3422 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 3423 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 3424 break;
2700 3425
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3426 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 3427 process_sgr_mode (nargs, arg);
2703 break; 3428 break;
… …
2709 tt_printf ("\033[0n"); 3434 tt_printf ("\033[0n");
2710 break; 3435 break;
2711 case 6: /* CPR requested */ 3436 case 6: /* CPR requested */
2712 scr_report_position (); 3437 scr_report_position ();
2713 break; 3438 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3439 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure))
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3441 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 3442 break;
2718#endif
2719 case 8: /* unofficial extension */ 3443 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3445 break;
2722 } 3446 }
2723 break; 3447 break;
2724 3448
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3449 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3482 break;
2759 3483
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3484 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3485 if (arg[0] == 4)
2762 scr_insert_mode (0); 3486 scr_insert_mode (0);
3487 else if (arg[0] == 20)
3488 priv_modes &= ~PrivMode_LFNL;
2763 break; 3489 break;
2764 3490
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3491 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3492 if (arg[0] == 4)
2767 scr_insert_mode (1); 3493 scr_insert_mode (1);
3494 else if (arg[0] == 20)
3495 priv_modes |= PrivMode_LFNL;
2768 break; 3496 break;
2769 3497
2770 /* 3498 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3499 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3500 */
… …
2784 break; 3512 break;
2785 case CSI_75: 3513 case CSI_75:
2786 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
2787 break; 3515 break;
2788 3516
2789#ifndef NO_FRILLS 3517#if !ENABLE_MINIMAL
2790 case CSI_74: 3518 case CSI_74:
2791 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
2792 break; 3520 break;
2793#endif 3521#endif
2794 3522
2795 case CSI_78: /* DECREQTPARM */ 3523 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3524 if (arg[0] == 0 || arg[0] == 1)
2797 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3525 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2798 /* FALLTHROUGH */ 3526 break;
2799 3527
2800 default: 3528 default:
2801 break; 3529 break;
2802 } 3530 }
2803} 3531}
2804/*}}} */ 3532/*}}} */
2805 3533
2806#ifndef NO_FRILLS 3534#if !ENABLE_MINIMAL
2807/* ARGSUSED */ 3535/* ARGSUSED */
2808void 3536void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3538{
2811 int x, y; 3539 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
2816 Window wdummy; 3541 Window wdummy;
3542
3543 dLocal (Display *, dpy);
2817 3544
2818 if (nargs == 0) 3545 if (nargs == 0)
2819 return; 3546 return;
3547
2820 switch (args[0]) 3548 switch (args[0])
2821 { 3549 {
2822 /* 3550 /*
2823 * commands 3551 * commands
2824 */ 3552 */
2825 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3554 XMapWindow (dpy, parent[0]);
2827 break; 3555 break;
2828 case 2: /* iconify window */ 3556 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3557 XIconifyWindow (dpy, parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3558 break;
2832 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
2834 break; 3561 break;
2835 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3564 break;
2838 case 5: /* raise window */ 3565 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
2840 break; 3567 break;
2841 case 6: /* lower window */ 3568 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3569 XLowerWindow (dpy, parent[0]);
2843 break; 3570 break;
2844 case 7: /* refresh window */ 3571 case 7: /* refresh window */
2845 scr_touch (true); 3572 scr_touch (true);
2846 break; 3573 break;
2847 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3575 set_widthheight ((unsigned int) (args[2] * fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
2850 break; 3577 break;
3578
3579 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3580 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3582 set_widthheight ((unsigned int)width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3583 (unsigned int) (args[1] * fheight));
2855 break; 3584 break;
3585
2856 /* 3586 /*
2857 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
2858 */ 3588 */
2859 case 11: /* report window state */ 3589 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3592 break;
2863 case 13: /* report window position */ 3593 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3599 break;
2870 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3603 break;
3604 case 18: /* report text area size (chars) */
3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3606 break;
2874 case 18: /* report window size (chars) */ 3607 case 19: /* report window size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2876 break; 3609 break;
2877#if 0 /* XXX: currently disabled due to security concerns */
2878 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3611 {
3612 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3615 XFree (s);
3616 }
2881 break; 3617 break;
2882 case 21: /* report window title */ 3618 case 21: /* report window title */
3619 {
3620 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3623 XFree (s);
3624 }
2885 break; 3625 break;
2886#endif
2887
2888 } 3626 }
2889} 3627}
2890#endif 3628#endif
2891 3629
2892/*----------------------------------------------------------------------*/ 3630/*----------------------------------------------------------------------*/
2893/* 3631/*
2894 * get input up until STRING TERMINATOR (or BEL) 3632 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3633 * ends_how is terminator used. returned input must be free()'d
2896 */ 3634 */
2897unsigned char * 3635char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3636rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3637{
2900 int seen_esc = 0; /* seen escape? */ 3638 unicode_t ch;
3639 bool seen_esc = false;
2901 unsigned int n = 0; 3640 unsigned int n = 0;
2902 unsigned char *s; 3641 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3642
2905 for (; (ch = cmd_getc ());) 3643 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3644 {
2907 if (ch == C0_BEL 3645 if (seen_esc)
2908 || ch == CHAR_ST 3646 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3647 if (ch == 0x5c) /* 7bit ST */
2910 break; 3648 break;
3649 else
3650 return NULL;
3651 }
2911 if (ch == C0_ESC) 3652 else if (ch == C0_ESC)
2912 { 3653 {
2913 seen_esc = 1; 3654 seen_esc = true;
2914 continue; 3655 continue;
2915 } 3656 }
2916 else if (ch == '\t') 3657 else if (ch == C0_BEL || ch == CHAR_ST)
2917 ch = ' '; /* translate '\t' to space */ 3658 break;
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3659 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3660 return NULL; /* other control character - exit */
2920 if (n < sizeof (string) - 1) 3661
3662 seen_esc = false;
3663
3664 if (n >= STRING_MAX - 1)
3665 // stop at some sane length
3666 return NULL;
3667
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
2921 string[n++] = ch; 3671 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3672 }
3673
2924 string[n++] = '\0'; 3674 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3675
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3676 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3677
2929 return s; 3678 return rxvt_wcstombs (string);
2930} 3679}
2931 3680
2932/*----------------------------------------------------------------------*/ 3681/*----------------------------------------------------------------------*/
2933/* 3682/*
2934 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3683 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2935 */ 3684 */
2936void 3685void
2937rxvt_term::process_dcs_seq () 3686rxvt_term::process_dcs_seq ()
2938{ 3687{
2939 unsigned char eh, *s; 3688 char *s;
3689 unicode_t eh;
3690
2940 /* 3691 /*
2941 * Not handled yet 3692 * Not handled yet
2942 */ 3693 */
2943 s = get_to_st (&eh); 3694 s = get_to_st (eh);
2944 if (s) 3695 if (s)
2945 free (s); 3696 free (s);
3697
2946 return; 3698 return;
2947} 3699}
2948 3700
2949/*----------------------------------------------------------------------*/ 3701/*----------------------------------------------------------------------*/
2950/* 3702/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3703 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3704 */
2953void 3705void
2954rxvt_term::process_osc_seq () 3706rxvt_term::process_osc_seq ()
2955{ 3707{
2956 unsigned char ch, eh, *s; 3708 unicode_t ch, eh;
2957 int arg; 3709 int arg;
2958 3710
2959 ch = cmd_getc (); 3711 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3712 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3713 arg = arg * 10 + (ch - '0');
2962 3714
2963 if (ch == ';') 3715 if (ch == ';')
2964 { 3716 {
2965 s = get_to_st (&eh); 3717 char *s = get_to_st (eh);
3718
2966 if (s) 3719 if (s)
2967 { 3720 {
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); 3721 process_xterm_seq (arg, s, eh);
2980 free (s); 3722 free (s);
2981 } 3723 }
2982 } 3724 }
2983} 3725}
3726
3727void
3728rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3729{
3730 if (str[0] == '?' && !str[1])
3731 {
3732 rgba c;
3733 pix_colors_focused[color].get (c);
3734
3735#if XFT
3736 if (c.a != rgba::MAX_CC)
3737 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3738 else
3739#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 }
3742 else
3743 set_window_color (color, str);
3744}
3745
2984/* 3746/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * 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 */ 3748 */
3006void 3749void
3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3008{ 3751{
3009 int changed = 0; 3752 int color;
3010 int color;
3011 char *buf, *name; 3753 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756
3757 dLocal (Display *, dpy);
3012 3758
3013 assert (str != NULL); 3759 assert (str != NULL);
3014 switch (op) 3760 switch (op)
3015 { 3761 {
3016 case XTerm_name: 3762 case XTerm_name:
3017 set_title (str); 3763 set_title (str);
3018 /* FALLTHROUGH */ 3764 /* FALLTHROUGH */
3019 case XTerm_iconName: 3765 case XTerm_iconName:
3020 set_iconName (str); 3766 set_icon_name (str);
3021 break; 3767 break;
3022 case XTerm_title: 3768 case XTerm_title:
3023 set_title (str); 3769 set_title (str);
3024 break; 3770 break;
3771 case XTerm_property:
3772 if (str[0] == '?')
3773 {
3774 Atom prop = display->atom (str + 1);
3775 Atom actual_type;
3776 int actual_format;
3777 unsigned long nitems;
3778 unsigned long bytes_after;
3779 unsigned char *value = 0;
3780 const char *str = "";
3781
3782 if (prop
3783 && XGetWindowProperty (dpy, parent[0],
3784 prop, 0, 1<<16, 0, AnyPropertyType,
3785 &actual_type, &actual_format,
3786 &nitems, &bytes_after, &value) == Success
3787 && actual_type != None
3788 && actual_format == 8)
3789 str = (const char *)(value);
3790
3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3792
3793 XFree (value);
3794 }
3795 else
3796 {
3797 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3798
3799 if (eq)
3800 {
3801 *eq = 0;
3802 set_utf8_property (display->atom (str), eq + 1);
3803 }
3804 else
3805 XDeleteProperty (dpy, parent[0],
3806 display->atom (str));
3807 }
3808 break;
3809
3025 case XTerm_Color: 3810 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3811 for (buf = (char *)str; buf && *buf;)
3027 { 3812 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3813 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3814 break;
3815
3030 *name++ = '\0'; 3816 *name++ = '\0';
3031 color = atoi (buf); 3817 color = atoi (buf) + minCOLOR;
3032 if (color < 0 || color >= TOTAL_COLORS) 3818
3819 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3033 break; 3820 break;
3821
3034 if ((buf = STRCHR (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3035 *buf++ = '\0'; 3823 *buf++ = '\0';
3036 set_window_color (color + minCOLOR, name); 3824
3825 process_color_seq (op, color, name, resp);
3037 } 3826 }
3827 break;
3828 case XTerm_Color00:
3829 process_color_seq (op, Color_fg, str, resp);
3830 break;
3831 case XTerm_Color01:
3832 process_color_seq (op, Color_bg, str, resp);
3038 break; 3833 break;
3039#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3836 process_color_seq (op, Color_cursor, str, resp);
3042 break; 3837 break;
3043#endif 3838#endif
3044 case XTerm_Color_pointer: 3839 case XTerm_Color_pointer_fg:
3045 set_window_color (Color_pointer, str); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3841 break;
3842 case XTerm_Color_pointer_bg:
3843 process_color_seq (op, Color_pointer_bg, str, resp);
3046 break; 3844 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#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: 3846 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3847 process_color_seq (op, Color_RV, str, resp);
3056 break; 3848 break;
3849 case Rxvt_Color_BD:
3850 case URxvt_Color_BD:
3851 process_color_seq (op, Color_BD, str, resp);
3852 break;
3853 case Rxvt_Color_UL:
3854 case URxvt_Color_UL:
3855 process_color_seq (op, Color_UL, str, resp);
3856 break;
3857 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp);
3859 break;
3057#endif 3860#endif
3861#if TRANSPARENT && TINTING
3862 case URxvt_Color_tint:
3863 process_color_seq (op, Color_tint, str, resp);
3058 3864
3059 case XTerm_Menu: 3865 check_our_parents ();
3866
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3869
3870 break;
3871#endif
3872
3873 case Rxvt_Pixmap:
3060 /* 3874 {
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 != ';') 3875 if (*str != ';')
3067 { 3876 {
3068#if XPM_BACKGROUND 3877#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3070 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3071#endif
3072 scr_touch (true); 3880 scr_touch (true);
3881#endif
3073 } 3882 }
3883
3884 int changed = 0;
3885
3074 while ((str = STRCHR (str, ';')) != NULL) 3886 while ((str = strchr (str, ';')) != NULL)
3075 { 3887 {
3076 str++; 3888 str++;
3077#if XPM_BACKGROUND 3889#if XPM_BACKGROUND
3078 changed += scale_pixmap (str); 3890 changed += scale_pixmap (str);
3079#endif 3891#endif
3080
3081 } 3892 }
3893
3082 if (changed) 3894 if (changed)
3083 { 3895 {
3084#ifdef XPM_BACKGROUND 3896#ifdef XPM_BACKGROUND
3085 resize_pixmap (); 3897 resize_pixmap ();
3086#endif
3087 scr_touch (true); 3898 scr_touch (true);
3899#endif
3088 } 3900 }
3901 }
3089 break; 3902 break;
3090 3903
3091 case XTerm_restoreFG: 3904 case Rxvt_restoreFG:
3092 set_window_color (Color_fg, str); 3905 set_window_color (Color_fg, str);
3093 break; 3906 break;
3094 case XTerm_restoreBG: 3907 case Rxvt_restoreBG:
3095 set_window_color (Color_bg, str); 3908 set_window_color (Color_bg, str);
3096 break; 3909 break;
3910
3097 case XTerm_logfile: 3911 case XTerm_logfile:
3912 // TODO, when secure mode?
3098 break; 3913 break;
3099 case XTerm_font:
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 3914
3110 if (display->selection_owner == this)
3111 display->set_selection_owner (0);
3112 }
3113 break;
3114#if 0 3915#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3916 case Rxvt_dumpscreen: /* no error notices */
3116 { 3917 {
3117 int fd; 3918 int fd;
3118 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3920 {
3120 scr_dump (fd); 3921 scr_dump (fd);
3121 close (fd); 3922 close (fd);
3122 } 3923 }
3123 } 3924 }
3124 break; 3925 break;
3125#endif 3926#endif
3927 case XTerm_font:
3928 op = URxvt_font;
3929 case URxvt_font:
3930#if ENABLE_STYLES
3931 case URxvt_boldFont:
3932 case URxvt_italicFont:
3933 case URxvt_boldItalicFont:
3934#endif
3935 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp);
3940 else
3941 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3126 3943
3944 res = strdup (str);
3945 allocated.push_back ((void *)res);
3946 set_fonts ();
3947 }
3948 break;
3949
3950 case URxvt_version:
3951 if (query)
3952 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3953 op,
3954 rs[Rs_name], VERSION[0], VERSION[2],
3955 resp);
3956 break;
3957
3958#if !ENABLE_MINIMAL
3959 case URxvt_locale:
3960 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3962 else
3963 {
3964 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale ();
3967 }
3968 break;
3969
3970 case URxvt_view_up:
3971 case URxvt_view_down:
3972 {
3973 int lines = atoi (str);
3974
3975 if (lines)
3976 scr_page (op == URxvt_view_up ? UP : DN, lines);
3977 else
3978 scr_erase_savelines ();
3979 }
3980
3981 break;
3982#endif
3983
3984#if ENABLE_PERL
3985 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3987 ; // no responses yet
3988 break;
3989#endif
3127 } 3990 }
3128} 3991}
3129/*----------------------------------------------------------------------*/ 3992/*----------------------------------------------------------------------*/
3130 3993
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3994/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 4002 * so no need for fancy checking
3140 */ 4003 */
3141int 4004int
3142rxvt_term::privcases (int mode, unsigned long bit) 4005rxvt_term::privcases (int mode, unsigned long bit)
3143{ 4006{
3144 int state; 4007 int state;
3145 4008
3146 if (mode == 's') 4009 if (mode == 's')
3147 { 4010 {
3148 SavedModes |= (PrivateModes & bit); 4011 SavedModes |= (priv_modes & bit);
3149 return -1; 4012 return -1;
3150 } 4013 }
3151 else 4014 else
3152 { 4015 {
3153 if (mode == 'r') 4016 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4017 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 4018 else
3156 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4019 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode (state, bit); 4020 PrivMode (state, bit);
3158 } 4021 }
4022
3159 return state; 4023 return state;
3160} 4024}
3161 4025
3162/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
3163void 4027void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3165{ 4029{
3166 unsigned int i, j; 4030 unsigned int i, j;
3167 int state; 4031 int state;
4032
3168 static const struct 4033 static const struct
3169 { 4034 {
3170 const int argval; 4035 const int argval;
3171 const unsigned long bit; 4036 const unsigned long bit;
3172 } 4037 }
4038
3173 argtopriv[] = { 4039 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 4040 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 4041 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 4042 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 4043 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 4044 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 4045 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 4046 { 7, PrivMode_Autowrap },
4047 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 4048 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 4049 // 18, 19 printing-related
3183 { menuBar_esc, PrivMode_menuBar }, 4050 { 25, PrivMode_VisibleCursor },
3184#endif
3185#ifdef scrollBar_esc 4051#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 4052 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 4053#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 4054 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 4055 { 40, PrivMode_132OK },
4056 // 41 xterm more fixes NYI
4057 // 45 margin bell NYI
4058 // 46 start logging
3191 { 47, PrivMode_Screen }, 4059 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 4060 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 4061#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 4062 { 67, PrivMode_BackSpace },
3195#endif 4063#endif
3196 { 1000, PrivMode_MouseX11 }, 4064 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3197 { 1010, PrivMode_TtyOutputInh }, 4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 4069 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 4073 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4075 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 4077 };
3202 4078
3203 if (nargs == 0) 4079 if (nargs == 0)
3204 return; 4080 return;
3205 4081
… …
3220 state = privcases (mode, argtopriv[j].bit); 4096 state = privcases (mode, argtopriv[j].bit);
3221 break; 4097 break;
3222 } 4098 }
3223 4099
3224 /* extra handling for values with state unkept */ 4100 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 4101 switch (arg[i])
3227 { 4102 {
4103#if ENABLE_STYLES
4104 case 1021:
4105 set_option (Opt_intensityStyles, mode);
4106
4107 scr_touch (true);
4108 break;
4109#endif
3228 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4111 case 1049:
4112 if (OPTION (Opt_secondaryScreen))
3229 if (mode == 0) 4113 if (mode == 0)
3230 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
3231 else if (mode == 1) 4115 else if (mode == 1)
3232 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
3233 /* FALLTHROUGH */
3234 default:
3235 continue; /* for (;i;) */
3236 }
3237
3238 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i])
3240 {
3241 /* case 1: - application cursor keys */
3242 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode
3246 */
3247 PrivMode (1, PrivMode_vt52);
3248 break; 4117 break;
4118 }
4119
4120 if (state >= 0)
4121 /* extra handling for values with valid 0 or 1 state */
4122 switch (arg[i])
4123 {
4124 /* case 1: - application cursor keys */
4125 case 2: /* VT52 mode */
4126 /* oddball mode. should be set regardless of set/reset
4127 * parameter. Return from VT52 mode with an ESC < from
4128 * within VT52 mode
4129 */
4130 PrivMode (1, PrivMode_vt52);
4131 break;
3249 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 4135 break;
3254 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
3255 if (state)
3256 Options &= ~Opt_jumpScroll;
3257 else
3258 Options |= Opt_jumpScroll; 4137 set_option (Opt_jumpScroll, !state);
3259 break; 4138 break;
3260 case 5: /* reverse video */ 4139 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
3262 break; 4141 break;
3263 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 4143 scr_relative_origin (state);
3265 break; 4144 break;
3266 case 7: /* autowrap */ 4145 case 7: /* autowrap */
3267 scr_autowrap (state); 4146 scr_autowrap (state);
3268 break; 4147 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 4148 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
3272 PrivateModes &= ~ (PrivMode_MouseX11); 4151 priv_modes &= ~PrivMode_MouseX11;
3273 break; 4152 break;
3274#ifdef menuBar_esc
3275 case menuBar_esc:
3276#ifdef MENUBAR
3277 map_menuBar (state);
3278#endif
3279 break;
3280#endif
3281#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
3282 case scrollBar_esc: 4154 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
3284 { 4156 {
3285 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 4158 scr_touch (true);
3287 } 4159 }
3288 break; 4160 break;
3289#endif 4161#endif
3290 case 25: /* visible/invisible cursor */ 4162 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 4163 scr_cursor_visible (state);
3292 break; 4164 break;
3293 /* case 35: - shift keys */ 4165 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 4166 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 4167 case 47: /* secondary screen */
3296 scr_change_screen (state); 4168 scr_change_screen (state);
3297 break; 4169 break;
3298 /* case 66: - application key pad */ 4170 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 4171 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 4172 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
3302 PrivateModes &= ~ (PrivMode_MouseX10); 4174 priv_modes &= ~PrivMode_MouseX10;
3303 break; 4175 break;
3304#if 0 4176#if 0
3305 case 1001: 4177 case 1001:
3306 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
3307#endif 4179#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state)
3310 Options &= ~Opt_scrollTtyOutput;
3311 else
3312 Options |= Opt_scrollTtyOutput; 4181 set_option (Opt_scrollTtyOutput, !state);
3313 break; 4182 break;
3314 case 1011: /* scroll to bottom on key press */ 4183 case 1011: /* scroll to bottom on key press */
3315 if (state)
3316 Options |= Opt_scrollTtyKeypress; 4184 set_option (Opt_scrollTtyKeypress, state);
3317 else
3318 Options &= ~Opt_scrollTtyKeypress;
3319 break; 4185 break;
3320 case 1047: /* secondary screen w/ clearing */ 4186 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4187 if (OPTION (Opt_secondaryScreen))
3322 if (current_screen != PRIMARY) 4188 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 4189 scr_erase_screen (2);
3324 scr_change_screen (state); 4190 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 4191 break;
4192 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY)
4196 scr_erase_screen (2);
4197 break;
4198 default:
4199 break;
3328 } 4200 }
3329 } 4201 }
3330} 4202}
3331/*}}} */ 4203/*}}} */
3332 4204
3333/*{{{ process sgr sequences */ 4205/*{{{ process sgr sequences */
3334void 4206void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4207rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 4208{
3337 unsigned int i; 4209 unsigned int i;
3338 short rendset; 4210 short rendset;
3339 int rendstyle; 4211 int rendstyle;
3340 4212
3341 if (nargs == 0) 4213 if (nargs == 0)
3342 { 4214 {
3343 scr_rendition (0, ~RS_None); 4215 scr_rendition (0, ~RS_None);
3344 return; 4216 return;
3345 } 4217 }
4218
3346 for (i = 0; i < nargs; i++) 4219 for (i = 0; i < nargs; i++)
3347 { 4220 {
3348 rendset = -1; 4221 rendset = -1;
3349 switch (arg[i]) 4222 switch (arg[i])
3350 { 4223 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 4225 rendset = 0, rendstyle = ~RS_None;
3353 break; 4226 break;
3354 case 1: 4227 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 4228 rendset = 1, rendstyle = RS_Bold;
3356 break; 4229 break;
4230 //case 2: // low intensity
4231 case 3:
4232 rendset = 1, rendstyle = RS_Italic;
4233 break;
3357 case 4: 4234 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 4235 rendset = 1, rendstyle = RS_Uline;
3359 break; 4236 break;
3360 case 5: 4237 case 5: // slowly blinking
4238 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 4239 rendset = 1, rendstyle = RS_Blink;
3362 break; 4240 break;
4241 //case 6: // scoansi light background
3363 case 7: 4242 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 4243 rendset = 1, rendstyle = RS_RVid;
3365 break; 4244 break;
3366 case 22: 4245 case 8:
4246 // invisible. NYI
4247 break;
4248 //case 9: // crossed out
4249 //case 10: // scoansi acs off, primary font
4250 //case 11: // scoansi acs on, first alt font
4251 //case 12: // scoansi acs on, |0x80, second alt font
4252 //...
4253 //case 19: // ninth alt font
4254 //case 20: // gothic
4255 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3367 rendset = 0, rendstyle = RS_Bold; 4256 rendset = 0, rendstyle = RS_Bold;
4257 break;
4258 case 22: // normal intensity
4259 rendset = 0, rendstyle = RS_Bold;
4260 break;
4261 case 23: // disable italic
4262 rendset = 0, rendstyle = RS_Italic;
3368 break; 4263 break;
3369 case 24: 4264 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 4265 rendset = 0, rendstyle = RS_Uline;
3371 break; 4266 break;
3372 case 25: 4267 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 4268 rendset = 0, rendstyle = RS_Blink;
3374 break; 4269 break;
4270 case 26: // variable spacing (iso 8613)
4271 rendset = 0, rendstyle = RS_Blink;
4272 break;
3375 case 27: 4273 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 4274 rendset = 0, rendstyle = RS_RVid;
3377 break; 4275 break;
4276 //case 28: // visible. NYI
4277 //case 29: // not crossed-out
3378 } 4278 }
4279
3379 if (rendset != -1) 4280 if (rendset != -1)
3380 { 4281 {
3381 scr_rendition (rendset, rendstyle); 4282 scr_rendition (rendset, rendstyle);
3382 continue; /* for (;i;) */ 4283 continue; /* for (;i;) */
3383 } 4284 }
… …
3390 case 33: 4291 case 33:
3391 case 34: 4292 case 34:
3392 case 35: 4293 case 35:
3393 case 36: 4294 case 36:
3394 case 37: 4295 case 37:
3395 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4296 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 4297 break;
3398#ifdef TTY_256COLOR 4298 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 4299 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 4300 {
3402 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 4302 i += 2;
3405 } 4303 }
3406 break; 4304 break;
3407#endif
3408 case 39: /* default fg */ 4305 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 4306 scr_color (Color_fg, Color_fg);
3410 break; 4307 break;
3411 4308
3412 case 40: 4309 case 40:
… …
3415 case 43: 4312 case 43:
3416 case 44: 4313 case 44:
3417 case 45: 4314 case 45:
3418 case 46: 4315 case 46:
3419 case 47: 4316 case 47:
3420 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4317 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 4318 break;
3423#ifdef TTY_256COLOR 4319 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 4320 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 4321 {
3427 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4322 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 4323 i += 2;
3430 } 4324 }
3431 break; 4325 break;
3432#endif
3433 case 49: /* default bg */ 4326 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
3435 break; 4328 break;
3436 4329
3437#ifndef NO_BRIGHTCOLOR 4330 //case 50: // not variable spacing
4331
4332#if !ENABLE_MINIMAL
3438 case 90: 4333 case 90:
3439 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
3440 case 92: 4335 case 92:
3441 case 93: 4336 case 93:
3442 case 94: 4337 case 94:
3443 case 95: 4338 case 95:
3444 case 96: 4339 case 96:
3445 case 97: 4340 case 97:
3446 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4341 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 4342 break;
3449 case 100: 4343 case 100:
3450 case 101: /* set bright bg color */ 4344 case 101: /* set bright bg color */
3451 case 102: 4345 case 102:
3452 case 103: 4346 case 103:
3453 case 104: 4347 case 104:
3454 case 105: 4348 case 105:
3455 case 106: 4349 case 106:
3456 case 107: 4350 case 107:
3457 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4351 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 4352 break;
3460#endif 4353#endif
3461
3462 } 4354 }
3463 } 4355 }
3464} 4356}
3465/*}}} */ 4357/*}}} */
3466 4358
3467/*{{{ process Rob Nation's own graphics mode sequences */ 4359/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 4360void
3469rxvt_term::process_graphics () 4361rxvt_term::process_graphics ()
3470{ 4362{
3471 unsigned char ch, cmd = cmd_getc (); 4363 unicode_t ch, cmd = cmd_getc ();
3472 4364
3473 if (cmd == 'Q') 4365 if (cmd == 'Q')
3474 { /* query graphics */ 4366 { /* query graphics */
3475 tt_printf ("\033G0\n"); /* no graphics */ 4367 tt_printf ("\033G0\012"); /* no graphics */
3476 return; 4368 return;
3477 } 4369 }
3478 /* swallow other graphics sequences until terminating ':' */ 4370 /* swallow other graphics sequences until terminating ':' */
3479 do 4371 do
3480 ch = cmd_getc (); 4372 ch = cmd_getc ();
… …
3490 */ 4382 */
3491void 4383void
3492rxvt_term::tt_printf (const char *fmt,...) 4384rxvt_term::tt_printf (const char *fmt,...)
3493{ 4385{
3494 va_list arg_ptr; 4386 va_list arg_ptr;
3495 unsigned char buf[256]; 4387 char buf[256];
3496 4388
3497 va_start (arg_ptr, fmt); 4389 va_start (arg_ptr, fmt);
3498 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3499 va_end (arg_ptr); 4391 va_end (arg_ptr);
3500 tt_write (buf, STRLEN (buf)); 4392 tt_write (buf, strlen (buf));
3501} 4393}
3502 4394
3503/* ---------------------------------------------------------------------- */ 4395/* ---------------------------------------------------------------------- */
3504/* Write data to the pty as typed by the user, pasted with the mouse, 4396/* Write data to the pty as typed by the user, pasted with the mouse,
3505 * or generated by us in response to a query ESC sequence. 4397 * or generated by us in response to a query ESC sequence.
3506 */ 4398 */
4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4400
3507void 4401void
3508rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
3509{ 4403{
3510 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4405 return;
3511 4406
3512 if (len) 4407 if (pty->pty < 0)
4408 return;
4409
4410 if (v_buflen == 0)
4411 {
4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413
4414 if ((unsigned int)written == len)
4415 return;
4416
4417 data += written;
4418 len -= written;
3513 { 4419 }
4420
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422
4423 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len;
4425
4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4427}
4428
4429void rxvt_term::pty_write ()
4430{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432
4433 if (written > 0)
4434 {
4435 v_buflen -= written;
4436
3514 if (v_buflen == 0) 4437 if (v_buflen == 0)
3515 { 4438 {
3516 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3517
3518 if ((unsigned int)written == len)
3519 return;
3520
3521 data += written;
3522 len -= written;
3523 }
3524
3525
3526 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3527
3528 memcpy (v_buffer + v_buflen, data, len);
3529 v_buflen += len;
3530 }
3531
3532 for (;;)
3533 {
3534 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3535
3536 if (written > 0)
3537 {
3538 v_buflen -= written;
3539
3540 if (v_buflen == 0)
3541 {
3542 free (v_buffer); 4439 free (v_buffer);
3543 v_buffer = 0; 4440 v_buffer = 0;
3544 v_buflen = 0; 4441 v_buflen = 0;
3545 4442
3546 pty_ev.set (EVENT_READ); 4443 pty_ev.set (EVENT_READ);
3547 return;
3548 }
3549
3550 memmove (v_buffer, v_buffer + written, v_buflen);
3551 }
3552 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3553 // original code just ignores this...
3554 destroy ();
3555 else
3556 {
3557 pty_ev.set (EVENT_READ | EVENT_WRITE);
3558 return; 4444 return;
3559 } 4445 }
4446
4447 memmove (v_buffer, v_buffer + written, v_buflen);
3560 } 4448 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ);
3561} 4451}
3562 4452
3563/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
3564 4454

Diff Legend

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