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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.213 by root, Thu Dec 22 16:44:10 2005 UTC

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

Diff Legend

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