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.28 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * 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>
31 * 31 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 58void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
61{ 60{
62 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
63 unsigned int newlen; 62 unsigned int newlen;
64 KeySym keysym; 63 KeySym keysym;
65#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
67#endif 66#endif
68 int valid_keysym; 67 int valid_keysym;
69 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
70 69
71/* 70 /*
72 * 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
73 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
74 * 73 *
75 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
76 */ 75 */
77 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 78 meta = (ev.state & ModMetaMask);
80 79
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
82 { 81 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
85 } 84 }
86 85
87 kbuf[0] = 0; 86 kbuf[0] = 0;
88 87
89#ifdef USE_XIM 88#ifdef USE_XIM
90 if (R->Input_Context) 89 if (Input_Context)
91 { 90 {
92 Status status_return; 91 Status status_return;
93 92
94#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
98 else 97 else
99#endif 98#endif
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
115 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
116 wkbuf[len] = 0; 123 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0) 125 if (len < 0)
119 len = 0; 126 len = 0;
120 } 127 }
128 }
121 else 129 else
122 len = 0; 130 len = 0;
123 } 131 }
124 132
125 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
126 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
127 } 135 }
128 else 136 else
129#endif 137#endif
130 { 138 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137/* for some backwards compatibility */ 145 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
140 if (ctrl) 148 if (ctrl)
141# else 149# else
142 if (meta) 150 if (meta)
143# endif 151# endif
144 { 152 {
145 if (keysym == R->ks_bigfont) 153 if (keysym == ks_bigfont)
146 { 154 {
147 rxvt_change_font(aR_ 0, FONT_UP); 155 change_font (FONT_UP);
148 return; 156 return;
149 } 157 }
150 else if (keysym == R->ks_smallfont) 158 else if (keysym == ks_smallfont)
151 { 159 {
152 rxvt_change_font(aR_ 0, FONT_DN); 160 change_font (FONT_DN);
153 return; 161 return;
162 }
154 } 163 }
155 }
156#endif 164#endif
157 165
158 if (R->TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
159#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
161#else 171#else
162 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
163#endif 174#endif
164 int lnsppg; 175 int lnsppg;
165 176
166#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
168#else 179#else
169 lnsppg = R->TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
170#endif 181#endif
171 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
172 rxvt_scr_page(aR_ UP, lnsppg); 183 {
173 return; 184 scr_page (UP, lnsppg);
185 return;
186 }
174 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
175 rxvt_scr_page(aR_ DN, lnsppg); 188 {
176 return; 189 scr_page (DN, lnsppg);
177 } 190 return;
178 } 191 }
192 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
181 if (keysym == XK_Up) { 195 {
182 rxvt_scr_page(aR_ UP, 1); 196 if (keysym == XK_Up)
183 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
184 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
185 rxvt_scr_page(aR_ DN, 1); 202 {
186 return; 203 scr_page (DN, 1);
187 } 204 return;
188 } 205 }
206 }
189#endif 207#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
192 if (keysym == XK_Home) { 210 {
193 rxvt_scr_move_to(aR_ 0, 1); 211 if (keysym == XK_Home)
194 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
195 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
196 rxvt_scr_move_to(aR_ 1, 0); 217 {
197 return; 218 scr_move_to (1, 0);
198 } 219 return;
199 } 220 }
221 }
200#endif 222#endif
201 } 223 }
202 224
203 if (shft) { 225 if (shft)
226 {
204 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
206 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
209 switch (keysym) { 234 {
210 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
213 return; 240 return;
214 /* rxvt extras */ 241 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP); 243 change_font (FONT_UP);
217 return; 244 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN); 246 change_font (FONT_DN);
220 return; 247 return;
221 } 248 }
222 } 249 }
223 } 250 }
224#ifdef PRINTPIPE 251#ifdef PRINTPIPE
225 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
226 rxvt_scr_printscreen(aR_ ctrl | shft); 253 {
254 scr_printscreen (ctrl | shft);
227 return; 255 return;
228 } 256 }
229#endif 257#endif
230#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) {
232 R->greek_mode = !R->greek_mode;
233 if (R->greek_mode) {
234 rxvt_xterm_seq(aR_ XTerm_title,
235 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset();
238 } else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return;
241 }
242#endif
243 258
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
245#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
247 unsigned int l; 263 {
264 unsigned int l;
248 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
250 267
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
253 270
254 /* escape prefix */ 271 /* escape prefix */
255 if (meta) 272 if (meta)
256# ifdef META8_OPTION 273# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
258# endif 275# endif
259 R->tt_write (&ch, 1); 276 tt_write (&ch, 1);
260 R->tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
261 return; 278 return;
262 } else 279 }
280 else
263#endif 281#endif
264 { 282 {
265 newlen = 1; 283 newlen = 1;
266 switch (keysym) { 284 switch (keysym)
285 {
267#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 287 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
273 } else 293 }
274 STRCPY(kbuf, R->key_backspace); 294 else
295 STRCPY (kbuf, key_backspace);
275# ifdef MULTICHAR_SET 296# ifdef MULTICHAR_SET
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
277 int col, row; 298 {
299 int col, row;
278 300
279 newlen = STRLEN(kbuf); 301 newlen = STRLEN (kbuf);
280 col = R->screen.cur.col - 1; 302 col = screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines; 303 row = screen.cur.row + TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col])) 304 if (IS_MULTI2 (screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
284 } 306 }
285# endif 307# endif
286 break; 308 break;
287#endif 309#endif
288#ifndef NO_DELETE_KEY 310#ifndef NO_DELETE_KEY
289 case XK_Delete: 311 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 312 STRCPY (kbuf, key_delete);
291# ifdef MULTICHAR_SET 313# ifdef MULTICHAR_SET
292 if (R->Options & Opt_mc_hack) { 314 if (Options & Opt_mc_hack)
293 int col, row; 315 {
294 316 int col, row;
295 newlen = STRLEN(kbuf); 317
296 col = R->screen.cur.col; 318 newlen = STRLEN (kbuf);
297 row = R->screen.cur.row + R->TermWin.saveLines; 319 col = screen.cur.col;
298 if (IS_MULTI1(R->screen.rend[row][col])) 320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
300 } 323 }
301# endif 324# endif
302 break; 325 break;
303#endif 326#endif
304 case XK_Tab: 327 case XK_Tab:
305 if (shft) 328 if (shft)
306 STRCPY(kbuf, "\033[Z"); 329 STRCPY (kbuf, "\033[Z");
307 else { 330 else
331 {
308#ifdef CTRL_TAB_MAKES_META 332#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 333 if (ctrl)
310 meta = 1; 334 meta = 1;
311#endif 335#endif
312#ifdef MOD4_TAB_MAKES_META 336#ifdef MOD4_TAB_MAKES_META
313 if (ev->state & Mod4Mask) 337 if (ev.state & Mod4Mask)
314 meta = 1; 338 meta = 1;
315#endif 339#endif
316 newlen = 0; 340 newlen = 0;
317 } 341 }
318 break; 342 break;
319
320 343
321#ifdef XK_KP_Left 344#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 345 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 346 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 347 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 348 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
327 STRCPY(kbuf, "\033OZ"); 350 {
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 351 STRCPY (kbuf, "\033OZ");
329 break; 352 kbuf[2] = "txvr"[keysym - XK_KP_Left];
330 } else 353 break;
354 }
355 else
331 /* translate to std. cursor key */ 356 /* translate to std. cursor key */
332 keysym = XK_Left + (keysym - XK_KP_Left); 357 keysym = XK_Left + (keysym - XK_KP_Left);
333 /* FALLTHROUGH */ 358 /* FALLTHROUGH */
334#endif 359#endif
335 case XK_Up: /* "\033[A" */ 360 case XK_Up: /* "\033[A" */
336 case XK_Down: /* "\033[B" */ 361 case XK_Down: /* "\033[B" */
337 case XK_Right: /* "\033[C" */ 362 case XK_Right: /* "\033[C" */
338 case XK_Left: /* "\033[D" */ 363 case XK_Left: /* "\033[D" */
339 STRCPY(kbuf, "\033[Z"); 364 STRCPY (kbuf, "\033[Z");
340 kbuf[2] = ("DACB"[keysym - XK_Left]); 365 kbuf[2] = "DACB"[keysym - XK_Left];
341 /* do Shift first */ 366 /* do Shift first */
342 if (shft) 367 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 368 kbuf[2] = "dacb"[keysym - XK_Left];
344 else if (ctrl) { 369 else if (ctrl)
345 kbuf[1] = 'O'; 370 {
346 kbuf[2] = ("dacb"[keysym - XK_Left]); 371 kbuf[1] = 'O';
347 } else if (R->PrivateModes & PrivMode_aplCUR) 372 kbuf[2] = "dacb"[keysym - XK_Left];
348 kbuf[1] = 'O'; 373 }
374 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET 376#ifdef MULTICHAR_SET
350 //TODO: ?? 377 //TODO: ??
351 if (R->Options & Opt_mc_hack) { 378 if (Options & Opt_mc_hack)
352 int col, row, m; 379 {
380 int col, row, m;
353 381
354 col = R->screen.cur.col; 382 col = screen.cur.col;
355 row = R->screen.cur.row + R->TermWin.saveLines; 383 row = screen.cur.row + TermWin.saveLines;
356 m = 0; 384 m = 0;
357 if (keysym == XK_Right 385 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col])) 386 && IS_MULTI1 (screen.rend[row][col]))
359 m = 1; 387 m = 1;
360 else if (keysym == XK_Left) { 388 else if (keysym == XK_Left)
361 if (col > 0) { 389 {
362 if (IS_MULTI2(R->screen.rend[row][col - 1])) 390 if (col > 0)
363 m = 1; 391 {
364 } else if (R->screen.cur.row > 0) { 392 if (IS_MULTI2 (screen.rend[row][col - 1]))
365 col = R->screen.tlen[--row]; 393 m = 1;
366 if (col == -1) 394 }
367 col = R->TermWin.ncol - 1; 395 else if (screen.cur.row > 0)
368 else 396 {
369 col--; 397 col = screen.tlen[--row];
370 if (col > 0 398 if (col == -1)
371 && IS_MULTI2(R->screen.rend[row][col])) 399 col = TermWin.ncol - 1;
372 m = 1; 400 else
373 } 401 col--;
374 } 402 if (col > 0
375 if (m) 403 && IS_MULTI2 (screen.rend[row][col]))
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 404 m = 1;
377 } 405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
378#endif 410#endif
379 break; 411 break;
380 412
381#ifndef UNSHIFTED_SCROLLKEYS 413#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 414# ifdef XK_KP_Prior
383 case XK_KP_Prior: 415 case XK_KP_Prior:
384 /* allow shift to override */ 416 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 417 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
386 STRCPY(kbuf, "\033Oy"); 418 {
387 break; 419 STRCPY (kbuf, "\033Oy");
388 } 420 break;
389 /* FALLTHROUGH */ 421 }
422 /* FALLTHROUGH */
390# endif 423# endif
391 case XK_Prior: 424 case XK_Prior:
392 STRCPY(kbuf, "\033[5~"); 425 STRCPY (kbuf, "\033[5~");
393 break; 426 break;
394# ifdef XK_KP_Next 427# ifdef XK_KP_Next
395 case XK_KP_Next: 428 case XK_KP_Next:
396 /* allow shift to override */ 429 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 430 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
398 STRCPY(kbuf, "\033Os"); 431 {
399 break; 432 STRCPY (kbuf, "\033Os");
400 } 433 break;
401 /* FALLTHROUGH */ 434 }
435 /* FALLTHROUGH */
402# endif 436# endif
403 case XK_Next: 437 case XK_Next:
404 STRCPY(kbuf, "\033[6~"); 438 STRCPY (kbuf, "\033[6~");
405 break; 439 break;
406#endif 440#endif
407 case XK_KP_Enter: 441 case XK_KP_Enter:
408 /* allow shift to override */ 442 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 443 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
410 STRCPY(kbuf, "\033OM"); 444 {
411 } else { 445 STRCPY (kbuf, "\033OM");
412 kbuf[0] = '\r'; 446 }
413 kbuf[1] = '\0'; 447 else
414 } 448 {
415 break; 449 kbuf[0] = '\r';
450 kbuf[1] = '\0';
451 }
452 break;
416 453
417#ifdef XK_KP_Begin 454#ifdef XK_KP_Begin
418 case XK_KP_Begin: 455 case XK_KP_Begin:
419 STRCPY(kbuf, "\033Ou"); 456 STRCPY (kbuf, "\033Ou");
420 break; 457 break;
421 458
422 case XK_KP_Insert: 459 case XK_KP_Insert:
423 STRCPY(kbuf, "\033Op"); 460 STRCPY (kbuf, "\033Op");
424 break; 461 break;
425 462
426 case XK_KP_Delete: 463 case XK_KP_Delete:
427 STRCPY(kbuf, "\033On"); 464 STRCPY (kbuf, "\033On");
428 break; 465 break;
429#endif 466#endif
430 case XK_KP_F1: /* "\033OP" */ 467 case XK_KP_F1: /* "\033OP" */
431 case XK_KP_F2: /* "\033OQ" */ 468 case XK_KP_F2: /* "\033OQ" */
432 case XK_KP_F3: /* "\033OR" */ 469 case XK_KP_F3: /* "\033OR" */
433 case XK_KP_F4: /* "\033OS" */ 470 case XK_KP_F4: /* "\033OS" */
434 STRCPY(kbuf, "\033OP"); 471 STRCPY (kbuf, "\033OP");
435 kbuf[2] += (keysym - XK_KP_F1); 472 kbuf[2] += (keysym - XK_KP_F1);
436 break; 473 break;
437 474
438 case XK_KP_Multiply: /* "\033Oj" : "*" */ 475 case XK_KP_Multiply: /* "\033Oj" : "*" */
439 case XK_KP_Add: /* "\033Ok" : "+" */ 476 case XK_KP_Add: /* "\033Ok" : "+" */
440 case XK_KP_Separator: /* "\033Ol" : "," */ 477 case XK_KP_Separator: /* "\033Ol" : "," */
441 case XK_KP_Subtract: /* "\033Om" : "-" */ 478 case XK_KP_Subtract: /* "\033Om" : "-" */
442 case XK_KP_Decimal: /* "\033On" : "." */ 479 case XK_KP_Decimal: /* "\033On" : "." */
443 case XK_KP_Divide: /* "\033Oo" : "/" */ 480 case XK_KP_Divide: /* "\033Oo" : "/" */
444 case XK_KP_0: /* "\033Op" : "0" */ 481 case XK_KP_0: /* "\033Op" : "0" */
445 case XK_KP_1: /* "\033Oq" : "1" */ 482 case XK_KP_1: /* "\033Oq" : "1" */
446 case XK_KP_2: /* "\033Or" : "2" */ 483 case XK_KP_2: /* "\033Or" : "2" */
447 case XK_KP_3: /* "\033Os" : "3" */ 484 case XK_KP_3: /* "\033Os" : "3" */
448 case XK_KP_4: /* "\033Ot" : "4" */ 485 case XK_KP_4: /* "\033Ot" : "4" */
449 case XK_KP_5: /* "\033Ou" : "5" */ 486 case XK_KP_5: /* "\033Ou" : "5" */
450 case XK_KP_6: /* "\033Ov" : "6" */ 487 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 488 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 489 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 490 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 491 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 492 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
456 STRCPY(kbuf, "\033Oj"); 493 {
457 kbuf[2] += (keysym - XK_KP_Multiply); 494 STRCPY (kbuf, "\033Oj");
458 } else { 495 kbuf[2] += (keysym - XK_KP_Multiply);
496 }
497 else
498 {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 499 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 500 kbuf[1] = '\0';
461 } 501 }
462 break; 502 break;
463 503
464 case XK_Find: 504 case XK_Find:
465 STRCPY(kbuf, "\033[1~"); 505 STRCPY (kbuf, "\033[1~");
466 break; 506 break;
467 case XK_Insert: 507 case XK_Insert:
468 STRCPY(kbuf, "\033[2~"); 508 STRCPY (kbuf, "\033[2~");
469 break; 509 break;
470#ifdef DXK_Remove /* support for DEC remove like key */ 510#ifdef DXK_Remove /* support for DEC remove like key */
471 case DXK_Remove: 511 case DXK_Remove:
472 /* FALLTHROUGH */ 512 /* FALLTHROUGH */
473#endif 513#endif
474 case XK_Execute: 514 case XK_Execute:
475 STRCPY(kbuf, "\033[3~"); 515 STRCPY (kbuf, "\033[3~");
476 break; 516 break;
477 case XK_Select: 517 case XK_Select:
478 STRCPY(kbuf, "\033[4~"); 518 STRCPY (kbuf, "\033[4~");
479 break; 519 break;
480#ifdef XK_KP_End 520#ifdef XK_KP_End
481 case XK_KP_End: 521 case XK_KP_End:
482 /* allow shift to override */ 522 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 523 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
484 STRCPY(kbuf, "\033Oq"); 524 {
485 break; 525 STRCPY (kbuf, "\033Oq");
486 } 526 break;
487 /* FALLTHROUGH */ 527 }
528 /* FALLTHROUGH */
488#endif 529#endif
489 case XK_End: 530 case XK_End:
490 STRCPY(kbuf, KS_END); 531 STRCPY (kbuf, KS_END);
491 break; 532 break;
492#ifdef XK_KP_Home 533#ifdef XK_KP_Home
493 case XK_KP_Home: 534 case XK_KP_Home:
494 /* allow shift to override */ 535 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 536 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
496 STRCPY(kbuf, "\033Ow"); 537 {
497 break; 538 STRCPY (kbuf, "\033Ow");
498 } 539 break;
499 /* FALLTHROUGH */ 540 }
541 /* FALLTHROUGH */
500#endif 542#endif
501 case XK_Home: 543 case XK_Home:
502 STRCPY(kbuf, KS_HOME); 544 STRCPY (kbuf, KS_HOME);
503 break; 545 break;
504 546
505#define FKEY(n, fkey) \ 547#define FKEY(n, fkey) \
506 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 548 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
507 549
508 case XK_F1: /* "\033[11~" */ 550 case XK_F1: /* "\033[11~" */
509 case XK_F2: /* "\033[12~" */ 551 case XK_F2: /* "\033[12~" */
510 case XK_F3: /* "\033[13~" */ 552 case XK_F3: /* "\033[13~" */
511 case XK_F4: /* "\033[14~" */ 553 case XK_F4: /* "\033[14~" */
512 case XK_F5: /* "\033[15~" */ 554 case XK_F5: /* "\033[15~" */
513 FKEY(11, XK_F1); 555 FKEY (11, XK_F1);
514 break; 556 break;
515 case XK_F6: /* "\033[17~" */ 557 case XK_F6: /* "\033[17~" */
516 case XK_F7: /* "\033[18~" */ 558 case XK_F7: /* "\033[18~" */
517 case XK_F8: /* "\033[19~" */ 559 case XK_F8: /* "\033[19~" */
518 case XK_F9: /* "\033[20~" */ 560 case XK_F9: /* "\033[20~" */
519 case XK_F10: /* "\033[21~" */ 561 case XK_F10: /* "\033[21~" */
520 FKEY(17, XK_F6); 562 FKEY (17, XK_F6);
521 break; 563 break;
522 case XK_F11: /* "\033[23~" */ 564 case XK_F11: /* "\033[23~" */
523 case XK_F12: /* "\033[24~" */ 565 case XK_F12: /* "\033[24~" */
524 case XK_F13: /* "\033[25~" */ 566 case XK_F13: /* "\033[25~" */
525 case XK_F14: /* "\033[26~" */ 567 case XK_F14: /* "\033[26~" */
526 FKEY(23, XK_F11); 568 FKEY (23, XK_F11);
527 break; 569 break;
528 case XK_F15: /* "\033[28~" */ 570 case XK_F15: /* "\033[28~" */
529 case XK_F16: /* "\033[29~" */ 571 case XK_F16: /* "\033[29~" */
530 FKEY(28, XK_F15); 572 FKEY (28, XK_F15);
531 break; 573 break;
532 case XK_Help: /* "\033[28~" */ 574 case XK_Help: /* "\033[28~" */
533 FKEY(28, XK_Help); 575 FKEY (28, XK_Help);
534 break; 576 break;
535 case XK_Menu: /* "\033[29~" */ 577 case XK_Menu: /* "\033[29~" */
536 FKEY(29, XK_Menu); 578 FKEY (29, XK_Menu);
537 break; 579 break;
538 case XK_F17: /* "\033[31~" */ 580 case XK_F17: /* "\033[31~" */
539 case XK_F18: /* "\033[32~" */ 581 case XK_F18: /* "\033[32~" */
540 case XK_F19: /* "\033[33~" */ 582 case XK_F19: /* "\033[33~" */
541 case XK_F20: /* "\033[34~" */ 583 case XK_F20: /* "\033[34~" */
542 case XK_F21: /* "\033[35~" */ 584 case XK_F21: /* "\033[35~" */
543 case XK_F22: /* "\033[36~" */ 585 case XK_F22: /* "\033[36~" */
544 case XK_F23: /* "\033[37~" */ 586 case XK_F23: /* "\033[37~" */
545 case XK_F24: /* "\033[38~" */ 587 case XK_F24: /* "\033[38~" */
546 case XK_F25: /* "\033[39~" */ 588 case XK_F25: /* "\033[39~" */
547 case XK_F26: /* "\033[40~" */ 589 case XK_F26: /* "\033[40~" */
548 case XK_F27: /* "\033[41~" */ 590 case XK_F27: /* "\033[41~" */
549 case XK_F28: /* "\033[42~" */ 591 case XK_F28: /* "\033[42~" */
550 case XK_F29: /* "\033[43~" */ 592 case XK_F29: /* "\033[43~" */
551 case XK_F30: /* "\033[44~" */ 593 case XK_F30: /* "\033[44~" */
552 case XK_F31: /* "\033[45~" */ 594 case XK_F31: /* "\033[45~" */
553 case XK_F32: /* "\033[46~" */ 595 case XK_F32: /* "\033[46~" */
554 case XK_F33: /* "\033[47~" */ 596 case XK_F33: /* "\033[47~" */
555 case XK_F34: /* "\033[48~" */ 597 case XK_F34: /* "\033[48~" */
556 case XK_F35: /* "\033[49~" */ 598 case XK_F35: /* "\033[49~" */
557 FKEY(31, XK_F17); 599 FKEY (31, XK_F17);
558 break; 600 break;
559#undef FKEY 601#undef FKEY
560 default: 602 default:
561 newlen = 0; 603 newlen = 0;
562 break; 604 break;
563 } 605 }
564 if (newlen) 606 if (newlen)
565 len = STRLEN(kbuf); 607 len = STRLEN (kbuf);
566 } 608 }
567 /* 609 /*
568 * Pass meta for all function keys, if 'meta' option set 610 * Pass meta for all function keys, if 'meta' option set
569 */ 611 */
570#ifdef META8_OPTION 612#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 613 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 614 kbuf[len - 1] |= 0x80;
573#endif 615#endif
616
617 }
574 } else if (ctrl && keysym == XK_minus) { 618 else if (ctrl && keysym == XK_minus)
619 {
575 len = 1; 620 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 621 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 622 }
623 else
624 {
578#ifdef META8_OPTION 625#ifdef META8_OPTION
579 /* set 8-bit on */ 626 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 627 if (meta && (meta_char == 0x80))
581 unsigned char *ch; 628 {
629 unsigned char *ch;
582 630
583 for (ch = kbuf; ch < kbuf + len; ch++) 631 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 632 *ch |= 0x80;
585 meta = 0; 633 meta = 0;
634 }
635#endif
636 /* nil */ ;
637 }
586 } 638 }
587#endif 639
588#ifdef GREEK_SUPPORT 640 if (len <= 0)
589 if (R->greek_mode) 641 return; /* not mapped */
590 len = greek_xlat(kbuf, len); 642
591#endif 643 if (Options & Opt_scrollTtyKeypress)
592 /* nil */ ; 644 if (TermWin.view_start)
593 } 645 {
646 TermWin.view_start = 0;
647 want_refresh = 1;
594 } 648 }
595 649
596 if (len <= 0) 650 /*
597 return; /* not mapped */
598
599 if (R->Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) {
601 R->TermWin.view_start = 0;
602 R->want_refresh = 1;
603 }
604
605/*
606 * these modifications only affect the static keybuffer 651 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 652 * pass Shift/Control indicators for function keys ending with `~'
608 * 653 *
609 * eg, 654 * eg,
610 * Prior = "ESC[5~" 655 * Prior = "ESC[5~"
611 * Shift+Prior = "ESC[5$" 656 * Shift+Prior = "ESC[5$"
612 * Ctrl+Prior = "ESC[5^" 657 * Ctrl+Prior = "ESC[5^"
613 * Ctrl+Shift+Prior = "ESC[5@" 658 * Ctrl+Shift+Prior = "ESC[5@"
614 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 659 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
615 */ 660 */
616 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 661 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 662 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 663
619/* escape prefix */ 664 /* escape prefix */
620 if (meta 665 if (meta
621#ifdef META8_OPTION 666#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 667 && meta_char == C0_ESC
623#endif 668#endif
624 ) { 669 )
670 {
625 const unsigned char ch = C0_ESC; 671 const unsigned char ch = C0_ESC;
626
627 R->tt_write(&ch, 1); 672 tt_write (&ch, 1);
628 } 673 }
674
629#ifdef DEBUG_CMD 675#if defined(DEBUG_CMD)
630 if (debug_key) { /* Display keyboard buffer contents */ 676 /* Display keyboard buffer contents */
631 char *p; 677 unsigned char *p;
632 int i; 678 int i;
633 679
634 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 680 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
635 for (i = 0, p = kbuf; i < len; i++, p++) 681 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 682 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 683 fprintf (stderr, "'\n");
638 }
639#endif /* DEBUG_CMD */ 684#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 685 tt_write (kbuf, (unsigned int)len);
641} 686}
642/*}}} */ 687/*}}} */
643 688
644#if (MENUBAR_MAX) 689#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
646/* attempt to `write' count to the input buffer */ 691/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 692unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 693rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 694{
651 unsigned int n, s; 695 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 696
656 n = cmdbuf_ptr - cmdbuf_base; 697 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
658 if (n > 0 && s < count) { 699 if (n > 0 && s < count)
700 {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 701 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
660 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 702 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
661 cmdbuf_ptr = cmdbuf_base; 703 cmdbuf_ptr = cmdbuf_base;
662 cmdbuf_endp -= n; 704 cmdbuf_endp -= n;
663 s += n; 705 s += n;
664 } 706 }
665 if (count > s) { 707 if (count > s)
708 {
666 rxvt_print_error("data loss: cmd_write too large"); 709 rxvt_print_error ("data loss: cmd_write too large");
667 count = s; 710 count = s;
668 } 711 }
669 for (; count--;) 712 for (; count--;)
670 *cmdbuf_endp++ = *str++; 713 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr;
672 R->cmdbuf_endp = cmdbuf_endp;
673 return 0; 714 return 0;
674} 715}
675#endif /* MENUBAR_MAX */ 716#endif /* MENUBAR_MAX */
676 717
677void 718void
678rxvt_term::flush () 719rxvt_term::flush ()
… …
688#endif 729#endif
689 730
690 if (want_refresh) 731 if (want_refresh)
691 { 732 {
692 scr_refresh (refresh_type); 733 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 734 scrollbar_show (1);
694#ifdef USE_XIM 735#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 736 IMSendSpot ();
696#endif 737#endif
697 }
698 738
699 XFlush (Xdisplay); 739 }
740
741 display->flush ();
700} 742}
701 743
702void 744void
703rxvt_term::check_cb (check_watcher &w) 745rxvt_term::check_cb (check_watcher &w)
704{ 746{
… …
706 SET_LOCALE (locale); 748 SET_LOCALE (locale);
707 749
708 flush (); 750 flush ();
709} 751}
710 752
711void
712rxvt_term::process_x_events ()
713{
714 do
715 {
716 XEvent xev;
717
718 XNextEvent (Xdisplay, &xev);
719
720#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink)
722 && xev.type == KeyPress)
723 {
724 if (hidden_cursor)
725 {
726 hidden_cursor = 0;
727 want_refresh = 1;
728 }
729
730 blink_ev.start (NOW + BLINK_INTERVAL);
731 }
732#endif
733
734#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank)
736 && (pointerBlankDelay > 0))
737 {
738 if (xev.type == MotionNotify
739 || xev.type == ButtonPress
740 || xev.type == ButtonRelease)
741 if (hidden_pointer)
742 pointer_unblank ();
743
744 if (xev.type == KeyPress && hidden_pointer == 0)
745 pointer_blank ();
746 }
747#endif
748
749#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window))
751#endif
752 rxvt_process_x_event (this, &xev);
753 }
754 while (XPending (Xdisplay));
755}
756
757#ifdef CURSOR_BLINK 753#ifdef CURSOR_BLINK
758void 754void
759rxvt_term::blink_cb (time_watcher &w) 755rxvt_term::cursor_blink_cb (time_watcher &w)
760{ 756{
761 hidden_cursor = !hidden_cursor; 757 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 758 want_refresh = 1;
763 759
764 w.start (w.at + BLINK_INTERVAL); 760 w.start (w.at + BLINK_INTERVAL);
765} 761}
766#endif 762#endif
767 763
764#ifdef TEXT_BLINK
768void 765void
769rxvt_term::x_cb (io_watcher &w, short revents) 766rxvt_term::text_blink_cb (time_watcher &w)
770{ 767{
771 SET_R (this); 768 if (scr_refresh_rend (RS_Blink, RS_Blink))
772 SET_LOCALE (locale); 769 {
773 770 hidden_text = !hidden_text;
774 process_x_events (); 771 want_refresh = 1;
772 w.start (w.at + TEXT_BLINK_INTERVAL);
773 }
775} 774}
775#endif
776 776
777bool 777bool
778rxvt_term::pty_fill () 778rxvt_term::pty_fill ()
779{ 779{
780 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 780 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
781 781
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 782 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 783 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 784 cmdbuf_endp = cmdbuf_ptr + n;
785 785
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
787 787
788 if (n > 0) 788 if (n > 0)
789 { 789 {
790 cmdbuf_endp += n; 790 cmdbuf_endp += n;
… …
852 if (ch == '\n') 852 if (ch == '\n')
853 { 853 {
854 nlines++; 854 nlines++;
855 refresh_count++; 855 refresh_count++;
856 856
857 if (!(Options & Opt_jumpScroll) 857 if (! (Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 { 859 {
860 refreshnow = true; 860 refreshnow = true;
861 flag = false; 861 flag = false;
862 ch = NOCHAR; 862 ch = NOCHAR;
863 break; 863 break;
864 } 864 }
865
866 // scr_add_lines only works for nlines < TermWin.nrow - 1.
867 if (nlines >= TermWin.nrow - 1)
868 {
869 scr_add_lines (buf, nlines, str - buf);
870 nlines = 0;
871 str = buf;
872 }
865 } 873 }
866 874
867 if (str >= buf + BUFSIZ) 875 if (str >= buf + BUFSIZ)
868 { 876 {
869 ch = NOCHAR; 877 ch = NOCHAR;
870 break; 878 break;
871 } 879 }
872 } 880 }
873 } 881 }
874 882
875 rxvt_scr_add_lines (this, buf, nlines, str - buf); 883 scr_add_lines (buf, nlines, str - buf);
876 884
877 /* 885 /*
878 * If there have been a lot of new lines, then update the screen 886 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full. 887 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which 888 * the number of pages between refreshes is refresh_limit, which
… …
895 else 903 else
896 { 904 {
897 switch (ch) 905 switch (ch)
898 { 906 {
899 default: 907 default:
900 rxvt_process_nonprinting (this, ch); 908 process_nonprinting (ch);
901 break; 909 break;
902 case C0_ESC: /* escape char */ 910 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this); 911 process_escape_seq ();
904 break; 912 break;
905 /*case 0x9b: */ /* CSI */ 913 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */ 914 /* process_csi_seq (); */
907 } 915 }
908 916
909 ch = NOCHAR; 917 ch = NOCHAR;
910 } 918 }
911 } 919 }
… …
922 { 930 {
923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 931 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
924 return *cmdbuf_ptr++; 932 return *cmdbuf_ptr++;
925 933
926 wchar_t wc; 934 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 935 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
928 936
929 if (len == (size_t)-2) 937 if (len == (size_t)-2)
930 return NOCHAR; 938 return NOCHAR;
931 939
932 if (len == (size_t)-1) 940 if (len == (size_t)-1)
… …
938 } 946 }
939 947
940 return NOCHAR; 948 return NOCHAR;
941} 949}
942 950
943/* rxvt_cmd_getc() - Return next input character */ 951/* rxvt_cmd_getc () - Return next input character */
944/* 952/*
945 * Return the next input character after first passing any keyboard input 953 * Return the next input character after first passing any keyboard input
946 * to the command. 954 * to the command.
947 */ 955 */
948/* INTPROTO */
949uint32_t 956uint32_t
950rxvt_cmd_getc(pR) 957rxvt_term::cmd_getc ()
951{ 958{
952 for (;;) 959 for (;;)
953 { 960 {
954 uint32_t c = R->next_char (); 961 uint32_t c = next_char ();
955 if (c != NOCHAR) 962 if (c != NOCHAR)
956 return c; 963 return c;
957 964
958 // incomplete sequences should occur rarely, still, a better solution 965 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design. 966 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (R->cmd_fd, F_SETFL, 0); 967 fcntl (cmd_fd, F_SETFL, 0);
961 R->pty_fill (); 968 pty_fill ();
962 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 969 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964
965#if 0
966#define TIMEOUT_USEC 5000
967 fd_set readfds;
968 int quick_timeout, select_res;
969 int want_motion_time, want_keypress_time;
970 struct timeval value;
971#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
972 struct timeval tp;
973#endif
974
975 for (;;) {
976 /* loop until we can return something */
977
978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
979 R->tt_write(NULL, 0);
980
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 if (R->mouse_slip_wheel_speed) {
983 quick_timeout = 1;
984 if (!R->mouse_slip_wheel_delay--
985 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
986 abs(R->mouse_slip_wheel_speed))) {
987 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1;
990 } 970 }
991 }
992#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
993#ifdef SELECTION_SCROLLING
994 if (R->pending_scroll_selection) {
995 quick_timeout = 1;
996 if (!R->scroll_selection_delay--
997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
998 R->scroll_selection_lines)) {
999 R->selection_extend (R->selection_save_x,
1000 R->selection_save_y, R->selection_save_state);
1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1002 R->refresh_type |= SMOOTH_REFRESH;
1003 R->want_refresh = 1;
1004 }
1005 }
1006#endif
1007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1008 if (scrollbar_isUp() || scrollbar_isDn()) {
1009 quick_timeout = 1;
1010 if (!R->scroll_arrow_delay--
1011 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1012 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1;
1015 }
1016 }
1017#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1018
1019#ifdef TRANSPARENT
1020 quick_timeout |= R->want_full_refresh;
1021#endif
1022#endif
1023} 971}
1024 972
973#ifdef POINTER_BLANK
1025void 974void
1026rxvt_term::pointer_unblank () 975rxvt_term::pointer_unblank ()
1027{ 976{
1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 977 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1029 recolour_cursor (); 978 recolour_cursor ();
1030 979
1031#ifdef POINTER_BLANK
1032 hidden_pointer = 0; 980 hidden_pointer = 0;
1033 981
1034 if (Options & Opt_pointerBlank) 982 if (Options & Opt_pointerBlank)
1035 pointer_ev.start (NOW + pointerBlankDelay); 983 pointer_ev.start (NOW + pointerBlankDelay);
1036#endif
1037} 984}
1038 985
1039#ifdef POINTER_BLANK
1040void 986void
1041rxvt_term::pointer_blank () 987rxvt_term::pointer_blank ()
1042{ 988{
1043 if (!(Options & Opt_pointerBlank)) 989 if (! (Options & Opt_pointerBlank))
1044 return; 990 return;
1045 991
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 992 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 993 XFlush (display->display);
1048 994
1049 hidden_pointer = 1; 995 hidden_pointer = 1;
1050} 996}
1051 997
1052void 998void
… …
1057 1003
1058 pointer_blank (); 1004 pointer_blank ();
1059} 1005}
1060#endif 1006#endif
1061 1007
1062/* INTPROTO */
1063void 1008void
1064rxvt_mouse_report(pR_ const XButtonEvent *ev) 1009rxvt_term::mouse_report (XButtonEvent &ev)
1065{ 1010{
1066 int button_number, key_state = 0; 1011 int button_number, key_state = 0;
1067 int x, y; 1012 int x, y;
1068 1013
1069 x = ev->x; 1014 x = ev.x;
1070 y = ev->y; 1015 y = ev.y;
1071 R->pixel_position (&x, &y); 1016 pixel_position (&x, &y);
1072 1017
1073 if (R->MEvent.button == AnyButton) { 1018 if (MEvent.button == AnyButton)
1019 {
1074 button_number = 3; 1020 button_number = 3;
1075 } else { 1021 }
1022 else
1023 {
1076 button_number = R->MEvent.button - Button1; 1024 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1025 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1026 if (button_number >= 3)
1079 button_number += (64 - 3); 1027 button_number += (64 - 3);
1080 } 1028 }
1081 1029
1082 if (R->PrivateModes & PrivMode_MouseX10) { 1030 if (PrivateModes & PrivMode_MouseX10)
1031 {
1083 /* 1032 /*
1084 * do not report ButtonRelease 1033 * do not report ButtonRelease
1085 * no state info allowed 1034 * no state info allowed
1086 */ 1035 */
1087 key_state = 0; 1036 key_state = 0;
1088 if (button_number == 3) 1037 if (button_number == 3)
1089 return; 1038 return;
1090 } else { 1039 }
1040 else
1041 {
1091 /* XTerm mouse reporting needs these values: 1042 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1043 * 4 = Shift
1093 * 8 = Meta 1044 * 8 = Meta
1094 * 16 = Control 1045 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1046 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1047 * 32 = Double Click
1097 */ 1048 */
1098 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1049 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1050 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1051 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1052#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1053 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1054#endif
1055
1104 } 1056 }
1105 1057
1106#ifdef DEBUG_MOUSEREPORT 1058#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1059 fprintf (stderr, "Mouse [");
1108 if (key_state & 16) 1060 if (key_state & 16)
1109 fputc('C', stderr); 1061 fputc ('C', stderr);
1110 if (key_state & 4) 1062 if (key_state & 4)
1111 fputc('S', stderr); 1063 fputc ('S', stderr);
1112 if (key_state & 8) 1064 if (key_state & 8)
1113 fputc('A', stderr); 1065 fputc ('A', stderr);
1114 if (key_state & 32) 1066 if (key_state & 32)
1115 fputc('2', stderr); 1067 fputc ('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1068 fprintf (stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1069 button_number,
1118 x + 1, 1070 x + 1,
1119 y + 1); 1071 y + 1);
1120#else 1072#else
1121 R->tt_printf("\033[M%c%c%c", 1073 tt_printf ("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1074 (32 + button_number + key_state),
1123 (32 + x + 1), 1075 (32 + x + 1),
1124 (32 + y + 1)); 1076 (32 + y + 1));
1125#endif 1077#endif
1126} 1078}
1127 1079
1128#ifdef USING_W11LIB 1080#ifdef USING_W11LIB
1129/* EXTPROTO */
1130void 1081void
1131rxvt_W11_process_x_event(XEvent *ev) 1082rxvt_W11_process_x_event (XEvent *ev)
1132{ 1083{
1133 rxvt_t *r = rxvt_get_r(); 1084 rxvt_t *r = rxvt_get_r ();
1134 1085
1135 rxvt_process_x_event(aR_ ev); 1086 x_cb (*ev);
1136} 1087}
1137#endif 1088#endif
1138 1089
1139/*{{{ process an X event */ 1090/*{{{ process an X event */
1140/* INTPROTO */
1141void 1091void
1142rxvt_process_x_event(pR_ XEvent *ev) 1092rxvt_term::x_cb (XEvent &ev)
1143{ 1093{
1144 int i, want_timeout; 1094 SET_R (this);
1095 SET_LOCALE (locale);
1096
1097#if defined(CURSOR_BLINK)
1098 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1099 {
1100 if (hidden_cursor)
1101 {
1102 hidden_cursor = 0;
1103 want_refresh = 1;
1104 }
1105
1106 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1107 }
1108#endif
1109
1110#if defined(POINTER_BLANK)
1111 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1112 {
1113 if (ev.type == MotionNotify
1114 || ev.type == ButtonPress
1115 || ev.type == ButtonRelease)
1116 if (hidden_pointer)
1117 pointer_unblank ();
1118
1119 if (ev.type == KeyPress && hidden_pointer == 0)
1120 pointer_blank ();
1121 }
1122#endif
1123
1124#ifdef USE_XIM
1125 if (XFilterEvent (&ev, None))
1126 return;
1127#endif
1128
1145 Window unused_root, unused_child; 1129 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1130 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1131 unsigned int unused_mask;
1148 1132
1149#ifdef DEBUG_X 1133#ifdef DEBUG_X
1150 const char *const eventnames[] = 1134 const char *const eventnames[] =
1151 { /* mason - this matches my system */ 1135 { /* mason - this matches my system */
1152 "", 1136 "",
1153 "", 1137 "",
1154 "KeyPress", 1138 "KeyPress",
1155 "KeyRelease", 1139 "KeyRelease",
1156 "ButtonPress", 1140 "ButtonPress",
1157 "ButtonRelease", 1141 "ButtonRelease",
1158 "MotionNotify", 1142 "MotionNotify",
1159 "EnterNotify", 1143 "EnterNotify",
1160 "LeaveNotify", 1144 "LeaveNotify",
1161 "FocusIn", 1145 "FocusIn",
1162 "FocusOut", 1146 "FocusOut",
1163 "KeymapNotify", 1147 "KeymapNotify",
1164 "Expose", 1148 "Expose",
1165 "GraphicsExpose", 1149 "GraphicsExpose",
1166 "NoExpose", 1150 "NoExpose",
1167 "VisibilityNotify", 1151 "VisibilityNotify",
1168 "CreateNotify", 1152 "CreateNotify",
1169 "DestroyNotify", 1153 "DestroyNotify",
1170 "UnmapNotify", 1154 "UnmapNotify",
1171 "MapNotify", 1155 "MapNotify",
1172 "MapRequest", 1156 "MapRequest",
1173 "ReparentNotify", 1157 "ReparentNotify",
1174 "ConfigureNotify", 1158 "ConfigureNotify",
1175 "ConfigureRequest", 1159 "ConfigureRequest",
1176 "GravityNotify", 1160 "GravityNotify",
1177 "ResizeRequest", 1161 "ResizeRequest",
1178 "CirculateNotify", 1162 "CirculateNotify",
1179 "CirculateRequest", 1163 "CirculateRequest",
1180 "PropertyNotify", 1164 "PropertyNotify",
1181 "SelectionClear", 1165 "SelectionClear",
1182 "SelectionRequest", 1166 "SelectionRequest",
1183 "SelectionNotify", 1167 "SelectionNotify",
1184 "ColormapNotify", 1168 "ColormapNotify",
1185 "ClientMessage", 1169 "ClientMessage",
1186 "MappingNotify" 1170 "MappingNotify"
1187 }; 1171 };
1188#endif 1172#endif
1189 1173
1190#ifdef DEBUG_X 1174#ifdef DEBUG_X
1191 struct timeval tp; 1175 struct timeval tp;
1192 struct tm *ltt; 1176 struct tm *ltt;
1193 (void)gettimeofday(&tp, NULL); 1177 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime(&(tp.tv_sec)); 1178 ltt = localtime (& (tp.tv_sec));
1195 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1179 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));
1196#endif 1180#endif
1197 1181
1198 switch (ev->type) { 1182 switch (ev.type)
1183 {
1199 case KeyPress: 1184 case KeyPress:
1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1185 lookup_key (ev.xkey);
1201 break; 1186 break;
1202 1187
1203#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1204 case KeyRelease: 1189 case KeyRelease:
1205 { 1190 {
1206 if (!(ev->xkey.state & ControlMask)) 1191 if (! (ev.xkey.state & ControlMask))
1207 R->mouse_slip_wheel_speed = 0; 1192 mouse_slip_wheel_speed = 0;
1208 else { 1193 else
1209 KeySym ks; 1194 {
1210 1195 KeySym ks;
1196
1211 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1197 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1212 if (ks == XK_Control_L || ks == XK_Control_R) 1198 if (ks == XK_Control_L || ks == XK_Control_R)
1213 R->mouse_slip_wheel_speed = 0; 1199 mouse_slip_wheel_speed = 0;
1214 } 1200 }
1215 break; 1201 break;
1216 } 1202 }
1217#endif 1203#endif
1218 1204
1219 case ButtonPress: 1205 case ButtonPress:
1220 rxvt_button_press(aR_ (XButtonEvent *)ev); 1206 button_press (ev.xbutton);
1221 break; 1207 break;
1222 1208
1223 case ButtonRelease: 1209 case ButtonRelease:
1224 rxvt_button_release(aR_ (XButtonEvent *)ev); 1210 button_release (ev.xbutton);
1225 break; 1211 break;
1226 1212
1227 case ClientMessage: 1213 case ClientMessage:
1228 if (ev->xclient.format == 32 1214 if (ev.xclient.format == 32
1229 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1215 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1230 R->destroy (); 1216 destroy ();
1231#ifdef OFFIX_DND 1217#ifdef OFFIX_DND
1232 /* OffiX Dnd (drag 'n' drop) protocol */ 1218 /* OffiX Dnd (drag 'n' drop) protocol */
1233 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1219 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1234 && (ev->xclient.data.l[0] == DndFile 1220 && (ev.xclient.data.l[0] == DndFile
1235 || ev->xclient.data.l[0] == DndDir 1221 || ev.xclient.data.l[0] == DndDir
1236 || ev->xclient.data.l[0] == DndLink)) { 1222 || ev.xclient.data.l[0] == DndLink))
1237 /* Get Dnd data */ 1223 {
1224 /* Get Dnd data */
1238 Atom ActualType; 1225 Atom ActualType;
1239 int ActualFormat; 1226 int ActualFormat;
1240 unsigned char *data; 1227 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1228 unsigned long Size, RemainingBytes;
1242 1229
1243 XGetWindowProperty(R->Xdisplay, Xroot, 1230 XGetWindowProperty (display->display, display->root,
1244 R->xa[XA_DNDSELECTION], 1231 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1232 0L, 1000000L,
1246 False, AnyPropertyType, 1233 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1234 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1235 &Size, &RemainingBytes,
1249 &data); 1236 &data);
1250 XChangeProperty(R->Xdisplay, Xroot, 1237 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1238 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1239 8, PropModeReplace,
1253 data, STRLEN(data)); 1240 data, STRLEN (data));
1254 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1241 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1243 }
1257#endif /* OFFIX_DND */ 1244#endif /* OFFIX_DND */
1258 break; 1245 break;
1259 1246
1260 case MappingNotify: 1247 case MappingNotify:
1261 XRefreshKeyboardMapping(&(ev->xmapping)); 1248 XRefreshKeyboardMapping (& (ev.xmapping));
1262 break; 1249 break;
1263 1250
1264 /* 1251 /*
1265 * XXX: this is not the _current_ arrangement 1252 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1253 * Here's my conclusion:
1267 * If the window is completely unobscured, use bitblt's 1254 * If the window is completely unobscured, use bitblt's
1268 * to scroll. Even then, they're only used when doing partial 1255 * to scroll. Even then, they're only used when doing partial
1269 * screen scrolling. When partially obscured, we have to fill 1256 * screen scrolling. When partially obscured, we have to fill
1270 * in the GraphicsExpose parts, which means that after each refresh, 1257 * in the GraphicsExpose parts, which means that after each refresh,
1271 * we need to wait for the graphics expose or Noexpose events, 1258 * we need to wait for the graphics expose or Noexpose events,
1272 * which ought to make things real slow! 1259 * which ought to make things real slow!
1273 */ 1260 */
1274 case VisibilityNotify: 1261 case VisibilityNotify:
1275 switch (ev->xvisibility.state) 1262 switch (ev.xvisibility.state)
1276 { 1263 {
1277 case VisibilityUnobscured: 1264 case VisibilityUnobscured:
1278 R->refresh_type = FAST_REFRESH; 1265 refresh_type = FAST_REFRESH;
1279 break; 1266 break;
1280 case VisibilityPartiallyObscured: 1267 case VisibilityPartiallyObscured:
1281 R->refresh_type = SLOW_REFRESH; 1268 refresh_type = SLOW_REFRESH;
1282 break; 1269 break;
1283 default: 1270 default:
1284 R->refresh_type = NO_REFRESH; 1271 refresh_type = NO_REFRESH;
1285 break; 1272 break;
1286 } 1273 }
1287 break; 1274 break;
1288 1275
1289 case FocusIn: 1276 case FocusIn:
1290 if (!R->TermWin.focus) { 1277 if (!TermWin.focus)
1291 R->TermWin.focus = 1; 1278 {
1292 R->want_refresh = 1; 1279 TermWin.focus = 1;
1280 want_refresh = 1;
1293#ifdef USE_XIM 1281#ifdef USE_XIM
1294 if (R->Input_Context != NULL) 1282 if (Input_Context != NULL)
1295 XSetICFocus(R->Input_Context); 1283 XSetICFocus (Input_Context);
1296#endif 1284#endif
1297#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1298 if (R->Options & Opt_cursorBlink) 1286 if (Options & Opt_cursorBlink)
1299 R->blink_ev.start (NOW + BLINK_INTERVAL); 1287 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1300#endif 1288#endif
1301 }
1302 break;
1303 1289
1290 }
1291 break;
1292
1304 case FocusOut: 1293 case FocusOut:
1305 if (R->TermWin.focus) { 1294 if (TermWin.focus)
1306 R->TermWin.focus = 0; 1295 {
1307 R->want_refresh = 1; 1296 TermWin.focus = 0;
1297 want_refresh = 1;
1308#ifdef USE_XIM 1298#ifdef USE_XIM
1309 if (R->Input_Context != NULL) 1299 if (Input_Context != NULL)
1310 XUnsetICFocus(R->Input_Context); 1300 XUnsetICFocus (Input_Context);
1311#endif 1301#endif
1312#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1314 R->blink_ev.stop (); 1304 cursor_blink_ev.stop ();
1315 R->hidden_cursor = 0; 1305 hidden_cursor = 0;
1316#endif 1306#endif
1317 }
1318 break;
1319 1307
1308 }
1309 break;
1310
1320 case ConfigureNotify: 1311 case ConfigureNotify:
1321 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1312 if (ev.xconfigure.window == TermWin.parent[0])
1322 int height, width; 1313 {
1314 int height, width;
1323 1315
1316 do
1324 do { /* Wrap lots of configures into one */ 1317 { /* Wrap lots of configures into one */
1325 width = ev->xconfigure.width; 1318 width = ev.xconfigure.width;
1326 height = ev->xconfigure.height; 1319 height = ev.xconfigure.height;
1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1320 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1321 }
1329 ConfigureNotify, ev)); 1322 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1323
1330 if (R->szHint.width != width || R->szHint.height != height) { 1324 if (szHint.width != width || szHint.height != height)
1325 {
1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1326 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1332 R->resize_all_windows (width, height, 1); 1327 resize_all_windows (width, height, 1);
1333 } 1328 }
1334#ifdef DEBUG_SIZE 1329#ifdef DEBUG_SIZE
1335 else { 1330 else
1331 {
1336 D_SIZE((stderr, "Size: Not resizing")); 1332 D_SIZE ((stderr, "Size: Not resizing"));
1337 } 1333 }
1338#endif 1334#endif
1339#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1340 if (R->Options & Opt_transparent) { 1336 if (Options & Opt_transparent)
1341 rxvt_check_our_parents(aR); 1337 {
1342 if (R->am_transparent) 1338 check_our_parents ();
1343 R->want_full_refresh = 1; 1339 if (am_transparent)
1344 } 1340 want_full_refresh = 1;
1341 }
1345#endif 1342#endif
1346 }
1347 break;
1348 1343
1344 }
1345 break;
1346
1349 case SelectionClear: 1347 case SelectionClear:
1350 rxvt_selection_clear(aR); 1348 display->set_selection_owner (0);
1351 break; 1349 break;
1352 1350
1353 case SelectionNotify: 1351 case SelectionNotify:
1354 if (R->selection_wait == Sel_normal) 1352 if (selection_wait == Sel_normal)
1355 rxvt_selection_paste(aR_ ev->xselection.requestor, 1353 selection_paste (ev.xselection.requestor,
1356 ev->xselection.property, True); 1354 ev.xselection.property, True);
1357 break; 1355 break;
1358 1356
1359 case SelectionRequest: 1357 case SelectionRequest:
1360 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1358 selection_send (ev.xselectionrequest);
1361 break; 1359 break;
1362 1360
1363 case UnmapNotify: 1361 case UnmapNotify:
1364 R->TermWin.mapped = 0; 1362 TermWin.mapped = 0;
1365 break; 1363#ifdef TEXT_BLINK
1364 text_blink_ev.stop ();
1365#endif
1366 break;
1366 1367
1367 case MapNotify: 1368 case MapNotify:
1368 R->TermWin.mapped = 1; 1369 TermWin.mapped = 1;
1369 break; 1370#ifdef TEXT_BLINK
1370 1371 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371 case PropertyNotify: 1372#endif
1372 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1373 if (ev->xproperty.state == PropertyNewValue)
1374 rxvt_selection_property(aR_ ev->xproperty.window,
1375 ev->xproperty.atom);
1376 break; 1373 break;
1377 } 1374
1378#ifdef TRANSPARENT 1375#ifdef TRANSPARENT
1379 /*
1380 * if user used some Esetroot compatible prog to set the root bg,
1381 * use the property to determine the pixmap. We use it later on.
1382 */
1383 if (R->xa[XA_XROOTPMAPID] == 0)
1384 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1385 "_XROOTPMAP_ID", False);
1386 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1387 break;
1388 /* FALLTHROUGH */
1389 case ReparentNotify: 1376 case ReparentNotify:
1390 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1377 rootwin_cb (ev);
1391 if (R->am_transparent) 1378 break;
1392 R->want_full_refresh = 1;
1393 }
1394#endif /* TRANSPARENT */ 1379#endif /* TRANSPARENT */
1395 break;
1396 1380
1397 case GraphicsExpose: 1381 case GraphicsExpose:
1398 case Expose: 1382 case Expose:
1399 if (ev->xany.window == R->TermWin.vt) { 1383 if (ev.xany.window == TermWin.vt)
1384 {
1400#ifdef NO_SLOW_LINK_SUPPORT 1385#ifdef NO_SLOW_LINK_SUPPORT
1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1386 scr_expose (ev.xexpose.x, ev.xexpose.y,
1402 ev->xexpose.width, ev->xexpose.height, False); 1387 ev.xexpose.width, ev.xexpose.height, False);
1403#else 1388#else
1404 // don't understand this, so commented it out 1389 // don't understand this, so commented it out
1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1390 scr_expose (ev.xexpose.x, ev.xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1391 ev.xexpose.width, ev.xexpose.height, False);
1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1392 //scr_expose (ev.xexpose.x, 0,
1408 // ev->xexpose.width, R->TermWin.height, False); 1393 // ev.xexpose.width, TermWin.height, False);
1409#endif 1394#endif
1410 R->want_refresh = 1; 1395 want_refresh = 1;
1411 } else { 1396 }
1412 XEvent unused_xevent; 1397 else
1398 {
1399 XEvent unused_event;
1413 1400
1414 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1415 Expose, 1402 Expose,
1416 &unused_xevent)) ; 1403 &unused_event)) ;
1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1418 GraphicsExpose, 1405 GraphicsExpose,
1419 &unused_xevent)) ; 1406 &unused_event)) ;
1420 if (isScrollbarWindow(ev->xany.window)) { 1407 if (isScrollbarWindow (ev.xany.window))
1421 R->scrollBar.setIdle(); 1408 {
1422 rxvt_scrollbar_show(aR_ 0); 1409 scrollBar.setIdle ();
1423 } 1410 scrollbar_show (0);
1411 }
1424#ifdef MENUBAR 1412#ifdef MENUBAR
1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1426 rxvt_menubar_expose(aR); 1414 menubar_expose ();
1427#endif 1415#endif
1428#ifdef RXVT_GRAPHICS 1416 }
1429 rxvt_Gr_expose(aR_ ev->xany.window); 1417 break;
1430#endif
1431 }
1432 break;
1433 1418
1434 case MotionNotify: 1419 case MotionNotify:
1435#ifdef POINTER_BLANK 1420#ifdef POINTER_BLANK
1436 if (R->hidden_pointer) 1421 if (hidden_pointer)
1437 R->pointer_unblank (); 1422 pointer_unblank ();
1438#endif 1423#endif
1439#if MENUBAR 1424#if MENUBAR
1440 if (isMenuBarWindow(ev->xany.window)) { 1425 if (isMenuBarWindow (ev.xany.window))
1441 rxvt_menubar_control(aR_ &(ev->xbutton)); 1426 {
1442 break; 1427 menubar_control (ev.xbutton);
1443 } 1428 break;
1429 }
1444#endif 1430#endif
1445 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1446 break; 1432 break;
1447 1433
1448 if (ev->xany.window == R->TermWin.vt) { 1434 if (ev.xany.window == TermWin.vt)
1435 {
1449 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1436 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1450 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1437 {
1451 MotionNotify, ev)) ; 1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1452 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1439 ;
1453 &unused_root, &unused_child, 1440
1454 &unused_root_x, &unused_root_y, 1441 XQueryPointer (display->display, TermWin.vt,
1455 &(ev->xbutton.x), &(ev->xbutton.y), 1442 &unused_root, &unused_child,
1456 &unused_mask); 1443 &unused_root_x, &unused_root_y,
1444 & (ev.xbutton.x), & (ev.xbutton.y),
1445 &unused_mask);
1457#ifdef MOUSE_THRESHOLD 1446#ifdef MOUSE_THRESHOLD
1458 /* deal with a `jumpy' mouse */ 1447 /* deal with a `jumpy' mouse */
1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1449 {
1460#endif 1450#endif
1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1462 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1452 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1463#ifdef SELECTION_SCROLLING 1453#ifdef SELECTION_SCROLLING
1464 if (ev->xbutton.y<R->TermWin.int_bwidth || 1454 if (ev.xbutton.y < TermWin.int_bwidth
1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1466 int dist;
1467
1468 R->pending_scroll_selection=1;
1469
1470 /* don't clobber the current delay if we are
1471 * already in the middle of scrolling.
1472 */
1473 if (R->scroll_selection_delay<=0)
1474 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1475
1476 /* save the event params so we can highlight
1477 * the selection in the pending-scroll loop
1478 */
1479 R->selection_save_x=ev->xbutton.x;
1480 R->selection_save_y=ev->xbutton.y;
1481 R->selection_save_state=
1482 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1483
1484 /* calc number of lines to scroll */
1485 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1486 R->scroll_selection_dir = UP;
1487 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1488 }
1489 else {
1490 R->scroll_selection_dir = DN;
1491 dist = ev->xbutton.y -
1492 (R->TermWin.int_bwidth + R->TermWin.height);
1493 }
1494 R->scroll_selection_lines=(Pixel2Height(dist)/
1495 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1496 MIN_IT(R->scroll_selection_lines,
1497 SELECTION_SCROLL_MAX_LINES);
1498 }
1499 else {
1500 /* we are within the text window, so we
1501 * shouldn't be scrolling
1502 */
1503 R->pending_scroll_selection = 0;
1504 }
1505#endif
1506#ifdef MOUSE_THRESHOLD
1507 }
1508#endif
1509 }
1510 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1511 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1512 MotionNotify, ev)) ;
1513 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1514 &unused_root, &unused_child,
1515 &unused_root_x, &unused_root_y,
1516 &(ev->xbutton.x), &(ev->xbutton.y),
1517 &unused_mask);
1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1519 scrollbar_size());
1520 R->scr_refresh (R->refresh_type);
1521 R->refresh_limit = 0;
1522 rxvt_scrollbar_show(aR_ 1);
1523 }
1524 break;
1525 }
1526}
1527
1528/* INTPROTO */
1529void
1530rxvt_button_press(pR_ XButtonEvent *ev)
1531{
1532 int reportmode = 0, clickintime;
1533
1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1535 if (!R->bypass_keystate)
1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1537/*
1538 * VT window processing of button press
1539 */
1540 if (ev->window == R->TermWin.vt)
1541 {
1542#if RXVT_GRAPHICS
1543 if (ev->subwindow != None)
1544 rxvt_Gr_ButtonPress (ev->x, ev->y);
1545 else
1546#endif
1547 {
1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1549 if (reportmode)
1550 {
1551 /* mouse report from vt window */
1552 /* save the xbutton state (for ButtonRelease) */
1553 R->MEvent.state = ev->state;
1554#ifdef MOUSE_REPORT_DOUBLECLICK
1555 if (ev->button == R->MEvent.button && clickintime)
1556 {
1557 /* same button, within alloted time */
1558 R->MEvent.clicks++;
1559 if (R->MEvent.clicks > 1)
1560 { 1456 {
1561 /* only report double clicks */ 1457 int dist;
1562 R->MEvent.clicks = 2;
1563 rxvt_mouse_report(aR_ ev);
1564 1458
1565 /* don't report the release */ 1459 pending_scroll_selection=1;
1566 R->MEvent.clicks = 0; 1460
1567 R->MEvent.button = AnyButton; 1461 /* don't clobber the current delay if we are
1568 } 1462 * already in the middle of scrolling.
1569 }
1570 else
1571 { 1463 */
1572 /* different button, or time expired */ 1464 if (scroll_selection_delay<=0)
1573 R->MEvent.clicks = 1; 1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1574 R->MEvent.button = ev->button; 1466
1575 rxvt_mouse_report(aR_ ev); 1467 /* save the event params so we can highlight
1576 } 1468 * the selection in the pending-scroll loop
1577#else
1578 R->MEvent.button = ev->button;
1579 rxvt_mouse_report(aR_ ev);
1580#endif /* MOUSE_REPORT_DOUBLECLICK */
1581 }
1582 else
1583 {
1584 if (ev->button != R->MEvent.button)
1585 R->MEvent.clicks = 0;
1586 switch (ev->button)
1587 { 1469 */
1588 case Button1: 1470 selection_save_x=ev.xbutton.x;
1589 /* allow shift+left click to extend selection */ 1471 selection_save_y=ev.xbutton.y;
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1472 selection_save_state=
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1474
1475 /* calc number of lines to scroll */
1476 if (ev.xbutton.y<TermWin.int_bwidth)
1591 { 1477 {
1592 if (R->MEvent.button == Button1 && clickintime) 1478 scroll_selection_dir = UP;
1593 R->selection_rotate (ev->x, ev->y); 1479 dist = TermWin.int_bwidth - ev.xbutton.y;
1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 } 1480 }
1597 else 1481 else
1598 { 1482 {
1599 if (R->MEvent.button == Button1 && clickintime) 1483 scroll_selection_dir = DN;
1600 R->MEvent.clicks++; 1484 dist = ev.xbutton.y -
1601 else 1485 (TermWin.int_bwidth + TermWin.height);
1602 R->MEvent.clicks = 1;
1603
1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 } 1486 }
1487 scroll_selection_lines= (Pixel2Height (dist)/
1488 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1489 MIN_IT (scroll_selection_lines,
1490 SELECTION_SCROLL_MAX_LINES);
1491 }
1492 else
1493 {
1494 /* we are within the text window, so we
1495 * shouldn't be scrolling
1496 */
1497 pending_scroll_selection = 0;
1498 }
1499#endif
1500#ifdef MOUSE_THRESHOLD
1606 1501
1502 }
1503#endif
1504
1505 }
1506 }
1507 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1508 {
1509 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1510 MotionNotify, &ev)) ;
1511 XQueryPointer (display->display, scrollBar.win,
1512 &unused_root, &unused_child,
1513 &unused_root_x, &unused_root_y,
1514 & (ev.xbutton.x), & (ev.xbutton.y),
1515 &unused_mask);
1516 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1517 scrollbar_size ());
1518 scr_refresh (refresh_type);
1519 refresh_limit = 0;
1520 scrollbar_show (1);
1521 }
1522 break;
1523 }
1524}
1525
1526void
1527rxvt_term::rootwin_cb (XEvent &ev)
1528{
1529 SET_R (this);
1530 SET_LOCALE (locale);
1531
1532 switch (ev.type)
1533 {
1534 case PropertyNotify:
1535 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1536 {
1537 if (ev.xproperty.state == PropertyNewValue)
1538 selection_property (ev.xproperty.window, ev.xproperty.atom);
1539 break;
1540 }
1541#ifdef TRANSPARENT
1542 else
1543 {
1544 /*
1545 * if user used some Esetroot compatible prog to set the root bg,
1546 * use the property to determine the pixmap. We use it later on.
1547 */
1548 if (xa[XA_XROOTPMAPID] == 0)
1549 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1550
1551 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1552 return;
1553 }
1554
1555 /* FALLTHROUGH */
1556 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ())
1558 if (am_transparent)
1559 want_full_refresh = 1;
1560 break;
1561#endif
1562 }
1563}
1564
1565void
1566rxvt_term::button_press (XButtonEvent &ev)
1567{
1568 int reportmode = 0, clickintime;
1569
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1571 if (!bypass_keystate)
1572 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1573 /*
1574 * VT window processing of button press
1575 */
1576 if (ev.window == TermWin.vt)
1577 {
1578 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1579 if (reportmode)
1580 {
1581 /* mouse report from vt window */
1582 /* save the xbutton state (for ButtonRelease) */
1583 MEvent.state = ev.state;
1584#ifdef MOUSE_REPORT_DOUBLECLICK
1585 if (ev.button == MEvent.button && clickintime)
1586 {
1587 /* same button, within alloted time */
1588 MEvent.clicks++;
1589 if (MEvent.clicks > 1)
1590 {
1591 /* only report double clicks */
1592 MEvent.clicks = 2;
1593 mouse_report (ev);
1594
1595 /* don't report the release */
1596 MEvent.clicks = 0;
1597 MEvent.button = AnyButton;
1598 }
1599 }
1600 else
1601 {
1602 /* different button, or time expired */
1603 MEvent.clicks = 1;
1604 MEvent.button = ev.button;
1605 mouse_report (ev);
1606 }
1607#else
1608 MEvent.button = ev.button;
1609 mouse_report (ev);
1610#endif /* MOUSE_REPORT_DOUBLECLICK */
1611
1612 }
1613 else
1614 {
1615 if (ev.button != MEvent.button)
1616 MEvent.clicks = 0;
1617 switch (ev.button)
1618 {
1619 case Button1:
1620 /* allow shift+left click to extend selection */
1621 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1622 {
1623 if (MEvent.button == Button1 && clickintime)
1624 selection_rotate (ev.x, ev.y);
1625 else
1626 selection_extend (ev.x, ev.y, 1);
1627 }
1628 else
1629 {
1630 if (MEvent.button == Button1 && clickintime)
1631 MEvent.clicks++;
1632 else
1633 MEvent.clicks = 1;
1634
1635 selection_click (MEvent.clicks, ev.x, ev.y);
1636 }
1637
1607 R->MEvent.button = Button1; 1638 MEvent.button = Button1;
1639 break;
1640
1641 case Button3:
1642 if (MEvent.button == Button3 && clickintime)
1643 selection_rotate (ev.x, ev.y);
1644 else
1645 selection_extend (ev.x, ev.y, 1);
1646 MEvent.button = Button3;
1647 break;
1648 }
1649 }
1650 MEvent.time = ev.time;
1651 return;
1652 }
1653
1654 /*
1655 * Scrollbar window processing of button press
1656 */
1657 if (isScrollbarWindow (ev.window))
1658 {
1659 scrollBar.setIdle ();
1660 /*
1661 * Rxvt-style scrollbar:
1662 * move up if mouse is above slider
1663 * move dn if mouse is below slider
1664 *
1665 * XTerm-style scrollbar:
1666 * Move display proportional to pointer location
1667 * pointer near top -> scroll one line
1668 * pointer near bot -> scroll full page
1669 */
1670#ifndef NO_SCROLLBAR_REPORT
1671 if (reportmode)
1672 {
1673 /*
1674 * Mouse report disabled scrollbar:
1675 * arrow buttons - send up/down
1676 * click on scrollbar - send pageup/down
1677 */
1678 if ((scrollBar.style == R_SB_NEXT
1679 && scrollbarnext_upButton (ev.y))
1680 || (scrollBar.style == R_SB_RXVT
1681 && scrollbarrxvt_upButton (ev.y)))
1682 tt_printf ("\033[A");
1683 else if ((scrollBar.style == R_SB_NEXT
1684 && scrollbarnext_dnButton (ev.y))
1685 || (scrollBar.style == R_SB_RXVT
1686 && scrollbarrxvt_dnButton (ev.y)))
1687 tt_printf ("\033[B");
1688 else
1689 switch (ev.button)
1690 {
1691 case Button2:
1692 tt_printf ("\014");
1693 break;
1694 case Button1:
1695 tt_printf ("\033[6~");
1696 break;
1697 case Button3:
1698 tt_printf ("\033[5~");
1699 break;
1700 }
1701 }
1702 else
1703#endif /* NO_SCROLLBAR_REPORT */
1704
1705 {
1706 char upordown = 0;
1707
1708 if (scrollBar.style == R_SB_NEXT)
1709 {
1710 if (scrollbarnext_upButton (ev.y))
1711 upordown = -1; /* up */
1712 else if (scrollbarnext_dnButton (ev.y))
1713 upordown = 1; /* down */
1714 }
1715 else if (scrollBar.style == R_SB_RXVT)
1716 {
1717 if (scrollbarrxvt_upButton (ev.y))
1718 upordown = -1; /* up */
1719 else if (scrollbarrxvt_dnButton (ev.y))
1720 upordown = 1; /* down */
1721 }
1722 if (upordown)
1723 {
1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1725 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1726#endif
1727 if (scr_page (upordown < 0 ? UP : DN, 1))
1728 {
1729 if (upordown < 0)
1730 scrollBar.setUp ();
1731 else
1732 scrollBar.setDn ();
1733 }
1734 }
1735 else
1736 switch (ev.button)
1737 {
1738 case Button2:
1739 switch (scrollbar_align)
1740 {
1741 case R_SB_ALIGN_TOP:
1742 csrO = 0;
1608 break; 1743 break;
1609 1744 case R_SB_ALIGN_CENTRE:
1610 case Button3: 1745 csrO = (scrollBar.bot - scrollBar.top) / 2;
1611 if (R->MEvent.button == Button3 && clickintime)
1612 R->selection_rotate (ev->x, ev->y);
1613 else
1614 R->selection_extend (ev->x, ev->y, 1);
1615 R->MEvent.button = Button3;
1616 break; 1746 break;
1747 case R_SB_ALIGN_BOTTOM:
1748 csrO = scrollBar.bot - scrollBar.top;
1749 break;
1750 }
1751 if (scrollBar.style == R_SB_XTERM
1752 || scrollbar_above_slider (ev.y)
1753 || scrollbar_below_slider (ev.y))
1754 scr_move_to ( scrollbar_position (ev.y) - csrO,
1755 scrollbar_size ());
1756 scrollBar.setMotion ();
1757 break;
1758
1759 case Button1:
1760 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1761 csrO = ev.y - scrollBar.top;
1762 /* FALLTHROUGH */
1763
1764 case Button3:
1765 if (scrollBar.style != R_SB_XTERM)
1766 {
1767 if (scrollbar_above_slider (ev.y))
1768# ifdef RXVT_SCROLL_FULL
1769 scr_page (UP, TermWin.nrow - 1);
1770# else
1771 scr_page (UP, TermWin.nrow / 4);
1772# endif
1773 else if (scrollbar_below_slider (ev.y))
1774# ifdef RXVT_SCROLL_FULL
1775 scr_page (DN, TermWin.nrow - 1);
1776# else
1777 scr_page (DN, TermWin.nrow / 4);
1778# endif
1779 else
1780 scrollBar.setMotion ();
1781 }
1782 else
1783 {
1784 scr_page ((ev.button == Button1 ? DN : UP),
1785 (TermWin.nrow
1786 * scrollbar_position (ev.y)
1787 / scrollbar_size ()));
1788 }
1789 break;
1790 }
1617 } 1791 }
1618 }
1619 R->MEvent.time = ev->time;
1620 return; 1792 return;
1621 }
1622 }
1623
1624/*
1625 * Scrollbar window processing of button press
1626 */
1627 if (isScrollbarWindow(ev->window))
1628 {
1629 R->scrollBar.setIdle ();
1630 /*
1631 * Rxvt-style scrollbar:
1632 * move up if mouse is above slider
1633 * move dn if mouse is below slider
1634 *
1635 * XTerm-style scrollbar:
1636 * Move display proportional to pointer location
1637 * pointer near top -> scroll one line
1638 * pointer near bot -> scroll full page
1639 */
1640#ifndef NO_SCROLLBAR_REPORT
1641 if (reportmode) {
1642 /*
1643 * Mouse report disabled scrollbar:
1644 * arrow buttons - send up/down
1645 * click on scrollbar - send pageup/down
1646 */
1647 if ((R->scrollBar.style == R_SB_NEXT
1648 && scrollbarnext_upButton(ev->y))
1649 || (R->scrollBar.style == R_SB_RXVT
1650 && scrollbarrxvt_upButton(ev->y)))
1651 R->tt_printf("\033[A");
1652 else if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_dnButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_dnButton(ev->y)))
1656 R->tt_printf("\033[B");
1657 else
1658 switch (ev->button) {
1659 case Button2:
1660 R->tt_printf("\014");
1661 break;
1662 case Button1:
1663 R->tt_printf("\033[6~");
1664 break;
1665 case Button3:
1666 R->tt_printf("\033[5~");
1667 break;
1668 }
1669 }
1670 else
1671#endif /* NO_SCROLLBAR_REPORT */
1672 {
1673 char upordown = 0;
1674
1675 if (R->scrollBar.style == R_SB_NEXT) {
1676 if (scrollbarnext_upButton(ev->y))
1677 upordown = -1; /* up */
1678 else if (scrollbarnext_dnButton(ev->y))
1679 upordown = 1; /* down */
1680 } else if (R->scrollBar.style == R_SB_RXVT) {
1681 if (scrollbarrxvt_upButton(ev->y))
1682 upordown = -1; /* up */
1683 else if (scrollbarrxvt_dnButton(ev->y))
1684 upordown = 1; /* down */
1685 } 1793 }
1686 if (upordown) { 1794#if MENUBAR
1795 /*
1796 * Menubar window processing of button press
1797 */
1798 if (isMenuBarWindow (ev.window))
1799 menubar_control (ev);
1800#endif
1801}
1802
1803void
1804rxvt_term::button_release (XButtonEvent &ev)
1805{
1806 int reportmode = 0;
1807
1808 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate)
1810 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1811
1812 if (scrollbar_isUpDn ())
1813 {
1814 scrollBar.setIdle ();
1815 scrollbar_show (0);
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1817 refresh_type &= ~SMOOTH_REFRESH;
1689#endif
1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1691 if (upordown < 0)
1692 R->scrollBar.setUp ();
1693 else
1694 R->scrollBar.setDn ();
1695 }
1696 } else
1697 switch (ev->button) {
1698 case Button2:
1699 switch (R->scrollbar_align) {
1700 case R_SB_ALIGN_TOP:
1701 R->csrO = 0;
1702 break;
1703 case R_SB_ALIGN_CENTRE:
1704 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1705 break;
1706 case R_SB_ALIGN_BOTTOM:
1707 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1708 break;
1709 }
1710 if (R->scrollBar.style == R_SB_XTERM
1711 || scrollbar_above_slider(ev->y)
1712 || scrollbar_below_slider(ev->y))
1713 rxvt_scr_move_to(aR_
1714 scrollbar_position(ev->y) - R->csrO,
1715 scrollbar_size());
1716 R->scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1721 R->csrO = ev->y - R->scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (R->scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1729# else
1730 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1731# endif 1818#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1735# else
1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1737# endif
1738 else
1739 R->scrollBar.setMotion ();
1740 } else {
1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1742 (R->TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 rxvt_menubar_control(aR_ ev);
1757#endif
1758}
1759 1819
1760/* INTPROTO */
1761void
1762rxvt_button_release(pR_ XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 R->csrO = 0; /* reset csr Offset */
1767 if (!R->bypass_keystate)
1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 R->scrollBar.setIdle ();
1772 rxvt_scrollbar_show(aR_ 0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 R->refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1820 }
1777#ifdef SELECTION_SCROLLING 1821#ifdef SELECTION_SCROLLING
1778 R->pending_scroll_selection=0; 1822 pending_scroll_selection=0;
1779#endif 1823#endif
1780 if (ev->window == R->TermWin.vt) 1824 if (ev.window == TermWin.vt)
1781 { 1825 {
1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else
1786#endif
1787 {
1788 if (reportmode) 1826 if (reportmode)
1789 { 1827 {
1790 /* mouse report from vt window */ 1828 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1829 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1830 if (ev.button >= 4)
1793 return; 1831 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1832#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1833 /* only report the release of 'slow' single clicks */
1796 if (R->MEvent.button != AnyButton 1834 if (MEvent.button != AnyButton
1797 && (ev->button != R->MEvent.button 1835 && (ev.button != MEvent.button
1798 || (ev->time - R->MEvent.time 1836 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1837 > MULTICLICK_TIME / 2)))
1800 { 1838 {
1801 R->MEvent.clicks = 0; 1839 MEvent.clicks = 0;
1802 R->MEvent.button = AnyButton; 1840 MEvent.button = AnyButton;
1803 rxvt_mouse_report(aR_ ev); 1841 mouse_report (ev);
1804 } 1842 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1843#else /* MOUSE_REPORT_DOUBLECLICK */
1806 R->MEvent.button = AnyButton; 1844 MEvent.button = AnyButton;
1807 rxvt_mouse_report(aR_ ev); 1845 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1846#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1847 return;
1810 } 1848 }
1811 /* 1849 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1850 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1851 * when overriding mouse reporting
1814 */ 1852 */
1815 if (R->PrivateModes & PrivMode_mouse_report 1853 if (PrivateModes & PrivMode_mouse_report
1816 && R->bypass_keystate 1854 && bypass_keystate
1817 && ev->button == Button1 && R->MEvent.clicks <= 1) 1855 && ev.button == Button1 && MEvent.clicks <= 1)
1818 R->selection_extend (ev->x, ev->y, 0); 1856 selection_extend (ev.x, ev.y, 0);
1819 1857
1820 switch (ev->button) { 1858 switch (ev.button)
1859 {
1821 case Button1: 1860 case Button1:
1822 case Button3: 1861 case Button3:
1823 rxvt_selection_make(aR_ ev->time); 1862 selection_make (ev.time);
1824 break; 1863 break;
1825 case Button2: 1864 case Button2:
1826 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1865 selection_request (ev.time, ev.x, ev.y);
1827 break; 1866 break;
1828#ifdef MOUSE_WHEEL 1867#ifdef MOUSE_WHEEL
1829 case Button4: 1868 case Button4:
1830 case Button5: 1869 case Button5:
1831 { 1870 {
1832 int i; 1871 int i;
1833 page_dirn v; 1872 page_dirn v;
1834 1873
1835 v = (ev->button == Button4) ? UP : DN; 1874 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1875 if (ev.state & ShiftMask)
1837 i = 1; 1876 i = 1;
1838 else if ((R->Options & Opt_mouseWheelScrollPage)) 1877 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = R->TermWin.nrow - 1; 1878 i = TermWin.nrow - 1;
1840 else 1879 else
1841 i = 5; 1880 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1881# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1882 if (ev.state & ControlMask)
1844 { 1883 {
1845 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1884 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1886 }
1848# endif 1887# endif
1849# ifdef JUMP_MOUSE_WHEEL 1888# ifdef JUMP_MOUSE_WHEEL
1850 rxvt_scr_page(aR_ v, i); 1889 scr_page (v, i);
1851 R->scr_refresh (SMOOTH_REFRESH); 1890 scr_refresh (SMOOTH_REFRESH);
1852 rxvt_scrollbar_show(aR_ 1); 1891 scrollbar_show (1);
1853# else 1892# else
1854 while (i--) 1893 while (i--)
1855 { 1894 {
1856 rxvt_scr_page(aR_ v, 1); 1895 scr_page (v, 1);
1857 R->scr_refresh (SMOOTH_REFRESH); 1896 scr_refresh (SMOOTH_REFRESH);
1858 rxvt_scrollbar_show(aR_ 1); 1897 scrollbar_show (1);
1859 } 1898 }
1860# endif 1899# endif
1861 } 1900
1862 break; 1901 }
1902 break;
1863#endif 1903#endif
1864 } 1904
1865 }
1866 } 1905 }
1906 }
1867#ifdef MENUBAR 1907#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1908 else if (isMenuBarWindow (ev.window))
1869 rxvt_menubar_control(aR_ ev); 1909 menubar_control (ev);
1870#endif 1910#endif
1871} 1911}
1872 1912
1873 1913
1874#ifdef TRANSPARENT 1914#ifdef TRANSPARENT
1875/* 1915/*
1876 * Check our parents are still who we think they are. 1916 * Check our parents are still who we think they are.
1877 * Do transparency updates if required 1917 * Do transparency updates if required
1878 */ 1918 */
1879/* EXTPROTO */
1880int 1919int
1881rxvt_check_our_parents(pR) 1920rxvt_term::check_our_parents ()
1882{ 1921{
1883 int i, pchanged, aformat, have_pixmap, rootdepth; 1922 int i, pchanged, aformat, have_pixmap, rootdepth;
1884 unsigned long nitems, bytes_after; 1923 unsigned long nitems, bytes_after;
1885 Atom atype; 1924 Atom atype;
1886 unsigned char *prop = NULL; 1925 unsigned char *prop = NULL;
1887 Window root, oldp, *list; 1926 Window root, oldp, *list;
1888 Pixmap rootpixmap = None; 1927 Pixmap rootpixmap = None;
1889 XWindowAttributes wattr, wrootattr; 1928 XWindowAttributes wattr, wrootattr;
1890 1929
1891 pchanged = 0; 1930 pchanged = 0;
1892 1931
1893 if (!(R->Options & Opt_transparent)) 1932 if (! (Options & Opt_transparent))
1894 return pchanged; /* Don't try any more */ 1933 return pchanged; /* Don't try any more */
1895 1934
1896 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1935 XGetWindowAttributes (display->display, display->root, &wrootattr);
1897 rootdepth = wrootattr.depth; 1936 rootdepth = wrootattr.depth;
1898 1937
1899 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1900 if (rootdepth != wattr.depth) { 1939 if (rootdepth != wattr.depth)
1940 {
1901 if (R->am_transparent) { 1941 if (am_transparent)
1942 {
1902 pchanged = 1; 1943 pchanged = 1;
1903 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1944 XSetWindowBackground (display->display, TermWin.vt,
1904 R->PixColors[Color_bg]); 1945 PixColors[Color_bg]);
1905 R->am_transparent = R->am_pixmap_trans = 0; 1946 am_transparent = am_pixmap_trans = 0;
1906 } 1947 }
1907 return pchanged; /* Don't try any more */ 1948 return pchanged; /* Don't try any more */
1908 } 1949 }
1909 1950
1910/* Get all X ops out of the queue so that our information is up-to-date. */ 1951 /* Get all X ops out of the queue so that our information is up-to-date. */
1911 XSync(R->Xdisplay, False); 1952 XSync (display->display, False);
1912 1953
1913/* 1954 /*
1914 * Make the frame window set by the window manager have 1955 * Make the frame window set by the window manager have
1915 * the root background. Some window managers put multiple nested frame 1956 * the root background. Some window managers put multiple nested frame
1916 * windows for each client, so we have to take care about that. 1957 * windows for each client, so we have to take care about that.
1917 */ 1958 */
1918 i = (R->xa[XA_XROOTPMAPID] != 0 1959 i = (xa[XA_XROOTPMAPID] != 0
1919 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1920 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1921 &nitems, &bytes_after, &prop) == Success)); 1962 &nitems, &bytes_after, &prop) == Success));
1922 if (!i || prop == NULL) 1963 if (!i || prop == NULL)
1923 have_pixmap = 0; 1964 have_pixmap = 0;
1924 else { 1965 else
1966 {
1925 have_pixmap = 1; 1967 have_pixmap = 1;
1926 rootpixmap = *((Pixmap *)prop); 1968 rootpixmap = * ((Pixmap *)prop);
1927 XFree(prop); 1969 XFree (prop);
1928 } 1970 }
1929 if (have_pixmap) { 1971 if (have_pixmap)
1930/* 1972 {
1973 /*
1931 * Copy Xroot pixmap transparency 1974 * Copy display->root pixmap transparency
1932 */ 1975 */
1933 int sx, sy, nx, ny; 1976 int sx, sy, nx, ny;
1934 unsigned int nw, nh; 1977 unsigned int nw, nh;
1935 Window cr; 1978 Window cr;
1936 XImage *image; 1979 XImage *image;
1937 GC gc; 1980 GC gc;
1938 XGCValues gcvalue; 1981 XGCValues gcvalue;
1939 1982
1940 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1941 0, 0, &sx, &sy, &cr); 1984 0, 0, &sx, &sy, &cr);
1942 nw = (unsigned int)R->szHint.width; 1985 nw = (unsigned int)szHint.width;
1943 nh = (unsigned int)R->szHint.height; 1986 nh = (unsigned int)szHint.height;
1944 nx = ny = 0; 1987 nx = ny = 0;
1945 if (sx < 0) { 1988 if (sx < 0)
1989 {
1946 nw += sx; 1990 nw += sx;
1947 nx = -sx; 1991 nx = -sx;
1948 sx = 0; 1992 sx = 0;
1949 } 1993 }
1950 if (sy < 0) { 1994 if (sy < 0)
1995 {
1951 nh += sy; 1996 nh += sy;
1952 ny = -sy; 1997 ny = -sy;
1953 sy = 0; 1998 sy = 0;
1954 } 1999 }
1955 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1956 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1957 R->allowedxerror = -1; 2002 allowedxerror = -1;
1958 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1959 ZPixmap); 2004 ZPixmap);
1960 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1961 /* XXX: may need a delay here? */ 2006 /* XXX: may need a delay here? */
1962 R->allowedxerror = 0; 2007 allowedxerror = 0;
1963 if (image == NULL) { 2008 if (image == NULL)
2009 {
1964 if (R->am_transparent && R->am_pixmap_trans) { 2010 if (am_transparent && am_pixmap_trans)
1965 pchanged = 1; 2011 {
2012 pchanged = 1;
2013 if (TermWin.pixmap != None)
2014 {
2015 XFreePixmap (display->display, TermWin.pixmap);
2016 TermWin.pixmap = None;
2017 }
2018 }
2019 am_pixmap_trans = 0;
2020 }
2021 else
2022 {
1966 if (R->TermWin.pixmap != None) { 2023 if (TermWin.pixmap != None)
1967 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2024 XFreePixmap (display->display, TermWin.pixmap);
1968 R->TermWin.pixmap = None; 2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1969 } 2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height,
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height);
2033 XFreeGC (display->display, gc);
2034 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2036 TermWin.pixmap);
2037 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1;
2039 am_transparent = am_pixmap_trans = 1;
2040 }
1970 } 2041 }
1971 R->am_pixmap_trans = 0;
1972 } else {
1973 if (R->TermWin.pixmap != None)
1974 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1975 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1976 (unsigned int)R->szHint.width,
1977 (unsigned int)R->szHint.height,
1978 (unsigned int)image->depth);
1979 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1980 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1981 nx, ny, (unsigned int)image->width,
1982 (unsigned int)image->height);
1983 XFreeGC(R->Xdisplay, gc);
1984 XDestroyImage(image);
1985 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1986 R->TermWin.pixmap);
1987 if (!R->am_transparent || !R->am_pixmap_trans)
1988 pchanged = 1;
1989 R->am_transparent = R->am_pixmap_trans = 1;
1990 }
1991 }
1992 if (!R->am_pixmap_trans) { 2042 if (!am_pixmap_trans)
2043 {
1993 unsigned int n; 2044 unsigned int n;
1994/* 2045 /*
1995 * InheritPixmap transparency 2046 * InheritPixmap transparency
1996 */ 2047 */
1997 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1998 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1999 i++) { 2050 i++)
2051 {
2000 oldp = R->TermWin.parent[i]; 2052 oldp = TermWin.parent[i];
2001 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2053 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2002 &R->TermWin.parent[i], &list, &n); 2054 &TermWin.parent[i], &list, &n);
2003 XFree(list); 2055 XFree (list);
2004 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2005 if (R->TermWin.parent[i] == Xroot) { 2057 if (TermWin.parent[i] == display->root)
2006 if (oldp != None) 2058 {
2007 pchanged = 1; 2059 if (oldp != None)
2008 break; 2060 pchanged = 1;
2009 } 2061 break;
2062 }
2010 if (oldp != R->TermWin.parent[i]) 2063 if (oldp != TermWin.parent[i])
2011 pchanged = 1; 2064 pchanged = 1;
2012 } 2065 }
2013 n = 0; 2066 n = 0;
2014 if (pchanged) { 2067 if (pchanged)
2068 {
2015 for (; n < (unsigned int)i; n++) { 2069 for (; n < (unsigned int)i; n++)
2070 {
2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2072 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2073 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2074 {
2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2020 break; 2076 break;
2021 } 2077 }
2022 } 2078 }
2023 } 2079 }
2024 if (n > (int)(sizeof(R->TermWin.parent) 2080 if (n > (int) (sizeof (TermWin.parent)
2025 / sizeof(R->TermWin.parent[0]))) { 2081 / sizeof (TermWin.parent[0])))
2082 {
2026 D_X((stderr, "InheritPixmap Turning off")); 2083 D_X ((stderr, "InheritPixmap Turning off"));
2027 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2084 XSetWindowBackground (display->display, TermWin.parent[0],
2028 R->PixColors[Color_fg]); 2085 PixColors[Color_fg]);
2029 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2086 XSetWindowBackground (display->display, TermWin.vt,
2030 R->PixColors[Color_bg]); 2087 PixColors[Color_bg]);
2031 R->am_transparent = 0; 2088 am_transparent = 0;
2032 /* XXX: also turn off Opt_transparent? */ 2089 /* XXX: also turn off Opt_transparent? */
2033 } else { 2090 }
2091 else
2092 {
2034 /* wait (an arbitrary period) for the WM to do its thing 2093 /* wait (an arbitrary period) for the WM to do its thing
2035 * needed for fvwm2.2.2 (and before?) */ 2094 * needed for fvwm2.2.2 (and before?) */
2036# ifdef HAVE_NANOSLEEP 2095# ifdef HAVE_NANOSLEEP
2037 struct timespec rqt; 2096 struct timespec rqt;
2038 2097
2039 rqt.tv_sec = 1; 2098 rqt.tv_sec = 1;
2040 rqt.tv_nsec = 0; 2099 rqt.tv_nsec = 0;
2041 nanosleep(&rqt, NULL); 2100 nanosleep (&rqt, NULL);
2042# else 2101# else
2043 sleep(1); 2102 sleep (1);
2044# endif 2103# endif
2045 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2046 for (n = 0; n < (unsigned int)i; n++) 2105 for (n = 0; n < (unsigned int)i; n++)
2047 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2048 ParentRelative); 2107 ParentRelative);
2049 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2050 ParentRelative); 2109 ParentRelative);
2051 R->am_transparent = 1; 2110 am_transparent = 1;
2052 } 2111 }
2053 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2054 R->TermWin.parent[i] = None; 2113 TermWin.parent[i] = None;
2055 } 2114 }
2056 return pchanged; 2115 return pchanged;
2057} 2116}
2058#endif 2117#endif
2059 2118
2060/*}}} */ 2119/*}}} */
2061 2120
2062/*{{{ print pipe */ 2121/*{{{ print pipe */
2063/*----------------------------------------------------------------------*/ 2122/*----------------------------------------------------------------------*/
2064#ifdef PRINTPIPE 2123#ifdef PRINTPIPE
2065/* EXTPROTO */ 2124FILE *
2066FILE *
2067rxvt_popen_printer(pR) 2125rxvt_term::popen_printer ()
2068{ 2126{
2069 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2127 FILE *stream = popen (rs[Rs_print_pipe], "w");
2070 2128
2071 if (stream == NULL) 2129 if (stream == NULL)
2072 rxvt_print_error("can't open printer pipe"); 2130 rxvt_print_error ("can't open printer pipe");
2073 return stream; 2131 return stream;
2074} 2132}
2075 2133
2076/* EXTPROTO */
2077int 2134int
2078rxvt_pclose_printer (FILE *stream) 2135rxvt_term::pclose_printer (FILE *stream)
2079{ 2136{
2080 fflush (stream); 2137 fflush (stream);
2081/* pclose() reported not to work on SunOS 4.1.3 */ 2138 /* pclose () reported not to work on SunOS 4.1.3 */
2082# if defined (__sun__) /* TODO: RESOLVE THIS */ 2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2083/* pclose works provided SIGCHLD handler uses waitpid */ 2140 /* pclose works provided SIGCHLD handler uses waitpid */
2084 return pclose (stream); /* return fclose (stream); */ 2141 return pclose (stream); /* return fclose (stream); */
2085# else 2142# else
2086 return pclose (stream); 2143 return pclose (stream);
2087# endif 2144# endif
2088} 2145}
2089 2146
2090/* 2147/*
2091 * simulate attached vt100 printer 2148 * simulate attached vt100 printer
2092 */ 2149 */
2093/* INTPROTO */
2094void 2150void
2095rxvt_process_print_pipe(pR) 2151rxvt_term::process_print_pipe ()
2096{ 2152{
2097 int done; 2153 int done;
2098 FILE *fd; 2154 FILE *fd;
2099 2155
2100 if ((fd = rxvt_popen_printer(aR)) == NULL) 2156 if ((fd = popen_printer ()) == NULL)
2101 return; 2157 return;
2102 2158
2103/* 2159 /*
2104 * Send all input to the printer until either ESC[4i or ESC[?4i 2160 * Send all input to the printer until either ESC[4i or ESC[?4i
2105 * is received. 2161 * is received.
2106 */ 2162 */
2107 for (done = 0; !done;) { 2163 for (done = 0; !done;)
2164 {
2108 unsigned char buf[8]; 2165 unsigned char buf[8];
2109 unsigned char ch; 2166 unsigned char ch;
2110 unsigned int i, len; 2167 unsigned int i, len;
2111 2168
2112 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2169 if ((ch = cmd_getc ()) != C0_ESC)
2170 {
2113 if (putc(ch, fd) == EOF) 2171 if (putc (ch, fd) == EOF)
2114 break; /* done = 1 */ 2172 break; /* done = 1 */
2115 } else { 2173 }
2174 else
2175 {
2116 len = 0; 2176 len = 0;
2117 buf[len++] = ch; 2177 buf[len++] = ch;
2118 2178
2119 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2179 if ((buf[len++] = cmd_getc ()) == '[')
2120 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2180 {
2121 buf[len++] = '?'; 2181 if ((ch = cmd_getc ()) == '?')
2122 ch = rxvt_cmd_getc(aR); 2182 {
2123 } 2183 buf[len++] = '?';
2184 ch = cmd_getc ();
2185 }
2124 if ((buf[len++] = ch) == '4') { 2186 if ((buf[len++] = ch) == '4')
2187 {
2125 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2188 if ((buf[len++] = cmd_getc ()) == 'i')
2126 break; /* done = 1 */ 2189 break; /* done = 1 */
2127 } 2190 }
2191 }
2192 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF)
2194 {
2195 done = 1;
2196 break;
2197 }
2198 }
2128 } 2199 }
2129 for (i = 0; i < len; i++)
2130 if (putc(buf[i], fd) == EOF) {
2131 done = 1;
2132 break;
2133 }
2134 }
2135 }
2136 rxvt_pclose_printer(fd); 2200 pclose_printer (fd);
2137} 2201}
2138#endif /* PRINTPIPE */ 2202#endif /* PRINTPIPE */
2139/*}}} */ 2203/*}}} */
2140 2204
2141/* *INDENT-OFF* */ 2205/* *INDENT-OFF* */
2142enum { 2206enum {
2143 C1_40 = 0x40, 2207 C1_40 = 0x40,
2144 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2208 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2145 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2209 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2146 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2210 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2147 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2211 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2148}; 2212};
2149/* *INDENT-ON* */ 2213/* *INDENT-ON* */
2150 2214
2151/*{{{ process non-printing single characters */ 2215/*{{{ process non-printing single characters */
2152/* INTPROTO */
2153void 2216void
2154rxvt_process_nonprinting(pR_ unsigned char ch) 2217rxvt_term::process_nonprinting (unsigned char ch)
2155{ 2218{
2156 switch (ch) { 2219 switch (ch)
2220 {
2157 case C0_ENQ: /* terminal Status */ 2221 case C0_ENQ: /* terminal Status */
2158 if (R->rs[Rs_answerbackstring]) 2222 if (rs[Rs_answerbackstring])
2159 R->tt_write( 2223 tt_write (
2160 (const unsigned char *)R->rs[Rs_answerbackstring], 2224 (const unsigned char *)rs[Rs_answerbackstring],
2161 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2225 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2162 else 2226 else
2163 R->tt_write((unsigned char *)VT100_ANS, 2227 tt_write ((unsigned char *)VT100_ANS,
2164 (unsigned int)STRLEN(VT100_ANS)); 2228 (unsigned int)STRLEN (VT100_ANS));
2165 break; 2229 break;
2166 case C0_BEL: /* bell */ 2230 case C0_BEL: /* bell */
2167 rxvt_scr_bell(aR); 2231 scr_bell ();
2168 break; 2232 break;
2169 case C0_BS: /* backspace */ 2233 case C0_BS: /* backspace */
2170 rxvt_scr_backspace(aR); 2234 scr_backspace ();
2171 break; 2235 break;
2172 case C0_HT: /* tab */ 2236 case C0_HT: /* tab */
2173 rxvt_scr_tab(aR_ 1); 2237 scr_tab (1);
2174 break; 2238 break;
2175 case C0_CR: /* carriage return */ 2239 case C0_CR: /* carriage return */
2176 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2240 scr_gotorc (0, 0, R_RELATIVE);
2177 break; 2241 break;
2178 case C0_VT: /* vertical tab, form feed */ 2242 case C0_VT: /* vertical tab, form feed */
2179 case C0_FF: 2243 case C0_FF:
2180 case C0_LF: /* line feed */ 2244 case C0_LF: /* line feed */
2181 rxvt_scr_index(aR_ UP); 2245 scr_index (UP);
2182 break; 2246 break;
2183 case C0_SO: /* shift out - acs */ 2247 case C0_SO: /* shift out - acs */
2184 rxvt_scr_charset_choose(aR_ 1); 2248 scr_charset_choose (1);
2185 break; 2249 break;
2186 case C0_SI: /* shift in - acs */ 2250 case C0_SI: /* shift in - acs */
2187 rxvt_scr_charset_choose(aR_ 0); 2251 scr_charset_choose (0);
2188 break; 2252 break;
2189 } 2253 }
2190} 2254}
2191/*}}} */ 2255/*}}} */
2192 2256
2193 2257
2194/*{{{ process VT52 escape sequences */ 2258/*{{{ process VT52 escape sequences */
2195/* INTPROTO */
2196void 2259void
2197rxvt_process_escape_vt52(pR_ unsigned char ch) 2260rxvt_term::process_escape_vt52 (unsigned char ch)
2198{ 2261{
2199 int row, col; 2262 int row, col;
2263
2264 switch (ch)
2200 2265 {
2201 switch (ch) {
2202 case 'A': /* cursor up */ 2266 case 'A': /* cursor up */
2203 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2267 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2204 break; 2268 break;
2205 case 'B': /* cursor down */ 2269 case 'B': /* cursor down */
2206 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2270 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2207 break; 2271 break;
2208 case 'C': /* cursor right */ 2272 case 'C': /* cursor right */
2209 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2273 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2210 break; 2274 break;
2211 case 'D': /* cursor left */ 2275 case 'D': /* cursor left */
2212 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2276 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2213 break; 2277 break;
2214 case 'H': /* cursor home */ 2278 case 'H': /* cursor home */
2215 rxvt_scr_gotorc(aR_ 0, 0, 0); 2279 scr_gotorc (0, 0, 0);
2216 break; 2280 break;
2217 case 'I': /* cursor up and scroll down if needed */ 2281 case 'I': /* cursor up and scroll down if needed */
2218 rxvt_scr_index(aR_ DN); 2282 scr_index (DN);
2219 break; 2283 break;
2220 case 'J': /* erase to end of screen */ 2284 case 'J': /* erase to end of screen */
2221 R->scr_erase_screen (0); 2285 scr_erase_screen (0);
2222 break; 2286 break;
2223 case 'K': /* erase to end of line */ 2287 case 'K': /* erase to end of line */
2224 rxvt_scr_erase_line(aR_ 0); 2288 scr_erase_line (0);
2225 break; 2289 break;
2226 case 'Y': /* move to specified row and col */ 2290 case 'Y': /* move to specified row and col */
2227 /* full command is 'ESC Y row col' where row and col 2291 /* full command is 'ESC Y row col' where row and col
2228 * are encoded by adding 32 and sending the ascii 2292 * are encoded by adding 32 and sending the ascii
2229 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2293 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2230 * etc. */ 2294 * etc. */
2231 row = rxvt_cmd_getc(aR) - ' '; 2295 row = cmd_getc () - ' ';
2232 col = rxvt_cmd_getc(aR) - ' '; 2296 col = cmd_getc () - ' ';
2233 rxvt_scr_gotorc(aR_ row, col, 0); 2297 scr_gotorc (row, col, 0);
2234 break; 2298 break;
2235 case 'Z': /* identify the terminal type */ 2299 case 'Z': /* identify the terminal type */
2236 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2300 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2237 break; 2301 break;
2238 case '<': /* turn off VT52 mode */ 2302 case '<': /* turn off VT52 mode */
2239 PrivMode(0, PrivMode_vt52); 2303 PrivMode (0, PrivMode_vt52);
2240 break; 2304 break;
2241 case 'F': /* use special graphics character set */ 2305 case 'F': /* use special graphics character set */
2242 case 'G': /* use regular character set */ 2306 case 'G': /* use regular character set */
2243 /* unimplemented */ 2307 /* unimplemented */
2244 break; 2308 break;
2245 case '=': /* use alternate keypad mode */ 2309 case '=': /* use alternate keypad mode */
2246 case '>': /* use regular keypad mode */ 2310 case '>': /* use regular keypad mode */
2247 /* unimplemented */ 2311 /* unimplemented */
2248 break; 2312 break;
2249 } 2313 }
2250} 2314}
2251/*}}} */ 2315/*}}} */
2252 2316
2253 2317
2254/*{{{ process escape sequences */ 2318/*{{{ process escape sequences */
2255/* INTPROTO */
2256void 2319void
2257rxvt_process_escape_seq(pR) 2320rxvt_term::process_escape_seq ()
2258{ 2321{
2259 unsigned char ch = rxvt_cmd_getc(aR); 2322 unsigned char ch = cmd_getc ();
2260 2323
2261 if (R->PrivateModes & PrivMode_vt52) { 2324 if (PrivateModes & PrivMode_vt52)
2262 rxvt_process_escape_vt52(aR_ ch);
2263 return;
2264 }
2265 2325 {
2326 process_escape_vt52 (ch);
2327 return;
2328 }
2329
2266 switch (ch) { 2330 switch (ch)
2331 {
2267 /* case 1: do_tek_mode (); break; */ 2332 /* case 1: do_tek_mode (); break; */
2268 case '#': 2333 case '#':
2269 if (rxvt_cmd_getc(aR) == '8') 2334 if (cmd_getc () == '8')
2270 rxvt_scr_E(aR); 2335 scr_E ();
2271 break; 2336 break;
2272 case '(': 2337 case '(':
2273 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2338 scr_charset_set (0, (unsigned int)cmd_getc ());
2274 break; 2339 break;
2275 case ')': 2340 case ')':
2276 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2341 scr_charset_set (1, (unsigned int)cmd_getc ());
2277 break; 2342 break;
2278 case '*': 2343 case '*':
2279 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2344 scr_charset_set (2, (unsigned int)cmd_getc ());
2280 break; 2345 break;
2281 case '+': 2346 case '+':
2282 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2347 scr_charset_set (3, (unsigned int)cmd_getc ());
2283 break; 2348 break;
2284#ifdef MULTICHAR_SET 2349#ifdef MULTICHAR_SET
2285 case '$': 2350 case '$':
2286 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2287 break; 2352 break;
2288#endif 2353#endif
2289#ifndef NO_FRILLS 2354#ifndef NO_FRILLS
2290 case '6': 2355 case '6':
2291 rxvt_scr_backindex(aR); 2356 scr_backindex ();
2292 break; 2357 break;
2293#endif 2358#endif
2294 case '7': 2359 case '7':
2295 rxvt_scr_cursor(aR_ SAVE); 2360 scr_cursor (SAVE);
2296 break; 2361 break;
2297 case '8': 2362 case '8':
2298 rxvt_scr_cursor(aR_ RESTORE); 2363 scr_cursor (RESTORE);
2299 break; 2364 break;
2300#ifndef NO_FRILLS 2365#ifndef NO_FRILLS
2301 case '9': 2366 case '9':
2302 rxvt_scr_forwardindex(aR); 2367 scr_forwardindex ();
2303 break; 2368 break;
2304#endif 2369#endif
2305 case '=': 2370 case '=':
2306 case '>': 2371 case '>':
2307 PrivMode((ch == '='), PrivMode_aplKP); 2372 PrivMode ((ch == '='), PrivMode_aplKP);
2308 break; 2373 break;
2309 2374
2310 case C1_40: 2375 case C1_40:
2311 rxvt_cmd_getc(aR); 2376 cmd_getc ();
2312 break; 2377 break;
2313 case C1_44: 2378 case C1_44:
2314 rxvt_scr_index(aR_ UP); 2379 scr_index (UP);
2315 break; 2380 break;
2316 2381
2317 /* 8.3.87: NEXT LINE */ 2382 /* 8.3.87: NEXT LINE */
2318 case C1_NEL: /* ESC E */ 2383 case C1_NEL: /* ESC E */
2319 { 2384 {
2320 uint32_t nlcr[] = { '\n', '\r' }; 2385 uint32_t nlcr[] = { '\n', '\r' };
2321 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2386 scr_add_lines (nlcr, 1, 2);
2322 } 2387 }
2323 break; 2388 break;
2324 2389
2325 /* kidnapped escape sequence: Should be 8.3.48 */ 2390 /* kidnapped escape sequence: Should be 8.3.48 */
2326 case C1_ESA: /* ESC G */ 2391 case C1_ESA: /* ESC G */
2327 rxvt_process_graphics(aR); 2392 process_graphics ();
2328 break; 2393 break;
2329 2394
2330 /* 8.3.63: CHARACTER TABULATION SET */ 2395 /* 8.3.63: CHARACTER TABULATION SET */
2331 case C1_HTS: /* ESC H */ 2396 case C1_HTS: /* ESC H */
2332 rxvt_scr_set_tab(aR_ 1); 2397 scr_set_tab (1);
2333 break; 2398 break;
2334 2399
2335 /* 8.3.105: REVERSE LINE FEED */ 2400 /* 8.3.105: REVERSE LINE FEED */
2336 case C1_RI: /* ESC M */ 2401 case C1_RI: /* ESC M */
2337 rxvt_scr_index(aR_ DN); 2402 scr_index (DN);
2338 break; 2403 break;
2339 2404
2340 /* 8.3.142: SINGLE-SHIFT TWO */ 2405 /* 8.3.142: SINGLE-SHIFT TWO */
2341 /*case C1_SS2: scr_single_shift (2); break; */ 2406 /*case C1_SS2: scr_single_shift (2); break; */
2342 2407
2343 /* 8.3.143: SINGLE-SHIFT THREE */ 2408 /* 8.3.143: SINGLE-SHIFT THREE */
2344 /*case C1_SS3: scr_single_shift (3); break; */ 2409 /*case C1_SS3: scr_single_shift (3); break; */
2345 2410
2346 /* 8.3.27: DEVICE CONTROL STRING */ 2411 /* 8.3.27: DEVICE CONTROL STRING */
2347 case C1_DCS: /* ESC P */ 2412 case C1_DCS: /* ESC P */
2348 rxvt_process_dcs_seq(aR); 2413 process_dcs_seq ();
2349 break; 2414 break;
2350 2415
2351 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2416 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2352 case C1_SCI: /* ESC Z */ 2417 case C1_SCI: /* ESC Z */
2353 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2418 tt_write ((const unsigned char *)ESCZ_ANSWER,
2354 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2419 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2355 break; /* steal obsolete ESC [ c */ 2420 break; /* steal obsolete ESC [ c */
2356 2421
2357 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2422 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2358 case C1_CSI: /* ESC [ */ 2423 case C1_CSI: /* ESC [ */
2359 rxvt_process_csi_seq(aR); 2424 process_csi_seq ();
2360 break; 2425 break;
2361 2426
2362 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2427 /* 8.3.90: OPERATING SYSTEM COMMAND */
2363 case C1_OSC: /* ESC ] */ 2428 case C1_OSC: /* ESC ] */
2364 rxvt_process_osc_seq(aR); 2429 process_osc_seq ();
2365 break; 2430 break;
2366 2431
2367 /* 8.3.106: RESET TO INITIAL STATE */ 2432 /* 8.3.106: RESET TO INITIAL STATE */
2368 case 'c': 2433 case 'c':
2369 rxvt_scr_poweron(aR); 2434 scr_poweron ();
2370 rxvt_scrollbar_show(aR_ 1); 2435 scrollbar_show (1);
2371 break; 2436 break;
2372 2437
2373 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2374 case 'n': 2439 case 'n':
2375 rxvt_scr_charset_choose(aR_ 2); 2440 scr_charset_choose (2);
2376 break; 2441 break;
2377 2442
2378 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2443 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2379 case 'o': 2444 case 'o':
2380 rxvt_scr_charset_choose(aR_ 3); 2445 scr_charset_choose (3);
2381 break; 2446 break;
2382 } 2447 }
2383} 2448}
2384/*}}} */ 2449/*}}} */
2385 2450
2386/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2387/* *INDENT-OFF* */ 2452/* *INDENT-OFF* */
2388enum { 2453enum {
2389 CSI_ICH = 0x40, 2454 CSI_ICH = 0x40,
2390 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2455 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2391 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2456 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2392 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2457 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2393 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2458 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2394 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2459 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2395 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2460 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2396 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2461 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2397 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2462 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2398}; 2463};
2399 2464
2400#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2465#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2401 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2466 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2402 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2467 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2403#define get_byte_array_bit(array, bit) \ 2468#define get_byte_array_bit(array, bit) \
2404 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2469 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2405 2470
2406const unsigned char csi_defaults[] = { 2471const unsigned char csi_defaults[] =
2472 {
2407 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2473 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2408 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2474 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2409 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2475 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2410 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2476 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2411 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2477 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2412 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2478 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2413 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2479 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2414 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2480 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2415}; 2481 };
2416/* *INDENT-ON* */ 2482/* *INDENT-ON* */
2417 2483
2418/* INTPROTO */
2419void 2484void
2420rxvt_process_csi_seq(pR) 2485rxvt_term::process_csi_seq ()
2421{ 2486{
2422 unsigned char ch, priv, i; 2487 unsigned char ch, priv, i;
2423 unsigned int nargs, p; 2488 unsigned int nargs, p;
2424 int n, ndef; 2489 int n, ndef;
2425 int arg[ESC_ARGS]; 2490 int arg[ESC_ARGS];
2426 2491
2427 for (nargs = ESC_ARGS; nargs > 0;) 2492 for (nargs = ESC_ARGS; nargs > 0;)
2428 arg[--nargs] = 0; 2493 arg[--nargs] = 0;
2429 2494
2430 priv = 0; 2495 priv = 0;
2496 ch = cmd_getc ();
2497 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */
2499 priv = ch;
2431 ch = rxvt_cmd_getc(aR); 2500 ch = cmd_getc ();
2432 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2433 priv = ch;
2434 ch = rxvt_cmd_getc(aR);
2435 } 2501 }
2436/* read any numerical arguments */ 2502 /* read any numerical arguments */
2437 for (n = -1; ch < CSI_ICH; ) { 2503 for (n = -1; ch < CSI_ICH; )
2504 {
2438 if (isdigit(ch)) { 2505 if (isdigit (ch))
2506 {
2439 if (n < 0) 2507 if (n < 0)
2440 n = ch - '0'; 2508 n = ch - '0';
2441 else 2509 else
2442 n = n * 10 + ch - '0'; 2510 n = n * 10 + ch - '0';
2511 }
2443 } else if (ch == ';') { 2512 else if (ch == ';')
2513 {
2444 if (nargs < ESC_ARGS) 2514 if (nargs < ESC_ARGS)
2445 arg[nargs++] = n; 2515 arg[nargs++] = n;
2446 n = -1; 2516 n = -1;
2517 }
2447 } else if (ch == '\b') { 2518 else if (ch == '\b')
2448 rxvt_scr_backspace(aR); 2519 {
2520 scr_backspace ();
2521 }
2449 } else if (ch == C0_ESC) { 2522 else if (ch == C0_ESC)
2450 rxvt_process_escape_seq(aR); 2523 {
2524 process_escape_seq ();
2525 return;
2526 }
2527 else if (ch < ' ')
2528 {
2529 process_nonprinting (ch);
2530 }
2531 ch = cmd_getc ();
2532 }
2533
2534 if (ch > CSI_7F)
2451 return; 2535 return;
2452 } else if (ch < ' ') {
2453 rxvt_process_nonprinting(aR_ ch);
2454 }
2455 ch = rxvt_cmd_getc(aR);
2456 }
2457 2536
2458 if (ch > CSI_7F)
2459 return;
2460
2461 if (nargs < ESC_ARGS) 2537 if (nargs < ESC_ARGS)
2462 arg[nargs++] = n; 2538 arg[nargs++] = n;
2463 2539
2464 i = ch - CSI_ICH; 2540 i = ch - CSI_ICH;
2465 ndef = get_byte_array_bit(csi_defaults, i); 2541 ndef = get_byte_array_bit (csi_defaults, i);
2466 for (p = 0; p < nargs; p++) 2542 for (p = 0; p < nargs; p++)
2467 if (arg[p] == -1) 2543 if (arg[p] == -1)
2468 arg[p] = ndef; 2544 arg[p] = ndef;
2469 2545
2470#ifdef DEBUG_CMD 2546#ifdef DEBUG_CMD
2471 fprintf(stderr, "CSI "); 2547 fprintf (stderr, "CSI ");
2472 for (p = 0; p < nargs; p++) 2548 for (p = 0; p < nargs; p++)
2473 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2549 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2474 fprintf(stderr, "%c\n", ch); 2550 fprintf (stderr, "%c\n", ch);
2475#endif 2551#endif
2476 2552
2477/* 2553 /*
2478 * private mode handling 2554 * private mode handling
2479 */ 2555 */
2480 if (priv) { 2556 if (priv)
2481 switch (priv) { 2557 {
2482 case '>': 2558 switch (priv)
2559 {
2560 case '>':
2483 if (ch == CSI_DA) /* secondary device attributes */ 2561 if (ch == CSI_DA) /* secondary device attributes */
2484 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2562 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2485 break; 2563 break;
2486 case '?': 2564 case '?':
2487 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2565 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2488 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2566 process_terminal_mode (ch, priv, nargs, arg);
2489 break; 2567 break;
2490 } 2568 }
2491 return; 2569 return;
2492 } 2570 }
2493 2571
2494 switch (ch) { 2572 switch (ch)
2495/* 2573 {
2574 /*
2496 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2575 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2497 */ 2576 */
2498#ifdef PRINTPIPE 2577#ifdef PRINTPIPE
2499 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2578 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2500 switch (arg[0]) { 2579 switch (arg[0])
2580 {
2501 case 0: /* initiate transfer to primary aux device */ 2581 case 0: /* initiate transfer to primary aux device */
2502 rxvt_scr_printscreen(aR_ 0); 2582 scr_printscreen (0);
2503 break; 2583 break;
2504 case 5: /* start relay to primary aux device */ 2584 case 5: /* start relay to primary aux device */
2505 rxvt_process_print_pipe(aR); 2585 process_print_pipe ();
2586 break;
2587 }
2506 break; 2588 break;
2507 }
2508 break;
2509#endif 2589#endif
2510 2590
2511 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2591 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2512 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2592 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2513 arg[0] = -arg[0]; 2593 arg[0] = -arg[0];
2514 /* FALLTHROUGH */ 2594 /* FALLTHROUGH */
2515 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2595 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2516 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2596 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2517 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2597 scr_gotorc (arg[0], 0, RELATIVE);
2518 break; 2598 break;
2519 2599
2520 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2600 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2521 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2601 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2522#ifdef ISO6429 2602#ifdef ISO6429
2523 arg[0] = -arg[0]; 2603 arg[0] = -arg[0];
2524#else /* emulate common DEC VTs */ 2604#else /* emulate common DEC VTs */
2525 arg[0] = arg[0] ? -arg[0] : -1; 2605 arg[0] = arg[0] ? -arg[0] : -1;
2526#endif 2606#endif
2527 /* FALLTHROUGH */ 2607 /* FALLTHROUGH */
2528 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2608 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2529 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2609 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2530#ifdef ISO6429 2610#ifdef ISO6429
2531 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2611 scr_gotorc (0, arg[0], RELATIVE);
2532#else /* emulate common DEC VTs */ 2612#else /* emulate common DEC VTs */
2533 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2613 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2534#endif 2614#endif
2535 break; 2615 break;
2536 2616
2537 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2617 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2538 arg[0] = -arg[0]; 2618 arg[0] = -arg[0];
2539 /* FALLTHROUGH */ 2619 /* FALLTHROUGH */
2540 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2620 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2541 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2621 scr_gotorc (arg[0], 0, R_RELATIVE);
2542 break; 2622 break;
2543 2623
2544 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2624 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2545 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2625 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2546 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2626 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2547 break; 2627 break;
2548 2628
2549 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2629 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2550 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2630 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2551 break; 2631 break;
2552 2632
2553 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2633 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2554 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2634 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2635 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2556 break; 2636 break;
2557 2637
2558 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2638 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2559 arg[0] = -arg[0]; 2639 arg[0] = -arg[0];
2560 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2641 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2562 rxvt_scr_tab(aR_ arg[0]); 2642 scr_tab (arg[0]);
2563 break; 2643 break;
2564 2644
2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2645 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2566 R->scr_erase_screen (arg[0]); 2646 scr_erase_screen (arg[0]);
2567 break; 2647 break;
2568 2648
2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2649 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2570 rxvt_scr_erase_line(aR_ arg[0]); 2650 scr_erase_line (arg[0]);
2571 break; 2651 break;
2572 2652
2573 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2653 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2574 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2654 scr_insdel_chars (arg[0], INSERT);
2575 break; 2655 break;
2576 2656
2577 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2657 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2578 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2658 scr_insdel_lines (arg[0], INSERT);
2579 break; 2659 break;
2580 2660
2581 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2661 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2582 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2662 scr_insdel_lines (arg[0], DELETE);
2583 break; 2663 break;
2584 2664
2585 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2665 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2586 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2666 scr_insdel_chars (arg[0], ERASE);
2587 break; 2667 break;
2588 2668
2589 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2669 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2590 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2670 scr_insdel_chars (arg[0], DELETE);
2591 break; 2671 break;
2592 2672
2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2673 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2594 arg[0] = -arg[0]; 2674 arg[0] = -arg[0];
2595 /* FALLTHROUGH */ 2675 /* FALLTHROUGH */
2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2676 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2598 break; 2678 break;
2599 2679
2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2601 R->tt_write((const unsigned char *)VT100_ANS, 2681 tt_write ((const unsigned char *)VT100_ANS,
2602 (unsigned int)(sizeof(VT100_ANS) - 1)); 2682 (unsigned int) (sizeof (VT100_ANS) - 1));
2603 break; 2683 break;
2604 2684
2605 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2606 rxvt_process_sgr_mode(aR_ nargs, arg); 2686 process_sgr_mode (nargs, arg);
2607 break; 2687 break;
2608 2688
2609 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2689 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2610 switch (arg[0]) { 2690 switch (arg[0])
2691 {
2611 case 5: /* DSR requested */ 2692 case 5: /* DSR requested */
2612 R->tt_printf("\033[0n"); 2693 tt_printf ("\033[0n");
2613 break; 2694 break;
2614 case 6: /* CPR requested */ 2695 case 6: /* CPR requested */
2615 rxvt_scr_report_position(aR); 2696 scr_report_position ();
2616 break; 2697 break;
2617#if defined (ENABLE_DISPLAY_ANSWER) 2698#if defined (ENABLE_DISPLAY_ANSWER)
2618 case 7: /* unofficial extension */ 2699 case 7: /* unofficial extension */
2619 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2700 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2620 break; 2701 break;
2621#endif 2702#endif
2622 case 8: /* unofficial extension */ 2703 case 8: /* unofficial extension */
2623 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2705 break;
2706 }
2624 break; 2707 break;
2625 }
2626 break;
2627 2708
2628 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2629 switch (arg[0]) { 2710 switch (arg[0])
2711 {
2630 case 0: /* char tab stop cleared at active position */ 2712 case 0: /* char tab stop cleared at active position */
2631 rxvt_scr_set_tab(aR_ 0); 2713 scr_set_tab (0);
2632 break; 2714 break;
2633 /* case 1: */ /* line tab stop cleared in active line */ 2715 /* case 1: */ /* line tab stop cleared in active line */
2634 /* case 2: */ /* char tab stops cleared in active line */ 2716 /* case 2: */ /* char tab stops cleared in active line */
2635 case 3: /* all char tab stops are cleared */ 2717 case 3: /* all char tab stops are cleared */
2636 /* case 4: */ /* all line tab stops are cleared */ 2718 /* case 4: */ /* all line tab stops are cleared */
2637 case 5: /* all tab stops are cleared */ 2719 case 5: /* all tab stops are cleared */
2638 rxvt_scr_set_tab(aR_ -1); 2720 scr_set_tab (-1);
2721 break;
2722 }
2639 break; 2723 break;
2640 }
2641 break;
2642 2724
2643 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2725 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2644 switch (arg[0]) { 2726 switch (arg[0])
2727 {
2645 case 0: /* char tab stop set at active position */ 2728 case 0: /* char tab stop set at active position */
2646 rxvt_scr_set_tab(aR_ 1); 2729 scr_set_tab (1);
2647 break; /* = ESC H */ 2730 break; /* = ESC H */
2648 /* case 1: */ /* line tab stop set at active line */ 2731 /* case 1: */ /* line tab stop set at active line */
2649 case 2: /* char tab stop cleared at active position */ 2732 case 2: /* char tab stop cleared at active position */
2650 rxvt_scr_set_tab(aR_ 0); 2733 scr_set_tab (0);
2651 break; /* = ESC [ 0 g */ 2734 break; /* = ESC [ 0 g */
2652 /* case 3: */ /* line tab stop cleared at active line */ 2735 /* case 3: */ /* line tab stop cleared at active line */
2653 /* case 4: */ /* char tab stops cleared at active line */ 2736 /* case 4: */ /* char tab stops cleared at active line */
2654 case 5: /* all char tab stops are cleared */ 2737 case 5: /* all char tab stops are cleared */
2655 rxvt_scr_set_tab(aR_ -1); 2738 scr_set_tab (-1);
2656 break; /* = ESC [ 3 g */ 2739 break; /* = ESC [ 3 g */
2657 /* case 6: */ /* all line tab stops are cleared */ 2740 /* case 6: */ /* all line tab stops are cleared */
2658 } 2741 }
2659 break; 2742 break;
2660 2743
2661 case CSI_RM: /* 8.3.107: RESET MODE */ 2744 case CSI_RM: /* 8.3.107: RESET MODE */
2662 if (arg[0] == 4) 2745 if (arg[0] == 4)
2663 rxvt_scr_insert_mode(aR_ 0); 2746 scr_insert_mode (0);
2664 break; 2747 break;
2665 2748
2666 case CSI_SM: /* 8.3.126: SET MODE */ 2749 case CSI_SM: /* 8.3.126: SET MODE */
2667 if (arg[0] == 4) 2750 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 1); 2751 scr_insert_mode (1);
2669 break; 2752 break;
2670 2753
2671/* 2754 /*
2672 * PRIVATE USE beyond this point. All CSI_7? sequences here 2755 * PRIVATE USE beyond this point. All CSI_7? sequences here
2673 */ 2756 */
2674 case CSI_72: /* DECSTBM: set top and bottom margins */ 2757 case CSI_72: /* DECSTBM: set top and bottom margins */
2675 if (nargs == 1) 2758 if (nargs == 1)
2676 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2759 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2677 else if (nargs == 0 || arg[0] >= arg[1]) 2760 else if (nargs == 0 || arg[0] >= arg[1])
2678 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2761 scr_scroll_region (0, MAX_ROWS - 1);
2679 else 2762 else
2680 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2763 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2681 break; 2764 break;
2682 2765
2683 case CSI_73: 2766 case CSI_73:
2684 rxvt_scr_cursor(aR_ SAVE); 2767 scr_cursor (SAVE);
2685 break; 2768 break;
2686 case CSI_75: 2769 case CSI_75:
2687 rxvt_scr_cursor(aR_ RESTORE); 2770 scr_cursor (RESTORE);
2688 break; 2771 break;
2689 2772
2690#ifndef NO_FRILLS 2773#ifndef NO_FRILLS
2691 case CSI_74: 2774 case CSI_74:
2692 rxvt_process_window_ops(aR_ arg, nargs); 2775 process_window_ops (arg, nargs);
2693 break; 2776 break;
2694#endif 2777#endif
2695 2778
2696 case CSI_78: /* DECREQTPARM */ 2779 case CSI_78: /* DECREQTPARM */
2697 if (arg[0] == 0 || arg[0] == 1) 2780 if (arg[0] == 0 || arg[0] == 1)
2698 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2781 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2699 /* FALLTHROUGH */ 2782 /* FALLTHROUGH */
2700 2783
2701 default: 2784 default:
2702 break; 2785 break;
2703 } 2786 }
2704} 2787}
2705/*}}} */ 2788/*}}} */
2706 2789
2707#ifndef NO_FRILLS 2790#ifndef NO_FRILLS
2708/* ARGSUSED */ 2791/* ARGSUSED */
2709/* INTPROTO */
2710void 2792void
2711rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2793rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2712{ 2794{
2713 int x, y; 2795 int x, y;
2714#if 0 2796#if 0
2715 char *s; 2797 char *s;
2716#endif 2798#endif
2717 XWindowAttributes wattr; 2799 XWindowAttributes wattr;
2718 Window wdummy; 2800 Window wdummy;
2719 2801
2720 if (nargs == 0) 2802 if (nargs == 0)
2721 return; 2803 return;
2722 switch (args[0]) { 2804 switch (args[0])
2805 {
2723 /* 2806 /*
2724 * commands 2807 * commands
2725 */ 2808 */
2726 case 1: /* deiconify window */ 2809 case 1: /* deiconify window */
2727 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2810 XMapWindow (display->display, TermWin.parent[0]);
2728 break; 2811 break;
2729 case 2: /* iconify window */ 2812 case 2: /* iconify window */
2730 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2813 XIconifyWindow (display->display, TermWin.parent[0],
2731 DefaultScreen(R->Xdisplay)); 2814 DefaultScreen (display->display));
2732 break; 2815 break;
2733 case 3: /* set position (pixels) */ 2816 case 3: /* set position (pixels) */
2734 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2817 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2735 break; 2818 break;
2736 case 4: /* set size (pixels) */ 2819 case 4: /* set size (pixels) */
2737 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2820 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2738 break; 2821 break;
2739 case 5: /* raise window */ 2822 case 5: /* raise window */
2740 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2823 XRaiseWindow (display->display, TermWin.parent[0]);
2741 break; 2824 break;
2742 case 6: /* lower window */ 2825 case 6: /* lower window */
2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2826 XLowerWindow (display->display, TermWin.parent[0]);
2744 break; 2827 break;
2745 case 7: /* refresh window */ 2828 case 7: /* refresh window */
2746 R->scr_touch (true); 2829 scr_touch (true);
2747 break; 2830 break;
2748 case 8: /* set size (chars) */ 2831 case 8: /* set size (chars) */
2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2750 (unsigned int)(args[1] * R->TermWin.fheight)); 2833 (unsigned int) (args[1] * TermWin.fheight));
2751 break; 2834 break;
2752 default: 2835 default:
2753 if (args[0] >= 24) /* set height (chars) */ 2836 if (args[0] >= 24) /* set height (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2837 set_widthheight ((unsigned int)TermWin.width,
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2838 (unsigned int) (args[1] * TermWin.fheight));
2756 break; 2839 break;
2757 /* 2840 /*
2758 * reports - some output format copied from XTerm 2841 * reports - some output format copied from XTerm
2759 */ 2842 */
2760 case 11: /* report window state */ 2843 case 11: /* report window state */
2761 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2762 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2763 break; 2846 break;
2764 case 13: /* report window position */ 2847 case 13: /* report window position */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2766 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2767 -wattr.border_width, -wattr.border_width, 2850 -wattr.border_width, -wattr.border_width,
2768 &x, &y, &wdummy); 2851 &x, &y, &wdummy);
2769 R->tt_printf("\033[3;%d;%dt", x, y); 2852 tt_printf ("\033[3;%d;%dt", x, y);
2770 break; 2853 break;
2771 case 14: /* report window size (pixels) */ 2854 case 14: /* report window size (pixels) */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2773 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2774 break; 2857 break;
2775 case 18: /* report window size (chars) */ 2858 case 18: /* report window size (chars) */
2776 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2777 break; 2860 break;
2778#if 0 /* XXX: currently disabled due to security concerns */ 2861#if 0 /* XXX: currently disabled due to security concerns */
2779 case 20: /* report icon label */ 2862 case 20: /* report icon label */
2780 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2863 XGetIconName (display->display, TermWin.parent[0], &s);
2781 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2782 break; 2865 break;
2783 case 21: /* report window title */ 2866 case 21: /* report window title */
2784 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2867 XFetchName (display->display, TermWin.parent[0], &s);
2785 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2869 break;
2787#endif 2870#endif
2871
2788 } 2872 }
2789} 2873}
2790#endif 2874#endif
2791 2875
2792/*----------------------------------------------------------------------*/ 2876/*----------------------------------------------------------------------*/
2793/* 2877/*
2794 * get input up until STRING TERMINATOR (or BEL) 2878 * get input up until STRING TERMINATOR (or BEL)
2795 * ends_how is terminator used. returned input must be free()d 2879 * ends_how is terminator used. returned input must be free ()d
2796 */ 2880 */
2797/* INTPROTO */
2798unsigned char * 2881unsigned char *
2799rxvt_get_to_st(pR_ unsigned char *ends_how) 2882rxvt_term::get_to_st (unsigned char *ends_how)
2800{ 2883{
2801 int seen_esc = 0; /* seen escape? */ 2884 int seen_esc = 0; /* seen escape? */
2802 unsigned int n = 0; 2885 unsigned int n = 0;
2803 unsigned char *s; 2886 unsigned char *s;
2804 unsigned char ch, string[STRING_MAX]; 2887 unsigned char ch, string[STRING_MAX];
2805 2888
2806 for (; (ch = rxvt_cmd_getc(aR));) { 2889 for (; (ch = cmd_getc ());)
2890 {
2807 if (ch == C0_BEL 2891 if (ch == C0_BEL
2808 || ch == CHAR_ST 2892 || ch == CHAR_ST
2809 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2810 break; 2894 break;
2811 if (ch == C0_ESC) { 2895 if (ch == C0_ESC)
2896 {
2812 seen_esc = 1; 2897 seen_esc = 1;
2813 continue; 2898 continue;
2899 }
2814 } else if (ch == '\t') 2900 else if (ch == '\t')
2815 ch = ' '; /* translate '\t' to space */ 2901 ch = ' '; /* translate '\t' to space */
2816 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2817 return NULL; /* other control character - exit */ 2903 return NULL; /* other control character - exit */
2818 if (n < sizeof(string) - 1) 2904 if (n < sizeof (string) - 1)
2819 string[n++] = ch; 2905 string[n++] = ch;
2820 seen_esc = 0; 2906 seen_esc = 0;
2821 } 2907 }
2822 string[n++] = '\0'; 2908 string[n++] = '\0';
2823 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2824 return NULL; 2910 return NULL;
2825 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2911 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2826 STRNCPY(s, string, n); 2912 STRNCPY (s, string, n);
2827 return s; 2913 return s;
2828} 2914}
2829 2915
2830/*----------------------------------------------------------------------*/ 2916/*----------------------------------------------------------------------*/
2831/* 2917/*
2832 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2918 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2833 */ 2919 */
2834/* INTPROTO */
2835void 2920void
2836rxvt_process_dcs_seq(pR) 2921rxvt_term::process_dcs_seq ()
2837{ 2922{
2838 unsigned char eh, *s; 2923 unsigned char eh, *s;
2839/* 2924 /*
2840 * Not handled yet 2925 * Not handled yet
2841 */ 2926 */
2842 s = rxvt_get_to_st(aR_ &eh); 2927 s = get_to_st (&eh);
2843 if (s) 2928 if (s)
2844 free(s); 2929 free (s);
2845 return; 2930 return;
2846} 2931}
2847 2932
2848/*----------------------------------------------------------------------*/ 2933/*----------------------------------------------------------------------*/
2849/* 2934/*
2850 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2851 */ 2936 */
2852/* INTPROTO */
2853void 2937void
2854rxvt_process_osc_seq(pR) 2938rxvt_term::process_osc_seq ()
2855{ 2939{
2856 unsigned char ch, eh, *s; 2940 unsigned char ch, eh, *s;
2857 int arg; 2941 int arg;
2858 2942
2859 ch = rxvt_cmd_getc(aR); 2943 ch = cmd_getc ();
2860 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2944 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2861 arg = arg * 10 + (ch - '0'); 2945 arg = arg * 10 + (ch - '0');
2862 2946
2863 if (ch == ';') { 2947 if (ch == ';')
2864 s = rxvt_get_to_st(aR_ &eh); 2948 {
2865 if (s) { 2949 s = get_to_st (&eh);
2866 /* 2950 if (s)
2951 {
2952 /*
2867 * rxvt_menubar_dispatch() violates the constness of the string, 2953 * rxvt_menubar_dispatch () violates the constness of the string,
2868 * so do it here 2954 * so do it here
2869 */ 2955 */
2870 if (arg == XTerm_Menu) 2956 if (arg == XTerm_Menu)
2871#if 0 /* XXX: currently disabled due to security concerns */ 2957#if 0 /* XXX: currently disabled due to security concerns */
2872 rxvt_menubar_dispatch(aR_ (char *)s); 2958 menubar_dispatch ((char *)s);
2873#else 2959#else
2874 0; 2960 (void)0;
2875#endif 2961#endif
2876 else 2962 else
2877 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2963 xterm_seq (arg, (char *)s, eh);
2878 free(s); 2964 free (s);
2879 } 2965 }
2880 } 2966 }
2881} 2967}
2882/* 2968/*
2883 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2884 * 0 = change iconName/title 2970 * 0 = change iconName/title
… …
2892 * 19 = change underlined character color 2978 * 19 = change underlined character color
2893 * 46 = change logfile (not implemented) 2979 * 46 = change logfile (not implemented)
2894 * 50 = change font 2980 * 50 = change font
2895 * 2981 *
2896 * rxvt extensions: 2982 * rxvt extensions:
2983 * 9 = change locale (NYI)
2897 * 10 = menu (may change in future) 2984 * 10 = menu (may change in future)
2898 * 20 = bg pixmap 2985 * 20 = bg pixmap
2899 * 39 = change default fg color 2986 * 39 = change default fg color
2900 * 49 = change default bg color 2987 * 49 = change default bg color
2901 * 55 = dump scrollback buffer and all of screen 2988 * 55 = dump scrollback buffer and all of screen
2902 */ 2989 */
2903/* EXTPROTO */
2904void 2990void
2905rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2991rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2906{ 2992{
2907 int changed = 0; 2993 int changed = 0;
2908 int color; 2994 int color;
2909 char *buf, *name; 2995 char *buf, *name;
2910 2996
2911 assert(str != NULL); 2997 assert (str != NULL);
2912 switch (op) { 2998 switch (op)
2999 {
2913 case XTerm_name: 3000 case XTerm_name:
2914 rxvt_set_title(aR_ str); 3001 set_title (str);
2915 /* FALLTHROUGH */ 3002 /* FALLTHROUGH */
2916 case XTerm_iconName: 3003 case XTerm_iconName:
2917 rxvt_set_iconName(aR_ str); 3004 set_iconName (str);
2918 break; 3005 break;
2919 case XTerm_title: 3006 case XTerm_title:
2920 rxvt_set_title(aR_ str); 3007 set_title (str);
2921 break; 3008 break;
2922 case XTerm_Color: 3009 case XTerm_Color:
2923 for (buf = (char *)str; buf && *buf;) { 3010 for (buf = (char *)str; buf && *buf;)
3011 {
2924 if ((name = STRCHR(buf, ';')) == NULL) 3012 if ((name = STRCHR (buf, ';')) == NULL)
2925 break; 3013 break;
2926 *name++ = '\0'; 3014 *name++ = '\0';
2927 color = atoi(buf); 3015 color = atoi (buf);
2928 if (color < 0 || color >= TOTAL_COLORS) 3016 if (color < 0 || color >= TOTAL_COLORS)
2929 break; 3017 break;
2930 if ((buf = STRCHR(name, ';')) != NULL) 3018 if ((buf = STRCHR (name, ';')) != NULL)
2931 *buf++ = '\0'; 3019 *buf++ = '\0';
2932 rxvt_set_window_color(aR_ color + minCOLOR, name); 3020 set_window_color (color + minCOLOR, name);
2933 } 3021 }
2934 break; 3022 break;
2935#ifndef NO_CURSORCOLOR 3023#ifndef NO_CURSORCOLOR
2936 case XTerm_Color_cursor: 3024 case XTerm_Color_cursor:
2937 rxvt_set_window_color(aR_ Color_cursor, str); 3025 set_window_color (Color_cursor, str);
2938 break; 3026 break;
2939#endif 3027#endif
2940 case XTerm_Color_pointer: 3028 case XTerm_Color_pointer:
2941 rxvt_set_window_color(aR_ Color_pointer, str); 3029 set_window_color (Color_pointer, str);
2942 break; 3030 break;
2943#ifndef NO_BOLD_UNDERLINE_REVERSE 3031#ifndef NO_BOLD_UNDERLINE_REVERSE
2944 case XTerm_Color_BD: 3032 case XTerm_Color_BD:
2945 rxvt_set_window_color(aR_ Color_BD, str); 3033 set_window_color (Color_BD, str);
2946 break; 3034 break;
2947 case XTerm_Color_UL: 3035 case XTerm_Color_UL:
2948 rxvt_set_window_color(aR_ Color_UL, str); 3036 set_window_color (Color_UL, str);
2949 break; 3037 break;
2950 case XTerm_Color_RV: 3038 case XTerm_Color_RV:
2951 rxvt_set_window_color(aR_ Color_RV, str); 3039 set_window_color (Color_RV, str);
2952 break; 3040 break;
2953#endif 3041#endif
2954 3042
2955 case XTerm_Menu: 3043 case XTerm_Menu:
2956 /* 3044 /*
2957 * rxvt_menubar_dispatch() violates the constness of the string, 3045 * rxvt_menubar_dispatch () violates the constness of the string,
2958 * so DON'T do it here 3046 * so DON'T do it here
2959 */ 3047 */
2960 break; 3048 break;
2961 case XTerm_Pixmap: 3049 case XTerm_Pixmap:
2962 if (*str != ';') { 3050 if (*str != ';')
3051 {
2963#if XPM_BACKGROUND 3052#if XPM_BACKGROUND
2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3053 scale_pixmap (""); /* reset to default scaling */
2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3054 set_bgPixmap (str); /* change pixmap */
2966#endif 3055#endif
2967 R->scr_touch (true); 3056 scr_touch (true);
2968 } 3057 }
2969 while ((str = STRCHR(str, ';')) != NULL) { 3058 while ((str = STRCHR (str, ';')) != NULL)
2970 str++; 3059 {
3060 str++;
2971#if XPM_BACKGROUND 3061#if XPM_BACKGROUND
2972 changed += rxvt_scale_pixmap(aR_ str); 3062 changed += scale_pixmap (str);
2973#endif 3063#endif
2974 } 3064
2975 if (changed) { 3065 }
3066 if (changed)
3067 {
2976#ifdef XPM_BACKGROUND 3068#ifdef XPM_BACKGROUND
2977 rxvt_resize_pixmap(aR); 3069 resize_pixmap ();
2978#endif 3070#endif
2979 R->scr_touch (true); 3071 scr_touch (true);
2980 } 3072 }
2981 break; 3073 break;
2982 3074
2983 case XTerm_restoreFG: 3075 case XTerm_restoreFG:
2984 rxvt_set_window_color(aR_ Color_fg, str); 3076 set_window_color (Color_fg, str);
2985 break; 3077 break;
2986 case XTerm_restoreBG: 3078 case XTerm_restoreBG:
2987 rxvt_set_window_color(aR_ Color_bg, str); 3079 set_window_color (Color_bg, str);
2988 break; 3080 break;
2989 case XTerm_logfile: 3081 case XTerm_logfile:
2990 break; 3082 break;
2991 case XTerm_font: 3083 case XTerm_font:
2992 rxvt_change_font(aR_ 0, str); 3084 change_font (str);
2993 break; 3085 break;
3086 case XTerm_locale:
3087 if (str[0] == '?' && !str[1])
3088 tt_printf ("%-.250s\n", locale);
3089 else
3090 {
3091 set_locale (str);
3092 im_cb ();
3093 }
3094 break;
2994#if 0 3095#if 0
2995 case XTerm_dumpscreen: /* no error notices */ 3096 case XTerm_dumpscreen: /* no error notices */
2996 { 3097 {
2997 int fd; 3098 int fd;
2998 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3099 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2999 rxvt_scr_dump(aR_ fd); 3100 {
3000 close(fd); 3101 scr_dump (fd);
3001 } 3102 close (fd);
3002 } 3103 }
3003 break; 3104 }
3105 break;
3004#endif 3106#endif
3107
3005 } 3108 }
3006} 3109}
3007/*----------------------------------------------------------------------*/ 3110/*----------------------------------------------------------------------*/
3008 3111
3009/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3014 * 's' = save 3117 * 's' = save
3015 * 'r' = restore 3118 * 'r' = restore
3016 * 't' = toggle 3119 * 't' = toggle
3017 * so no need for fancy checking 3120 * so no need for fancy checking
3018 */ 3121 */
3019/* INTPROTO */
3020int 3122int
3021rxvt_privcases(pR_ int mode, unsigned long bit) 3123rxvt_term::privcases (int mode, unsigned long bit)
3022{ 3124{
3023 int state; 3125 int state;
3024 3126
3025 if (mode == 's') { 3127 if (mode == 's')
3128 {
3026 R->SavedModes |= (R->PrivateModes & bit); 3129 SavedModes |= (PrivateModes & bit);
3027 return -1; 3130 return -1;
3028 } else { 3131 }
3132 else
3133 {
3029 if (mode == 'r') 3134 if (mode == 'r')
3030 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3031 else 3136 else
3032 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3033 PrivMode(state, bit); 3138 PrivMode (state, bit);
3034 } 3139 }
3035 return state; 3140 return state;
3036} 3141}
3037 3142
3038/* we're not using priv _yet_ */ 3143/* we're not using priv _yet_ */
3039/* INTPROTO */
3040void 3144void
3041rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3145rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3042{ 3146{
3043 unsigned int i, j; 3147 unsigned int i, j;
3044 int state; 3148 int state;
3045 static const struct { 3149 static const struct
3150 {
3046 const int argval; 3151 const int argval;
3047 const unsigned long bit; 3152 const unsigned long bit;
3153 }
3048 } argtopriv[] = { 3154 argtopriv[] = {
3049 { 1, PrivMode_aplCUR }, 3155 { 1, PrivMode_aplCUR },
3050 { 2, PrivMode_vt52 }, 3156 { 2, PrivMode_vt52 },
3051 { 3, PrivMode_132 }, 3157 { 3, PrivMode_132 },
3052 { 4, PrivMode_smoothScroll }, 3158 { 4, PrivMode_smoothScroll },
3053 { 5, PrivMode_rVideo }, 3159 { 5, PrivMode_rVideo },
3054 { 6, PrivMode_relOrigin }, 3160 { 6, PrivMode_relOrigin },
3055 { 7, PrivMode_Autowrap }, 3161 { 7, PrivMode_Autowrap },
3056 { 9, PrivMode_MouseX10 }, 3162 { 9, PrivMode_MouseX10 },
3057#ifdef menuBar_esc 3163#ifdef menuBar_esc
3058 { menuBar_esc, PrivMode_menuBar }, 3164 { menuBar_esc, PrivMode_menuBar },
3059#endif 3165#endif
3060#ifdef scrollBar_esc 3166#ifdef scrollBar_esc
3061 { scrollBar_esc, PrivMode_scrollBar }, 3167 { scrollBar_esc, PrivMode_scrollBar },
3062#endif 3168#endif
3063 { 25, PrivMode_VisibleCursor }, 3169 { 25, PrivMode_VisibleCursor },
3064 { 35, PrivMode_ShiftKeys }, 3170 { 35, PrivMode_ShiftKeys },
3065 { 40, PrivMode_132OK }, 3171 { 40, PrivMode_132OK },
3066 { 47, PrivMode_Screen }, 3172 { 47, PrivMode_Screen },
3067 { 66, PrivMode_aplKP }, 3173 { 66, PrivMode_aplKP },
3068#ifndef NO_BACKSPACE_KEY 3174#ifndef NO_BACKSPACE_KEY
3069 { 67, PrivMode_BackSpace }, 3175 { 67, PrivMode_BackSpace },
3070#endif 3176#endif
3071 { 1000, PrivMode_MouseX11 }, 3177 { 1000, PrivMode_MouseX11 },
3072 { 1010, PrivMode_TtyOutputInh }, 3178 { 1010, PrivMode_TtyOutputInh },
3073 { 1011, PrivMode_Keypress }, 3179 { 1011, PrivMode_Keypress },
3074 { 1047, PrivMode_Screen }, 3180 { 1047, PrivMode_Screen },
3075 }; 3181 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3182 };
3076 3183
3077 if (nargs == 0) 3184 if (nargs == 0)
3078 return; 3185 return;
3079 3186
3080/* make lo/hi boolean */ 3187 /* make lo/hi boolean */
3081 if (mode == 'l') 3188 if (mode == 'l')
3082 mode = 0; /* reset */ 3189 mode = 0; /* reset */
3083 else if (mode == 'h') 3190 else if (mode == 'h')
3084 mode = 1; /* set */ 3191 mode = 1; /* set */
3085 3192
3086 for (i = 0; i < nargs; i++) { 3193 for (i = 0; i < nargs; i++)
3194 {
3087 state = -1; 3195 state = -1;
3088 3196
3089 /* basic handling */ 3197 /* basic handling */
3090 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3091 if (argtopriv[j].argval == arg[i]) { 3199 if (argtopriv[j].argval == arg[i])
3200 {
3092 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3201 state = privcases (mode, argtopriv[j].bit);
3093 break; 3202 break;
3094 } 3203 }
3095 3204
3096 /* extra handling for values with state unkept */ 3205 /* extra handling for values with state unkept */
3097 if (state == -1) 3206 if (state == -1)
3098 switch (arg[i]) { 3207 switch (arg[i])
3208 {
3099 case 1048: /* alternative cursor save */ 3209 case 1048: /* alternative cursor save */
3100 if (mode == 0) 3210 if (mode == 0)
3101 rxvt_scr_cursor(aR_ RESTORE); 3211 scr_cursor (RESTORE);
3102 else if (mode == 1) 3212 else if (mode == 1)
3103 rxvt_scr_cursor(aR_ SAVE); 3213 scr_cursor (SAVE);
3104 /* FALLTHROUGH */ 3214 /* FALLTHROUGH */
3105 default: 3215 default:
3106 continue; /* for(;i;) */ 3216 continue; /* for (;i;) */
3107 } 3217 }
3108 3218
3109 /* extra handling for values with valid 0 or 1 state */ 3219 /* extra handling for values with valid 0 or 1 state */
3110 switch (arg[i]) { 3220 switch (arg[i])
3221 {
3111 /* case 1: - application cursor keys */ 3222 /* case 1: - application cursor keys */
3112 case 2: /* VT52 mode */ 3223 case 2: /* VT52 mode */
3113 /* oddball mode. should be set regardless of set/reset 3224 /* oddball mode. should be set regardless of set/reset
3114 * parameter. Return from VT52 mode with an ESC < from 3225 * parameter. Return from VT52 mode with an ESC < from
3115 * within VT52 mode 3226 * within VT52 mode
3116 */ 3227 */
3117 PrivMode(1, PrivMode_vt52); 3228 PrivMode (1, PrivMode_vt52);
3118 break; 3229 break;
3119 case 3: /* 80/132 */ 3230 case 3: /* 80/132 */
3120 if (R->PrivateModes & PrivMode_132OK) 3231 if (PrivateModes & PrivMode_132OK)
3121 rxvt_set_widthheight(aR_
3122 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3123 (unsigned int)R->TermWin.height); 3233 (unsigned int)TermWin.height);
3124 break; 3234 break;
3125 case 4: /* smooth scrolling */ 3235 case 4: /* smooth scrolling */
3126 if (state) 3236 if (state)
3127 R->Options &= ~Opt_jumpScroll; 3237 Options &= ~Opt_jumpScroll;
3128 else 3238 else
3129 R->Options |= Opt_jumpScroll; 3239 Options |= Opt_jumpScroll;
3130 break; 3240 break;
3131 case 5: /* reverse video */ 3241 case 5: /* reverse video */
3132 rxvt_scr_rvideo_mode(aR_ state); 3242 scr_rvideo_mode (state);
3133 break; 3243 break;
3134 case 6: /* relative/absolute origins */ 3244 case 6: /* relative/absolute origins */
3135 rxvt_scr_relative_origin(aR_ state); 3245 scr_relative_origin (state);
3136 break; 3246 break;
3137 case 7: /* autowrap */ 3247 case 7: /* autowrap */
3138 rxvt_scr_autowrap(aR_ state); 3248 scr_autowrap (state);
3139 break; 3249 break;
3140 /* case 8: - auto repeat, can't do on a per window basis */ 3250 /* case 8: - auto repeat, can't do on a per window basis */
3141 case 9: /* X10 mouse reporting */ 3251 case 9: /* X10 mouse reporting */
3142 if (state) /* orthogonal */ 3252 if (state) /* orthogonal */
3143 R->PrivateModes &= ~(PrivMode_MouseX11); 3253 PrivateModes &= ~ (PrivMode_MouseX11);
3144 break; 3254 break;
3145#ifdef menuBar_esc 3255#ifdef menuBar_esc
3146 case menuBar_esc: 3256 case menuBar_esc:
3147#ifdef MENUBAR 3257#ifdef MENUBAR
3148 rxvt_map_menuBar(aR_ state); 3258 map_menuBar (state);
3149#endif 3259#endif
3150 break; 3260 break;
3151#endif 3261#endif
3152#ifdef scrollBar_esc 3262#ifdef scrollBar_esc
3153 case scrollBar_esc: 3263 case scrollBar_esc:
3154 if (rxvt_scrollbar_mapping(aR_ state)) { 3264 if (scrollbar_mapping (state))
3155 R->resize_all_windows (0, 0, 0); 3265 {
3266 resize_all_windows (0, 0, 0);
3156 R->scr_touch (true); 3267 scr_touch (true);
3157 } 3268 }
3158 break; 3269 break;
3159#endif 3270#endif
3160 case 25: /* visible/invisible cursor */ 3271 case 25: /* visible/invisible cursor */
3161 rxvt_scr_cursor_visible(aR_ state); 3272 scr_cursor_visible (state);
3162 break; 3273 break;
3163 /* case 35: - shift keys */ 3274 /* case 35: - shift keys */
3164 /* case 40: - 80 <--> 132 mode */ 3275 /* case 40: - 80 <--> 132 mode */
3165 case 47: /* secondary screen */ 3276 case 47: /* secondary screen */
3166 rxvt_scr_change_screen(aR_ state); 3277 scr_change_screen (state);
3167 break; 3278 break;
3168 /* case 66: - application key pad */ 3279 /* case 66: - application key pad */
3169 /* case 67: - backspace key */ 3280 /* case 67: - backspace key */
3170 case 1000: /* X11 mouse reporting */ 3281 case 1000: /* X11 mouse reporting */
3171 if (state) /* orthogonal */ 3282 if (state) /* orthogonal */
3172 R->PrivateModes &= ~(PrivMode_MouseX10); 3283 PrivateModes &= ~ (PrivMode_MouseX10);
3173 break; 3284 break;
3174#if 0 3285#if 0
3175 case 1001: 3286 case 1001:
3176 break; /* X11 mouse highlighting */ 3287 break; /* X11 mouse highlighting */
3177#endif 3288#endif
3178 case 1010: /* scroll to bottom on TTY output inhibit */ 3289 case 1010: /* scroll to bottom on TTY output inhibit */
3179 if (state) 3290 if (state)
3180 R->Options &= ~Opt_scrollTtyOutput; 3291 Options &= ~Opt_scrollTtyOutput;
3181 else 3292 else
3182 R->Options |= Opt_scrollTtyOutput; 3293 Options |= Opt_scrollTtyOutput;
3183 break; 3294 break;
3184 case 1011: /* scroll to bottom on key press */ 3295 case 1011: /* scroll to bottom on key press */
3185 if (state) 3296 if (state)
3186 R->Options |= Opt_scrollTtyKeypress; 3297 Options |= Opt_scrollTtyKeypress;
3187 else 3298 else
3188 R->Options &= ~Opt_scrollTtyKeypress; 3299 Options &= ~Opt_scrollTtyKeypress;
3189 break; 3300 break;
3190 case 1047: /* secondary screen w/ clearing */ 3301 case 1047: /* secondary screen w/ clearing */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3191 if (R->current_screen != PRIMARY) 3303 if (current_screen != PRIMARY)
3192 R->scr_erase_screen (2); 3304 scr_erase_screen (2);
3193 rxvt_scr_change_screen(aR_ state); 3305 scr_change_screen (state);
3194 /* FALLTHROUGH */ 3306 /* FALLTHROUGH */
3195 default: 3307 default:
3196 break; 3308 break;
3197 } 3309 }
3198 } 3310 }
3199} 3311}
3200/*}}} */ 3312/*}}} */
3201 3313
3202/*{{{ process sgr sequences */ 3314/*{{{ process sgr sequences */
3203/* INTPROTO */
3204void 3315void
3205rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3206{ 3317{
3207 unsigned int i; 3318 unsigned int i;
3208 short rendset; 3319 short rendset;
3209 int rendstyle; 3320 int rendstyle;
3210 3321
3211 if (nargs == 0) { 3322 if (nargs == 0)
3212 rxvt_scr_rendition(aR_ 0, ~RS_None);
3213 return;
3214 } 3323 {
3324 scr_rendition (0, ~RS_None);
3325 return;
3326 }
3215 for (i = 0; i < nargs; i++) { 3327 for (i = 0; i < nargs; i++)
3328 {
3216 rendset = -1; 3329 rendset = -1;
3217 switch (arg[i]) { 3330 switch (arg[i])
3218 case 0: 3331 {
3332 case 0:
3219 rendset = 0, rendstyle = ~RS_None; 3333 rendset = 0, rendstyle = ~RS_None;
3220 break; 3334 break;
3221 case 1: 3335 case 1:
3222 rendset = 1, rendstyle = RS_Bold; 3336 rendset = 1, rendstyle = RS_Bold;
3223 break; 3337 break;
3224 case 4: 3338 case 4:
3225 rendset = 1, rendstyle = RS_Uline; 3339 rendset = 1, rendstyle = RS_Uline;
3226 break; 3340 break;
3227 case 5: 3341 case 5:
3228 rendset = 1, rendstyle = RS_Blink; 3342 rendset = 1, rendstyle = RS_Blink;
3229 break; 3343 break;
3230 case 7: 3344 case 7:
3231 rendset = 1, rendstyle = RS_RVid; 3345 rendset = 1, rendstyle = RS_RVid;
3232 break; 3346 break;
3233 case 22: 3347 case 22:
3234 rendset = 0, rendstyle = RS_Bold; 3348 rendset = 0, rendstyle = RS_Bold;
3235 break; 3349 break;
3236 case 24: 3350 case 24:
3237 rendset = 0, rendstyle = RS_Uline; 3351 rendset = 0, rendstyle = RS_Uline;
3238 break; 3352 break;
3239 case 25: 3353 case 25:
3240 rendset = 0, rendstyle = RS_Blink; 3354 rendset = 0, rendstyle = RS_Blink;
3241 break; 3355 break;
3242 case 27: 3356 case 27:
3243 rendset = 0, rendstyle = RS_RVid; 3357 rendset = 0, rendstyle = RS_RVid;
3244 break; 3358 break;
3245 } 3359 }
3246 if (rendset != -1) { 3360 if (rendset != -1)
3247 rxvt_scr_rendition(aR_ rendset, rendstyle); 3361 {
3362 scr_rendition (rendset, rendstyle);
3248 continue; /* for(;i;) */ 3363 continue; /* for (;i;) */
3249 } 3364 }
3250 3365
3251 switch (arg[i]) { 3366 switch (arg[i])
3252 case 30: 3367 {
3368 case 30:
3253 case 31: /* set fg color */ 3369 case 31: /* set fg color */
3254 case 32: 3370 case 32:
3255 case 33: 3371 case 33:
3256 case 34: 3372 case 34:
3257 case 35: 3373 case 35:
3258 case 36: 3374 case 36:
3259 case 37: 3375 case 37:
3260 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3261 Color_fg); 3377 Color_fg);
3262 break; 3378 break;
3263#ifdef TTY_256COLOR 3379#ifdef TTY_256COLOR
3264 case 38: 3380 case 38:
3265 if (nargs > i + 2 && arg[i + 1] == 5) { 3381 if (nargs > i + 2 && arg[i + 1] == 5)
3382 {
3266 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3267 Color_fg); 3384 Color_fg);
3268 i += 2; 3385 i += 2;
3269 } 3386 }
3270 break; 3387 break;
3271#endif 3388#endif
3272 case 39: /* default fg */ 3389 case 39: /* default fg */
3273 rxvt_scr_color(aR_ Color_fg, Color_fg); 3390 scr_color (Color_fg, Color_fg);
3274 break; 3391 break;
3275 3392
3276 case 40: 3393 case 40:
3277 case 41: /* set bg color */ 3394 case 41: /* set bg color */
3278 case 42: 3395 case 42:
3279 case 43: 3396 case 43:
3280 case 44: 3397 case 44:
3281 case 45: 3398 case 45:
3282 case 46: 3399 case 46:
3283 case 47: 3400 case 47:
3284 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3285 Color_bg); 3402 Color_bg);
3286 break; 3403 break;
3287#ifdef TTY_256COLOR 3404#ifdef TTY_256COLOR
3288 case 48: 3405 case 48:
3289 if (nargs > i + 2 && arg[i + 1] == 5) { 3406 if (nargs > i + 2 && arg[i + 1] == 5)
3407 {
3290 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3291 Color_bg); 3409 Color_bg);
3292 i += 2; 3410 i += 2;
3293 } 3411 }
3294 break; 3412 break;
3295#endif 3413#endif
3296 case 49: /* default bg */ 3414 case 49: /* default bg */
3297 rxvt_scr_color(aR_ Color_bg, Color_bg); 3415 scr_color (Color_bg, Color_bg);
3298 break; 3416 break;
3299 3417
3300#ifndef NO_BRIGHTCOLOR 3418#ifndef NO_BRIGHTCOLOR
3301 case 90: 3419 case 90:
3302 case 91: /* set bright fg color */ 3420 case 91: /* set bright fg color */
3303 case 92: 3421 case 92:
3304 case 93: 3422 case 93:
3305 case 94: 3423 case 94:
3306 case 95: 3424 case 95:
3307 case 96: 3425 case 96:
3308 case 97: 3426 case 97:
3309 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3310 Color_fg); 3428 Color_fg);
3311 break; 3429 break;
3312 case 100: 3430 case 100:
3313 case 101: /* set bright bg color */ 3431 case 101: /* set bright bg color */
3314 case 102: 3432 case 102:
3315 case 103: 3433 case 103:
3316 case 104: 3434 case 104:
3317 case 105: 3435 case 105:
3318 case 106: 3436 case 106:
3319 case 107: 3437 case 107:
3320 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3321 Color_bg); 3439 Color_bg);
3322 break; 3440 break;
3323#endif 3441#endif
3324 } 3442
3443 }
3325 } 3444 }
3326} 3445}
3327/*}}} */ 3446/*}}} */
3328 3447
3329/*{{{ process Rob Nation's own graphics mode sequences */ 3448/*{{{ process Rob Nation's own graphics mode sequences */
3330/* INTPROTO */
3331void 3449void
3332rxvt_process_graphics(pR) 3450rxvt_term::process_graphics ()
3333{ 3451{
3334 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3452 unsigned char ch, cmd = cmd_getc ();
3335 3453
3336#ifndef RXVT_GRAPHICS 3454 if (cmd == 'Q')
3337 if (cmd == 'Q') { /* query graphics */ 3455 { /* query graphics */
3338 R->tt_printf("\033G0\n"); /* no graphics */ 3456 tt_printf ("\033G0\n"); /* no graphics */
3339 return; 3457 return;
3340 } 3458 }
3341/* swallow other graphics sequences until terminating ':' */ 3459 /* swallow other graphics sequences until terminating ':' */
3342 do 3460 do
3343 ch = rxvt_cmd_getc(aR); 3461 ch = cmd_getc ();
3344 while (ch != ':'); 3462 while (ch != ':');
3345#else
3346 unsigned int nargs;
3347 int args[NGRX_PTS];
3348 unsigned char *text = NULL;
3349
3350 if (cmd == 'Q') { /* query graphics */
3351 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3352 return;
3353 }
3354 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3355 int neg;
3356
3357 ch = rxvt_cmd_getc(aR);
3358 neg = (ch == '-');
3359 if (neg || ch == '+')
3360 ch = rxvt_cmd_getc(aR);
3361
3362 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3363 args[nargs] = args[nargs] * 10 + (ch - '0');
3364 if (neg)
3365 args[nargs] = -args[nargs];
3366
3367 nargs++;
3368 args[nargs] = 0;
3369 if (ch != ';')
3370 break;
3371 }
3372
3373 if ((cmd == 'T') && (nargs >= 5)) {
3374 int i, len = args[4];
3375
3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3377
3378 if (text != NULL) {
3379 for (i = 0; i < len; i++)
3380 text[i] = rxvt_cmd_getc(aR);
3381 text[len] = '\0';
3382 }
3383 }
3384 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3385#endif
3386} 3463}
3387/*}}} */ 3464/*}}} */
3388 3465
3389/* ------------------------------------------------------------------------- */ 3466/* ------------------------------------------------------------------------- */
3390 3467
3391/* 3468/*
3392 * Send printf() formatted output to the command. 3469 * Send printf () formatted output to the command.
3393 * Only use for small amounts of data. 3470 * Only use for small amounts of data.
3394 */ 3471 */
3395void 3472void
3396rxvt_term::tt_printf (const char *fmt,...) 3473rxvt_term::tt_printf (const char *fmt,...)
3397{ 3474{
… …
3415 3492
3416 if (len) 3493 if (len)
3417 { 3494 {
3418 if (v_buflen == 0) 3495 if (v_buflen == 0)
3419 { 3496 {
3420 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3497 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3498
3421 if (written == len) 3499 if ((unsigned int)written == len)
3422 return; 3500 return;
3423 3501
3424 data += written; 3502 data += written;
3425 len -= written; 3503 len -= written;
3426 } 3504 }

Diff Legend

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