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.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.35 by pcg, Sat Jan 31 03:27:45 2004 UTC

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

Diff Legend

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