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.37 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
… …
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129
130 { 129 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
133 } 132 }
134 133
135 if (valid_keysym) 134 if (valid_keysym)
136 { 135 {
137 /* for some backwards compatibility */ 136 /* for some backwards compatibility */
… …
162 { 161 {
163#else 162#else
164 if (IS_SCROLL_MOD) 163 if (IS_SCROLL_MOD)
165 { 164 {
166#endif 165#endif
167 int lnsppg; 166 int lnsppg;
168 167
169#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 170#else
172 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 209 scr_move_to (1, 0);
211 return; 210 return;
212 } 211 }
213 } 212 }
214#endif 213#endif
215
216 } 214 }
217 215
218 if (shft) 216 if (shft)
219 { 217 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 225 {
228 switch (keysym) 226 switch (keysym)
229 { 227 {
230 /* normal XTerm key bindings */ 228 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
233 return; 231 return;
234 /* rxvt extras */ 232 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 234 change_font (0, FONT_UP);
237 return; 235 return;
… …
253 { 251 {
254 greek_mode = !greek_mode; 252 greek_mode = !greek_mode;
255 if (greek_mode) 253 if (greek_mode)
256 { 254 {
257 xterm_seq (XTerm_title, 255 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928 256 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset(); 258 greek_reset ();
261 } 259 }
262 else 260 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 262 return;
265 } 263 }
266#endif 264#endif
267 265
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 267 {
270#ifdef KEYSYM_RESOURCE 268#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 270 {
273 unsigned int l; 271 unsigned int l;
274 const unsigned char *kbuf0; 272 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 273 const unsigned char ch = C0_ESC;
276 274
… …
286 tt_write (kbuf0, l); 284 tt_write (kbuf0, l);
287 return; 285 return;
288 } 286 }
289 else 287 else
290#endif 288#endif
291
292 { 289 {
293 newlen = 1; 290 newlen = 1;
294 switch (keysym) 291 switch (keysym)
295 { 292 {
296#ifndef NO_BACKSPACE_KEY 293#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 294 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 295 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 296 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 298 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 299 kbuf[1] = '\0';
303 } 300 }
304 else 301 else
305 STRCPY(kbuf, key_backspace); 302 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 303# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 305 {
309 int col, row; 306 int col, row;
310 307
311 newlen = STRLEN(kbuf); 308 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 309 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 310 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 311 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 313 }
317# endif 314# endif
318 break; 315 break;
319#endif 316#endif
320#ifndef NO_DELETE_KEY 317#ifndef NO_DELETE_KEY
321 case XK_Delete: 318 case XK_Delete:
322 STRCPY(kbuf, key_delete); 319 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 320# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 321 if (Options & Opt_mc_hack)
325 { 322 {
326 int col, row; 323 int col, row;
327 324
328 newlen = STRLEN(kbuf); 325 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 326 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 327 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 328 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 330 }
334# endif 331# endif
335 break; 332 break;
336#endif 333#endif
337 case XK_Tab: 334 case XK_Tab:
338 if (shft) 335 if (shft)
339 STRCPY(kbuf, "\033[Z"); 336 STRCPY (kbuf, "\033[Z");
340 else 337 else
341 { 338 {
342#ifdef CTRL_TAB_MAKES_META 339#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 340 if (ctrl)
344 meta = 1; 341 meta = 1;
345#endif 342#endif
346#ifdef MOD4_TAB_MAKES_META 343#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 344 if (ev.state & Mod4Mask)
348 meta = 1; 345 meta = 1;
349#endif 346#endif
350 newlen = 0; 347 newlen = 0;
351 } 348 }
352 break; 349 break;
353
354 350
355#ifdef XK_KP_Left 351#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 352 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 353 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 354 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 355 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 357 {
362 STRCPY(kbuf, "\033OZ"); 358 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 359 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 360 break;
365 } 361 }
366 else 362 else
367 /* translate to std. cursor key */ 363 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 364 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 366#endif
371 case XK_Up: /* "\033[A" */ 367 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 368 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 369 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 370 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 371 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 372 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 373 /* do Shift first */
378 if (shft) 374 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 375 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 376 else if (ctrl)
381 { 377 {
382 kbuf[1] = 'O'; 378 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 380 }
385 else if (PrivateModes & PrivMode_aplCUR) 381 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 382 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 383#ifdef MULTICHAR_SET
388 //TODO: ?? 384 //TODO: ??
… …
392 388
393 col = screen.cur.col; 389 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 390 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 391 m = 0;
396 if (keysym == XK_Right 392 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 393 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 394 m = 1;
399 else if (keysym == XK_Left) 395 else if (keysym == XK_Left)
400 { 396 {
401 if (col > 0) 397 if (col > 0)
402 { 398 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 399 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 400 m = 1;
405 } 401 }
406 else if (screen.cur.row > 0) 402 else if (screen.cur.row > 0)
407 { 403 {
408 col = screen.tlen[--row]; 404 col = screen.tlen[--row];
409 if (col == -1) 405 if (col == -1)
410 col = TermWin.ncol - 1; 406 col = TermWin.ncol - 1;
411 else 407 else
412 col--; 408 col--;
413 if (col > 0 409 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 410 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 411 m = 1;
416 } 412 }
417 } 413 }
418 if (m) 414 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 416 }
421#endif 417#endif
422 break; 418 break;
423 419
424#ifndef UNSHIFTED_SCROLLKEYS 420#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 421# ifdef XK_KP_Prior
426 case XK_KP_Prior: 422 case XK_KP_Prior:
427 /* allow shift to override */ 423 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 425 {
430 STRCPY(kbuf, "\033Oy"); 426 STRCPY (kbuf, "\033Oy");
431 break; 427 break;
432 } 428 }
433 /* FALLTHROUGH */ 429 /* FALLTHROUGH */
434# endif 430# endif
435 case XK_Prior: 431 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 432 STRCPY (kbuf, "\033[5~");
437 break; 433 break;
438# ifdef XK_KP_Next 434# ifdef XK_KP_Next
439 case XK_KP_Next: 435 case XK_KP_Next:
440 /* allow shift to override */ 436 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 438 {
443 STRCPY(kbuf, "\033Os"); 439 STRCPY (kbuf, "\033Os");
444 break; 440 break;
445 } 441 }
446 /* FALLTHROUGH */ 442 /* FALLTHROUGH */
447# endif 443# endif
448 case XK_Next: 444 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 445 STRCPY (kbuf, "\033[6~");
450 break; 446 break;
451#endif 447#endif
452 case XK_KP_Enter: 448 case XK_KP_Enter:
453 /* allow shift to override */ 449 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 451 {
456 STRCPY(kbuf, "\033OM"); 452 STRCPY (kbuf, "\033OM");
457 } 453 }
458 else 454 else
459 { 455 {
460 kbuf[0] = '\r'; 456 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 457 kbuf[1] = '\0';
462 } 458 }
463 break; 459 break;
464 460
465#ifdef XK_KP_Begin 461#ifdef XK_KP_Begin
466 case XK_KP_Begin: 462 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 463 STRCPY (kbuf, "\033Ou");
468 break; 464 break;
469 465
470 case XK_KP_Insert: 466 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 467 STRCPY (kbuf, "\033Op");
472 break; 468 break;
473 469
474 case XK_KP_Delete: 470 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 471 STRCPY (kbuf, "\033On");
476 break; 472 break;
477#endif 473#endif
478 case XK_KP_F1: /* "\033OP" */ 474 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 475 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 476 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 477 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 478 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 479 kbuf[2] += (keysym - XK_KP_F1);
484 break; 480 break;
485 481
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 482 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 483 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 484 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 485 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 486 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 487 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 488 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 496 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 497 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 498 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 500 {
505 STRCPY(kbuf, "\033Oj"); 501 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 502 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 503 }
508 else 504 else
509 { 505 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 507 kbuf[1] = '\0';
512 } 508 }
513 break; 509 break;
514 510
515 case XK_Find: 511 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 512 STRCPY (kbuf, "\033[1~");
517 break; 513 break;
518 case XK_Insert: 514 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 515 STRCPY (kbuf, "\033[2~");
520 break; 516 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 517#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 518 case DXK_Remove:
523 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
524#endif 520#endif
525 case XK_Execute: 521 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 522 STRCPY (kbuf, "\033[3~");
527 break; 523 break;
528 case XK_Select: 524 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 525 STRCPY (kbuf, "\033[4~");
530 break; 526 break;
531#ifdef XK_KP_End 527#ifdef XK_KP_End
532 case XK_KP_End: 528 case XK_KP_End:
533 /* allow shift to override */ 529 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 531 {
536 STRCPY(kbuf, "\033Oq"); 532 STRCPY (kbuf, "\033Oq");
537 break; 533 break;
538 } 534 }
539 /* FALLTHROUGH */ 535 /* FALLTHROUGH */
540#endif 536#endif
541 case XK_End: 537 case XK_End:
542 STRCPY(kbuf, KS_END); 538 STRCPY (kbuf, KS_END);
543 break; 539 break;
544#ifdef XK_KP_Home 540#ifdef XK_KP_Home
545 case XK_KP_Home: 541 case XK_KP_Home:
546 /* allow shift to override */ 542 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 544 {
549 STRCPY(kbuf, "\033Ow"); 545 STRCPY (kbuf, "\033Ow");
550 break; 546 break;
551 } 547 }
552 /* FALLTHROUGH */ 548 /* FALLTHROUGH */
553#endif 549#endif
554 case XK_Home: 550 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 551 STRCPY (kbuf, KS_HOME);
556 break; 552 break;
557 553
558#define FKEY(n, fkey) \ 554#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 556
561 case XK_F1: /* "\033[11~" */ 557 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 558 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 559 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 560 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 561 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 562 FKEY (11, XK_F1);
567 break; 563 break;
568 case XK_F6: /* "\033[17~" */ 564 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 565 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 566 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 567 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 568 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 569 FKEY (17, XK_F6);
574 break; 570 break;
575 case XK_F11: /* "\033[23~" */ 571 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 572 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 573 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 574 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 575 FKEY (23, XK_F11);
580 break; 576 break;
581 case XK_F15: /* "\033[28~" */ 577 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 578 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 579 FKEY (28, XK_F15);
584 break; 580 break;
585 case XK_Help: /* "\033[28~" */ 581 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 582 FKEY (28, XK_Help);
587 break; 583 break;
588 case XK_Menu: /* "\033[29~" */ 584 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 585 FKEY (29, XK_Menu);
590 break; 586 break;
591 case XK_F17: /* "\033[31~" */ 587 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 588 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 589 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 590 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 601 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 602 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 603 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 604 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 605 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 606 FKEY (31, XK_F17);
611 break; 607 break;
612#undef FKEY 608#undef FKEY
613 default: 609 default:
614 newlen = 0; 610 newlen = 0;
615 break; 611 break;
616 } 612 }
617 if (newlen) 613 if (newlen)
618 len = STRLEN(kbuf); 614 len = STRLEN (kbuf);
619 } 615 }
620 /* 616 /*
621 * Pass meta for all function keys, if 'meta' option set 617 * Pass meta for all function keys, if 'meta' option set
622 */ 618 */
623#ifdef META8_OPTION 619#ifdef META8_OPTION
… …
644 meta = 0; 640 meta = 0;
645 } 641 }
646#endif 642#endif
647#ifdef GREEK_SUPPORT 643#ifdef GREEK_SUPPORT
648 if (greek_mode) 644 if (greek_mode)
649 len = greek_xlat(kbuf, len); 645 len = greek_xlat (kbuf, len);
650#endif 646#endif
651 /* nil */ ; 647 /* nil */ ;
652 } 648 }
653 } 649 }
654 650
… …
683#endif 679#endif
684 ) 680 )
685 { 681 {
686 const unsigned char ch = C0_ESC; 682 const unsigned char ch = C0_ESC;
687 683
688 tt_write(&ch, 1); 684 tt_write (&ch, 1);
689 } 685 }
690#ifdef DEBUG_CMD 686#ifdef DEBUG_CMD
691 if (debug_key) 687 if (debug_key)
692 { /* Display keyboard buffer contents */ 688 { /* Display keyboard buffer contents */
693 char *p; 689 char *p;
694 int i; 690 int i;
695 691
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 693 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 695 fprintf (stderr, "'\n");
700 } 696 }
701#endif /* DEBUG_CMD */ 697#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 698 tt_write (kbuf, (unsigned int)len);
703} 699}
704/*}}} */ 700/*}}} */
705 701
706#if (MENUBAR_MAX) 702#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 704/* attempt to `write' count to the input buffer */
709unsigned int 705unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 706rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 707{
712 unsigned int n, s; 708 unsigned int n, s;
713 709
714 n = cmdbuf_ptr - cmdbuf_base; 710 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 712 if (n > 0 && s < count)
717 { 713 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 714 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 716 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 717 cmdbuf_endp -= n;
722 s += n; 718 s += n;
723 } 719 }
724 if (count > s) 720 if (count > s)
725 { 721 {
726 rxvt_print_error("data loss: cmd_write too large"); 722 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 723 count = s;
728 } 724 }
729 for (; count--;) 725 for (; count--;)
730 *cmdbuf_endp++ = *str++; 726 *cmdbuf_endp++ = *str++;
731 return 0; 727 return 0;
… …
753 IMSendSpot (); 749 IMSendSpot ();
754#endif 750#endif
755 751
756 } 752 }
757 753
758 XFlush (Xdisplay); 754 display->flush ();
759} 755}
760 756
761void 757void
762rxvt_term::check_cb (check_watcher &w) 758rxvt_term::check_cb (check_watcher &w)
763{ 759{
764 SET_R (this); 760 SET_R (this);
765 SET_LOCALE (locale); 761 SET_LOCALE (locale);
766 762
767 flush (); 763 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 764}
813 765
814#ifdef CURSOR_BLINK 766#ifdef CURSOR_BLINK
815void 767void
816rxvt_term::cursor_blink_cb (time_watcher &w) 768rxvt_term::cursor_blink_cb (time_watcher &w)
… …
832 want_refresh = 1; 784 want_refresh = 1;
833 w.start (w.at + TEXT_BLINK_INTERVAL); 785 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 786 }
835} 787}
836#endif 788#endif
837
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846 789
847bool 790bool
848rxvt_term::pty_fill () 791rxvt_term::pty_fill ()
849{ 792{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 793 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
… …
922 if (ch == '\n') 865 if (ch == '\n')
923 { 866 {
924 nlines++; 867 nlines++;
925 refresh_count++; 868 refresh_count++;
926 869
927 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 { 872 {
930 refreshnow = true; 873 refreshnow = true;
931 flag = false; 874 flag = false;
932 ch = NOCHAR; 875 ch = NOCHAR;
… …
1000 { 943 {
1001 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
1002 return *cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
1003 946
1004 wchar_t wc; 947 wchar_t wc;
1005 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
1006 949
1007 if (len == (size_t)-2) 950 if (len == (size_t)-2)
1008 return NOCHAR; 951 return NOCHAR;
1009 952
1010 if (len == (size_t)-1) 953 if (len == (size_t)-1)
… …
1016 } 959 }
1017 960
1018 return NOCHAR; 961 return NOCHAR;
1019} 962}
1020 963
1021/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
1022/* 965/*
1023 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
1024 * to the command. 967 * to the command.
1025 */ 968 */
1026uint32_t 969uint32_t
… …
1042 985
1043#ifdef POINTER_BLANK 986#ifdef POINTER_BLANK
1044void 987void
1045rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1046{ 989{
1047 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1048 recolour_cursor (); 991 recolour_cursor ();
1049 992
1050 hidden_pointer = 0; 993 hidden_pointer = 0;
1051 994
1052 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
… …
1054} 997}
1055 998
1056void 999void
1057rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1058{ 1001{
1059 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1060 return; 1003 return;
1061 1004
1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1063 XFlush (Xdisplay); 1006 XFlush (display->display);
1064 1007
1065 hidden_pointer = 1; 1008 hidden_pointer = 1;
1066} 1009}
1067 1010
1068void 1011void
… …
1074 pointer_blank (); 1017 pointer_blank ();
1075} 1018}
1076#endif 1019#endif
1077 1020
1078void 1021void
1079rxvt_term::mouse_report (const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1080{ 1023{
1081 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1082 int x, y; 1025 int x, y;
1083 1026
1084 x = ev->x; 1027 x = ev.x;
1085 y = ev->y; 1028 y = ev.y;
1086 pixel_position (&x, &y); 1029 pixel_position (&x, &y);
1087 1030
1088 if (MEvent.button == AnyButton) 1031 if (MEvent.button == AnyButton)
1089 { 1032 {
1090 button_number = 3; 1033 button_number = 3;
… …
1124#endif 1067#endif
1125 1068
1126 } 1069 }
1127 1070
1128#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1129 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1130 if (key_state & 16) 1073 if (key_state & 16)
1131 fputc('C', stderr); 1074 fputc ('C', stderr);
1132 if (key_state & 4) 1075 if (key_state & 4)
1133 fputc('S', stderr); 1076 fputc ('S', stderr);
1134 if (key_state & 8) 1077 if (key_state & 8)
1135 fputc('A', stderr); 1078 fputc ('A', stderr);
1136 if (key_state & 32) 1079 if (key_state & 32)
1137 fputc('2', stderr); 1080 fputc ('2', stderr);
1138 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1139 button_number, 1082 button_number,
1140 x + 1, 1083 x + 1,
1141 y + 1); 1084 y + 1);
1142#else 1085#else
1143 tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1144 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1145 (32 + x + 1), 1088 (32 + x + 1),
1146 (32 + y + 1)); 1089 (32 + y + 1));
1147#endif 1090#endif
1148} 1091}
1149 1092
1150#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1151void 1094void
1152rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1153{ 1096{
1154 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1155 1098
1156 process_x_event (ev); 1099 x_cb (*ev);
1157} 1100}
1158#endif 1101#endif
1159 1102
1160/*{{{ process an X event */ 1103/*{{{ process an X event */
1161void 1104void
1162rxvt_term::process_x_event (XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1163{ 1106{
1107 SET_R (this);
1108 SET_LOCALE (locale);
1109
1110#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 }
1121#endif
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1164 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1165 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1166 unsigned int unused_mask; 1144 unsigned int unused_mask;
1167 1145
1168#ifdef DEBUG_X 1146#ifdef DEBUG_X
… …
1207#endif 1185#endif
1208 1186
1209#ifdef DEBUG_X 1187#ifdef DEBUG_X
1210 struct timeval tp; 1188 struct timeval tp;
1211 struct tm *ltt; 1189 struct tm *ltt;
1212 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday (&tp, NULL);
1213 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1214 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)); 1192 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));
1215#endif 1193#endif
1216 1194
1217 switch (ev->type) 1195 switch (ev.type)
1218 { 1196 {
1219 case KeyPress: 1197 case KeyPress:
1220 lookup_key ((XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1221 break; 1199 break;
1222 1200
1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1224 case KeyRelease: 1202 case KeyRelease:
1225 { 1203 {
1226 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1227 mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1228 else 1206 else
1229 { 1207 {
1230 KeySym ks; 1208 KeySym ks;
1231 1209
1232 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1233 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1234 mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1235 } 1213 }
1236 break; 1214 break;
1237 } 1215 }
1238#endif 1216#endif
1239 1217
1240 case ButtonPress: 1218 case ButtonPress:
1241 button_press ((XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1242 break; 1220 break;
1243 1221
1244 case ButtonRelease: 1222 case ButtonRelease:
1245 button_release ((XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1246 break; 1224 break;
1247 1225
1248 case ClientMessage: 1226 case ClientMessage:
1249 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1250 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1251 destroy (); 1229 destroy ();
1252#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1253 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1254 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1255 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1256 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1257 || ev->xclient.data.l[0] == DndLink)) 1235 || ev.xclient.data.l[0] == DndLink))
1258 { 1236 {
1259 /* Get Dnd data */ 1237 /* Get Dnd data */
1260 Atom ActualType; 1238 Atom ActualType;
1261 int ActualFormat; 1239 int ActualFormat;
1262 unsigned char *data; 1240 unsigned char *data;
1263 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1264 1242
1265 XGetWindowProperty(Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1266 xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1267 0L, 1000000L, 1245 0L, 1000000L,
1268 False, AnyPropertyType, 1246 False, AnyPropertyType,
1269 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1270 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1271 &data); 1249 &data);
1272 XChangeProperty(Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1273 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1274 8, PropModeReplace, 1252 8, PropModeReplace,
1275 data, STRLEN(data)); 1253 data, STRLEN (data));
1276 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1277 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1278 } 1256 }
1279#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1280 break; 1258 break;
1281 1259
1282 case MappingNotify: 1260 case MappingNotify:
1283 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1284 break; 1262 break;
1285 1263
1286 /* 1264 /*
1287 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1288 * Here's my conclusion: 1266 * Here's my conclusion:
… …
1292 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1293 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1294 * which ought to make things real slow! 1272 * which ought to make things real slow!
1295 */ 1273 */
1296 case VisibilityNotify: 1274 case VisibilityNotify:
1297 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1298 { 1276 {
1299 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1300 refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1301 break; 1279 break;
1302 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
… …
1313 { 1291 {
1314 TermWin.focus = 1; 1292 TermWin.focus = 1;
1315 want_refresh = 1; 1293 want_refresh = 1;
1316#ifdef USE_XIM 1294#ifdef USE_XIM
1317 if (Input_Context != NULL) 1295 if (Input_Context != NULL)
1318 XSetICFocus(Input_Context); 1296 XSetICFocus (Input_Context);
1319#endif 1297#endif
1320#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1321 if (Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1322 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1323#endif 1301#endif
… …
1330 { 1308 {
1331 TermWin.focus = 0; 1309 TermWin.focus = 0;
1332 want_refresh = 1; 1310 want_refresh = 1;
1333#ifdef USE_XIM 1311#ifdef USE_XIM
1334 if (Input_Context != NULL) 1312 if (Input_Context != NULL)
1335 XUnsetICFocus(Input_Context); 1313 XUnsetICFocus (Input_Context);
1336#endif 1314#endif
1337#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1338 if (Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1339 cursor_blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1340 hidden_cursor = 0; 1318 hidden_cursor = 0;
… …
1342 1320
1343 } 1321 }
1344 break; 1322 break;
1345 1323
1346 case ConfigureNotify: 1324 case ConfigureNotify:
1347 if (ev->xconfigure.window == TermWin.parent[0]) 1325 if (ev.xconfigure.window == TermWin.parent[0])
1348 { 1326 {
1349 int height, width; 1327 int height, width;
1350 1328
1351 do 1329 do
1352 { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1353 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1354 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1355 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1356 } 1334 }
1357 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1358 ConfigureNotify, ev)); 1336
1359 if (szHint.width != width || szHint.height != height) 1337 if (szHint.width != width || szHint.height != height)
1360 { 1338 {
1361 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1362 resize_all_windows (width, height, 1); 1340 resize_all_windows (width, height, 1);
1363 } 1341 }
1364#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1365 else 1343 else
1366 { 1344 {
1367 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1368 } 1346 }
1369#endif 1347#endif
1370#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1371 if (Options & Opt_transparent) 1349 if (Options & Opt_transparent)
1372 { 1350 {
… …
1378 1356
1379 } 1357 }
1380 break; 1358 break;
1381 1359
1382 case SelectionClear: 1360 case SelectionClear:
1383 selection_clear (); 1361 display->set_selection_owner (0);
1384 break; 1362 break;
1385 1363
1386 case SelectionNotify: 1364 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1388 selection_paste (ev->xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
1389 ev->xselection.property, True); 1367 ev.xselection.property, True);
1390 break; 1368 break;
1391 1369
1392 case SelectionRequest: 1370 case SelectionRequest:
1393 selection_send (&(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1394 break; 1372 break;
1395 1373
1396 case UnmapNotify: 1374 case UnmapNotify:
1397 TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1398#ifdef TEXT_BLINK 1376#ifdef TEXT_BLINK
… …
1405#ifdef TEXT_BLINK 1383#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif 1385#endif
1408 break; 1386 break;
1409 1387
1410 case PropertyNotify:
1411 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1412 {
1413 if (ev->xproperty.state == PropertyNewValue)
1414 selection_property (ev->xproperty.window,
1415 ev->xproperty.atom);
1416 break;
1417 }
1418#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1419 /*
1420 * if user used some Esetroot compatible prog to set the root bg,
1421 * use the property to determine the pixmap. We use it later on.
1422 */
1423 if (xa[XA_XROOTPMAPID] == 0)
1424 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1425 "_XROOTPMAP_ID", False);
1426 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1427 break;
1428 /* FALLTHROUGH */
1429 case ReparentNotify: 1389 case ReparentNotify:
1430 if ((Options & Opt_transparent) && check_our_parents ()) 1390 rootwin_cb (ev);
1431 { 1391 break;
1432 if (am_transparent)
1433 want_full_refresh = 1;
1434 }
1435#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1436 break;
1437 1393
1438 case GraphicsExpose: 1394 case GraphicsExpose:
1439 case Expose: 1395 case Expose:
1440 if (ev->xany.window == TermWin.vt) 1396 if (ev.xany.window == TermWin.vt)
1441 { 1397 {
1442#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1443 scr_expose (ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1445#else 1401#else
1446 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1447 scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1448 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1449 //scr_expose (ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1450 // ev->xexpose.width, TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1451#endif 1407#endif
1452 want_refresh = 1; 1408 want_refresh = 1;
1453 } 1409 }
1454 else 1410 else
1455 { 1411 {
1456 XEvent unused_xevent; 1412 XEvent unused_event;
1457 1413
1458 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1459 Expose, 1415 Expose,
1460 &unused_xevent)) ; 1416 &unused_event)) ;
1461 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1462 GraphicsExpose, 1418 GraphicsExpose,
1463 &unused_xevent)) ; 1419 &unused_event)) ;
1464 if (isScrollbarWindow(ev->xany.window)) 1420 if (isScrollbarWindow (ev.xany.window))
1465 { 1421 {
1466 scrollBar.setIdle(); 1422 scrollBar.setIdle ();
1467 scrollbar_show (0); 1423 scrollbar_show (0);
1468 } 1424 }
1469#ifdef MENUBAR 1425#ifdef MENUBAR
1470 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1471 menubar_expose (); 1427 menubar_expose ();
1472#endif 1428#endif
1473#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1474 Gr_expose (ev->xany.window); 1430 Gr_expose (ev.xany.window);
1475#endif 1431#endif
1476 1432
1477 } 1433 }
1478 break; 1434 break;
1479 1435
… …
1481#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1482 if (hidden_pointer) 1438 if (hidden_pointer)
1483 pointer_unblank (); 1439 pointer_unblank ();
1484#endif 1440#endif
1485#if MENUBAR 1441#if MENUBAR
1486 if (isMenuBarWindow(ev->xany.window)) 1442 if (isMenuBarWindow (ev.xany.window))
1487 { 1443 {
1488 menubar_control (&(ev->xbutton)); 1444 menubar_control (& (ev.xbutton));
1489 break; 1445 break;
1490 } 1446 }
1491#endif 1447#endif
1492 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1493 break; 1449 break;
1494 1450
1495 if (ev->xany.window == TermWin.vt) 1451 if (ev.xany.window == TermWin.vt)
1496 { 1452 {
1497 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1498 { 1454 {
1499 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1500 MotionNotify, ev)) ; 1456 ;
1457
1501 XQueryPointer(Xdisplay, TermWin.vt, 1458 XQueryPointer (display->display, TermWin.vt,
1502 &unused_root, &unused_child, 1459 &unused_root, &unused_child,
1503 &unused_root_x, &unused_root_y, 1460 &unused_root_x, &unused_root_y,
1504 &(ev->xbutton.x), &(ev->xbutton.y), 1461 & (ev.xbutton.x), & (ev.xbutton.y),
1505 &unused_mask); 1462 &unused_mask);
1506#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1507 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1508 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1509 { 1466 {
1510#endif 1467#endif
1511 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1512 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1513#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1514 if (ev->xbutton.y < TermWin.int_bwidth 1471 if (ev.xbutton.y < TermWin.int_bwidth
1515 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1516 { 1473 {
1517 int dist; 1474 int dist;
1518 1475
1519 pending_scroll_selection=1; 1476 pending_scroll_selection=1;
1520 1477
… …
1525 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1526 1483
1527 /* save the event params so we can highlight 1484 /* save the event params so we can highlight
1528 * the selection in the pending-scroll loop 1485 * the selection in the pending-scroll loop
1529 */ 1486 */
1530 selection_save_x=ev->xbutton.x; 1487 selection_save_x=ev.xbutton.x;
1531 selection_save_y=ev->xbutton.y; 1488 selection_save_y=ev.xbutton.y;
1532 selection_save_state= 1489 selection_save_state=
1533 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1534 1491
1535 /* calc number of lines to scroll */ 1492 /* calc number of lines to scroll */
1536 if (ev->xbutton.y<TermWin.int_bwidth) 1493 if (ev.xbutton.y<TermWin.int_bwidth)
1537 { 1494 {
1538 scroll_selection_dir = UP; 1495 scroll_selection_dir = UP;
1539 dist = TermWin.int_bwidth - ev->xbutton.y; 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1540 } 1497 }
1541 else 1498 else
1542 { 1499 {
1543 scroll_selection_dir = DN; 1500 scroll_selection_dir = DN;
1544 dist = ev->xbutton.y - 1501 dist = ev.xbutton.y -
1545 (TermWin.int_bwidth + TermWin.height); 1502 (TermWin.int_bwidth + TermWin.height);
1546 } 1503 }
1547 scroll_selection_lines=(Pixel2Height(dist)/ 1504 scroll_selection_lines= (Pixel2Height (dist)/
1548 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1549 MIN_IT(scroll_selection_lines, 1506 MIN_IT (scroll_selection_lines,
1550 SELECTION_SCROLL_MAX_LINES); 1507 SELECTION_SCROLL_MAX_LINES);
1551 } 1508 }
1552 else 1509 else
1553 { 1510 {
1554 /* we are within the text window, so we 1511 /* we are within the text window, so we
… …
1562 } 1519 }
1563#endif 1520#endif
1564 1521
1565 } 1522 }
1566 } 1523 }
1567 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1568 { 1525 {
1569 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1570 MotionNotify, ev)) ; 1527 MotionNotify, &ev)) ;
1571 XQueryPointer(Xdisplay, scrollBar.win, 1528 XQueryPointer (display->display, scrollBar.win,
1572 &unused_root, &unused_child, 1529 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1574 &(ev->xbutton.x), &(ev->xbutton.y), 1531 & (ev.xbutton.x), & (ev.xbutton.y),
1575 &unused_mask); 1532 &unused_mask);
1576 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1577 scrollbar_size()); 1534 scrollbar_size ());
1578 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1579 refresh_limit = 0; 1536 refresh_limit = 0;
1580 scrollbar_show (1); 1537 scrollbar_show (1);
1581 } 1538 }
1582 break; 1539 break;
1583 } 1540 }
1584} 1541}
1585 1542
1586void 1543void
1544rxvt_term::rootwin_cb (XEvent &ev)
1545{
1546 SET_R (this);
1547 SET_LOCALE (locale);
1548
1549 switch (ev.type)
1550 {
1551 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 /* FALLTHROUGH */
1573 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ())
1575 if (am_transparent)
1576 want_full_refresh = 1;
1577 break;
1578#endif
1579 }
1580}
1581
1582void
1587rxvt_term::button_press (XButtonEvent *ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1588{ 1584{
1589 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1590 1586
1591 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1588 if (!bypass_keystate)
1593 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1594 /* 1590 /*
1595 * VT window processing of button press 1591 * VT window processing of button press
1596 */ 1592 */
1597 if (ev->window == TermWin.vt) 1593 if (ev.window == TermWin.vt)
1598 { 1594 {
1599#if RXVT_GRAPHICS 1595#if RXVT_GRAPHICS
1600 if (ev->subwindow != None) 1596 if (ev.subwindow != None)
1601 rxvt_Gr_ButtonPress (ev->x, ev->y); 1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else 1598 else
1603#endif 1599#endif
1604 1600
1605 { 1601 {
1606 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1603 if (reportmode)
1608 { 1604 {
1609 /* mouse report from vt window */ 1605 /* mouse report from vt window */
1610 /* save the xbutton state (for ButtonRelease) */ 1606 /* save the xbutton state (for ButtonRelease) */
1611 MEvent.state = ev->state; 1607 MEvent.state = ev.state;
1612#ifdef MOUSE_REPORT_DOUBLECLICK 1608#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev->button == MEvent.button && clickintime) 1609 if (ev.button == MEvent.button && clickintime)
1614 { 1610 {
1615 /* same button, within alloted time */ 1611 /* same button, within alloted time */
1616 MEvent.clicks++; 1612 MEvent.clicks++;
1617 if (MEvent.clicks > 1) 1613 if (MEvent.clicks > 1)
1618 { 1614 {
… …
1627 } 1623 }
1628 else 1624 else
1629 { 1625 {
1630 /* different button, or time expired */ 1626 /* different button, or time expired */
1631 MEvent.clicks = 1; 1627 MEvent.clicks = 1;
1632 MEvent.button = ev->button; 1628 MEvent.button = ev.button;
1633 mouse_report (ev); 1629 mouse_report (ev);
1634 } 1630 }
1635#else 1631#else
1636 MEvent.button = ev->button; 1632 MEvent.button = ev.button;
1637 mouse_report (ev); 1633 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */ 1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1639 1635
1640 } 1636 }
1641 else 1637 else
1642 { 1638 {
1643 if (ev->button != MEvent.button) 1639 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1640 MEvent.clicks = 0;
1645 switch (ev->button) 1641 switch (ev.button)
1646 { 1642 {
1647 case Button1: 1643 case Button1:
1648 /* allow shift+left click to extend selection */ 1644 /* allow shift+left click to extend selection */
1649 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1646 {
1651 if (MEvent.button == Button1 && clickintime) 1647 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev->x, ev->y); 1648 selection_rotate (ev.x, ev.y);
1653 else 1649 else
1654 selection_extend (ev->x, ev->y, 1); 1650 selection_extend (ev.x, ev.y, 1);
1655 } 1651 }
1656 else 1652 else
1657 { 1653 {
1658 if (MEvent.button == Button1 && clickintime) 1654 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++; 1655 MEvent.clicks++;
1660 else 1656 else
1661 MEvent.clicks = 1; 1657 MEvent.clicks = 1;
1662 1658
1663 selection_click (MEvent.clicks, ev->x, ev->y); 1659 selection_click (MEvent.clicks, ev.x, ev.y);
1664 } 1660 }
1665 1661
1666 MEvent.button = Button1; 1662 MEvent.button = Button1;
1667 break; 1663 break;
1668 1664
1669 case Button3: 1665 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1666 if (MEvent.button == Button3 && clickintime)
1671 selection_rotate (ev->x, ev->y); 1667 selection_rotate (ev.x, ev.y);
1672 else 1668 else
1673 selection_extend (ev->x, ev->y, 1); 1669 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1670 MEvent.button = Button3;
1675 break; 1671 break;
1676 } 1672 }
1677 } 1673 }
1678 MEvent.time = ev->time; 1674 MEvent.time = ev.time;
1679 return; 1675 return;
1680 } 1676 }
1681 } 1677 }
1682 1678
1683 /* 1679 /*
1684 * Scrollbar window processing of button press 1680 * Scrollbar window processing of button press
1685 */ 1681 */
1686 if (isScrollbarWindow(ev->window)) 1682 if (isScrollbarWindow (ev.window))
1687 { 1683 {
1688 scrollBar.setIdle (); 1684 scrollBar.setIdle ();
1689 /* 1685 /*
1690 * Rxvt-style scrollbar: 1686 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1687 * move up if mouse is above slider
… …
1703 * Mouse report disabled scrollbar: 1699 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 1700 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 1701 * click on scrollbar - send pageup/down
1706 */ 1702 */
1707 if ((scrollBar.style == R_SB_NEXT 1703 if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_upButton(ev->y)) 1704 && scrollbarnext_upButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1705 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev->y))) 1706 && scrollbarrxvt_upButton (ev.y)))
1711 tt_printf("\033[A"); 1707 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 1708 else if ((scrollBar.style == R_SB_NEXT
1713 && scrollbarnext_dnButton(ev->y)) 1709 && scrollbarnext_dnButton (ev.y))
1714 || (scrollBar.style == R_SB_RXVT 1710 || (scrollBar.style == R_SB_RXVT
1715 && scrollbarrxvt_dnButton(ev->y))) 1711 && scrollbarrxvt_dnButton (ev.y)))
1716 tt_printf("\033[B"); 1712 tt_printf ("\033[B");
1717 else 1713 else
1718 switch (ev->button) 1714 switch (ev.button)
1719 { 1715 {
1720 case Button2: 1716 case Button2:
1721 tt_printf("\014"); 1717 tt_printf ("\014");
1722 break; 1718 break;
1723 case Button1: 1719 case Button1:
1724 tt_printf("\033[6~"); 1720 tt_printf ("\033[6~");
1725 break; 1721 break;
1726 case Button3: 1722 case Button3:
1727 tt_printf("\033[5~"); 1723 tt_printf ("\033[5~");
1728 break; 1724 break;
1729 } 1725 }
1730 } 1726 }
1731 else 1727 else
1732#endif /* NO_SCROLLBAR_REPORT */ 1728#endif /* NO_SCROLLBAR_REPORT */
… …
1734 { 1730 {
1735 char upordown = 0; 1731 char upordown = 0;
1736 1732
1737 if (scrollBar.style == R_SB_NEXT) 1733 if (scrollBar.style == R_SB_NEXT)
1738 { 1734 {
1739 if (scrollbarnext_upButton(ev->y)) 1735 if (scrollbarnext_upButton (ev.y))
1740 upordown = -1; /* up */ 1736 upordown = -1; /* up */
1741 else if (scrollbarnext_dnButton(ev->y)) 1737 else if (scrollbarnext_dnButton (ev.y))
1742 upordown = 1; /* down */ 1738 upordown = 1; /* down */
1743 } 1739 }
1744 else if (scrollBar.style == R_SB_RXVT) 1740 else if (scrollBar.style == R_SB_RXVT)
1745 { 1741 {
1746 if (scrollbarrxvt_upButton(ev->y)) 1742 if (scrollbarrxvt_upButton (ev.y))
1747 upordown = -1; /* up */ 1743 upordown = -1; /* up */
1748 else if (scrollbarrxvt_dnButton(ev->y)) 1744 else if (scrollbarrxvt_dnButton (ev.y))
1749 upordown = 1; /* down */ 1745 upordown = 1; /* down */
1750 } 1746 }
1751 if (upordown) 1747 if (upordown)
1752 { 1748 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1760 else 1756 else
1761 scrollBar.setDn (); 1757 scrollBar.setDn ();
1762 } 1758 }
1763 } 1759 }
1764 else 1760 else
1765 switch (ev->button) 1761 switch (ev.button)
1766 { 1762 {
1767 case Button2: 1763 case Button2:
1768 switch (scrollbar_align) 1764 switch (scrollbar_align)
1769 { 1765 {
1770 case R_SB_ALIGN_TOP: 1766 case R_SB_ALIGN_TOP:
… …
1776 case R_SB_ALIGN_BOTTOM: 1772 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 1773 csrO = scrollBar.bot - scrollBar.top;
1778 break; 1774 break;
1779 } 1775 }
1780 if (scrollBar.style == R_SB_XTERM 1776 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev->y) 1777 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider(ev->y)) 1778 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position(ev->y) - csrO, 1779 scr_move_to ( scrollbar_position (ev.y) - csrO,
1784 scrollbar_size()); 1780 scrollbar_size ());
1785 scrollBar.setMotion (); 1781 scrollBar.setMotion ();
1786 break; 1782 break;
1787 1783
1788 case Button1: 1784 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1785 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1790 csrO = ev->y - scrollBar.top; 1786 csrO = ev.y - scrollBar.top;
1791 /* FALLTHROUGH */ 1787 /* FALLTHROUGH */
1792 1788
1793 case Button3: 1789 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 1790 if (scrollBar.style != R_SB_XTERM)
1795 { 1791 {
1796 if (scrollbar_above_slider(ev->y)) 1792 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 1793# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 1794 scr_page (UP, TermWin.nrow - 1);
1799# else 1795# else
1800 scr_page (UP, TermWin.nrow / 4); 1796 scr_page (UP, TermWin.nrow / 4);
1801# endif 1797# endif
1802 else if (scrollbar_below_slider(ev->y)) 1798 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 1799# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 1800 scr_page (DN, TermWin.nrow - 1);
1805# else 1801# else
1806 scr_page (DN, TermWin.nrow / 4); 1802 scr_page (DN, TermWin.nrow / 4);
1807# endif 1803# endif
1808 else 1804 else
1809 scrollBar.setMotion (); 1805 scrollBar.setMotion ();
1810 } 1806 }
1811 else 1807 else
1812 { 1808 {
1813 scr_page ((ev->button == Button1 ? DN : UP), 1809 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 1810 (TermWin.nrow
1815 * scrollbar_position(ev->y) 1811 * scrollbar_position (ev.y)
1816 / scrollbar_size())); 1812 / scrollbar_size ()));
1817 } 1813 }
1818 break; 1814 break;
1819 } 1815 }
1820 } 1816 }
1821 return; 1817 return;
1822 } 1818 }
1823#if MENUBAR 1819#if MENUBAR
1824 /* 1820 /*
1825 * Menubar window processing of button press 1821 * Menubar window processing of button press
1826 */ 1822 */
1827 if (isMenuBarWindow(ev->window)) 1823 if (isMenuBarWindow (ev.window))
1828 menubar_control (ev); 1824 menubar_control (ev);
1829#endif 1825#endif
1830} 1826}
1831 1827
1832void 1828void
1833rxvt_term::button_release (XButtonEvent *ev) 1829rxvt_term::button_release (const XButtonEvent &ev)
1834{ 1830{
1835 int reportmode = 0; 1831 int reportmode = 0;
1836 1832
1837 csrO = 0; /* reset csr Offset */ 1833 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1834 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1840 1836
1841 if (scrollbar_isUpDn()) 1837 if (scrollbar_isUpDn ())
1842 { 1838 {
1843 scrollBar.setIdle (); 1839 scrollBar.setIdle ();
1844 scrollbar_show (0); 1840 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH; 1842 refresh_type &= ~SMOOTH_REFRESH;
… …
1848 1844
1849 } 1845 }
1850#ifdef SELECTION_SCROLLING 1846#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1847 pending_scroll_selection=0;
1852#endif 1848#endif
1853 if (ev->window == TermWin.vt) 1849 if (ev.window == TermWin.vt)
1854 { 1850 {
1855#ifdef RXVT_GRAPHICS 1851#ifdef RXVT_GRAPHICS
1856 if (ev->subwindow != None) 1852 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1858 else 1854 else
1859#endif 1855#endif
1860 1856
1861 { 1857 {
1862 if (reportmode) 1858 if (reportmode)
1863 { 1859 {
1864 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */ 1861 /* don't report release of wheel "buttons" */
1866 if (ev->button >= 4) 1862 if (ev.button >= 4)
1867 return; 1863 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */ 1865 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton 1866 if (MEvent.button != AnyButton
1871 && (ev->button != MEvent.button 1867 && (ev.button != MEvent.button
1872 || (ev->time - MEvent.time 1868 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2))) 1869 > MULTICLICK_TIME / 2)))
1874 { 1870 {
1875 MEvent.clicks = 0; 1871 MEvent.clicks = 0;
1876 MEvent.button = AnyButton; 1872 MEvent.button = AnyButton;
1877 mouse_report (ev); 1873 mouse_report (ev);
… …
1886 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1883 * when overriding mouse reporting
1888 */ 1884 */
1889 if (PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1886 && bypass_keystate
1891 && ev->button == Button1 && MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1893 1889
1894 switch (ev->button) 1890 switch (ev.button)
1895 { 1891 {
1896 case Button1: 1892 case Button1:
1897 case Button3: 1893 case Button3:
1898 selection_make (ev->time); 1894 selection_make (ev.time);
1899 break; 1895 break;
1900 case Button2: 1896 case Button2:
1901 selection_request (ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1902 break; 1898 break;
1903#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1904 case Button4: 1900 case Button4:
1905 case Button5: 1901 case Button5:
1906 { 1902 {
1907 int i; 1903 int i;
1908 page_dirn v; 1904 page_dirn v;
1909 1905
1910 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1911 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1912 i = 1; 1908 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1915 else 1911 else
1916 i = 5; 1912 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1918 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1919 { 1915 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1918 }
1923# endif 1919# endif
… …
1940 1936
1941 } 1937 }
1942 } 1938 }
1943 } 1939 }
1944#ifdef MENUBAR 1940#ifdef MENUBAR
1945 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1942 menubar_control (ev);
1947#endif 1943#endif
1948} 1944}
1949 1945
1950 1946
… …
1964 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1966 1962
1967 pchanged = 0; 1963 pchanged = 0;
1968 1964
1969 if (!(Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1971 1967
1972 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1974 1970
1975 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1976 if (rootdepth != wattr.depth) 1972 if (rootdepth != wattr.depth)
1977 { 1973 {
1978 if (am_transparent) 1974 if (am_transparent)
1979 { 1975 {
1980 pchanged = 1; 1976 pchanged = 1;
1981 XSetWindowBackground(Xdisplay, TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1982 PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1984 } 1980 }
1985 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1986 } 1982 }
1987 1983
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1984 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync(Xdisplay, False); 1985 XSync (display->display, False);
1990 1986
1991 /* 1987 /*
1992 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1990 * windows for each client, so we have to take care about that.
1995 */ 1991 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1997 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
2000 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
2001 have_pixmap = 0; 1997 have_pixmap = 0;
2002 else 1998 else
2003 { 1999 {
2004 have_pixmap = 1; 2000 have_pixmap = 1;
2005 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
2006 XFree(prop); 2002 XFree (prop);
2007 } 2003 }
2008 if (have_pixmap) 2004 if (have_pixmap)
2009 { 2005 {
2010 /* 2006 /*
2011 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
2012 */ 2008 */
2013 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 2010 unsigned int nw, nh;
2015 Window cr; 2011 Window cr;
2016 XImage *image; 2012 XImage *image;
2017 GC gc; 2013 GC gc;
2018 XGCValues gcvalue; 2014 XGCValues gcvalue;
2019 2015
2020 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 2018 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 2019 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 2020 nx = ny = 0;
2025 if (sx < 0) 2021 if (sx < 0)
… …
2032 { 2028 {
2033 nh += sy; 2029 nh += sy;
2034 ny = -sy; 2030 ny = -sy;
2035 sy = 0; 2031 sy = 0;
2036 } 2032 }
2037 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2035 allowedxerror = -1;
2040 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2041 ZPixmap); 2037 ZPixmap);
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2040 allowedxerror = 0;
2045 if (image == NULL) 2041 if (image == NULL)
… …
2047 if (am_transparent && am_pixmap_trans) 2043 if (am_transparent && am_pixmap_trans)
2048 { 2044 {
2049 pchanged = 1; 2045 pchanged = 1;
2050 if (TermWin.pixmap != None) 2046 if (TermWin.pixmap != None)
2051 { 2047 {
2052 XFreePixmap(Xdisplay, TermWin.pixmap); 2048 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2049 TermWin.pixmap = None;
2054 } 2050 }
2055 } 2051 }
2056 am_pixmap_trans = 0; 2052 am_pixmap_trans = 0;
2057 } 2053 }
2058 else 2054 else
2059 { 2055 {
2060 if (TermWin.pixmap != None) 2056 if (TermWin.pixmap != None)
2061 XFreePixmap(Xdisplay, TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
2062 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width, 2059 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2060 (unsigned int)szHint.height,
2065 (unsigned int)image->depth); 2061 (unsigned int)image->depth);
2066 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width, 2064 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2065 (unsigned int)image->height);
2070 XFreeGC(Xdisplay, gc); 2066 XFreeGC (display->display, gc);
2071 XDestroyImage(image); 2067 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 2069 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans) 2070 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2071 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1; 2072 am_transparent = am_pixmap_trans = 1;
2077 } 2073 }
… …
2080 { 2076 {
2081 unsigned int n; 2077 unsigned int n;
2082 /* 2078 /*
2083 * InheritPixmap transparency 2079 * InheritPixmap transparency
2084 */ 2080 */
2085 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2087 i++) 2083 i++)
2088 { 2084 {
2089 oldp = TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2090 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2092 XFree(list); 2088 XFree (list);
2093 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2094 if (TermWin.parent[i] == Xroot) 2090 if (TermWin.parent[i] == display->root)
2095 { 2091 {
2096 if (oldp != None) 2092 if (oldp != None)
2097 pchanged = 1; 2093 pchanged = 1;
2098 break; 2094 break;
2099 } 2095 }
… …
2103 n = 0; 2099 n = 0;
2104 if (pchanged) 2100 if (pchanged)
2105 { 2101 {
2106 for (; n < (unsigned int)i; n++) 2102 for (; n < (unsigned int)i; n++)
2107 { 2103 {
2108 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2111 { 2107 {
2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2109 break;
2114 } 2110 }
2115 } 2111 }
2116 } 2112 }
2117 if (n > (int)(sizeof(TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2118 / sizeof(TermWin.parent[0]))) 2114 / sizeof (TermWin.parent[0])))
2119 { 2115 {
2120 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2122 PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2123 XSetWindowBackground(Xdisplay, TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2124 PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2125 am_transparent = 0; 2121 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2127 } 2123 }
2128 else 2124 else
… …
2132# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt; 2129 struct timespec rqt;
2134 2130
2135 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2137 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2138# else 2134# else
2139 sleep(1); 2135 sleep (1);
2140# endif 2136# endif
2141 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2144 ParentRelative); 2140 ParentRelative);
2145 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2146 ParentRelative); 2142 ParentRelative);
2147 am_transparent = 1; 2143 am_transparent = 1;
2148 } 2144 }
2149 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2151 } 2147 }
2152 return pchanged; 2148 return pchanged;
2153} 2149}
2154#endif 2150#endif
… …
2159/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2161FILE * 2157FILE *
2162rxvt_term::popen_printer () 2158rxvt_term::popen_printer ()
2163{ 2159{
2164 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2161
2166 if (stream == NULL) 2162 if (stream == NULL)
2167 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2168 return stream; 2164 return stream;
2169} 2165}
2170 2166
2171int 2167int
2172rxvt_term::pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2173{ 2169{
2174 fflush (stream); 2170 fflush (stream);
2175 /* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2179# else 2175# else
2180 return pclose (stream); 2176 return pclose (stream);
… …
2203 unsigned char ch; 2199 unsigned char ch;
2204 unsigned int i, len; 2200 unsigned int i, len;
2205 2201
2206 if ((ch = cmd_getc ()) != C0_ESC) 2202 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2203 {
2208 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2205 break; /* done = 1 */
2210 } 2206 }
2211 else 2207 else
2212 { 2208 {
2213 len = 0; 2209 len = 0;
… …
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2222 break; /* done = 1 */
2227 } 2223 }
2228 } 2224 }
2229 for (i = 0; i < len; i++) 2225 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF) 2226 if (putc (buf[i], fd) == EOF)
2231 { 2227 {
2232 done = 1; 2228 done = 1;
2233 break; 2229 break;
2234 } 2230 }
2235 } 2231 }
… …
2255{ 2251{
2256 switch (ch) 2252 switch (ch)
2257 { 2253 {
2258 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2260 tt_write( 2256 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2259 else
2264 tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2262 break;
2267 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2268 scr_bell (); 2264 scr_bell ();
2269 break; 2265 break;
2270 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
… …
2332 row = cmd_getc () - ' '; 2328 row = cmd_getc () - ' ';
2333 col = cmd_getc () - ' '; 2329 col = cmd_getc () - ' ';
2334 scr_gotorc (row, col, 0); 2330 scr_gotorc (row, col, 0);
2335 break; 2331 break;
2336 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2338 break; 2334 break;
2339 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2340 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2341 break; 2337 break;
2342 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2343 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2344 /* unimplemented */ 2340 /* unimplemented */
2345 break; 2341 break;
… …
2404 scr_forwardindex (); 2400 scr_forwardindex ();
2405 break; 2401 break;
2406#endif 2402#endif
2407 case '=': 2403 case '=':
2408 case '>': 2404 case '>':
2409 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2410 break; 2406 break;
2411 2407
2412 case C1_40: 2408 case C1_40:
2413 cmd_getc (); 2409 cmd_getc ();
2414 break; 2410 break;
… …
2450 process_dcs_seq (); 2446 process_dcs_seq ();
2451 break; 2447 break;
2452 2448
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2455 tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2458 2454
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2460 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2457 process_csi_seq ();
… …
2501 2497
2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2505#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2507 2503
2508const unsigned char csi_defaults[] = 2504const unsigned char csi_defaults[] =
2509 { 2505 {
2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2506 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2511 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2507 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2512 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2518 }; 2514 };
2519/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2520 2516
2521void 2517void
2522rxvt_term::process_csi_seq () 2518rxvt_term::process_csi_seq ()
… …
2537 ch = cmd_getc (); 2533 ch = cmd_getc ();
2538 } 2534 }
2539 /* read any numerical arguments */ 2535 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2536 for (n = -1; ch < CSI_ICH; )
2541 { 2537 {
2542 if (isdigit(ch)) 2538 if (isdigit (ch))
2543 { 2539 {
2544 if (n < 0) 2540 if (n < 0)
2545 n = ch - '0'; 2541 n = ch - '0';
2546 else 2542 else
2547 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
… …
2573 2569
2574 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2575 arg[nargs++] = n; 2571 arg[nargs++] = n;
2576 2572
2577 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2578 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2576 if (arg[p] == -1)
2581 arg[p] = ndef; 2577 arg[p] = ndef;
2582 2578
2583#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2584 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2585 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2586 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2587 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2588#endif 2584#endif
2589 2585
2590 /* 2586 /*
2591 * private mode handling 2587 * private mode handling
2592 */ 2588 */
… …
2594 { 2590 {
2595 switch (priv) 2591 switch (priv)
2596 { 2592 {
2597 case '>': 2593 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2600 break; 2596 break;
2601 case '?': 2597 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2600 break;
… …
2607 } 2603 }
2608 2604
2609 switch (ch) 2605 switch (ch)
2610 { 2606 {
2611 /* 2607 /*
2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2613 */ 2609 */
2614#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2616 switch (arg[0]) 2612 switch (arg[0])
2617 { 2613 {
… …
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2715 break; 2711 break;
2716 2712
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2719 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2720 break; 2716 break;
2721 2717
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2719 process_sgr_mode (nargs, arg);
2724 break; 2720 break;
2725 2721
2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2727 switch (arg[0]) 2723 switch (arg[0])
2728 { 2724 {
2729 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2730 tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2731 break; 2727 break;
2732 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2733 scr_report_position (); 2729 scr_report_position ();
2734 break; 2730 break;
2735#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2737 tt_printf("%-.250s\n", rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2734 break;
2739#endif 2735#endif
2740 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2742 break; 2738 break;
… …
2813 break; 2809 break;
2814#endif 2810#endif
2815 2811
2816 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2820 2816
2821 default: 2817 default:
2822 break; 2818 break;
2823 } 2819 }
… …
2842 { 2838 {
2843 /* 2839 /*
2844 * commands 2840 * commands
2845 */ 2841 */
2846 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2847 XMapWindow(Xdisplay, TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 2844 break;
2849 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2850 XIconifyWindow(Xdisplay, TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2851 DefaultScreen(Xdisplay)); 2847 DefaultScreen (display->display));
2852 break; 2848 break;
2853 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2854 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2855 break; 2851 break;
2856 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 2854 break;
2859 case 5: /* raise window */ 2855 case 5: /* raise window */
2860 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2861 break; 2857 break;
2862 case 6: /* lower window */ 2858 case 6: /* lower window */
2863 XLowerWindow(Xdisplay, TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2864 break; 2860 break;
2865 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2866 scr_touch (true); 2862 scr_touch (true);
2867 break; 2863 break;
2868 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int)(args[1] * TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2867 break;
2872 default: 2868 default:
2873 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int)(args[1] * TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 2872 break;
2877 /* 2873 /*
2878 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2879 */ 2875 */
2880 case 11: /* report window state */ 2876 case 11: /* report window state */
2881 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 2879 break;
2884 case 13: /* report window position */ 2880 case 13: /* report window position */
2885 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2889 tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 2886 break;
2891 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 2890 break;
2895 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 2893 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2900 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2902 break; 2898 break;
2903 case 21: /* report window title */ 2899 case 21: /* report window title */
2904 XFetchName(Xdisplay, TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2906 break; 2902 break;
2907#endif 2903#endif
2908 2904
2909 } 2905 }
2910} 2906}
2911#endif 2907#endif
2912 2908
2913/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2914/* 2910/*
2915 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2917 */ 2913 */
2918unsigned char * 2914unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2920{ 2916{
2921 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
… …
2936 } 2932 }
2937 else if (ch == '\t') 2933 else if (ch == '\t')
2938 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2940 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2941 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2942 string[n++] = ch; 2938 string[n++] = ch;
2943 seen_esc = 0; 2939 seen_esc = 0;
2944 } 2940 }
2945 string[n++] = '\0'; 2941 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 2943 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2950 return s; 2946 return s;
2951} 2947}
2952 2948
2953/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2954/* 2950/*
… …
2961 /* 2957 /*
2962 * Not handled yet 2958 * Not handled yet
2963 */ 2959 */
2964 s = get_to_st (&eh); 2960 s = get_to_st (&eh);
2965 if (s) 2961 if (s)
2966 free(s); 2962 free (s);
2967 return; 2963 return;
2968} 2964}
2969 2965
2970/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2971/* 2967/*
… …
2976{ 2972{
2977 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2978 int arg; 2974 int arg;
2979 2975
2980 ch = cmd_getc (); 2976 ch = cmd_getc ();
2981 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2983 2979
2984 if (ch == ';') 2980 if (ch == ';')
2985 { 2981 {
2986 s = get_to_st (&eh); 2982 s = get_to_st (&eh);
2987 if (s) 2983 if (s)
2988 { 2984 {
2989 /* 2985 /*
2990 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here 2987 * so do it here
2992 */ 2988 */
2993 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s); 2991 menubar_dispatch ((char *)s);
2996#else 2992#else
2997 (void)0; 2993 (void)0;
2998#endif 2994#endif
2999 else 2995 else
3000 xterm_seq (arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
3001 free(s); 2997 free (s);
3002 } 2998 }
3003 } 2999 }
3004} 3000}
3005/* 3001/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3022 * 39 = change default fg color 3018 * 39 = change default fg color
3023 * 49 = change default bg color 3019 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
3025 */ 3021 */
3026void 3022void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3028{ 3024{
3029 int changed = 0; 3025 int changed = 0;
3030 int color; 3026 int color;
3031 char *buf, *name; 3027 char *buf, *name;
3032 3028
3033 assert(str != NULL); 3029 assert (str != NULL);
3034 switch (op) 3030 switch (op)
3035 { 3031 {
3036 case XTerm_name: 3032 case XTerm_name:
3037 set_title (str); 3033 set_title (str);
3038 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
… …
3043 set_title (str); 3039 set_title (str);
3044 break; 3040 break;
3045 case XTerm_Color: 3041 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3042 for (buf = (char *)str; buf && *buf;)
3047 { 3043 {
3048 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3045 break;
3050 *name++ = '\0'; 3046 *name++ = '\0';
3051 color = atoi(buf); 3047 color = atoi (buf);
3052 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3049 break;
3054 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3051 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
3057 } 3053 }
3058 break; 3054 break;
3059#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
… …
3076 break; 3072 break;
3077#endif 3073#endif
3078 3074
3079 case XTerm_Menu: 3075 case XTerm_Menu:
3080 /* 3076 /*
3081 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here 3078 * so DON'T do it here
3083 */ 3079 */
3084 break; 3080 break;
3085 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
3086 if (*str != ';') 3082 if (*str != ';')
… …
3089 scale_pixmap (""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
3090 set_bgPixmap (str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
3091#endif 3087#endif
3092 scr_touch (true); 3088 scr_touch (true);
3093 } 3089 }
3094 while ((str = STRCHR(str, ';')) != NULL) 3090 while ((str = STRCHR (str, ';')) != NULL)
3095 { 3091 {
3096 str++; 3092 str++;
3097#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
3098 changed += scale_pixmap (str); 3094 changed += scale_pixmap (str);
3099#endif 3095#endif
… …
3121 break; 3117 break;
3122#if 0 3118#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3124 { 3120 {
3125 int fd; 3121 int fd;
3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3123 {
3128 scr_dump (fd); 3124 scr_dump (fd);
3129 close(fd); 3125 close (fd);
3130 } 3126 }
3131 } 3127 }
3132 break; 3128 break;
3133#endif 3129#endif
3134 3130
… …
3159 else 3155 else
3160 { 3156 {
3161 if (mode == 'r') 3157 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3159 else
3164 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode(state, bit); 3161 PrivMode (state, bit);
3166 } 3162 }
3167 return state; 3163 return state;
3168} 3164}
3169 3165
3170/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3171void 3167void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3169{
3174 unsigned int i, j; 3170 unsigned int i, j;
3175 int state; 3171 int state;
3176 static const struct 3172 static const struct
3177 { 3173 {
… …
3220 for (i = 0; i < nargs; i++) 3216 for (i = 0; i < nargs; i++)
3221 { 3217 {
3222 state = -1; 3218 state = -1;
3223 3219
3224 /* basic handling */ 3220 /* basic handling */
3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3226 if (argtopriv[j].argval == arg[i]) 3222 if (argtopriv[j].argval == arg[i])
3227 { 3223 {
3228 state = privcases (mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3229 break; 3225 break;
3230 } 3226 }
… …
3238 scr_cursor (RESTORE); 3234 scr_cursor (RESTORE);
3239 else if (mode == 1) 3235 else if (mode == 1)
3240 scr_cursor (SAVE); 3236 scr_cursor (SAVE);
3241 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3242 default: 3238 default:
3243 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3244 } 3240 }
3245 3241
3246 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i]) 3243 switch (arg[i])
3248 { 3244 {
… …
3250 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode 3249 * within VT52 mode
3254 */ 3250 */
3255 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3256 break; 3252 break;
3257 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3260 (unsigned int)TermWin.height); 3256 (unsigned int)TermWin.height);
3261 break; 3257 break;
3262 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3263 if (state) 3259 if (state)
3264 Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
… …
3275 scr_autowrap (state); 3271 scr_autowrap (state);
3276 break; 3272 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3273 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3280 PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3281 break; 3277 break;
3282#ifdef menuBar_esc 3278#ifdef menuBar_esc
3283 case menuBar_esc: 3279 case menuBar_esc:
3284#ifdef MENUBAR 3280#ifdef MENUBAR
3285 map_menuBar (state); 3281 map_menuBar (state);
… …
3305 break; 3301 break;
3306 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3310 PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3311 break; 3307 break;
3312#if 0 3308#if 0
3313 case 1001: 3309 case 1001:
3314 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3315#endif 3311#endif
… …
3385 break; 3381 break;
3386 } 3382 }
3387 if (rendset != -1) 3383 if (rendset != -1)
3388 { 3384 {
3389 scr_rendition (rendset, rendstyle); 3385 scr_rendition (rendset, rendstyle);
3390 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3391 } 3387 }
3392 3388
3393 switch (arg[i]) 3389 switch (arg[i])
3394 { 3390 {
3395 case 30: 3391 case 30:
… …
3398 case 33: 3394 case 33:
3399 case 34: 3395 case 34:
3400 case 35: 3396 case 35:
3401 case 36: 3397 case 36:
3402 case 37: 3398 case 37:
3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3404 Color_fg); 3400 Color_fg);
3405 break; 3401 break;
3406#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3407 case 38: 3403 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3405 {
3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3411 Color_fg); 3407 Color_fg);
3412 i += 2; 3408 i += 2;
3413 } 3409 }
3414 break; 3410 break;
3415#endif 3411#endif
… …
3423 case 43: 3419 case 43:
3424 case 44: 3420 case 44:
3425 case 45: 3421 case 45:
3426 case 46: 3422 case 46:
3427 case 47: 3423 case 47:
3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3429 Color_bg); 3425 Color_bg);
3430 break; 3426 break;
3431#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3432 case 48: 3428 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3430 {
3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3436 Color_bg); 3432 Color_bg);
3437 i += 2; 3433 i += 2;
3438 } 3434 }
3439 break; 3435 break;
3440#endif 3436#endif
… …
3449 case 93: 3445 case 93:
3450 case 94: 3446 case 94:
3451 case 95: 3447 case 95:
3452 case 96: 3448 case 96:
3453 case 97: 3449 case 97:
3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3455 Color_fg); 3451 Color_fg);
3456 break; 3452 break;
3457 case 100: 3453 case 100:
3458 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3459 case 102: 3455 case 102:
3460 case 103: 3456 case 103:
3461 case 104: 3457 case 104:
3462 case 105: 3458 case 105:
3463 case 106: 3459 case 106:
3464 case 107: 3460 case 107:
3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3466 Color_bg); 3462 Color_bg);
3467 break; 3463 break;
3468#endif 3464#endif
3469 3465
3470 } 3466 }
… …
3479 unsigned char ch, cmd = cmd_getc (); 3475 unsigned char ch, cmd = cmd_getc ();
3480 3476
3481#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3478 if (cmd == 'Q')
3483 { /* query graphics */ 3479 { /* query graphics */
3484 tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3481 return;
3486 } 3482 }
3487 /* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3488 do 3484 do
3489 ch = cmd_getc (); 3485 ch = cmd_getc ();
… …
3493 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3494 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3495 3491
3496 if (cmd == 'Q') 3492 if (cmd == 'Q')
3497 { /* query graphics */ 3493 { /* query graphics */
3498 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3499 return; 3495 return;
3500 } 3496 }
3501 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3502 { 3498 {
3503 int neg; 3499 int neg;
3504 3500
3505 ch = cmd_getc (); 3501 ch = cmd_getc ();
3506 neg = (ch == '-'); 3502 neg = (ch == '-');
3507 if (neg || ch == '+') 3503 if (neg || ch == '+')
3508 ch = cmd_getc (); 3504 ch = cmd_getc ();
3509 3505
3510 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg) 3508 if (neg)
3513 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3514 3510
3515 nargs++; 3511 nargs++;
… …
3520 3516
3521 if ((cmd == 'T') && (nargs >= 5)) 3517 if ((cmd == 'T') && (nargs >= 5))
3522 { 3518 {
3523 int i, len = args[4]; 3519 int i, len = args[4];
3524 3520
3525 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3526 3522
3527 if (text != NULL) 3523 if (text != NULL)
3528 { 3524 {
3529 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc (); 3526 text[i] = cmd_getc ();
… …
3537/*}}} */ 3533/*}}} */
3538 3534
3539/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3540 3536
3541/* 3537/*
3542 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3543 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3544 */ 3540 */
3545void 3541void
3546rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3547{ 3543{

Diff Legend

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