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

Diff Legend

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