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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.178 by root, Wed Dec 15 00:53:23 2004 UTC

… …
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 {
… …
683rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
684{ 941{
685 SET_R (this); 942 SET_R (this);
686 SET_LOCALE (locale); 943 SET_LOCALE (locale);
687 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;
688 flush (); 959 flush ();
689} 960}
690 961
691#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
692void 963void
… …
768 1039
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
772 1043
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1045
775 if (n > 0) 1046 if (n > 0)
776 { 1047 {
777 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
778 return true; 1049 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1059{
789 SET_R (this); 1060 SET_R (this);
790 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
791 1062
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1065 while (pty_fill ())
797 if (cmd_parse ()) 1066 if (cmd_parse ())
798 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
799} 1071}
800 1072
801void 1073void
802rxvt_term::pointer_unblank () 1074rxvt_term::pointer_unblank ()
803{ 1075{
… …
805 recolour_cursor (); 1077 recolour_cursor ();
806 1078
807#ifdef POINTER_BLANK 1079#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1080 hidden_pointer = 0;
809 1081
810 if (Options & Opt_pointerBlank) 1082 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1083 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1084#endif
813} 1085}
814 1086
815#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
816void 1088void
817rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
818{ 1090{
819 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
820 return; 1092 return;
821 1093
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1095 XFlush (display->display);
824 1096
… …
844 x = ev.x; 1116 x = ev.x;
845 y = ev.y; 1117 y = ev.y;
846 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
847 1119
848 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1121 button_number = 3;
851 }
852 else 1122 else
853 { 1123 {
854 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1126 if (button_number >= 3)
857 button_number += (64 - 3); 1127 button_number += (64 - 3);
858 } 1128 }
859 1129
860 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
861 { 1131 {
862 /* 1132 /*
863 * do not report ButtonRelease 1133 * do not report ButtonRelease
864 * no state info allowed 1134 * no state info allowed
865 */ 1135 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1154#endif
885
886 } 1155 }
887 1156
888#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1159 if (key_state & 16)
891 fputc ('C', stderr); 1160 fputc ('C', stderr);
892 if (key_state & 4) 1161 if (key_state & 4)
893 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1166 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1168 button_number,
900 x + 1, 1169 x + 1,
901 y + 1); 1170 y + 1);
902#else 1171#endif
1172
903 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
905 (32 + x + 1), 1175 (32 + x + 1),
906 (32 + y + 1)); 1176 (32 + y + 1));
907#endif
908} 1177}
909 1178
910#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
911void 1180void
912rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
923{ 1192{
924 SET_R (this); 1193 SET_R (this);
925 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
926 1195
927#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1198 {
930 if (hidden_cursor) 1199 if (hidden_cursor)
931 { 1200 {
932 hidden_cursor = 0; 1201 hidden_cursor = 0;
933 want_refresh = 1; 1202 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1206 }
938#endif 1207#endif
939 1208
940#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1211 {
943 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1215 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1219 pointer_blank ();
951 } 1220 }
952#endif 1221#endif
953 1222
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1225 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1010#endif
1011 1226
1012 switch (ev.type) 1227 switch (ev.type)
1013 { 1228 {
1014 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1015 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;
1016 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
1017 1298
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1301 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
1030 } 1304#endif
1031 break; 1305 break;
1032 } 1306 }
1033#endif
1034 1307
1035 case ButtonPress: 1308 case ButtonPress:
1036 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1037 break; 1310 break;
1038 1311
… …
1062 0L, 1000000L, 1335 0L, 1000000L,
1063 False, AnyPropertyType, 1336 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1066 &data); 1339 &data);
1067 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1341 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1344 }
1075#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1076 break; 1346 break;
1077 1347
1078 case MappingNotify: 1348 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1349 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1350 break;
1081 1351
1082 /* 1352 /*
1083 * XXX: this is not the _current_ arrangement 1353 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1354 * Here's my conclusion:
… …
1109 { 1379 {
1110 TermWin.focus = 1; 1380 TermWin.focus = 1;
1111 want_refresh = 1; 1381 want_refresh = 1;
1112#ifdef USE_XIM 1382#ifdef USE_XIM
1113 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1115#endif 1388#endif
1116#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1392#endif
1120#ifdef OFF_FOCUS_FADING 1393#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1394 if (rs[Rs_fade])
1122 { 1395 {
1123 PixColors = PixColorsFocused; 1396 pix_colors = pix_colors_focused;
1124 set_colorfgbg ();
1125 scr_clear (); 1397 scr_recolour ();
1126 scr_touch (true);
1127 } 1398 }
1128#endif 1399#endif
1129 1400
1130 } 1401 }
1131 break; 1402 break;
… …
1133 case FocusOut: 1404 case FocusOut:
1134 if (TermWin.focus) 1405 if (TermWin.focus)
1135 { 1406 {
1136 TermWin.focus = 0; 1407 TermWin.focus = 0;
1137 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
1138#ifdef USE_XIM 1416#ifdef USE_XIM
1139 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1141#endif 1419#endif
1142#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1423 hidden_cursor = 0;
1146#endif 1424#endif
1147#ifdef OFF_FOCUS_FADING 1425#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1426 if (rs[Rs_fade])
1149 { 1427 {
1150 PixColors = PixColorsUnFocused; 1428 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg ();
1152 scr_clear (); 1429 scr_recolour ();
1153 scr_touch (true);
1154 } 1430 }
1155#endif 1431#endif
1156
1157 } 1432 }
1158 break; 1433 break;
1159 1434
1160 case ConfigureNotify: 1435 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1170 } 1445 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1447
1173 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1174 { 1449 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1450 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1177 } 1452 }
1178#ifdef DEBUG_SIZE 1453
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1186 {
1187 check_our_parents (); 1456 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif 1457#endif
1192 } 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
1193 break; 1466 break;
1194 1467
1195 case SelectionClear: 1468 case SelectionClear:
1196 selection_clear (); 1469 selection_clear ();
1197 break; 1470 break;
1198 1471
1199 case SelectionNotify: 1472 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1475 break;
1204 1476
1205 case SelectionRequest: 1477 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1207 break; 1479 break;
… …
1228 1500
1229 case GraphicsExpose: 1501 case GraphicsExpose:
1230 case Expose: 1502 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == TermWin.vt)
1232 { 1504 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1505 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1506 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1507 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1509
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1515
1241 // ev.xexpose.width, TermWin.height, False); 1516 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1517 }
1245 else 1518 else
1246 { 1519 {
1247 XEvent unused_event; 1520 XEvent unused_event;
1248 1521
… …
1258 } 1531 }
1259#ifdef MENUBAR 1532#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1534 menubar_expose ();
1262#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
1263 } 1541 }
1264 break; 1542 break;
1265 1543
1266 case MotionNotify: 1544 case MotionNotify:
1267#ifdef POINTER_BLANK 1545#ifdef POINTER_BLANK
… …
1273 { 1551 {
1274 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1275 break; 1553 break;
1276 } 1554 }
1277#endif 1555#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1557 break;
1280 1558
1281 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1282 { 1560 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1562 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1564 ;
1287 1565
1288 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1570 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1574 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1300#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1590 {
1304 int dist; 1591 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1598
1312 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1314 */ 1601 */
1315 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1605
1320 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1608 {
1323 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1611 }
1326 else 1612 else
1327 { 1613 {
1328 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1616 }
1617
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1334 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1336 } 1623 }
1337 else 1624 else
1338 { 1625 {
1339 /* we are within the text window, so we 1626 /* we are within the text window, so we
1340 * shouldn't be scrolling 1627 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1629 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1344 } 1631 }
1345#endif 1632#endif
1346#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1347
1348 } 1634 }
1349#endif 1635#endif
1350
1351 } 1636 }
1352 } 1637 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1639 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1357 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1648 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1650 scrollbar_size ());
1364 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1367 } 1654 }
1368 break; 1655 break;
1369 } 1656 }
1370} 1657}
1371 1658
1659#if TRANSPARENT
1372void 1660void
1373rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1662{
1375 SET_R (this); 1663 SET_R (this);
1376 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1377 1665
1378 switch (ev.type) 1666 switch (ev.type)
1379 { 1667 {
1380 case PropertyNotify: 1668 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1669 /*
1391 * 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,
1392 * 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.
1393 */ 1672 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1398 return; 1675 return;
1399 }
1400 1676
1401 /* FALLTHROUGH */ 1677 /* FALLTHROUGH */
1402 case ReparentNotify: 1678 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1680 want_refresh = want_full_refresh = 1;
1405 break; 1681 break;
1406#endif
1407 } 1682 }
1408} 1683}
1684#endif
1409 1685
1410void 1686void
1411rxvt_term::button_press (XButtonEvent &ev) 1687rxvt_term::button_press (XButtonEvent &ev)
1412{ 1688{
1413 int reportmode = 0, clickintime; 1689 int reportmode = 0, clickintime;
1414 1690
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1691 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1692 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1693 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694
1418 /* 1695 /*
1419 * VT window processing of button press 1696 * VT window processing of button press
1420 */ 1697 */
1421 if (ev.window == TermWin.vt) 1698 if (ev.window == TermWin.vt)
1422 { 1699 {
1700#if ISO_14755
1701 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 {
1704 iso14755_54 (ev.x, ev.y);
1705 return;
1706 }
1707#endif
1708
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1709 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1710
1424 if (reportmode) 1711 if (reportmode)
1425 { 1712 {
1426 /* mouse report from vt window */ 1713 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1714 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1715 MEvent.state = ev.state;
… …
1457 } 1744 }
1458 else 1745 else
1459 { 1746 {
1460 if (ev.button != MEvent.button) 1747 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1748 MEvent.clicks = 0;
1749
1462 switch (ev.button) 1750 switch (ev.button)
1463 { 1751 {
1464 case Button1: 1752 case Button1:
1753 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */
1755#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask);
1757#else
1758 selection.rect = false;
1759#endif
1760
1465 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1763 {
1468 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1470 else 1766 else
1471 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1782 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1489 else 1785 else
1490 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1491 MEvent.button = Button3; 1788 MEvent.button = Button3;
1492 break; 1789 break;
1493 } 1790 }
1494 } 1791 }
1792
1495 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1496 return; 1794 return;
1497 } 1795 }
1498 1796
1499 /* 1797 /*
… …
1591 break; 1889 break;
1592 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1892 break;
1595 } 1893 }
1894
1596 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1899
1601 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1602 break; 1901 break;
1603 1902
1604 case Button1: 1903 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1929 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1931 / scrollbar_size ()));
1633 } 1932 }
1933
1634 break; 1934 break;
1635 } 1935 }
1636 } 1936 }
1637 return; 1937 return;
1638 } 1938 }
… …
1650{ 1950{
1651 int reportmode = 0; 1951 int reportmode = 0;
1652 1952
1653 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1954 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1956
1657 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1658 { 1958 {
1659 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1660 scrollbar_show (0); 1960 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1963#endif
1664
1665 } 1964 }
1965
1666#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1967 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1968 sel_scroll_ev.stop();
1669#endif 1969#endif
1970
1670 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1671 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1672 if (reportmode) 1978 if (reportmode)
1673 { 1979 {
1674 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1691 mouse_report (ev); 1997 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 1999 return;
1694 } 2000 }
2001
1695 /* 2002 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2004 * when overriding mouse reporting
1698 */ 2005 */
1699 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2007 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1703 2010
1704 switch (ev.button) 2011 switch (ev.button)
… …
1719 2026
1720 v = ev.button == Button4 ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
1721 2028
1722 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1723 i = 1; 2030 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2031 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1726 else 2033 else
1727 i = 5; 2034 i = 5;
1728 2035
1729# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2074#endif
1768} 2075}
1769 2076
1770#ifdef TRANSPARENT 2077#ifdef TRANSPARENT
1771#if TINTING 2078#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2079/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2080
1775static void 2081typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2082
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2084{
1783 /* No saturation */ 2085 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2086 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i;
1787 2091
1788 b = ((uint16_t *) ptr)[x]; 2092 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2093
1790 g = (b & 0x3e0) * gm; 2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2095
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2096 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2097 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2098 mask_g = visual->green_mask;
1795 } 2099 mask_b = visual->blue_mask;
1796 ptr += bpl; 2100
1797 } 2101 /* boring lookup table pre-initialization */
2102 switch (srcImage->bits_per_pixel) {
2103 case 15:
2104 if ((mask_r != 0x7c00) ||
2105 (mask_g != 0x03e0) ||
2106 (mask_b != 0x001f))
2107 return;
2108 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2109 lookup_r = lookup;
2110 lookup_g = lookup+32;
2111 lookup_b = lookup+32+32;
2112 sh_r = 10;
2113 sh_g = 5;
2114 sh_b = 0;
2115 break;
2116 case 16:
2117 if ((mask_r != 0xf800) ||
2118 (mask_g != 0x07e0) ||
2119 (mask_b != 0x001f))
2120 return;
2121 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2122 lookup_r = lookup;
2123 lookup_g = lookup+32;
2124 lookup_b = lookup+32+64;
2125 sh_r = 11;
2126 sh_g = 5;
2127 sh_b = 0;
2128 break;
2129 case 24:
2130 if ((mask_r != 0xff0000) ||
2131 (mask_g != 0x00ff00) ||
2132 (mask_b != 0x0000ff))
2133 return;
2134 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2135 lookup_r = lookup;
2136 lookup_g = lookup+256;
2137 lookup_b = lookup+256+256;
2138 sh_r = 16;
2139 sh_g = 8;
2140 sh_b = 0;
2141 break;
2142 case 32:
2143 if ((mask_r != 0xff0000) ||
2144 (mask_g != 0x00ff00) ||
2145 (mask_b != 0x0000ff))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2148 lookup_r = lookup;
2149 lookup_g = lookup+256;
2150 lookup_b = lookup+256+256;
2151 sh_r = 16;
2152 sh_g = 8;
2153 sh_b = 0;
2154 break;
2155 default:
2156 return; /* we do not support this color depth */
2157 }
2158
2159 /* prepare limits for color transformation (each channel is handled separately) */
2160 if (shade < 0) {
2161 shade = -shade;
2162 if (shade < 0) shade = 0;
2163 if (shade > 100) shade = 100;
2164
2165 lower_lim_r = 65535-rm;
2166 lower_lim_g = 65535-gm;
2167 lower_lim_b = 65535-bm;
2168
2169 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2170 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2171 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2172
2173 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2174 } else {
1799 for (y = h; --y >= 0;) { 2175 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2176 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2177
1803 b = ((uint16_t *) ptr)[x]; 2178 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2179
1805 g = (b & 0x3e0) * gm; 2180 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2181 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2182 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2183 }
1809 b |= (!(b >> 5) - 1); 2184
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2185 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2186 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2187 {
1813 } 2188 unsigned int tmp;
1814 ptr += bpl; 2189
2190 tmp = lower_lim_r;
2191 lower_lim_r = lower_lim_b;
2192 lower_lim_b = tmp;
2193
2194 tmp = upper_lim_r;
2195 upper_lim_r = upper_lim_b;
2196 upper_lim_b = tmp;
2197 }
2198
2199 /* fill our lookup tables */
2200 for (i = 0; i <= mask_r>>sh_r; i++)
2201 {
2202 RUINT32T tmp;
2203 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2204 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2205 lookup_r[i] = (tmp/65535)<<sh_r;
2206 }
2207 for (i = 0; i <= mask_g>>sh_g; i++)
2208 {
2209 RUINT32T tmp;
2210 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2211 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2212 lookup_g[i] = (tmp/65535)<<sh_g;
2213 }
2214 for (i = 0; i <= mask_b>>sh_b; i++)
2215 {
2216 RUINT32T tmp;
2217 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2218 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2219 lookup_b[i] = (tmp/65535)<<sh_b;
2220 }
2221
2222 /* apply table to input image (replacing colors by newly calculated ones) */
2223 switch (srcImage->bits_per_pixel)
2224 {
2225 case 15:
2226 {
2227 unsigned short *p1, *pf, *p, *pl;
2228 p1 = (unsigned short *) srcImage->data;
2229 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2230 while (p1 < pf)
2231 {
2232 p = p1;
2233 pl = p1 + srcImage->width;
2234 for (; p < pl; p++)
1815 } 2235 {
2236 *p = lookup_r[(*p & 0x7c00)>>10] |
2237 lookup_g[(*p & 0x03e0)>> 5] |
2238 lookup_b[(*p & 0x001f)];
2239 }
2240 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2241 }
1817} 2242 break;
1818 2243 }
1819/* RGB 16 */ 2244 case 16:
1820static void 2245 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2246 unsigned short *p1, *pf, *p, *pl;
1822{ 2247 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2248 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2249 while (p1 < pf)
1825 2250 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2251 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2252 pl = p1 + srcImage->width;
1828 /* No saturation */ 2253 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2254 {
1843 } else { 2255 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2256 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2257 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2258 }
1859 ptr += bpl; 2259 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2260 }
2261 break;
2262 }
2263 case 24:
2264 {
2265 unsigned char *p1, *pf, *p, *pl;
2266 p1 = (unsigned char *) srcImage->data;
2267 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2268 while (p1 < pf)
2269 {
2270 p = p1;
2271 pl = p1 + srcImage->width * 3;
2272 for (; p < pl; p += 3)
1860 } 2273 {
2274 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2275 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2276 p[2] = lookup_r[(p[2] & 0x0000ff)];
2277 }
2278 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2279 }
1862} 2280 break;
2281 }
2282 case 32:
2283 {
2284 RUINT32T *p1, *pf, *p, *pl;
2285 p1 = (RUINT32T *) srcImage->data;
2286 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2287
1864/* RGB 24 */ 2288 while (p1 < pf)
1865static void 2289 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2290 p = p1;
1867{ 2291 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2292 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2293 {
1896 } else { 2294 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2296 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2297 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2298 }
1927 ptr += bpl; 2299 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2300 }
2301 break;
2302 }
1929 } 2303 }
1930}
1931 2304
1932/* RGB 32 */ 2305 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2306}
2003
2004#endif 2307#endif
2005 2308
2006/* 2309/*
2007 * Check our parents are still who we think they are. 2310 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2311 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
2020 2323
2021 pchanged = 0; 2324 pchanged = 0;
2022 2325
2023 if (!(Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
2025 2328
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
2028 2331
… …
2031 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
2032 { 2335 {
2033 if (am_transparent) 2336 if (am_transparent)
2034 { 2337 {
2035 pchanged = 1; 2338 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
2038 } 2341 }
2039 2342
2040 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2041 } 2344 }
… …
2046 /* 2349 /*
2047 * Make the frame window set by the window manager have 2350 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2351 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2352 * windows for each client, so we have to take care about that.
2050 */ 2353 */
2051 i = (xa[XA_XROOTPMAPID] 2354 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2357 &nitems, &bytes_after, &prop) == Success);
2055 2358
2056 if (!i || prop == NULL) 2359 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2360 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2363 &nitems, &bytes_after, &prop) == Success);
2061 2364
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2365 if (!i || prop == NULL
2366#if TINTING
2367 || !rs[Rs_color + Color_tint]
2368#endif
2369 )
2063 have_pixmap = 0; 2370 have_pixmap = 0;
2064 else 2371 else
2065 { 2372 {
2066 have_pixmap = 1; 2373 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2374 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2385 Window cr;
2079 XImage *image; 2386 XImage *image;
2080 GC gc; 2387 GC gc;
2081 XGCValues gcvalue; 2388 XGCValues gcvalue;
2082 2389
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2391 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2392 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2393 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2394 nx = ny = 0;
2088 2395
… …
2100 sy = 0; 2407 sy = 0;
2101 } 2408 }
2102 2409
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412
2413 XSync (display->display, False);
2105 allowedxerror = -1; 2414 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2416
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2418 /* XXX: may need a delay here? */
… …
2130 2439
2131#if TINTING 2440#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2441 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2442 {
2134 unsigned short rm, gm, bm; 2443 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2444 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2445
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2446 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2447
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2448 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2449 }
2151#endif 2450#endif
2152 2451
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2453 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2456 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2457 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2458 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]);
2161 2461
2162 if (!am_transparent || !am_pixmap_trans) 2462 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2463 pchanged = 1;
2164 2464
2165 am_transparent = am_pixmap_trans = 1; 2465 am_transparent = am_pixmap_trans = 1;
2166 } 2466 }
2167 } 2467 }
2168 2468
2169 if (!am_pixmap_trans) 2469 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2471 else
2170 { 2472 {
2171 unsigned int n; 2473 unsigned int n;
2172 /* 2474 /*
2173 * InheritPixmap transparency 2475 * InheritPixmap transparency
2174 */ 2476 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2478 {
2178 oldp = TermWin.parent[i]; 2479 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2480 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2481 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2482 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2483
2184 if (TermWin.parent[i] == display->root) 2484 if (TermWin.parent[i] == display->root)
2185 { 2485 {
2186 if (oldp != None) 2486 if (oldp != None)
2187 pchanged = 1; 2487 pchanged = 1;
… …
2198 if (pchanged) 2498 if (pchanged)
2199 { 2499 {
2200 for (; n < (unsigned int)i; n++) 2500 for (; n < (unsigned int)i; n++)
2201 { 2501 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2504 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2506 break;
2208 } 2507 }
2209 } 2508 }
2210 } 2509 }
2211 2510
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2512 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2515 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2516 /* XXX: also turn off Opt_transparent? */
2219 } 2517 }
2220 else 2518 else
2221 { 2519 {
2222#if WAIT_FOR_WM 2520#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2521 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2522 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2523 sleep (1);
2226#endif 2524#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2525 for (n = 0; n < (unsigned int)i; n++)
2526 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]);
2529 }
2230 2530
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2532 am_transparent = 1;
2233 } 2533 }
2234 2534
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2536 TermWin.parent[i] = None;
2537 }
2538
2539 if (scrollBar.win)
2540 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle ();
2543 scrollbar_show (0);
2544 }
2545
2546 if (am_transparent)
2547 {
2548 want_refresh = want_full_refresh = 1;
2549 if (am_pixmap_trans)
2550 flush ();
2237 } 2551 }
2238 2552
2239 return pchanged; 2553 return pchanged;
2240} 2554}
2241#endif 2555#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2574 if (ch == NOCHAR) // TODO: improve
2261 break; 2575 break;
2262 2576
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2577 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2578 {
2579 if (!seen_input)
2580 {
2581 seen_input = 1;
2582 // many badly-written programs (e.g. jed) contain a race condition:
2583 // they first read the screensize and then install a SIGWINCH handler.
2584 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized.
2589 if (seen_resize)
2590 kill (-cmd_pid, SIGWINCH);
2591 }
2592
2265 /* Read a text string from the input buffer */ 2593 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2594 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2595 bool refreshnow = false;
2268 int nlines = 0; 2596 int nlines = 0;
2269 unicode_t *str = buf; 2597 unicode_t *str = buf;
2270 2598
2271 *str++ = ch;
2272
2273 for (;;) 2599 for (;;)
2274 { 2600 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2602 break;
2280 2603
2281 *str++ = ch; 2604 *str++ = ch;
2282 2605
2283 if (ch == C0_LF) 2606 if (ch == C0_LF)
2284 { 2607 {
2285 nlines++; 2608 nlines++;
2286 refresh_count++; 2609 refresh_count++;
2287 2610
2288 if (! (Options & Opt_jumpScroll) 2611 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2613 {
2291 refreshnow = true; 2614 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2615 ch = NOCHAR;
2294 break; 2616 break;
2295 } 2617 }
2296 2618
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2620 if (nlines >= TermWin.nrow - 1)
2299 { 2621 {
2300 scr_add_lines (buf, nlines, str - buf); 2622 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2623 nlines = 0;
2302 str = buf; 2624 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2628 if (str >= buf + UBUFSIZ)
2307 { 2629 {
2308 ch = NOCHAR; 2630 ch = NOCHAR;
2309 break; 2631 break;
2310 } 2632 }
2633
2634 seq_begin = cmdbuf_ptr;
2635 ch = next_char ();
2311 } 2636 }
2312 2637
2313 scr_add_lines (buf, nlines, str - buf); 2638 scr_add_lines (buf, nlines, str - buf);
2314 2639
2315 /* 2640 /*
2316 * If there have been a lot of new lines, then update the screen 2641 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2642 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2643 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2644 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2645 */
2324 if (refreshnow) 2646 if (refreshnow)
2325 { 2647 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2648 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2649 refresh_limit++;
2328 else 2650 else
2651 {
2652 flag = true;
2329 scr_refresh (refresh_type); 2653 scr_refresh (refresh_type);
2654 }
2330 } 2655 }
2331 2656
2332 } 2657 }
2333 else 2658 else
2334 { 2659 {
… …
2518 process_escape_seq (); 2843 process_escape_seq ();
2519 break; 2844 break;
2520 case C0_ENQ: /* terminal Status */ 2845 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2846 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2847 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2848 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2849 else
2525 tt_write ((unsigned char *)VT100_ANS, 2850 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2851 (unsigned int)strlen (VT100_ANS));
2527 break; 2852 break;
2528 case C0_BEL: /* bell */ 2853 case C0_BEL: /* bell */
2529 scr_bell (); 2854 scr_bell ();
2530 break; 2855 break;
2531 case C0_BS: /* backspace */ 2856 case C0_BS: /* backspace */
… …
2630void 2955void
2631rxvt_term::process_escape_seq () 2956rxvt_term::process_escape_seq ()
2632{ 2957{
2633 unicode_t ch = cmd_getc (); 2958 unicode_t ch = cmd_getc ();
2634 2959
2635 if (PrivateModes & PrivMode_vt52) 2960 if (priv_modes & PrivMode_vt52)
2636 { 2961 {
2637 process_escape_vt52 (ch); 2962 process_escape_vt52 (ch);
2638 return; 2963 return;
2639 } 2964 }
2640 2965
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2980 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2981 break;
2657 case '+': 2982 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2983 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2984 break;
2660#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2661 case '6': 2986 case '6':
2662 scr_backindex (); 2987 scr_backindex ();
2663 break; 2988 break;
2664#endif 2989#endif
2665 case '7': 2990 case '7':
2666 scr_cursor (SAVE); 2991 scr_cursor (SAVE);
2667 break; 2992 break;
2668 case '8': 2993 case '8':
2669 scr_cursor (RESTORE); 2994 scr_cursor (RESTORE);
2670 break; 2995 break;
2671#ifndef NO_FRILLS 2996#if ENABLE_FRILLS
2672 case '9': 2997 case '9':
2673 scr_forwardindex (); 2998 scr_forwardindex ();
2674 break; 2999 break;
2675#endif 3000#endif
2676 case '=': 3001 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3300 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3301 break;
2977 3302
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3303 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3304 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3305 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3306 break;
2982 3307
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3308 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3309 process_sgr_mode (nargs, arg);
2985 break; 3310 break;
… …
2992 break; 3317 break;
2993 case 6: /* CPR requested */ 3318 case 6: /* CPR requested */
2994 scr_report_position (); 3319 scr_report_position ();
2995 break; 3320 break;
2996 case 7: /* unofficial extension */ 3321 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3322 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3323 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3324 break;
3000 case 8: /* unofficial extension */ 3325 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3326 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3327 break;
3003 } 3328 }
… …
3039 break; 3364 break;
3040 3365
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3366 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3367 if (arg[0] == 4)
3043 scr_insert_mode (0); 3368 scr_insert_mode (0);
3369 else if (arg[0] == 20)
3370 priv_modes &= ~PrivMode_LFNL;
3044 break; 3371 break;
3045 3372
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3373 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3374 if (arg[0] == 4)
3048 scr_insert_mode (1); 3375 scr_insert_mode (1);
3376 else if (arg[0] == 20)
3377 priv_modes |= PrivMode_LFNL;
3049 break; 3378 break;
3050 3379
3051 /* 3380 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3381 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3382 */
… …
3065 break; 3394 break;
3066 case CSI_75: 3395 case CSI_75:
3067 scr_cursor (RESTORE); 3396 scr_cursor (RESTORE);
3068 break; 3397 break;
3069 3398
3070#ifndef NO_FRILLS 3399#if ENABLE_FRILLS
3071 case CSI_74: 3400 case CSI_74:
3072 process_window_ops (arg, nargs); 3401 process_window_ops (arg, nargs);
3073 break; 3402 break;
3074#endif 3403#endif
3075 3404
… …
3082 break; 3411 break;
3083 } 3412 }
3084} 3413}
3085/*}}} */ 3414/*}}} */
3086 3415
3087#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
3088/* ARGSUSED */ 3417/* ARGSUSED */
3089void 3418void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3419rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3420{
3092 int x, y; 3421 int x, y;
… …
3159 break; 3488 break;
3160 case 19: /* report window size (chars) */ 3489 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3491 break;
3163 case 20: /* report icon label */ 3492 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3493 {
3166 char *s; 3494 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3495 XGetIconName (display->display, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s);
3169 } 3498 }
3170 break; 3499 break;
3171 case 21: /* report window title */ 3500 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3501 {
3174 char *s; 3502 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3503 XFetchName (display->display, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s);
3177 } 3506 }
3178 break; 3507 break;
3179 } 3508 }
3180} 3509}
3181#endif 3510#endif
3182 3511
… …
3186 * ends_how is terminator used. returned input must be free()'d 3515 * ends_how is terminator used. returned input must be free()'d
3187 */ 3516 */
3188unsigned char * 3517unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3518rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3519{
3191 unicode_t prev = 0, ch; 3520 unicode_t ch;
3521 bool seen_esc = false;
3192 unsigned int n = 0; 3522 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3523 wchar_t string[STRING_MAX];
3195 3524
3196 while ((ch = cmd_getc ()) != NOCHAR) 3525 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3526 {
3198 if (prev == C0_ESC) 3527 if (seen_esc)
3199 { 3528 {
3200 if (ch == 0x5c) /* 7bit ST */ 3529 if (ch == 0x5c) /* 7bit ST */
3201 break; 3530 break;
3202 else 3531 else
3203 return NULL; 3532 return NULL;
3204 } 3533 }
3534 else if (ch == C0_ESC)
3535 {
3536 seen_esc = true;
3537 continue;
3538 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3539 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3540 break;
3207 else if (ch < 0x20) 3541 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3542 return NULL; /* other control character - exit */
3543
3544 seen_esc = false;
3209 3545
3210 if (n >= sizeof (string) - 1) 3546 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3547 // stop at some sane length
3212 return NULL; 3548 return NULL;
3213 3549
3214 if (ch == C0_SYN) 3550 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3551 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3552 else
3220 string[n++] = prev = ch; 3553 string[n++] = ch;
3221 } 3554 }
3222 3555
3223 string[n++] = '\0'; 3556 string[n++] = '\0';
3224 3557
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3558 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3559
3230 return s; 3560 return (unsigned char *)rxvt_wcstombs (string);
3231} 3561}
3232 3562
3233/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
3234/* 3564/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3609void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3611{
3282 if (str[0] == '?' && !str[1]) 3612 if (str[0] == '?' && !str[1])
3283 { 3613 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3614 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3615 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3617 }
3291 else 3618 else
3292 set_window_color (color, str); 3619 set_window_color (color, str);
3293} 3620}
3294 3621
… …
3322{ 3649{
3323 int changed = 0; 3650 int changed = 0;
3324 int color; 3651 int color;
3325 char *buf, *name; 3652 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3653 bool query = str[0] == '?' && !str[1];
3654 int saveop = op;
3327 3655
3328 assert (str != NULL); 3656 assert (str != NULL);
3329 switch (op) 3657 switch (op)
3330 { 3658 {
3331 case XTerm_name: 3659 case XTerm_name:
… …
3338 set_title (str); 3666 set_title (str);
3339 break; 3667 break;
3340 case XTerm_property: 3668 case XTerm_property:
3341 if (str[0] == '?') 3669 if (str[0] == '?')
3342 { 3670 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3671 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3672 Atom actual_type;
3345 int actual_format; 3673 int actual_format;
3346 unsigned long nitems; 3674 unsigned long nitems;
3347 unsigned long bytes_after; 3675 unsigned long bytes_after;
3348 unsigned char *value = 0; 3676 unsigned char *value = 0;
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3695
3368 if (eq) 3696 if (eq)
3369 { 3697 {
3370 *eq = 0; 3698 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3699 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3700 }
3376 else 3701 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3702 XDeleteProperty (display->display, TermWin.parent[0],
3378 display->atom (str)); 3703 display->atom (str));
3379 } 3704 }
3380 break; 3705 break;
3381 3706
3382 case XTerm_Color: 3707 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3708 for (buf = (char *)str; buf && *buf;)
3384 { 3709 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3710 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3711 break;
3387 3712
3388 *name++ = '\0'; 3713 *name++ = '\0';
3389 color = atoi (buf); 3714 color = atoi (buf);
3390 3715
3391 if (color < 0 || color >= TOTAL_COLORS) 3716 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3717 break;
3393 3718
3394 if ((buf = STRCHR (name, ';')) != NULL) 3719 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3720 *buf++ = '\0';
3396 3721
3397 if (name[0] == '?' && !name[1]) 3722 if (name[0] == '?' && !name[1])
3398 { 3723 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3724 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3725 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3726 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3727 }
3406 else 3728 else
3407 set_window_color (color + minCOLOR, name); 3729 set_window_color (color + minCOLOR, name);
3408 } 3730 }
3409 break; 3731 break;
… …
3426 break; 3748 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3749#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3750 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3752 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3431 case XTerm_Color_UL: 3756 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3758 break;
3434 case XTerm_Color_RV: 3759 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 break;
3762#endif
3763#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3766 check_our_parents ();
3767 if (am_transparent)
3768 want_full_refresh = want_refresh = 1;
3436 break; 3769 break;
3437#endif 3770#endif
3438 3771
3439 case XTerm_Pixmap: 3772 case XTerm_Pixmap:
3440 if (*str != ';') 3773 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3776 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3777 set_bgPixmap (str); /* change pixmap */
3445#endif 3778#endif
3446 scr_touch (true); 3779 scr_touch (true);
3447 } 3780 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3781 while ((str = strchr (str, ';')) != NULL)
3449 { 3782 {
3450 str++; 3783 str++;
3451#if XPM_BACKGROUND 3784#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3785 changed += scale_pixmap (str);
3453#endif 3786#endif
… …
3472 case XTerm_logfile: 3805 case XTerm_logfile:
3473 // TODO, when secure mode? 3806 // TODO, when secure mode?
3474 break; 3807 break;
3475 3808
3476 case XTerm_font: 3809 case XTerm_font:
3810 op = URxvt_font;
3811 case URxvt_font:
3812#if ENABLE_STYLES
3813 case URxvt_boldFont:
3814 case URxvt_italicFont:
3815 case URxvt_boldItalicFont:
3816#endif
3477 if (query) 3817 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3821 resp);
3822 else
3478 { 3823 {
3479 if (Options & Opt_insecure) 3824 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3825
3481 TermWin.fontset->fontdesc 3826 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3827 allocated.push_back ((void *)res);
3483 : "", 3828 set_fonts ();
3484 resp);
3485 } 3829 }
3486 else
3487 change_font (str);
3488 break; 3830 break;
3489 3831
3490#ifndef NO_FRILLS 3832#if ENABLE_FRILLS
3491 case XTerm_locale: 3833 case XTerm_locale:
3492 if (query) 3834 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3836 else
3498 { 3837 {
3499 set_locale (str); 3838 set_locale (str);
3500# ifdef USE_XIM 3839# ifdef USE_XIM
3501 im_cb (); 3840 im_cb ();
3502# endif 3841# endif
3503 } 3842 }
3504 break; 3843 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif 3844#endif
3515 3845
3516#ifdef MENUBAR 3846#ifdef MENUBAR
3517 case XTerm_Menu: 3847 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3848 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3850 break;
3521#endif 3851#endif
3522#if 0 3852#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3853 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3880{
3551 int state; 3881 int state;
3552 3882
3553 if (mode == 's') 3883 if (mode == 's')
3554 { 3884 {
3555 SavedModes |= (PrivateModes & bit); 3885 SavedModes |= (priv_modes & bit);
3556 return -1; 3886 return -1;
3557 } 3887 }
3558 else 3888 else
3559 { 3889 {
3560 if (mode == 'r') 3890 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3891 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3892 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3893 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3894 PrivMode (state, bit);
3565 } 3895 }
3566 3896
3567 return state; 3897 return state;
3568} 3898}
… …
3586 { 3, PrivMode_132 }, 3916 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3917 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3918 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3919 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3920 { 7, PrivMode_Autowrap },
3921 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3922 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3923#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3924 { menuBar_esc, PrivMode_menuBar },
3594#endif 3925#endif
3926 // 18, 19 printing-related
3927 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3928#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3929 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3930#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3931 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3932 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3933 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3934 // 45 margin bell NYI
3605 // 46 start logging 3935 // 46 start logging
… …
3646 3976
3647 /* extra handling for values with state unkept */ 3977 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3978 switch (arg[i])
3649 { 3979 {
3650 case 1048: /* alternative cursor save */ 3980 case 1048: /* alternative cursor save */
3981 case 1049:
3651 if (Options & Opt_secondaryScreen) 3982 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3983 if (mode == 0)
3653 scr_cursor (RESTORE); 3984 scr_cursor (RESTORE);
3654 else if (mode == 1) 3985 else if (mode == 1)
3655 scr_cursor (SAVE); 3986 scr_cursor (SAVE);
3656 break; 3987 break;
… …
3667 * within VT52 mode 3998 * within VT52 mode
3668 */ 3999 */
3669 PrivMode (1, PrivMode_vt52); 4000 PrivMode (1, PrivMode_vt52);
3670 break; 4001 break;
3671 case 3: /* 80/132 */ 4002 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4003 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4005 break;
3675 case 4: /* smooth scrolling */ 4006 case 4: /* smooth scrolling */
3676 if (state) 4007 if (state)
3677 Options &= ~Opt_jumpScroll; 4008 options &= ~Opt_jumpScroll;
3678 else 4009 else
3679 Options |= Opt_jumpScroll; 4010 options |= Opt_jumpScroll;
3680 break; 4011 break;
3681 case 5: /* reverse video */ 4012 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4013 scr_rvideo_mode (state);
3683 break; 4014 break;
3684 case 6: /* relative/absolute origins */ 4015 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4019 scr_autowrap (state);
3689 break; 4020 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4021 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4022 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4023 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4024 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4025 break;
3695#ifdef menuBar_esc 4026#ifdef menuBar_esc
3696 case menuBar_esc: 4027 case menuBar_esc:
3697#ifdef MENUBAR 4028#ifdef MENUBAR
3698 map_menuBar (state); 4029 map_menuBar (state);
… …
3718 break; 4049 break;
3719 /* case 66: - application key pad */ 4050 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4051 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4052 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4053 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4054 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4055 break;
3725#if 0 4056#if 0
3726 case 1001: 4057 case 1001:
3727 break; /* X11 mouse highlighting */ 4058 break; /* X11 mouse highlighting */
3728#endif 4059#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4060 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4061 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4062 options &= ~Opt_scrollTtyOutput;
3732 else 4063 else
3733 Options |= Opt_scrollTtyOutput; 4064 options |= Opt_scrollTtyOutput;
3734 break; 4065 break;
3735 case 1011: /* scroll to bottom on key press */ 4066 case 1011: /* scroll to bottom on key press */
3736 if (state) 4067 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4068 options |= Opt_scrollTtyKeypress;
3738 else 4069 else
3739 Options &= ~Opt_scrollTtyKeypress; 4070 options &= ~Opt_scrollTtyKeypress;
3740 break; 4071 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4072 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4073 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4074 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4075 scr_erase_screen (2);
3745 scr_change_screen (state); 4076 scr_change_screen (state);
3746 break; 4077 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4078 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4079 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4080 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4081 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4082 scr_erase_screen (2);
3752 break; 4083 break;
3753 default: 4084 default:
3754 break; 4085 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4111 rendset = 0, rendstyle = ~RS_None;
3781 break; 4112 break;
3782 case 1: 4113 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4114 rendset = 1, rendstyle = RS_Bold;
3784 break; 4115 break;
3785 //case 2: // faint or second colour 4116 //case 2: // low intensity
4117 case 3:
4118 rendset = 1, rendstyle = RS_Italic;
4119 break;
3786 case 4: 4120 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4121 rendset = 1, rendstyle = RS_Uline;
3788 break; 4122 break;
3789 case 5: // slowly blinking 4123 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4124 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4136 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4137 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4138 //...
3805 //case 19: // ninth alt font 4139 //case 19: // ninth alt font
3806 //case 20: // gothic 4140 //case 20: // gothic
3807 case 21: // disable bold, faint 4141 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4142 rendset = 0, rendstyle = RS_Bold;
3809 break; 4143 break;
3810 case 22: 4144 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4145 rendset = 0, rendstyle = RS_Bold;
3812 break; 4146 break;
3813 //case 23: disable italic 4147 case 23: // disable italic
4148 rendset = 0, rendstyle = RS_Italic;
4149 break;
3814 case 24: 4150 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4151 rendset = 0, rendstyle = RS_Uline;
3816 break; 4152 break;
3817 case 25: 4153 case 25:
4154 rendset = 0, rendstyle = RS_Blink;
4155 break;
4156 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4157 rendset = 0, rendstyle = RS_Blink;
3819 break; 4158 break;
3820 case 27: 4159 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4160 rendset = 0, rendstyle = RS_RVid;
3822 break; 4161 break;
… …
3840 case 35: 4179 case 35:
3841 case 36: 4180 case 36:
3842 case 37: 4181 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4183 break;
3845#ifdef TTY_256COLOR 4184 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4185 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4186 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4187 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4188 i += 2;
3851 } 4189 }
3852 break; 4190 break;
3853#endif
3854 case 39: /* default fg */ 4191 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4192 scr_color (Color_fg, Color_fg);
3856 break; 4193 break;
3857 4194
3858 case 40: 4195 case 40:
… …
3863 case 45: 4200 case 45:
3864 case 46: 4201 case 46:
3865 case 47: 4202 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4204 break;
3868#ifdef TTY_256COLOR 4205 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4206 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4207 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4208 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4209 i += 2;
3874 } 4210 }
3875 break; 4211 break;
3876#endif
3877 case 49: /* default bg */ 4212 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4213 scr_color (Color_bg, Color_bg);
3879 break; 4214 break;
4215
4216 //case 50: // not variable spacing
3880 4217
3881#ifndef NO_BRIGHTCOLOR 4218#ifndef NO_BRIGHTCOLOR
3882 case 90: 4219 case 90:
3883 case 91: /* set bright fg color */ 4220 case 91: /* set bright fg color */
3884 case 92: 4221 case 92:
3885 case 93: 4222 case 93:
3886 case 94: 4223 case 94:
3887 case 95: 4224 case 95:
3888 case 96: 4225 case 96:
3889 case 97: 4226 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4227 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4228 break;
3893 case 100: 4229 case 100:
3894 case 101: /* set bright bg color */ 4230 case 101: /* set bright bg color */
3895 case 102: 4231 case 102:
3896 case 103: 4232 case 103:
3897 case 104: 4233 case 104:
3898 case 105: 4234 case 105:
3899 case 106: 4235 case 106:
3900 case 107: 4236 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4237 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4238 break;
3904#endif 4239#endif
3905 4240
3906 } 4241 }
3907 } 4242 }
… …
3914{ 4249{
3915 unicode_t ch, cmd = cmd_getc (); 4250 unicode_t ch, cmd = cmd_getc ();
3916 4251
3917 if (cmd == 'Q') 4252 if (cmd == 'Q')
3918 { /* query graphics */ 4253 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4254 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4255 return;
3921 } 4256 }
3922 /* swallow other graphics sequences until terminating ':' */ 4257 /* swallow other graphics sequences until terminating ':' */
3923 do 4258 do
3924 ch = cmd_getc (); 4259 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4274 unsigned char buf[256];
3940 4275
3941 va_start (arg_ptr, fmt); 4276 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4277 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4278 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4279 tt_write (buf, strlen (buf));
3945} 4280}
3946 4281
3947/* ---------------------------------------------------------------------- */ 4282/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4283/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4284 * or generated by us in response to a query ESC sequence.
3950 */ 4285 */
4286const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4287
3951void 4288void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4289rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4290{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4291 if (v_buflen == 0)
4292 {
4293 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4294
3956 if (len) 4295 if ((unsigned int)written == len)
4296 return;
4297
4298 data += written;
4299 len -= written;
3957 { 4300 }
4301
4302 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4303
4304 memcpy (v_buffer + v_buflen, data, len);
4305 v_buflen += len;
4306
4307 pty_ev.set (EVENT_READ | EVENT_WRITE);
4308}
4309
4310void rxvt_term::pty_write ()
4311{
4312 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4313
4314 if (written > 0)
4315 {
4316 v_buflen -= written;
4317
3958 if (v_buflen == 0) 4318 if (v_buflen == 0)
3959 { 4319 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4320 free (v_buffer);
3987 v_buffer = 0; 4321 v_buffer = 0;
3988 v_buflen = 0; 4322 v_buflen = 0;
3989 4323
3990 pty_ev.set (EVENT_READ); 4324 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4325 return;
4003 } 4326 }
4327
4328 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4329 }
4330 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331 // original code just ignores this...
4332 destroy ();
4005} 4333}
4006 4334
4007/*----------------------- end-of-file (C source) -----------------------*/ 4335/*----------------------- end-of-file (C source) -----------------------*/
4008 4336

Diff Legend

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