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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.216 by root, Tue Dec 27 01:25:42 2005 UTC

… …
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/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || !IN_RANGE_EXC (y, 0, nrow))
142 return;
143
144 for (;;)
145 {
146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
149
150 if (t != NOCHAR || !x)
151 {
152 iso14755_51 (l.t[x], l.r[x]);
153 iso14755buf = ISO_14755_54;
154 break;
155 }
156
157 x--;
158 }
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173#if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181#endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 scr_overlay_new (0, -1, width, len + 2);
208
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210
211 for (int y = 0; y < len; y++)
212 {
213 char buf[9];
214
215 ch = *chr++;
216
217 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '=');
220#if !UNICODE3
221 if (ch >= 0x10000)
222 ch = 0xfffd;
223#endif
224 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r);
226 }
227
228 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname);
230
231 free (fname);
232
233#if ENABLE_COMBINING
234 if (alloc)
235 delete [] alloc;
236#endif
237}
238#endif
239
240void
241rxvt_term::commit_iso14755 ()
242{
243 wchar_t ch[2];
244
245 ch[0] = iso14755buf & ISO_14755_MASK;
246 ch[1] = 0;
247
248 if (iso14755buf & ISO_14755_51)
249 {
250 char mb[16];
251 int len;
252
253 // allow verbatim 0-bytes and control-bytes to be entered
254 if (ch[0] >= 0x20)
255 len = wcstombs (mb, ch, 16);
256 else
257 {
258 mb[0] = ch[0];
259 len = 1;
260 }
261
262 if (len > 0)
263 tt_write ((unsigned char *)mb, len);
264 else
265 scr_bell ();
266 }
267
268 iso14755buf = 0;
269}
270
271int
272rxvt_term::hex_keyval (XKeyEvent &ev)
273{
274 // check wether this event corresponds to a hex digit
275 // if the modifiers had not been pressed.
276 for (int index = 0; index < 8; index++)
277 {
278 KeySym k = XLookupKeysym (&ev, index);
279
280 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
281 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
282 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
283 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
284 }
285
286 return -1;
287}
288#endif
61 289
62/*{{{ Convert the keypress event into a string */ 290/*{{{ Convert the keypress event into a string */
63void 291void
64rxvt_term::lookup_key (XKeyEvent &ev) 292rxvt_term::lookup_key (XKeyEvent &ev)
65{ 293{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 305 * escape sequence to toggle the Keypad.
78 * 306 *
79 * Always permit `shift' to override the current setting 307 * Always permit `shift' to override the current setting
80 */ 308 */
81 shft = (ev.state & ShiftMask); 309 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 310 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 311 meta = ev.state & ModMetaMask;
84 312
85 if (numlock_state || (ev.state & ModNumLockMask)) 313 if (numlock_state || (ev.state & ModNumLockMask))
86 { 314 {
87 numlock_state = (ev.state & ModNumLockMask); 315 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 316 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 336
109 // the XOpenIM manpage lies about hardcoding the locale 337 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 338 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 339 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 340 SET_LOCALE (rs[Rs_imLocale]);
341
113 // assume wchar_t == unicode or better 342 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 343 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
345
116 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 347 SET_LOCALE (locale);
118 348
119 if (status_return == XLookupChars 349 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 350 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 377 valid_keysym = keysym != NoSymbol;
148 } 378 }
149 379
150 if (valid_keysym) 380 if (valid_keysym)
151 { 381 {
382#ifdef KEYSYM_RESOURCE
383 if (keyboard->dispatch (this, keysym, ev.state))
384 return;
385#endif
386
152 if (TermWin.saveLines) 387 if (saveLines)
153 { 388 {
154#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 390 if (!ctrl && !meta)
156 {
157#else 391#else
158 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
393#endif
159 { 394 {
160#endif
161 int lnsppg; 395 int lnsppg;
162 396
163#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 399#else
166 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
167#endif 401#endif
168 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
169 { 403 {
170 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
171 return; 405 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 448 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 449 {
216 keysym += (XK_F11 - XK_F1); 450 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 451 shft = 0; /* turn off Shift */
218 } 452 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 453 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 454 {
221 switch (keysym) 455 switch (keysym)
222 { 456 {
223 /* normal XTerm key bindings */ 457 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 458 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 459 selection_request (ev.time, 0, 0);
226 return; 460 return;
461#if TODO
227 /* rxvt extras */ 462 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 463 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 464 change_font (FONT_UP);
230 return; 465 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 466 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 467 change_font (FONT_DN);
233 return; 468 return;
469#endif
234 } 470 }
235 } 471 }
236 } 472 }
237#ifdef PRINTPIPE 473
238 if (keysym == XK_Print) 474#if ENABLE_FRILLS || ISO_14755
239 { 475 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 476 if (shft && ctrl)
241 return;
242 } 477 {
243#endif 478 int hv;
244 479
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 480 if (iso14755buf & ISO_14755_51
246 { 481 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 482 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 483 {
250 unsigned int l; 484 commit_iso14755 ();
251 const unsigned char *kbuf0; 485 iso14755buf = ISO_14755_51;
252 486# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 487 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 488# endif
261 ) 489 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 490 }
266 491 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 492 {
493 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
494 | hv | ISO_14755_51;
495# if ISO_14755
496 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif
268 return; 498 return;
269 } 499 }
270 else 500 else
501 {
502# if ENABLE_OVERLAY
503 scr_overlay_off ();
271#endif 504# endif
505 iso14755buf = 0;
506 }
507 }
508 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
509 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
510 if (!(iso14755buf & ISO_14755_STARTED))
511 {
512 iso14755buf |= ISO_14755_STARTED;
513# if ENABLE_OVERLAY
514 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
515 scr_overlay_set (0, 0, "ISO 14755 mode");
516# endif
517 }
518#endif
519
520#ifdef PRINTPIPE
521 if (keysym == XK_Print)
522 {
523 scr_printscreen (ctrl | shft);
524 return;
525 }
526#endif
527
528 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
529 {
272 { 530 {
273 newlen = 1; 531 newlen = 1;
274 switch (keysym) 532 switch (keysym)
275 { 533 {
276#ifndef NO_BACKSPACE_KEY 534#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 535 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 536 if (priv_modes & PrivMode_HaveBackSpace)
279 { 537 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 538 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 539 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 540 kbuf[1] = '\0';
283 } 541 }
284 else 542 else
285 STRCPY (kbuf, key_backspace); 543 strcpy (kbuf, key_backspace);
286 break; 544 break;
287#endif 545#endif
288#ifndef NO_DELETE_KEY 546#ifndef NO_DELETE_KEY
547# ifdef XK_KP_Prior
548 case XK_KP_Delete:
549 /* allow shift to override */
550 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
551 {
552 strcpy (kbuf, "\033On");
553 break;
554 }
555 /* FALLTHROUGH */
556# endif
289 case XK_Delete: 557 case XK_Delete:
290 STRCPY (kbuf, key_delete); 558 strcpy (kbuf, key_delete);
291 break; 559 break;
292#endif 560#endif
293 case XK_Tab: 561 case XK_Tab:
294 if (shft) 562 if (shft)
295 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
296 else 564 else
297 { 565 {
298#ifdef CTRL_TAB_MAKES_META 566#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 567 if (ctrl)
300 meta = 1; 568 meta = 1;
… …
306 newlen = 0; 574 newlen = 0;
307 } 575 }
308 break; 576 break;
309 577
310#ifdef XK_KP_Left 578#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 579 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 580 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 581 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 582 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 583 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 584 {
317 STRCPY (kbuf, "\033OZ"); 585 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 586 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 587 break;
320 } 588 }
321 else 589 else
322 /* translate to std. cursor key */ 590 /* translate to std. cursor key */
… …
325#endif 593#endif
326 case XK_Up: /* "\033[A" */ 594 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 595 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 596 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 597 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 598 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 599 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 600 /* do Shift first */
333 if (shft) 601 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 602 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 603 else if (ctrl)
336 { 604 {
337 kbuf[1] = 'O'; 605 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 606 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 607 }
340 else if (PrivateModes & PrivMode_aplCUR) 608 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 609 kbuf[1] = 'O';
342 break; 610 break;
343 611
344#ifndef UNSHIFTED_SCROLLKEYS 612#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 613# ifdef XK_KP_Prior
346 case XK_KP_Prior: 614 case XK_KP_Prior:
347 /* allow shift to override */ 615 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 616 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 617 {
350 STRCPY (kbuf, "\033Oy"); 618 strcpy (kbuf, "\033Oy");
351 break; 619 break;
352 } 620 }
353 /* FALLTHROUGH */ 621 /* FALLTHROUGH */
354# endif 622# endif
355 case XK_Prior: 623 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 624 strcpy (kbuf, "\033[5~");
357 break; 625 break;
358# ifdef XK_KP_Next 626# ifdef XK_KP_Next
359 case XK_KP_Next: 627 case XK_KP_Next:
360 /* allow shift to override */ 628 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 629 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 630 {
363 STRCPY (kbuf, "\033Os"); 631 strcpy (kbuf, "\033Os");
364 break; 632 break;
365 } 633 }
366 /* FALLTHROUGH */ 634 /* FALLTHROUGH */
367# endif 635# endif
368 case XK_Next: 636 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 637 strcpy (kbuf, "\033[6~");
370 break; 638 break;
371#endif 639#endif
372 case XK_KP_Enter: 640 case XK_KP_Enter:
373 /* allow shift to override */ 641 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 642 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 643 {
376 STRCPY (kbuf, "\033OM"); 644 strcpy (kbuf, "\033OM");
645 break;
646 }
647
648 /* FALLTHROUGH */
649
650 case XK_Return:
651 if (priv_modes & PrivMode_LFNL)
652 {
653 kbuf[0] = '\015';
654 kbuf[1] = '\012';
655 kbuf[2] = '\0';
377 } 656 }
378 else 657 else
379 { 658 {
380 kbuf[0] = '\r'; 659 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 660 kbuf[1] = '\0';
382 } 661 }
383 break; 662 break;
384 663
385#ifdef XK_KP_Begin 664#ifdef XK_KP_Begin
386 case XK_KP_Begin: 665 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 666 strcpy (kbuf, "\033Ou");
388 break; 667 break;
389 668
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 669#endif
398 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 675 kbuf[2] += (keysym - XK_KP_F1);
404 break; 676 break;
405 677
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 678 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 679 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 694 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 695 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 696 {
425 STRCPY (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 699 }
428 else 700 else
429 { 701 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 703 kbuf[1] = '\0';
432 } 704 }
433 break; 705 break;
434 706
435 case XK_Find: 707 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
437 break; 709 break;
710
711#ifdef XK_KP_End
712 case XK_KP_Insert:
713 /* allow shift to override */
714 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
715 {
716 strcpy (kbuf, "\033Op");
717 break;
718 }
719 /* FALLTHROUGH */
720#endif
438 case XK_Insert: 721 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 722 strcpy (kbuf, "\033[2~");
440 break; 723 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 724#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 725 case DXK_Remove:
443 /* FALLTHROUGH */ 726 /* FALLTHROUGH */
444#endif 727#endif
445 case XK_Execute: 728 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 729 strcpy (kbuf, "\033[3~");
447 break; 730 break;
448 case XK_Select: 731 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 732 strcpy (kbuf, "\033[4~");
450 break; 733 break;
451#ifdef XK_KP_End 734#ifdef XK_KP_End
452 case XK_KP_End: 735 case XK_KP_End:
453 /* allow shift to override */ 736 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 737 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 738 {
456 STRCPY (kbuf, "\033Oq"); 739 strcpy (kbuf, "\033Oq");
457 break; 740 break;
458 } 741 }
459 /* FALLTHROUGH */ 742 /* FALLTHROUGH */
460#endif 743#endif
461 case XK_End: 744 case XK_End:
462 STRCPY (kbuf, KS_END); 745 strcpy (kbuf, KS_END);
463 break; 746 break;
464#ifdef XK_KP_Home 747#ifdef XK_KP_Home
465 case XK_KP_Home: 748 case XK_KP_Home:
466 /* allow shift to override */ 749 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 750 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 751 {
469 STRCPY (kbuf, "\033Ow"); 752 strcpy (kbuf, "\033Ow");
470 break; 753 break;
471 } 754 }
472 /* FALLTHROUGH */ 755 /* FALLTHROUGH */
473#endif 756#endif
474 case XK_Home: 757 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 758 strcpy (kbuf, KS_HOME);
476 break; 759 break;
477 760
478#define FKEY(n, fkey) \ 761#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 762 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 763
… …
532#undef FKEY 815#undef FKEY
533 default: 816 default:
534 newlen = 0; 817 newlen = 0;
535 break; 818 break;
536 } 819 }
820
537 if (newlen) 821 if (newlen)
538 len = STRLEN (kbuf); 822 len = strlen (kbuf);
539 } 823 }
540 824
541 /* 825 /*
542 * Pass meta for all function keys, if 'meta' option set 826 * Pass meta for all function keys, if 'meta' option set
543 */ 827 */
… …
550 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
551 { 835 {
552 len = 1; 836 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 837 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 838 }
839 else if (keysym == XK_ISO_Left_Tab)
840 {
841 strcpy (kbuf, "\033[Z");
842 len = 3;
843 }
555 else 844 else
556 { 845 {
557#ifdef META8_OPTION 846#ifdef META8_OPTION
558 /* set 8-bit on */ 847 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 848 if (meta && (meta_char == 0x80))
… …
571 } 860 }
572 861
573 if (len <= 0) 862 if (len <= 0)
574 return; /* not mapped */ 863 return; /* not mapped */
575 864
576 if (Options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 866 if (view_start)
578 { 867 {
579 TermWin.view_start = 0; 868 view_start = 0;
580 want_refresh = 1; 869 want_refresh = 1;
581 } 870 }
582 871
583 /* 872 /*
584 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
617#endif /* DEBUG_CMD */ 906#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 907 tt_write (kbuf, (unsigned int)len);
619} 908}
620/*}}} */ 909/*}}} */
621 910
622#if (MENUBAR_MAX) 911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 913/* attempt to `write' count to the input buffer */
625unsigned int 914unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 915rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 916{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 919 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 921
633 if (n > 0 && s < count) 922 if (n > 0 && s < count)
634 { 923 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 924 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 925 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 926 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 927 cmdbuf_endp -= n;
639 s += n; 928 s += n;
640 } 929 }
… …
650 939
651 cmd_parse (); 940 cmd_parse ();
652 941
653 return 0; 942 return 0;
654} 943}
655#endif /* MENUBAR_MAX */ 944#endif
656 945
657void 946void
658rxvt_term::flush () 947rxvt_term::flush ()
659{ 948{
949 flush_ev.stop ();
950
660#ifdef TRANSPARENT 951#ifdef TRANSPARENT
661 if (want_full_refresh) 952 if (want_full_refresh)
662 { 953 {
663 want_full_refresh = 0; 954 want_full_refresh = 0;
664 scr_clear (); 955 scr_clear ();
665 scr_touch (false); 956 scr_touch (false);
666 want_refresh = 1;
667 } 957 }
668#endif 958#endif
669 959
670 if (want_refresh) 960 if (want_refresh)
671 { 961 {
… …
675 IMSendSpot (); 965 IMSendSpot ();
676#endif 966#endif
677 } 967 }
678 968
679 display->flush (); 969 display->flush ();
680
681 flush_ev.stop ();
682} 970}
683 971
684void 972void
685rxvt_term::check_cb (check_watcher &w) 973rxvt_term::check_cb (check_watcher &w)
686{ 974{
687 SET_R (this); 975 SET_R (this);
688 SET_LOCALE (locale); 976 SET_LOCALE (locale);
689 977
690 display->flush (); 978 display->flush ();
691 979
692 if (!flush_ev.active) 980 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 981 flush_ev.start (NOW + 0.01);
694} 982}
695 983
696void 984void
697rxvt_term::flush_cb (time_watcher &w) 985rxvt_term::flush_cb (time_watcher &w)
… …
762{ 1050{
763 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1054 {
1055 if (view_start == nsaved ||
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0;
1058
767 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1060 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1062 }
771} 1063}
… …
784 1076
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1077 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1078 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1079 cmdbuf_endp = cmdbuf_ptr + n;
788 1080
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1082
791 if (n > 0) 1083 if (n > 0)
792 { 1084 {
793 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
794 return true; 1086 return true;
795 } 1087 }
796 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
797 destroy (); 1093 destroy ();
1094 }
798 1095
799 return false; 1096 return false;
800} 1097}
801 1098
802void 1099void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1100rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1101{
805 SET_R (this); 1102 SET_R (this);
806 SET_LOCALE (locale); 1103 SET_LOCALE (locale);
807 1104
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1105 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1106 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1107 while (pty_fill ())
813 if (cmd_parse ()) 1108 if (cmd_parse ())
814 break; 1109 break;
1110
1111 if (revents & EVENT_WRITE)
1112 pty_write ();
815} 1113}
816 1114
817void 1115void
818rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
819{ 1117{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
821 recolour_cursor (); 1119 recolour_cursor ();
822 1120
823#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1122 hidden_pointer = 0;
825 1123
826 if (Options & Opt_pointerBlank) 1124 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1125 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1126#endif
829} 1127}
830 1128
831#ifdef POINTER_BLANK 1129#ifdef POINTER_BLANK
832void 1130void
833rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
834{ 1132{
835 if (! (Options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
836 return; 1134 return;
837 1135
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
839 XFlush (display->display); 1137 XFlush (display->display);
840 1138
841 hidden_pointer = 1; 1139 hidden_pointer = 1;
842} 1140}
843 1141
… …
860 x = ev.x; 1158 x = ev.x;
861 y = ev.y; 1159 y = ev.y;
862 pixel_position (&x, &y); 1160 pixel_position (&x, &y);
863 1161
864 if (MEvent.button == AnyButton) 1162 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1163 button_number = 3;
867 }
868 else 1164 else
869 { 1165 {
870 button_number = MEvent.button - Button1; 1166 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1167 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1168 if (button_number >= 3)
873 button_number += (64 - 3); 1169 button_number += (64 - 3);
874 } 1170 }
875 1171
876 if (PrivateModes & PrivMode_MouseX10) 1172 if (priv_modes & PrivMode_MouseX10)
877 { 1173 {
878 /* 1174 /*
879 * do not report ButtonRelease 1175 * do not report ButtonRelease
880 * no state info allowed 1176 * no state info allowed
881 */ 1177 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1192 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1193 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1194#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1195 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1196#endif
901
902 } 1197 }
903 1198
904#ifdef DEBUG_MOUSEREPORT 1199#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1200 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1201 if (key_state & 16)
907 fputc ('C', stderr); 1202 fputc ('C', stderr);
908 if (key_state & 4) 1203 if (key_state & 4)
909 fputc ('S', stderr); 1204 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1208 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1209 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1210 button_number,
916 x + 1, 1211 x + 1,
917 y + 1); 1212 y + 1);
918#else 1213#endif
1214
919 tt_printf ("\033[M%c%c%c", 1215 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1216 (32 + button_number + key_state),
921 (32 + x + 1), 1217 (32 + x + 1),
922 (32 + y + 1)); 1218 (32 + y + 1));
923#endif
924} 1219}
925 1220
926#ifdef USING_W11LIB 1221#ifdef USING_W11LIB
927void 1222void
928rxvt_W11_process_x_event (XEvent *ev) 1223rxvt_W11_process_x_event (XEvent *ev)
… …
935 1230
936/*{{{ process an X event */ 1231/*{{{ process an X event */
937void 1232void
938rxvt_term::x_cb (XEvent &ev) 1233rxvt_term::x_cb (XEvent &ev)
939{ 1234{
1235 dDisp;
1236
940 SET_R (this); 1237 SET_R (this);
941 SET_LOCALE (locale); 1238 SET_LOCALE (locale);
942 1239
943#if defined(CURSOR_BLINK) 1240#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1242 {
946 if (hidden_cursor) 1243 if (hidden_cursor)
947 { 1244 {
948 hidden_cursor = 0; 1245 hidden_cursor = 0;
949 want_refresh = 1; 1246 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1250 }
954#endif 1251#endif
955 1252
956#if defined(POINTER_BLANK) 1253#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1255 {
959 if (ev.type == MotionNotify 1256 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1257 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1258 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1259 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1262 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1263 pointer_blank ();
967 } 1264 }
968#endif 1265#endif
969 1266
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1267 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1268 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1269 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1270
1028 switch (ev.type) 1271 switch (ev.type)
1029 { 1272 {
1030 case KeyPress: 1273 case KeyPress:
1274#if ISO_14755
1275 if (!(iso14755buf & ISO_14755_52))
1276#endif
1031 lookup_key (ev.xkey); 1277 lookup_key (ev.xkey);
1278
1279 break;
1280
1281 case KeyRelease:
1282 {
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1284 KeySym ks;
1285
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif
1288
1289#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support
1291 if (iso14755buf)
1292 if (iso14755buf & ISO_14755_52)
1293 {
1294# if ENABLE_OVERLAY
1295 scr_overlay_off ();
1296# endif
1297# if ISO_14755
1298 // iso14755 part 5.2 handling: release time
1299 // first: controls
1300 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f)))
1303 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1305 commit_iso14755 ();
1306 return; // case-break;
1307 }
1308
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks)
1311 {
1312 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 ();
1314 return; // case-break;
1315 }
1316
1317 scr_bell ();
1318# endif
1319 iso14755buf = 0;
1032 break; 1320 break;
1321 }
1322 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327 if (iso14755buf & ISO_14755_51)
1328 commit_iso14755 ();
1329#if ISO_14755
1330 else if (iso14755buf & ISO_14755_STARTED)
1331 {
1332 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1333
1334 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1335 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1336 }
1337# endif
1338 else
1339 iso14755buf = 0;
1340 }
1341#endif
1033 1342
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1344 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1345 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1346 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1347 mouse_slip_wheel_speed = 0;
1046 } 1348#endif
1047 break; 1349 break;
1048 } 1350 }
1049#endif
1050 1351
1051 case ButtonPress: 1352 case ButtonPress:
1052 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1053 break; 1354 break;
1054 1355
… …
1056 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1057 break; 1358 break;
1058 1359
1059 case ClientMessage: 1360 case ClientMessage:
1060 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1363 {
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1062 destroy (); 1365 destroy ();
1366#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev);
1371#endif
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1063#ifdef OFFIX_DND 1382#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */ 1383 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile 1385 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir 1386 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink)) 1387 || ev.xclient.data.l[0] == DndLink))
1069 { 1388 {
1070 /* Get Dnd data */ 1389 /* Get Dnd data */
1071 Atom ActualType; 1390 Atom ActualType;
1072 int ActualFormat; 1391 int ActualFormat;
1073 unsigned char *data; 1392 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1393 unsigned long Size, RemainingBytes;
1075 1394
1076 XGetWindowProperty (display->display, display->root, 1395 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1396 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1397 0L, 1000000L,
1079 False, AnyPropertyType, 1398 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1399 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1400 &Size, &RemainingBytes,
1082 &data); 1401 &data);
1083 XChangeProperty (display->display, display->root, 1402 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1403 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1404 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1405 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1406 }
1091#endif /* OFFIX_DND */ 1407#endif /* OFFIX_DND */
1092 break; 1408 break;
1093 1409
1094 case MappingNotify: 1410 case MappingNotify:
… …
1119 break; 1435 break;
1120 } 1436 }
1121 break; 1437 break;
1122 1438
1123 case FocusIn: 1439 case FocusIn:
1124 if (!TermWin.focus) 1440 focus_in ();
1441 break;
1442
1443 case FocusOut:
1444 focus_out ();
1445 break;
1446
1447 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0])
1125 { 1449 {
1126 TermWin.focus = 1; 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1451 ;
1128#ifdef USE_XIM 1452
1129 if (Input_Context != NULL) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1130 XSetICFocus (Input_Context);
1131#endif
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1454 {
1139 PixColors = PixColorsFocused; 1455 seen_resize = 1;
1140 set_colorfgbg (); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1457 }
1144#endif
1145 1458
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent)
1461 check_our_parents ();
1462#endif
1146 } 1463 }
1147 break; 1464 break;
1148 1465
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1466 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 { 1468 && ev.xproperty.state == PropertyNewValue)
1179 int height, width; 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1470
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1471 break;
1202 1472
1203 case SelectionClear: 1473 case SelectionClear:
1204 selection_clear (); 1474 selection_clear ();
1205 break; 1475 break;
1206 1476
1207 case SelectionNotify: 1477 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1480 break;
1212 1481
1213 case SelectionRequest: 1482 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1215 break; 1484 break;
1216 1485
1217 case UnmapNotify: 1486 case UnmapNotify:
1218 TermWin.mapped = 0; 1487 mapped = 0;
1219#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1221#endif 1490#endif
1222 break; 1491 break;
1223 1492
1224 case MapNotify: 1493 case MapNotify:
1225 TermWin.mapped = 1; 1494 mapped = 1;
1226#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif 1497#endif
1229 break; 1498 break;
1230 1499
… …
1234 break; 1503 break;
1235#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1236 1505
1237 case GraphicsExpose: 1506 case GraphicsExpose:
1238 case Expose: 1507 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1240 { 1509 {
1241 do 1510 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1245 1514
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1516
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1251 1520
1252 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1253 } 1522 }
1254 else 1523 else
1255 { 1524 {
1256 XEvent unused_event; 1525 XEvent unused_event;
1257 1526
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1528 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1530 ;
1262 1531
1263 if (isScrollbarWindow (ev.xany.window)) 1532 if (isScrollbarWindow (ev.xany.window))
1264 { 1533 {
1265 scrollBar.setIdle (); 1534 scrollBar.setIdle ();
… …
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose (); 1539 menubar_expose ();
1271#endif 1540#endif
1272 1541
1273#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1276#endif 1545#endif
1277 } 1546 }
1278 break; 1547 break;
1279 1548
1280 case MotionNotify: 1549 case MotionNotify:
… …
1287 { 1556 {
1288 menubar_control (ev.xbutton); 1557 menubar_control (ev.xbutton);
1289 break; 1558 break;
1290 } 1559 }
1291#endif 1560#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1562 break;
1294 1563
1295 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1296 { 1565 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1567 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1300 ; 1569 ;
1301 1570
1302 XQueryPointer (display->display, TermWin.vt, 1571 XQueryPointer (disp, vt,
1303 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1574 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1575 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1577 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1578 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1579 {
1311#endif 1580#endif
1581#if ISO_14755
1582 // 5.4
1583 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1584 {
1585 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1586 break;
1587 }
1588#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1591
1314#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1595 {
1318 int dist; 1596 int dist;
1319 1597
1320 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1602 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1603
1326 /* save the event params so we can highlight 1604 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1605 * the selection in the pending-scroll loop
1328 */ 1606 */
1329 selection_save_x=ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1610
1334 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1336 { 1613 {
1337 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1339 } 1616 }
1340 else 1617 else
1341 { 1618 {
1342 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1620 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1621 }
1622
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1623 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1625 + 1;
1348 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1350 } 1628 }
1351 else 1629 else
1352 { 1630 {
1353 /* we are within the text window, so we 1631 /* we are within the text window, so we
1354 * shouldn't be scrolling 1632 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1634 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1358 } 1636 }
1359#endif 1637#endif
1360#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1361
1362 } 1639 }
1363#endif 1640#endif
1364
1365 } 1641 }
1366 } 1642 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1644 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1645 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1646 MotionNotify, &ev))
1647 ;
1648
1371 XQueryPointer (display->display, scrollBar.win, 1649 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1652 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1653 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1655 scrollbar_size ());
1378 scr_refresh (refresh_type); 1656 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1657 refresh_limit = 0;
… …
1382 break; 1660 break;
1383 } 1661 }
1384} 1662}
1385 1663
1386void 1664void
1665rxvt_term::focus_in ()
1666{
1667 if (!focus)
1668 {
1669 focus = 1;
1670 want_refresh = 1;
1671#if USE_XIM
1672 if (Input_Context != NULL)
1673 {
1674 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context);
1676 }
1677#endif
1678#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink)
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif
1682#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade])
1684 {
1685 pix_colors = pix_colors_focused;
1686 scr_recolour ();
1687 }
1688#endif
1689 }
1690}
1691
1692void
1693rxvt_term::focus_out ()
1694{
1695 if (focus)
1696 {
1697 focus = 0;
1698 want_refresh = 1;
1699
1700#if ENABLE_FRILLS || ISO_14755
1701 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY
1704 scr_overlay_off ();
1705#endif
1706#if USE_XIM
1707 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context);
1709#endif
1710#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink)
1712 cursor_blink_ev.stop ();
1713 hidden_cursor = 0;
1714#endif
1715#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade])
1717 {
1718 pix_colors = pix_colors_unfocused;
1719 scr_recolour ();
1720 }
1721#endif
1722 }
1723}
1724
1725#if TRANSPARENT
1726void
1387rxvt_term::rootwin_cb (XEvent &ev) 1727rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1728{
1389 SET_R (this); 1729 SET_R (this);
1390 SET_LOCALE (locale); 1730 SET_LOCALE (locale);
1391 1731
1392 switch (ev.type) 1732 switch (ev.type)
1393 { 1733 {
1394 case PropertyNotify: 1734 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1735 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1736 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1737 * use the property to determine the pixmap. We use it later on.
1407 */ 1738 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1739 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1741 return;
1413 }
1414 1742
1415 /* FALLTHROUGH */ 1743 /* FALLTHROUGH */
1416 case ReparentNotify: 1744 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1746 want_refresh = want_full_refresh = 1;
1419 break; 1747 break;
1420#endif
1421 } 1748 }
1422} 1749}
1750#endif
1423 1751
1424void 1752void
1425rxvt_term::button_press (XButtonEvent &ev) 1753rxvt_term::button_press (XButtonEvent &ev)
1426{ 1754{
1427 int reportmode = 0, clickintime; 1755 int reportmode = 0, clickintime;
1428 1756
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1758 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760
1432 /* 1761 /*
1433 * VT window processing of button press 1762 * VT window processing of button press
1434 */ 1763 */
1435 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1436 { 1765 {
1766#if ISO_14755
1767 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 {
1770 iso14755_54 (ev.x, ev.y);
1771 return;
1772 }
1773#endif
1774
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1775 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1776
1438 if (reportmode) 1777 if (reportmode)
1439 { 1778 {
1440 /* mouse report from vt window */ 1779 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1780 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1781 MEvent.state = ev.state;
… …
1471 } 1810 }
1472 else 1811 else
1473 { 1812 {
1474 if (ev.button != MEvent.button) 1813 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1814 MEvent.clicks = 0;
1815
1476 switch (ev.button) 1816 switch (ev.button)
1477 { 1817 {
1478 case Button1: 1818 case Button1:
1819 /* allow meta + click to select rectangular areas */
1820 /* should be done in screen.C */
1821#if ENABLE_FRILLS
1822 selection.rect = !!(ev.state & ModMetaMask);
1823#else
1824 selection.rect = false;
1825#endif
1826
1479 /* allow shift+left click to extend selection */ 1827 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1829 {
1482 if (MEvent.button == Button1 && clickintime) 1830 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1831 selection_rotate (ev.x, ev.y);
1484 else 1832 else
1485 selection_extend (ev.x, ev.y, 1); 1833 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1848 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1849 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1850 selection_rotate (ev.x, ev.y);
1503 else 1851 else
1504 selection_extend (ev.x, ev.y, 1); 1852 selection_extend (ev.x, ev.y, 1);
1853
1505 MEvent.button = Button3; 1854 MEvent.button = Button3;
1506 break; 1855 break;
1507 } 1856 }
1508 } 1857 }
1858
1509 MEvent.time = ev.time; 1859 MEvent.time = ev.time;
1510 return; 1860 return;
1511 } 1861 }
1512 1862
1513 /* 1863 /*
… …
1605 break; 1955 break;
1606 case R_SB_ALIGN_BOTTOM: 1956 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1957 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1958 break;
1609 } 1959 }
1960
1610 if (scrollBar.style == R_SB_XTERM 1961 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1962 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1963 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1964 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1965
1615 scrollBar.setMotion (); 1966 scrollBar.setMotion ();
1616 break; 1967 break;
1617 1968
1618 case Button1: 1969 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1970 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 1974 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1625 { 1976 {
1626 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1629# else 1980# else
1630 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1631# endif 1982# endif
1632 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1635# else 1986# else
1636 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1637# endif 1988# endif
1638 else 1989 else
1639 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1640 } 1991 }
1641 else 1992 else
1642 { 1993 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1995 (nrow
1645 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1997 / scrollbar_size ()));
1647 } 1998 }
1999
1648 break; 2000 break;
1649 } 2001 }
1650 } 2002 }
1651 return; 2003 return;
1652 } 2004 }
… …
1664{ 2016{
1665 int reportmode = 0; 2017 int reportmode = 0;
1666 2018
1667 csrO = 0; /* reset csr Offset */ 2019 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2020 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2021 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2022
1671 if (scrollbar_isUpDn ()) 2023 if (scrollbar_isUpDn ())
1672 { 2024 {
1673 scrollBar.setIdle (); 2025 scrollBar.setIdle ();
1674 scrollbar_show (0); 2026 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 2028 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 2029#endif
1678
1679 } 2030 }
2031
1680#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
1683#endif 2035#endif
2036
1684 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
1685 { 2038 {
2039#if ISO_14755
2040 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return;
2043#endif
1686 if (reportmode) 2044 if (reportmode)
1687 { 2045 {
1688 /* mouse report from vt window */ 2046 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2047 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2048 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2062 MEvent.button = AnyButton;
1705 mouse_report (ev); 2063 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2064#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2065 return;
1708 } 2066 }
2067
1709 /* 2068 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2069 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2070 * when overriding mouse reporting
1712 */ 2071 */
1713 if (PrivateModes & PrivMode_mouse_report 2072 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2073 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2074 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2075 selection_extend (ev.x, ev.y, 0);
1717 2076
1718 switch (ev.button) 2077 switch (ev.button)
… …
1733 2092
1734 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
1735 2094
1736 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
1737 i = 1; 2096 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2098 i = nrow - 1;
1740 else 2099 else
1741 i = 5; 2100 i = 5;
1742 2101
1743# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
1745 { 2104 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2108
1750 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2111
1753 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2156 int i;
1798 2157
1799 Visual* visual = display->visual; 2158 Visual *visual = display->visual;
1800 2159
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2161
1803 /* for convenience */ 2162 /* for convenience */
1804 mask_r = visual->red_mask; 2163 mask_r = visual->red_mask;
… …
2025 Atom atype; 2384 Atom atype;
2026 unsigned char *prop = NULL; 2385 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2386 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2387 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2388 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2030 2390
2031 pchanged = 0; 2391 pchanged = 0;
2032 2392
2033 if (!(Options & Opt_transparent)) 2393 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2035 2395
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2038 2398
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2040 2400
2041 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2042 { 2402 {
2043 if (am_transparent) 2403 if (am_transparent)
2044 { 2404 {
2045 pchanged = 1; 2405 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2048 } 2408 }
2049 2409
2050 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2051 } 2411 }
2052 2412
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2413 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2414 XSync (disp, False);
2055 2415
2056 /* 2416 /*
2057 * Make the frame window set by the window manager have 2417 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2418 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2419 * windows for each client, so we have to take care about that.
2060 */ 2420 */
2061 i = (xa[XA_XROOTPMAPID] 2421 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2424 &nitems, &bytes_after, &prop) == Success);
2065 2425
2066 if (!i || prop == NULL) 2426 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2427 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2430 &nitems, &bytes_after, &prop) == Success);
2071 2431
2072 if (!i || prop == NULL 2432 if (!i || prop == NULL
2073#if TINTING 2433#if TINTING
… …
2092 Window cr; 2452 Window cr;
2093 XImage *image; 2453 XImage *image;
2094 GC gc; 2454 GC gc;
2095 XGCValues gcvalue; 2455 XGCValues gcvalue;
2096 2456
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2461 nx = ny = 0;
2102 2462
… …
2112 nh += sy; 2472 nh += sy;
2113 ny = -sy; 2473 ny = -sy;
2114 sy = 0; 2474 sy = 0;
2115 } 2475 }
2116 2476
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2479
2480 XSync (disp, False);
2119 allowedxerror = -1; 2481 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2483
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2485 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2486 allowedxerror = 0;
2125 2487
2126 if (image == NULL) 2488 if (image == NULL)
2127 { 2489 {
2128 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2129 { 2491 {
2130 pchanged = 1; 2492 pchanged = 1;
2131 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2132 { 2494 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2134 TermWin.pixmap = None; 2496 pixmap = None;
2135 } 2497 }
2136 } 2498 }
2137 2499
2138 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2139 } 2501 }
2140 else 2502 else
2141 { 2503 {
2142 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2144 2506
2145#if TINTING 2507#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2509 {
2148 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2511 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2512
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2513 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2514
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2516 }
2155#endif 2517#endif
2156 2518
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2158 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2524 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2525 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2166 2528
2167 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2530 pchanged = 1;
2169 2531
2170 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2171 } 2533 }
2172 } 2534 }
2173 2535
2174 if (!am_pixmap_trans) 2536 if (am_pixmap_trans)
2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2538 else
2175 { 2539 {
2176 unsigned int n; 2540 unsigned int n;
2177 /* 2541 /*
2178 * InheritPixmap transparency 2542 * InheritPixmap transparency
2179 */ 2543 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2545 {
2183 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2186 XFree (list); 2549 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2550
2189 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2190 { 2552 {
2191 if (oldp != None) 2553 if (oldp != None)
2192 pchanged = 1; 2554 pchanged = 1;
2193 2555
2194 break; 2556 break;
2195 } 2557 }
2196 2558
2197 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2198 pchanged = 1; 2560 pchanged = 1;
2199 } 2561 }
2200 2562
2201 n = 0; 2563 n = 0;
2202 2564
2203 if (pchanged) 2565 if (pchanged)
2204 { 2566 {
2205 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2206 { 2568 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2571 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2573 break;
2213 } 2574 }
2214 } 2575 }
2215 } 2576 }
2216 2577
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2218 { 2579 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2582 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2224 } 2584 }
2225 else 2585 else
2226 { 2586 {
2227#if WAIT_FOR_WM 2587#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2588 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2590 sleep (1);
2231#endif 2591#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2234 { 2593 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2237 } 2596 }
2238 2597
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2240 am_transparent = 1; 2599 am_transparent = 1;
2241 } 2600 }
2242 2601
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2603 parent[i] = None;
2245 } 2604 }
2246 2605
2247 // this is experimental
2248 if (scrollBar.win) 2606 if (scrollBar.win)
2249 { 2607 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2609 scrollBar.setIdle ();
2253 scrollbar_show (0); 2610 scrollbar_show (0);
2611 }
2612
2613 if (am_transparent)
2614 {
2615 want_refresh = want_full_refresh = 1;
2616 if (am_pixmap_trans)
2617 flush ();
2254 } 2618 }
2255 2619
2256 return pchanged; 2620 return pchanged;
2257} 2621}
2258#endif 2622#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2641 if (ch == NOCHAR) // TODO: improve
2278 break; 2642 break;
2279 2643
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2645 {
2646 if (!seen_input)
2647 {
2648 seen_input = 1;
2649 // many badly-written programs (e.g. jed) contain a race condition:
2650 // they first read the screensize and then install a SIGWINCH handler.
2651 // some window managers resize the window early, and these programs
2652 // then sometimes get the size wrong.
2653 // unfortunately other programs are even more buggy and dislike
2654 // being sent SIGWINCH, so only do it when we were in fact being
2655 // resized.
2656 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH);
2658 }
2659
2282 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2662 bool refreshnow = false;
2285 int nlines = 0; 2663 int nlines = 0;
2286 unicode_t *str = buf; 2664 unicode_t *str = buf;
2287 2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2666
2290 for (;;) 2667 for (;;)
2291 { 2668 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2670 break;
2297 2671
2298 *str++ = ch; 2672 *str++ = ch;
2299 2673
2300 if (ch == C0_LF) 2674 if (ch == C0_LF || str >= eol)
2301 { 2675 {
2676 if (ch == C0_LF)
2302 nlines++; 2677 nlines++;
2678
2303 refresh_count++; 2679 refresh_count++;
2304 2680
2305 if (! (Options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2683 {
2308 refreshnow = true; 2684 refreshnow = true;
2309 ch = NOCHAR; 2685 ch = NOCHAR;
2310 break; 2686 break;
2311 } 2687 }
2312 2688
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2315 { 2691 {
2316 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2693 nlines = 0;
2318 str = buf; 2694 str = buf;
2695 eol = str + min (ncol, UBUFSIZ);
2319 } 2696 }
2697
2698 if (str >= eol)
2699 {
2700 if (eol >= buf + UBUFSIZ)
2701 {
2702 ch = NOCHAR;
2703 break;
2704 }
2705 else
2706 eol = min (eol + ncol, buf + UBUFSIZ);
2707 }
2708
2320 } 2709 }
2321 2710
2322 if (str >= buf + UBUFSIZ) 2711 seq_begin = cmdbuf_ptr;
2323 { 2712 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2713 }
2328 2714
2329 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, nlines, str - buf);
2330 2716
2331 /* 2717 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2720 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2721 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2722 */
2337 if (refreshnow) 2723 if (refreshnow)
2338 { 2724 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2726 refresh_limit++;
2341 else 2727 else
2342 { 2728 {
2343 flag = true; 2729 flag = true;
2344 scr_refresh (refresh_type); 2730 scr_refresh (refresh_type);
… …
2398 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2786
2401 // assume wchar == unicode 2787 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2403 return wc; 2789 return wc & UNICODE_MASK;
2404 } 2790 }
2405 2791
2406 return NOCHAR; 2792 return NOCHAR;
2407} 2793}
2408 2794
… …
2534 process_escape_seq (); 2920 process_escape_seq ();
2535 break; 2921 break;
2536 case C0_ENQ: /* terminal Status */ 2922 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2923 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2926 else
2541 tt_write ((unsigned char *)VT100_ANS, 2927 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2928 (unsigned int)strlen (VT100_ANS));
2543 break; 2929 break;
2544 case C0_BEL: /* bell */ 2930 case C0_BEL: /* bell */
2545 scr_bell (); 2931 scr_bell ();
2546 break; 2932 break;
2547 case C0_BS: /* backspace */ 2933 case C0_BS: /* backspace */
… …
2646void 3032void
2647rxvt_term::process_escape_seq () 3033rxvt_term::process_escape_seq ()
2648{ 3034{
2649 unicode_t ch = cmd_getc (); 3035 unicode_t ch = cmd_getc ();
2650 3036
2651 if (PrivateModes & PrivMode_vt52) 3037 if (priv_modes & PrivMode_vt52)
2652 { 3038 {
2653 process_escape_vt52 (ch); 3039 process_escape_vt52 (ch);
2654 return; 3040 return;
2655 } 3041 }
2656 3042
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3057 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3058 break;
2673 case '+': 3059 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3060 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3061 break;
2676#ifndef NO_FRILLS 3062#if ENABLE_FRILLS
2677 case '6': 3063 case '6':
2678 scr_backindex (); 3064 scr_backindex ();
2679 break; 3065 break;
2680#endif 3066#endif
2681 case '7': 3067 case '7':
2682 scr_cursor (SAVE); 3068 scr_cursor (SAVE);
2683 break; 3069 break;
2684 case '8': 3070 case '8':
2685 scr_cursor (RESTORE); 3071 scr_cursor (RESTORE);
2686 break; 3072 break;
2687#ifndef NO_FRILLS 3073#if ENABLE_FRILLS
2688 case '9': 3074 case '9':
2689 scr_forwardindex (); 3075 scr_forwardindex ();
2690 break; 3076 break;
2691#endif 3077#endif
2692 case '=': 3078 case '=':
… …
2871 { 3257 {
2872 switch (priv) 3258 switch (priv)
2873 { 3259 {
2874 case '>': 3260 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3261 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3263 break;
2878 case '?': 3264 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3266 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3267 break;
… …
2986 3372
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3378 break;
2993 3379
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3383 break;
2998 3384
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3386 process_sgr_mode (nargs, arg);
3001 break; 3387 break;
… …
3008 break; 3394 break;
3009 case 6: /* CPR requested */ 3395 case 6: /* CPR requested */
3010 scr_report_position (); 3396 scr_report_position ();
3011 break; 3397 break;
3012 case 7: /* unofficial extension */ 3398 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3399 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3400 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3401 break;
3016 case 8: /* unofficial extension */ 3402 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3404 break;
3019 } 3405 }
… …
3055 break; 3441 break;
3056 3442
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3443 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3444 if (arg[0] == 4)
3059 scr_insert_mode (0); 3445 scr_insert_mode (0);
3446 else if (arg[0] == 20)
3447 priv_modes &= ~PrivMode_LFNL;
3060 break; 3448 break;
3061 3449
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3450 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3451 if (arg[0] == 4)
3064 scr_insert_mode (1); 3452 scr_insert_mode (1);
3453 else if (arg[0] == 20)
3454 priv_modes |= PrivMode_LFNL;
3065 break; 3455 break;
3066 3456
3067 /* 3457 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3458 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3459 */
… …
3081 break; 3471 break;
3082 case CSI_75: 3472 case CSI_75:
3083 scr_cursor (RESTORE); 3473 scr_cursor (RESTORE);
3084 break; 3474 break;
3085 3475
3086#ifndef NO_FRILLS 3476#if ENABLE_FRILLS
3087 case CSI_74: 3477 case CSI_74:
3088 process_window_ops (arg, nargs); 3478 process_window_ops (arg, nargs);
3089 break; 3479 break;
3090#endif 3480#endif
3091 3481
… …
3098 break; 3488 break;
3099 } 3489 }
3100} 3490}
3101/*}}} */ 3491/*}}} */
3102 3492
3103#ifndef NO_FRILLS 3493#if ENABLE_FRILLS
3104/* ARGSUSED */ 3494/* ARGSUSED */
3105void 3495void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3496rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3497{
3108 int x, y; 3498 int x, y;
3109 XWindowAttributes wattr; 3499 XWindowAttributes wattr;
3110 Window wdummy; 3500 Window wdummy;
3501 dDisp;
3111 3502
3112 if (nargs == 0) 3503 if (nargs == 0)
3113 return; 3504 return;
3114 3505
3115 switch (args[0]) 3506 switch (args[0])
3116 { 3507 {
3117 /* 3508 /*
3118 * commands 3509 * commands
3119 */ 3510 */
3120 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3122 break; 3513 break;
3123 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3515 XIconifyWindow (disp, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3516 break;
3127 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3129 break; 3519 break;
3130 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3522 break;
3133 case 5: /* raise window */ 3523 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3135 break; 3525 break;
3136 case 6: /* lower window */ 3526 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3138 break; 3528 break;
3139 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3140 scr_touch (true); 3530 scr_touch (true);
3141 break; 3531 break;
3142 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3145 break; 3535 break;
3146 3536
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3538 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3152 break; 3542 break;
3153 3543
3154 3544
3155 /* 3545 /*
3156 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3157 */ 3547 */
3158 case 11: /* report window state */ 3548 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3551 break;
3162 case 13: /* report window position */ 3552 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3558 break;
3169 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3562 break;
3173 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3565 break;
3176 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3568 break;
3179 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3570 {
3182 char *s; 3571 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s);
3185 } 3575 }
3186 break; 3576 break;
3187 case 21: /* report window title */ 3577 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3578 {
3190 char *s; 3579 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s);
3193 } 3583 }
3194 break; 3584 break;
3195 } 3585 }
3196} 3586}
3197#endif 3587#endif
3198 3588
… …
3202 * ends_how is terminator used. returned input must be free()'d 3592 * ends_how is terminator used. returned input must be free()'d
3203 */ 3593 */
3204unsigned char * 3594unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3595rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3596{
3207 unicode_t prev = 0, ch; 3597 unicode_t ch;
3598 bool seen_esc = false;
3208 unsigned int n = 0; 3599 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3600 wchar_t string[STRING_MAX];
3211 3601
3212 while ((ch = cmd_getc ()) != NOCHAR) 3602 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3603 {
3214 if (prev == C0_ESC) 3604 if (seen_esc)
3215 { 3605 {
3216 if (ch == 0x5c) /* 7bit ST */ 3606 if (ch == 0x5c) /* 7bit ST */
3217 break; 3607 break;
3218 else 3608 else
3219 return NULL; 3609 return NULL;
3220 } 3610 }
3611 else if (ch == C0_ESC)
3612 {
3613 seen_esc = true;
3614 continue;
3615 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3616 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3617 break;
3223 else if (ch < 0x20) 3618 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3619 return NULL; /* other control character - exit */
3225 3620
3226 if (n >= sizeof (string) - 1) 3621 seen_esc = false;
3622
3623 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3624 // stop at some sane length
3228 return NULL; 3625 return NULL;
3229 3626
3230 if (ch == C0_SYN) 3627 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3628 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3629 else
3236 string[n++] = prev = ch; 3630 string[n++] = ch;
3237 } 3631 }
3238 3632
3239 string[n++] = '\0'; 3633 string[n++] = '\0';
3240 3634
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3635 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3636
3246 return s; 3637 return (unsigned char *)rxvt_wcstombs (string);
3247} 3638}
3248 3639
3249/*----------------------------------------------------------------------*/ 3640/*----------------------------------------------------------------------*/
3250/* 3641/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3686void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3688{
3298 if (str[0] == '?' && !str[1]) 3689 if (str[0] == '?' && !str[1])
3299 { 3690 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3691 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3692 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3694 }
3307 else 3695 else
3308 set_window_color (color, str); 3696 set_window_color (color, str);
3309} 3697}
3310 3698
3311/* 3699/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3701 */
3336void 3702void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3338{ 3704{
3339 int changed = 0; 3705 int changed = 0;
3340 int color; 3706 int color;
3341 char *buf, *name; 3707 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3708 bool query = str[0] == '?' && !str[1];
3709 int saveop = op;
3710 dDisp;
3343 3711
3344 assert (str != NULL); 3712 assert (str != NULL);
3345 switch (op) 3713 switch (op)
3346 { 3714 {
3347 case XTerm_name: 3715 case XTerm_name:
… …
3354 set_title (str); 3722 set_title (str);
3355 break; 3723 break;
3356 case XTerm_property: 3724 case XTerm_property:
3357 if (str[0] == '?') 3725 if (str[0] == '?')
3358 { 3726 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3727 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3728 Atom actual_type;
3361 int actual_format; 3729 int actual_format;
3362 unsigned long nitems; 3730 unsigned long nitems;
3363 unsigned long bytes_after; 3731 unsigned long bytes_after;
3364 unsigned char *value = 0; 3732 unsigned char *value = 0;
3365 const char *str = ""; 3733 const char *str = "";
3366 3734
3367 if (prop 3735 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3740 && actual_type != None
3373 && actual_format == 8) 3741 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3750 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3751
3384 if (eq) 3752 if (eq)
3385 { 3753 {
3386 *eq = 0; 3754 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3755 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3756 }
3392 else 3757 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3394 display->atom (str)); 3759 display->atom (str));
3395 } 3760 }
3396 break; 3761 break;
3397 3762
3398 case XTerm_Color: 3763 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3764 for (buf = (char *)str; buf && *buf;)
3400 { 3765 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3766 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3767 break;
3403 3768
3404 *name++ = '\0'; 3769 *name++ = '\0';
3405 color = atoi (buf); 3770 color = atoi (buf);
3406 3771
3407 if (color < 0 || color >= TOTAL_COLORS) 3772 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3773 break;
3409 3774
3410 if ((buf = STRCHR (name, ';')) != NULL) 3775 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3776 *buf++ = '\0';
3412 3777
3413 if (name[0] == '?' && !name[1]) 3778 if (name[0] == '?' && !name[1])
3414 { 3779 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3780 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3781 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3782 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3783 }
3422 else 3784 else
3423 set_window_color (color + minCOLOR, name); 3785 set_window_color (color + minCOLOR, name);
3424 } 3786 }
3425 break; 3787 break;
… …
3447 case XTerm_Color_UL: 3809 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3811 break;
3450 case XTerm_Color_RV: 3812 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3814 break;
3815 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3817 break;
3818#endif
3819#if TRANSPARENT && TINTING
3820 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3822 check_our_parents ();
3823 if (am_transparent)
3824 want_full_refresh = want_refresh = 1;
3452 break; 3825 break;
3453#endif 3826#endif
3454 3827
3455 case XTerm_Pixmap: 3828 case XTerm_Pixmap:
3456 if (*str != ';') 3829 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3832 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3833 set_bgPixmap (str); /* change pixmap */
3461#endif 3834#endif
3462 scr_touch (true); 3835 scr_touch (true);
3463 } 3836 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3837 while ((str = strchr (str, ';')) != NULL)
3465 { 3838 {
3466 str++; 3839 str++;
3467#if XPM_BACKGROUND 3840#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3841 changed += scale_pixmap (str);
3469#endif 3842#endif
3470
3471 } 3843 }
3844
3472 if (changed) 3845 if (changed)
3473 { 3846 {
3474#ifdef XPM_BACKGROUND 3847#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3848 resize_pixmap ();
3476#endif 3849#endif
… …
3487 3860
3488 case XTerm_logfile: 3861 case XTerm_logfile:
3489 // TODO, when secure mode? 3862 // TODO, when secure mode?
3490 break; 3863 break;
3491 3864
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR 3865#ifdef MENUBAR
3533 case XTerm_Menu: 3866 case URxvt_Menu:
3534 if (Options & Opt_insecure) 3867 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3869 break;
3537#endif 3870#endif
3538#if 0 3871#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3872 case XTerm_dumpscreen: /* no error notices */
… …
3543 { 3876 {
3544 scr_dump (fd); 3877 scr_dump (fd);
3545 close (fd); 3878 close (fd);
3546 } 3879 }
3547 } 3880 }
3881 break;
3882#endif
3883 case XTerm_font:
3884 op = URxvt_font;
3885 case URxvt_font:
3886#if ENABLE_STYLES
3887 case URxvt_boldFont:
3888 case URxvt_italicFont:
3889 case URxvt_boldItalicFont:
3890#endif
3891 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp);
3896 else
3897 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3899
3900 res = strdup (str);
3901 allocated.push_back ((void *)res);
3902 set_fonts ();
3903 }
3904 break;
3905
3906#if ENABLE_FRILLS
3907 case URxvt_locale:
3908 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3910 else
3911 {
3912 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8);
3914 init_xlocale ();
3915 }
3916 break;
3917
3918 case URxvt_view_up:
3919 case URxvt_view_down:
3920 int lines = atoi (str);
3921
3922 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else
3925 {
3926 scr_erase_savelines ();
3927 }
3928
3548 break; 3929 break;
3549#endif 3930#endif
3550 } 3931 }
3551} 3932}
3552/*----------------------------------------------------------------------*/ 3933/*----------------------------------------------------------------------*/
… …
3566{ 3947{
3567 int state; 3948 int state;
3568 3949
3569 if (mode == 's') 3950 if (mode == 's')
3570 { 3951 {
3571 SavedModes |= (PrivateModes & bit); 3952 SavedModes |= (priv_modes & bit);
3572 return -1; 3953 return -1;
3573 } 3954 }
3574 else 3955 else
3575 { 3956 {
3576 if (mode == 'r') 3957 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3958 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3959 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3960 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3961 PrivMode (state, bit);
3581 } 3962 }
3582 3963
3583 return state; 3964 return state;
3584} 3965}
… …
3602 { 3, PrivMode_132 }, 3983 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3984 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3985 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3986 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3987 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3989 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3990#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3991 { menuBar_esc, PrivMode_menuBar },
3610#endif 3992#endif
3993 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3995#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3996 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3997#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3998 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3999 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4000 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4001 // 45 margin bell NYI
3621 // 46 start logging 4002 // 46 start logging
… …
3662 4043
3663 /* extra handling for values with state unkept */ 4044 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4045 switch (arg[i])
3665 { 4046 {
3666 case 1048: /* alternative cursor save */ 4047 case 1048: /* alternative cursor save */
4048 case 1049:
3667 if (Options & Opt_secondaryScreen) 4049 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 4050 if (mode == 0)
3669 scr_cursor (RESTORE); 4051 scr_cursor (RESTORE);
3670 else if (mode == 1) 4052 else if (mode == 1)
3671 scr_cursor (SAVE); 4053 scr_cursor (SAVE);
3672 break; 4054 break;
… …
3683 * within VT52 mode 4065 * within VT52 mode
3684 */ 4066 */
3685 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
3686 break; 4068 break;
3687 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4072 break;
3691 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
3692 if (state) 4074 if (state)
3693 Options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
3694 else 4076 else
3695 Options |= Opt_jumpScroll; 4077 options |= Opt_jumpScroll;
3696 break; 4078 break;
3697 case 5: /* reverse video */ 4079 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4080 scr_rvideo_mode (state);
3699 break; 4081 break;
3700 case 6: /* relative/absolute origins */ 4082 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4086 scr_autowrap (state);
3705 break; 4087 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4088 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4089 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4090 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4091 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4092 break;
3711#ifdef menuBar_esc 4093#ifdef menuBar_esc
3712 case menuBar_esc: 4094 case menuBar_esc:
3713#ifdef MENUBAR 4095#ifdef MENUBAR
3714 map_menuBar (state); 4096 map_menuBar (state);
… …
3734 break; 4116 break;
3735 /* case 66: - application key pad */ 4117 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4118 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4119 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4120 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4121 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4122 break;
3741#if 0 4123#if 0
3742 case 1001: 4124 case 1001:
3743 break; /* X11 mouse highlighting */ 4125 break; /* X11 mouse highlighting */
3744#endif 4126#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4127 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4128 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4129 options &= ~Opt_scrollTtyOutput;
3748 else 4130 else
3749 Options |= Opt_scrollTtyOutput; 4131 options |= Opt_scrollTtyOutput;
3750 break; 4132 break;
3751 case 1011: /* scroll to bottom on key press */ 4133 case 1011: /* scroll to bottom on key press */
3752 if (state) 4134 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4135 options |= Opt_scrollTtyKeypress;
3754 else 4136 else
3755 Options &= ~Opt_scrollTtyKeypress; 4137 options &= ~Opt_scrollTtyKeypress;
3756 break; 4138 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4139 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4140 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4141 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4142 scr_erase_screen (2);
3761 scr_change_screen (state); 4143 scr_change_screen (state);
3762 break; 4144 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4145 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4146 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4147 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4148 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4149 scr_erase_screen (2);
3768 break; 4150 break;
3769 default: 4151 default:
3770 break; 4152 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4178 rendset = 0, rendstyle = ~RS_None;
3797 break; 4179 break;
3798 case 1: 4180 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4181 rendset = 1, rendstyle = RS_Bold;
3800 break; 4182 break;
3801 //case 2: // faint or second colour 4183 //case 2: // low intensity
4184 case 3:
4185 rendset = 1, rendstyle = RS_Italic;
4186 break;
3802 case 4: 4187 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4188 rendset = 1, rendstyle = RS_Uline;
3804 break; 4189 break;
3805 case 5: // slowly blinking 4190 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4191 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4203 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4204 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4205 //...
3821 //case 19: // ninth alt font 4206 //case 19: // ninth alt font
3822 //case 20: // gothic 4207 //case 20: // gothic
3823 case 21: // disable bold, faint 4208 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4209 rendset = 0, rendstyle = RS_Bold;
3825 break; 4210 break;
3826 case 22: 4211 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4212 rendset = 0, rendstyle = RS_Bold;
3828 break; 4213 break;
3829 //case 23: disable italic 4214 case 23: // disable italic
4215 rendset = 0, rendstyle = RS_Italic;
4216 break;
3830 case 24: 4217 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4218 rendset = 0, rendstyle = RS_Uline;
3832 break; 4219 break;
3833 case 25: 4220 case 25:
4221 rendset = 0, rendstyle = RS_Blink;
4222 break;
4223 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4224 rendset = 0, rendstyle = RS_Blink;
3835 break; 4225 break;
3836 case 27: 4226 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4227 rendset = 0, rendstyle = RS_RVid;
3838 break; 4228 break;
… …
3856 case 35: 4246 case 35:
3857 case 36: 4247 case 36:
3858 case 37: 4248 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4249 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4250 break;
3861#ifdef TTY_256COLOR 4251 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4252 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4253 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4254 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4255 i += 2;
3867 } 4256 }
3868 break; 4257 break;
3869#endif
3870 case 39: /* default fg */ 4258 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4259 scr_color (Color_fg, Color_fg);
3872 break; 4260 break;
3873 4261
3874 case 40: 4262 case 40:
… …
3879 case 45: 4267 case 45:
3880 case 46: 4268 case 46:
3881 case 47: 4269 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4270 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4271 break;
3884#ifdef TTY_256COLOR 4272 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4273 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4274 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4275 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4276 i += 2;
3890 } 4277 }
3891 break; 4278 break;
3892#endif
3893 case 49: /* default bg */ 4279 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4280 scr_color (Color_bg, Color_bg);
3895 break; 4281 break;
4282
4283 //case 50: // not variable spacing
3896 4284
3897#ifndef NO_BRIGHTCOLOR 4285#ifndef NO_BRIGHTCOLOR
3898 case 90: 4286 case 90:
3899 case 91: /* set bright fg color */ 4287 case 91: /* set bright fg color */
3900 case 92: 4288 case 92:
3901 case 93: 4289 case 93:
3902 case 94: 4290 case 94:
3903 case 95: 4291 case 95:
3904 case 96: 4292 case 96:
3905 case 97: 4293 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4294 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4295 break;
3909 case 100: 4296 case 100:
3910 case 101: /* set bright bg color */ 4297 case 101: /* set bright bg color */
3911 case 102: 4298 case 102:
3912 case 103: 4299 case 103:
3913 case 104: 4300 case 104:
3914 case 105: 4301 case 105:
3915 case 106: 4302 case 106:
3916 case 107: 4303 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4305 break;
3920#endif 4306#endif
3921 4307
3922 } 4308 }
3923 } 4309 }
… …
3930{ 4316{
3931 unicode_t ch, cmd = cmd_getc (); 4317 unicode_t ch, cmd = cmd_getc ();
3932 4318
3933 if (cmd == 'Q') 4319 if (cmd == 'Q')
3934 { /* query graphics */ 4320 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4321 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4322 return;
3937 } 4323 }
3938 /* swallow other graphics sequences until terminating ':' */ 4324 /* swallow other graphics sequences until terminating ':' */
3939 do 4325 do
3940 ch = cmd_getc (); 4326 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4341 unsigned char buf[256];
3956 4342
3957 va_start (arg_ptr, fmt); 4343 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4345 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4346 tt_write (buf, strlen (buf));
3961} 4347}
3962 4348
3963/* ---------------------------------------------------------------------- */ 4349/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4350/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4351 * or generated by us in response to a query ESC sequence.
3966 */ 4352 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354
3967void 4355void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4356rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4357{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4358 if (v_buflen == 0)
4359 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4361
3972 if (len) 4362 if ((unsigned int)written == len)
4363 return;
4364
4365 data += written;
4366 len -= written;
3973 { 4367 }
4368
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4370
4371 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len;
4373
4374 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375}
4376
4377void rxvt_term::pty_write ()
4378{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380
4381 if (written > 0)
4382 {
4383 v_buflen -= written;
4384
3974 if (v_buflen == 0) 4385 if (v_buflen == 0)
3975 { 4386 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4387 free (v_buffer);
4003 v_buffer = 0; 4388 v_buffer = 0;
4004 v_buflen = 0; 4389 v_buflen = 0;
4005 4390
4006 pty_ev.set (EVENT_READ); 4391 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4392 return;
4019 } 4393 }
4394
4395 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4396 }
4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4398 pty_ev.set (EVENT_READ);
4021} 4399}
4022 4400
4023/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4024 4402

Diff Legend

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