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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
306 newlen = 0; 551 newlen = 0;
307 } 552 }
308 break; 553 break;
309 554
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
672 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
673 scrollbar_show (1); 930 scrollbar_show (1);
674#ifdef USE_XIM 931#ifdef USE_XIM
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677
678 } 934 }
679 935
680 display->flush (); 936 display->flush ();
681} 937}
682 938
… …
684rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
685{ 941{
686 SET_R (this); 942 SET_R (this);
687 SET_LOCALE (locale); 943 SET_LOCALE (locale);
688 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
689 flush (); 959 flush ();
690} 960}
691 961
692#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
693void 963void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 982 }
713} 983}
714#endif 984#endif
715 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
716bool 1029bool
717rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
718{ 1031{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
720 1039
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
724 1043
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1045
727 if (n > 0) 1046 if (n > 0)
728 { 1047 {
729 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
730 return true; 1049 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1059{
741 SET_R (this); 1060 SET_R (this);
742 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
743 1062
1063 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ())
1066 if (cmd_parse ())
1067 break;
1068
744 if (revents & EVENT_WRITE) 1069 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1070 pty_write ();
746 else if (revents & EVENT_READ) 1071}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1072
760 if (cmd_parse ()) 1073void
761 break; 1074rxvt_term::pointer_unblank ()
762 } 1075{
763 } 1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1077 recolour_cursor ();
1078
1079#ifdef POINTER_BLANK
1080 hidden_pointer = 0;
1081
1082 if (options & Opt_pointerBlank)
1083 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif
764} 1085}
765 1086
766#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
767void 1088void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
781{ 1090{
782 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
783 return; 1092 return;
784 1093
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1095 XFlush (display->display);
787 1096
… …
807 x = ev.x; 1116 x = ev.x;
808 y = ev.y; 1117 y = ev.y;
809 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
810 1119
811 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1121 button_number = 3;
814 }
815 else 1122 else
816 { 1123 {
817 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1126 if (button_number >= 3)
820 button_number += (64 - 3); 1127 button_number += (64 - 3);
821 } 1128 }
822 1129
823 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
824 { 1131 {
825 /* 1132 /*
826 * do not report ButtonRelease 1133 * do not report ButtonRelease
827 * no state info allowed 1134 * no state info allowed
828 */ 1135 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1154#endif
848
849 } 1155 }
850 1156
851#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1159 if (key_state & 16)
854 fputc ('C', stderr); 1160 fputc ('C', stderr);
855 if (key_state & 4) 1161 if (key_state & 4)
856 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1166 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1168 button_number,
863 x + 1, 1169 x + 1,
864 y + 1); 1170 y + 1);
865#else 1171#endif
1172
866 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
868 (32 + x + 1), 1175 (32 + x + 1),
869 (32 + y + 1)); 1176 (32 + y + 1));
870#endif
871} 1177}
872 1178
873#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
874void 1180void
875rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1192{
887 SET_R (this); 1193 SET_R (this);
888 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
889 1195
890#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1198 {
893 if (hidden_cursor) 1199 if (hidden_cursor)
894 { 1200 {
895 hidden_cursor = 0; 1201 hidden_cursor = 0;
896 want_refresh = 1; 1202 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1206 }
901#endif 1207#endif
902 1208
903#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1211 {
906 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1215 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1219 pointer_blank ();
914 } 1220 }
915#endif 1221#endif
916 1222
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1225 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1226
975 switch (ev.type) 1227 switch (ev.type)
976 { 1228 {
977 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
978 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1234
1235 break;
1236
1237 case KeyRelease:
1238 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
979 break; 1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
980 1298
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
986 else 1304#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1305 break;
995 } 1306 }
996#endif
997 1307
998 case ButtonPress: 1308 case ButtonPress:
999 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1000 break; 1310 break;
1001 1311
… …
1013 && (ev.xclient.data.l[0] == DndFile 1323 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1324 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1325 || ev.xclient.data.l[0] == DndLink))
1016 { 1326 {
1017 /* Get Dnd data */ 1327 /* Get Dnd data */
1018 Atom ActualType; 1328 Atom ActualType;
1019 int ActualFormat; 1329 int ActualFormat;
1020 unsigned char *data; 1330 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1331 unsigned long Size, RemainingBytes;
1022 1332
1023 XGetWindowProperty (display->display, display->root, 1333 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1334 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1335 0L, 1000000L,
1026 False, AnyPropertyType, 1336 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1029 &data); 1339 &data);
1030 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1341 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1344 }
1037#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1038 break; 1346 break;
1039 1347
1040 case MappingNotify: 1348 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1349 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1350 break;
1043 1351
1044 /* 1352 /*
1045 * XXX: this is not the _current_ arrangement 1353 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1354 * Here's my conclusion:
… …
1071 { 1379 {
1072 TermWin.focus = 1; 1380 TermWin.focus = 1;
1073 want_refresh = 1; 1381 want_refresh = 1;
1074#ifdef USE_XIM 1382#ifdef USE_XIM
1075 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1077#endif 1388#endif
1078#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1081#endif 1399#endif
1082 1400
1083 } 1401 }
1084 break; 1402 break;
1085 1403
1086 case FocusOut: 1404 case FocusOut:
1087 if (TermWin.focus) 1405 if (TermWin.focus)
1088 { 1406 {
1089 TermWin.focus = 0; 1407 TermWin.focus = 0;
1090 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1091#ifdef USE_XIM 1416#ifdef USE_XIM
1092 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1094#endif 1419#endif
1095#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1423 hidden_cursor = 0;
1099#endif 1424#endif
1100 1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1101 } 1432 }
1102 break; 1433 break;
1103 1434
1104 case ConfigureNotify: 1435 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1445 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1447
1117 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1118 { 1449 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1450 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1121 } 1452 }
1122#ifdef DEBUG_SIZE 1453
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1456 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1457#endif
1136 } 1458 }
1459 break;
1460
1461 case PropertyNotify:
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1137 break; 1466 break;
1138 1467
1139 case SelectionClear: 1468 case SelectionClear:
1140 selection_clear (); 1469 selection_clear ();
1141 break; 1470 break;
1142 1471
1143 case SelectionNotify: 1472 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1475 break;
1148 1476
1149 case SelectionRequest: 1477 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1151 break; 1479 break;
… …
1172 1500
1173 case GraphicsExpose: 1501 case GraphicsExpose:
1174 case Expose: 1502 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == TermWin.vt)
1176 { 1504 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1505 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1506 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1507 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1509
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1515
1185 // ev.xexpose.width, TermWin.height, False); 1516 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1517 }
1189 else 1518 else
1190 { 1519 {
1191 XEvent unused_event; 1520 XEvent unused_event;
1192 1521
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1523 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1525 ;
1198 &unused_event)) ; 1526
1199 if (isScrollbarWindow (ev.xany.window)) 1527 if (isScrollbarWindow (ev.xany.window))
1200 { 1528 {
1201 scrollBar.setIdle (); 1529 scrollBar.setIdle ();
1202 scrollbar_show (0); 1530 scrollbar_show (0);
1203 } 1531 }
1204#ifdef MENUBAR 1532#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1534 menubar_expose ();
1207#endif 1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1208 } 1541 }
1209 break; 1542 break;
1210 1543
1211 case MotionNotify: 1544 case MotionNotify:
1212#ifdef POINTER_BLANK 1545#ifdef POINTER_BLANK
… …
1218 { 1551 {
1219 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1220 break; 1553 break;
1221 } 1554 }
1222#endif 1555#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1557 break;
1225 1558
1226 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1227 { 1560 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1562 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1564 ;
1232 1565
1233 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1570 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1574 {
1242#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1245#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1590 {
1249 int dist; 1591 int dist;
1250 1592
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1593 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1594 * already in the middle of scrolling.
1255 */ 1595 */
1256 if (scroll_selection_delay<=0) 1596 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1598
1259 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1261 */ 1601 */
1262 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1605
1267 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1608 {
1270 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1611 }
1273 else 1612 else
1274 { 1613 {
1275 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1616 }
1617
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1281 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1283 } 1623 }
1284 else 1624 else
1285 { 1625 {
1286 /* we are within the text window, so we 1626 /* we are within the text window, so we
1287 * shouldn't be scrolling 1627 * shouldn't be scrolling
1288 */ 1628 */
1289 pending_scroll_selection = 0; 1629 if (sel_scroll_ev.active)
1630 sel_scroll_ev.stop();
1290 } 1631 }
1291#endif 1632#endif
1292#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1293
1294 } 1634 }
1295#endif 1635#endif
1296
1297 } 1636 }
1298 } 1637 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1639 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1303 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1648 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1650 scrollbar_size ());
1310 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1313 } 1654 }
1314 break; 1655 break;
1315 } 1656 }
1316} 1657}
1317 1658
1659#if TRANSPARENT
1318void 1660void
1319rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1662{
1321 SET_R (this); 1663 SET_R (this);
1322 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1323 1665
1324 switch (ev.type) 1666 switch (ev.type)
1325 { 1667 {
1326 case PropertyNotify: 1668 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1669 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1670 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1671 * use the property to determine the pixmap. We use it later on.
1339 */ 1672 */
1340 if (xa[XA_XROOTPMAPID] == 0) 1673 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342 1675
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return; 1677 return;
1345 }
1346 1678
1347 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1348 case ReparentNotify: 1680 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1351 break; 1683 break;
1352#endif
1353 } 1684 }
1354} 1685}
1686#endif
1355 1687
1356void 1688void
1357rxvt_term::button_press (XButtonEvent &ev) 1689rxvt_term::button_press (XButtonEvent &ev)
1358{ 1690{
1359 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1360 1692
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1694 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1364 /* 1697 /*
1365 * VT window processing of button press 1698 * VT window processing of button press
1366 */ 1699 */
1367 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1368 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1370 if (reportmode) 1713 if (reportmode)
1371 { 1714 {
1372 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1403 } 1746 }
1404 else 1747 else
1405 { 1748 {
1406 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1408 switch (ev.button) 1752 switch (ev.button)
1409 { 1753 {
1410 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1411 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1765 {
1414 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1416 else 1768 else
1417 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1784 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1435 else 1787 else
1436 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1437 MEvent.button = Button3; 1790 MEvent.button = Button3;
1438 break; 1791 break;
1439 } 1792 }
1440 } 1793 }
1794
1441 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1442 return; 1796 return;
1443 } 1797 }
1444 1798
1445 /* 1799 /*
… …
1511 upordown = 1; /* down */ 1865 upordown = 1; /* down */
1512 } 1866 }
1513 if (upordown) 1867 if (upordown)
1514 { 1868 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1869#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1870 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1871#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1872 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1873 {
1520 if (upordown < 0) 1874 if (upordown < 0)
1521 scrollBar.setUp (); 1875 scrollBar.setUp ();
… …
1537 break; 1891 break;
1538 case R_SB_ALIGN_BOTTOM: 1892 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1893 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1894 break;
1541 } 1895 }
1896
1542 if (scrollBar.style == R_SB_XTERM 1897 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1898 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1899 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1901
1547 scrollBar.setMotion (); 1902 scrollBar.setMotion ();
1548 break; 1903 break;
1549 1904
1550 case Button1: 1905 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1906 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1930 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1931 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1932 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1933 / scrollbar_size ()));
1579 } 1934 }
1935
1580 break; 1936 break;
1581 } 1937 }
1582 } 1938 }
1583 return; 1939 return;
1584 } 1940 }
… …
1596{ 1952{
1597 int reportmode = 0; 1953 int reportmode = 0;
1598 1954
1599 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1956 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1958
1603 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1604 { 1960 {
1605 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1606 scrollbar_show (0); 1962 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1965#endif
1610
1611 } 1966 }
1967
1612#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1969 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop();
1614#endif 1971#endif
1972
1615 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1616 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1617 if (reportmode) 1980 if (reportmode)
1618 { 1981 {
1619 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1636 mouse_report (ev); 1999 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2001 return;
1639 } 2002 }
2003
1640 /* 2004 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2006 * when overriding mouse reporting
1643 */ 2007 */
1644 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2009 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1648 2012
1649 switch (ev.button) 2013 switch (ev.button)
… …
1660 case Button5: 2024 case Button5:
1661 { 2025 {
1662 int i; 2026 int i;
1663 page_dirn v; 2027 page_dirn v;
1664 2028
1665 v = (ev.button == Button4) ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
2030
1666 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1667 i = 1; 2032 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2033 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1670 else 2035 else
1671 i = 5; 2036 i = 5;
2037
1672# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2039 if (ev.state & ControlMask)
1674 { 2040 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2041 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2044
2045 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047
2048 slip_wheel_ev.start ();
1677 } 2049 }
2050 else
2051 {
1678# endif 2052# endif
1679# ifdef JUMP_MOUSE_WHEEL 2053# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2054 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2055 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2056 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING
1689 } 2066 }
1690# endif 2067#endif
1691
1692 } 2068 }
1693 break; 2069 break;
1694#endif 2070#endif
1695
1696 } 2071 }
1697 } 2072 }
1698#ifdef MENUBAR 2073#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2074 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2075 menubar_control (ev);
1701#endif 2076#endif
1702} 2077}
1703 2078
1704#ifdef TRANSPARENT 2079#ifdef TRANSPARENT
1705#if TINTING 2080#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2081/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2082
1709static void 2083typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2084
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2086{
1717 /* No saturation */ 2087 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2088 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
1721 2093
1722 b = ((uint16_t *) ptr)[x]; 2094 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2095
1724 g = (b & 0x3e0) * gm; 2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2097
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2098 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2099 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2100 mask_g = visual->green_mask;
1729 } 2101 mask_b = visual->blue_mask;
1730 ptr += bpl; 2102
1731 } 2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2176 } else {
1733 for (y = h; --y >= 0;) { 2177 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2178 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2179
1737 b = ((uint16_t *) ptr)[x]; 2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2181
1739 g = (b & 0x3e0) * gm; 2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2185 }
1743 b |= (!(b >> 5) - 1); 2186
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2189 {
1747 } 2190 unsigned int tmp;
1748 ptr += bpl; 2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
1749 } 2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2243 }
1751} 2244 break;
1752 2245 }
1753/* RGB 16 */ 2246 case 16:
1754static void 2247 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2248 unsigned short *p1, *pf, *p, *pl;
1756{ 2249 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2251 while (p1 < pf)
1759 2252 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2253 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2254 pl = p1 + srcImage->width;
1762 /* No saturation */ 2255 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2256 {
1777 } else { 2257 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2258 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2259 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2260 }
1793 ptr += bpl; 2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
1794 } 2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2281 }
1796} 2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2289
1798/* RGB 24 */ 2290 while (p1 < pf)
1799static void 2291 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2292 p = p1;
1801{ 2293 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2294 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2295 {
1830 } else { 2296 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2297 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2298 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2299 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2300 }
1861 ptr += bpl; 2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2302 }
2303 break;
2304 }
1863 } 2305 }
1864}
1865 2306
1866/* RGB 32 */ 2307 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2308}
1937
1938#endif 2309#endif
1939 2310
1940/* 2311/*
1941 * Check our parents are still who we think they are. 2312 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2313 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
1954 2325
1955 pchanged = 0; 2326 pchanged = 0;
1956 2327
1957 if (!(Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
1959 2330
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
1962 2333
… …
1965 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
1966 { 2337 {
1967 if (am_transparent) 2338 if (am_transparent)
1968 { 2339 {
1969 pchanged = 1; 2340 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
1972 } 2343 }
1973 2344
1974 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1975 } 2346 }
… …
1991 i = (xa[XA_XSETROOTID] 2362 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2365 &nitems, &bytes_after, &prop) == Success);
1995 2366
1996 if (!i || prop == NULL) 2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
1997 have_pixmap = 0; 2372 have_pixmap = 0;
1998 else 2373 else
1999 { 2374 {
2000 have_pixmap = 1; 2375 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2376 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2377 XFree (prop);
2003 } 2378 }
2004 2379
2005 if (have_pixmap) 2380 if (have_pixmap)
2006 { 2381 {
… …
2034 sy = 0; 2409 sy = 0;
2035 } 2410 }
2036 2411
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2039 allowedxerror = -1; 2416 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2418
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2440 XFreePixmap (display->display, TermWin.pixmap);
2064 2441
2065#if TINTING 2442#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2443 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2444 {
2068 unsigned short shade, rm, gm, bm; 2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2447
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2449
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2450 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2451 }
2083#endif 2452#endif
2084 2453
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2455 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2458 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2459 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2460 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2462 XClearWindow (display->display, TermWin.parent[0]);
2094 2463
2095 if (!am_transparent || !am_pixmap_trans) 2464 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2465 pchanged = 1;
2097 2466
2098 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2099 } 2468 }
2100 } 2469 }
2101 2470
2102 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2103 { 2474 {
2104 unsigned int n; 2475 unsigned int n;
2105 /* 2476 /*
2106 * InheritPixmap transparency 2477 * InheritPixmap transparency
2107 */ 2478 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2480 {
2111 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2484 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2485
2117 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2118 { 2487 {
2119 if (oldp != None) 2488 if (oldp != None)
2120 pchanged = 1; 2489 pchanged = 1;
… …
2131 if (pchanged) 2500 if (pchanged)
2132 { 2501 {
2133 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2134 { 2503 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2506 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2508 break;
2141 } 2509 }
2142 } 2510 }
2143 } 2511 }
2144 2512
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2514 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2517 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2152 } 2519 }
2153 else 2520 else
2154 { 2521 {
2155#if WAIT_FOR_WM 2522#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2524 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2525 sleep (1);
2159#endif 2526#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2163 2532
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2534 am_transparent = 1;
2166 } 2535 }
2167 2536
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2170 } 2553 }
2171 2554
2172 return pchanged; 2555 return pchanged;
2173} 2556}
2174#endif 2557#endif
… …
2191 } 2574 }
2192 2575
2193 if (ch == NOCHAR) // TODO: improve 2576 if (ch == NOCHAR) // TODO: improve
2194 break; 2577 break;
2195 2578
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 {
2581 if (!seen_input)
2197 { 2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2198 /* Read a text string from the input buffer */ 2595 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2596 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2597 bool refreshnow = false;
2201 int nlines = 0; 2598 int nlines = 0;
2202 unicode_t *str = buf; 2599 unicode_t *str = buf;
2203 2600
2204 *str++ = ch;
2205
2206 for (;;) 2601 for (;;)
2207 { 2602 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2604 break;
2213 2605
2214 *str++ = ch; 2606 *str++ = ch;
2215 2607
2216 if (ch == '\n') 2608 if (ch == C0_LF)
2217 { 2609 {
2218 nlines++; 2610 nlines++;
2219 refresh_count++; 2611 refresh_count++;
2220 2612
2221 if (! (Options & Opt_jumpScroll) 2613 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2615 {
2224 refreshnow = true; 2616 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2617 ch = NOCHAR;
2227 break; 2618 break;
2228 } 2619 }
2229 2620
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2622 if (nlines >= TermWin.nrow - 1)
2232 { 2623 {
2233 scr_add_lines (buf, nlines, str - buf); 2624 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2625 nlines = 0;
2235 str = buf; 2626 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2630 if (str >= buf + UBUFSIZ)
2240 { 2631 {
2241 ch = NOCHAR; 2632 ch = NOCHAR;
2242 break; 2633 break;
2243 } 2634 }
2635
2636 seq_begin = cmdbuf_ptr;
2637 ch = next_char ();
2244 } 2638 }
2245 2639
2246 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2247 2641
2248 /* 2642 /*
2249 * If there have been a lot of new lines, then update the screen 2643 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2644 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2645 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2646 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2647 */
2257 if (refreshnow) 2648 if (refreshnow)
2258 { 2649 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2651 refresh_limit++;
2261 2652 else
2653 {
2654 flag = true;
2262 scr_refresh (refresh_type); 2655 scr_refresh (refresh_type);
2656 }
2263 } 2657 }
2264 2658
2265 } 2659 }
2266 else 2660 else
2267 { 2661 {
… …
2281 } 2675 }
2282 2676
2283 return flag; 2677 return flag;
2284} 2678}
2285 2679
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2286// read the next character 2689// read the next character
2287unicode_t 2690unicode_t
2288rxvt_term::next_char () 2691rxvt_term::next_char ()
2289{ 2692{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2693 while (cmdbuf_ptr < cmdbuf_endp)
… …
2321 */ 2724 */
2322unicode_t 2725unicode_t
2323rxvt_term::cmd_getc () 2726rxvt_term::cmd_getc ()
2324{ 2727{
2325 unicode_t c = next_char (); 2728 unicode_t c = next_char ();
2729
2730 if (c == NOCHAR)
2731 throw out_of_input;
2732
2733 return c;
2734}
2735
2736unicode_t
2737rxvt_term::cmd_get8 ()
2738{
2739 unicode_t c = next_octet ();
2326 2740
2327 if (c == NOCHAR) 2741 if (c == NOCHAR)
2328 throw out_of_input; 2742 throw out_of_input;
2329 2743
2330 return c; 2744 return c;
… …
2431 process_escape_seq (); 2845 process_escape_seq ();
2432 break; 2846 break;
2433 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2851 else
2438 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2440 break; 2854 break;
2441 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2442 scr_bell (); 2856 scr_bell ();
2443 break; 2857 break;
2444 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2460 break; 2874 break;
2461 case C0_SI: /* shift in - acs */ 2875 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2876 scr_charset_choose (0);
2463 break; 2877 break;
2464 2878
2879#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2880 // 8-bit controls
2466 case 0x90: /* DCS */ 2881 case 0x90: /* DCS */
2467 process_dcs_seq (); 2882 process_dcs_seq ();
2468 break; 2883 break;
2469 case 0x9b: /* CSI */ 2884 case 0x9b: /* CSI */
2470 process_csi_seq (); 2885 process_csi_seq ();
2471 break; 2886 break;
2472 case 0x9d: /* CSI */ 2887 case 0x9d: /* CSI */
2473 process_osc_seq (); 2888 process_osc_seq ();
2474 break; 2889 break;
2890#endif
2475 } 2891 }
2476} 2892}
2477/*}}} */ 2893/*}}} */
2478 2894
2479 2895
… …
2541void 2957void
2542rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2543{ 2959{
2544 unicode_t ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2545 2961
2546 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2547 { 2963 {
2548 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2549 return; 2965 return;
2550 } 2966 }
2551 2967
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2983 break;
2568 case '+': 2984 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2986 break;
2571#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2572 case '6': 2988 case '6':
2573 scr_backindex (); 2989 scr_backindex ();
2574 break; 2990 break;
2575#endif 2991#endif
2576 case '7': 2992 case '7':
2577 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2578 break; 2994 break;
2579 case '8': 2995 case '8':
2580 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2581 break; 2997 break;
2582#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2583 case '9': 2999 case '9':
2584 scr_forwardindex (); 3000 scr_forwardindex ();
2585 break; 3001 break;
2586#endif 3002#endif
2587 case '=': 3003 case '=':
… …
2597 break; 3013 break;
2598 3014
2599 /* 8.3.87: NEXT LINE */ 3015 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3016 case C1_NEL: /* ESC E */
2601 { 3017 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3018 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3019 scr_add_lines (nlcr, 1, 2);
2604 } 3020 }
2605 break; 3021 break;
2606 3022
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3023 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3084
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3085/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3086/* *INDENT-OFF* */
2671enum { 3087enum {
2672 CSI_ICH = 0x40, 3088 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3089 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3090 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3091 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3092 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3093 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3094 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3303 break;
2888 3304
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3308 break;
2893 3309
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
2896 break; 3312 break;
… …
2903 break; 3319 break;
2904 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
2905 scr_report_position (); 3321 scr_report_position ();
2906 break; 3322 break;
2907 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3324 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3326 break;
2911 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3329 break;
2914 } 3330 }
… …
2950 break; 3366 break;
2951 3367
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3369 if (arg[0] == 4)
2954 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
2955 break; 3373 break;
2956 3374
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3376 if (arg[0] == 4)
2959 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
2960 break; 3380 break;
2961 3381
2962 /* 3382 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3384 */
… …
2976 break; 3396 break;
2977 case CSI_75: 3397 case CSI_75:
2978 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
2979 break; 3399 break;
2980 3400
2981#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
2982 case CSI_74: 3402 case CSI_74:
2983 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
2984 break; 3404 break;
2985#endif 3405#endif
2986 3406
… …
2993 break; 3413 break;
2994 } 3414 }
2995} 3415}
2996/*}}} */ 3416/*}}} */
2997 3417
2998#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
2999/* ARGSUSED */ 3419/* ARGSUSED */
3000void 3420void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3422{
3003 int x, y; 3423 int x, y;
… …
3070 break; 3490 break;
3071 case 19: /* report window size (chars) */ 3491 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3493 break;
3074 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3495 {
3077 char *s; 3496 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3080 } 3500 }
3081 break; 3501 break;
3082 case 21: /* report window title */ 3502 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3503 {
3085 char *s; 3504 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s);
3088 } 3508 }
3089 break; 3509 break;
3090 } 3510 }
3091} 3511}
3092#endif 3512#endif
3093 3513
3094/*----------------------------------------------------------------------*/ 3514/*----------------------------------------------------------------------*/
3095/* 3515/*
3096 * get input up until STRING TERMINATOR (or BEL) 3516 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3517 * ends_how is terminator used. returned input must be free()'d
3098 */ 3518 */
3099unsigned char * 3519unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3521{
3102 int seen_esc = 0; /* seen escape? */ 3522 unicode_t ch;
3523 bool seen_esc = false;
3103 unsigned int n = 0; 3524 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3107 3526
3108 while ((ch = cmd_getc ())) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3528 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3529 if (seen_esc)
3530 {
3114 if (ch == 0x5c) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
3115 break; 3532 break;
3116 else 3533 else
3117 return NULL; 3534 return NULL;
3118 3535 }
3119 if (ch == C0_ESC) 3536 else if (ch == C0_ESC)
3120 { 3537 {
3121 seen_esc = 1; 3538 seen_esc = true;
3122 continue; 3539 continue;
3123 } 3540 }
3124 else if (ch == '\t') 3541 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3542 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3543 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3128 3547
3129 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3549 // stop at some sane length
3131 return NULL; 3550 return NULL;
3132 3551
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
3133 string[n++] = ch; 3555 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3556 }
3136 3557
3137 string[n++] = '\0'; 3558 string[n++] = '\0';
3138 3559
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3561
3144 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3145} 3563}
3146 3564
3147/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3148/* 3566/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3611void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3613{
3196 if (str[0] == '?' && !str[1]) 3614 if (str[0] == '?' && !str[1])
3197 { 3615 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3616 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3617 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3619 }
3205 else 3620 else
3206 set_window_color (color, str); 3621 set_window_color (color, str);
3207} 3622}
3208 3623
… …
3236{ 3651{
3237 int changed = 0; 3652 int changed = 0;
3238 int color; 3653 int color;
3239 char *buf, *name; 3654 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
3241 3657
3242 assert (str != NULL); 3658 assert (str != NULL);
3243 switch (op) 3659 switch (op)
3244 { 3660 {
3245 case XTerm_name: 3661 case XTerm_name:
… …
3252 set_title (str); 3668 set_title (str);
3253 break; 3669 break;
3254 case XTerm_property: 3670 case XTerm_property:
3255 if (str[0] == '?') 3671 if (str[0] == '?')
3256 { 3672 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3674 Atom actual_type;
3259 int actual_format; 3675 int actual_format;
3260 unsigned long nitems; 3676 unsigned long nitems;
3261 unsigned long bytes_after; 3677 unsigned long bytes_after;
3262 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3697
3282 if (eq) 3698 if (eq)
3283 { 3699 {
3284 *eq = 0; 3700 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3701 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3702 }
3290 else 3703 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str)); 3705 display->atom (str));
3293 } 3706 }
3294 break; 3707 break;
3295 3708
3296 case XTerm_Color: 3709 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
3298 { 3711 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3713 break;
3301 3714
3302 *name++ = '\0'; 3715 *name++ = '\0';
3303 color = atoi (buf); 3716 color = atoi (buf);
3304 3717
3305 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3719 break;
3307 3720
3308 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3722 *buf++ = '\0';
3310 3723
3311 if (name[0] == '?' && !name[1]) 3724 if (name[0] == '?' && !name[1])
3312 { 3725 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3726 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3729 }
3320 else 3730 else
3321 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
3322 } 3732 }
3323 break; 3733 break;
… …
3340 break; 3750 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3345 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3760 break;
3348 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break;
3764#endif
3765#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3768 check_our_parents ();
3769 if (am_transparent)
3770 want_full_refresh = want_refresh = 1;
3350 break; 3771 break;
3351#endif 3772#endif
3352 3773
3353 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3354 if (*str != ';') 3775 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3359#endif 3780#endif
3360 scr_touch (true); 3781 scr_touch (true);
3361 } 3782 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3363 { 3784 {
3364 str++; 3785 str++;
3365#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3367#endif 3788#endif
… …
3386 case XTerm_logfile: 3807 case XTerm_logfile:
3387 // TODO, when secure mode? 3808 // TODO, when secure mode?
3388 break; 3809 break;
3389 3810
3390 case XTerm_font: 3811 case XTerm_font:
3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3391 if (query) 3819 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3823 resp);
3824 else
3392 { 3825 {
3393 if (Options & Opt_insecure) 3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3827
3395 TermWin.fontset->fontdesc 3828 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3829 allocated.push_back ((void *)res);
3397 : "", 3830 set_fonts ();
3398 resp);
3399 } 3831 }
3400 else
3401 change_font (str);
3402 break; 3832 break;
3403 3833
3404#ifndef NO_FRILLS 3834#if ENABLE_FRILLS
3405 case XTerm_locale: 3835 case XTerm_locale:
3406 if (query) 3836 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3838 else
3412 { 3839 {
3413 set_locale (str); 3840 set_locale (str);
3414# ifdef USE_XIM 3841# ifdef USE_XIM
3415 im_cb (); 3842 im_cb ();
3416# endif 3843# endif
3417 } 3844 }
3418 break; 3845 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3846#endif
3429 3847
3430#ifdef MENUBAR 3848#ifdef MENUBAR
3431 case XTerm_Menu: 3849 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3850 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3852 break;
3435#endif 3853#endif
3436#if 0 3854#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3882{
3465 int state; 3883 int state;
3466 3884
3467 if (mode == 's') 3885 if (mode == 's')
3468 { 3886 {
3469 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3470 return -1; 3888 return -1;
3471 } 3889 }
3472 else 3890 else
3473 { 3891 {
3474 if (mode == 'r') 3892 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3894 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3896 PrivMode (state, bit);
3479 } 3897 }
3480 3898
3481 return state; 3899 return state;
3482} 3900}
… …
3500 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3925#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3508#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3932#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3935 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3936 // 45 margin bell NYI
3519 // 46 start logging 3937 // 46 start logging
… …
3560 3978
3561 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3980 switch (arg[i])
3563 { 3981 {
3564 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3565 if (Options & Opt_secondaryScreen) 3984 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3985 if (mode == 0)
3567 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3568 else if (mode == 1) 3987 else if (mode == 1)
3569 scr_cursor (SAVE); 3988 scr_cursor (SAVE);
3570 break; 3989 break;
… …
3581 * within VT52 mode 4000 * within VT52 mode
3582 */ 4001 */
3583 PrivMode (1, PrivMode_vt52); 4002 PrivMode (1, PrivMode_vt52);
3584 break; 4003 break;
3585 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4007 break;
3589 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3590 if (state) 4009 if (state)
3591 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3592 else 4011 else
3593 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3594 break; 4013 break;
3595 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3597 break; 4016 break;
3598 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4021 scr_autowrap (state);
3603 break; 4022 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4026 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4027 break;
3609#ifdef menuBar_esc 4028#ifdef menuBar_esc
3610 case menuBar_esc: 4029 case menuBar_esc:
3611#ifdef MENUBAR 4030#ifdef MENUBAR
3612 map_menuBar (state); 4031 map_menuBar (state);
… …
3632 break; 4051 break;
3633 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4056 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4057 break;
3639#if 0 4058#if 0
3640 case 1001: 4059 case 1001:
3641 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3642#endif 4061#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4063 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3646 else 4065 else
3647 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3648 break; 4067 break;
3649 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3650 if (state) 4069 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3652 else 4071 else
3653 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3654 break; 4073 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4074 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4077 scr_erase_screen (2);
3659 scr_change_screen (state); 4078 scr_change_screen (state);
3660 break; 4079 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4080 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4081 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4082 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4083 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4084 scr_erase_screen (2);
3666 break; 4085 break;
3667 default: 4086 default:
3668 break; 4087 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3695 break; 4114 break;
3696 case 1: 4115 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3698 break; 4117 break;
4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3699 case 4: 4122 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3701 break; 4124 break;
3702 case 5: 4125 case 5: // slowly blinking
4126 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4127 rendset = 1, rendstyle = RS_Blink;
3704 break; 4128 break;
4129 //case 6: // scoansi light background
3705 case 7: 4130 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4131 rendset = 1, rendstyle = RS_RVid;
3707 break; 4132 break;
3708 case 8: 4133 case 8:
3709 // invisible. NYI 4134 // invisible. NYI
3710 break; 4135 break;
3711 case 22: 4136 //case 9: // crossed out
4137 //case 10: // scoansi acs off, primary font
4138 //case 11: // scoansi acs on, first alt font
4139 //case 12: // scoansi acs on, |0x80, second alt font
4140 //...
4141 //case 19: // ninth alt font
4142 //case 20: // gothic
4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
4145 break;
4146 case 22: // normal intensity
4147 rendset = 0, rendstyle = RS_Bold;
4148 break;
4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
3713 break; 4151 break;
3714 case 24: 4152 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3716 break; 4154 break;
3717 case 25: 4155 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4156 rendset = 0, rendstyle = RS_Blink;
3719 break; 4157 break;
4158 case 26: // variable spacing (iso 8613)
4159 rendset = 0, rendstyle = RS_Blink;
4160 break;
3720 case 27: 4161 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3722 break; 4163 break;
3723 case 28:
3724 // visible. NYI 4164 //case 28: // visible. NYI
3725 break; 4165 //case 29: // not crossed-out
3726 } 4166 }
3727 4167
3728 if (rendset != -1) 4168 if (rendset != -1)
3729 { 4169 {
3730 scr_rendition (rendset, rendstyle); 4170 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4181 case 35:
3742 case 36: 4182 case 36:
3743 case 37: 4183 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4185 break;
3746#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4188 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4190 i += 2;
3752 } 4191 }
3753 break; 4192 break;
3754#endif
3755 case 39: /* default fg */ 4193 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
3757 break; 4195 break;
3758 4196
3759 case 40: 4197 case 40:
… …
3764 case 45: 4202 case 45:
3765 case 46: 4203 case 46:
3766 case 47: 4204 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4206 break;
3769#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4209 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4211 i += 2;
3775 } 4212 }
3776 break; 4213 break;
3777#endif
3778 case 49: /* default bg */ 4214 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
3780 break; 4216 break;
4217
4218 //case 50: // not variable spacing
3781 4219
3782#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
3783 case 90: 4221 case 90:
3784 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
3785 case 92: 4223 case 92:
3786 case 93: 4224 case 93:
3787 case 94: 4225 case 94:
3788 case 95: 4226 case 95:
3789 case 96: 4227 case 96:
3790 case 97: 4228 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4230 break;
3794 case 100: 4231 case 100:
3795 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
3796 case 102: 4233 case 102:
3797 case 103: 4234 case 103:
3798 case 104: 4235 case 104:
3799 case 105: 4236 case 105:
3800 case 106: 4237 case 106:
3801 case 107: 4238 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4240 break;
3805#endif 4241#endif
3806 4242
3807 } 4243 }
3808 } 4244 }
3809} 4245}
3810/*}}} */ 4246/*}}} */
3811 4247
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4248/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4249void
3814rxvt_term::process_graphics () 4250rxvt_term::process_graphics ()
3815{ 4251{
3816 unicode_t ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
3817 4253
3818 if (cmd == 'Q') 4254 if (cmd == 'Q')
3819 { /* query graphics */ 4255 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4257 return;
3822 } 4258 }
3823 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
3824 do 4260 do
3825 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4276 unsigned char buf[256];
3841 4277
3842 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4280 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
3846} 4282}
3847 4283
3848/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
3851 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
3852void 4290void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4292{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4296
3857 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
3858 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
3859 if (v_buflen == 0) 4320 if (v_buflen == 0)
3860 { 4321 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4322 free (v_buffer);
3888 v_buffer = 0; 4323 v_buffer = 0;
3889 v_buflen = 0; 4324 v_buflen = 0;
3890 4325
3891 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4327 return;
3904 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
3906} 4335}
3907 4336
3908/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
3909 4338

Diff Legend

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