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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.197 by root, Thu Feb 17 15:07:48 2005 UTC

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

Diff Legend

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