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

Diff Legend

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