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.183 by root, Tue Dec 21 06:43:00 2004 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <cwchar>
54#include <csignal>
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;
… …
243#endif 488#endif
244 489
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
246 { 491 {
247#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 494 {
250 unsigned int l; 495 unsigned int l;
251 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
252 497
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
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
… …
529 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
530 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
531 break; 787 break;
532#undef FKEY 788#undef FKEY
533 default: 789 default:
534 newlen = 0; 790 if (len == 0
535 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
536 } 795 }
796
537 if (newlen) 797 if (newlen)
538 len = STRLEN (kbuf); 798 len = strlen (kbuf);
539 } 799 }
540 800
541 /* 801 /*
542 * Pass meta for all function keys, if 'meta' option set 802 * Pass meta for all function keys, if 'meta' option set
543 */ 803 */
… …
550 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
551 { 811 {
552 len = 1; 812 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
555 else 827 else
556 { 828 {
557#ifdef META8_OPTION 829#ifdef META8_OPTION
558 /* set 8-bit on */ 830 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 831 if (meta && (meta_char == 0x80))
… …
571 } 843 }
572 844
573 if (len <= 0) 845 if (len <= 0)
574 return; /* not mapped */ 846 return; /* not mapped */
575 847
576 if (Options & Opt_scrollTtyKeypress) 848 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 849 if (TermWin.view_start)
578 { 850 {
579 TermWin.view_start = 0; 851 TermWin.view_start = 0;
580 want_refresh = 1; 852 want_refresh = 1;
581 } 853 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 902 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 904
633 if (n > 0 && s < count) 905 if (n > 0 && s < count)
634 { 906 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 907 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 908 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 909 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 910 cmdbuf_endp -= n;
639 s += n; 911 s += n;
640 } 912 }
… …
655#endif /* MENUBAR_MAX */ 927#endif /* MENUBAR_MAX */
656 928
657void 929void
658rxvt_term::flush () 930rxvt_term::flush ()
659{ 931{
932 flush_ev.stop ();
933
660#ifdef TRANSPARENT 934#ifdef TRANSPARENT
661 if (want_full_refresh) 935 if (want_full_refresh)
662 { 936 {
663 want_full_refresh = 0; 937 want_full_refresh = 0;
664 scr_clear (); 938 scr_clear ();
665 scr_touch (false); 939 scr_touch (false);
666 want_refresh = 1;
667 } 940 }
668#endif 941#endif
669 942
670 if (want_refresh) 943 if (want_refresh)
671 { 944 {
… …
683rxvt_term::check_cb (check_watcher &w) 956rxvt_term::check_cb (check_watcher &w)
684{ 957{
685 SET_R (this); 958 SET_R (this);
686 SET_LOCALE (locale); 959 SET_LOCALE (locale);
687 960
961 display->flush ();
962
963 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01);
965}
966
967void
968rxvt_term::flush_cb (time_watcher &w)
969{
970 SET_R (this);
971 SET_LOCALE (locale);
972
973 refresh_limit = 1;
974 refresh_count = 0;
688 flush (); 975 flush ();
689} 976}
690 977
691#ifdef CURSOR_BLINK 978#ifdef CURSOR_BLINK
692void 979void
… …
768 1055
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1056 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1057 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1058 cmdbuf_endp = cmdbuf_ptr + n;
772 1059
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1061
775 if (n > 0) 1062 if (n > 0)
776 { 1063 {
777 cmdbuf_endp += n; 1064 cmdbuf_endp += n;
778 return true; 1065 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1075{
789 SET_R (this); 1076 SET_R (this);
790 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
791 1078
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1079 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1080 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1081 while (pty_fill ())
797 if (cmd_parse ()) 1082 if (cmd_parse ())
798 break; 1083 break;
1084
1085 if (revents & EVENT_WRITE)
1086 pty_write ();
799} 1087}
800 1088
801void 1089void
802rxvt_term::pointer_unblank () 1090rxvt_term::pointer_unblank ()
803{ 1091{
… …
805 recolour_cursor (); 1093 recolour_cursor ();
806 1094
807#ifdef POINTER_BLANK 1095#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1096 hidden_pointer = 0;
809 1097
810 if (Options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1099 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1100#endif
813} 1101}
814 1102
815#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
816void 1104void
817rxvt_term::pointer_blank () 1105rxvt_term::pointer_blank ()
818{ 1106{
819 if (! (Options & Opt_pointerBlank)) 1107 if (! (options & Opt_pointerBlank))
820 return; 1108 return;
821 1109
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1110 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1111 XFlush (display->display);
824 1112
… …
844 x = ev.x; 1132 x = ev.x;
845 y = ev.y; 1133 y = ev.y;
846 pixel_position (&x, &y); 1134 pixel_position (&x, &y);
847 1135
848 if (MEvent.button == AnyButton) 1136 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1137 button_number = 3;
851 }
852 else 1138 else
853 { 1139 {
854 button_number = MEvent.button - Button1; 1140 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1141 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1142 if (button_number >= 3)
857 button_number += (64 - 3); 1143 button_number += (64 - 3);
858 } 1144 }
859 1145
860 if (PrivateModes & PrivMode_MouseX10) 1146 if (priv_modes & PrivMode_MouseX10)
861 { 1147 {
862 /* 1148 /*
863 * do not report ButtonRelease 1149 * do not report ButtonRelease
864 * no state info allowed 1150 * no state info allowed
865 */ 1151 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1166 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1167 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1168#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1169 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1170#endif
885
886 } 1171 }
887 1172
888#ifdef DEBUG_MOUSEREPORT 1173#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1174 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1175 if (key_state & 16)
891 fputc ('C', stderr); 1176 fputc ('C', stderr);
892 if (key_state & 4) 1177 if (key_state & 4)
893 fputc ('S', stderr); 1178 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1182 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1183 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1184 button_number,
900 x + 1, 1185 x + 1,
901 y + 1); 1186 y + 1);
902#else 1187#endif
1188
903 tt_printf ("\033[M%c%c%c", 1189 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1190 (32 + button_number + key_state),
905 (32 + x + 1), 1191 (32 + x + 1),
906 (32 + y + 1)); 1192 (32 + y + 1));
907#endif
908} 1193}
909 1194
910#ifdef USING_W11LIB 1195#ifdef USING_W11LIB
911void 1196void
912rxvt_W11_process_x_event (XEvent *ev) 1197rxvt_W11_process_x_event (XEvent *ev)
… …
923{ 1208{
924 SET_R (this); 1209 SET_R (this);
925 SET_LOCALE (locale); 1210 SET_LOCALE (locale);
926 1211
927#if defined(CURSOR_BLINK) 1212#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1214 {
930 if (hidden_cursor) 1215 if (hidden_cursor)
931 { 1216 {
932 hidden_cursor = 0; 1217 hidden_cursor = 0;
933 want_refresh = 1; 1218 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1222 }
938#endif 1223#endif
939 1224
940#if defined(POINTER_BLANK) 1225#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1227 {
943 if (ev.type == MotionNotify 1228 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1229 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1230 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1231 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1234 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1235 pointer_blank ();
951 } 1236 }
952#endif 1237#endif
953 1238
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1239 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1240 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1241 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 1242
1012 switch (ev.type) 1243 switch (ev.type)
1013 { 1244 {
1014 case KeyPress: 1245 case KeyPress:
1246#if ISO_14755
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1015 lookup_key (ev.xkey); 1249 lookup_key (ev.xkey);
1250
1251 break;
1252
1253 case KeyRelease:
1254 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1016 break; 1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1017 1314
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1316 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1317 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) 1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1319 mouse_slip_wheel_speed = 0;
1030 } 1320#endif
1031 break; 1321 break;
1032 } 1322 }
1033#endif
1034 1323
1035 case ButtonPress: 1324 case ButtonPress:
1036 button_press (ev.xbutton); 1325 button_press (ev.xbutton);
1037 break; 1326 break;
1038 1327
… …
1062 0L, 1000000L, 1351 0L, 1000000L,
1063 False, AnyPropertyType, 1352 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1353 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1354 &Size, &RemainingBytes,
1066 &data); 1355 &data);
1067 XChangeProperty (display->display, display->root, 1356 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1357 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1358 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1360 }
1075#endif /* OFFIX_DND */ 1361#endif /* OFFIX_DND */
1076 break; 1362 break;
1077 1363
1078 case MappingNotify: 1364 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1365 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1366 break;
1081 1367
1082 /* 1368 /*
1083 * XXX: this is not the _current_ arrangement 1369 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1370 * Here's my conclusion:
… …
1109 { 1395 {
1110 TermWin.focus = 1; 1396 TermWin.focus = 1;
1111 want_refresh = 1; 1397 want_refresh = 1;
1112#ifdef USE_XIM 1398#ifdef USE_XIM
1113 if (Input_Context != NULL) 1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1402 XSetICFocus (Input_Context);
1403 }
1115#endif 1404#endif
1116#ifdef CURSOR_BLINK 1405#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1406 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1408#endif
1120#ifdef OFF_FOCUS_FADING 1409#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1410 if (rs[Rs_fade])
1122 { 1411 {
1123 PixColors = PixColorsFocused; 1412 pix_colors = pix_colors_focused;
1124 set_colorfgbg ();
1125 scr_clear (); 1413 scr_recolour ();
1126 scr_touch (true);
1127 } 1414 }
1128#endif 1415#endif
1129 1416
1130 } 1417 }
1131 break; 1418 break;
… …
1133 case FocusOut: 1420 case FocusOut:
1134 if (TermWin.focus) 1421 if (TermWin.focus)
1135 { 1422 {
1136 TermWin.focus = 0; 1423 TermWin.focus = 0;
1137 want_refresh = 1; 1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1138#ifdef USE_XIM 1432#ifdef USE_XIM
1139 if (Input_Context != NULL) 1433 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1434 XUnsetICFocus (Input_Context);
1141#endif 1435#endif
1142#ifdef CURSOR_BLINK 1436#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1437 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1438 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1439 hidden_cursor = 0;
1146#endif 1440#endif
1147#ifdef OFF_FOCUS_FADING 1441#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1442 if (rs[Rs_fade])
1149 { 1443 {
1150 PixColors = PixColorsUnFocused; 1444 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg ();
1152 scr_clear (); 1445 scr_recolour ();
1153 scr_touch (true);
1154 } 1446 }
1155#endif 1447#endif
1156
1157 } 1448 }
1158 break; 1449 break;
1159 1450
1160 case ConfigureNotify: 1451 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == TermWin.parent[0])
… …
1170 } 1461 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1463
1173 if (szHint.width != width || szHint.height != height) 1464 if (szHint.width != width || szHint.height != height)
1174 { 1465 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1466 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1467 resize_all_windows (width, height, 1);
1177 } 1468 }
1178#ifdef DEBUG_SIZE 1469
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1471 if (options & Opt_transparent)
1186 {
1187 check_our_parents (); 1472 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif 1473#endif
1192 } 1474 }
1475 break;
1476
1477 case PropertyNotify:
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481
1193 break; 1482 break;
1194 1483
1195 case SelectionClear: 1484 case SelectionClear:
1196 selection_clear (); 1485 selection_clear ();
1197 break; 1486 break;
1198 1487
1199 case SelectionNotify: 1488 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1489 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1490 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1491 break;
1204 1492
1205 case SelectionRequest: 1493 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1494 selection_send (ev.xselectionrequest);
1207 break; 1495 break;
… …
1228 1516
1229 case GraphicsExpose: 1517 case GraphicsExpose:
1230 case Expose: 1518 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1519 if (ev.xany.window == TermWin.vt)
1232 { 1520 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1521 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1525
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1531
1241 // ev.xexpose.width, TermWin.height, False); 1532 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1533 }
1245 else 1534 else
1246 { 1535 {
1247 XEvent unused_event; 1536 XEvent unused_event;
1248 1537
… …
1258 } 1547 }
1259#ifdef MENUBAR 1548#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1550 menubar_expose ();
1262#endif 1551#endif
1552
1553#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window);
1556#endif
1263 } 1557 }
1264 break; 1558 break;
1265 1559
1266 case MotionNotify: 1560 case MotionNotify:
1267#ifdef POINTER_BLANK 1561#ifdef POINTER_BLANK
… …
1273 { 1567 {
1274 menubar_control (ev.xbutton); 1568 menubar_control (ev.xbutton);
1275 break; 1569 break;
1276 } 1570 }
1277#endif 1571#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1573 break;
1280 1574
1281 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == TermWin.vt)
1282 { 1576 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1577 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1578 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1580 ;
1287 1581
1288 XQueryPointer (display->display, TermWin.vt, 1582 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1585 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1586 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1588 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1589 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1590 {
1297#endif 1591#endif
1592#if ISO_14755
1593 // 5.4
1594 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 {
1596 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1597 break;
1598 }
1599#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1600 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1601 ev.xbutton.state & Button3Mask ? 2 : 0);
1602
1300#ifdef SELECTION_SCROLLING 1603#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1604 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1606 {
1304 int dist; 1607 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1614
1312 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1314 */ 1617 */
1315 selection_save_x=ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1619 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1621
1320 /* calc number of lines to scroll */ 1622 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1623 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1624 {
1323 scroll_selection_dir = UP; 1625 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1626 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1627 }
1326 else 1628 else
1327 { 1629 {
1328 scroll_selection_dir = DN; 1630 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1632 }
1633
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1634 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1635 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1;
1334 MIN_IT (scroll_selection_lines, 1637 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1638 SELECTION_SCROLL_MAX_LINES);
1336 } 1639 }
1337 else 1640 else
1338 { 1641 {
1339 /* we are within the text window, so we 1642 /* we are within the text window, so we
1340 * shouldn't be scrolling 1643 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1645 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1646 sel_scroll_ev.stop();
1344 } 1647 }
1345#endif 1648#endif
1346#ifdef MOUSE_THRESHOLD 1649#ifdef MOUSE_THRESHOLD
1347
1348 } 1650 }
1349#endif 1651#endif
1350
1351 } 1652 }
1352 } 1653 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1655 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1657 MotionNotify, &ev))
1658 ;
1659
1357 XQueryPointer (display->display, scrollBar.win, 1660 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1661 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1662 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1663 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1664 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1666 scrollbar_size ());
1364 scr_refresh (refresh_type); 1667 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1668 refresh_limit = 0;
… …
1367 } 1670 }
1368 break; 1671 break;
1369 } 1672 }
1370} 1673}
1371 1674
1675#if TRANSPARENT
1372void 1676void
1373rxvt_term::rootwin_cb (XEvent &ev) 1677rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1678{
1375 SET_R (this); 1679 SET_R (this);
1376 SET_LOCALE (locale); 1680 SET_LOCALE (locale);
1377 1681
1378 switch (ev.type) 1682 switch (ev.type)
1379 { 1683 {
1380 case PropertyNotify: 1684 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 /* 1685 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1686 * 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. 1687 * use the property to determine the pixmap. We use it later on.
1393 */ 1688 */
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]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1691 return;
1399 }
1400 1692
1401 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1402 case ReparentNotify: 1694 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1696 want_refresh = want_full_refresh = 1;
1405 break; 1697 break;
1406#endif
1407 } 1698 }
1408} 1699}
1700#endif
1409 1701
1410void 1702void
1411rxvt_term::button_press (XButtonEvent &ev) 1703rxvt_term::button_press (XButtonEvent &ev)
1412{ 1704{
1413 int reportmode = 0, clickintime; 1705 int reportmode = 0, clickintime;
1414 1706
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1708 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1709 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710
1418 /* 1711 /*
1419 * VT window processing of button press 1712 * VT window processing of button press
1420 */ 1713 */
1421 if (ev.window == TermWin.vt) 1714 if (ev.window == TermWin.vt)
1422 { 1715 {
1716#if ISO_14755
1717 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 {
1720 iso14755_54 (ev.x, ev.y);
1721 return;
1722 }
1723#endif
1724
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1725 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1726
1424 if (reportmode) 1727 if (reportmode)
1425 { 1728 {
1426 /* mouse report from vt window */ 1729 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1730 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1731 MEvent.state = ev.state;
… …
1457 } 1760 }
1458 else 1761 else
1459 { 1762 {
1460 if (ev.button != MEvent.button) 1763 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1764 MEvent.clicks = 0;
1765
1462 switch (ev.button) 1766 switch (ev.button)
1463 { 1767 {
1464 case Button1: 1768 case Button1:
1769 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */
1771#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask);
1773#else
1774 selection.rect = false;
1775#endif
1776
1465 /* allow shift+left click to extend selection */ 1777 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1779 {
1468 if (MEvent.button == Button1 && clickintime) 1780 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1781 selection_rotate (ev.x, ev.y);
1470 else 1782 else
1471 selection_extend (ev.x, ev.y, 1); 1783 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1798 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1799 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1800 selection_rotate (ev.x, ev.y);
1489 else 1801 else
1490 selection_extend (ev.x, ev.y, 1); 1802 selection_extend (ev.x, ev.y, 1);
1803
1491 MEvent.button = Button3; 1804 MEvent.button = Button3;
1492 break; 1805 break;
1493 } 1806 }
1494 } 1807 }
1808
1495 MEvent.time = ev.time; 1809 MEvent.time = ev.time;
1496 return; 1810 return;
1497 } 1811 }
1498 1812
1499 /* 1813 /*
… …
1591 break; 1905 break;
1592 case R_SB_ALIGN_BOTTOM: 1906 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1907 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1908 break;
1595 } 1909 }
1910
1596 if (scrollBar.style == R_SB_XTERM 1911 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1912 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1913 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1914 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1915
1601 scrollBar.setMotion (); 1916 scrollBar.setMotion ();
1602 break; 1917 break;
1603 1918
1604 case Button1: 1919 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1920 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1944 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1945 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1946 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1947 / scrollbar_size ()));
1633 } 1948 }
1949
1634 break; 1950 break;
1635 } 1951 }
1636 } 1952 }
1637 return; 1953 return;
1638 } 1954 }
… …
1650{ 1966{
1651 int reportmode = 0; 1967 int reportmode = 0;
1652 1968
1653 csrO = 0; /* reset csr Offset */ 1969 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1970 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1971 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1972
1657 if (scrollbar_isUpDn ()) 1973 if (scrollbar_isUpDn ())
1658 { 1974 {
1659 scrollBar.setIdle (); 1975 scrollBar.setIdle ();
1660 scrollbar_show (0); 1976 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1978 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1979#endif
1664
1665 } 1980 }
1981
1666#ifdef SELECTION_SCROLLING 1982#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1983 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1984 sel_scroll_ev.stop();
1669#endif 1985#endif
1986
1670 if (ev.window == TermWin.vt) 1987 if (ev.window == TermWin.vt)
1671 { 1988 {
1989#if ISO_14755
1990 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return;
1993#endif
1672 if (reportmode) 1994 if (reportmode)
1673 { 1995 {
1674 /* mouse report from vt window */ 1996 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1997 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1998 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2012 MEvent.button = AnyButton;
1691 mouse_report (ev); 2013 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2014#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2015 return;
1694 } 2016 }
2017
1695 /* 2018 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2019 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2020 * when overriding mouse reporting
1698 */ 2021 */
1699 if (PrivateModes & PrivMode_mouse_report 2022 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2023 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2024 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2025 selection_extend (ev.x, ev.y, 0);
1703 2026
1704 switch (ev.button) 2027 switch (ev.button)
… …
1719 2042
1720 v = ev.button == Button4 ? UP : DN; 2043 v = ev.button == Button4 ? UP : DN;
1721 2044
1722 if (ev.state & ShiftMask) 2045 if (ev.state & ShiftMask)
1723 i = 1; 2046 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2047 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2048 i = TermWin.nrow - 1;
1726 else 2049 else
1727 i = 5; 2050 i = 5;
1728 2051
1729# ifdef MOUSE_SLIP_WHEELING 2052# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2090#endif
1768} 2091}
1769 2092
1770#ifdef TRANSPARENT 2093#ifdef TRANSPARENT
1771#if TINTING 2094#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2095/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2096
1775static void 2097typedef 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 2098
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2100{
1783 /* No saturation */ 2101 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2102 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i;
1787 2107
1788 b = ((uint16_t *) ptr)[x]; 2108 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2109
1790 g = (b & 0x3e0) * gm; 2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2111
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2112 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2113 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2114 mask_g = visual->green_mask;
1795 } 2115 mask_b = visual->blue_mask;
1796 ptr += bpl; 2116
1797 } 2117 /* boring lookup table pre-initialization */
2118 switch (srcImage->bits_per_pixel) {
2119 case 15:
2120 if ((mask_r != 0x7c00) ||
2121 (mask_g != 0x03e0) ||
2122 (mask_b != 0x001f))
2123 return;
2124 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2125 lookup_r = lookup;
2126 lookup_g = lookup+32;
2127 lookup_b = lookup+32+32;
2128 sh_r = 10;
2129 sh_g = 5;
2130 sh_b = 0;
2131 break;
2132 case 16:
2133 if ((mask_r != 0xf800) ||
2134 (mask_g != 0x07e0) ||
2135 (mask_b != 0x001f))
2136 return;
2137 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2138 lookup_r = lookup;
2139 lookup_g = lookup+32;
2140 lookup_b = lookup+32+64;
2141 sh_r = 11;
2142 sh_g = 5;
2143 sh_b = 0;
2144 break;
2145 case 24:
2146 if ((mask_r != 0xff0000) ||
2147 (mask_g != 0x00ff00) ||
2148 (mask_b != 0x0000ff))
2149 return;
2150 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2151 lookup_r = lookup;
2152 lookup_g = lookup+256;
2153 lookup_b = lookup+256+256;
2154 sh_r = 16;
2155 sh_g = 8;
2156 sh_b = 0;
2157 break;
2158 case 32:
2159 if ((mask_r != 0xff0000) ||
2160 (mask_g != 0x00ff00) ||
2161 (mask_b != 0x0000ff))
2162 return;
2163 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2164 lookup_r = lookup;
2165 lookup_g = lookup+256;
2166 lookup_b = lookup+256+256;
2167 sh_r = 16;
2168 sh_g = 8;
2169 sh_b = 0;
2170 break;
2171 default:
2172 return; /* we do not support this color depth */
2173 }
2174
2175 /* prepare limits for color transformation (each channel is handled separately) */
2176 if (shade < 0) {
2177 shade = -shade;
2178 if (shade < 0) shade = 0;
2179 if (shade > 100) shade = 100;
2180
2181 lower_lim_r = 65535-rm;
2182 lower_lim_g = 65535-gm;
2183 lower_lim_b = 65535-bm;
2184
2185 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2186 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2187 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2188
2189 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2190 } else {
1799 for (y = h; --y >= 0;) { 2191 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2192 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2193
1803 b = ((uint16_t *) ptr)[x]; 2194 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2195
1805 g = (b & 0x3e0) * gm; 2196 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2197 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2198 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2199 }
1809 b |= (!(b >> 5) - 1); 2200
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2201 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2202 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2203 {
1813 } 2204 unsigned int tmp;
1814 ptr += bpl; 2205
2206 tmp = lower_lim_r;
2207 lower_lim_r = lower_lim_b;
2208 lower_lim_b = tmp;
2209
2210 tmp = upper_lim_r;
2211 upper_lim_r = upper_lim_b;
2212 upper_lim_b = tmp;
2213 }
2214
2215 /* fill our lookup tables */
2216 for (i = 0; i <= mask_r>>sh_r; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2220 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2221 lookup_r[i] = (tmp/65535)<<sh_r;
2222 }
2223 for (i = 0; i <= mask_g>>sh_g; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2227 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2228 lookup_g[i] = (tmp/65535)<<sh_g;
2229 }
2230 for (i = 0; i <= mask_b>>sh_b; i++)
2231 {
2232 RUINT32T tmp;
2233 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2234 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2235 lookup_b[i] = (tmp/65535)<<sh_b;
2236 }
2237
2238 /* apply table to input image (replacing colors by newly calculated ones) */
2239 switch (srcImage->bits_per_pixel)
2240 {
2241 case 15:
2242 {
2243 unsigned short *p1, *pf, *p, *pl;
2244 p1 = (unsigned short *) srcImage->data;
2245 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2246 while (p1 < pf)
2247 {
2248 p = p1;
2249 pl = p1 + srcImage->width;
2250 for (; p < pl; p++)
1815 } 2251 {
2252 *p = lookup_r[(*p & 0x7c00)>>10] |
2253 lookup_g[(*p & 0x03e0)>> 5] |
2254 lookup_b[(*p & 0x001f)];
2255 }
2256 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2257 }
1817} 2258 break;
1818 2259 }
1819/* RGB 16 */ 2260 case 16:
1820static void 2261 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2262 unsigned short *p1, *pf, *p, *pl;
1822{ 2263 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2264 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2265 while (p1 < pf)
1825 2266 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2267 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2268 pl = p1 + srcImage->width;
1828 /* No saturation */ 2269 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 } 2270 {
1843 } else { 2271 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2272 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2273 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 } 2274 }
1859 ptr += bpl; 2275 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2276 }
2277 break;
2278 }
2279 case 24:
2280 {
2281 unsigned char *p1, *pf, *p, *pl;
2282 p1 = (unsigned char *) srcImage->data;
2283 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width * 3;
2288 for (; p < pl; p += 3)
1860 } 2289 {
2290 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2291 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2292 p[2] = lookup_r[(p[2] & 0x0000ff)];
2293 }
2294 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2295 }
1862} 2296 break;
2297 }
2298 case 32:
2299 {
2300 RUINT32T *p1, *pf, *p, *pl;
2301 p1 = (RUINT32T *) srcImage->data;
2302 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2303
1864/* RGB 24 */ 2304 while (p1 < pf)
1865static void 2305 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2306 p = p1;
1867{ 2307 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2308 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 } 2309 {
1896 } else { 2310 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2311 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2312 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2313 (*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 } 2314 }
1927 ptr += bpl; 2315 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2316 }
2317 break;
2318 }
1929 } 2319 }
1930}
1931 2320
1932/* RGB 32 */ 2321 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} 2322}
2003
2004#endif 2323#endif
2005 2324
2006/* 2325/*
2007 * Check our parents are still who we think they are. 2326 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2327 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2337 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2338 XWindowAttributes wattr, wrootattr;
2020 2339
2021 pchanged = 0; 2340 pchanged = 0;
2022 2341
2023 if (!(Options & Opt_transparent)) 2342 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2025 2344
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2346 rootdepth = wrootattr.depth;
2028 2347
… …
2031 if (rootdepth != wattr.depth) 2350 if (rootdepth != wattr.depth)
2032 { 2351 {
2033 if (am_transparent) 2352 if (am_transparent)
2034 { 2353 {
2035 pchanged = 1; 2354 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2356 am_transparent = am_pixmap_trans = 0;
2038 } 2357 }
2039 2358
2040 return pchanged; /* Don't try any more */ 2359 return pchanged; /* Don't try any more */
2041 } 2360 }
… …
2046 /* 2365 /*
2047 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
2050 */ 2369 */
2051 i = (xa[XA_XROOTPMAPID] 2370 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2373 &nitems, &bytes_after, &prop) == Success);
2055 2374
2056 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2376 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2379 &nitems, &bytes_after, &prop) == Success);
2061 2380
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2381 if (!i || prop == NULL
2382#if TINTING
2383 || !rs[Rs_color + Color_tint]
2384#endif
2385 )
2063 have_pixmap = 0; 2386 have_pixmap = 0;
2064 else 2387 else
2065 { 2388 {
2066 have_pixmap = 1; 2389 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2390 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2401 Window cr;
2079 XImage *image; 2402 XImage *image;
2080 GC gc; 2403 GC gc;
2081 XGCValues gcvalue; 2404 XGCValues gcvalue;
2082 2405
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2407 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2408 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2409 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2410 nx = ny = 0;
2088 2411
… …
2100 sy = 0; 2423 sy = 0;
2101 } 2424 }
2102 2425
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2105 allowedxerror = -1; 2430 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2432
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2434 /* XXX: may need a delay here? */
… …
2130 2455
2131#if TINTING 2456#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2457 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2458 {
2134 unsigned short rm, gm, bm; 2459 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2460 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); 2461
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2463
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2464 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 } 2465 }
2151#endif 2466#endif
2152 2467
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2469 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2472 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2473 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2474 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]);
2161 2477
2162 if (!am_transparent || !am_pixmap_trans) 2478 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2479 pchanged = 1;
2164 2480
2165 am_transparent = am_pixmap_trans = 1; 2481 am_transparent = am_pixmap_trans = 1;
2166 } 2482 }
2167 } 2483 }
2168 2484
2169 if (!am_pixmap_trans) 2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2170 { 2488 {
2171 unsigned int n; 2489 unsigned int n;
2172 /* 2490 /*
2173 * InheritPixmap transparency 2491 * InheritPixmap transparency
2174 */ 2492 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2494 {
2178 oldp = TermWin.parent[i]; 2495 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2497 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2498 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2499
2184 if (TermWin.parent[i] == display->root) 2500 if (TermWin.parent[i] == display->root)
2185 { 2501 {
2186 if (oldp != None) 2502 if (oldp != None)
2187 pchanged = 1; 2503 pchanged = 1;
… …
2198 if (pchanged) 2514 if (pchanged)
2199 { 2515 {
2200 for (; n < (unsigned int)i; n++) 2516 for (; n < (unsigned int)i; n++)
2201 { 2517 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2518 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) 2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2520 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2522 break;
2208 } 2523 }
2209 } 2524 }
2210 } 2525 }
2211 2526
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2528 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2531 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2532 /* XXX: also turn off Opt_transparent? */
2219 } 2533 }
2220 else 2534 else
2221 { 2535 {
2222#if WAIT_FOR_WM 2536#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2537 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2538 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2539 sleep (1);
2226#endif 2540#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2541 for (n = 0; n < (unsigned int)i; n++)
2542 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]);
2545 }
2230 2546
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2548 am_transparent = 1;
2233 } 2549 }
2234 2550
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2552 TermWin.parent[i] = None;
2553 }
2554
2555 if (scrollBar.win)
2556 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle ();
2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2237 } 2567 }
2238 2568
2239 return pchanged; 2569 return pchanged;
2240} 2570}
2241#endif 2571#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2590 if (ch == NOCHAR) // TODO: improve
2261 break; 2591 break;
2262 2592
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2594 {
2595 if (!seen_input)
2596 {
2597 seen_input = 1;
2598 // many badly-written programs (e.g. jed) contain a race condition:
2599 // they first read the screensize and then install a SIGWINCH handler.
2600 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized.
2605 if (seen_resize)
2606 kill (-cmd_pid, SIGWINCH);
2607 }
2608
2265 /* Read a text string from the input buffer */ 2609 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2610 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2611 bool refreshnow = false;
2268 int nlines = 0; 2612 int nlines = 0;
2269 unicode_t *str = buf; 2613 unicode_t *str = buf;
2270 2614
2271 *str++ = ch;
2272
2273 for (;;) 2615 for (;;)
2274 { 2616 {
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)) 2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2618 break;
2280 2619
2281 *str++ = ch; 2620 *str++ = ch;
2282 2621
2283 if (ch == C0_LF) 2622 if (ch == C0_LF)
2284 { 2623 {
2285 nlines++; 2624 nlines++;
2286 refresh_count++; 2625 refresh_count++;
2287 2626
2288 if (! (Options & Opt_jumpScroll) 2627 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2629 {
2291 refreshnow = true; 2630 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2631 ch = NOCHAR;
2294 break; 2632 break;
2295 } 2633 }
2296 2634
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2636 if (nlines >= TermWin.nrow - 1)
2299 { 2637 {
2300 scr_add_lines (buf, nlines, str - buf); 2638 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2639 nlines = 0;
2302 str = buf; 2640 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2644 if (str >= buf + UBUFSIZ)
2307 { 2645 {
2308 ch = NOCHAR; 2646 ch = NOCHAR;
2309 break; 2647 break;
2310 } 2648 }
2649
2650 seq_begin = cmdbuf_ptr;
2651 ch = next_char ();
2311 } 2652 }
2312 2653
2313 scr_add_lines (buf, nlines, str - buf); 2654 scr_add_lines (buf, nlines, str - buf);
2314 2655
2315 /* 2656 /*
2316 * If there have been a lot of new lines, then update the screen 2657 * 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. 2658 * 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 2659 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2660 * 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 */ 2661 */
2324 if (refreshnow) 2662 if (refreshnow)
2325 { 2663 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2665 refresh_limit++;
2328 else 2666 else
2667 {
2668 flag = true;
2329 scr_refresh (refresh_type); 2669 scr_refresh (refresh_type);
2670 }
2330 } 2671 }
2331 2672
2332 } 2673 }
2333 else 2674 else
2334 { 2675 {
… …
2382 if (len == (size_t)-1) 2723 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2725
2385 // assume wchar == unicode 2726 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2727 cmdbuf_ptr += len;
2387 return wc; 2728 return wc & UNICODE_MASK;
2388 } 2729 }
2389 2730
2390 return NOCHAR; 2731 return NOCHAR;
2391} 2732}
2392 2733
… …
2518 process_escape_seq (); 2859 process_escape_seq ();
2519 break; 2860 break;
2520 case C0_ENQ: /* terminal Status */ 2861 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2862 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2865 else
2525 tt_write ((unsigned char *)VT100_ANS, 2866 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2867 (unsigned int)strlen (VT100_ANS));
2527 break; 2868 break;
2528 case C0_BEL: /* bell */ 2869 case C0_BEL: /* bell */
2529 scr_bell (); 2870 scr_bell ();
2530 break; 2871 break;
2531 case C0_BS: /* backspace */ 2872 case C0_BS: /* backspace */
… …
2630void 2971void
2631rxvt_term::process_escape_seq () 2972rxvt_term::process_escape_seq ()
2632{ 2973{
2633 unicode_t ch = cmd_getc (); 2974 unicode_t ch = cmd_getc ();
2634 2975
2635 if (PrivateModes & PrivMode_vt52) 2976 if (priv_modes & PrivMode_vt52)
2636 { 2977 {
2637 process_escape_vt52 (ch); 2978 process_escape_vt52 (ch);
2638 return; 2979 return;
2639 } 2980 }
2640 2981
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2996 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2997 break;
2657 case '+': 2998 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2999 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3000 break;
2660#ifndef NO_FRILLS 3001#if ENABLE_FRILLS
2661 case '6': 3002 case '6':
2662 scr_backindex (); 3003 scr_backindex ();
2663 break; 3004 break;
2664#endif 3005#endif
2665 case '7': 3006 case '7':
2666 scr_cursor (SAVE); 3007 scr_cursor (SAVE);
2667 break; 3008 break;
2668 case '8': 3009 case '8':
2669 scr_cursor (RESTORE); 3010 scr_cursor (RESTORE);
2670 break; 3011 break;
2671#ifndef NO_FRILLS 3012#if ENABLE_FRILLS
2672 case '9': 3013 case '9':
2673 scr_forwardindex (); 3014 scr_forwardindex ();
2674 break; 3015 break;
2675#endif 3016#endif
2676 case '=': 3017 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3317 break;
2977 3318
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3320 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3321 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3322 break;
2982 3323
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3325 process_sgr_mode (nargs, arg);
2985 break; 3326 break;
… …
2992 break; 3333 break;
2993 case 6: /* CPR requested */ 3334 case 6: /* CPR requested */
2994 scr_report_position (); 3335 scr_report_position ();
2995 break; 3336 break;
2996 case 7: /* unofficial extension */ 3337 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3338 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3339 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3340 break;
3000 case 8: /* unofficial extension */ 3341 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3343 break;
3003 } 3344 }
… …
3039 break; 3380 break;
3040 3381
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3382 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3383 if (arg[0] == 4)
3043 scr_insert_mode (0); 3384 scr_insert_mode (0);
3385 else if (arg[0] == 20)
3386 priv_modes &= ~PrivMode_LFNL;
3044 break; 3387 break;
3045 3388
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3389 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3390 if (arg[0] == 4)
3048 scr_insert_mode (1); 3391 scr_insert_mode (1);
3392 else if (arg[0] == 20)
3393 priv_modes |= PrivMode_LFNL;
3049 break; 3394 break;
3050 3395
3051 /* 3396 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3397 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3398 */
… …
3065 break; 3410 break;
3066 case CSI_75: 3411 case CSI_75:
3067 scr_cursor (RESTORE); 3412 scr_cursor (RESTORE);
3068 break; 3413 break;
3069 3414
3070#ifndef NO_FRILLS 3415#if ENABLE_FRILLS
3071 case CSI_74: 3416 case CSI_74:
3072 process_window_ops (arg, nargs); 3417 process_window_ops (arg, nargs);
3073 break; 3418 break;
3074#endif 3419#endif
3075 3420
… …
3082 break; 3427 break;
3083 } 3428 }
3084} 3429}
3085/*}}} */ 3430/*}}} */
3086 3431
3087#ifndef NO_FRILLS 3432#if ENABLE_FRILLS
3088/* ARGSUSED */ 3433/* ARGSUSED */
3089void 3434void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3435rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3436{
3092 int x, y; 3437 int x, y;
… …
3159 break; 3504 break;
3160 case 19: /* report window size (chars) */ 3505 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3507 break;
3163 case 20: /* report icon label */ 3508 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3509 {
3166 char *s; 3510 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3511 XGetIconName (display->display, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s);
3169 } 3514 }
3170 break; 3515 break;
3171 case 21: /* report window title */ 3516 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3517 {
3174 char *s; 3518 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3519 XFetchName (display->display, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s);
3177 } 3522 }
3178 break; 3523 break;
3179 } 3524 }
3180} 3525}
3181#endif 3526#endif
3182 3527
… …
3186 * ends_how is terminator used. returned input must be free()'d 3531 * ends_how is terminator used. returned input must be free()'d
3187 */ 3532 */
3188unsigned char * 3533unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3534rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3535{
3191 unicode_t prev = 0, ch; 3536 unicode_t ch;
3537 bool seen_esc = false;
3192 unsigned int n = 0; 3538 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3539 wchar_t string[STRING_MAX];
3195 3540
3196 while ((ch = cmd_getc ()) != NOCHAR) 3541 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3542 {
3198 if (prev == C0_ESC) 3543 if (seen_esc)
3199 { 3544 {
3200 if (ch == 0x5c) /* 7bit ST */ 3545 if (ch == 0x5c) /* 7bit ST */
3201 break; 3546 break;
3202 else 3547 else
3203 return NULL; 3548 return NULL;
3204 } 3549 }
3550 else if (ch == C0_ESC)
3551 {
3552 seen_esc = true;
3553 continue;
3554 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3555 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3556 break;
3207 else if (ch < 0x20) 3557 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3558 return NULL; /* other control character - exit */
3559
3560 seen_esc = false;
3209 3561
3210 if (n >= sizeof (string) - 1) 3562 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3563 // stop at some sane length
3212 return NULL; 3564 return NULL;
3213 3565
3214 if (ch == C0_SYN) 3566 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3567 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3568 else
3220 string[n++] = prev = ch; 3569 string[n++] = ch;
3221 } 3570 }
3222 3571
3223 string[n++] = '\0'; 3572 string[n++] = '\0';
3224 3573
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3574 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3575
3230 return s; 3576 return (unsigned char *)rxvt_wcstombs (string);
3231} 3577}
3232 3578
3233/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
3234/* 3580/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3625void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3627{
3282 if (str[0] == '?' && !str[1]) 3628 if (str[0] == '?' && !str[1])
3283 { 3629 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3630 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3631 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3633 }
3291 else 3634 else
3292 set_window_color (color, str); 3635 set_window_color (color, str);
3293} 3636}
3294 3637
… …
3322{ 3665{
3323 int changed = 0; 3666 int changed = 0;
3324 int color; 3667 int color;
3325 char *buf, *name; 3668 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3669 bool query = str[0] == '?' && !str[1];
3670 int saveop = op;
3327 3671
3328 assert (str != NULL); 3672 assert (str != NULL);
3329 switch (op) 3673 switch (op)
3330 { 3674 {
3331 case XTerm_name: 3675 case XTerm_name:
… …
3338 set_title (str); 3682 set_title (str);
3339 break; 3683 break;
3340 case XTerm_property: 3684 case XTerm_property:
3341 if (str[0] == '?') 3685 if (str[0] == '?')
3342 { 3686 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3687 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3688 Atom actual_type;
3345 int actual_format; 3689 int actual_format;
3346 unsigned long nitems; 3690 unsigned long nitems;
3347 unsigned long bytes_after; 3691 unsigned long bytes_after;
3348 unsigned char *value = 0; 3692 unsigned char *value = 0;
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3710 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3711
3368 if (eq) 3712 if (eq)
3369 { 3713 {
3370 *eq = 0; 3714 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3715 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 } 3716 }
3376 else 3717 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3718 XDeleteProperty (display->display, TermWin.parent[0],
3378 display->atom (str)); 3719 display->atom (str));
3379 } 3720 }
3380 break; 3721 break;
3381 3722
3382 case XTerm_Color: 3723 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3724 for (buf = (char *)str; buf && *buf;)
3384 { 3725 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3726 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3727 break;
3387 3728
3388 *name++ = '\0'; 3729 *name++ = '\0';
3389 color = atoi (buf); 3730 color = atoi (buf);
3390 3731
3391 if (color < 0 || color >= TOTAL_COLORS) 3732 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3733 break;
3393 3734
3394 if ((buf = STRCHR (name, ';')) != NULL) 3735 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3736 *buf++ = '\0';
3396 3737
3397 if (name[0] == '?' && !name[1]) 3738 if (name[0] == '?' && !name[1])
3398 { 3739 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3740 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3741 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); 3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3743 }
3406 else 3744 else
3407 set_window_color (color + minCOLOR, name); 3745 set_window_color (color + minCOLOR, name);
3408 } 3746 }
3409 break; 3747 break;
… …
3426 break; 3764 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3765#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3766 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3431 case XTerm_Color_UL: 3772 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3774 break;
3434 case XTerm_Color_RV: 3775 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break;
3778#endif
3779#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3782 check_our_parents ();
3783 if (am_transparent)
3784 want_full_refresh = want_refresh = 1;
3436 break; 3785 break;
3437#endif 3786#endif
3438 3787
3439 case XTerm_Pixmap: 3788 case XTerm_Pixmap:
3440 if (*str != ';') 3789 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3792 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3793 set_bgPixmap (str); /* change pixmap */
3445#endif 3794#endif
3446 scr_touch (true); 3795 scr_touch (true);
3447 } 3796 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3797 while ((str = strchr (str, ';')) != NULL)
3449 { 3798 {
3450 str++; 3799 str++;
3451#if XPM_BACKGROUND 3800#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3801 changed += scale_pixmap (str);
3453#endif 3802#endif
… …
3472 case XTerm_logfile: 3821 case XTerm_logfile:
3473 // TODO, when secure mode? 3822 // TODO, when secure mode?
3474 break; 3823 break;
3475 3824
3476 case XTerm_font: 3825 case XTerm_font:
3826 op = URxvt_font;
3827 case URxvt_font:
3828#if ENABLE_STYLES
3829 case URxvt_boldFont:
3830 case URxvt_italicFont:
3831 case URxvt_boldItalicFont:
3832#endif
3477 if (query) 3833 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3837 resp);
3838 else
3478 { 3839 {
3479 if (Options & Opt_insecure) 3840 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3841
3481 TermWin.fontset->fontdesc 3842 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3843 allocated.push_back ((void *)res);
3483 : "", 3844 set_fonts ();
3484 resp);
3485 } 3845 }
3486 else
3487 change_font (str);
3488 break; 3846 break;
3489 3847
3490#ifndef NO_FRILLS 3848#if ENABLE_FRILLS
3491 case XTerm_locale: 3849 case XTerm_locale:
3492 if (query) 3850 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3852 else
3498 { 3853 {
3499 set_locale (str); 3854 set_locale (str);
3500# ifdef USE_XIM 3855# ifdef USE_XIM
3501 im_cb (); 3856 im_cb ();
3502# endif 3857# endif
3503 } 3858 }
3504 break; 3859 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 3860#endif
3515 3861
3516#ifdef MENUBAR 3862#ifdef MENUBAR
3517 case XTerm_Menu: 3863 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3864 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3866 break;
3521#endif 3867#endif
3522#if 0 3868#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3869 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3896{
3551 int state; 3897 int state;
3552 3898
3553 if (mode == 's') 3899 if (mode == 's')
3554 { 3900 {
3555 SavedModes |= (PrivateModes & bit); 3901 SavedModes |= (priv_modes & bit);
3556 return -1; 3902 return -1;
3557 } 3903 }
3558 else 3904 else
3559 { 3905 {
3560 if (mode == 'r') 3906 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3907 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3908 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3909 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3910 PrivMode (state, bit);
3565 } 3911 }
3566 3912
3567 return state; 3913 return state;
3568} 3914}
… …
3586 { 3, PrivMode_132 }, 3932 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3933 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3934 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3935 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3936 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3938 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3939#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3940 { menuBar_esc, PrivMode_menuBar },
3594#endif 3941#endif
3942 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3944#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3945 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3946#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3947 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3948 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3949 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3950 // 45 margin bell NYI
3605 // 46 start logging 3951 // 46 start logging
… …
3646 3992
3647 /* extra handling for values with state unkept */ 3993 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3994 switch (arg[i])
3649 { 3995 {
3650 case 1048: /* alternative cursor save */ 3996 case 1048: /* alternative cursor save */
3997 case 1049:
3651 if (Options & Opt_secondaryScreen) 3998 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3999 if (mode == 0)
3653 scr_cursor (RESTORE); 4000 scr_cursor (RESTORE);
3654 else if (mode == 1) 4001 else if (mode == 1)
3655 scr_cursor (SAVE); 4002 scr_cursor (SAVE);
3656 break; 4003 break;
… …
3667 * within VT52 mode 4014 * within VT52 mode
3668 */ 4015 */
3669 PrivMode (1, PrivMode_vt52); 4016 PrivMode (1, PrivMode_vt52);
3670 break; 4017 break;
3671 case 3: /* 80/132 */ 4018 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4019 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4021 break;
3675 case 4: /* smooth scrolling */ 4022 case 4: /* smooth scrolling */
3676 if (state) 4023 if (state)
3677 Options &= ~Opt_jumpScroll; 4024 options &= ~Opt_jumpScroll;
3678 else 4025 else
3679 Options |= Opt_jumpScroll; 4026 options |= Opt_jumpScroll;
3680 break; 4027 break;
3681 case 5: /* reverse video */ 4028 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4029 scr_rvideo_mode (state);
3683 break; 4030 break;
3684 case 6: /* relative/absolute origins */ 4031 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4035 scr_autowrap (state);
3689 break; 4036 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4037 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4038 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4039 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4040 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4041 break;
3695#ifdef menuBar_esc 4042#ifdef menuBar_esc
3696 case menuBar_esc: 4043 case menuBar_esc:
3697#ifdef MENUBAR 4044#ifdef MENUBAR
3698 map_menuBar (state); 4045 map_menuBar (state);
… …
3718 break; 4065 break;
3719 /* case 66: - application key pad */ 4066 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4067 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4068 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4070 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4071 break;
3725#if 0 4072#if 0
3726 case 1001: 4073 case 1001:
3727 break; /* X11 mouse highlighting */ 4074 break; /* X11 mouse highlighting */
3728#endif 4075#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4076 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4077 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4078 options &= ~Opt_scrollTtyOutput;
3732 else 4079 else
3733 Options |= Opt_scrollTtyOutput; 4080 options |= Opt_scrollTtyOutput;
3734 break; 4081 break;
3735 case 1011: /* scroll to bottom on key press */ 4082 case 1011: /* scroll to bottom on key press */
3736 if (state) 4083 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4084 options |= Opt_scrollTtyKeypress;
3738 else 4085 else
3739 Options &= ~Opt_scrollTtyKeypress; 4086 options &= ~Opt_scrollTtyKeypress;
3740 break; 4087 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4088 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4089 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4090 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4091 scr_erase_screen (2);
3745 scr_change_screen (state); 4092 scr_change_screen (state);
3746 break; 4093 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4094 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4095 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4096 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4097 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4098 scr_erase_screen (2);
3752 break; 4099 break;
3753 default: 4100 default:
3754 break; 4101 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4127 rendset = 0, rendstyle = ~RS_None;
3781 break; 4128 break;
3782 case 1: 4129 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4130 rendset = 1, rendstyle = RS_Bold;
3784 break; 4131 break;
3785 //case 2: // faint or second colour 4132 //case 2: // low intensity
4133 case 3:
4134 rendset = 1, rendstyle = RS_Italic;
4135 break;
3786 case 4: 4136 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4137 rendset = 1, rendstyle = RS_Uline;
3788 break; 4138 break;
3789 case 5: // slowly blinking 4139 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4140 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4152 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4153 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4154 //...
3805 //case 19: // ninth alt font 4155 //case 19: // ninth alt font
3806 //case 20: // gothic 4156 //case 20: // gothic
3807 case 21: // disable bold, faint 4157 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4158 rendset = 0, rendstyle = RS_Bold;
3809 break; 4159 break;
3810 case 22: 4160 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4161 rendset = 0, rendstyle = RS_Bold;
3812 break; 4162 break;
3813 //case 23: disable italic 4163 case 23: // disable italic
4164 rendset = 0, rendstyle = RS_Italic;
4165 break;
3814 case 24: 4166 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4167 rendset = 0, rendstyle = RS_Uline;
3816 break; 4168 break;
3817 case 25: 4169 case 25:
4170 rendset = 0, rendstyle = RS_Blink;
4171 break;
4172 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4173 rendset = 0, rendstyle = RS_Blink;
3819 break; 4174 break;
3820 case 27: 4175 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4176 rendset = 0, rendstyle = RS_RVid;
3822 break; 4177 break;
… …
3840 case 35: 4195 case 35:
3841 case 36: 4196 case 36:
3842 case 37: 4197 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4199 break;
3845#ifdef TTY_256COLOR 4200 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4202 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4204 i += 2;
3851 } 4205 }
3852 break; 4206 break;
3853#endif
3854 case 39: /* default fg */ 4207 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4208 scr_color (Color_fg, Color_fg);
3856 break; 4209 break;
3857 4210
3858 case 40: 4211 case 40:
… …
3863 case 45: 4216 case 45:
3864 case 46: 4217 case 46:
3865 case 47: 4218 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4220 break;
3868#ifdef TTY_256COLOR 4221 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4223 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4225 i += 2;
3874 } 4226 }
3875 break; 4227 break;
3876#endif
3877 case 49: /* default bg */ 4228 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4229 scr_color (Color_bg, Color_bg);
3879 break; 4230 break;
4231
4232 //case 50: // not variable spacing
3880 4233
3881#ifndef NO_BRIGHTCOLOR 4234#ifndef NO_BRIGHTCOLOR
3882 case 90: 4235 case 90:
3883 case 91: /* set bright fg color */ 4236 case 91: /* set bright fg color */
3884 case 92: 4237 case 92:
3885 case 93: 4238 case 93:
3886 case 94: 4239 case 94:
3887 case 95: 4240 case 95:
3888 case 96: 4241 case 96:
3889 case 97: 4242 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4243 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4244 break;
3893 case 100: 4245 case 100:
3894 case 101: /* set bright bg color */ 4246 case 101: /* set bright bg color */
3895 case 102: 4247 case 102:
3896 case 103: 4248 case 103:
3897 case 104: 4249 case 104:
3898 case 105: 4250 case 105:
3899 case 106: 4251 case 106:
3900 case 107: 4252 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4254 break;
3904#endif 4255#endif
3905 4256
3906 } 4257 }
3907 } 4258 }
… …
3914{ 4265{
3915 unicode_t ch, cmd = cmd_getc (); 4266 unicode_t ch, cmd = cmd_getc ();
3916 4267
3917 if (cmd == 'Q') 4268 if (cmd == 'Q')
3918 { /* query graphics */ 4269 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4270 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4271 return;
3921 } 4272 }
3922 /* swallow other graphics sequences until terminating ':' */ 4273 /* swallow other graphics sequences until terminating ':' */
3923 do 4274 do
3924 ch = cmd_getc (); 4275 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4290 unsigned char buf[256];
3940 4291
3941 va_start (arg_ptr, fmt); 4292 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4294 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4295 tt_write (buf, strlen (buf));
3945} 4296}
3946 4297
3947/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* 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. 4300 * or generated by us in response to a query ESC sequence.
3950 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
3951void 4304void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4306{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4310
3956 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
3957 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
3958 if (v_buflen == 0) 4334 if (v_buflen == 0)
3959 { 4335 {
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); 4336 free (v_buffer);
3987 v_buffer = 0; 4337 v_buffer = 0;
3988 v_buflen = 0; 4338 v_buflen = 0;
3989 4339
3990 pty_ev.set (EVENT_READ); 4340 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; 4341 return;
4003 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
4005} 4349}
4006 4350
4007/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
4008 4352

Diff Legend

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