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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

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

Diff Legend

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