ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.28 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.50 by pcg, Sun Feb 22 08:09:37 2004 UTC

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

Diff Legend

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