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

Diff Legend

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