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.54 by pcg, Sun Feb 22 12:58:02 2004 UTC vs.
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
60
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122 XK_KP_Space, 0x2422,
123 0,
124};
125
126void
127rxvt_term::iso14755_54 (int x, int y)
128{
129 x = Pixel2Col (x);
130 y = Pixel2Row (y);
131
132 if (x < 0 || x >= TermWin.ncol
133 || y < 0 || y >= TermWin.nrow)
134 return;
135
136 for (;;)
137 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
139
140 if (t != NOCHAR || !x)
141 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54;
145 break;
146 }
147
148 x--;
149 }
150
151}
152#endif
153
154#if ENABLE_OVERLAY
155void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{
158 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2;
161 int len;
162
163#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch))
165 {
166 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr);
169 }
170 else
171#endif
172 {
173 ch2 = ch;
174
175 alloc = 0;
176 chr = &ch2;
177 len = 1;
178 }
179
180 int width = strlen (f->name);
181
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
183
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185
186 for (int y = 0; y < len; y++)
187 {
188 char buf[9];
189
190 ch = *chr++;
191
192 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '=');
195#if !UNICODE3
196 if (ch >= 0x10000)
197 ch = 0xfffd;
198#endif
199 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r);
201 }
202
203 scr_overlay_set (0, len, f->name);
204
205#if ENABLE_COMBINING
206 if (alloc)
207 delete [] alloc;
208#endif
209}
210#endif
211
212void
213rxvt_term::commit_iso14755 ()
214{
215 wchar_t ch[2];
216
217 ch[0] = iso14755buf & ISO_14755_MASK;
218 ch[1] = 0;
219
220 if (iso14755buf & ISO_14755_51)
221 {
222 char mb[16];
223 int len;
224
225 // allow verbatim 0-bytes and control-bytes to be entered
226 if (ch[0] >= 0x20)
227 len = wcstombs (mb, ch, 16);
228 else
229 {
230 mb[0] = ch[0];
231 len = 1;
232 }
233
234 if (len > 0)
235 tt_write ((unsigned char *)mb, len);
236 else
237 scr_bell ();
238 }
239
240 iso14755buf = 0;
241}
242
243int
244rxvt_term::hex_keyval (XKeyEvent &ev)
245{
246 // check wether this event corresponds to a hex digit
247 // if the modifiers had not been pressed.
248 for (int index = 0; index < 8; index++)
249 {
250 KeySym k = XLookupKeysym (&ev, index);
251
252 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
253 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
254 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
255 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
256 }
257
258 return -1;
259}
260#endif
56 261
57/*{{{ Convert the keypress event into a string */ 262/*{{{ Convert the keypress event into a string */
58void 263void
59rxvt_term::lookup_key (XKeyEvent &ev) 264rxvt_term::lookup_key (XKeyEvent &ev)
60{ 265{
… …
88#ifdef USE_XIM 293#ifdef USE_XIM
89 if (Input_Context) 294 if (Input_Context)
90 { 295 {
91 Status status_return; 296 Status status_return;
92 297
298#if 0
93#ifdef X_HAVE_UTF8_STRING 299#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 300 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 301 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 302 KBUFSZ, &keysym, &status_return);
97 else 303 else
304#endif
98#endif 305#endif
99 { 306 {
100 wchar_t wkbuf[KBUFSZ + 1]; 307 wchar_t wkbuf[KBUFSZ + 1];
101 308
102 // the XOpenIM manpage lies about hardcoding the locale 309 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 317 SET_LOCALE (locale);
111 318
112 if (status_return == XLookupChars 319 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 320 || status_return == XLookupBoth)
114 { 321 {
322 /* make sure the user can type ctrl-@, i.e. NUL */
323 if (len == 1 && *wkbuf == 0)
324 {
325 kbuf[0] = 0;
326 len = 1;
327 }
328 else
329 {
115 wkbuf[len] = 0; 330 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 331 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 332 if (len < 0)
118 len = 0; 333 len = 0;
334 }
119 } 335 }
120 else 336 else
121 len = 0; 337 len = 0;
122 } 338 }
123 339
… …
131 valid_keysym = keysym != NoSymbol; 347 valid_keysym = keysym != NoSymbol;
132 } 348 }
133 349
134 if (valid_keysym) 350 if (valid_keysym)
135 { 351 {
136 /* for some backwards compatibility */ 352#ifdef KEYSYM_RESOURCE
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 353 if (keyboard->dispatch (this, keysym, ev.state))
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (FONT_UP);
147 return; 354 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (FONT_DN);
152 return;
153 }
154 }
155#endif 355#endif
156 356
157 if (TermWin.saveLines) 357 if (TermWin.saveLines)
158 { 358 {
159#ifdef UNSHIFTED_SCROLLKEYS 359#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 360 if (!ctrl && !meta)
161 {
162#else 361#else
163 if (IS_SCROLL_MOD) 362 if (IS_SCROLL_MOD)
363#endif
164 { 364 {
165#endif
166 int lnsppg; 365 int lnsppg;
167 366
168#ifdef PAGING_CONTEXT_LINES 367#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 369#else
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 418 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 419 {
221 keysym += (XK_F11 - XK_F1); 420 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 421 shft = 0; /* turn off Shift */
223 } 422 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 424 {
226 switch (keysym) 425 switch (keysym)
227 { 426 {
228 /* normal XTerm key bindings */ 427 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 428 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 429 selection_request (ev.time, 0, 0);
231 return; 430 return;
431#if TODO
232 /* rxvt extras */ 432 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 433 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (FONT_UP); 434 change_font (FONT_UP);
235 return; 435 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (FONT_DN); 437 change_font (FONT_DN);
238 return; 438 return;
439#endif
239 } 440 }
240 } 441 }
241 } 442 }
242#ifdef PRINTPIPE 443
243 if (keysym == XK_Print) 444#if ENABLE_FRILLS || ISO_14755
244 { 445 // ISO 14755 support
245 scr_printscreen (ctrl | shft); 446 if (shft && ctrl)
246 return;
247 } 447 {
248#endif 448 int hv;
249 449
250 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 450 if (iso14755buf & ISO_14755_51
251 { 451 && (keysym == XK_space || keysym == XK_KP_Space
252#ifdef KEYSYM_RESOURCE 452 || keysym == XK_Return || keysym == XK_KP_Enter))
253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
254 { 453 {
255 unsigned int l; 454 commit_iso14755 ();
256 const unsigned char *kbuf0; 455 iso14755buf = ISO_14755_51;
257 const unsigned char ch = C0_ESC; 456# if ISO_14755
258 457 iso14755_51 (0);
259 kbuf0 = (Keysym_map[keysym & 0xFF]);
260 l = (unsigned int)*kbuf0++;
261
262 /* escape prefix */
263 if (meta)
264# ifdef META8_OPTION
265 if (meta_char == C0_ESC)
266# endif 458# endif
267 tt_write (&ch, 1); 459 return;
268 tt_write (kbuf0, l); 460 }
461 else if ((hv = hex_keyval (ev)) >= 0)
462 {
463 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
464 | hv | ISO_14755_51;
465# if ISO_14755
466 iso14755_51 (iso14755buf & ISO_14755_MASK);
467# endif
269 return; 468 return;
270 } 469 }
271 else 470 else
471 {
472# if ENABLE_OVERLAY
473 scr_overlay_off ();
272#endif 474# endif
475 iso14755buf = 0;
476 }
477 }
478 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
479 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
480 if (!(iso14755buf & ISO_14755_STARTED))
481 {
482 iso14755buf |= ISO_14755_STARTED;
483# if ENABLE_OVERLAY
484 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
485 scr_overlay_set (0, 0, "ISO 14755 mode");
486# endif
487 }
488#endif
489
490#ifdef PRINTPIPE
491 if (keysym == XK_Print)
492 {
493 scr_printscreen (ctrl | shft);
494 return;
495 }
496#endif
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
273 { 500 {
274 newlen = 1; 501 newlen = 1;
275 switch (keysym) 502 switch (keysym)
276 { 503 {
277#ifndef NO_BACKSPACE_KEY 504#ifndef NO_BACKSPACE_KEY
278 case XK_BackSpace: 505 case XK_BackSpace:
279 if (PrivateModes & PrivMode_HaveBackSpace) 506 if (priv_modes & PrivMode_HaveBackSpace)
280 { 507 {
281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
282 ^ !!ctrl) ? '\b' : '\177'; 509 ^ !!ctrl) ? '\b' : '\177';
283 kbuf[1] = '\0'; 510 kbuf[1] = '\0';
284 } 511 }
285 else 512 else
286 STRCPY (kbuf, key_backspace); 513 strcpy (kbuf, key_backspace);
287# ifdef MULTICHAR_SET
288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
289 {
290 int col, row;
291
292 newlen = STRLEN (kbuf);
293 col = screen.cur.col - 1;
294 row = screen.cur.row + TermWin.saveLines;
295 if (IS_MULTI2 (screen.rend[row][col]))
296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
297 }
298# endif
299 break; 514 break;
300#endif 515#endif
301#ifndef NO_DELETE_KEY 516#ifndef NO_DELETE_KEY
302 case XK_Delete: 517 case XK_Delete:
303 STRCPY (kbuf, key_delete); 518 strcpy (kbuf, key_delete);
304# ifdef MULTICHAR_SET
305 if (Options & Opt_mc_hack)
306 {
307 int col, row;
308
309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
311 row = screen.cur.row + TermWin.saveLines;
312 if (IS_MULTI1 (screen.rend[row][col]))
313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
314 }
315# endif
316 break; 519 break;
317#endif 520#endif
318 case XK_Tab: 521 case XK_Tab:
319 if (shft) 522 if (shft)
320 STRCPY (kbuf, "\033[Z"); 523 strcpy (kbuf, "\033[Z");
321 else 524 else
322 { 525 {
323#ifdef CTRL_TAB_MAKES_META 526#ifdef CTRL_TAB_MAKES_META
324 if (ctrl) 527 if (ctrl)
325 meta = 1; 528 meta = 1;
… …
331 newlen = 0; 534 newlen = 0;
332 } 535 }
333 break; 536 break;
334 537
335#ifdef XK_KP_Left 538#ifdef XK_KP_Left
336 case XK_KP_Up: /* \033Ox or standard */ 539 case XK_KP_Up: /* \033Ox or standard */
337 case XK_KP_Down: /* \033Or or standard */ 540 case XK_KP_Down: /* \033Or or standard */
338 case XK_KP_Right: /* \033Ov or standard */ 541 case XK_KP_Right: /* \033Ov or standard */
339 case XK_KP_Left: /* \033Ot or standard */ 542 case XK_KP_Left: /* \033Ot or standard */
340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
341 { 544 {
342 STRCPY (kbuf, "\033OZ"); 545 strcpy (kbuf, "\033OZ");
343 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
344 break; 547 break;
345 } 548 }
346 else 549 else
347 /* translate to std. cursor key */ 550 /* translate to std. cursor key */
… …
350#endif 553#endif
351 case XK_Up: /* "\033[A" */ 554 case XK_Up: /* "\033[A" */
352 case XK_Down: /* "\033[B" */ 555 case XK_Down: /* "\033[B" */
353 case XK_Right: /* "\033[C" */ 556 case XK_Right: /* "\033[C" */
354 case XK_Left: /* "\033[D" */ 557 case XK_Left: /* "\033[D" */
355 STRCPY (kbuf, "\033[Z"); 558 strcpy (kbuf, "\033[Z");
356 kbuf[2] = "DACB"[keysym - XK_Left]; 559 kbuf[2] = "DACB"[keysym - XK_Left];
357 /* do Shift first */ 560 /* do Shift first */
358 if (shft) 561 if (shft)
359 kbuf[2] = "dacb"[keysym - XK_Left]; 562 kbuf[2] = "dacb"[keysym - XK_Left];
360 else if (ctrl) 563 else if (ctrl)
361 { 564 {
362 kbuf[1] = 'O'; 565 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left]; 566 kbuf[2] = "dacb"[keysym - XK_Left];
364 } 567 }
365 else if (PrivateModes & PrivMode_aplCUR) 568 else if (priv_modes & PrivMode_aplCUR)
366 kbuf[1] = 'O'; 569 kbuf[1] = 'O';
367#ifdef MULTICHAR_SET
368 //TODO: ??
369 if (Options & Opt_mc_hack)
370 {
371 int col, row, m;
372
373 col = screen.cur.col;
374 row = screen.cur.row + TermWin.saveLines;
375 m = 0;
376 if (keysym == XK_Right
377 && IS_MULTI1 (screen.rend[row][col]))
378 m = 1;
379 else if (keysym == XK_Left)
380 {
381 if (col > 0)
382 {
383 if (IS_MULTI2 (screen.rend[row][col - 1]))
384 m = 1;
385 }
386 else if (screen.cur.row > 0)
387 {
388 col = screen.tlen[--row];
389 if (col == -1)
390 col = TermWin.ncol - 1;
391 else
392 col--;
393 if (col > 0
394 && IS_MULTI2 (screen.rend[row][col]))
395 m = 1;
396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
401#endif
402 break; 570 break;
403 571
404#ifndef UNSHIFTED_SCROLLKEYS 572#ifndef UNSHIFTED_SCROLLKEYS
405# ifdef XK_KP_Prior 573# ifdef XK_KP_Prior
406 case XK_KP_Prior: 574 case XK_KP_Prior:
407 /* allow shift to override */ 575 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
409 { 577 {
410 STRCPY (kbuf, "\033Oy"); 578 strcpy (kbuf, "\033Oy");
411 break; 579 break;
412 } 580 }
413 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
414# endif 582# endif
415 case XK_Prior: 583 case XK_Prior:
416 STRCPY (kbuf, "\033[5~"); 584 strcpy (kbuf, "\033[5~");
417 break; 585 break;
418# ifdef XK_KP_Next 586# ifdef XK_KP_Next
419 case XK_KP_Next: 587 case XK_KP_Next:
420 /* allow shift to override */ 588 /* allow shift to override */
421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
422 { 590 {
423 STRCPY (kbuf, "\033Os"); 591 strcpy (kbuf, "\033Os");
424 break; 592 break;
425 } 593 }
426 /* FALLTHROUGH */ 594 /* FALLTHROUGH */
427# endif 595# endif
428 case XK_Next: 596 case XK_Next:
429 STRCPY (kbuf, "\033[6~"); 597 strcpy (kbuf, "\033[6~");
430 break; 598 break;
431#endif 599#endif
432 case XK_KP_Enter: 600 case XK_KP_Enter:
433 /* allow shift to override */ 601 /* allow shift to override */
434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
435 { 603 {
436 STRCPY (kbuf, "\033OM"); 604 strcpy (kbuf, "\033OM");
605 break;
606 }
607
608 /* FALLTHROUGH */
609
610 case XK_Return:
611 if (priv_modes & PrivMode_LFNL)
612 {
613 kbuf[0] = '\015';
614 kbuf[1] = '\012';
615 kbuf[2] = '\0';
437 } 616 }
438 else 617 else
439 { 618 {
440 kbuf[0] = '\r'; 619 kbuf[0] = '\015';
441 kbuf[1] = '\0'; 620 kbuf[1] = '\0';
442 } 621 }
443 break; 622 break;
444 623
445#ifdef XK_KP_Begin 624#ifdef XK_KP_Begin
446 case XK_KP_Begin: 625 case XK_KP_Begin:
447 STRCPY (kbuf, "\033Ou"); 626 strcpy (kbuf, "\033Ou");
448 break; 627 break;
449 628
450 case XK_KP_Insert: 629 case XK_KP_Insert:
451 STRCPY (kbuf, "\033Op"); 630 strcpy (kbuf, "\033Op");
452 break; 631 break;
453 632
454 case XK_KP_Delete: 633 case XK_KP_Delete:
455 STRCPY (kbuf, "\033On"); 634 strcpy (kbuf, "\033On");
456 break; 635 break;
457#endif 636#endif
458 case XK_KP_F1: /* "\033OP" */ 637 case XK_KP_F1: /* "\033OP" */
459 case XK_KP_F2: /* "\033OQ" */ 638 case XK_KP_F2: /* "\033OQ" */
460 case XK_KP_F3: /* "\033OR" */ 639 case XK_KP_F3: /* "\033OR" */
461 case XK_KP_F4: /* "\033OS" */ 640 case XK_KP_F4: /* "\033OS" */
462 STRCPY (kbuf, "\033OP"); 641 strcpy (kbuf, "\033OP");
463 kbuf[2] += (keysym - XK_KP_F1); 642 kbuf[2] += (keysym - XK_KP_F1);
464 break; 643 break;
465 644
466 case XK_KP_Multiply: /* "\033Oj" : "*" */ 645 case XK_KP_Multiply: /* "\033Oj" : "*" */
467 case XK_KP_Add: /* "\033Ok" : "+" */ 646 case XK_KP_Add: /* "\033Ok" : "+" */
… …
478 case XK_KP_6: /* "\033Ov" : "6" */ 657 case XK_KP_6: /* "\033Ov" : "6" */
479 case XK_KP_7: /* "\033Ow" : "7" */ 658 case XK_KP_7: /* "\033Ow" : "7" */
480 case XK_KP_8: /* "\033Ox" : "8" */ 659 case XK_KP_8: /* "\033Ox" : "8" */
481 case XK_KP_9: /* "\033Oy" : "9" */ 660 case XK_KP_9: /* "\033Oy" : "9" */
482 /* allow shift to override */ 661 /* allow shift to override */
483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
484 { 663 {
485 STRCPY (kbuf, "\033Oj"); 664 strcpy (kbuf, "\033Oj");
486 kbuf[2] += (keysym - XK_KP_Multiply); 665 kbuf[2] += (keysym - XK_KP_Multiply);
487 } 666 }
488 else 667 else
489 { 668 {
490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
491 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
492 } 671 }
493 break; 672 break;
494 673
495 case XK_Find: 674 case XK_Find:
496 STRCPY (kbuf, "\033[1~"); 675 strcpy (kbuf, "\033[1~");
497 break; 676 break;
498 case XK_Insert: 677 case XK_Insert:
499 STRCPY (kbuf, "\033[2~"); 678 strcpy (kbuf, "\033[2~");
500 break; 679 break;
501#ifdef DXK_Remove /* support for DEC remove like key */ 680#ifdef DXK_Remove /* support for DEC remove like key */
502 case DXK_Remove: 681 case DXK_Remove:
503 /* FALLTHROUGH */ 682 /* FALLTHROUGH */
504#endif 683#endif
505 case XK_Execute: 684 case XK_Execute:
506 STRCPY (kbuf, "\033[3~"); 685 strcpy (kbuf, "\033[3~");
507 break; 686 break;
508 case XK_Select: 687 case XK_Select:
509 STRCPY (kbuf, "\033[4~"); 688 strcpy (kbuf, "\033[4~");
510 break; 689 break;
511#ifdef XK_KP_End 690#ifdef XK_KP_End
512 case XK_KP_End: 691 case XK_KP_End:
513 /* allow shift to override */ 692 /* allow shift to override */
514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
515 { 694 {
516 STRCPY (kbuf, "\033Oq"); 695 strcpy (kbuf, "\033Oq");
517 break; 696 break;
518 } 697 }
519 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
520#endif 699#endif
521 case XK_End: 700 case XK_End:
522 STRCPY (kbuf, KS_END); 701 strcpy (kbuf, KS_END);
523 break; 702 break;
524#ifdef XK_KP_Home 703#ifdef XK_KP_Home
525 case XK_KP_Home: 704 case XK_KP_Home:
526 /* allow shift to override */ 705 /* allow shift to override */
527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
528 { 707 {
529 STRCPY (kbuf, "\033Ow"); 708 strcpy (kbuf, "\033Ow");
530 break; 709 break;
531 } 710 }
532 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
533#endif 712#endif
534 case XK_Home: 713 case XK_Home:
535 STRCPY (kbuf, KS_HOME); 714 strcpy (kbuf, KS_HOME);
536 break; 715 break;
537 716
538#define FKEY(n, fkey) \ 717#define FKEY(n, fkey) \
539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
540 719
… …
592#undef FKEY 771#undef FKEY
593 default: 772 default:
594 newlen = 0; 773 newlen = 0;
595 break; 774 break;
596 } 775 }
776
597 if (newlen) 777 if (newlen)
598 len = STRLEN (kbuf); 778 len = strlen (kbuf);
599 } 779 }
780
600 /* 781 /*
601 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
602 */ 783 */
603#ifdef META8_OPTION 784#ifdef META8_OPTION
604 if (meta && (meta_char == 0x80) && len > 0) 785 if (meta && (meta_char == 0x80) && len > 0)
… …
609 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
610 { 791 {
611 len = 1; 792 len = 1;
612 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
613 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
614 else 800 else
615 { 801 {
616#ifdef META8_OPTION 802#ifdef META8_OPTION
617 /* set 8-bit on */ 803 /* set 8-bit on */
618 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
619 { 805 {
620 unsigned char *ch; 806 unsigned char *ch;
621 807
622 for (ch = kbuf; ch < kbuf + len; ch++) 808 for (ch = kbuf; ch < kbuf + len; ch++)
623 *ch |= 0x80; 809 *ch |= 0x80;
810
624 meta = 0; 811 meta = 0;
625 } 812 }
626#endif 813#endif
627 /* nil */ ; 814 /* nil */ ;
628 } 815 }
629 } 816 }
630 817
631 if (len <= 0) 818 if (len <= 0)
632 return; /* not mapped */ 819 return; /* not mapped */
633 820
634 if (Options & Opt_scrollTtyKeypress) 821 if (options & Opt_scrollTtyKeypress)
635 if (TermWin.view_start) 822 if (TermWin.view_start)
636 { 823 {
637 TermWin.view_start = 0; 824 TermWin.view_start = 0;
638 want_refresh = 1; 825 want_refresh = 1;
639 } 826 }
… …
653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
654 841
655 /* escape prefix */ 842 /* escape prefix */
656 if (meta 843 if (meta
657#ifdef META8_OPTION 844#ifdef META8_OPTION
658 && (meta_char == C0_ESC) 845 && meta_char == C0_ESC
659#endif 846#endif
660 ) 847 )
661 { 848 {
662 const unsigned char ch = C0_ESC; 849 const unsigned char ch = C0_ESC;
663
664 tt_write (&ch, 1); 850 tt_write (&ch, 1);
665 } 851 }
852
666#ifdef DEBUG_CMD 853#if defined(DEBUG_CMD)
667 if (debug_key)
668 { /* Display keyboard buffer contents */ 854 /* Display keyboard buffer contents */
669 char *p; 855 unsigned char *p;
670 int i; 856 int i;
671 857
672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 858 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
673 for (i = 0, p = kbuf; i < len; i++, p++) 859 for (i = 0, p = kbuf; i < len; i++, p++)
674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 860 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
675 fprintf (stderr, "'\n"); 861 fprintf (stderr, "'\n");
676 }
677#endif /* DEBUG_CMD */ 862#endif /* DEBUG_CMD */
678 tt_write (kbuf, (unsigned int)len); 863 tt_write (kbuf, (unsigned int)len);
679} 864}
680/*}}} */ 865/*}}} */
681 866
682#if (MENUBAR_MAX) 867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
684/* attempt to `write' count to the input buffer */ 869/* attempt to `write' count to the input buffer */
685unsigned int 870unsigned int
686rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
687{ 872{
688 unsigned int n, s; 873 unsigned int n, s;
689 874
690 n = cmdbuf_ptr - cmdbuf_base; 875 n = cmdbuf_ptr - cmdbuf_base;
691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
877
692 if (n > 0 && s < count) 878 if (n > 0 && s < count)
693 { 879 {
694 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
696 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
697 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
698 s += n; 884 s += n;
699 } 885 }
886
700 if (count > s) 887 if (count > s)
701 { 888 {
702 rxvt_print_error ("data loss: cmd_write too large"); 889 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
703 count = s; 890 count = s;
704 } 891 }
892
705 for (; count--;) 893 for (; count--;)
706 *cmdbuf_endp++ = *str++; 894 *cmdbuf_endp++ = *str++;
895
896 cmd_parse ();
897
707 return 0; 898 return 0;
708} 899}
709#endif /* MENUBAR_MAX */ 900#endif
710 901
711void 902void
712rxvt_term::flush () 903rxvt_term::flush ()
713{ 904{
905 flush_ev.stop ();
906
714#ifdef TRANSPARENT 907#ifdef TRANSPARENT
715 if (want_full_refresh) 908 if (want_full_refresh)
716 { 909 {
717 want_full_refresh = 0; 910 want_full_refresh = 0;
718 scr_clear (); 911 scr_clear ();
719 scr_touch (false); 912 scr_touch (false);
720 want_refresh = 1;
721 } 913 }
722#endif 914#endif
723 915
724 if (want_refresh) 916 if (want_refresh)
725 { 917 {
726 scr_refresh (refresh_type); 918 scr_refresh (refresh_type);
727 scrollbar_show (1); 919 scrollbar_show (1);
728#ifdef USE_XIM 920#ifdef USE_XIM
729 IMSendSpot (); 921 IMSendSpot ();
730#endif 922#endif
731
732 } 923 }
733 924
734 display->flush (); 925 display->flush ();
735} 926}
736 927
… …
738rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
739{ 930{
740 SET_R (this); 931 SET_R (this);
741 SET_LOCALE (locale); 932 SET_LOCALE (locale);
742 933
934 display->flush ();
935
936 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01);
938}
939
940void
941rxvt_term::flush_cb (time_watcher &w)
942{
943 SET_R (this);
944 SET_LOCALE (locale);
945
946 refresh_limit = 1;
947 refresh_count = 0;
743 flush (); 948 flush ();
744} 949}
745 950
746#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
747void 952void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 971 }
767} 972}
768#endif 973#endif
769 974
975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
976void
977rxvt_term::cont_scroll_cb (time_watcher &w)
978{
979 if ((scrollbar_isUp() || scrollbar_isDn()) &&
980 scr_page (scrollbar_isUp() ? UP : DN, 1))
981 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
985 }
986}
987#endif
988
989#ifdef SELECTION_SCROLLING
990void
991rxvt_term::sel_scroll_cb (time_watcher &w)
992{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines))
994 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
999 }
1000}
1001#endif
1002
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004void
1005rxvt_term::slip_wheel_cb (time_watcher &w)
1006{
1007 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed))
1010 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 }
1019}
1020#endif
1021
770bool 1022bool
771rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
772{ 1024{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026
1027 if (CBUFSIZ == n)
1028 {
1029 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1030 n = 0;
1031 }
774 1032
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
778 1036
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
780 1038
781 if (n > 0) 1039 if (n > 0)
782 { 1040 {
783 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
784 return true; 1042 return true;
785 } 1043 }
786 else if (n < 0 && errno != EAGAIN) 1044 else if (n < 0 && errno != EAGAIN)
787 destroy (); 1045 destroy ();
788 1046
789 return false; 1047 return false;
790} 1048}
791 1049
792void 1050void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
794{ 1052{
795 SET_R (this); 1053 SET_R (this);
796 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
797 1055
1056 if (revents & EVENT_READ)
1057 // loop, but don't allow a single term to monopolize us
1058 while (pty_fill ())
1059 if (cmd_parse ())
1060 break;
1061
798 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1063 pty_write ();
800 else if (revents & EVENT_READ)
801 {
802 bool flag = true;
803
804 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 while (flag && pty_fill ())
807 {
808 if (!seen_input)
809 {
810 seen_input = 1;
811 /* once we know the shell is running, send the screen size. Again! */
812 tt_winch ();
813 }
814
815 uint32_t ch = NOCHAR;
816
817 for (;;)
818 {
819 if (ch == NOCHAR)
820 ch = next_char ();
821
822 if (ch == NOCHAR) // TODO: improve
823 break;
824
825 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
826 {
827 /* Read a text string from the input buffer */
828 uint32_t buf[BUFSIZ];
829 bool refreshnow = false;
830 int nlines = 0;
831 uint32_t *str = buf;
832
833 *str++ = ch;
834
835 for (;;)
836 {
837 ch = next_char ();
838
839 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
840 break;
841 else
842 {
843 *str++ = ch;
844
845 if (ch == '\n')
846 {
847 nlines++;
848 refresh_count++;
849
850 if (! (Options & Opt_jumpScroll)
851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 {
853 refreshnow = true;
854 flag = false;
855 ch = NOCHAR;
856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 scr_add_lines (buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 scr_refresh (refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 process_nonprinting (ch);
902 break;
903 case C0_ESC: /* escape char */
904 process_escape_seq ();
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* process_csi_seq (); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
915} 1064}
916 1065
917// read the next character, currently handles UTF-8 1066void
918// will probably handle all sorts of other stuff in the future 1067rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1068{
922 while (cmdbuf_ptr < cmdbuf_endp) 1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 1070 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1071
927 wchar_t wc; 1072#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1073 hidden_pointer = 0;
929 1074
930 if (len == (size_t)-2) 1075 if (options & Opt_pointerBlank)
931 return NOCHAR; 1076 pointer_ev.start (NOW + pointerBlankDelay);
932 1077#endif
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
942}
943
944/* rxvt_cmd_getc () - Return next input character */
945/*
946 * Return the next input character after first passing any keyboard input
947 * to the command.
948 */
949uint32_t
950rxvt_term::cmd_getc ()
951{
952 for (;;)
953 {
954 uint32_t c = next_char ();
955 if (c != NOCHAR)
956 return c;
957
958 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (cmd_fd, F_SETFL, 0);
961 pty_fill ();
962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964} 1078}
965 1079
966#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
967void 1081void
968rxvt_term::pointer_unblank ()
969{
970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
971 recolour_cursor ();
972
973 hidden_pointer = 0;
974
975 if (Options & Opt_pointerBlank)
976 pointer_ev.start (NOW + pointerBlankDelay);
977}
978
979void
980rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
981{ 1083{
982 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
983 return; 1085 return;
984 1086
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
986 XFlush (display->display); 1088 XFlush (display->display);
987 1089
988 hidden_pointer = 1; 1090 hidden_pointer = 1;
989} 1091}
990 1092
… …
997 pointer_blank (); 1099 pointer_blank ();
998} 1100}
999#endif 1101#endif
1000 1102
1001void 1103void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1104rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1105{
1004 int button_number, key_state = 0; 1106 int button_number, key_state = 0;
1005 int x, y; 1107 int x, y;
1006 1108
1007 x = ev.x; 1109 x = ev.x;
1008 y = ev.y; 1110 y = ev.y;
1009 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
1010 1112
1011 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1114 button_number = 3;
1014 }
1015 else 1115 else
1016 { 1116 {
1017 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1119 if (button_number >= 3)
1020 button_number += (64 - 3); 1120 button_number += (64 - 3);
1021 } 1121 }
1022 1122
1023 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
1024 { 1124 {
1025 /* 1125 /*
1026 * do not report ButtonRelease 1126 * do not report ButtonRelease
1027 * no state info allowed 1127 * no state info allowed
1028 */ 1128 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1147#endif
1048
1049 } 1148 }
1050 1149
1051#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1152 if (key_state & 16)
1054 fputc ('C', stderr); 1153 fputc ('C', stderr);
1055 if (key_state & 4) 1154 if (key_state & 4)
1056 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1159 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1161 button_number,
1063 x + 1, 1162 x + 1,
1064 y + 1); 1163 y + 1);
1065#else 1164#endif
1165
1066 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
1068 (32 + x + 1), 1168 (32 + x + 1),
1069 (32 + y + 1)); 1169 (32 + y + 1));
1070#endif
1071} 1170}
1072 1171
1073#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
1074void 1173void
1075rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
1082 1181
1083/*{{{ process an X event */ 1182/*{{{ process an X event */
1084void 1183void
1085rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
1086{ 1185{
1186 dDisp;
1187
1087 SET_R (this); 1188 SET_R (this);
1088 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
1089 1190
1090#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1092 { 1193 {
1093 if (hidden_cursor) 1194 if (hidden_cursor)
1094 { 1195 {
1095 hidden_cursor = 0; 1196 hidden_cursor = 0;
1096 want_refresh = 1; 1197 want_refresh = 1;
… …
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 } 1201 }
1101#endif 1202#endif
1102 1203
1103#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 { 1206 {
1106 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
1109 if (hidden_pointer) 1210 if (hidden_pointer)
… …
1112 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank (); 1214 pointer_blank ();
1114 } 1215 }
1115#endif 1216#endif
1116 1217
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1122 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1220 unsigned int unused_mask;
1125
1126#ifdef DEBUG_X
1127 const char *const eventnames[] =
1128 { /* mason - this matches my system */
1129 "",
1130 "",
1131 "KeyPress",
1132 "KeyRelease",
1133 "ButtonPress",
1134 "ButtonRelease",
1135 "MotionNotify",
1136 "EnterNotify",
1137 "LeaveNotify",
1138 "FocusIn",
1139 "FocusOut",
1140 "KeymapNotify",
1141 "Expose",
1142 "GraphicsExpose",
1143 "NoExpose",
1144 "VisibilityNotify",
1145 "CreateNotify",
1146 "DestroyNotify",
1147 "UnmapNotify",
1148 "MapNotify",
1149 "MapRequest",
1150 "ReparentNotify",
1151 "ConfigureNotify",
1152 "ConfigureRequest",
1153 "GravityNotify",
1154 "ResizeRequest",
1155 "CirculateNotify",
1156 "CirculateRequest",
1157 "PropertyNotify",
1158 "SelectionClear",
1159 "SelectionRequest",
1160 "SelectionNotify",
1161 "ColormapNotify",
1162 "ClientMessage",
1163 "MappingNotify"
1164 };
1165#endif
1166
1167#ifdef DEBUG_X
1168 struct timeval tp;
1169 struct tm *ltt;
1170 (void)gettimeofday (&tp, NULL);
1171 ltt = localtime (& (tp.tv_sec));
1172 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));
1173#endif
1174 1221
1175 switch (ev.type) 1222 switch (ev.type)
1176 { 1223 {
1177 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
1178 lookup_key (ev.xkey); 1228 lookup_key (ev.xkey);
1229
1230 break;
1231
1232 case KeyRelease:
1233 {
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1235 KeySym ks;
1236
1237 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1238#endif
1239
1240#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support
1242 if (iso14755buf)
1243 if (iso14755buf & ISO_14755_52)
1244 {
1245# if ENABLE_OVERLAY
1246 scr_overlay_off ();
1247# endif
1248# if ISO_14755
1249 // iso14755 part 5.2 handling: release time
1250 // first: controls
1251 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f)))
1254 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1256 commit_iso14755 ();
1257 return; // case-break;
1258 }
1259
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks)
1262 {
1263 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 scr_bell ();
1269# endif
1270 iso14755buf = 0;
1179 break; 1271 break;
1272 }
1273 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1274 {
1275# if ENABLE_OVERLAY
1276 scr_overlay_off ();
1277# endif
1278 if (iso14755buf & ISO_14755_51)
1279 commit_iso14755 ();
1280#if ISO_14755
1281 else if (iso14755buf & ISO_14755_STARTED)
1282 {
1283 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1284
1285 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1286 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1287 }
1288# endif
1289 else
1290 iso14755buf = 0;
1291 }
1292#endif
1180 1293
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1295 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
1186 else 1299#endif
1187 {
1188 KeySym ks;
1189
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0;
1193 }
1194 break; 1300 break;
1195 } 1301 }
1196#endif
1197 1302
1198 case ButtonPress: 1303 case ButtonPress:
1199 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1200 break; 1305 break;
1201 1306
… …
1213 && (ev.xclient.data.l[0] == DndFile 1318 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1319 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1320 || ev.xclient.data.l[0] == DndLink))
1216 { 1321 {
1217 /* Get Dnd data */ 1322 /* Get Dnd data */
1218 Atom ActualType; 1323 Atom ActualType;
1219 int ActualFormat; 1324 int ActualFormat;
1220 unsigned char *data; 1325 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1222 1327
1223 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1224 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1330 0L, 1000000L,
1226 False, AnyPropertyType, 1331 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1229 &data); 1334 &data);
1230 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1336 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1236 } 1339 }
1237#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1238 break; 1341 break;
1239 1342
1240 case MappingNotify: 1343 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1345 break;
1243 1346
1244 /* 1347 /*
1245 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1271 { 1374 {
1272 TermWin.focus = 1; 1375 TermWin.focus = 1;
1273 want_refresh = 1; 1376 want_refresh = 1;
1274#ifdef USE_XIM 1377#ifdef USE_XIM
1275 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1276 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1277#endif 1383#endif
1278#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1281#endif 1394#endif
1282 1395
1283 } 1396 }
1284 break; 1397 break;
1285 1398
1286 case FocusOut: 1399 case FocusOut:
1287 if (TermWin.focus) 1400 if (TermWin.focus)
1288 { 1401 {
1289 TermWin.focus = 0; 1402 TermWin.focus = 0;
1290 want_refresh = 1; 1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1291#ifdef USE_XIM 1411#ifdef USE_XIM
1292 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1293 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1294#endif 1414#endif
1295#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1418 hidden_cursor = 0;
1299#endif 1419#endif
1300 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1301 } 1427 }
1302 break; 1428 break;
1303 1429
1304 case ConfigureNotify: 1430 case ConfigureNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1310 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1311 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1312 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1314 } 1440 }
1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1316 1442
1317 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1318 { 1444 {
1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1320 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1321 } 1447 }
1322#ifdef DEBUG_SIZE 1448
1323 else
1324 {
1325 D_SIZE ((stderr, "Size: Not resizing"));
1326 }
1327#endif
1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1329 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1330 {
1331 check_our_parents (); 1451 check_our_parents ();
1332 if (am_transparent)
1333 want_full_refresh = 1;
1334 }
1335#endif 1452#endif
1336
1337 } 1453 }
1338 break; 1454 break;
1339 1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break;
1462
1340 case SelectionClear: 1463 case SelectionClear:
1341 display->set_selection_owner (0); 1464 selection_clear ();
1342 break; 1465 break;
1343 1466
1344 case SelectionNotify: 1467 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1470 break;
1349 1471
1350 case SelectionRequest: 1472 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1352 break; 1474 break;
… …
1373 1495
1374 case GraphicsExpose: 1496 case GraphicsExpose:
1375 case Expose: 1497 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1377 { 1499 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1504
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1510
1386 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1512 }
1390 else 1513 else
1391 { 1514 {
1392 XEvent unused_event; 1515 XEvent unused_event;
1393 1516
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1395 Expose, 1518 ;
1396 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1398 GraphicsExpose, 1521
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1401 { 1523 {
1402 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1403 scrollbar_show (0); 1525 scrollbar_show (0);
1404 } 1526 }
1405#ifdef MENUBAR 1527#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1529 menubar_expose ();
1408#endif 1530#endif
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1534 XClearWindow (disp, ev.xany.window);
1535#endif
1409 } 1536 }
1410 break; 1537 break;
1411 1538
1412 case MotionNotify: 1539 case MotionNotify:
1413#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1542 pointer_unblank ();
1416#endif 1543#endif
1417#if MENUBAR 1544#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1545 if (isMenuBarWindow (ev.xany.window))
1419 { 1546 {
1420 menubar_control (& (ev.xbutton)); 1547 menubar_control (ev.xbutton);
1421 break; 1548 break;
1422 } 1549 }
1423#endif 1550#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1552 break;
1426 1553
1427 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1428 { 1555 {
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1557 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1432 ; 1559 ;
1433 1560
1434 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1435 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1565 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1569 {
1443#endif 1570#endif
1571#if ISO_14755
1572 // 5.4
1573 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1574 {
1575 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1576 break;
1577 }
1578#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1446#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1585 {
1450 int dist; 1586 int dist;
1451 1587
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1456 */ 1590 */
1457 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1593
1460 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1462 */ 1596 */
1463 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1600
1468 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1470 { 1603 {
1471 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1473 } 1606 }
1474 else 1607 else
1475 { 1608 {
1476 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y -
1478 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1479 } 1611 }
1612
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1482 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1484 } 1618 }
1485 else 1619 else
1486 { 1620 {
1487 /* we are within the text window, so we 1621 /* we are within the text window, so we
1488 * shouldn't be scrolling 1622 * shouldn't be scrolling
1489 */ 1623 */
1490 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1491 } 1626 }
1492#endif 1627#endif
1493#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1494
1495 } 1629 }
1496#endif 1630#endif
1497
1498 } 1631 }
1499 } 1632 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1634 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1503 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1504 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1505 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1643 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1645 scrollbar_size ());
1511 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1514 } 1649 }
1515 break; 1650 break;
1516 } 1651 }
1517} 1652}
1518 1653
1654#if TRANSPARENT
1519void 1655void
1520rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1657{
1522 SET_R (this); 1658 SET_R (this);
1523 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1524 1660
1525 switch (ev.type) 1661 switch (ev.type)
1526 { 1662 {
1527 case PropertyNotify: 1663 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /* 1664 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1665 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on. 1666 * use the property to determine the pixmap. We use it later on.
1540 */ 1667 */
1541 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1670 return;
1546 }
1547 1671
1548 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1549 case ReparentNotify: 1673 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1553 break; 1676 break;
1554#endif
1555 } 1677 }
1556} 1678}
1679#endif
1557 1680
1558void 1681void
1559rxvt_term::button_press (const XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1560{ 1683{
1561 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1562 1685
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1687 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1566 /* 1690 /*
1567 * VT window processing of button press 1691 * VT window processing of button press
1568 */ 1692 */
1569 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1570 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1572 if (reportmode) 1706 if (reportmode)
1573 { 1707 {
1574 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1605 } 1739 }
1606 else 1740 else
1607 { 1741 {
1608 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1610 switch (ev.button) 1745 switch (ev.button)
1611 { 1746 {
1612 case Button1: 1747 case Button1:
1748 /* allow meta + click to select rectangular areas */
1749 /* should be done in screen.C */
1750#if ENABLE_FRILLS
1751 selection.rect = !!(ev.state & ModMetaMask);
1752#else
1753 selection.rect = false;
1754#endif
1755
1613 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1758 {
1616 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1618 else 1761 else
1619 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1777 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1637 else 1780 else
1638 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1639 MEvent.button = Button3; 1783 MEvent.button = Button3;
1640 break; 1784 break;
1641 } 1785 }
1642 } 1786 }
1787
1643 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1644 return; 1789 return;
1645 } 1790 }
1646 1791
1647 /* 1792 /*
… …
1713 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1714 } 1859 }
1715 if (upordown) 1860 if (upordown)
1716 { 1861 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1864#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1866 {
1722 if (upordown < 0) 1867 if (upordown < 0)
1723 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1739 break; 1884 break;
1740 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1742 break; 1887 break;
1743 } 1888 }
1889
1744 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 1894
1749 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1750 break; 1896 break;
1751 1897
1752 case Button1: 1898 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1777 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 1924 (TermWin.nrow
1779 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 1926 / scrollbar_size ()));
1781 } 1927 }
1928
1782 break; 1929 break;
1783 } 1930 }
1784 } 1931 }
1785 return; 1932 return;
1786 } 1933 }
… …
1792 menubar_control (ev); 1939 menubar_control (ev);
1793#endif 1940#endif
1794} 1941}
1795 1942
1796void 1943void
1797rxvt_term::button_release (const XButtonEvent &ev) 1944rxvt_term::button_release (XButtonEvent &ev)
1798{ 1945{
1799 int reportmode = 0; 1946 int reportmode = 0;
1800 1947
1801 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1949 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 1951
1805 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1806 { 1953 {
1807 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1808 scrollbar_show (0); 1955 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1958#endif
1812
1813 } 1959 }
1960
1814#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1816#endif 1964#endif
1965
1817 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1818 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1819 if (reportmode) 1973 if (reportmode)
1820 { 1974 {
1821 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1838 mouse_report (ev); 1992 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 1994 return;
1841 } 1995 }
1996
1842 /* 1997 /*
1843 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 1999 * when overriding mouse reporting
1845 */ 2000 */
1846 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2002 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1850 2005
1851 switch (ev.button) 2006 switch (ev.button)
… …
1862 case Button5: 2017 case Button5:
1863 { 2018 {
1864 int i; 2019 int i;
1865 page_dirn v; 2020 page_dirn v;
1866 2021
1867 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1868 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1869 i = 1; 2025 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1872 else 2028 else
1873 i = 5; 2029 i = 5;
2030
1874# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1876 { 2033 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2034 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2037
2038 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1879 } 2042 }
2043 else
2044 {
1880# endif 2045# endif
1881# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1888 scr_page (v, 1); 2047 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2049 scrollbar_show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING
1891 } 2059 }
1892# endif 2060#endif
1893
1894 } 2061 }
1895 break; 2062 break;
1896#endif 2063#endif
1897
1898 } 2064 }
1899 } 2065 }
1900#ifdef MENUBAR 2066#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2068 menubar_control (ev);
1903#endif 2069#endif
1904} 2070}
1905 2071
1906
1907#ifdef TRANSPARENT 2072#ifdef TRANSPARENT
2073#if TINTING
2074/* taken from aterm-0.4.2 */
2075
2076typedef uint32_t RUINT32T;
2077
2078void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2079{
2080 int sh_r, sh_g, sh_b;
2081 RUINT32T mask_r, mask_g, mask_b;
2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2085 int i;
2086
2087 Visual *visual = display->visual;
2088
2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2090
2091 /* for convenience */
2092 mask_r = visual->red_mask;
2093 mask_g = visual->green_mask;
2094 mask_b = visual->blue_mask;
2095
2096 /* boring lookup table pre-initialization */
2097 switch (srcImage->bits_per_pixel) {
2098 case 15:
2099 if ((mask_r != 0x7c00) ||
2100 (mask_g != 0x03e0) ||
2101 (mask_b != 0x001f))
2102 return;
2103 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2104 lookup_r = lookup;
2105 lookup_g = lookup+32;
2106 lookup_b = lookup+32+32;
2107 sh_r = 10;
2108 sh_g = 5;
2109 sh_b = 0;
2110 break;
2111 case 16:
2112 if ((mask_r != 0xf800) ||
2113 (mask_g != 0x07e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+64;
2120 sh_r = 11;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 24:
2125 if ((mask_r != 0xff0000) ||
2126 (mask_g != 0x00ff00) ||
2127 (mask_b != 0x0000ff))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2130 lookup_r = lookup;
2131 lookup_g = lookup+256;
2132 lookup_b = lookup+256+256;
2133 sh_r = 16;
2134 sh_g = 8;
2135 sh_b = 0;
2136 break;
2137 case 32:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 default:
2151 return; /* we do not support this color depth */
2152 }
2153
2154 /* prepare limits for color transformation (each channel is handled separately) */
2155 if (shade < 0) {
2156 shade = -shade;
2157 if (shade < 0) shade = 0;
2158 if (shade > 100) shade = 100;
2159
2160 lower_lim_r = 65535-rm;
2161 lower_lim_g = 65535-gm;
2162 lower_lim_b = 65535-bm;
2163
2164 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2165 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2166 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2167
2168 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2169 } else {
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2174
2175 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2176 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2177 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2178 }
2179
2180 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2181 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2182 {
2183 unsigned int tmp;
2184
2185 tmp = lower_lim_r;
2186 lower_lim_r = lower_lim_b;
2187 lower_lim_b = tmp;
2188
2189 tmp = upper_lim_r;
2190 upper_lim_r = upper_lim_b;
2191 upper_lim_b = tmp;
2192 }
2193
2194 /* fill our lookup tables */
2195 for (i = 0; i <= mask_r>>sh_r; i++)
2196 {
2197 RUINT32T tmp;
2198 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2199 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2200 lookup_r[i] = (tmp/65535)<<sh_r;
2201 }
2202 for (i = 0; i <= mask_g>>sh_g; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2206 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2207 lookup_g[i] = (tmp/65535)<<sh_g;
2208 }
2209 for (i = 0; i <= mask_b>>sh_b; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2213 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2214 lookup_b[i] = (tmp/65535)<<sh_b;
2215 }
2216
2217 /* apply table to input image (replacing colors by newly calculated ones) */
2218 switch (srcImage->bits_per_pixel)
2219 {
2220 case 15:
2221 {
2222 unsigned short *p1, *pf, *p, *pl;
2223 p1 = (unsigned short *) srcImage->data;
2224 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2225 while (p1 < pf)
2226 {
2227 p = p1;
2228 pl = p1 + srcImage->width;
2229 for (; p < pl; p++)
2230 {
2231 *p = lookup_r[(*p & 0x7c00)>>10] |
2232 lookup_g[(*p & 0x03e0)>> 5] |
2233 lookup_b[(*p & 0x001f)];
2234 }
2235 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2236 }
2237 break;
2238 }
2239 case 16:
2240 {
2241 unsigned short *p1, *pf, *p, *pl;
2242 p1 = (unsigned short *) srcImage->data;
2243 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2244 while (p1 < pf)
2245 {
2246 p = p1;
2247 pl = p1 + srcImage->width;
2248 for (; p < pl; p++)
2249 {
2250 *p = lookup_r[(*p & 0xf800)>>11] |
2251 lookup_g[(*p & 0x07e0)>> 5] |
2252 lookup_b[(*p & 0x001f)];
2253 }
2254 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2255 }
2256 break;
2257 }
2258 case 24:
2259 {
2260 unsigned char *p1, *pf, *p, *pl;
2261 p1 = (unsigned char *) srcImage->data;
2262 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2263 while (p1 < pf)
2264 {
2265 p = p1;
2266 pl = p1 + srcImage->width * 3;
2267 for (; p < pl; p += 3)
2268 {
2269 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2270 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2271 p[2] = lookup_r[(p[2] & 0x0000ff)];
2272 }
2273 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2274 }
2275 break;
2276 }
2277 case 32:
2278 {
2279 RUINT32T *p1, *pf, *p, *pl;
2280 p1 = (RUINT32T *) srcImage->data;
2281 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282
2283 while (p1 < pf)
2284 {
2285 p = p1;
2286 pl = p1 + srcImage->width;
2287 for (; p < pl; p++)
2288 {
2289 *p = lookup_r[(*p & 0xff0000)>>16] |
2290 lookup_g[(*p & 0x00ff00)>> 8] |
2291 lookup_b[(*p & 0x0000ff)] |
2292 (*p & ~0xffffff);
2293 }
2294 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 }
2299
2300 free (lookup);
2301}
2302#endif
2303
1908/* 2304/*
1909 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2306 * Do transparency updates if required
1911 */ 2307 */
1912int 2308int
1913rxvt_term::check_our_parents () 2309rxvt_term::check_our_parents ()
1914{ 2310{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2311 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2312 unsigned long nitems, bytes_after;
1917 Atom atype; 2313 Atom atype;
1918 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2315 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1922 2319
1923 pchanged = 0; 2320 pchanged = 0;
1924 2321
1925 if (! (Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1927 2324
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1930 2327
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2329
1932 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1933 { 2331 {
1934 if (am_transparent) 2332 if (am_transparent)
1935 { 2333 {
1936 pchanged = 1; 2334 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1940 } 2337 }
2338
1941 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1942 } 2340 }
1943 2341
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2342 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2343 XSync (disp, False);
1946 2344
1947 /* 2345 /*
1948 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2348 * windows for each client, so we have to take care about that.
1951 */ 2349 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2350 i = (xa[XA_XROOTPMAP_ID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2353 &nitems, &bytes_after, &prop) == Success);
2354
1956 if (!i || prop == NULL) 2355 if (!i || prop == NULL)
2356 i = (xa[XA_ESETROOT_PMAP_ID]
2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success);
2360
2361 if (!i || prop == NULL
2362#if TINTING
2363 || !rs[Rs_color + Color_tint]
2364#endif
2365 )
1957 have_pixmap = 0; 2366 have_pixmap = 0;
1958 else 2367 else
1959 { 2368 {
1960 have_pixmap = 1; 2369 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2370 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2371 XFree (prop);
1963 } 2372 }
2373
1964 if (have_pixmap) 2374 if (have_pixmap)
1965 { 2375 {
1966 /* 2376 /*
1967 * Copy display->root pixmap transparency 2377 * Copy display->root pixmap transparency
1968 */ 2378 */
1969 int sx, sy, nx, ny; 2379 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2380 unsigned int nw, nh;
1971 Window cr; 2381 Window cr;
1972 XImage *image; 2382 XImage *image;
1973 GC gc; 2383 GC gc;
1974 XGCValues gcvalue; 2384 XGCValues gcvalue;
1975 2385
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2390 nx = ny = 0;
2391
1981 if (sx < 0) 2392 if (sx < 0)
1982 { 2393 {
1983 nw += sx; 2394 nw += sx;
1984 nx = -sx; 2395 nx = -sx;
1985 sx = 0; 2396 sx = 0;
1986 } 2397 }
2398
1987 if (sy < 0) 2399 if (sy < 0)
1988 { 2400 {
1989 nh += sy; 2401 nh += sy;
1990 ny = -sy; 2402 ny = -sy;
1991 sy = 0; 2403 sy = 0;
1992 } 2404 }
2405
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
1995 allowedxerror = -1; 2410 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2412
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2415 allowedxerror = 0;
2416
2001 if (image == NULL) 2417 if (image == NULL)
2002 { 2418 {
2003 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
2004 { 2420 {
2005 pchanged = 1; 2421 pchanged = 1;
2006 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
2007 { 2423 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
2009 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
2010 } 2426 }
2011 } 2427 }
2428
2012 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
2013 } 2430 }
2014 else 2431 else
2015 { 2432 {
2016 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2434 XFreePixmap (disp, TermWin.pixmap);
2435
2436#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint))
2438 {
2439 unsigned short rm, gm, bm;
2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2441
2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2443
2444 ShadeXImage (display, image, shade, rm, gm, bm);
2445 }
2446#endif
2447
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2449 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2452 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
2027 XDestroyImage (image); 2454 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2029 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2457
2030 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2459 pchanged = 1;
2460
2032 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
2033 } 2462 }
2034 } 2463 }
2464
2035 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2036 { 2468 {
2037 unsigned int n; 2469 unsigned int n;
2038 /* 2470 /*
2039 * InheritPixmap transparency 2471 * InheritPixmap transparency
2040 */ 2472 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2474 {
2045 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2478 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
2050 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2051 { 2481 {
2052 if (oldp != None) 2482 if (oldp != None)
2053 pchanged = 1; 2483 pchanged = 1;
2484
2054 break; 2485 break;
2055 } 2486 }
2487
2056 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2489 pchanged = 1;
2058 } 2490 }
2491
2059 n = 0; 2492 n = 0;
2493
2060 if (pchanged) 2494 if (pchanged)
2061 { 2495 {
2062 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2063 { 2497 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2500 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2502 break;
2070 } 2503 }
2071 } 2504 }
2072 } 2505 }
2073 if (n > (int) (sizeof (TermWin.parent) 2506
2074 / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2508 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2078 PixColors[Color_fg]);
2079 XSetWindowBackground (display->display, TermWin.vt,
2080 PixColors[Color_bg]);
2081 am_transparent = 0; 2511 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2083 } 2513 }
2084 else 2514 else
2085 { 2515 {
2516#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2088# ifdef HAVE_NANOSLEEP
2089 struct timespec rqt;
2090
2091 rqt.tv_sec = 1;
2092 rqt.tv_nsec = 0;
2093 nanosleep (&rqt, NULL);
2094# else
2095 sleep (1); 2519 sleep (1);
2096# endif 2520#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2526
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2528 am_transparent = 1;
2104 } 2529 }
2530
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2107 } 2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2542 if (am_transparent)
2543 {
2544 want_refresh = want_full_refresh = 1;
2545 if (am_pixmap_trans)
2546 flush ();
2547 }
2548
2108 return pchanged; 2549 return pchanged;
2109} 2550}
2110#endif 2551#endif
2111 2552
2112/*}}} */ 2553/*}}} */
2554
2555bool
2556rxvt_term::cmd_parse ()
2557{
2558 bool flag = false;
2559 unicode_t ch = NOCHAR;
2560 unsigned char *seq_begin; // remember start of esc-sequence here
2561
2562 for (;;)
2563 {
2564 if (ch == NOCHAR)
2565 {
2566 seq_begin = cmdbuf_ptr;
2567 ch = next_char ();
2568 }
2569
2570 if (ch == NOCHAR) // TODO: improve
2571 break;
2572
2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574 {
2575 if (!seen_input)
2576 {
2577 seen_input = 1;
2578 // many badly-written programs (e.g. jed) contain a race condition:
2579 // they first read the screensize and then install a SIGWINCH handler.
2580 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized.
2585 if (seen_resize)
2586 kill (-cmd_pid, SIGWINCH);
2587 }
2588
2589 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ];
2591 bool refreshnow = false;
2592 int nlines = 0;
2593 unicode_t *str = buf;
2594
2595 for (;;)
2596 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break;
2599
2600 *str++ = ch;
2601
2602 if (ch == C0_LF)
2603 {
2604 nlines++;
2605 refresh_count++;
2606
2607 if (!(options & Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2609 {
2610 refreshnow = true;
2611 ch = NOCHAR;
2612 break;
2613 }
2614
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2616 if (nlines >= TermWin.nrow - 1)
2617 {
2618 scr_add_lines (buf, nlines, str - buf);
2619 nlines = 0;
2620 str = buf;
2621 }
2622 }
2623
2624 if (str >= buf + UBUFSIZ)
2625 {
2626 ch = NOCHAR;
2627 break;
2628 }
2629
2630 seq_begin = cmdbuf_ptr;
2631 ch = next_char ();
2632 }
2633
2634 scr_add_lines (buf, nlines, str - buf);
2635
2636 /*
2637 * If there have been a lot of new lines, then update the screen
2638 * What the heck I'll cheat and only refresh less than every page-full.
2639 * the number of pages between refreshes is refresh_limit, which
2640 * is incremented here because we must be doing flat-out scrolling.
2641 */
2642 if (refreshnow)
2643 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++;
2646 else
2647 {
2648 flag = true;
2649 scr_refresh (refresh_type);
2650 }
2651 }
2652
2653 }
2654 else
2655 {
2656 try
2657 {
2658 process_nonprinting (ch);
2659 }
2660 catch (const class out_of_input &o)
2661 {
2662 // we ran out of input, retry later
2663 cmdbuf_ptr = seq_begin;
2664 break;
2665 }
2666
2667 ch = NOCHAR;
2668 }
2669 }
2670
2671 return flag;
2672}
2673
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681}
2682
2683// read the next character
2684unicode_t
2685rxvt_term::next_char ()
2686{
2687 while (cmdbuf_ptr < cmdbuf_endp)
2688 {
2689 // assume 7-bit to be ascii ALWAYS
2690 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2691 return *cmdbuf_ptr++;
2692
2693 wchar_t wc;
2694 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2695
2696 if (len == (size_t)-2)
2697 {
2698 // the mbstate stores incomplete sequences. didn't know this :/
2699 cmdbuf_ptr = cmdbuf_endp;
2700 break;
2701 }
2702
2703 if (len == (size_t)-1)
2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2705
2706 // assume wchar == unicode
2707 cmdbuf_ptr += len;
2708 return wc & UNICODE_MASK;
2709 }
2710
2711 return NOCHAR;
2712}
2713
2714/* rxvt_cmd_getc () - Return next input character */
2715/*
2716 * Return the next input character after first passing any keyboard input
2717 * to the command.
2718 */
2719unicode_t
2720rxvt_term::cmd_getc ()
2721{
2722 unicode_t c = next_char ();
2723
2724 if (c == NOCHAR)
2725 throw out_of_input;
2726
2727 return c;
2728}
2729
2730unicode_t
2731rxvt_term::cmd_get8 ()
2732{
2733 unicode_t c = next_octet ();
2734
2735 if (c == NOCHAR)
2736 throw out_of_input;
2737
2738 return c;
2739}
2113 2740
2114/*{{{ print pipe */ 2741/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2742/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2743#ifdef PRINTPIPE
2117FILE * 2744FILE *
2118rxvt_term::popen_printer () 2745rxvt_term::popen_printer ()
2119{ 2746{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2747 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2748
2122 if (stream == NULL) 2749 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2750 rxvt_warn ("can't open printer pipe, not printing.\n");
2751
2124 return stream; 2752 return stream;
2125} 2753}
2126 2754
2127int 2755int
2128rxvt_term::pclose_printer (FILE *stream) 2756rxvt_term::pclose_printer (FILE *stream)
2129{ 2757{
2130 fflush (stream); 2758 fflush (stream);
2131 /* pclose () reported not to work on SunOS 4.1.3 */
2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2133 /* pclose works provided SIGCHLD handler uses waitpid */
2134 return pclose (stream); /* return fclose (stream); */
2135# else
2136 return pclose (stream); 2759 return pclose (stream);
2137# endif
2138} 2760}
2139 2761
2140/* 2762/*
2141 * simulate attached vt100 printer 2763 * simulate attached vt100 printer
2142 */ 2764 */
2143void 2765void
2144rxvt_term::process_print_pipe () 2766rxvt_term::process_print_pipe ()
2145{ 2767{
2146 int done; 2768 int done;
2147 FILE *fd; 2769 FILE *fd;
2148 2770
2149 if ((fd = popen_printer ()) == NULL) 2771 if ((fd = popen_printer ()) == NULL)
2150 return; 2772 return;
2151 2773
2152 /* 2774 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2775 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2776 * is received.
2155 */ 2777 */
2156 for (done = 0; !done;) 2778 for (done = 0; !done;)
2157 { 2779 {
2158 unsigned char buf[8]; 2780 unsigned char buf[8];
2159 unsigned char ch; 2781 unicode_t ch;
2160 unsigned int i, len; 2782 unsigned int i, len;
2161 2783
2162 if ((ch = cmd_getc ()) != C0_ESC) 2784 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2785 {
2164 if (putc (ch, fd) == EOF) 2786 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2787 break; /* done = 1 */
… …
2180 { 2802 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2803 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2804 break; /* done = 1 */
2183 } 2805 }
2184 } 2806 }
2807
2185 for (i = 0; i < len; i++) 2808 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2809 if (putc (buf[i], fd) == EOF)
2187 { 2810 {
2188 done = 1; 2811 done = 1;
2189 break; 2812 break;
2190 } 2813 }
2191 } 2814 }
2192 } 2815 }
2816
2193 pclose_printer (fd); 2817 pclose_printer (fd);
2194} 2818}
2195#endif /* PRINTPIPE */ 2819#endif /* PRINTPIPE */
2196/*}}} */ 2820/*}}} */
2197 2821
2198/* *INDENT-OFF* */ 2822/* *INDENT-OFF* */
2199enum { 2823enum {
2200 C1_40 = 0x40, 2824 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2825 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2826 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2827 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2828 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2829};
2206/* *INDENT-ON* */ 2830/* *INDENT-ON* */
2207 2831
2208/*{{{ process non-printing single characters */ 2832/*{{{ process non-printing single characters */
2209void 2833void
2210rxvt_term::process_nonprinting (unsigned char ch) 2834rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2835{
2212 switch (ch) 2836 switch (ch)
2213 { 2837 {
2838 case C0_ESC:
2839 process_escape_seq ();
2840 break;
2214 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2219 else 2845 else
2220 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2222 break; 2848 break;
2223 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2224 scr_bell (); 2850 scr_bell ();
2225 break; 2851 break;
2226 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2867 scr_charset_choose (1);
2242 break; 2868 break;
2243 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2870 scr_charset_choose (0);
2245 break; 2871 break;
2872
2873#ifdef EIGHT_BIT_CONTROLS
2874 // 8-bit controls
2875 case 0x90: /* DCS */
2876 process_dcs_seq ();
2877 break;
2878 case 0x9b: /* CSI */
2879 process_csi_seq ();
2880 break;
2881 case 0x9d: /* CSI */
2882 process_osc_seq ();
2883 break;
2884#endif
2246 } 2885 }
2247} 2886}
2248/*}}} */ 2887/*}}} */
2249 2888
2250 2889
2251/*{{{ process VT52 escape sequences */ 2890/*{{{ process VT52 escape sequences */
2252void 2891void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2892rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2893{
2255 int row, col; 2894 int row, col;
2256 2895
2257 switch (ch) 2896 switch (ch)
2258 { 2897 {
… …
2310 2949
2311/*{{{ process escape sequences */ 2950/*{{{ process escape sequences */
2312void 2951void
2313rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2314{ 2953{
2315 unsigned char ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2316 2955
2317 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2318 { 2957 {
2319 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2320 return; 2959 return;
2321 } 2960 }
2322 2961
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2977 break;
2339 case '+': 2978 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2980 break;
2342#ifdef MULTICHAR_SET 2981#if ENABLE_FRILLS
2343 case '$':
2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2345 break;
2346#endif
2347#ifndef NO_FRILLS
2348 case '6': 2982 case '6':
2349 scr_backindex (); 2983 scr_backindex ();
2350 break; 2984 break;
2351#endif 2985#endif
2352 case '7': 2986 case '7':
2353 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2354 break; 2988 break;
2355 case '8': 2989 case '8':
2356 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2357 break; 2991 break;
2358#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2359 case '9': 2993 case '9':
2360 scr_forwardindex (); 2994 scr_forwardindex ();
2361 break; 2995 break;
2362#endif 2996#endif
2363 case '=': 2997 case '=':
… …
2373 break; 3007 break;
2374 3008
2375 /* 8.3.87: NEXT LINE */ 3009 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3010 case C1_NEL: /* ESC E */
2377 { 3011 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3012 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3013 scr_add_lines (nlcr, 1, 2);
2380 } 3014 }
2381 break; 3015 break;
2382 3016
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3017 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 3028 case C1_RI: /* ESC M */
2395 scr_index (DN); 3029 scr_index (DN);
2396 break; 3030 break;
2397 3031
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3032 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3033 /*case C1_SS2: scr_single_shift (2); break; */
2400 3034
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3035 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3036 /*case C1_SS3: scr_single_shift (3); break; */
2403 3037
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3038 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3039 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3040 process_dcs_seq ();
2407 break; 3041 break;
… …
2422 process_osc_seq (); 3056 process_osc_seq ();
2423 break; 3057 break;
2424 3058
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3059 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3060 case 'c':
3061 mbstate.reset ();
2427 scr_poweron (); 3062 scr_poweron ();
2428 scrollbar_show (1); 3063 scrollbar_show (1);
2429 break; 3064 break;
2430 3065
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3066 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3078
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3080/* *INDENT-OFF* */
2446enum { 3081enum {
2447 CSI_ICH = 0x40, 3082 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3083 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3084 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3085 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3086 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3087 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3088 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3103 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3104 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3105 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3106 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3107 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3108 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3109 };
2475/* *INDENT-ON* */ 3110/* *INDENT-ON* */
2476 3111
2477void 3112void
2478rxvt_term::process_csi_seq () 3113rxvt_term::process_csi_seq ()
2479{ 3114{
2480 unsigned char ch, priv, i; 3115 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3116 unsigned int nargs, p;
2482 int n, ndef; 3117 int n, ndef;
2483 int arg[ESC_ARGS]; 3118 int arg[ESC_ARGS];
2484 3119
2485 for (nargs = ESC_ARGS; nargs > 0;) 3120 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3121 arg[--nargs] = 0;
2487 3122
2488 priv = 0; 3123 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3125 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3126 { /* '<' '=' '>' '?' */
2492 priv = ch; 3127 priv = ch;
2493 ch = cmd_getc (); 3128 ch = cmd_getc ();
2494 } 3129 }
3130
2495 /* read any numerical arguments */ 3131 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3132 for (n = -1; ch < CSI_ICH; )
2497 { 3133 {
2498 if (isdigit (ch)) 3134 if (isdigit (ch))
2499 { 3135 {
… …
2506 { 3142 {
2507 if (nargs < ESC_ARGS) 3143 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3144 arg[nargs++] = n;
2509 n = -1; 3145 n = -1;
2510 } 3146 }
2511 else if (ch == '\b') 3147 else if (IS_CONTROL (ch))
2512 {
2513 scr_backspace ();
2514 }
2515 else if (ch == C0_ESC)
2516 {
2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch); 3148 process_nonprinting (ch);
2523 } 3149
2524 ch = cmd_getc (); 3150 ch = cmd_getc ();
2525 } 3151 }
2526 3152
2527 if (ch > CSI_7F) 3153 if (ch > CSI_7F)
2528 return; 3154 return;
… …
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2671 break; 3297 break;
2672 3298
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2675 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3302 break;
2677 3303
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2680 break; 3306 break;
… …
2686 tt_printf ("\033[0n"); 3312 tt_printf ("\033[0n");
2687 break; 3313 break;
2688 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2689 scr_report_position (); 3315 scr_report_position ();
2690 break; 3316 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
3318 if (options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3320 break;
2695#endif
2696 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3323 break;
2699 } 3324 }
2700 break; 3325 break;
2701 3326
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3327 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3360 break;
2736 3361
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3363 if (arg[0] == 4)
2739 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2740 break; 3367 break;
2741 3368
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3370 if (arg[0] == 4)
2744 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2745 break; 3374 break;
2746 3375
2747 /* 3376 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3378 */
… …
2761 break; 3390 break;
2762 case CSI_75: 3391 case CSI_75:
2763 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2764 break; 3393 break;
2765 3394
2766#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2767 case CSI_74: 3396 case CSI_74:
2768 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2769 break; 3398 break;
2770#endif 3399#endif
2771 3400
2772 case CSI_78: /* DECREQTPARM */ 3401 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3402 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3403 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3404 break;
2776 3405
2777 default: 3406 default:
2778 break; 3407 break;
2779 } 3408 }
2780} 3409}
2781/*}}} */ 3410/*}}} */
2782 3411
2783#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2784/* ARGSUSED */ 3413/* ARGSUSED */
2785void 3414void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3416{
2788 int x, y; 3417 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
2793 Window wdummy; 3419 Window wdummy;
3420 dDisp;
2794 3421
2795 if (nargs == 0) 3422 if (nargs == 0)
2796 return; 3423 return;
3424
2797 switch (args[0]) 3425 switch (args[0])
2798 { 3426 {
2799 /* 3427 /*
2800 * commands 3428 * commands
2801 */ 3429 */
2802 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
2804 break; 3432 break;
2805 case 2: /* iconify window */ 3433 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3435 break;
2809 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2811 break; 3438 break;
2812 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3441 break;
2815 case 5: /* raise window */ 3442 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
2817 break; 3444 break;
2818 case 6: /* lower window */ 3445 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
2820 break; 3447 break;
2821 case 7: /* refresh window */ 3448 case 7: /* refresh window */
2822 scr_touch (true); 3449 scr_touch (true);
2823 break; 3450 break;
2824 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3453 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3454 break;
3455
3456 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3457 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3458 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3459 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3460 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3461 break;
3462
3463
2833 /* 3464 /*
2834 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
2835 */ 3466 */
2836 case 11: /* report window state */ 3467 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3470 break;
2840 case 13: /* report window position */ 3471 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3477 break;
2847 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3481 break;
2851 case 18: /* report window size (chars) */ 3482 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3484 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3485 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3487 break;
2855 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3489 {
3490 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s);
3494 }
2858 break; 3495 break;
2859 case 21: /* report window title */ 3496 case 21: /* report window title */
3497 {
3498 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s);
3502 }
2862 break; 3503 break;
2863#endif
2864
2865 } 3504 }
2866} 3505}
2867#endif 3506#endif
2868 3507
2869/*----------------------------------------------------------------------*/ 3508/*----------------------------------------------------------------------*/
2870/* 3509/*
2871 * get input up until STRING TERMINATOR (or BEL) 3510 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3511 * ends_how is terminator used. returned input must be free()'d
2873 */ 3512 */
2874unsigned char * 3513unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3515{
2877 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
2878 unsigned int n = 0; 3518 unsigned int n = 0;
2879 unsigned char *s; 3519 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3520
2882 for (; (ch = cmd_getc ());) 3521 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3522 {
2884 if (ch == C0_BEL 3523 if (seen_esc)
2885 || ch == CHAR_ST 3524 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
2887 break; 3526 break;
3527 else
3528 return NULL;
3529 }
2888 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
2889 { 3531 {
2890 seen_esc = 1; 3532 seen_esc = true;
2891 continue; 3533 continue;
2892 } 3534 }
2893 else if (ch == '\t') 3535 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3536 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3537 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3541
2897 if (n < sizeof (string) - 1) 3542 if (n >= sizeof (string) - 1)
3543 // stop at some sane length
3544 return NULL;
3545
3546 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 ();
3548 else
2898 string[n++] = ch; 3549 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3550 }
3551
2901 string[n++] = '\0'; 3552 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3553
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3555
2906 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
2907} 3557}
2908 3558
2909/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2910/* 3560/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3562 */
2913void 3563void
2914rxvt_term::process_dcs_seq () 3564rxvt_term::process_dcs_seq ()
2915{ 3565{
2916 unsigned char eh, *s; 3566 unsigned char *s;
3567 unicode_t eh;
3568
2917 /* 3569 /*
2918 * Not handled yet 3570 * Not handled yet
2919 */ 3571 */
2920 s = get_to_st (&eh); 3572 s = get_to_st (eh);
2921 if (s) 3573 if (s)
2922 free (s); 3574 free (s);
3575
2923 return; 3576 return;
2924} 3577}
2925 3578
2926/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
2927/* 3580/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3581 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3582 */
2930void 3583void
2931rxvt_term::process_osc_seq () 3584rxvt_term::process_osc_seq ()
2932{ 3585{
2933 unsigned char ch, eh, *s; 3586 unicode_t ch, eh;
2934 int arg; 3587 int arg;
2935 3588
2936 ch = cmd_getc (); 3589 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3590 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3591 arg = arg * 10 + (ch - '0');
2939 3592
2940 if (ch == ';') 3593 if (ch == ';')
2941 { 3594 {
2942 s = get_to_st (&eh); 3595 unsigned char *s = get_to_st (eh);
3596
2943 if (s) 3597 if (s)
2944 { 3598 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3599 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3600 free (s);
2958 } 3601 }
2959 } 3602 }
2960} 3603}
3604
3605void
3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3607{
3608 if (str[0] == '?' && !str[1])
3609 {
3610 unsigned short r, g, b;
3611 pix_colors_focused[color].get (display, r, g, b);
3612 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3613 }
3614 else
3615 set_window_color (color, str);
3616}
3617
2961/* 3618/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3620 * 0 = change iconName/title
2964 * 1 = change iconName 3621 * 1 = change iconName
2965 * 2 = change title 3622 * 2 = change title
2966 * 4 = change color 3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
2967 * 12 = change text color 3626 * 12 = change text color
2968 * 13 = change mouse foreground color 3627 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3628 * 17 = change highlight character colour
2970 * 18 = change bold character color 3629 * 18 = change bold character color
2971 * 19 = change underlined character color 3630 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3631 * 46 = change logfile (not implemented)
2973 * 50 = change font 3632 * 50 = change font
2974 * 3633 *
2975 * rxvt extensions: 3634 * rxvt extensions:
2976 * 9 = change locale (NYI)
2977 * 10 = menu (may change in future)
2978 * 20 = bg pixmap 3635 * 20 = bg pixmap
2979 * 39 = change default fg color 3636 * 39 = change default fg color
2980 * 49 = change default bg color 3637 * 49 = change default bg color
2981 * 55 = dump scrollback buffer and all of screen 3638 * 55 = dump scrollback buffer and all of screen
3639 * 701 = change locale
3640 * 702 = find font
3641 * 703 = menu
2982 */ 3642 */
2983void 3643void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2985{ 3645{
2986 int changed = 0; 3646 int changed = 0;
2987 int color; 3647 int color;
2988 char *buf, *name; 3648 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
2989 3652
2990 assert (str != NULL); 3653 assert (str != NULL);
2991 switch (op) 3654 switch (op)
2992 { 3655 {
2993 case XTerm_name: 3656 case XTerm_name:
2994 set_title (str); 3657 set_title (str);
2995 /* FALLTHROUGH */ 3658 /* FALLTHROUGH */
2996 case XTerm_iconName: 3659 case XTerm_iconName:
2997 set_iconName (str); 3660 set_icon_name (str);
2998 break; 3661 break;
2999 case XTerm_title: 3662 case XTerm_title:
3000 set_title (str); 3663 set_title (str);
3001 break; 3664 break;
3665 case XTerm_property:
3666 if (str[0] == '?')
3667 {
3668 Atom prop = display->atom (str + 1);
3669 Atom actual_type;
3670 int actual_format;
3671 unsigned long nitems;
3672 unsigned long bytes_after;
3673 unsigned char *value = 0;
3674 const char *str = "";
3675
3676 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None
3682 && actual_format == 8)
3683 str = (const char *)(value);
3684
3685 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3686
3687 XFree (value);
3688 }
3689 else
3690 {
3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3692
3693 if (eq)
3694 {
3695 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1);
3697 }
3698 else
3699 XDeleteProperty (disp, TermWin.parent[0],
3700 display->atom (str));
3701 }
3702 break;
3703
3002 case XTerm_Color: 3704 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
3004 { 3706 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3708 break;
3709
3007 *name++ = '\0'; 3710 *name++ = '\0';
3008 color = atoi (buf); 3711 color = atoi (buf);
3712
3009 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3714 break;
3715
3011 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3717 *buf++ = '\0';
3718
3719 if (name[0] == '?' && !name[1])
3720 {
3721 unsigned short r, g, b;
3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3724 }
3725 else
3013 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
3014 } 3727 }
3728 break;
3729 case XTerm_Color00:
3730 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3731 break;
3732 case XTerm_Color01:
3733 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3734 break;
3016#ifndef NO_CURSORCOLOR 3735#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3736 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3738 break;
3020#endif 3739#endif
3021 case XTerm_Color_pointer: 3740 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3741 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3742 break;
3743 case XTerm_Color_pointer_bg:
3744 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3745 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3027 break; 3752 break;
3028 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3755 break;
3031 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3758 break;
3034#endif 3759#endif
3035 3760#if TRANSPARENT && TINTING
3036 case XTerm_Menu: 3761 case XTerm_Color_tint:
3037 /* 3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3038 * rxvt_menubar_dispatch () violates the constness of the string, 3763 check_our_parents ();
3039 * so DON'T do it here 3764 if (am_transparent)
3040 */ 3765 want_full_refresh = want_refresh = 1;
3041 break; 3766 break;
3767#endif
3768
3042 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3043 if (*str != ';') 3770 if (*str != ';')
3044 { 3771 {
3045#if XPM_BACKGROUND 3772#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3048#endif 3775#endif
3049 scr_touch (true); 3776 scr_touch (true);
3050 } 3777 }
3051 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3052 { 3779 {
3053 str++; 3780 str++;
3054#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3056#endif 3783#endif
3057
3058 } 3784 }
3785
3059 if (changed) 3786 if (changed)
3060 { 3787 {
3061#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3062 resize_pixmap (); 3789 resize_pixmap ();
3063#endif 3790#endif
… …
3069 set_window_color (Color_fg, str); 3796 set_window_color (Color_fg, str);
3070 break; 3797 break;
3071 case XTerm_restoreBG: 3798 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3799 set_window_color (Color_bg, str);
3073 break; 3800 break;
3801
3074 case XTerm_logfile: 3802 case XTerm_logfile:
3803 // TODO, when secure mode?
3075 break; 3804 break;
3805
3076 case XTerm_font: 3806 case XTerm_font:
3077 change_font (str); 3807 op = URxvt_font;
3808 case URxvt_font:
3809#if ENABLE_STYLES
3810 case URxvt_boldFont:
3811 case URxvt_italicFont:
3812 case URxvt_boldItalicFont:
3813#endif
3814 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3818 resp);
3819 else
3820 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822
3823 res = strdup (str);
3824 allocated.push_back ((void *)res);
3825 set_fonts ();
3826 }
3078 break; 3827 break;
3828
3829#if ENABLE_FRILLS
3079 case XTerm_locale: 3830 case XTerm_locale:
3080 if (str[0] == '?' && !str[1]) 3831 if (query)
3081 tt_printf ("%-.250s\n", locale); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3082 else 3833 else
3083 { 3834 {
3084 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3085 im_cb (); 3838 im_cb ();
3839# endif
3086 } 3840 }
3087 break; 3841 break;
3842#endif
3843
3844#ifdef MENUBAR
3845 case XTerm_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3088#if 0 3850#if 0
3089 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
3090 { 3852 {
3091 int fd; 3853 int fd;
3092 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3093 { 3855 {
3094 scr_dump (fd); 3856 scr_dump (fd);
3095 close (fd); 3857 close (fd);
3096 } 3858 }
3097 } 3859 }
3098 break; 3860 break;
3099#endif 3861#endif
3100
3101 } 3862 }
3102} 3863}
3103/*----------------------------------------------------------------------*/ 3864/*----------------------------------------------------------------------*/
3104 3865
3105/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3866/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3113 * so no need for fancy checking 3874 * so no need for fancy checking
3114 */ 3875 */
3115int 3876int
3116rxvt_term::privcases (int mode, unsigned long bit) 3877rxvt_term::privcases (int mode, unsigned long bit)
3117{ 3878{
3118 int state; 3879 int state;
3119 3880
3120 if (mode == 's') 3881 if (mode == 's')
3121 { 3882 {
3122 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3123 return -1; 3884 return -1;
3124 } 3885 }
3125 else 3886 else
3126 { 3887 {
3127 if (mode == 'r') 3888 if (mode == 'r')
3128 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3129 else 3890 else
3130 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3131 PrivMode (state, bit); 3892 PrivMode (state, bit);
3132 } 3893 }
3894
3133 return state; 3895 return state;
3134} 3896}
3135 3897
3136/* we're not using priv _yet_ */ 3898/* we're not using priv _yet_ */
3137void 3899void
3138rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3900rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3139{ 3901{
3140 unsigned int i, j; 3902 unsigned int i, j;
3141 int state; 3903 int state;
3904
3142 static const struct 3905 static const struct
3143 { 3906 {
3144 const int argval; 3907 const int argval;
3145 const unsigned long bit; 3908 const unsigned long bit;
3146 } 3909 }
3910
3147 argtopriv[] = { 3911 argtopriv[] = {
3148 { 1, PrivMode_aplCUR }, 3912 { 1, PrivMode_aplCUR },
3149 { 2, PrivMode_vt52 }, 3913 { 2, PrivMode_vt52 },
3150 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3151 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3152 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3153 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3154 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3155 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3156#ifdef menuBar_esc 3921#ifdef menuBar_esc
3157 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3158#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3159#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3160 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3161#endif 3928#endif
3162 { 25, PrivMode_VisibleCursor },
3163 { 35, PrivMode_ShiftKeys }, 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3164 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3931 // 41 xterm more fixes NYI
3932 // 45 margin bell NYI
3933 // 46 start logging
3165 { 47, PrivMode_Screen }, 3934 { 47, PrivMode_Screen },
3166 { 66, PrivMode_aplKP }, 3935 { 66, PrivMode_aplKP },
3167#ifndef NO_BACKSPACE_KEY 3936#ifndef NO_BACKSPACE_KEY
3168 { 67, PrivMode_BackSpace }, 3937 { 67, PrivMode_BackSpace },
3169#endif 3938#endif
3170 { 1000, PrivMode_MouseX11 }, 3939 { 1000, PrivMode_MouseX11 },
3940 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3941 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3942 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3171 { 1010, PrivMode_TtyOutputInh }, 3943 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3172 { 1011, PrivMode_Keypress }, 3944 { 1011, PrivMode_Keypress }, // rxvt extension
3945 // 1035 enable modifiers for alt, numlock NYI
3946 // 1036 send ESC for meta keys NYI
3947 // 1037 send DEL for keypad delete NYI
3173 { 1047, PrivMode_Screen }, 3948 { 1047, PrivMode_Screen },
3949 // 1048 save and restore cursor
3174 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3950 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3951 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3175 }; 3952 };
3176 3953
3177 if (nargs == 0) 3954 if (nargs == 0)
3178 return; 3955 return;
3179 3956
… …
3194 state = privcases (mode, argtopriv[j].bit); 3971 state = privcases (mode, argtopriv[j].bit);
3195 break; 3972 break;
3196 } 3973 }
3197 3974
3198 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3199 if (state == -1)
3200 switch (arg[i]) 3976 switch (arg[i])
3201 { 3977 {
3202 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3980 if (options & Opt_secondaryScreen)
3203 if (mode == 0) 3981 if (mode == 0)
3204 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3205 else if (mode == 1) 3983 else if (mode == 1)
3206 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3207 /* FALLTHROUGH */
3208 default:
3209 continue; /* for (;i;) */
3210 }
3211
3212 /* extra handling for values with valid 0 or 1 state */
3213 switch (arg[i])
3214 {
3215 /* case 1: - application cursor keys */
3216 case 2: /* VT52 mode */
3217 /* oddball mode. should be set regardless of set/reset
3218 * parameter. Return from VT52 mode with an ESC < from
3219 * within VT52 mode
3220 */
3221 PrivMode (1, PrivMode_vt52);
3222 break; 3985 break;
3986 }
3987
3988 if (state >= 0)
3989 /* extra handling for values with valid 0 or 1 state */
3990 switch (arg[i])
3991 {
3992 /* case 1: - application cursor keys */
3993 case 2: /* VT52 mode */
3994 /* oddball mode. should be set regardless of set/reset
3995 * parameter. Return from VT52 mode with an ESC < from
3996 * within VT52 mode
3997 */
3998 PrivMode (1, PrivMode_vt52);
3999 break;
3223 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3224 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3225 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3226 (unsigned int)TermWin.height);
3227 break; 4003 break;
3228 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3229 if (state) 4005 if (state)
3230 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3231 else 4007 else
3232 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3233 break; 4009 break;
3234 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3235 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3236 break; 4012 break;
3237 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
3238 scr_relative_origin (state); 4014 scr_relative_origin (state);
3239 break; 4015 break;
3240 case 7: /* autowrap */ 4016 case 7: /* autowrap */
3241 scr_autowrap (state); 4017 scr_autowrap (state);
3242 break; 4018 break;
3243 /* case 8: - auto repeat, can't do on a per window basis */ 4019 /* case 8: - auto repeat, can't do on a per window basis */
3244 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3245 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3246 PrivateModes &= ~ (PrivMode_MouseX11); 4022 priv_modes &= ~PrivMode_MouseX11;
3247 break; 4023 break;
3248#ifdef menuBar_esc 4024#ifdef menuBar_esc
3249 case menuBar_esc: 4025 case menuBar_esc:
3250#ifdef MENUBAR 4026#ifdef MENUBAR
3251 map_menuBar (state); 4027 map_menuBar (state);
3252#endif 4028#endif
3253 break; 4029 break;
3254#endif 4030#endif
3255#ifdef scrollBar_esc 4031#ifdef scrollBar_esc
3256 case scrollBar_esc: 4032 case scrollBar_esc:
3257 if (scrollbar_mapping (state)) 4033 if (scrollbar_mapping (state))
3258 { 4034 {
3259 resize_all_windows (0, 0, 0); 4035 resize_all_windows (0, 0, 0);
3260 scr_touch (true); 4036 scr_touch (true);
3261 } 4037 }
3262 break; 4038 break;
3263#endif 4039#endif
3264 case 25: /* visible/invisible cursor */ 4040 case 25: /* visible/invisible cursor */
3265 scr_cursor_visible (state); 4041 scr_cursor_visible (state);
3266 break; 4042 break;
3267 /* case 35: - shift keys */ 4043 /* case 35: - shift keys */
3268 /* case 40: - 80 <--> 132 mode */ 4044 /* case 40: - 80 <--> 132 mode */
3269 case 47: /* secondary screen */ 4045 case 47: /* secondary screen */
3270 scr_change_screen (state); 4046 scr_change_screen (state);
3271 break; 4047 break;
3272 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3273 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3274 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3275 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX10); 4052 priv_modes &= ~PrivMode_MouseX10;
3277 break; 4053 break;
3278#if 0 4054#if 0
3279 case 1001: 4055 case 1001:
3280 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3281#endif 4057#endif
3282 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3283 if (state) 4059 if (state)
3284 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3285 else 4061 else
3286 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3287 break; 4063 break;
3288 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3289 if (state) 4065 if (state)
3290 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3291 else 4067 else
3292 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3293 break; 4069 break;
3294 case 1047: /* secondary screen w/ clearing */ 4070 case 1047: /* secondary screen w/ clearing last */
3295 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4071 if (options & Opt_secondaryScreen)
3296 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3297 scr_erase_screen (2); 4073 scr_erase_screen (2);
3298 scr_change_screen (state); 4074 scr_change_screen (state);
3299 /* FALLTHROUGH */
3300 default:
3301 break; 4075 break;
4076 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen)
4079 if (current_screen != PRIMARY)
4080 scr_erase_screen (2);
4081 break;
4082 default:
4083 break;
3302 } 4084 }
3303 } 4085 }
3304} 4086}
3305/*}}} */ 4087/*}}} */
3306 4088
3307/*{{{ process sgr sequences */ 4089/*{{{ process sgr sequences */
3308void 4090void
3309rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4091rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3310{ 4092{
3311 unsigned int i; 4093 unsigned int i;
3312 short rendset; 4094 short rendset;
3313 int rendstyle; 4095 int rendstyle;
3314 4096
3315 if (nargs == 0) 4097 if (nargs == 0)
3316 { 4098 {
3317 scr_rendition (0, ~RS_None); 4099 scr_rendition (0, ~RS_None);
3318 return; 4100 return;
3319 } 4101 }
4102
3320 for (i = 0; i < nargs; i++) 4103 for (i = 0; i < nargs; i++)
3321 { 4104 {
3322 rendset = -1; 4105 rendset = -1;
3323 switch (arg[i]) 4106 switch (arg[i])
3324 { 4107 {
… …
3326 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3327 break; 4110 break;
3328 case 1: 4111 case 1:
3329 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3330 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3331 case 4: 4118 case 4:
3332 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3333 break; 4120 break;
3334 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3335 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3336 break; 4124 break;
4125 //case 6: // scoansi light background
3337 case 7: 4126 case 7:
3338 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3339 break; 4128 break;
3340 case 22: 4129 case 8:
4130 // invisible. NYI
4131 break;
4132 //case 9: // crossed out
4133 //case 10: // scoansi acs off, primary font
4134 //case 11: // scoansi acs on, first alt font
4135 //case 12: // scoansi acs on, |0x80, second alt font
4136 //...
4137 //case 19: // ninth alt font
4138 //case 20: // gothic
4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3341 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 22: // normal intensity
4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic;
3342 break; 4147 break;
3343 case 24: 4148 case 24:
3344 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3345 break; 4150 break;
3346 case 25: 4151 case 25:
3347 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3348 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3349 case 27: 4157 case 27:
3350 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3351 break; 4159 break;
4160 //case 28: // visible. NYI
4161 //case 29: // not crossed-out
3352 } 4162 }
4163
3353 if (rendset != -1) 4164 if (rendset != -1)
3354 { 4165 {
3355 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
3356 continue; /* for (;i;) */ 4167 continue; /* for (;i;) */
3357 } 4168 }
… …
3364 case 33: 4175 case 33:
3365 case 34: 4176 case 34:
3366 case 35: 4177 case 35:
3367 case 36: 4178 case 36:
3368 case 37: 4179 case 37:
3369 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3370 Color_fg);
3371 break; 4181 break;
3372#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3373 case 38:
3374 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3375 { 4184 {
3376 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3377 Color_fg);
3378 i += 2; 4186 i += 2;
3379 } 4187 }
3380 break; 4188 break;
3381#endif
3382 case 39: /* default fg */ 4189 case 39: /* default fg */
3383 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3384 break; 4191 break;
3385 4192
3386 case 40: 4193 case 40:
… …
3389 case 43: 4196 case 43:
3390 case 44: 4197 case 44:
3391 case 45: 4198 case 45:
3392 case 46: 4199 case 46:
3393 case 47: 4200 case 47:
3394 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3395 Color_bg);
3396 break; 4202 break;
3397#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3398 case 48:
3399 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3400 { 4205 {
3401 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3402 Color_bg);
3403 i += 2; 4207 i += 2;
3404 } 4208 }
3405 break; 4209 break;
3406#endif
3407 case 49: /* default bg */ 4210 case 49: /* default bg */
3408 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3409 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3410 4215
3411#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3412 case 90: 4217 case 90:
3413 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3414 case 92: 4219 case 92:
3415 case 93: 4220 case 93:
3416 case 94: 4221 case 94:
3417 case 95: 4222 case 95:
3418 case 96: 4223 case 96:
3419 case 97: 4224 case 97:
3420 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3421 Color_fg);
3422 break; 4226 break;
3423 case 100: 4227 case 100:
3424 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3425 case 102: 4229 case 102:
3426 case 103: 4230 case 103:
3427 case 104: 4231 case 104:
3428 case 105: 4232 case 105:
3429 case 106: 4233 case 106:
3430 case 107: 4234 case 107:
3431 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3432 Color_bg);
3433 break; 4236 break;
3434#endif 4237#endif
3435 4238
3436 } 4239 }
3437 } 4240 }
3438} 4241}
3439/*}}} */ 4242/*}}} */
3440 4243
3441/*{{{ process Rob Nation's own graphics mode sequences */ 4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3442void 4245void
3443rxvt_term::process_graphics () 4246rxvt_term::process_graphics ()
3444{ 4247{
3445 unsigned char ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3446 4249
3447 if (cmd == 'Q') 4250 if (cmd == 'Q')
3448 { /* query graphics */ 4251 { /* query graphics */
3449 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3450 return; 4253 return;
3451 } 4254 }
3452 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3453 do 4256 do
3454 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3469 unsigned char buf[256]; 4272 unsigned char buf[256];
3470 4273
3471 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3472 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3473 va_end (arg_ptr); 4276 va_end (arg_ptr);
3474 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3475} 4278}
3476 4279
3477/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3478/* Write data to the pty as typed by the user, pasted with the mouse, 4281/* Write data to the pty as typed by the user, pasted with the mouse,
3479 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3480 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3481void 4286void
3482rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3483{ 4288{
3484 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4289 if (v_buflen == 0)
4290 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3485 4292
3486 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3487 { 4298 }
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304
4305 pty_ev.set (EVENT_READ | EVENT_WRITE);
4306}
4307
4308void rxvt_term::pty_write ()
4309{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311
4312 if (written > 0)
4313 {
4314 v_buflen -= written;
4315
3488 if (v_buflen == 0) 4316 if (v_buflen == 0)
3489 { 4317 {
3490 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3491
3492 if ((unsigned int)written == len)
3493 return;
3494
3495 data += written;
3496 len -= written;
3497 }
3498
3499
3500 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3501
3502 memcpy (v_buffer + v_buflen, data, len);
3503 v_buflen += len;
3504 }
3505
3506 for (;;)
3507 {
3508 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3509
3510 if (written > 0)
3511 {
3512 v_buflen -= written;
3513
3514 if (v_buflen == 0)
3515 {
3516 free (v_buffer); 4318 free (v_buffer);
3517 v_buffer = 0; 4319 v_buffer = 0;
3518 v_buflen = 0; 4320 v_buflen = 0;
3519 4321
3520 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3521 return;
3522 }
3523
3524 memmove (v_buffer, v_buffer + written, v_buflen);
3525 }
3526 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3527 // original code just ignores this...
3528 destroy ();
3529 else
3530 {
3531 pty_ev.set (EVENT_READ | EVENT_WRITE);
3532 return; 4323 return;
3533 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3534 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3535} 4331}
3536 4332
3537/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3538 4334

Diff Legend

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