ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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