ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC

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

Diff Legend

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