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.219 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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