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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

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

Diff Legend

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