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.27 by pcg, Tue Dec 30 01:35:58 2003 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.27 2003/12/30 01:35:58 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 w.at += BLINK_INTERVAL;
762 hidden_cursor = !hidden_cursor; 757 hidden_cursor = !hidden_cursor;
763 want_refresh = 1; 758 want_refresh = 1;
764}
765#endif
766 759
760 w.start (w.at + BLINK_INTERVAL);
761}
762#endif
763
764#ifdef TEXT_BLINK
767void 765void
768rxvt_term::x_cb (io_watcher &w, short revents) 766rxvt_term::text_blink_cb (time_watcher &w)
769{ 767{
770 SET_R (this); 768 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 SET_LOCALE (locale); 769 {
772 770 hidden_text = !hidden_text;
773 process_x_events (); 771 want_refresh = 1;
772 w.start (w.at + TEXT_BLINK_INTERVAL);
773 }
774} 774}
775#endif
775 776
776bool 777bool
777rxvt_term::pty_fill () 778rxvt_term::pty_fill ()
778{ 779{
779 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 780 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
780 781
781 memmove (cmdbuf_base, cmdbuf_ptr, n); 782 memmove (cmdbuf_base, cmdbuf_ptr, n);
782 cmdbuf_ptr = cmdbuf_base; 783 cmdbuf_ptr = cmdbuf_base;
783 cmdbuf_endp = cmdbuf_ptr + n; 784 cmdbuf_endp = cmdbuf_ptr + n;
784 785
785 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
786 787
787 if (n > 0) 788 if (n > 0)
788 { 789 {
789 cmdbuf_endp += n; 790 cmdbuf_endp += n;
… …
851 if (ch == '\n') 852 if (ch == '\n')
852 { 853 {
853 nlines++; 854 nlines++;
854 refresh_count++; 855 refresh_count++;
855 856
856 if (!(Options & Opt_jumpScroll) 857 if (! (Options & Opt_jumpScroll)
857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
858 { 859 {
859 refreshnow = true; 860 refreshnow = true;
860 flag = false; 861 flag = false;
861 ch = NOCHAR; 862 ch = NOCHAR;
862 break; 863 break;
863 } 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 }
864 } 873 }
865 874
866 if (str >= buf + BUFSIZ) 875 if (str >= buf + BUFSIZ)
867 { 876 {
868 ch = NOCHAR; 877 ch = NOCHAR;
869 break; 878 break;
870 } 879 }
871 } 880 }
872 } 881 }
873 882
874 rxvt_scr_add_lines (this, buf, nlines, str - buf); 883 scr_add_lines (buf, nlines, str - buf);
875 884
876 /* 885 /*
877 * 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
878 * 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.
879 * the number of pages between refreshes is refresh_limit, which 888 * the number of pages between refreshes is refresh_limit, which
… …
894 else 903 else
895 { 904 {
896 switch (ch) 905 switch (ch)
897 { 906 {
898 default: 907 default:
899 rxvt_process_nonprinting (this, ch); 908 process_nonprinting (ch);
900 break; 909 break;
901 case C0_ESC: /* escape char */ 910 case C0_ESC: /* escape char */
902 rxvt_process_escape_seq (this); 911 process_escape_seq ();
903 break; 912 break;
904 /*case 0x9b: */ /* CSI */ 913 /*case 0x9b: */ /* CSI */
905 /* rxvt_process_csi_seq (this); */ 914 /* process_csi_seq (); */
906 } 915 }
907 916
908 ch = NOCHAR; 917 ch = NOCHAR;
909 } 918 }
910 } 919 }
… …
921 { 930 {
922 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
923 return *cmdbuf_ptr++; 932 return *cmdbuf_ptr++;
924 933
925 wchar_t wc; 934 wchar_t wc;
926 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);
927 936
928 if (len == (size_t)-2) 937 if (len == (size_t)-2)
929 return NOCHAR; 938 return NOCHAR;
930 939
931 if (len == (size_t)-1) 940 if (len == (size_t)-1)
… …
937 } 946 }
938 947
939 return NOCHAR; 948 return NOCHAR;
940} 949}
941 950
942/* rxvt_cmd_getc() - Return next input character */ 951/* rxvt_cmd_getc () - Return next input character */
943/* 952/*
944 * Return the next input character after first passing any keyboard input 953 * Return the next input character after first passing any keyboard input
945 * to the command. 954 * to the command.
946 */ 955 */
947/* INTPROTO */
948uint32_t 956uint32_t
949rxvt_cmd_getc(pR) 957rxvt_term::cmd_getc ()
950{ 958{
951 for (;;) 959 for (;;)
952 { 960 {
953 uint32_t c = R->next_char (); 961 uint32_t c = next_char ();
954 if (c != NOCHAR) 962 if (c != NOCHAR)
955 return c; 963 return c;
956 964
957 // incomplete sequences should occur rarely, still, a better solution 965 // incomplete sequences should occur rarely, still, a better solution
958 // would be preferred. either setjmp/longjmp or better design. 966 // would be preferred. either setjmp/longjmp or better design.
959 fcntl (R->cmd_fd, F_SETFL, 0); 967 fcntl (cmd_fd, F_SETFL, 0);
960 R->pty_fill (); 968 pty_fill ();
961 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 969 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
962 }
963
964#if 0
965#define TIMEOUT_USEC 5000
966 fd_set readfds;
967 int quick_timeout, select_res;
968 int want_motion_time, want_keypress_time;
969 struct timeval value;
970#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
971 struct timeval tp;
972#endif
973
974 for (;;) {
975 /* loop until we can return something */
976
977 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
978 R->tt_write(NULL, 0);
979
980#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
981 if (R->mouse_slip_wheel_speed) {
982 quick_timeout = 1;
983 if (!R->mouse_slip_wheel_delay--
984 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
985 abs(R->mouse_slip_wheel_speed))) {
986 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
987 R->refresh_type |= SMOOTH_REFRESH;
988 R->want_refresh = 1;
989 } 970 }
990 }
991#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
992#ifdef SELECTION_SCROLLING
993 if (R->pending_scroll_selection) {
994 quick_timeout = 1;
995 if (!R->scroll_selection_delay--
996 && rxvt_scr_page(aR_ R->scroll_selection_dir,
997 R->scroll_selection_lines)) {
998 R->selection_extend (R->selection_save_x,
999 R->selection_save_y, R->selection_save_state);
1000 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1001 R->refresh_type |= SMOOTH_REFRESH;
1002 R->want_refresh = 1;
1003 }
1004 }
1005#endif
1006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1007 if (scrollbar_isUp() || scrollbar_isDn()) {
1008 quick_timeout = 1;
1009 if (!R->scroll_arrow_delay--
1010 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1011 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1012 R->refresh_type |= SMOOTH_REFRESH;
1013 R->want_refresh = 1;
1014 }
1015 }
1016#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1017
1018#ifdef TRANSPARENT
1019 quick_timeout |= R->want_full_refresh;
1020#endif
1021#endif
1022} 971}
1023 972
973#ifdef POINTER_BLANK
1024void 974void
1025rxvt_term::pointer_unblank () 975rxvt_term::pointer_unblank ()
1026{ 976{
1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 977 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1028 recolour_cursor (); 978 recolour_cursor ();
1029 979
1030#ifdef POINTER_BLANK
1031 hidden_pointer = 0; 980 hidden_pointer = 0;
1032 981
1033 if (Options & Opt_pointerBlank) 982 if (Options & Opt_pointerBlank)
1034 pointer_ev.start (NOW + pointerBlankDelay); 983 pointer_ev.start (NOW + pointerBlankDelay);
1035#endif
1036} 984}
1037 985
1038#ifdef POINTER_BLANK
1039void 986void
1040rxvt_term::pointer_blank () 987rxvt_term::pointer_blank ()
1041{ 988{
1042 pointer_ev.stop ();
1043
1044 if (!(Options & Opt_pointerBlank)) 989 if (! (Options & Opt_pointerBlank))
1045 return; 990 return;
1046 991
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 992 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 993 XFlush (display->display);
1049 994
1050 hidden_pointer = 1; 995 hidden_pointer = 1;
1051} 996}
1052 997
1053void 998void
… …
1058 1003
1059 pointer_blank (); 1004 pointer_blank ();
1060} 1005}
1061#endif 1006#endif
1062 1007
1063/* INTPROTO */
1064void 1008void
1065rxvt_mouse_report(pR_ const XButtonEvent *ev) 1009rxvt_term::mouse_report (XButtonEvent &ev)
1066{ 1010{
1067 int button_number, key_state = 0; 1011 int button_number, key_state = 0;
1068 int x, y; 1012 int x, y;
1069 1013
1070 x = ev->x; 1014 x = ev.x;
1071 y = ev->y; 1015 y = ev.y;
1072 R->pixel_position (&x, &y); 1016 pixel_position (&x, &y);
1073 1017
1074 if (R->MEvent.button == AnyButton) { 1018 if (MEvent.button == AnyButton)
1019 {
1075 button_number = 3; 1020 button_number = 3;
1076 } else { 1021 }
1022 else
1023 {
1077 button_number = R->MEvent.button - Button1; 1024 button_number = MEvent.button - Button1;
1078 /* add 0x3D for wheel events, like xterm does */ 1025 /* add 0x3D for wheel events, like xterm does */
1079 if (button_number >= 3) 1026 if (button_number >= 3)
1080 button_number += (64 - 3); 1027 button_number += (64 - 3);
1081 } 1028 }
1082 1029
1083 if (R->PrivateModes & PrivMode_MouseX10) { 1030 if (PrivateModes & PrivMode_MouseX10)
1031 {
1084 /* 1032 /*
1085 * do not report ButtonRelease 1033 * do not report ButtonRelease
1086 * no state info allowed 1034 * no state info allowed
1087 */ 1035 */
1088 key_state = 0; 1036 key_state = 0;
1089 if (button_number == 3) 1037 if (button_number == 3)
1090 return; 1038 return;
1091 } else { 1039 }
1040 else
1041 {
1092 /* XTerm mouse reporting needs these values: 1042 /* XTerm mouse reporting needs these values:
1093 * 4 = Shift 1043 * 4 = Shift
1094 * 8 = Meta 1044 * 8 = Meta
1095 * 16 = Control 1045 * 16 = Control
1096 * plus will add in our own Double-Click reporting 1046 * plus will add in our own Double-Click reporting
1097 * 32 = Double Click 1047 * 32 = Double Click
1098 */ 1048 */
1099 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1049 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1100 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1050 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1101 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1051 + ((MEvent.state & ControlMask) ? 16 : 0);
1102#ifdef MOUSE_REPORT_DOUBLECLICK 1052#ifdef MOUSE_REPORT_DOUBLECLICK
1103 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1053 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1104#endif 1054#endif
1055
1105 } 1056 }
1106 1057
1107#ifdef DEBUG_MOUSEREPORT 1058#ifdef DEBUG_MOUSEREPORT
1108 fprintf(stderr, "Mouse ["); 1059 fprintf (stderr, "Mouse [");
1109 if (key_state & 16) 1060 if (key_state & 16)
1110 fputc('C', stderr); 1061 fputc ('C', stderr);
1111 if (key_state & 4) 1062 if (key_state & 4)
1112 fputc('S', stderr); 1063 fputc ('S', stderr);
1113 if (key_state & 8) 1064 if (key_state & 8)
1114 fputc('A', stderr); 1065 fputc ('A', stderr);
1115 if (key_state & 32) 1066 if (key_state & 32)
1116 fputc('2', stderr); 1067 fputc ('2', stderr);
1117 fprintf(stderr, "]: <%d>, %d/%d\n", 1068 fprintf (stderr, "]: <%d>, %d/%d\n",
1118 button_number, 1069 button_number,
1119 x + 1, 1070 x + 1,
1120 y + 1); 1071 y + 1);
1121#else 1072#else
1122 R->tt_printf("\033[M%c%c%c", 1073 tt_printf ("\033[M%c%c%c",
1123 (32 + button_number + key_state), 1074 (32 + button_number + key_state),
1124 (32 + x + 1), 1075 (32 + x + 1),
1125 (32 + y + 1)); 1076 (32 + y + 1));
1126#endif 1077#endif
1127} 1078}
1128 1079
1129#ifdef USING_W11LIB 1080#ifdef USING_W11LIB
1130/* EXTPROTO */
1131void 1081void
1132rxvt_W11_process_x_event(XEvent *ev) 1082rxvt_W11_process_x_event (XEvent *ev)
1133{ 1083{
1134 rxvt_t *r = rxvt_get_r(); 1084 rxvt_t *r = rxvt_get_r ();
1135 1085
1136 rxvt_process_x_event(aR_ ev); 1086 x_cb (*ev);
1137} 1087}
1138#endif 1088#endif
1139 1089
1140/*{{{ process an X event */ 1090/*{{{ process an X event */
1141/* INTPROTO */
1142void 1091void
1143rxvt_process_x_event(pR_ XEvent *ev) 1092rxvt_term::x_cb (XEvent &ev)
1144{ 1093{
1145 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
1146 Window unused_root, unused_child; 1129 Window unused_root, unused_child;
1147 int unused_root_x, unused_root_y; 1130 int unused_root_x, unused_root_y;
1148 unsigned int unused_mask; 1131 unsigned int unused_mask;
1149 1132
1150#ifdef DEBUG_X 1133#ifdef DEBUG_X
1151 const char *const eventnames[] = 1134 const char *const eventnames[] =
1152 { /* mason - this matches my system */ 1135 { /* mason - this matches my system */
1153 "", 1136 "",
1154 "", 1137 "",
1155 "KeyPress", 1138 "KeyPress",
1156 "KeyRelease", 1139 "KeyRelease",
1157 "ButtonPress", 1140 "ButtonPress",
1158 "ButtonRelease", 1141 "ButtonRelease",
1159 "MotionNotify", 1142 "MotionNotify",
1160 "EnterNotify", 1143 "EnterNotify",
1161 "LeaveNotify", 1144 "LeaveNotify",
1162 "FocusIn", 1145 "FocusIn",
1163 "FocusOut", 1146 "FocusOut",
1164 "KeymapNotify", 1147 "KeymapNotify",
1165 "Expose", 1148 "Expose",
1166 "GraphicsExpose", 1149 "GraphicsExpose",
1167 "NoExpose", 1150 "NoExpose",
1168 "VisibilityNotify", 1151 "VisibilityNotify",
1169 "CreateNotify", 1152 "CreateNotify",
1170 "DestroyNotify", 1153 "DestroyNotify",
1171 "UnmapNotify", 1154 "UnmapNotify",
1172 "MapNotify", 1155 "MapNotify",
1173 "MapRequest", 1156 "MapRequest",
1174 "ReparentNotify", 1157 "ReparentNotify",
1175 "ConfigureNotify", 1158 "ConfigureNotify",
1176 "ConfigureRequest", 1159 "ConfigureRequest",
1177 "GravityNotify", 1160 "GravityNotify",
1178 "ResizeRequest", 1161 "ResizeRequest",
1179 "CirculateNotify", 1162 "CirculateNotify",
1180 "CirculateRequest", 1163 "CirculateRequest",
1181 "PropertyNotify", 1164 "PropertyNotify",
1182 "SelectionClear", 1165 "SelectionClear",
1183 "SelectionRequest", 1166 "SelectionRequest",
1184 "SelectionNotify", 1167 "SelectionNotify",
1185 "ColormapNotify", 1168 "ColormapNotify",
1186 "ClientMessage", 1169 "ClientMessage",
1187 "MappingNotify" 1170 "MappingNotify"
1188 }; 1171 };
1189#endif 1172#endif
1190 1173
1191#ifdef DEBUG_X 1174#ifdef DEBUG_X
1192 struct timeval tp; 1175 struct timeval tp;
1193 struct tm *ltt; 1176 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1177 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1178 ltt = localtime (& (tp.tv_sec));
1196 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));
1197#endif 1180#endif
1198 1181
1199 switch (ev->type) { 1182 switch (ev.type)
1183 {
1200 case KeyPress: 1184 case KeyPress:
1201 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1185 lookup_key (ev.xkey);
1202 break; 1186 break;
1203 1187
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease: 1189 case KeyRelease:
1206 { 1190 {
1207 if (!(ev->xkey.state & ControlMask)) 1191 if (! (ev.xkey.state & ControlMask))
1208 R->mouse_slip_wheel_speed = 0; 1192 mouse_slip_wheel_speed = 0;
1209 else { 1193 else
1210 KeySym ks; 1194 {
1211 1195 KeySym ks;
1196
1212 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1197 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1213 if (ks == XK_Control_L || ks == XK_Control_R) 1198 if (ks == XK_Control_L || ks == XK_Control_R)
1214 R->mouse_slip_wheel_speed = 0; 1199 mouse_slip_wheel_speed = 0;
1215 } 1200 }
1216 break; 1201 break;
1217 } 1202 }
1218#endif 1203#endif
1219 1204
1220 case ButtonPress: 1205 case ButtonPress:
1221 rxvt_button_press(aR_ (XButtonEvent *)ev); 1206 button_press (ev.xbutton);
1222 break; 1207 break;
1223 1208
1224 case ButtonRelease: 1209 case ButtonRelease:
1225 rxvt_button_release(aR_ (XButtonEvent *)ev); 1210 button_release (ev.xbutton);
1226 break; 1211 break;
1227 1212
1228 case ClientMessage: 1213 case ClientMessage:
1229 if (ev->xclient.format == 32 1214 if (ev.xclient.format == 32
1230 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1215 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1231 R->destroy (); 1216 destroy ();
1232#ifdef OFFIX_DND 1217#ifdef OFFIX_DND
1233 /* OffiX Dnd (drag 'n' drop) protocol */ 1218 /* OffiX Dnd (drag 'n' drop) protocol */
1234 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1219 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1235 && (ev->xclient.data.l[0] == DndFile 1220 && (ev.xclient.data.l[0] == DndFile
1236 || ev->xclient.data.l[0] == DndDir 1221 || ev.xclient.data.l[0] == DndDir
1237 || ev->xclient.data.l[0] == DndLink)) { 1222 || ev.xclient.data.l[0] == DndLink))
1238 /* Get Dnd data */ 1223 {
1224 /* Get Dnd data */
1239 Atom ActualType; 1225 Atom ActualType;
1240 int ActualFormat; 1226 int ActualFormat;
1241 unsigned char *data; 1227 unsigned char *data;
1242 unsigned long Size, RemainingBytes; 1228 unsigned long Size, RemainingBytes;
1243 1229
1244 XGetWindowProperty(R->Xdisplay, Xroot, 1230 XGetWindowProperty (display->display, display->root,
1245 R->xa[XA_DNDSELECTION], 1231 xa[XA_DNDSELECTION],
1246 0L, 1000000L, 1232 0L, 1000000L,
1247 False, AnyPropertyType, 1233 False, AnyPropertyType,
1248 &ActualType, &ActualFormat, 1234 &ActualType, &ActualFormat,
1249 &Size, &RemainingBytes, 1235 &Size, &RemainingBytes,
1250 &data); 1236 &data);
1251 XChangeProperty(R->Xdisplay, Xroot, 1237 XChangeProperty (display->display, display->root,
1252 XA_CUT_BUFFER0, XA_STRING, 1238 XA_CUT_BUFFER0, XA_STRING,
1253 8, PropModeReplace, 1239 8, PropModeReplace,
1254 data, STRLEN(data)); 1240 data, STRLEN (data));
1255 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1241 selection_paste (display->root, XA_CUT_BUFFER0, True);
1256 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1257 } 1243 }
1258#endif /* OFFIX_DND */ 1244#endif /* OFFIX_DND */
1259 break; 1245 break;
1260 1246
1261 case MappingNotify: 1247 case MappingNotify:
1262 XRefreshKeyboardMapping(&(ev->xmapping)); 1248 XRefreshKeyboardMapping (& (ev.xmapping));
1263 break; 1249 break;
1264 1250
1265 /* 1251 /*
1266 * XXX: this is not the _current_ arrangement 1252 * XXX: this is not the _current_ arrangement
1267 * Here's my conclusion: 1253 * Here's my conclusion:
1268 * If the window is completely unobscured, use bitblt's 1254 * If the window is completely unobscured, use bitblt's
1269 * to scroll. Even then, they're only used when doing partial 1255 * to scroll. Even then, they're only used when doing partial
1270 * screen scrolling. When partially obscured, we have to fill 1256 * screen scrolling. When partially obscured, we have to fill
1271 * in the GraphicsExpose parts, which means that after each refresh, 1257 * in the GraphicsExpose parts, which means that after each refresh,
1272 * we need to wait for the graphics expose or Noexpose events, 1258 * we need to wait for the graphics expose or Noexpose events,
1273 * which ought to make things real slow! 1259 * which ought to make things real slow!
1274 */ 1260 */
1275 case VisibilityNotify: 1261 case VisibilityNotify:
1276 switch (ev->xvisibility.state) 1262 switch (ev.xvisibility.state)
1277 { 1263 {
1278 case VisibilityUnobscured: 1264 case VisibilityUnobscured:
1279 R->refresh_type = FAST_REFRESH; 1265 refresh_type = FAST_REFRESH;
1280 break; 1266 break;
1281 case VisibilityPartiallyObscured: 1267 case VisibilityPartiallyObscured:
1282 R->refresh_type = SLOW_REFRESH; 1268 refresh_type = SLOW_REFRESH;
1283 break; 1269 break;
1284 default: 1270 default:
1285 R->refresh_type = NO_REFRESH; 1271 refresh_type = NO_REFRESH;
1286 break; 1272 break;
1287 } 1273 }
1288 break; 1274 break;
1289 1275
1290 case FocusIn: 1276 case FocusIn:
1291 if (!R->TermWin.focus) { 1277 if (!TermWin.focus)
1292 R->TermWin.focus = 1; 1278 {
1293 R->want_refresh = 1; 1279 TermWin.focus = 1;
1280 want_refresh = 1;
1294#ifdef USE_XIM 1281#ifdef USE_XIM
1295 if (R->Input_Context != NULL) 1282 if (Input_Context != NULL)
1296 XSetICFocus(R->Input_Context); 1283 XSetICFocus (Input_Context);
1297#endif 1284#endif
1298#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1299 if (R->Options & Opt_cursorBlink) 1286 if (Options & Opt_cursorBlink)
1300 R->blink_ev.start (NOW + BLINK_INTERVAL); 1287 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif 1288#endif
1302 }
1303 break;
1304 1289
1290 }
1291 break;
1292
1305 case FocusOut: 1293 case FocusOut:
1306 if (R->TermWin.focus) { 1294 if (TermWin.focus)
1307 R->TermWin.focus = 0; 1295 {
1308 R->want_refresh = 1; 1296 TermWin.focus = 0;
1297 want_refresh = 1;
1309#ifdef USE_XIM 1298#ifdef USE_XIM
1310 if (R->Input_Context != NULL) 1299 if (Input_Context != NULL)
1311 XUnsetICFocus(R->Input_Context); 1300 XUnsetICFocus (Input_Context);
1312#endif 1301#endif
1313#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1314 if (R->Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1315 R->blink_ev.stop (); 1304 cursor_blink_ev.stop ();
1316 R->hidden_cursor = 0; 1305 hidden_cursor = 0;
1317#endif 1306#endif
1318 }
1319 break;
1320 1307
1308 }
1309 break;
1310
1321 case ConfigureNotify: 1311 case ConfigureNotify:
1322 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1312 if (ev.xconfigure.window == TermWin.parent[0])
1323 int height, width; 1313 {
1314 int height, width;
1324 1315
1316 do
1325 do { /* Wrap lots of configures into one */ 1317 { /* Wrap lots of configures into one */
1326 width = ev->xconfigure.width; 1318 width = ev.xconfigure.width;
1327 height = ev->xconfigure.height; 1319 height = ev.xconfigure.height;
1328 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1320 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1329 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1321 }
1330 ConfigureNotify, ev)); 1322 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1323
1331 if (R->szHint.width != width || R->szHint.height != height) { 1324 if (szHint.width != width || szHint.height != height)
1325 {
1332 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));
1333 R->resize_all_windows (width, height, 1); 1327 resize_all_windows (width, height, 1);
1334 } 1328 }
1335#ifdef DEBUG_SIZE 1329#ifdef DEBUG_SIZE
1336 else { 1330 else
1331 {
1337 D_SIZE((stderr, "Size: Not resizing")); 1332 D_SIZE ((stderr, "Size: Not resizing"));
1338 } 1333 }
1339#endif 1334#endif
1340#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1341 if (R->Options & Opt_transparent) { 1336 if (Options & Opt_transparent)
1342 rxvt_check_our_parents(aR); 1337 {
1343 if (R->am_transparent) 1338 check_our_parents ();
1344 R->want_full_refresh = 1; 1339 if (am_transparent)
1345 } 1340 want_full_refresh = 1;
1341 }
1346#endif 1342#endif
1347 }
1348 break;
1349 1343
1344 }
1345 break;
1346
1350 case SelectionClear: 1347 case SelectionClear:
1351 rxvt_selection_clear(aR); 1348 display->set_selection_owner (0);
1352 break; 1349 break;
1353 1350
1354 case SelectionNotify: 1351 case SelectionNotify:
1355 if (R->selection_wait == Sel_normal) 1352 if (selection_wait == Sel_normal)
1356 rxvt_selection_paste(aR_ ev->xselection.requestor, 1353 selection_paste (ev.xselection.requestor,
1357 ev->xselection.property, True); 1354 ev.xselection.property, True);
1358 break; 1355 break;
1359 1356
1360 case SelectionRequest: 1357 case SelectionRequest:
1361 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1358 selection_send (ev.xselectionrequest);
1362 break; 1359 break;
1363 1360
1364 case UnmapNotify: 1361 case UnmapNotify:
1365 R->TermWin.mapped = 0; 1362 TermWin.mapped = 0;
1366 break; 1363#ifdef TEXT_BLINK
1364 text_blink_ev.stop ();
1365#endif
1366 break;
1367 1367
1368 case MapNotify: 1368 case MapNotify:
1369 R->TermWin.mapped = 1; 1369 TermWin.mapped = 1;
1370 break; 1370#ifdef TEXT_BLINK
1371 1371 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1372 case PropertyNotify: 1372#endif
1373 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1374 if (ev->xproperty.state == PropertyNewValue)
1375 rxvt_selection_property(aR_ ev->xproperty.window,
1376 ev->xproperty.atom);
1377 break; 1373 break;
1378 } 1374
1379#ifdef TRANSPARENT 1375#ifdef TRANSPARENT
1380 /*
1381 * if user used some Esetroot compatible prog to set the root bg,
1382 * use the property to determine the pixmap. We use it later on.
1383 */
1384 if (R->xa[XA_XROOTPMAPID] == 0)
1385 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1386 "_XROOTPMAP_ID", False);
1387 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1388 break;
1389 /* FALLTHROUGH */
1390 case ReparentNotify: 1376 case ReparentNotify:
1391 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1377 rootwin_cb (ev);
1392 if (R->am_transparent) 1378 break;
1393 R->want_full_refresh = 1;
1394 }
1395#endif /* TRANSPARENT */ 1379#endif /* TRANSPARENT */
1396 break;
1397 1380
1398 case GraphicsExpose: 1381 case GraphicsExpose:
1399 case Expose: 1382 case Expose:
1400 if (ev->xany.window == R->TermWin.vt) { 1383 if (ev.xany.window == TermWin.vt)
1384 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1385#ifdef NO_SLOW_LINK_SUPPORT
1402 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1386 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev->xexpose.width, ev->xexpose.height, False); 1387 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1388#else
1405 // don't understand this, so commented it out 1389 // don't understand this, so commented it out
1406 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1390 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev->xexpose.width, ev->xexpose.height, False); 1391 ev.xexpose.width, ev.xexpose.height, False);
1408 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1392 //scr_expose (ev.xexpose.x, 0,
1409 // ev->xexpose.width, R->TermWin.height, False); 1393 // ev.xexpose.width, TermWin.height, False);
1410#endif 1394#endif
1411 R->want_refresh = 1; 1395 want_refresh = 1;
1412 } else { 1396 }
1413 XEvent unused_xevent; 1397 else
1398 {
1399 XEvent unused_event;
1414 1400
1415 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1416 Expose, 1402 Expose,
1417 &unused_xevent)) ; 1403 &unused_event)) ;
1418 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1419 GraphicsExpose, 1405 GraphicsExpose,
1420 &unused_xevent)) ; 1406 &unused_event)) ;
1421 if (isScrollbarWindow(ev->xany.window)) { 1407 if (isScrollbarWindow (ev.xany.window))
1422 R->scrollBar.setIdle(); 1408 {
1423 rxvt_scrollbar_show(aR_ 0); 1409 scrollBar.setIdle ();
1424 } 1410 scrollbar_show (0);
1411 }
1425#ifdef MENUBAR 1412#ifdef MENUBAR
1426 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 rxvt_menubar_expose(aR); 1414 menubar_expose ();
1428#endif 1415#endif
1429#ifdef RXVT_GRAPHICS 1416 }
1430 rxvt_Gr_expose(aR_ ev->xany.window); 1417 break;
1431#endif
1432 }
1433 break;
1434 1418
1435 case MotionNotify: 1419 case MotionNotify:
1436#ifdef POINTER_BLANK 1420#ifdef POINTER_BLANK
1437 if (R->hidden_pointer) 1421 if (hidden_pointer)
1438 R->pointer_unblank (); 1422 pointer_unblank ();
1439#endif 1423#endif
1440#if MENUBAR 1424#if MENUBAR
1441 if (isMenuBarWindow(ev->xany.window)) { 1425 if (isMenuBarWindow (ev.xany.window))
1442 rxvt_menubar_control(aR_ &(ev->xbutton)); 1426 {
1443 break; 1427 menubar_control (ev.xbutton);
1444 } 1428 break;
1429 }
1445#endif 1430#endif
1446 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1447 break; 1432 break;
1448 1433
1449 if (ev->xany.window == R->TermWin.vt) { 1434 if (ev.xany.window == TermWin.vt)
1435 {
1450 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1436 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1451 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1437 {
1452 MotionNotify, ev)) ; 1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1453 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1439 ;
1454 &unused_root, &unused_child, 1440
1455 &unused_root_x, &unused_root_y, 1441 XQueryPointer (display->display, TermWin.vt,
1456 &(ev->xbutton.x), &(ev->xbutton.y), 1442 &unused_root, &unused_child,
1457 &unused_mask); 1443 &unused_root_x, &unused_root_y,
1444 & (ev.xbutton.x), & (ev.xbutton.y),
1445 &unused_mask);
1458#ifdef MOUSE_THRESHOLD 1446#ifdef MOUSE_THRESHOLD
1459 /* deal with a `jumpy' mouse */ 1447 /* deal with a `jumpy' mouse */
1460 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1449 {
1461#endif 1450#endif
1462 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1463 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1452 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1464#ifdef SELECTION_SCROLLING 1453#ifdef SELECTION_SCROLLING
1465 if (ev->xbutton.y<R->TermWin.int_bwidth || 1454 if (ev.xbutton.y < TermWin.int_bwidth
1466 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1467 int dist;
1468
1469 R->pending_scroll_selection=1;
1470
1471 /* don't clobber the current delay if we are
1472 * already in the middle of scrolling.
1473 */
1474 if (R->scroll_selection_delay<=0)
1475 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1476
1477 /* save the event params so we can highlight
1478 * the selection in the pending-scroll loop
1479 */
1480 R->selection_save_x=ev->xbutton.x;
1481 R->selection_save_y=ev->xbutton.y;
1482 R->selection_save_state=
1483 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1484
1485 /* calc number of lines to scroll */
1486 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1487 R->scroll_selection_dir = UP;
1488 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1489 }
1490 else {
1491 R->scroll_selection_dir = DN;
1492 dist = ev->xbutton.y -
1493 (R->TermWin.int_bwidth + R->TermWin.height);
1494 }
1495 R->scroll_selection_lines=(Pixel2Height(dist)/
1496 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1497 MIN_IT(R->scroll_selection_lines,
1498 SELECTION_SCROLL_MAX_LINES);
1499 }
1500 else {
1501 /* we are within the text window, so we
1502 * shouldn't be scrolling
1503 */
1504 R->pending_scroll_selection = 0;
1505 }
1506#endif
1507#ifdef MOUSE_THRESHOLD
1508 }
1509#endif
1510 }
1511 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1512 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1513 MotionNotify, ev)) ;
1514 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1515 &unused_root, &unused_child,
1516 &unused_root_x, &unused_root_y,
1517 &(ev->xbutton.x), &(ev->xbutton.y),
1518 &unused_mask);
1519 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1520 scrollbar_size());
1521 R->scr_refresh (R->refresh_type);
1522 R->refresh_limit = 0;
1523 rxvt_scrollbar_show(aR_ 1);
1524 }
1525 break;
1526 }
1527}
1528
1529/* INTPROTO */
1530void
1531rxvt_button_press(pR_ XButtonEvent *ev)
1532{
1533 int reportmode = 0, clickintime;
1534
1535 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1536 if (!R->bypass_keystate)
1537 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1538/*
1539 * VT window processing of button press
1540 */
1541 if (ev->window == R->TermWin.vt)
1542 {
1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else
1547#endif
1548 {
1549 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1550 if (reportmode)
1551 {
1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */
1554 R->MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == R->MEvent.button && clickintime)
1557 {
1558 /* same button, within alloted time */
1559 R->MEvent.clicks++;
1560 if (R->MEvent.clicks > 1)
1561 { 1456 {
1562 /* only report double clicks */ 1457 int dist;
1563 R->MEvent.clicks = 2;
1564 rxvt_mouse_report(aR_ ev);
1565 1458
1566 /* don't report the release */ 1459 pending_scroll_selection=1;
1567 R->MEvent.clicks = 0; 1460
1568 R->MEvent.button = AnyButton; 1461 /* don't clobber the current delay if we are
1569 } 1462 * already in the middle of scrolling.
1570 }
1571 else
1572 { 1463 */
1573 /* different button, or time expired */ 1464 if (scroll_selection_delay<=0)
1574 R->MEvent.clicks = 1; 1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1575 R->MEvent.button = ev->button; 1466
1576 rxvt_mouse_report(aR_ ev); 1467 /* save the event params so we can highlight
1577 } 1468 * the selection in the pending-scroll loop
1578#else
1579 R->MEvent.button = ev->button;
1580 rxvt_mouse_report(aR_ ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 }
1583 else
1584 {
1585 if (ev->button != R->MEvent.button)
1586 R->MEvent.clicks = 0;
1587 switch (ev->button)
1588 { 1469 */
1589 case Button1: 1470 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1471 selection_save_y=ev.xbutton.y;
1591 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)
1592 { 1477 {
1593 if (R->MEvent.button == Button1 && clickintime) 1478 scroll_selection_dir = UP;
1594 R->selection_rotate (ev->x, ev->y); 1479 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 R->selection_extend (ev->x, ev->y, 1);
1597 } 1480 }
1598 else 1481 else
1599 { 1482 {
1600 if (R->MEvent.button == Button1 && clickintime) 1483 scroll_selection_dir = DN;
1601 R->MEvent.clicks++; 1484 dist = ev.xbutton.y -
1602 else 1485 (TermWin.int_bwidth + TermWin.height);
1603 R->MEvent.clicks = 1;
1604
1605 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1606 } 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
1607 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
1608 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;
1609 break; 1743 break;
1610 1744 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1745 csrO = (scrollBar.bot - scrollBar.top) / 2;
1612 if (R->MEvent.button == Button3 && clickintime)
1613 R->selection_rotate (ev->x, ev->y);
1614 else
1615 R->selection_extend (ev->x, ev->y, 1);
1616 R->MEvent.button = Button3;
1617 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 }
1618 } 1791 }
1619 }
1620 R->MEvent.time = ev->time;
1621 return; 1792 return;
1622 }
1623 }
1624
1625/*
1626 * Scrollbar window processing of button press
1627 */
1628 if (isScrollbarWindow(ev->window))
1629 {
1630 R->scrollBar.setIdle ();
1631 /*
1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider
1635 *
1636 * XTerm-style scrollbar:
1637 * Move display proportional to pointer location
1638 * pointer near top -> scroll one line
1639 * pointer near bot -> scroll full page
1640 */
1641#ifndef NO_SCROLLBAR_REPORT
1642 if (reportmode) {
1643 /*
1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down
1647 */
1648 if ((R->scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y))
1650 || (R->scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y)))
1652 R->tt_printf("\033[A");
1653 else if ((R->scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y))
1655 || (R->scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y)))
1657 R->tt_printf("\033[B");
1658 else
1659 switch (ev->button) {
1660 case Button2:
1661 R->tt_printf("\014");
1662 break;
1663 case Button1:
1664 R->tt_printf("\033[6~");
1665 break;
1666 case Button3:
1667 R->tt_printf("\033[5~");
1668 break;
1669 }
1670 }
1671 else
1672#endif /* NO_SCROLLBAR_REPORT */
1673 {
1674 char upordown = 0;
1675
1676 if (R->scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */
1681 } else if (R->scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */
1686 } 1793 }
1687 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);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1817 refresh_type &= ~SMOOTH_REFRESH;
1690#endif
1691 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0)
1693 R->scrollBar.setUp ();
1694 else
1695 R->scrollBar.setDn ();
1696 }
1697 } else
1698 switch (ev->button) {
1699 case Button2:
1700 switch (R->scrollbar_align) {
1701 case R_SB_ALIGN_TOP:
1702 R->csrO = 0;
1703 break;
1704 case R_SB_ALIGN_CENTRE:
1705 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1706 break;
1707 case R_SB_ALIGN_BOTTOM:
1708 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1709 break;
1710 }
1711 if (R->scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y))
1714 rxvt_scr_move_to(aR_
1715 scrollbar_position(ev->y) - R->csrO,
1716 scrollbar_size());
1717 R->scrollBar.setMotion ();
1718 break;
1719
1720 case Button1:
1721 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1722 R->csrO = ev->y - R->scrollBar.top;
1723 /* FALLTHROUGH */
1724
1725 case Button3:
1726 if (R->scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL
1729 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1730# else
1731 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1732# endif 1818#endif
1733 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL
1735 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1736# else
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1738# endif
1739 else
1740 R->scrollBar.setMotion ();
1741 } else {
1742 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1743 (R->TermWin.nrow
1744 * scrollbar_position(ev->y)
1745 / scrollbar_size()));
1746 }
1747 break;
1748 }
1749 }
1750 return;
1751 }
1752#if MENUBAR
1753 /*
1754 * Menubar window processing of button press
1755 */
1756 if (isMenuBarWindow(ev->window))
1757 rxvt_menubar_control(aR_ ev);
1758#endif
1759}
1760 1819
1761/* INTPROTO */
1762void
1763rxvt_button_release(pR_ XButtonEvent *ev)
1764{
1765 int reportmode = 0;
1766
1767 R->csrO = 0; /* reset csr Offset */
1768 if (!R->bypass_keystate)
1769 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1770
1771 if (scrollbar_isUpDn()) {
1772 R->scrollBar.setIdle ();
1773 rxvt_scrollbar_show(aR_ 0);
1774#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1775 R->refresh_type &= ~SMOOTH_REFRESH;
1776#endif
1777 } 1820 }
1778#ifdef SELECTION_SCROLLING 1821#ifdef SELECTION_SCROLLING
1779 R->pending_scroll_selection=0; 1822 pending_scroll_selection=0;
1780#endif 1823#endif
1781 if (ev->window == R->TermWin.vt) 1824 if (ev.window == TermWin.vt)
1782 { 1825 {
1783#ifdef RXVT_GRAPHICS
1784 if (ev->subwindow != None)
1785 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1786 else
1787#endif
1788 {
1789 if (reportmode) 1826 if (reportmode)
1790 { 1827 {
1791 /* mouse report from vt window */ 1828 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */ 1829 /* don't report release of wheel "buttons" */
1793 if (ev->button >= 4) 1830 if (ev.button >= 4)
1794 return; 1831 return;
1795#ifdef MOUSE_REPORT_DOUBLECLICK 1832#ifdef MOUSE_REPORT_DOUBLECLICK
1796 /* only report the release of 'slow' single clicks */ 1833 /* only report the release of 'slow' single clicks */
1797 if (R->MEvent.button != AnyButton 1834 if (MEvent.button != AnyButton
1798 && (ev->button != R->MEvent.button 1835 && (ev.button != MEvent.button
1799 || (ev->time - R->MEvent.time 1836 || (ev.time - MEvent.time
1800 > MULTICLICK_TIME / 2))) 1837 > MULTICLICK_TIME / 2)))
1801 { 1838 {
1802 R->MEvent.clicks = 0; 1839 MEvent.clicks = 0;
1803 R->MEvent.button = AnyButton; 1840 MEvent.button = AnyButton;
1804 rxvt_mouse_report(aR_ ev); 1841 mouse_report (ev);
1805 } 1842 }
1806#else /* MOUSE_REPORT_DOUBLECLICK */ 1843#else /* MOUSE_REPORT_DOUBLECLICK */
1807 R->MEvent.button = AnyButton; 1844 MEvent.button = AnyButton;
1808 rxvt_mouse_report(aR_ ev); 1845 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 1846#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 1847 return;
1811 } 1848 }
1812 /* 1849 /*
1813 * dumb hack to compensate for the failure of click-and-drag 1850 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 1851 * when overriding mouse reporting
1815 */ 1852 */
1816 if (R->PrivateModes & PrivMode_mouse_report 1853 if (PrivateModes & PrivMode_mouse_report
1817 && R->bypass_keystate 1854 && bypass_keystate
1818 && ev->button == Button1 && R->MEvent.clicks <= 1) 1855 && ev.button == Button1 && MEvent.clicks <= 1)
1819 R->selection_extend (ev->x, ev->y, 0); 1856 selection_extend (ev.x, ev.y, 0);
1820 1857
1821 switch (ev->button) { 1858 switch (ev.button)
1859 {
1822 case Button1: 1860 case Button1:
1823 case Button3: 1861 case Button3:
1824 rxvt_selection_make(aR_ ev->time); 1862 selection_make (ev.time);
1825 break; 1863 break;
1826 case Button2: 1864 case Button2:
1827 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1865 selection_request (ev.time, ev.x, ev.y);
1828 break; 1866 break;
1829#ifdef MOUSE_WHEEL 1867#ifdef MOUSE_WHEEL
1830 case Button4: 1868 case Button4:
1831 case Button5: 1869 case Button5:
1832 { 1870 {
1833 int i; 1871 int i;
1834 page_dirn v; 1872 page_dirn v;
1835 1873
1836 v = (ev->button == Button4) ? UP : DN; 1874 v = (ev.button == Button4) ? UP : DN;
1837 if (ev->state & ShiftMask) 1875 if (ev.state & ShiftMask)
1838 i = 1; 1876 i = 1;
1839 else if ((R->Options & Opt_mouseWheelScrollPage)) 1877 else if ((Options & Opt_mouseWheelScrollPage))
1840 i = R->TermWin.nrow - 1; 1878 i = TermWin.nrow - 1;
1841 else 1879 else
1842 i = 5; 1880 i = 5;
1843# ifdef MOUSE_SLIP_WHEELING 1881# ifdef MOUSE_SLIP_WHEELING
1844 if (ev->state & ControlMask) 1882 if (ev.state & ControlMask)
1845 { 1883 {
1846 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1884 mouse_slip_wheel_speed += (v ? -1 : 1);
1847 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1848 } 1886 }
1849# endif 1887# endif
1850# ifdef JUMP_MOUSE_WHEEL 1888# ifdef JUMP_MOUSE_WHEEL
1851 rxvt_scr_page(aR_ v, i); 1889 scr_page (v, i);
1852 R->scr_refresh (SMOOTH_REFRESH); 1890 scr_refresh (SMOOTH_REFRESH);
1853 rxvt_scrollbar_show(aR_ 1); 1891 scrollbar_show (1);
1854# else 1892# else
1855 while (i--) 1893 while (i--)
1856 { 1894 {
1857 rxvt_scr_page(aR_ v, 1); 1895 scr_page (v, 1);
1858 R->scr_refresh (SMOOTH_REFRESH); 1896 scr_refresh (SMOOTH_REFRESH);
1859 rxvt_scrollbar_show(aR_ 1); 1897 scrollbar_show (1);
1860 } 1898 }
1861# endif 1899# endif
1862 } 1900
1863 break; 1901 }
1902 break;
1864#endif 1903#endif
1865 } 1904
1866 }
1867 } 1905 }
1906 }
1868#ifdef MENUBAR 1907#ifdef MENUBAR
1869 else if (isMenuBarWindow(ev->window)) 1908 else if (isMenuBarWindow (ev.window))
1870 rxvt_menubar_control(aR_ ev); 1909 menubar_control (ev);
1871#endif 1910#endif
1872} 1911}
1873 1912
1874 1913
1875#ifdef TRANSPARENT 1914#ifdef TRANSPARENT
1876/* 1915/*
1877 * Check our parents are still who we think they are. 1916 * Check our parents are still who we think they are.
1878 * Do transparency updates if required 1917 * Do transparency updates if required
1879 */ 1918 */
1880/* EXTPROTO */
1881int 1919int
1882rxvt_check_our_parents(pR) 1920rxvt_term::check_our_parents ()
1883{ 1921{
1884 int i, pchanged, aformat, have_pixmap, rootdepth; 1922 int i, pchanged, aformat, have_pixmap, rootdepth;
1885 unsigned long nitems, bytes_after; 1923 unsigned long nitems, bytes_after;
1886 Atom atype; 1924 Atom atype;
1887 unsigned char *prop = NULL; 1925 unsigned char *prop = NULL;
1888 Window root, oldp, *list; 1926 Window root, oldp, *list;
1889 Pixmap rootpixmap = None; 1927 Pixmap rootpixmap = None;
1890 XWindowAttributes wattr, wrootattr; 1928 XWindowAttributes wattr, wrootattr;
1891 1929
1892 pchanged = 0; 1930 pchanged = 0;
1893 1931
1894 if (!(R->Options & Opt_transparent)) 1932 if (! (Options & Opt_transparent))
1895 return pchanged; /* Don't try any more */ 1933 return pchanged; /* Don't try any more */
1896 1934
1897 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1935 XGetWindowAttributes (display->display, display->root, &wrootattr);
1898 rootdepth = wrootattr.depth; 1936 rootdepth = wrootattr.depth;
1899 1937
1900 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1901 if (rootdepth != wattr.depth) { 1939 if (rootdepth != wattr.depth)
1940 {
1902 if (R->am_transparent) { 1941 if (am_transparent)
1942 {
1903 pchanged = 1; 1943 pchanged = 1;
1904 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1944 XSetWindowBackground (display->display, TermWin.vt,
1905 R->PixColors[Color_bg]); 1945 PixColors[Color_bg]);
1906 R->am_transparent = R->am_pixmap_trans = 0; 1946 am_transparent = am_pixmap_trans = 0;
1907 } 1947 }
1908 return pchanged; /* Don't try any more */ 1948 return pchanged; /* Don't try any more */
1909 } 1949 }
1910 1950
1911/* 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. */
1912 XSync(R->Xdisplay, False); 1952 XSync (display->display, False);
1913 1953
1914/* 1954 /*
1915 * Make the frame window set by the window manager have 1955 * Make the frame window set by the window manager have
1916 * the root background. Some window managers put multiple nested frame 1956 * the root background. Some window managers put multiple nested frame
1917 * 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.
1918 */ 1958 */
1919 i = (R->xa[XA_XROOTPMAPID] != 0 1959 i = (xa[XA_XROOTPMAPID] != 0
1920 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1921 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1922 &nitems, &bytes_after, &prop) == Success)); 1962 &nitems, &bytes_after, &prop) == Success));
1923 if (!i || prop == NULL) 1963 if (!i || prop == NULL)
1924 have_pixmap = 0; 1964 have_pixmap = 0;
1925 else { 1965 else
1966 {
1926 have_pixmap = 1; 1967 have_pixmap = 1;
1927 rootpixmap = *((Pixmap *)prop); 1968 rootpixmap = * ((Pixmap *)prop);
1928 XFree(prop); 1969 XFree (prop);
1929 } 1970 }
1930 if (have_pixmap) { 1971 if (have_pixmap)
1931/* 1972 {
1973 /*
1932 * Copy Xroot pixmap transparency 1974 * Copy display->root pixmap transparency
1933 */ 1975 */
1934 int sx, sy, nx, ny; 1976 int sx, sy, nx, ny;
1935 unsigned int nw, nh; 1977 unsigned int nw, nh;
1936 Window cr; 1978 Window cr;
1937 XImage *image; 1979 XImage *image;
1938 GC gc; 1980 GC gc;
1939 XGCValues gcvalue; 1981 XGCValues gcvalue;
1940 1982
1941 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1942 0, 0, &sx, &sy, &cr); 1984 0, 0, &sx, &sy, &cr);
1943 nw = (unsigned int)R->szHint.width; 1985 nw = (unsigned int)szHint.width;
1944 nh = (unsigned int)R->szHint.height; 1986 nh = (unsigned int)szHint.height;
1945 nx = ny = 0; 1987 nx = ny = 0;
1946 if (sx < 0) { 1988 if (sx < 0)
1989 {
1947 nw += sx; 1990 nw += sx;
1948 nx = -sx; 1991 nx = -sx;
1949 sx = 0; 1992 sx = 0;
1950 } 1993 }
1951 if (sy < 0) { 1994 if (sy < 0)
1995 {
1952 nh += sy; 1996 nh += sy;
1953 ny = -sy; 1997 ny = -sy;
1954 sy = 0; 1998 sy = 0;
1955 } 1999 }
1956 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1957 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1958 R->allowedxerror = -1; 2002 allowedxerror = -1;
1959 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1960 ZPixmap); 2004 ZPixmap);
1961 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1962 /* XXX: may need a delay here? */ 2006 /* XXX: may need a delay here? */
1963 R->allowedxerror = 0; 2007 allowedxerror = 0;
1964 if (image == NULL) { 2008 if (image == NULL)
2009 {
1965 if (R->am_transparent && R->am_pixmap_trans) { 2010 if (am_transparent && am_pixmap_trans)
1966 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 {
1967 if (R->TermWin.pixmap != None) { 2023 if (TermWin.pixmap != None)
1968 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2024 XFreePixmap (display->display, TermWin.pixmap);
1969 R->TermWin.pixmap = None; 2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1970 } 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 }
1971 } 2041 }
1972 R->am_pixmap_trans = 0;
1973 } else {
1974 if (R->TermWin.pixmap != None)
1975 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1976 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1977 (unsigned int)R->szHint.width,
1978 (unsigned int)R->szHint.height,
1979 (unsigned int)image->depth);
1980 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1981 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height);
1984 XFreeGC(R->Xdisplay, gc);
1985 XDestroyImage(image);
1986 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1987 R->TermWin.pixmap);
1988 if (!R->am_transparent || !R->am_pixmap_trans)
1989 pchanged = 1;
1990 R->am_transparent = R->am_pixmap_trans = 1;
1991 }
1992 }
1993 if (!R->am_pixmap_trans) { 2042 if (!am_pixmap_trans)
2043 {
1994 unsigned int n; 2044 unsigned int n;
1995/* 2045 /*
1996 * InheritPixmap transparency 2046 * InheritPixmap transparency
1997 */ 2047 */
1998 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1999 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2000 i++) { 2050 i++)
2051 {
2001 oldp = R->TermWin.parent[i]; 2052 oldp = TermWin.parent[i];
2002 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2053 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2003 &R->TermWin.parent[i], &list, &n); 2054 &TermWin.parent[i], &list, &n);
2004 XFree(list); 2055 XFree (list);
2005 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2006 if (R->TermWin.parent[i] == Xroot) { 2057 if (TermWin.parent[i] == display->root)
2007 if (oldp != None) 2058 {
2008 pchanged = 1; 2059 if (oldp != None)
2009 break; 2060 pchanged = 1;
2010 } 2061 break;
2062 }
2011 if (oldp != R->TermWin.parent[i]) 2063 if (oldp != TermWin.parent[i])
2012 pchanged = 1; 2064 pchanged = 1;
2013 } 2065 }
2014 n = 0; 2066 n = 0;
2015 if (pchanged) { 2067 if (pchanged)
2068 {
2016 for (; n < (unsigned int)i; n++) { 2069 for (; n < (unsigned int)i; n++)
2070 {
2017 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2018 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"));
2019 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2073 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2074 {
2020 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2021 break; 2076 break;
2022 } 2077 }
2023 } 2078 }
2024 } 2079 }
2025 if (n > (int)(sizeof(R->TermWin.parent) 2080 if (n > (int) (sizeof (TermWin.parent)
2026 / sizeof(R->TermWin.parent[0]))) { 2081 / sizeof (TermWin.parent[0])))
2082 {
2027 D_X((stderr, "InheritPixmap Turning off")); 2083 D_X ((stderr, "InheritPixmap Turning off"));
2028 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2084 XSetWindowBackground (display->display, TermWin.parent[0],
2029 R->PixColors[Color_fg]); 2085 PixColors[Color_fg]);
2030 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2086 XSetWindowBackground (display->display, TermWin.vt,
2031 R->PixColors[Color_bg]); 2087 PixColors[Color_bg]);
2032 R->am_transparent = 0; 2088 am_transparent = 0;
2033 /* XXX: also turn off Opt_transparent? */ 2089 /* XXX: also turn off Opt_transparent? */
2034 } else { 2090 }
2091 else
2092 {
2035 /* wait (an arbitrary period) for the WM to do its thing 2093 /* wait (an arbitrary period) for the WM to do its thing
2036 * needed for fvwm2.2.2 (and before?) */ 2094 * needed for fvwm2.2.2 (and before?) */
2037# ifdef HAVE_NANOSLEEP 2095# ifdef HAVE_NANOSLEEP
2038 struct timespec rqt; 2096 struct timespec rqt;
2039 2097
2040 rqt.tv_sec = 1; 2098 rqt.tv_sec = 1;
2041 rqt.tv_nsec = 0; 2099 rqt.tv_nsec = 0;
2042 nanosleep(&rqt, NULL); 2100 nanosleep (&rqt, NULL);
2043# else 2101# else
2044 sleep(1); 2102 sleep (1);
2045# endif 2103# endif
2046 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2047 for (n = 0; n < (unsigned int)i; n++) 2105 for (n = 0; n < (unsigned int)i; n++)
2048 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2049 ParentRelative); 2107 ParentRelative);
2050 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2051 ParentRelative); 2109 ParentRelative);
2052 R->am_transparent = 1; 2110 am_transparent = 1;
2053 } 2111 }
2054 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2055 R->TermWin.parent[i] = None; 2113 TermWin.parent[i] = None;
2056 } 2114 }
2057 return pchanged; 2115 return pchanged;
2058} 2116}
2059#endif 2117#endif
2060 2118
2061/*}}} */ 2119/*}}} */
2062 2120
2063/*{{{ print pipe */ 2121/*{{{ print pipe */
2064/*----------------------------------------------------------------------*/ 2122/*----------------------------------------------------------------------*/
2065#ifdef PRINTPIPE 2123#ifdef PRINTPIPE
2066/* EXTPROTO */ 2124FILE *
2067FILE *
2068rxvt_popen_printer(pR) 2125rxvt_term::popen_printer ()
2069{ 2126{
2070 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2127 FILE *stream = popen (rs[Rs_print_pipe], "w");
2071 2128
2072 if (stream == NULL) 2129 if (stream == NULL)
2073 rxvt_print_error("can't open printer pipe"); 2130 rxvt_print_error ("can't open printer pipe");
2074 return stream; 2131 return stream;
2075} 2132}
2076 2133
2077/* EXTPROTO */
2078int 2134int
2079rxvt_pclose_printer (FILE *stream) 2135rxvt_term::pclose_printer (FILE *stream)
2080{ 2136{
2081 fflush (stream); 2137 fflush (stream);
2082/* pclose() reported not to work on SunOS 4.1.3 */ 2138 /* pclose () reported not to work on SunOS 4.1.3 */
2083# if defined (__sun__) /* TODO: RESOLVE THIS */ 2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2084/* pclose works provided SIGCHLD handler uses waitpid */ 2140 /* pclose works provided SIGCHLD handler uses waitpid */
2085 return pclose (stream); /* return fclose (stream); */ 2141 return pclose (stream); /* return fclose (stream); */
2086# else 2142# else
2087 return pclose (stream); 2143 return pclose (stream);
2088# endif 2144# endif
2089} 2145}
2090 2146
2091/* 2147/*
2092 * simulate attached vt100 printer 2148 * simulate attached vt100 printer
2093 */ 2149 */
2094/* INTPROTO */
2095void 2150void
2096rxvt_process_print_pipe(pR) 2151rxvt_term::process_print_pipe ()
2097{ 2152{
2098 int done; 2153 int done;
2099 FILE *fd; 2154 FILE *fd;
2100 2155
2101 if ((fd = rxvt_popen_printer(aR)) == NULL) 2156 if ((fd = popen_printer ()) == NULL)
2102 return; 2157 return;
2103 2158
2104/* 2159 /*
2105 * 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
2106 * is received. 2161 * is received.
2107 */ 2162 */
2108 for (done = 0; !done;) { 2163 for (done = 0; !done;)
2164 {
2109 unsigned char buf[8]; 2165 unsigned char buf[8];
2110 unsigned char ch; 2166 unsigned char ch;
2111 unsigned int i, len; 2167 unsigned int i, len;
2112 2168
2113 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2169 if ((ch = cmd_getc ()) != C0_ESC)
2170 {
2114 if (putc(ch, fd) == EOF) 2171 if (putc (ch, fd) == EOF)
2115 break; /* done = 1 */ 2172 break; /* done = 1 */
2116 } else { 2173 }
2174 else
2175 {
2117 len = 0; 2176 len = 0;
2118 buf[len++] = ch; 2177 buf[len++] = ch;
2119 2178
2120 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2179 if ((buf[len++] = cmd_getc ()) == '[')
2121 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2180 {
2122 buf[len++] = '?'; 2181 if ((ch = cmd_getc ()) == '?')
2123 ch = rxvt_cmd_getc(aR); 2182 {
2124 } 2183 buf[len++] = '?';
2184 ch = cmd_getc ();
2185 }
2125 if ((buf[len++] = ch) == '4') { 2186 if ((buf[len++] = ch) == '4')
2187 {
2126 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2188 if ((buf[len++] = cmd_getc ()) == 'i')
2127 break; /* done = 1 */ 2189 break; /* done = 1 */
2128 } 2190 }
2191 }
2192 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF)
2194 {
2195 done = 1;
2196 break;
2197 }
2198 }
2129 } 2199 }
2130 for (i = 0; i < len; i++)
2131 if (putc(buf[i], fd) == EOF) {
2132 done = 1;
2133 break;
2134 }
2135 }
2136 }
2137 rxvt_pclose_printer(fd); 2200 pclose_printer (fd);
2138} 2201}
2139#endif /* PRINTPIPE */ 2202#endif /* PRINTPIPE */
2140/*}}} */ 2203/*}}} */
2141 2204
2142/* *INDENT-OFF* */ 2205/* *INDENT-OFF* */
2143enum { 2206enum {
2144 C1_40 = 0x40, 2207 C1_40 = 0x40,
2145 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,
2146 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,
2147 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,
2148 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
2149}; 2212};
2150/* *INDENT-ON* */ 2213/* *INDENT-ON* */
2151 2214
2152/*{{{ process non-printing single characters */ 2215/*{{{ process non-printing single characters */
2153/* INTPROTO */
2154void 2216void
2155rxvt_process_nonprinting(pR_ unsigned char ch) 2217rxvt_term::process_nonprinting (unsigned char ch)
2156{ 2218{
2157 switch (ch) { 2219 switch (ch)
2220 {
2158 case C0_ENQ: /* terminal Status */ 2221 case C0_ENQ: /* terminal Status */
2159 if (R->rs[Rs_answerbackstring]) 2222 if (rs[Rs_answerbackstring])
2160 R->tt_write( 2223 tt_write (
2161 (const unsigned char *)R->rs[Rs_answerbackstring], 2224 (const unsigned char *)rs[Rs_answerbackstring],
2162 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2225 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2163 else 2226 else
2164 R->tt_write((unsigned char *)VT100_ANS, 2227 tt_write ((unsigned char *)VT100_ANS,
2165 (unsigned int)STRLEN(VT100_ANS)); 2228 (unsigned int)STRLEN (VT100_ANS));
2166 break; 2229 break;
2167 case C0_BEL: /* bell */ 2230 case C0_BEL: /* bell */
2168 rxvt_scr_bell(aR); 2231 scr_bell ();
2169 break; 2232 break;
2170 case C0_BS: /* backspace */ 2233 case C0_BS: /* backspace */
2171 rxvt_scr_backspace(aR); 2234 scr_backspace ();
2172 break; 2235 break;
2173 case C0_HT: /* tab */ 2236 case C0_HT: /* tab */
2174 rxvt_scr_tab(aR_ 1); 2237 scr_tab (1);
2175 break; 2238 break;
2176 case C0_CR: /* carriage return */ 2239 case C0_CR: /* carriage return */
2177 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2240 scr_gotorc (0, 0, R_RELATIVE);
2178 break; 2241 break;
2179 case C0_VT: /* vertical tab, form feed */ 2242 case C0_VT: /* vertical tab, form feed */
2180 case C0_FF: 2243 case C0_FF:
2181 case C0_LF: /* line feed */ 2244 case C0_LF: /* line feed */
2182 rxvt_scr_index(aR_ UP); 2245 scr_index (UP);
2183 break; 2246 break;
2184 case C0_SO: /* shift out - acs */ 2247 case C0_SO: /* shift out - acs */
2185 rxvt_scr_charset_choose(aR_ 1); 2248 scr_charset_choose (1);
2186 break; 2249 break;
2187 case C0_SI: /* shift in - acs */ 2250 case C0_SI: /* shift in - acs */
2188 rxvt_scr_charset_choose(aR_ 0); 2251 scr_charset_choose (0);
2189 break; 2252 break;
2190 } 2253 }
2191} 2254}
2192/*}}} */ 2255/*}}} */
2193 2256
2194 2257
2195/*{{{ process VT52 escape sequences */ 2258/*{{{ process VT52 escape sequences */
2196/* INTPROTO */
2197void 2259void
2198rxvt_process_escape_vt52(pR_ unsigned char ch) 2260rxvt_term::process_escape_vt52 (unsigned char ch)
2199{ 2261{
2200 int row, col; 2262 int row, col;
2263
2264 switch (ch)
2201 2265 {
2202 switch (ch) {
2203 case 'A': /* cursor up */ 2266 case 'A': /* cursor up */
2204 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2267 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2205 break; 2268 break;
2206 case 'B': /* cursor down */ 2269 case 'B': /* cursor down */
2207 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2270 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2208 break; 2271 break;
2209 case 'C': /* cursor right */ 2272 case 'C': /* cursor right */
2210 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2273 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2211 break; 2274 break;
2212 case 'D': /* cursor left */ 2275 case 'D': /* cursor left */
2213 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2276 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2214 break; 2277 break;
2215 case 'H': /* cursor home */ 2278 case 'H': /* cursor home */
2216 rxvt_scr_gotorc(aR_ 0, 0, 0); 2279 scr_gotorc (0, 0, 0);
2217 break; 2280 break;
2218 case 'I': /* cursor up and scroll down if needed */ 2281 case 'I': /* cursor up and scroll down if needed */
2219 rxvt_scr_index(aR_ DN); 2282 scr_index (DN);
2220 break; 2283 break;
2221 case 'J': /* erase to end of screen */ 2284 case 'J': /* erase to end of screen */
2222 R->scr_erase_screen (0); 2285 scr_erase_screen (0);
2223 break; 2286 break;
2224 case 'K': /* erase to end of line */ 2287 case 'K': /* erase to end of line */
2225 rxvt_scr_erase_line(aR_ 0); 2288 scr_erase_line (0);
2226 break; 2289 break;
2227 case 'Y': /* move to specified row and col */ 2290 case 'Y': /* move to specified row and col */
2228 /* full command is 'ESC Y row col' where row and col 2291 /* full command is 'ESC Y row col' where row and col
2229 * are encoded by adding 32 and sending the ascii 2292 * are encoded by adding 32 and sending the ascii
2230 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2293 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2231 * etc. */ 2294 * etc. */
2232 row = rxvt_cmd_getc(aR) - ' '; 2295 row = cmd_getc () - ' ';
2233 col = rxvt_cmd_getc(aR) - ' '; 2296 col = cmd_getc () - ' ';
2234 rxvt_scr_gotorc(aR_ row, col, 0); 2297 scr_gotorc (row, col, 0);
2235 break; 2298 break;
2236 case 'Z': /* identify the terminal type */ 2299 case 'Z': /* identify the terminal type */
2237 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2300 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2238 break; 2301 break;
2239 case '<': /* turn off VT52 mode */ 2302 case '<': /* turn off VT52 mode */
2240 PrivMode(0, PrivMode_vt52); 2303 PrivMode (0, PrivMode_vt52);
2241 break; 2304 break;
2242 case 'F': /* use special graphics character set */ 2305 case 'F': /* use special graphics character set */
2243 case 'G': /* use regular character set */ 2306 case 'G': /* use regular character set */
2244 /* unimplemented */ 2307 /* unimplemented */
2245 break; 2308 break;
2246 case '=': /* use alternate keypad mode */ 2309 case '=': /* use alternate keypad mode */
2247 case '>': /* use regular keypad mode */ 2310 case '>': /* use regular keypad mode */
2248 /* unimplemented */ 2311 /* unimplemented */
2249 break; 2312 break;
2250 } 2313 }
2251} 2314}
2252/*}}} */ 2315/*}}} */
2253 2316
2254 2317
2255/*{{{ process escape sequences */ 2318/*{{{ process escape sequences */
2256/* INTPROTO */
2257void 2319void
2258rxvt_process_escape_seq(pR) 2320rxvt_term::process_escape_seq ()
2259{ 2321{
2260 unsigned char ch = rxvt_cmd_getc(aR); 2322 unsigned char ch = cmd_getc ();
2261 2323
2262 if (R->PrivateModes & PrivMode_vt52) { 2324 if (PrivateModes & PrivMode_vt52)
2263 rxvt_process_escape_vt52(aR_ ch);
2264 return;
2265 }
2266 2325 {
2326 process_escape_vt52 (ch);
2327 return;
2328 }
2329
2267 switch (ch) { 2330 switch (ch)
2331 {
2268 /* case 1: do_tek_mode (); break; */ 2332 /* case 1: do_tek_mode (); break; */
2269 case '#': 2333 case '#':
2270 if (rxvt_cmd_getc(aR) == '8') 2334 if (cmd_getc () == '8')
2271 rxvt_scr_E(aR); 2335 scr_E ();
2272 break; 2336 break;
2273 case '(': 2337 case '(':
2274 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2338 scr_charset_set (0, (unsigned int)cmd_getc ());
2275 break; 2339 break;
2276 case ')': 2340 case ')':
2277 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2341 scr_charset_set (1, (unsigned int)cmd_getc ());
2278 break; 2342 break;
2279 case '*': 2343 case '*':
2280 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2344 scr_charset_set (2, (unsigned int)cmd_getc ());
2281 break; 2345 break;
2282 case '+': 2346 case '+':
2283 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2347 scr_charset_set (3, (unsigned int)cmd_getc ());
2284 break; 2348 break;
2285#ifdef MULTICHAR_SET 2349#ifdef MULTICHAR_SET
2286 case '$': 2350 case '$':
2287 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2288 break; 2352 break;
2289#endif 2353#endif
2290#ifndef NO_FRILLS 2354#ifndef NO_FRILLS
2291 case '6': 2355 case '6':
2292 rxvt_scr_backindex(aR); 2356 scr_backindex ();
2293 break; 2357 break;
2294#endif 2358#endif
2295 case '7': 2359 case '7':
2296 rxvt_scr_cursor(aR_ SAVE); 2360 scr_cursor (SAVE);
2297 break; 2361 break;
2298 case '8': 2362 case '8':
2299 rxvt_scr_cursor(aR_ RESTORE); 2363 scr_cursor (RESTORE);
2300 break; 2364 break;
2301#ifndef NO_FRILLS 2365#ifndef NO_FRILLS
2302 case '9': 2366 case '9':
2303 rxvt_scr_forwardindex(aR); 2367 scr_forwardindex ();
2304 break; 2368 break;
2305#endif 2369#endif
2306 case '=': 2370 case '=':
2307 case '>': 2371 case '>':
2308 PrivMode((ch == '='), PrivMode_aplKP); 2372 PrivMode ((ch == '='), PrivMode_aplKP);
2309 break; 2373 break;
2310 2374
2311 case C1_40: 2375 case C1_40:
2312 rxvt_cmd_getc(aR); 2376 cmd_getc ();
2313 break; 2377 break;
2314 case C1_44: 2378 case C1_44:
2315 rxvt_scr_index(aR_ UP); 2379 scr_index (UP);
2316 break; 2380 break;
2317 2381
2318 /* 8.3.87: NEXT LINE */ 2382 /* 8.3.87: NEXT LINE */
2319 case C1_NEL: /* ESC E */ 2383 case C1_NEL: /* ESC E */
2320 { 2384 {
2321 uint32_t nlcr[] = { '\n', '\r' }; 2385 uint32_t nlcr[] = { '\n', '\r' };
2322 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2386 scr_add_lines (nlcr, 1, 2);
2323 } 2387 }
2324 break; 2388 break;
2325 2389
2326 /* kidnapped escape sequence: Should be 8.3.48 */ 2390 /* kidnapped escape sequence: Should be 8.3.48 */
2327 case C1_ESA: /* ESC G */ 2391 case C1_ESA: /* ESC G */
2328 rxvt_process_graphics(aR); 2392 process_graphics ();
2329 break; 2393 break;
2330 2394
2331 /* 8.3.63: CHARACTER TABULATION SET */ 2395 /* 8.3.63: CHARACTER TABULATION SET */
2332 case C1_HTS: /* ESC H */ 2396 case C1_HTS: /* ESC H */
2333 rxvt_scr_set_tab(aR_ 1); 2397 scr_set_tab (1);
2334 break; 2398 break;
2335 2399
2336 /* 8.3.105: REVERSE LINE FEED */ 2400 /* 8.3.105: REVERSE LINE FEED */
2337 case C1_RI: /* ESC M */ 2401 case C1_RI: /* ESC M */
2338 rxvt_scr_index(aR_ DN); 2402 scr_index (DN);
2339 break; 2403 break;
2340 2404
2341 /* 8.3.142: SINGLE-SHIFT TWO */ 2405 /* 8.3.142: SINGLE-SHIFT TWO */
2342 /*case C1_SS2: scr_single_shift (2); break; */ 2406 /*case C1_SS2: scr_single_shift (2); break; */
2343 2407
2344 /* 8.3.143: SINGLE-SHIFT THREE */ 2408 /* 8.3.143: SINGLE-SHIFT THREE */
2345 /*case C1_SS3: scr_single_shift (3); break; */ 2409 /*case C1_SS3: scr_single_shift (3); break; */
2346 2410
2347 /* 8.3.27: DEVICE CONTROL STRING */ 2411 /* 8.3.27: DEVICE CONTROL STRING */
2348 case C1_DCS: /* ESC P */ 2412 case C1_DCS: /* ESC P */
2349 rxvt_process_dcs_seq(aR); 2413 process_dcs_seq ();
2350 break; 2414 break;
2351 2415
2352 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2416 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2353 case C1_SCI: /* ESC Z */ 2417 case C1_SCI: /* ESC Z */
2354 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2418 tt_write ((const unsigned char *)ESCZ_ANSWER,
2355 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2419 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2356 break; /* steal obsolete ESC [ c */ 2420 break; /* steal obsolete ESC [ c */
2357 2421
2358 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2422 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2359 case C1_CSI: /* ESC [ */ 2423 case C1_CSI: /* ESC [ */
2360 rxvt_process_csi_seq(aR); 2424 process_csi_seq ();
2361 break; 2425 break;
2362 2426
2363 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2427 /* 8.3.90: OPERATING SYSTEM COMMAND */
2364 case C1_OSC: /* ESC ] */ 2428 case C1_OSC: /* ESC ] */
2365 rxvt_process_osc_seq(aR); 2429 process_osc_seq ();
2366 break; 2430 break;
2367 2431
2368 /* 8.3.106: RESET TO INITIAL STATE */ 2432 /* 8.3.106: RESET TO INITIAL STATE */
2369 case 'c': 2433 case 'c':
2370 rxvt_scr_poweron(aR); 2434 scr_poweron ();
2371 rxvt_scrollbar_show(aR_ 1); 2435 scrollbar_show (1);
2372 break; 2436 break;
2373 2437
2374 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2375 case 'n': 2439 case 'n':
2376 rxvt_scr_charset_choose(aR_ 2); 2440 scr_charset_choose (2);
2377 break; 2441 break;
2378 2442
2379 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2443 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2380 case 'o': 2444 case 'o':
2381 rxvt_scr_charset_choose(aR_ 3); 2445 scr_charset_choose (3);
2382 break; 2446 break;
2383 } 2447 }
2384} 2448}
2385/*}}} */ 2449/*}}} */
2386 2450
2387/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2388/* *INDENT-OFF* */ 2452/* *INDENT-OFF* */
2389enum { 2453enum {
2390 CSI_ICH = 0x40, 2454 CSI_ICH = 0x40,
2391 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,
2392 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 ,
2393 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,
2394 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,
2395 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,
2396 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,
2397 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 ,
2398 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
2399}; 2463};
2400 2464
2401#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2465#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2402 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2466 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2403 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2467 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2404#define get_byte_array_bit(array, bit) \ 2468#define get_byte_array_bit(array, bit) \
2405 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2469 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2406 2470
2407const unsigned char csi_defaults[] = { 2471const unsigned char csi_defaults[] =
2472 {
2408 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, */
2409 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, */
2410 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, */
2411 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, [, \, ], ^, _, */
2412 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, */
2413 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, */
2414 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, */
2415 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, {, |, }, ~, */
2416}; 2481 };
2417/* *INDENT-ON* */ 2482/* *INDENT-ON* */
2418 2483
2419/* INTPROTO */
2420void 2484void
2421rxvt_process_csi_seq(pR) 2485rxvt_term::process_csi_seq ()
2422{ 2486{
2423 unsigned char ch, priv, i; 2487 unsigned char ch, priv, i;
2424 unsigned int nargs, p; 2488 unsigned int nargs, p;
2425 int n, ndef; 2489 int n, ndef;
2426 int arg[ESC_ARGS]; 2490 int arg[ESC_ARGS];
2427 2491
2428 for (nargs = ESC_ARGS; nargs > 0;) 2492 for (nargs = ESC_ARGS; nargs > 0;)
2429 arg[--nargs] = 0; 2493 arg[--nargs] = 0;
2430 2494
2431 priv = 0; 2495 priv = 0;
2496 ch = cmd_getc ();
2497 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */
2499 priv = ch;
2432 ch = rxvt_cmd_getc(aR); 2500 ch = cmd_getc ();
2433 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2434 priv = ch;
2435 ch = rxvt_cmd_getc(aR);
2436 } 2501 }
2437/* read any numerical arguments */ 2502 /* read any numerical arguments */
2438 for (n = -1; ch < CSI_ICH; ) { 2503 for (n = -1; ch < CSI_ICH; )
2504 {
2439 if (isdigit(ch)) { 2505 if (isdigit (ch))
2506 {
2440 if (n < 0) 2507 if (n < 0)
2441 n = ch - '0'; 2508 n = ch - '0';
2442 else 2509 else
2443 n = n * 10 + ch - '0'; 2510 n = n * 10 + ch - '0';
2511 }
2444 } else if (ch == ';') { 2512 else if (ch == ';')
2513 {
2445 if (nargs < ESC_ARGS) 2514 if (nargs < ESC_ARGS)
2446 arg[nargs++] = n; 2515 arg[nargs++] = n;
2447 n = -1; 2516 n = -1;
2517 }
2448 } else if (ch == '\b') { 2518 else if (ch == '\b')
2449 rxvt_scr_backspace(aR); 2519 {
2520 scr_backspace ();
2521 }
2450 } else if (ch == C0_ESC) { 2522 else if (ch == C0_ESC)
2451 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)
2452 return; 2535 return;
2453 } else if (ch < ' ') {
2454 rxvt_process_nonprinting(aR_ ch);
2455 }
2456 ch = rxvt_cmd_getc(aR);
2457 }
2458 2536
2459 if (ch > CSI_7F)
2460 return;
2461
2462 if (nargs < ESC_ARGS) 2537 if (nargs < ESC_ARGS)
2463 arg[nargs++] = n; 2538 arg[nargs++] = n;
2464 2539
2465 i = ch - CSI_ICH; 2540 i = ch - CSI_ICH;
2466 ndef = get_byte_array_bit(csi_defaults, i); 2541 ndef = get_byte_array_bit (csi_defaults, i);
2467 for (p = 0; p < nargs; p++) 2542 for (p = 0; p < nargs; p++)
2468 if (arg[p] == -1) 2543 if (arg[p] == -1)
2469 arg[p] = ndef; 2544 arg[p] = ndef;
2470 2545
2471#ifdef DEBUG_CMD 2546#ifdef DEBUG_CMD
2472 fprintf(stderr, "CSI "); 2547 fprintf (stderr, "CSI ");
2473 for (p = 0; p < nargs; p++) 2548 for (p = 0; p < nargs; p++)
2474 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2549 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2475 fprintf(stderr, "%c\n", ch); 2550 fprintf (stderr, "%c\n", ch);
2476#endif 2551#endif
2477 2552
2478/* 2553 /*
2479 * private mode handling 2554 * private mode handling
2480 */ 2555 */
2481 if (priv) { 2556 if (priv)
2482 switch (priv) { 2557 {
2483 case '>': 2558 switch (priv)
2559 {
2560 case '>':
2484 if (ch == CSI_DA) /* secondary device attributes */ 2561 if (ch == CSI_DA) /* secondary device attributes */
2485 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2562 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2486 break; 2563 break;
2487 case '?': 2564 case '?':
2488 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2565 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2489 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2566 process_terminal_mode (ch, priv, nargs, arg);
2490 break; 2567 break;
2491 } 2568 }
2492 return; 2569 return;
2493 } 2570 }
2494 2571
2495 switch (ch) { 2572 switch (ch)
2496/* 2573 {
2574 /*
2497 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2575 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2498 */ 2576 */
2499#ifdef PRINTPIPE 2577#ifdef PRINTPIPE
2500 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2578 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2501 switch (arg[0]) { 2579 switch (arg[0])
2580 {
2502 case 0: /* initiate transfer to primary aux device */ 2581 case 0: /* initiate transfer to primary aux device */
2503 rxvt_scr_printscreen(aR_ 0); 2582 scr_printscreen (0);
2504 break; 2583 break;
2505 case 5: /* start relay to primary aux device */ 2584 case 5: /* start relay to primary aux device */
2506 rxvt_process_print_pipe(aR); 2585 process_print_pipe ();
2586 break;
2587 }
2507 break; 2588 break;
2508 }
2509 break;
2510#endif 2589#endif
2511 2590
2512 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2591 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2513 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2592 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2514 arg[0] = -arg[0]; 2593 arg[0] = -arg[0];
2515 /* FALLTHROUGH */ 2594 /* FALLTHROUGH */
2516 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2595 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2517 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2596 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2518 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2597 scr_gotorc (arg[0], 0, RELATIVE);
2519 break; 2598 break;
2520 2599
2521 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2600 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2522 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2601 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2523#ifdef ISO6429 2602#ifdef ISO6429
2524 arg[0] = -arg[0]; 2603 arg[0] = -arg[0];
2525#else /* emulate common DEC VTs */ 2604#else /* emulate common DEC VTs */
2526 arg[0] = arg[0] ? -arg[0] : -1; 2605 arg[0] = arg[0] ? -arg[0] : -1;
2527#endif 2606#endif
2528 /* FALLTHROUGH */ 2607 /* FALLTHROUGH */
2529 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2608 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2530 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2609 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2531#ifdef ISO6429 2610#ifdef ISO6429
2532 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2611 scr_gotorc (0, arg[0], RELATIVE);
2533#else /* emulate common DEC VTs */ 2612#else /* emulate common DEC VTs */
2534 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2613 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2535#endif 2614#endif
2536 break; 2615 break;
2537 2616
2538 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2617 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2539 arg[0] = -arg[0]; 2618 arg[0] = -arg[0];
2540 /* FALLTHROUGH */ 2619 /* FALLTHROUGH */
2541 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2620 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2542 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2621 scr_gotorc (arg[0], 0, R_RELATIVE);
2543 break; 2622 break;
2544 2623
2545 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2624 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2546 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2625 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2547 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2626 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2548 break; 2627 break;
2549 2628
2550 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2629 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2551 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2630 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2552 break; 2631 break;
2553 2632
2554 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2633 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2555 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 */
2556 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);
2557 break; 2636 break;
2558 2637
2559 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2638 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2560 arg[0] = -arg[0]; 2639 arg[0] = -arg[0];
2561 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2562 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2641 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2563 rxvt_scr_tab(aR_ arg[0]); 2642 scr_tab (arg[0]);
2564 break; 2643 break;
2565 2644
2566 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2645 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2567 R->scr_erase_screen (arg[0]); 2646 scr_erase_screen (arg[0]);
2568 break; 2647 break;
2569 2648
2570 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2649 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2571 rxvt_scr_erase_line(aR_ arg[0]); 2650 scr_erase_line (arg[0]);
2572 break; 2651 break;
2573 2652
2574 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2653 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2575 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2654 scr_insdel_chars (arg[0], INSERT);
2576 break; 2655 break;
2577 2656
2578 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2657 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2579 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2658 scr_insdel_lines (arg[0], INSERT);
2580 break; 2659 break;
2581 2660
2582 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2661 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2583 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2662 scr_insdel_lines (arg[0], DELETE);
2584 break; 2663 break;
2585 2664
2586 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2665 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2587 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2666 scr_insdel_chars (arg[0], ERASE);
2588 break; 2667 break;
2589 2668
2590 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2669 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2591 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2670 scr_insdel_chars (arg[0], DELETE);
2592 break; 2671 break;
2593 2672
2594 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2673 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2595 arg[0] = -arg[0]; 2674 arg[0] = -arg[0];
2596 /* FALLTHROUGH */ 2675 /* FALLTHROUGH */
2597 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2676 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2598 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2599 break; 2678 break;
2600 2679
2601 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2602 R->tt_write((const unsigned char *)VT100_ANS, 2681 tt_write ((const unsigned char *)VT100_ANS,
2603 (unsigned int)(sizeof(VT100_ANS) - 1)); 2682 (unsigned int) (sizeof (VT100_ANS) - 1));
2604 break; 2683 break;
2605 2684
2606 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2607 rxvt_process_sgr_mode(aR_ nargs, arg); 2686 process_sgr_mode (nargs, arg);
2608 break; 2687 break;
2609 2688
2610 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2689 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2611 switch (arg[0]) { 2690 switch (arg[0])
2691 {
2612 case 5: /* DSR requested */ 2692 case 5: /* DSR requested */
2613 R->tt_printf("\033[0n"); 2693 tt_printf ("\033[0n");
2614 break; 2694 break;
2615 case 6: /* CPR requested */ 2695 case 6: /* CPR requested */
2616 rxvt_scr_report_position(aR); 2696 scr_report_position ();
2617 break; 2697 break;
2618#if defined (ENABLE_DISPLAY_ANSWER) 2698#if defined (ENABLE_DISPLAY_ANSWER)
2619 case 7: /* unofficial extension */ 2699 case 7: /* unofficial extension */
2620 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2700 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2621 break; 2701 break;
2622#endif 2702#endif
2623 case 8: /* unofficial extension */ 2703 case 8: /* unofficial extension */
2624 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2705 break;
2706 }
2625 break; 2707 break;
2626 }
2627 break;
2628 2708
2629 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2630 switch (arg[0]) { 2710 switch (arg[0])
2711 {
2631 case 0: /* char tab stop cleared at active position */ 2712 case 0: /* char tab stop cleared at active position */
2632 rxvt_scr_set_tab(aR_ 0); 2713 scr_set_tab (0);
2633 break; 2714 break;
2634 /* case 1: */ /* line tab stop cleared in active line */ 2715 /* case 1: */ /* line tab stop cleared in active line */
2635 /* case 2: */ /* char tab stops cleared in active line */ 2716 /* case 2: */ /* char tab stops cleared in active line */
2636 case 3: /* all char tab stops are cleared */ 2717 case 3: /* all char tab stops are cleared */
2637 /* case 4: */ /* all line tab stops are cleared */ 2718 /* case 4: */ /* all line tab stops are cleared */
2638 case 5: /* all tab stops are cleared */ 2719 case 5: /* all tab stops are cleared */
2639 rxvt_scr_set_tab(aR_ -1); 2720 scr_set_tab (-1);
2721 break;
2722 }
2640 break; 2723 break;
2641 }
2642 break;
2643 2724
2644 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2725 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2645 switch (arg[0]) { 2726 switch (arg[0])
2727 {
2646 case 0: /* char tab stop set at active position */ 2728 case 0: /* char tab stop set at active position */
2647 rxvt_scr_set_tab(aR_ 1); 2729 scr_set_tab (1);
2648 break; /* = ESC H */ 2730 break; /* = ESC H */
2649 /* case 1: */ /* line tab stop set at active line */ 2731 /* case 1: */ /* line tab stop set at active line */
2650 case 2: /* char tab stop cleared at active position */ 2732 case 2: /* char tab stop cleared at active position */
2651 rxvt_scr_set_tab(aR_ 0); 2733 scr_set_tab (0);
2652 break; /* = ESC [ 0 g */ 2734 break; /* = ESC [ 0 g */
2653 /* case 3: */ /* line tab stop cleared at active line */ 2735 /* case 3: */ /* line tab stop cleared at active line */
2654 /* case 4: */ /* char tab stops cleared at active line */ 2736 /* case 4: */ /* char tab stops cleared at active line */
2655 case 5: /* all char tab stops are cleared */ 2737 case 5: /* all char tab stops are cleared */
2656 rxvt_scr_set_tab(aR_ -1); 2738 scr_set_tab (-1);
2657 break; /* = ESC [ 3 g */ 2739 break; /* = ESC [ 3 g */
2658 /* case 6: */ /* all line tab stops are cleared */ 2740 /* case 6: */ /* all line tab stops are cleared */
2659 } 2741 }
2660 break; 2742 break;
2661 2743
2662 case CSI_RM: /* 8.3.107: RESET MODE */ 2744 case CSI_RM: /* 8.3.107: RESET MODE */
2663 if (arg[0] == 4) 2745 if (arg[0] == 4)
2664 rxvt_scr_insert_mode(aR_ 0); 2746 scr_insert_mode (0);
2665 break; 2747 break;
2666 2748
2667 case CSI_SM: /* 8.3.126: SET MODE */ 2749 case CSI_SM: /* 8.3.126: SET MODE */
2668 if (arg[0] == 4) 2750 if (arg[0] == 4)
2669 rxvt_scr_insert_mode(aR_ 1); 2751 scr_insert_mode (1);
2670 break; 2752 break;
2671 2753
2672/* 2754 /*
2673 * PRIVATE USE beyond this point. All CSI_7? sequences here 2755 * PRIVATE USE beyond this point. All CSI_7? sequences here
2674 */ 2756 */
2675 case CSI_72: /* DECSTBM: set top and bottom margins */ 2757 case CSI_72: /* DECSTBM: set top and bottom margins */
2676 if (nargs == 1) 2758 if (nargs == 1)
2677 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2759 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2678 else if (nargs == 0 || arg[0] >= arg[1]) 2760 else if (nargs == 0 || arg[0] >= arg[1])
2679 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2761 scr_scroll_region (0, MAX_ROWS - 1);
2680 else 2762 else
2681 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2763 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2682 break; 2764 break;
2683 2765
2684 case CSI_73: 2766 case CSI_73:
2685 rxvt_scr_cursor(aR_ SAVE); 2767 scr_cursor (SAVE);
2686 break; 2768 break;
2687 case CSI_75: 2769 case CSI_75:
2688 rxvt_scr_cursor(aR_ RESTORE); 2770 scr_cursor (RESTORE);
2689 break; 2771 break;
2690 2772
2691#ifndef NO_FRILLS 2773#ifndef NO_FRILLS
2692 case CSI_74: 2774 case CSI_74:
2693 rxvt_process_window_ops(aR_ arg, nargs); 2775 process_window_ops (arg, nargs);
2694 break; 2776 break;
2695#endif 2777#endif
2696 2778
2697 case CSI_78: /* DECREQTPARM */ 2779 case CSI_78: /* DECREQTPARM */
2698 if (arg[0] == 0 || arg[0] == 1) 2780 if (arg[0] == 0 || arg[0] == 1)
2699 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);
2700 /* FALLTHROUGH */ 2782 /* FALLTHROUGH */
2701 2783
2702 default: 2784 default:
2703 break; 2785 break;
2704 } 2786 }
2705} 2787}
2706/*}}} */ 2788/*}}} */
2707 2789
2708#ifndef NO_FRILLS 2790#ifndef NO_FRILLS
2709/* ARGSUSED */ 2791/* ARGSUSED */
2710/* INTPROTO */
2711void 2792void
2712rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2793rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2713{ 2794{
2714 int x, y; 2795 int x, y;
2715#if 0 2796#if 0
2716 char *s; 2797 char *s;
2717#endif 2798#endif
2718 XWindowAttributes wattr; 2799 XWindowAttributes wattr;
2719 Window wdummy; 2800 Window wdummy;
2720 2801
2721 if (nargs == 0) 2802 if (nargs == 0)
2722 return; 2803 return;
2723 switch (args[0]) { 2804 switch (args[0])
2805 {
2724 /* 2806 /*
2725 * commands 2807 * commands
2726 */ 2808 */
2727 case 1: /* deiconify window */ 2809 case 1: /* deiconify window */
2728 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2810 XMapWindow (display->display, TermWin.parent[0]);
2729 break; 2811 break;
2730 case 2: /* iconify window */ 2812 case 2: /* iconify window */
2731 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2813 XIconifyWindow (display->display, TermWin.parent[0],
2732 DefaultScreen(R->Xdisplay)); 2814 DefaultScreen (display->display));
2733 break; 2815 break;
2734 case 3: /* set position (pixels) */ 2816 case 3: /* set position (pixels) */
2735 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2817 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2736 break; 2818 break;
2737 case 4: /* set size (pixels) */ 2819 case 4: /* set size (pixels) */
2738 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2820 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2739 break; 2821 break;
2740 case 5: /* raise window */ 2822 case 5: /* raise window */
2741 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2823 XRaiseWindow (display->display, TermWin.parent[0]);
2742 break; 2824 break;
2743 case 6: /* lower window */ 2825 case 6: /* lower window */
2744 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2826 XLowerWindow (display->display, TermWin.parent[0]);
2745 break; 2827 break;
2746 case 7: /* refresh window */ 2828 case 7: /* refresh window */
2747 R->scr_touch (true); 2829 scr_touch (true);
2748 break; 2830 break;
2749 case 8: /* set size (chars) */ 2831 case 8: /* set size (chars) */
2750 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2751 (unsigned int)(args[1] * R->TermWin.fheight)); 2833 (unsigned int) (args[1] * TermWin.fheight));
2752 break; 2834 break;
2753 default: 2835 default:
2754 if (args[0] >= 24) /* set height (chars) */ 2836 if (args[0] >= 24) /* set height (chars) */
2755 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2837 set_widthheight ((unsigned int)TermWin.width,
2756 (unsigned int)(args[1] * R->TermWin.fheight)); 2838 (unsigned int) (args[1] * TermWin.fheight));
2757 break; 2839 break;
2758 /* 2840 /*
2759 * reports - some output format copied from XTerm 2841 * reports - some output format copied from XTerm
2760 */ 2842 */
2761 case 11: /* report window state */ 2843 case 11: /* report window state */
2762 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2764 break; 2846 break;
2765 case 13: /* report window position */ 2847 case 13: /* report window position */
2766 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2767 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2768 -wattr.border_width, -wattr.border_width, 2850 -wattr.border_width, -wattr.border_width,
2769 &x, &y, &wdummy); 2851 &x, &y, &wdummy);
2770 R->tt_printf("\033[3;%d;%dt", x, y); 2852 tt_printf ("\033[3;%d;%dt", x, y);
2771 break; 2853 break;
2772 case 14: /* report window size (pixels) */ 2854 case 14: /* report window size (pixels) */
2773 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2774 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2775 break; 2857 break;
2776 case 18: /* report window size (chars) */ 2858 case 18: /* report window size (chars) */
2777 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2778 break; 2860 break;
2779#if 0 /* XXX: currently disabled due to security concerns */ 2861#if 0 /* XXX: currently disabled due to security concerns */
2780 case 20: /* report icon label */ 2862 case 20: /* report icon label */
2781 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2863 XGetIconName (display->display, TermWin.parent[0], &s);
2782 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2783 break; 2865 break;
2784 case 21: /* report window title */ 2866 case 21: /* report window title */
2785 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2867 XFetchName (display->display, TermWin.parent[0], &s);
2786 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2787 break; 2869 break;
2788#endif 2870#endif
2871
2789 } 2872 }
2790} 2873}
2791#endif 2874#endif
2792 2875
2793/*----------------------------------------------------------------------*/ 2876/*----------------------------------------------------------------------*/
2794/* 2877/*
2795 * get input up until STRING TERMINATOR (or BEL) 2878 * get input up until STRING TERMINATOR (or BEL)
2796 * ends_how is terminator used. returned input must be free()d 2879 * ends_how is terminator used. returned input must be free ()d
2797 */ 2880 */
2798/* INTPROTO */
2799unsigned char * 2881unsigned char *
2800rxvt_get_to_st(pR_ unsigned char *ends_how) 2882rxvt_term::get_to_st (unsigned char *ends_how)
2801{ 2883{
2802 int seen_esc = 0; /* seen escape? */ 2884 int seen_esc = 0; /* seen escape? */
2803 unsigned int n = 0; 2885 unsigned int n = 0;
2804 unsigned char *s; 2886 unsigned char *s;
2805 unsigned char ch, string[STRING_MAX]; 2887 unsigned char ch, string[STRING_MAX];
2806 2888
2807 for (; (ch = rxvt_cmd_getc(aR));) { 2889 for (; (ch = cmd_getc ());)
2890 {
2808 if (ch == C0_BEL 2891 if (ch == C0_BEL
2809 || ch == CHAR_ST 2892 || ch == CHAR_ST
2810 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2811 break; 2894 break;
2812 if (ch == C0_ESC) { 2895 if (ch == C0_ESC)
2896 {
2813 seen_esc = 1; 2897 seen_esc = 1;
2814 continue; 2898 continue;
2899 }
2815 } else if (ch == '\t') 2900 else if (ch == '\t')
2816 ch = ' '; /* translate '\t' to space */ 2901 ch = ' '; /* translate '\t' to space */
2817 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2818 return NULL; /* other control character - exit */ 2903 return NULL; /* other control character - exit */
2819 if (n < sizeof(string) - 1) 2904 if (n < sizeof (string) - 1)
2820 string[n++] = ch; 2905 string[n++] = ch;
2821 seen_esc = 0; 2906 seen_esc = 0;
2822 } 2907 }
2823 string[n++] = '\0'; 2908 string[n++] = '\0';
2824 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2825 return NULL; 2910 return NULL;
2826 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2911 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2827 STRNCPY(s, string, n); 2912 STRNCPY (s, string, n);
2828 return s; 2913 return s;
2829} 2914}
2830 2915
2831/*----------------------------------------------------------------------*/ 2916/*----------------------------------------------------------------------*/
2832/* 2917/*
2833 * 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)'
2834 */ 2919 */
2835/* INTPROTO */
2836void 2920void
2837rxvt_process_dcs_seq(pR) 2921rxvt_term::process_dcs_seq ()
2838{ 2922{
2839 unsigned char eh, *s; 2923 unsigned char eh, *s;
2840/* 2924 /*
2841 * Not handled yet 2925 * Not handled yet
2842 */ 2926 */
2843 s = rxvt_get_to_st(aR_ &eh); 2927 s = get_to_st (&eh);
2844 if (s) 2928 if (s)
2845 free(s); 2929 free (s);
2846 return; 2930 return;
2847} 2931}
2848 2932
2849/*----------------------------------------------------------------------*/ 2933/*----------------------------------------------------------------------*/
2850/* 2934/*
2851 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2852 */ 2936 */
2853/* INTPROTO */
2854void 2937void
2855rxvt_process_osc_seq(pR) 2938rxvt_term::process_osc_seq ()
2856{ 2939{
2857 unsigned char ch, eh, *s; 2940 unsigned char ch, eh, *s;
2858 int arg; 2941 int arg;
2859 2942
2860 ch = rxvt_cmd_getc(aR); 2943 ch = cmd_getc ();
2861 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2944 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2862 arg = arg * 10 + (ch - '0'); 2945 arg = arg * 10 + (ch - '0');
2863 2946
2864 if (ch == ';') { 2947 if (ch == ';')
2865 s = rxvt_get_to_st(aR_ &eh); 2948 {
2866 if (s) { 2949 s = get_to_st (&eh);
2867 /* 2950 if (s)
2951 {
2952 /*
2868 * rxvt_menubar_dispatch() violates the constness of the string, 2953 * rxvt_menubar_dispatch () violates the constness of the string,
2869 * so do it here 2954 * so do it here
2870 */ 2955 */
2871 if (arg == XTerm_Menu) 2956 if (arg == XTerm_Menu)
2872#if 0 /* XXX: currently disabled due to security concerns */ 2957#if 0 /* XXX: currently disabled due to security concerns */
2873 rxvt_menubar_dispatch(aR_ (char *)s); 2958 menubar_dispatch ((char *)s);
2874#else 2959#else
2875 0; 2960 (void)0;
2876#endif 2961#endif
2877 else 2962 else
2878 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2963 xterm_seq (arg, (char *)s, eh);
2879 free(s); 2964 free (s);
2880 } 2965 }
2881 } 2966 }
2882} 2967}
2883/* 2968/*
2884 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2885 * 0 = change iconName/title 2970 * 0 = change iconName/title
… …
2893 * 19 = change underlined character color 2978 * 19 = change underlined character color
2894 * 46 = change logfile (not implemented) 2979 * 46 = change logfile (not implemented)
2895 * 50 = change font 2980 * 50 = change font
2896 * 2981 *
2897 * rxvt extensions: 2982 * rxvt extensions:
2983 * 9 = change locale (NYI)
2898 * 10 = menu (may change in future) 2984 * 10 = menu (may change in future)
2899 * 20 = bg pixmap 2985 * 20 = bg pixmap
2900 * 39 = change default fg color 2986 * 39 = change default fg color
2901 * 49 = change default bg color 2987 * 49 = change default bg color
2902 * 55 = dump scrollback buffer and all of screen 2988 * 55 = dump scrollback buffer and all of screen
2903 */ 2989 */
2904/* EXTPROTO */
2905void 2990void
2906rxvt_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)))
2907{ 2992{
2908 int changed = 0; 2993 int changed = 0;
2909 int color; 2994 int color;
2910 char *buf, *name; 2995 char *buf, *name;
2911 2996
2912 assert(str != NULL); 2997 assert (str != NULL);
2913 switch (op) { 2998 switch (op)
2999 {
2914 case XTerm_name: 3000 case XTerm_name:
2915 rxvt_set_title(aR_ str); 3001 set_title (str);
2916 /* FALLTHROUGH */ 3002 /* FALLTHROUGH */
2917 case XTerm_iconName: 3003 case XTerm_iconName:
2918 rxvt_set_iconName(aR_ str); 3004 set_iconName (str);
2919 break; 3005 break;
2920 case XTerm_title: 3006 case XTerm_title:
2921 rxvt_set_title(aR_ str); 3007 set_title (str);
2922 break; 3008 break;
2923 case XTerm_Color: 3009 case XTerm_Color:
2924 for (buf = (char *)str; buf && *buf;) { 3010 for (buf = (char *)str; buf && *buf;)
3011 {
2925 if ((name = STRCHR(buf, ';')) == NULL) 3012 if ((name = STRCHR (buf, ';')) == NULL)
2926 break; 3013 break;
2927 *name++ = '\0'; 3014 *name++ = '\0';
2928 color = atoi(buf); 3015 color = atoi (buf);
2929 if (color < 0 || color >= TOTAL_COLORS) 3016 if (color < 0 || color >= TOTAL_COLORS)
2930 break; 3017 break;
2931 if ((buf = STRCHR(name, ';')) != NULL) 3018 if ((buf = STRCHR (name, ';')) != NULL)
2932 *buf++ = '\0'; 3019 *buf++ = '\0';
2933 rxvt_set_window_color(aR_ color + minCOLOR, name); 3020 set_window_color (color + minCOLOR, name);
2934 } 3021 }
2935 break; 3022 break;
2936#ifndef NO_CURSORCOLOR 3023#ifndef NO_CURSORCOLOR
2937 case XTerm_Color_cursor: 3024 case XTerm_Color_cursor:
2938 rxvt_set_window_color(aR_ Color_cursor, str); 3025 set_window_color (Color_cursor, str);
2939 break; 3026 break;
2940#endif 3027#endif
2941 case XTerm_Color_pointer: 3028 case XTerm_Color_pointer:
2942 rxvt_set_window_color(aR_ Color_pointer, str); 3029 set_window_color (Color_pointer, str);
2943 break; 3030 break;
2944#ifndef NO_BOLD_UNDERLINE_REVERSE 3031#ifndef NO_BOLD_UNDERLINE_REVERSE
2945 case XTerm_Color_BD: 3032 case XTerm_Color_BD:
2946 rxvt_set_window_color(aR_ Color_BD, str); 3033 set_window_color (Color_BD, str);
2947 break; 3034 break;
2948 case XTerm_Color_UL: 3035 case XTerm_Color_UL:
2949 rxvt_set_window_color(aR_ Color_UL, str); 3036 set_window_color (Color_UL, str);
2950 break; 3037 break;
2951 case XTerm_Color_RV: 3038 case XTerm_Color_RV:
2952 rxvt_set_window_color(aR_ Color_RV, str); 3039 set_window_color (Color_RV, str);
2953 break; 3040 break;
2954#endif 3041#endif
2955 3042
2956 case XTerm_Menu: 3043 case XTerm_Menu:
2957 /* 3044 /*
2958 * rxvt_menubar_dispatch() violates the constness of the string, 3045 * rxvt_menubar_dispatch () violates the constness of the string,
2959 * so DON'T do it here 3046 * so DON'T do it here
2960 */ 3047 */
2961 break; 3048 break;
2962 case XTerm_Pixmap: 3049 case XTerm_Pixmap:
2963 if (*str != ';') { 3050 if (*str != ';')
3051 {
2964#if XPM_BACKGROUND 3052#if XPM_BACKGROUND
2965 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3053 scale_pixmap (""); /* reset to default scaling */
2966 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3054 set_bgPixmap (str); /* change pixmap */
2967#endif 3055#endif
2968 R->scr_touch (true); 3056 scr_touch (true);
2969 } 3057 }
2970 while ((str = STRCHR(str, ';')) != NULL) { 3058 while ((str = STRCHR (str, ';')) != NULL)
2971 str++; 3059 {
3060 str++;
2972#if XPM_BACKGROUND 3061#if XPM_BACKGROUND
2973 changed += rxvt_scale_pixmap(aR_ str); 3062 changed += scale_pixmap (str);
2974#endif 3063#endif
2975 } 3064
2976 if (changed) { 3065 }
3066 if (changed)
3067 {
2977#ifdef XPM_BACKGROUND 3068#ifdef XPM_BACKGROUND
2978 rxvt_resize_pixmap(aR); 3069 resize_pixmap ();
2979#endif 3070#endif
2980 R->scr_touch (true); 3071 scr_touch (true);
2981 } 3072 }
2982 break; 3073 break;
2983 3074
2984 case XTerm_restoreFG: 3075 case XTerm_restoreFG:
2985 rxvt_set_window_color(aR_ Color_fg, str); 3076 set_window_color (Color_fg, str);
2986 break; 3077 break;
2987 case XTerm_restoreBG: 3078 case XTerm_restoreBG:
2988 rxvt_set_window_color(aR_ Color_bg, str); 3079 set_window_color (Color_bg, str);
2989 break; 3080 break;
2990 case XTerm_logfile: 3081 case XTerm_logfile:
2991 break; 3082 break;
2992 case XTerm_font: 3083 case XTerm_font:
2993 rxvt_change_font(aR_ 0, str); 3084 change_font (str);
2994 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;
2995#if 0 3095#if 0
2996 case XTerm_dumpscreen: /* no error notices */ 3096 case XTerm_dumpscreen: /* no error notices */
2997 { 3097 {
2998 int fd; 3098 int fd;
2999 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)
3000 rxvt_scr_dump(aR_ fd); 3100 {
3001 close(fd); 3101 scr_dump (fd);
3002 } 3102 close (fd);
3003 } 3103 }
3004 break; 3104 }
3105 break;
3005#endif 3106#endif
3107
3006 } 3108 }
3007} 3109}
3008/*----------------------------------------------------------------------*/ 3110/*----------------------------------------------------------------------*/
3009 3111
3010/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3015 * 's' = save 3117 * 's' = save
3016 * 'r' = restore 3118 * 'r' = restore
3017 * 't' = toggle 3119 * 't' = toggle
3018 * so no need for fancy checking 3120 * so no need for fancy checking
3019 */ 3121 */
3020/* INTPROTO */
3021int 3122int
3022rxvt_privcases(pR_ int mode, unsigned long bit) 3123rxvt_term::privcases (int mode, unsigned long bit)
3023{ 3124{
3024 int state; 3125 int state;
3025 3126
3026 if (mode == 's') { 3127 if (mode == 's')
3128 {
3027 R->SavedModes |= (R->PrivateModes & bit); 3129 SavedModes |= (PrivateModes & bit);
3028 return -1; 3130 return -1;
3029 } else { 3131 }
3132 else
3133 {
3030 if (mode == 'r') 3134 if (mode == 'r')
3031 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3032 else 3136 else
3033 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3034 PrivMode(state, bit); 3138 PrivMode (state, bit);
3035 } 3139 }
3036 return state; 3140 return state;
3037} 3141}
3038 3142
3039/* we're not using priv _yet_ */ 3143/* we're not using priv _yet_ */
3040/* INTPROTO */
3041void 3144void
3042rxvt_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)
3043{ 3146{
3044 unsigned int i, j; 3147 unsigned int i, j;
3045 int state; 3148 int state;
3046 static const struct { 3149 static const struct
3150 {
3047 const int argval; 3151 const int argval;
3048 const unsigned long bit; 3152 const unsigned long bit;
3153 }
3049 } argtopriv[] = { 3154 argtopriv[] = {
3050 { 1, PrivMode_aplCUR }, 3155 { 1, PrivMode_aplCUR },
3051 { 2, PrivMode_vt52 }, 3156 { 2, PrivMode_vt52 },
3052 { 3, PrivMode_132 }, 3157 { 3, PrivMode_132 },
3053 { 4, PrivMode_smoothScroll }, 3158 { 4, PrivMode_smoothScroll },
3054 { 5, PrivMode_rVideo }, 3159 { 5, PrivMode_rVideo },
3055 { 6, PrivMode_relOrigin }, 3160 { 6, PrivMode_relOrigin },
3056 { 7, PrivMode_Autowrap }, 3161 { 7, PrivMode_Autowrap },
3057 { 9, PrivMode_MouseX10 }, 3162 { 9, PrivMode_MouseX10 },
3058#ifdef menuBar_esc 3163#ifdef menuBar_esc
3059 { menuBar_esc, PrivMode_menuBar }, 3164 { menuBar_esc, PrivMode_menuBar },
3060#endif 3165#endif
3061#ifdef scrollBar_esc 3166#ifdef scrollBar_esc
3062 { scrollBar_esc, PrivMode_scrollBar }, 3167 { scrollBar_esc, PrivMode_scrollBar },
3063#endif 3168#endif
3064 { 25, PrivMode_VisibleCursor }, 3169 { 25, PrivMode_VisibleCursor },
3065 { 35, PrivMode_ShiftKeys }, 3170 { 35, PrivMode_ShiftKeys },
3066 { 40, PrivMode_132OK }, 3171 { 40, PrivMode_132OK },
3067 { 47, PrivMode_Screen }, 3172 { 47, PrivMode_Screen },
3068 { 66, PrivMode_aplKP }, 3173 { 66, PrivMode_aplKP },
3069#ifndef NO_BACKSPACE_KEY 3174#ifndef NO_BACKSPACE_KEY
3070 { 67, PrivMode_BackSpace }, 3175 { 67, PrivMode_BackSpace },
3071#endif 3176#endif
3072 { 1000, PrivMode_MouseX11 }, 3177 { 1000, PrivMode_MouseX11 },
3073 { 1010, PrivMode_TtyOutputInh }, 3178 { 1010, PrivMode_TtyOutputInh },
3074 { 1011, PrivMode_Keypress }, 3179 { 1011, PrivMode_Keypress },
3075 { 1047, PrivMode_Screen }, 3180 { 1047, PrivMode_Screen },
3076 }; 3181 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3182 };
3077 3183
3078 if (nargs == 0) 3184 if (nargs == 0)
3079 return; 3185 return;
3080 3186
3081/* make lo/hi boolean */ 3187 /* make lo/hi boolean */
3082 if (mode == 'l') 3188 if (mode == 'l')
3083 mode = 0; /* reset */ 3189 mode = 0; /* reset */
3084 else if (mode == 'h') 3190 else if (mode == 'h')
3085 mode = 1; /* set */ 3191 mode = 1; /* set */
3086 3192
3087 for (i = 0; i < nargs; i++) { 3193 for (i = 0; i < nargs; i++)
3194 {
3088 state = -1; 3195 state = -1;
3089 3196
3090 /* basic handling */ 3197 /* basic handling */
3091 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3092 if (argtopriv[j].argval == arg[i]) { 3199 if (argtopriv[j].argval == arg[i])
3200 {
3093 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3201 state = privcases (mode, argtopriv[j].bit);
3094 break; 3202 break;
3095 } 3203 }
3096 3204
3097 /* extra handling for values with state unkept */ 3205 /* extra handling for values with state unkept */
3098 if (state == -1) 3206 if (state == -1)
3099 switch (arg[i]) { 3207 switch (arg[i])
3208 {
3100 case 1048: /* alternative cursor save */ 3209 case 1048: /* alternative cursor save */
3101 if (mode == 0) 3210 if (mode == 0)
3102 rxvt_scr_cursor(aR_ RESTORE); 3211 scr_cursor (RESTORE);
3103 else if (mode == 1) 3212 else if (mode == 1)
3104 rxvt_scr_cursor(aR_ SAVE); 3213 scr_cursor (SAVE);
3105 /* FALLTHROUGH */ 3214 /* FALLTHROUGH */
3106 default: 3215 default:
3107 continue; /* for(;i;) */ 3216 continue; /* for (;i;) */
3108 } 3217 }
3109 3218
3110 /* extra handling for values with valid 0 or 1 state */ 3219 /* extra handling for values with valid 0 or 1 state */
3111 switch (arg[i]) { 3220 switch (arg[i])
3221 {
3112 /* case 1: - application cursor keys */ 3222 /* case 1: - application cursor keys */
3113 case 2: /* VT52 mode */ 3223 case 2: /* VT52 mode */
3114 /* oddball mode. should be set regardless of set/reset 3224 /* oddball mode. should be set regardless of set/reset
3115 * parameter. Return from VT52 mode with an ESC < from 3225 * parameter. Return from VT52 mode with an ESC < from
3116 * within VT52 mode 3226 * within VT52 mode
3117 */ 3227 */
3118 PrivMode(1, PrivMode_vt52); 3228 PrivMode (1, PrivMode_vt52);
3119 break; 3229 break;
3120 case 3: /* 80/132 */ 3230 case 3: /* 80/132 */
3121 if (R->PrivateModes & PrivMode_132OK) 3231 if (PrivateModes & PrivMode_132OK)
3122 rxvt_set_widthheight(aR_
3123 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3124 (unsigned int)R->TermWin.height); 3233 (unsigned int)TermWin.height);
3125 break; 3234 break;
3126 case 4: /* smooth scrolling */ 3235 case 4: /* smooth scrolling */
3127 if (state) 3236 if (state)
3128 R->Options &= ~Opt_jumpScroll; 3237 Options &= ~Opt_jumpScroll;
3129 else 3238 else
3130 R->Options |= Opt_jumpScroll; 3239 Options |= Opt_jumpScroll;
3131 break; 3240 break;
3132 case 5: /* reverse video */ 3241 case 5: /* reverse video */
3133 rxvt_scr_rvideo_mode(aR_ state); 3242 scr_rvideo_mode (state);
3134 break; 3243 break;
3135 case 6: /* relative/absolute origins */ 3244 case 6: /* relative/absolute origins */
3136 rxvt_scr_relative_origin(aR_ state); 3245 scr_relative_origin (state);
3137 break; 3246 break;
3138 case 7: /* autowrap */ 3247 case 7: /* autowrap */
3139 rxvt_scr_autowrap(aR_ state); 3248 scr_autowrap (state);
3140 break; 3249 break;
3141 /* 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 */
3142 case 9: /* X10 mouse reporting */ 3251 case 9: /* X10 mouse reporting */
3143 if (state) /* orthogonal */ 3252 if (state) /* orthogonal */
3144 R->PrivateModes &= ~(PrivMode_MouseX11); 3253 PrivateModes &= ~ (PrivMode_MouseX11);
3145 break; 3254 break;
3146#ifdef menuBar_esc 3255#ifdef menuBar_esc
3147 case menuBar_esc: 3256 case menuBar_esc:
3148#ifdef MENUBAR 3257#ifdef MENUBAR
3149 rxvt_map_menuBar(aR_ state); 3258 map_menuBar (state);
3150#endif 3259#endif
3151 break; 3260 break;
3152#endif 3261#endif
3153#ifdef scrollBar_esc 3262#ifdef scrollBar_esc
3154 case scrollBar_esc: 3263 case scrollBar_esc:
3155 if (rxvt_scrollbar_mapping(aR_ state)) { 3264 if (scrollbar_mapping (state))
3156 R->resize_all_windows (0, 0, 0); 3265 {
3266 resize_all_windows (0, 0, 0);
3157 R->scr_touch (true); 3267 scr_touch (true);
3158 } 3268 }
3159 break; 3269 break;
3160#endif 3270#endif
3161 case 25: /* visible/invisible cursor */ 3271 case 25: /* visible/invisible cursor */
3162 rxvt_scr_cursor_visible(aR_ state); 3272 scr_cursor_visible (state);
3163 break; 3273 break;
3164 /* case 35: - shift keys */ 3274 /* case 35: - shift keys */
3165 /* case 40: - 80 <--> 132 mode */ 3275 /* case 40: - 80 <--> 132 mode */
3166 case 47: /* secondary screen */ 3276 case 47: /* secondary screen */
3167 rxvt_scr_change_screen(aR_ state); 3277 scr_change_screen (state);
3168 break; 3278 break;
3169 /* case 66: - application key pad */ 3279 /* case 66: - application key pad */
3170 /* case 67: - backspace key */ 3280 /* case 67: - backspace key */
3171 case 1000: /* X11 mouse reporting */ 3281 case 1000: /* X11 mouse reporting */
3172 if (state) /* orthogonal */ 3282 if (state) /* orthogonal */
3173 R->PrivateModes &= ~(PrivMode_MouseX10); 3283 PrivateModes &= ~ (PrivMode_MouseX10);
3174 break; 3284 break;
3175#if 0 3285#if 0
3176 case 1001: 3286 case 1001:
3177 break; /* X11 mouse highlighting */ 3287 break; /* X11 mouse highlighting */
3178#endif 3288#endif
3179 case 1010: /* scroll to bottom on TTY output inhibit */ 3289 case 1010: /* scroll to bottom on TTY output inhibit */
3180 if (state) 3290 if (state)
3181 R->Options &= ~Opt_scrollTtyOutput; 3291 Options &= ~Opt_scrollTtyOutput;
3182 else 3292 else
3183 R->Options |= Opt_scrollTtyOutput; 3293 Options |= Opt_scrollTtyOutput;
3184 break; 3294 break;
3185 case 1011: /* scroll to bottom on key press */ 3295 case 1011: /* scroll to bottom on key press */
3186 if (state) 3296 if (state)
3187 R->Options |= Opt_scrollTtyKeypress; 3297 Options |= Opt_scrollTtyKeypress;
3188 else 3298 else
3189 R->Options &= ~Opt_scrollTtyKeypress; 3299 Options &= ~Opt_scrollTtyKeypress;
3190 break; 3300 break;
3191 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 */
3192 if (R->current_screen != PRIMARY) 3303 if (current_screen != PRIMARY)
3193 R->scr_erase_screen (2); 3304 scr_erase_screen (2);
3194 rxvt_scr_change_screen(aR_ state); 3305 scr_change_screen (state);
3195 /* FALLTHROUGH */ 3306 /* FALLTHROUGH */
3196 default: 3307 default:
3197 break; 3308 break;
3198 } 3309 }
3199 } 3310 }
3200} 3311}
3201/*}}} */ 3312/*}}} */
3202 3313
3203/*{{{ process sgr sequences */ 3314/*{{{ process sgr sequences */
3204/* INTPROTO */
3205void 3315void
3206rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3207{ 3317{
3208 unsigned int i; 3318 unsigned int i;
3209 short rendset; 3319 short rendset;
3210 int rendstyle; 3320 int rendstyle;
3211 3321
3212 if (nargs == 0) { 3322 if (nargs == 0)
3213 rxvt_scr_rendition(aR_ 0, ~RS_None);
3214 return;
3215 } 3323 {
3324 scr_rendition (0, ~RS_None);
3325 return;
3326 }
3216 for (i = 0; i < nargs; i++) { 3327 for (i = 0; i < nargs; i++)
3328 {
3217 rendset = -1; 3329 rendset = -1;
3218 switch (arg[i]) { 3330 switch (arg[i])
3219 case 0: 3331 {
3332 case 0:
3220 rendset = 0, rendstyle = ~RS_None; 3333 rendset = 0, rendstyle = ~RS_None;
3221 break; 3334 break;
3222 case 1: 3335 case 1:
3223 rendset = 1, rendstyle = RS_Bold; 3336 rendset = 1, rendstyle = RS_Bold;
3224 break; 3337 break;
3225 case 4: 3338 case 4:
3226 rendset = 1, rendstyle = RS_Uline; 3339 rendset = 1, rendstyle = RS_Uline;
3227 break; 3340 break;
3228 case 5: 3341 case 5:
3229 rendset = 1, rendstyle = RS_Blink; 3342 rendset = 1, rendstyle = RS_Blink;
3230 break; 3343 break;
3231 case 7: 3344 case 7:
3232 rendset = 1, rendstyle = RS_RVid; 3345 rendset = 1, rendstyle = RS_RVid;
3233 break; 3346 break;
3234 case 22: 3347 case 22:
3235 rendset = 0, rendstyle = RS_Bold; 3348 rendset = 0, rendstyle = RS_Bold;
3236 break; 3349 break;
3237 case 24: 3350 case 24:
3238 rendset = 0, rendstyle = RS_Uline; 3351 rendset = 0, rendstyle = RS_Uline;
3239 break; 3352 break;
3240 case 25: 3353 case 25:
3241 rendset = 0, rendstyle = RS_Blink; 3354 rendset = 0, rendstyle = RS_Blink;
3242 break; 3355 break;
3243 case 27: 3356 case 27:
3244 rendset = 0, rendstyle = RS_RVid; 3357 rendset = 0, rendstyle = RS_RVid;
3245 break; 3358 break;
3246 } 3359 }
3247 if (rendset != -1) { 3360 if (rendset != -1)
3248 rxvt_scr_rendition(aR_ rendset, rendstyle); 3361 {
3362 scr_rendition (rendset, rendstyle);
3249 continue; /* for(;i;) */ 3363 continue; /* for (;i;) */
3250 } 3364 }
3251 3365
3252 switch (arg[i]) { 3366 switch (arg[i])
3253 case 30: 3367 {
3368 case 30:
3254 case 31: /* set fg color */ 3369 case 31: /* set fg color */
3255 case 32: 3370 case 32:
3256 case 33: 3371 case 33:
3257 case 34: 3372 case 34:
3258 case 35: 3373 case 35:
3259 case 36: 3374 case 36:
3260 case 37: 3375 case 37:
3261 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3262 Color_fg); 3377 Color_fg);
3263 break; 3378 break;
3264#ifdef TTY_256COLOR 3379#ifdef TTY_256COLOR
3265 case 38: 3380 case 38:
3266 if (nargs > i + 2 && arg[i + 1] == 5) { 3381 if (nargs > i + 2 && arg[i + 1] == 5)
3382 {
3267 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3268 Color_fg); 3384 Color_fg);
3269 i += 2; 3385 i += 2;
3270 } 3386 }
3271 break; 3387 break;
3272#endif 3388#endif
3273 case 39: /* default fg */ 3389 case 39: /* default fg */
3274 rxvt_scr_color(aR_ Color_fg, Color_fg); 3390 scr_color (Color_fg, Color_fg);
3275 break; 3391 break;
3276 3392
3277 case 40: 3393 case 40:
3278 case 41: /* set bg color */ 3394 case 41: /* set bg color */
3279 case 42: 3395 case 42:
3280 case 43: 3396 case 43:
3281 case 44: 3397 case 44:
3282 case 45: 3398 case 45:
3283 case 46: 3399 case 46:
3284 case 47: 3400 case 47:
3285 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3286 Color_bg); 3402 Color_bg);
3287 break; 3403 break;
3288#ifdef TTY_256COLOR 3404#ifdef TTY_256COLOR
3289 case 48: 3405 case 48:
3290 if (nargs > i + 2 && arg[i + 1] == 5) { 3406 if (nargs > i + 2 && arg[i + 1] == 5)
3407 {
3291 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3292 Color_bg); 3409 Color_bg);
3293 i += 2; 3410 i += 2;
3294 } 3411 }
3295 break; 3412 break;
3296#endif 3413#endif
3297 case 49: /* default bg */ 3414 case 49: /* default bg */
3298 rxvt_scr_color(aR_ Color_bg, Color_bg); 3415 scr_color (Color_bg, Color_bg);
3299 break; 3416 break;
3300 3417
3301#ifndef NO_BRIGHTCOLOR 3418#ifndef NO_BRIGHTCOLOR
3302 case 90: 3419 case 90:
3303 case 91: /* set bright fg color */ 3420 case 91: /* set bright fg color */
3304 case 92: 3421 case 92:
3305 case 93: 3422 case 93:
3306 case 94: 3423 case 94:
3307 case 95: 3424 case 95:
3308 case 96: 3425 case 96:
3309 case 97: 3426 case 97:
3310 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3311 Color_fg); 3428 Color_fg);
3312 break; 3429 break;
3313 case 100: 3430 case 100:
3314 case 101: /* set bright bg color */ 3431 case 101: /* set bright bg color */
3315 case 102: 3432 case 102:
3316 case 103: 3433 case 103:
3317 case 104: 3434 case 104:
3318 case 105: 3435 case 105:
3319 case 106: 3436 case 106:
3320 case 107: 3437 case 107:
3321 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3322 Color_bg); 3439 Color_bg);
3323 break; 3440 break;
3324#endif 3441#endif
3325 } 3442
3443 }
3326 } 3444 }
3327} 3445}
3328/*}}} */ 3446/*}}} */
3329 3447
3330/*{{{ process Rob Nation's own graphics mode sequences */ 3448/*{{{ process Rob Nation's own graphics mode sequences */
3331/* INTPROTO */
3332void 3449void
3333rxvt_process_graphics(pR) 3450rxvt_term::process_graphics ()
3334{ 3451{
3335 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3452 unsigned char ch, cmd = cmd_getc ();
3336 3453
3337#ifndef RXVT_GRAPHICS 3454 if (cmd == 'Q')
3338 if (cmd == 'Q') { /* query graphics */ 3455 { /* query graphics */
3339 R->tt_printf("\033G0\n"); /* no graphics */ 3456 tt_printf ("\033G0\n"); /* no graphics */
3340 return; 3457 return;
3341 } 3458 }
3342/* swallow other graphics sequences until terminating ':' */ 3459 /* swallow other graphics sequences until terminating ':' */
3343 do 3460 do
3344 ch = rxvt_cmd_getc(aR); 3461 ch = cmd_getc ();
3345 while (ch != ':'); 3462 while (ch != ':');
3346#else
3347 unsigned int nargs;
3348 int args[NGRX_PTS];
3349 unsigned char *text = NULL;
3350
3351 if (cmd == 'Q') { /* query graphics */
3352 R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3353 return;
3354 }
3355 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3356 int neg;
3357
3358 ch = rxvt_cmd_getc(aR);
3359 neg = (ch == '-');
3360 if (neg || ch == '+')
3361 ch = rxvt_cmd_getc(aR);
3362
3363 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR))
3364 args[nargs] = args[nargs] * 10 + (ch - '0');
3365 if (neg)
3366 args[nargs] = -args[nargs];
3367
3368 nargs++;
3369 args[nargs] = 0;
3370 if (ch != ';')
3371 break;
3372 }
3373
3374 if ((cmd == 'T') && (nargs >= 5)) {
3375 int i, len = args[4];
3376
3377 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3378
3379 if (text != NULL) {
3380 for (i = 0; i < len; i++)
3381 text[i] = rxvt_cmd_getc(aR);
3382 text[len] = '\0';
3383 }
3384 }
3385 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text);
3386#endif
3387} 3463}
3388/*}}} */ 3464/*}}} */
3389 3465
3390/* ------------------------------------------------------------------------- */ 3466/* ------------------------------------------------------------------------- */
3391 3467
3392/* 3468/*
3393 * Send printf() formatted output to the command. 3469 * Send printf () formatted output to the command.
3394 * Only use for small amounts of data. 3470 * Only use for small amounts of data.
3395 */ 3471 */
3396void 3472void
3397rxvt_term::tt_printf (const char *fmt,...) 3473rxvt_term::tt_printf (const char *fmt,...)
3398{ 3474{
… …
3416 3492
3417 if (len) 3493 if (len)
3418 { 3494 {
3419 if (v_buflen == 0) 3495 if (v_buflen == 0)
3420 { 3496 {
3421 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
3422 if (written == len) 3499 if ((unsigned int)written == len)
3423 return; 3500 return;
3424 3501
3425 data += written; 3502 data += written;
3426 len -= written; 3503 len -= written;
3427 } 3504 }

Diff Legend

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