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

Diff Legend

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