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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.43 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.15 2003/12/18 05:45:11 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>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
49static char curlocale[128]; 49static char curlocale[128];
50 50
51void 51void
52rxvt_set_locale (const char *locale) 52rxvt_set_locale (const char *locale)
53{ 53{
54 if (locale && strncmp (locale, curlocale, 128)) 54 if (locale && STRNCMP (locale, curlocale, 128))
55 { 55 {
56 strncpy (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
58 } 58 }
59} 59}
60 60
61void * 61void *
… …
72{ 72{
73 free (p); 73 free (p);
74} 74}
75 75
76rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
77: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
78#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
80#endif 92#endif
81#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 95#endif
96#ifdef USE_XIM
84 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
88{ 103{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
90} 105}
91 106
92rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
93{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
127 delete PixColors;
128
129 displays.put (display);
130
94 scr_release (); 131 scr_release ();
95 132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
96 free (locale); 137 free (locale);
97 free (codeset); 138 free (codeset);
98 139
99#ifndef NO_SETOWNER_TTYDEV 140 delete envv;
100 rxvt_privileged_ttydev (this, RESTORE); 141 delete argv;
101#endif 142}
102#ifdef UTMP_SUPPORT 143
103 rxvt_privileged_utmp (this, RESTORE); 144void
104#endif 145rxvt_term::destroy ()
146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
105#ifdef USE_XIM 152#ifdef USE_XIM
106 if (Input_Context != NULL) 153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
107 { 162 }
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112 163
113 if (cmd_fd >= 0)
114 close (cmd_fd);
115
116 if (Xfd >= 0)
117 XCloseDisplay (Xdisplay);
118
119 delete PixColors;
120}
121
122void
123rxvt_term::destroy ()
124{
125 check_ev.stop (); 164 check_ev.stop ();
126 pty_ev.stop (); 165 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
129 blink_ev.stop (); 170 text_blink_ev.stop ();
130#endif 171#endif
131#ifdef POINTER_BLANK 172#ifdef POINTER_BLANK
132 pointer_ev.stop (); 173 pointer_ev.stop ();
133#endif 174#endif
134 175
… …
142 183
143 delete this; 184 delete this;
144} 185}
145 186
146/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
147/* rxvt_init() */ 188/* rxvt_init () */
148/* LIBPROTO */ 189/* LIBPROTO */
149rxvt_t 190rxvt_t
150rxvt_init (int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
151{ 192{
152 SET_R (new rxvt_term); 193 SET_R (new rxvt_term);
153 dR;
154 194
155 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
156 { 196 {
157 delete R; 197 delete GET_R;
158 return NULL; 198 SET_R (0);
159 } 199 }
160 200
161 return R; 201 return GET_R;
162} 202}
163 203
164/* EXTPROTO */ 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
165void 206void
166rxvt_init_signals () 207rxvt_init_signals ()
167{ 208{
168/* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
169#if 0 210#if 0
170#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
172#else 213#else
173#endif 214#endif
174#endif 215#endif
175 216
176 struct sigaction sa; 217 struct sigaction sa;
… …
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186 227
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */ 229 /* signal (SIGURG, SIG_DFL); */
189 230
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192} 233}
193 234
194bool 235bool
195rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
… …
199 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
200 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
201 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
202 * 2. chown tty on some systems 243 * 2. chown tty on some systems
203 */ 244 */
204 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
205 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
206
207#if HAVE_XSETLOCALE || HAVE_SETLOCALE
208 locale = strdup (setlocale (LC_CTYPE, ""));
209#endif
210#if HAVE_NL_LANGINFO
211 codeset = strdup (nl_langinfo (CODESET));
212#endif
213 247
214 init_secondary (); 248 init_secondary ();
215 249
216 const char **cmd_argv = init_resources (argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
217 251
252 set_locale ("");
253
218#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
219 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
220#endif 256#endif
221#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
222 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
223 scrollBar.setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
224#endif 260#endif
225 261
226 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
227 263
228 init_xlocale (); 264 init_xlocale ();
229 265
230 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
231#ifdef RXVT_GRAPHICS
232 rxvt_Gr_reset (this); /* reset graphics */
233#endif
234 267
235#if 0 268#if 0
236#ifdef DEBUG_X
237 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
238#endif
239#endif 270#endif
240 271
241#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
242 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
243 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
244#endif 275#endif
245#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
246 if (menubar_visible(r)) 277 if (menubar_visible ())
247 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
248#endif 279#endif
249#ifdef TRANSPARENT 280#ifdef TRANSPARENT
250 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
251 { 282 {
252 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
253 rxvt_check_our_parents (this); 284 check_our_parents ();
254 } 285 }
255#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
256 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
257 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
258 292
259 init_env ();
260 init_command (cmd_argv); 293 init_command (cmd_argv);
261 294
262 x_ev.start (Xfd, EVENT_READ);
263 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
264 296
265 check_ev.start (); 297 check_ev.start ();
266
267 process_x_events ();
268 298
269 return true; 299 return true;
270} 300}
271 301
272/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
… …
276 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
277 */ 307 */
278/* ARGSUSED */ 308/* ARGSUSED */
279/* EXTPROTO */ 309/* EXTPROTO */
280RETSIGTYPE 310RETSIGTYPE
281rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
282{ 312{
283 int pid, save_errno = errno; 313 int pid, save_errno = errno;
284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ; 315 ;
286 errno = save_errno; 316 errno = save_errno;
287 317
288#if 0 318#if 0
289 if (pid == R->cmd_pid) 319 if (pid == cmd_pid)
290 exit (EXIT_SUCCESS); 320 exit (EXIT_SUCCESS);
291#endif 321#endif
292} 322}
293 323
294/* 324/*
295 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
296 */ 326 */
297/* EXTPROTO */ 327/* EXTPROTO */
298RETSIGTYPE 328RETSIGTYPE
299rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
300{ 330{
301 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
302#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
303 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
304#endif 334#endif
305 rxvt_clean_exit(); 335 rxvt_clean_exit ();
306 kill(getpid(), sig); 336 kill (getpid (), sig);
307} 337}
308 338
309/* ARGSUSED */
310/* INTPROTO */ 339/* INTPROTO */
311int 340int
312rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
313 __attribute__ ((unused)), const XErrorEvent * event)
314{ 342{
315 dR;
316
317 if (R->allowedxerror == -1) 343 if (GET_R->allowedxerror == -1)
318 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
319 else 345 else
320 { 346 {
321 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
322 event->request_code, event->minor_code,
323 event->error_code);
324
325 R->destroy (); 348 GET_R->destroy ();
326 } 349 }
327 350
328 return 0; 351 return 0;
329} 352}
330 353
… …
335 */ 358 */
336/* EXTPROTO */ 359/* EXTPROTO */
337void 360void
338rxvt_clean_exit () 361rxvt_clean_exit ()
339{ 362{
340 dR; 363 // TODO: rxvtd should clean up all ressources
341 364 if (GET_R)
342 R->destroy (); 365 GET_R->destroy ();
343} 366}
344 367
345/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
346 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
347 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
348/* EXTPROTO */ 371/* EXTPROTO */
349void * 372void *
350rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
351{ 374{
352 void *p; 375 void *p;
353 376
354 p = malloc(size); 377 p = malloc (size);
355 if (p) 378 if (p)
356 return p; 379 return p;
357 380
358 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
359 rxvt_clean_exit(); 382 rxvt_clean_exit ();
360 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
361/* NOTREACHED */ 384 /* NOTREACHED */
362} 385}
363 386
364/* EXTPROTO */ 387/* EXTPROTO */
365void * 388void *
366rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
367{ 390{
368 void *p; 391 void *p;
369 392
370 p = calloc(number, size); 393 p = calloc (number, size);
371 if (p) 394 if (p)
372 return p; 395 return p;
373 396
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 398 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
377/* NOTREACHED */ 400 /* NOTREACHED */
378} 401}
379 402
380/* EXTPROTO */ 403/* EXTPROTO */
381void * 404void *
382rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
383{ 406{
384 void *p; 407 void *p;
385 408
386 if (ptr) 409 if (ptr)
387 p = realloc(ptr, size); 410 p = realloc (ptr, size);
388 else 411 else
389 p = malloc(size); 412 p = malloc (size);
390 if (p) 413 if (p)
391 return p; 414 return p;
392 415
393 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
394 rxvt_clean_exit(); 417 rxvt_clean_exit ();
395 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
396/* NOTREACHED */ 419 /* NOTREACHED */
397} 420}
398 421
399/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
400 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
401 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
402/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
403/* INTPROTO */
404void 426void
405rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
406{ 428{
407#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
408# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
409/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
410# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
411# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
412# define HAVE_SETEUID 434# define HAVE_SETEUID
413# endif 435# endif
414# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
415 switch (mode) { 437 switch (mode)
438 {
416 case IGNORE: 439 case IGNORE:
417 /* 440 /*
418 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
419 * back to root later, as required 442 * back to root later, as required
420 */ 443 */
421 seteuid(getuid()); 444 seteuid (getuid ());
422 setegid(getgid()); 445 setegid (getgid ());
423 break; 446 break;
424 case SAVE: 447 case SAVE:
425 R->euid = geteuid(); 448 euid = geteuid ();
426 R->egid = getegid(); 449 egid = getegid ();
427 break; 450 break;
428 case RESTORE: 451 case RESTORE:
429 seteuid(R->euid); 452 seteuid (euid);
430 setegid(R->egid); 453 setegid (egid);
431 break; 454 break;
432 } 455 }
433# else 456# else
434 switch (mode) { 457 switch (mode)
458 {
435 case IGNORE: 459 case IGNORE:
436 setuid(getuid()); 460 setuid (getuid ());
437 setgid(getgid()); 461 setgid (getgid ());
438 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
439 case SAVE: 463 case SAVE:
440 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
441 case RESTORE: 465 case RESTORE:
442 break; 466 break;
443 } 467 }
444# endif 468# endif
445#endif 469#endif
446} 470}
447 471
448#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
449/* EXTPROTO */
450void 473void
451rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
452{ 475{
453 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
454 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
455 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
456 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
457 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
458 return; 481 return;
459 482
460 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
461 if (action == SAVE) { 484 if (action == SAVE)
485 {
462 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
463 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
464 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
465 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
466 rxvt_cleanutent(aR); 492 cleanutent ();
467 } 493 }
468 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
469} 495}
470#endif 496#endif
471 497
472#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
473/* EXTPROTO */
474void 499void
475rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
476{ 501{
477 D_MAIN((stderr, 502 D_MAIN ((stderr,
478 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
479 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
480 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
481 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
482 return; 507 return;
483 508
484 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
485 510
486 if (action == SAVE) { 511 if (action == SAVE)
512 {
487 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
488# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
489/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
490 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
491 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
492 else 518 else
493# endif 519# endif
520
494 { 521 {
495 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
496 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
497# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
498 revoke(R->ttydev); 525 revoke (ttydev);
499# endif 526# endif
527
500 } 528 }
529 }
530 else
501 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
502 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
503# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
504 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
505 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
506# else 536# else
507 chmod(R->ttydev, 537 chmod (ttydev,
508 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
509 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
510# endif 540# endif
511 }
512 541
542 }
543
513 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
514 545
515# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
516 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
517 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
518 SAVE ? "Saving" : 549 SAVE ? "Saving" :
519 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
520 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
521 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
522# endif 553# endif
523} 554}
524#endif 555#endif
525 556
526/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
527/* 558/*
528 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
529 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
530 */ 561 */
531/* EXTPROTO */
532void 562void
533rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
534{ 564{
535 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
536 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
537 unsigned int w, h; 567 unsigned int w, h;
538 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
539 569
540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
542 R->szHint.height)); 572 szHint.height));
543 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
544 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
545/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
546 576
547 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
548 flags = 0; 578 flags = 0;
549 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
550 R->parsed_geometry = 1; 581 parsed_geometry = 1;
551 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
552 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
553 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
554 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
555 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
556 } 588 }
557 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
558 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
559 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
560 } 593 }
561 if (flags & XValue) { 594 if (flags & XValue)
595 {
562 R->szHint.x = x; 596 szHint.x = x;
563 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
564 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
565 recalc_x = 1; 600 recalc_x = 1;
566 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
567 } 602 }
568 } 603 }
569 if (flags & YValue) { 604 if (flags & YValue)
605 {
570 R->szHint.y = y; 606 szHint.y = y;
571 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
572 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
573 recalc_y = 1; 610 recalc_y = 1;
574 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
575 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
576 else 613 else
577 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
578 } 615 }
579 } 616 }
580 } 617 }
581/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
582 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
583 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
584 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
585 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
586 623
587 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
588 625
589 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
590 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
591 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
592 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
593 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
594 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
595 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
596 } 634 }
597 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
598 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
599 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
600 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
601 } 640 }
602 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
603 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
604 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
605 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
606 645
607 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
608 R->szHint.width = width; 648 szHint.width = width;
609 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
610 } else { 650 }
651 else
652 {
611 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
612 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
613 } 655 }
614 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
615 R->szHint.height = height; 658 szHint.height = height;
616 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
617 } else { 660 }
661 else
662 {
618 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
619 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
620 } 665 }
621 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
622 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
623 668
624 if (recalc_x) 669 if (recalc_x)
625 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
626 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
627 if (recalc_y) 672 if (recalc_y)
628 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
629 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
630 675
631 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
632 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
634 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
635 R->szHint.height)); 680 szHint.height));
636 return; 681 return;
637} 682}
638 683
639/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
640/* 685/*
641 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
642 * Called after a window size change. 687 * Called after a window size change.
643 */ 688 */
644void 689void
645rxvt_term::tt_winch () 690rxvt_term::tt_winch ()
646{ 691{
647 struct winsize ws; 692 struct winsize ws;
648 693
649 if (cmd_fd < 0) 694 if (cmd_fd < 0)
650 return; 695 return;
651 696
652 ws.ws_col = TermWin.ncol; 697 ws.ws_col = TermWin.ncol;
… …
654 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
655#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
656 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
657#else 702#else
658 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
659 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
660# ifdef SIGWINCH 705# ifdef SIGWINCH
661 else if (cmd_pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
662 kill (cmd_pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
663# endif 708# endif
664#endif 709#endif
665} 710}
666 711
667/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
668/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
669/* 714/*
670 * init = 1 - initialize 715 * init = 1 - initialize
671 * 716 *
672 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
674 */ 719 */
675/* EXTPROTO */ 720bool
676void
677rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
678{ 722{
679} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
680 734
681/* INTPROTO */ 735 if (fs && fs->populate (fontname))
682void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
683rxvt_font_up_down(pR_ int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
684{ 761{
762 return false;
685} 763}
686 764
687/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
688/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
689/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
690/* EXTPROTO */
691void 768void
692rxvt_set_title(pR_ const char *str) 769rxvt_term::set_title (const char *str)
693{ 770{
694#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
695 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
696#else 773#else
697 char *name; 774 char *name;
698 775
699 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
700 name = NULL; 777 name = NULL;
701 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
702 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
703 if (name) 780 if (name)
704 XFree(name); 781 XFree (name);
705#endif 782#endif
706} 783}
707 784
708/* EXTPROTO */
709void 785void
710rxvt_set_iconName(pR_ const char *str) 786rxvt_term::set_iconName (const char *str)
711{ 787{
712#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
713 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
714#else 790#else
715 char *name; 791 char *name;
716 792
717 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
718 name = NULL; 794 name = NULL;
719 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
720 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
721 if (name) 797 if (name)
722 XFree(name); 798 XFree (name);
723#endif 799#endif
724} 800}
725 801
726#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
727/* EXTPROTO */
728void 803void
729rxvt_set_window_color(pR_ int idx, const char *color) 804rxvt_term::set_window_color (int idx, const char *color)
730{ 805{
731 rxvt_color xcol; 806 rxvt_color xcol;
732 int i; 807 int i;
733 808
734 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
735 return; 810 return;
736 811
737/* handle color aliases */ 812 /* handle color aliases */
738 if (isdigit(*color)) { 813 if (isdigit (*color))
814 {
739 i = atoi(color); 815 i = atoi (color);
816 if (i >= 8 && i <= 15)
740 if (i >= 8 && i <= 15) { /* bright colors */ 817 { /* bright colors */
741 i -= 8; 818 i -= 8;
742# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
743 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
744 SET_PIXCOLOR(R, idx); 821 SET_PIXCOLOR (idx);
745 goto Done; 822 goto Done;
746# endif 823# endif
824
747 } 825 }
748 if (i >= 0 && i <= 7) { /* normal colors */ 826 if (i >= 0 && i <= 7)
827 { /* normal colors */
749 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
750 SET_PIXCOLOR(R, idx); 829 SET_PIXCOLOR (idx);
751 goto Done; 830 goto Done;
752 } 831 }
753 } 832 }
754 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
755 return; 834 return;
756/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 835 /* XStoreColor (display->display, XCMAP, XColor*); */
757 836
758/* 837 /*
759 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
760 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
761 */ 840 */
762# if 0 841# if 0
763 for (i = Color_Black; i <= Color_White; i++) 842 for (i = Color_Black; i <= Color_White; i++)
764 if (R->PixColors[idx] == R->PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
765 break; 844 break;
766 if (i > Color_White) { 845 if (i > Color_White)
846 {
767 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
768 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
769 DisplayPlanes(R->Xdisplay, Xscreen)); 849 DisplayPlanes (display->display, display->screen));
770 } 850 }
771# endif 851# endif
772 852
773 R->PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
774 SET_PIXCOLOR(R, idx); 854 SET_PIXCOLOR (idx);
775 855
776/* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
777/* Cursor cursor; */ 857 /* Cursor cursor; */
778 Done: 858Done:
779 if (idx == Color_bg && !(R->Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
781 R->PixColors[Color_bg]); 861 PixColors[Color_bg]);
782 862
783/* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
784 864
785 rxvt_set_colorfgbg (aR); 865 set_colorfgbg ();
786 R->recolour_cursor (); 866 recolour_cursor ();
787/* the only reasonable way to enforce a clean update */ 867 /* the only reasonable way to enforce a clean update */
788 rxvt_scr_poweron (aR); 868 scr_poweron ();
789} 869}
790 870
791#else 871#else
792# define rxvt_set_window_color(aR_ idx,color) ((void)0) 872# define set_window_color (idx,color) ((void)0)
793#endif /* XTERM_COLOR_CHANGE */ 873#endif /* XTERM_COLOR_CHANGE */
794 874
795void 875void
796rxvt_term::recolour_cursor () 876rxvt_term::recolour_cursor ()
797{ 877{
798#if TODO 878#if TODO
799 rxvt_color xcol[2]; 879 rxvt_color xcol[2];
800 880
801 xcol[0] = PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
802 xcol[1] = PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
803 XQueryColors (Xdisplay, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
805#endif 885#endif
806} 886}
807 887
808/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
809/* 889/*
810 * find if fg/bg matches any of the normal (low-intensity) colors 890 * find if fg/bg matches any of the normal (low-intensity) colors
811 */ 891 */
812/* INTPROTO */
813void 892void
814rxvt_set_colorfgbg(pR) 893rxvt_term::set_colorfgbg ()
815{ 894{
816 unsigned int i; 895 unsigned int i;
817 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
818 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
819 898
820 R->env_colorfgbg = 899 env_colorfgbg =
821 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
822 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
823 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
824 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_fg] == R->PixColors[i]) { 904 if (PixColors[Color_fg] == PixColors[i])
905 {
826 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
827 break; 907 break;
828 } 908 }
829 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
830 if (R->PixColors[Color_bg] == R->PixColors[i]) { 910 if (PixColors[Color_bg] == PixColors[i])
911 {
831 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
832#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
833 xpmb = "default;"; 914 xpmb = "default;";
834#endif 915#endif
835 break; 916 break;
836 } 917 }
918
837 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
838 putenv(R->env_colorfgbg);
839 920
840#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
841 R->colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
842 for (i = minCOLOR; i <= maxCOLOR; i++) { 923 for (i = minCOLOR; i <= maxCOLOR; i++)
924 {
843 if (R->PixColors[Color_fg] == R->PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
844 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
845 if (R->PixColors[Color_bg] == R->PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
846 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
847 } 929 }
848#endif 930#endif
849} 931}
850 932
851/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
852/* 934/*
853 * Colour determination for low colour displays, routine from 935 * Colour determination for low colour displays, routine from
854 * Hans de Goede <hans@highrise.nl> 936 * Hans de Goede <hans@highrise.nl>
855 */ 937 */
856 938
857/* EXTPROTO */
858int 939int
859rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
860{ 941{
861 screen_in_out->set(aR_ colour);
862
863 if (!screen_in_out->set(aR_ colour)) { 942 if (!screen_in_out->set (display, colour))
943 {
864 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
865 return false; 945 return false;
866 } 946 }
867 947
868 return true; 948 return true;
869} 949}
870 950
871/* -------------------------------------------------------------------- * 951/* -------------------------------------------------------------------- *
872 * - WINDOW RESIZING - * 952 * - WINDOW RESIZING - *
873 * -------------------------------------------------------------------- */ 953 * -------------------------------------------------------------------- */
874/* EXTPROTO */
875void 954void
876rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 955rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
877 int ignoreparent)
878{ 956{
879 int fix_screen; 957 int fix_screen;
880 958
881#ifdef SMART_RESIZE 959#ifdef SMART_RESIZE
882 int old_width = R->szHint.width, old_height = R->szHint.height; 960 int old_width = szHint.width, old_height = szHint.height;
883#endif 961#endif
884 962
885 rxvt_window_calc(aR_ width, height); 963 window_calc (width, height);
886 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
887 if (!ignoreparent) { 965 if (!ignoreparent)
966 {
888#ifdef SMART_RESIZE 967#ifdef SMART_RESIZE
889/* 968 /*
890 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
891 * reposition window on resize depending on placement on screen 970 * reposition window on resize depending on placement on screen
892 */ 971 */
893 int x, y, x1, y1; 972 int x, y, x1, y1;
894 int dx, dy; 973 int dx, dy;
895 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 974 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
896 Window unused_cr; 975 Window unused_cr;
897 976
898 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 977 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
899 0, 0, &x, &y, &unused_cr); 978 0, 0, &x, &y, &unused_cr);
900 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 979 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
901 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 980 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
902 /* 981 /*
903 * if Xroot isn't the parent window, a WM will probably have offset 982 * if display->root isn't the parent window, a WM will probably have offset
904 * our position for handles and decorations. Counter it 983 * our position for handles and decorations. Counter it
905 */ 984 */
906 if (x1 != x || y1 != y) { 985 if (x1 != x || y1 != y)
986 {
907 x -= x1; 987 x -= x1;
908 y -= y1; 988 y -= y1;
909 } 989 }
910 990
911 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 991 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
912 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 992 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
913 dx = old_width - R->szHint.width; 993 dx = old_width - szHint.width;
914 dy = old_height - R->szHint.height; 994 dy = old_height - szHint.height;
915 995
916 /* Check position of the center of the window */ 996 /* Check position of the center of the window */
917 if (x < x1) /* left half */ 997 if (x < x1) /* left half */
918 dx = 0; 998 dx = 0;
919 else if (x == x1) /* exact center */ 999 else if (x == x1) /* exact center */
920 dx /= 2; 1000 dx /= 2;
921 if (y < y1) /* top half */ 1001 if (y < y1) /* top half */
922 dy = 0; 1002 dy = 0;
923 else if (y == y1) /* exact center */ 1003 else if (y == y1) /* exact center */
924 dy /= 2; 1004 dy /= 2;
925 1005
926 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
927 R->szHint.width, R->szHint.height); 1007 szHint.width, szHint.height);
928#else 1008#else
929 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
930 R->szHint.height); 1010 szHint.height);
931#endif 1011#endif
932 }
933 1012
1013 }
1014
934 fix_screen = (R->TermWin.ncol != R->prev_ncol 1015 fix_screen = (TermWin.ncol != prev_ncol
935 || R->TermWin.nrow != R->prev_nrow); 1016 || TermWin.nrow != prev_nrow);
1017
936 if (fix_screen || width != R->old_width || height != R->old_height) { 1018 if (fix_screen || width != old_width || height != old_height)
1019 {
937 if (scrollbar_visible(R)) { 1020 if (scrollbar_visible ())
1021 {
938 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
939 0, scrollbar_TotalWidth(), R->szHint.height); 1023 0, scrollbar_TotalWidth (), szHint.height);
940 rxvt_Resize_scrollBar(aR); 1024 resize_scrollbar ();
941 } 1025 }
1026
942 if (menubar_visible(R)) 1027 if (menubar_visible ())
943 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
944 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030
945 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
946 R->window_vt_y, TermWin_TotalWidth(), 1032 window_vt_y, TermWin_TotalWidth (),
947 TermWin_TotalHeight()); 1033 TermWin_TotalHeight ());
948#ifdef RXVT_GRAPHICS
949 if (R->old_height)
950 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
951 R->old_height - R->szHint.base_height);
952#endif
953 rxvt_scr_clear(aR); 1034 scr_clear ();
954#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
955 rxvt_resize_pixmap(aR); 1036 resize_pixmap ();
956#endif 1037#endif
957 }
958 1038
1039 }
1040
959 if (fix_screen || R->old_height == 0) { 1041 if (fix_screen || old_height == 0)
1042 {
960 int curr_screen = -1; 1043 int curr_screen = -1;
961 uint16_t old_ncol = R->prev_ncol; 1044 int old_ncol = prev_ncol;
962 1045
963 /* scr_reset only works on the primary screen */ 1046 /* scr_reset only works on the primary screen */
964 if (R->old_height) /* this is not the first time through */ 1047 if (old_height) /* this is not the first time through */
1048 {
1049 unsigned int ncol = TermWin.ncol;
1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
965 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
966 1052 TermWin.ncol = ncol;
967 R->scr_reset();
968
969 if (curr_screen >= 0) { /* this is not the first time through */
970 rxvt_scr_change_screen(aR_ curr_screen);
971 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
972 } 1053 }
973 }
974 1054
1055 scr_reset ();
1056
1057 if (curr_screen >= 0) /* this is not the first time through */
1058 {
1059 scr_change_screen (curr_screen);
1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1061 }
1062 }
1063
975 R->old_width = R->szHint.width; 1064 old_width = szHint.width;
976 R->old_height = R->szHint.height; 1065 old_height = szHint.height;
977 1066
978#ifdef USE_XIM 1067#ifdef USE_XIM
979 rxvt_IMSetStatusPosition(aR); 1068 IMSetStatusPosition ();
980#endif 1069#endif
981} 1070}
982 1071
983/* 1072/*
984 * Set the width/height of the vt window in characters. Units are pixels. 1073 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 1074 * good for toggling 80/132 columns
986 */ 1075 */
987/* EXTPROTO */
988void 1076void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1077rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 1078{
991 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
992 1080
993 if (width == 0 || height == 0) { 1081 if (width == 0 || height == 0)
1082 {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
995 if (width == 0) 1084 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 1085 width = wattr.width - szHint.base_width;
997 if (height == 0) 1086 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 1087 height = wattr.height - szHint.base_height;
999 } 1088 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 1089 if (width != TermWin.width || height != TermWin.height)
1090 {
1001 width += R->szHint.base_width; 1091 width += szHint.base_width;
1002 height += R->szHint.base_height; 1092 height += szHint.base_height;
1003 rxvt_resize_all_windows(aR_ width, height, 0); 1093 resize_all_windows (width, height, 0);
1004 } 1094 }
1005} 1095}
1006 1096
1007/* -------------------------------------------------------------------- * 1097/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1098 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1099 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1100#ifdef USE_XIM
1011/* INTPROTO */ 1101
1012void 1102void
1013rxvt_setSize(pR_ XRectangle * size) 1103rxvt_term::im_set_size (XRectangle *size)
1014{ 1104{
1015 size->x = R->TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
1016 size->y = R->TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
1017 size->width = Width2Pixel(R->TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
1018 size->height = Height2Pixel(R->TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
1019} 1109}
1020 1110
1021/* INTPROTO */
1022void 1111void
1023rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1024{ 1113{
1025 *fg = R->PixColors[Color_fg]; 1114 *fg = PixColors[Color_fg];
1026 *bg = R->PixColors[Color_bg]; 1115 *bg = PixColors[Color_bg];
1027} 1116}
1028 1117
1029/* Checking whether input method is running. */ 1118/* Checking whether input method is running. */
1030/* INTPROTO */
1031Bool 1119bool
1032rxvt_IMisRunning(pR) 1120rxvt_term::IMisRunning ()
1033{ 1121{
1034 char *p; 1122 char *p;
1035 Atom atom; 1123 Atom atom;
1036 Window win; 1124 Window win;
1037 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
1038 1126
1039/* get current locale modifier */ 1127 /* get current locale modifier */
1040 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1129 {
1041 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
1042 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1043 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1044 *p = '\0'; 1133 *p = '\0';
1045 1134
1046 atom = XInternAtom(R->Xdisplay, server, False); 1135 atom = XInternAtom (display->display, server, False);
1047 win = XGetSelectionOwner(R->Xdisplay, atom); 1136 win = XGetSelectionOwner (display->display, atom);
1048 if (win != None) 1137 if (win != None)
1049 return True; 1138 return True;
1050 } 1139 }
1051 return False; 1140 return False;
1052} 1141}
1053 1142
1054/* EXTPROTO */
1055void 1143void
1056rxvt_IMSendSpot(pR) 1144rxvt_term::IMSendSpot ()
1057{ 1145{
1058 XPoint spot; 1146 XPoint spot;
1059 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
1060 1148
1061 if (R->Input_Context == NULL 1149 if (Input_Context == NULL
1062 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1063 || !(R->event_type == KeyPress 1151 || ! (event_type == KeyPress
1064 || R->event_type == Expose 1152 || event_type == Expose
1065 || R->event_type == NoExpose 1153 || event_type == NoExpose
1066 || R->event_type == SelectionNotify 1154 || event_type == SelectionNotify
1067 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
1068 || !rxvt_IMisRunning(aR)) 1156 || !IMisRunning ())
1069 return; 1157 return;
1070 1158
1071 rxvt_setPosition(aR_ & spot); 1159 im_set_position (&spot);
1072 1160
1073 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1074 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1075 XFree(preedit_attr); 1163 XFree (preedit_attr);
1076} 1164}
1077 1165
1078/* EXTPROTO */
1079void 1166void
1080rxvt_setTermFontSet(pR_ int idx)
1081{
1082 char *string;
1083 long length;
1084 int success = 0;
1085
1086 if (idx < 0 || idx >= MAX_NFONTS)
1087 return;
1088}
1089
1090/* INTPROTO */
1091void
1092rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1093 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1094{ 1169{
1095 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1096 1171
1097 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1098 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1174
1099 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1100 mbh -= R->TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1101 1177
1102 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1103 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1104 1180
1105 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1106 + vtx;
1107 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1108 1183
1109 status_rect->x = vtx; 1184 status_rect->x = vtx;
1110 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1111 1186
1112 status_rect->width = needed_rect->width ? needed_rect->width 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1113 : Width2Pixel(R->TermWin.ncol + 1);
1114 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1115} 1189}
1116 1190
1117/* ARGSUSED */
1118/* INTPROTO */
1119void 1191void
1120rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1192rxvt_term::im_destroy ()
1121 __attribute__ ((unused)), XPointer call_data
1122 __attribute__ ((unused)))
1123{ 1193{
1124 dR; 1194 if (Input_Context)
1125 1195 {
1196 XDestroyIC (Input_Context);
1126 R->Input_Context = NULL; 1197 Input_Context = NULL;
1127/* To avoid Segmentation Fault in C locale: Solaris only? */ 1198 }
1128 if (STRCMP(R->locale, "C")) 1199
1129 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1200 if (input_method)
1130 rxvt_IMInstantiateCallback, NULL); 1201 {
1202 display->put_xim (input_method);
1203 input_method = 0;
1204 }
1131} 1205}
1132 1206
1133/* 1207/*
1134 * X manual pages and include files don't match on some systems: 1208 * Try to open a XIM with the current modifiers, then see if we can
1135 * some think this is an XIDProc and others an XIMProc so we can't 1209 * open a suitable preedit type
1136 * use the first argument - need to update this to be nice for
1137 * both types via some sort of configure detection
1138 */ 1210 */
1139/* ARGSUSED */ 1211bool
1140/* EXTPROTO */ 1212rxvt_term::IM_get_IC (const char *modifiers)
1141void
1142rxvt_IMInstantiateCallback(Display * unused
1143 __attribute__ ((unused)), XPointer client_data
1144 __attribute__ ((unused)), XPointer call_data
1145 __attribute__ ((unused)))
1146{ 1213{
1147 dR; 1214 int i, j, found;
1215 XIM xim;
1216 XPoint spot;
1217 XRectangle rect, status_rect, needed_rect;
1218 unsigned long fg, bg;
1219 const char *p;
1220 char **s;
1221 XIMStyles *xim_styles;
1222 XVaNestedList preedit_attr, status_attr;
1223
1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1225 return false;
1226
1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1228 input_method = display->get_xim (locale, modifiers);
1229 if (input_method == NULL)
1230 return false;
1231
1232 xim = input_method->xim;
1233
1234 xim_styles = NULL;
1235 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1236 || !xim_styles || !xim_styles->count_styles)
1237 {
1238 display->put_xim (input_method);
1239 return false;
1240 }
1241
1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1243 s = rxvt_splitcommastring (p);
1244 for (i = found = 0; !found && s[i]; i++)
1245 {
1246 if (!STRCMP (s[i], "OverTheSpot"))
1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1248 else if (!STRCMP (s[i], "OffTheSpot"))
1249 input_style = (XIMPreeditArea | XIMStatusArea);
1250 else if (!STRCMP (s[i], "Root"))
1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1252
1253 for (j = 0; j < xim_styles->count_styles; j++)
1254 if (input_style == xim_styles->supported_styles[j])
1255 {
1256 found = 1;
1257 break;
1258 }
1259 }
1260
1261 for (i = 0; s[i]; i++)
1262 free (s[i]);
1263
1264 free (s);
1265 XFree (xim_styles);
1266
1267 if (!found)
1268 {
1269 display->put_xim (input_method);
1270 return false;
1271 }
1272
1273 preedit_attr = status_attr = NULL;
1274
1275 if (input_style & XIMPreeditPosition)
1276 {
1277 im_set_size (&rect);
1278 im_set_position (&spot);
1279 im_set_color (&fg, &bg);
1280
1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1282 XNSpotLocation, &spot,
1283 XNForeground, fg, XNBackground, bg,
1284 //XNFontSet, TermWin.fontset,
1285 NULL);
1286 }
1287 else if (input_style & XIMPreeditArea)
1288 {
1289 im_set_color (&fg, &bg);
1290
1291 /*
1292 * The necessary width of preedit area is unknown
1293 * until create input context.
1294 */
1295 needed_rect.width = 0;
1296
1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1298
1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1300 XNForeground, fg, XNBackground, bg,
1301 //XNFontSet, TermWin.fontset,
1302 NULL);
1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1304 XNForeground, fg, XNBackground, bg,
1305 //XNFontSet, TermWin.fontset,
1306 NULL);
1307 }
1308
1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1310 XNClientWindow, TermWin.parent[0],
1311 XNFocusWindow, TermWin.parent[0],
1312 preedit_attr ? XNPreeditAttributes : NULL,
1313 preedit_attr,
1314 status_attr ? XNStatusAttributes : NULL,
1315 status_attr, NULL);
1316 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr);
1318
1319 if (Input_Context == NULL)
1320 {
1321 rxvt_print_error ("failed to create input context");
1322 display->put_xim (input_method);
1323 return false;
1324 }
1325
1326 if (input_style & XIMPreeditArea)
1327 IMSetStatusPosition ();
1328
1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1330 return true;
1331}
1332
1333void
1334rxvt_term::im_cb ()
1335{
1148 int i, found, had_im; 1336 int i, found, had_im;
1149 const char *p; 1337 const char *p;
1150 char **s; 1338 char **s;
1151 char buf[IMBUFSIZ]; 1339 char buf[IMBUFSIZ];
1152 1340
1341 im_destroy ();
1342
1153 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1154 if (R->Input_Context) 1344 if (Input_Context)
1155 return; 1345 return;
1156 1346
1157#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1158 if (R->rs[Rs_imLocale]) 1348 if (rs[Rs_imLocale])
1159 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1349 SET_LOCALE (rs[Rs_imLocale]);
1160#endif 1350#endif
1161 1351
1162 p = R->rs[Rs_inputMethod]; 1352 p = rs[Rs_inputMethod];
1163 if (p && *p) 1353 if (p && *p)
1164 { 1354 {
1165 bool found = false; 1355 bool found = false;
1166 1356
1167 s = rxvt_splitcommastring (p); 1357 s = rxvt_splitcommastring (p);
… …
1169 { 1359 {
1170 if (*s[i]) 1360 if (*s[i])
1171 { 1361 {
1172 STRCPY (buf, "@im="); 1362 STRCPY (buf, "@im=");
1173 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1363 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1174 if ((p = XSetLocaleModifiers (buf)) && *p 1364 if (IM_get_IC (buf))
1175 && rxvt_IM_get_IC (aR))
1176 { 1365 {
1177 found = true; 1366 found = true;
1178 break; 1367 break;
1179 } 1368 }
1180 } 1369 }
1181 } 1370 }
1182 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1183 free(s[i]); 1372 free (s[i]);
1184 free(s); 1373 free (s);
1185 1374
1186 if (found) 1375 if (found)
1187 goto done; 1376 goto done;
1188 } 1377 }
1189 1378
1190/* try with XMODIFIERS env. var. */ 1379 /* try with XMODIFIERS env. var. */
1191 if ((p = XSetLocaleModifiers ("")) && *p 1380 if (IM_get_IC (""))
1192 && rxvt_IM_get_IC (aR))
1193 goto done; 1381 goto done;
1194 1382
1195/* try with no modifiers base IF the user didn't specify an IM */ 1383 /* try with no modifiers base IF the user didn't specify an IM */
1196 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1384 if (IM_get_IC ("@im=none"))
1197 && rxvt_IM_get_IC (aR) == True)
1198 goto done; 1385 goto done;
1199 1386
1200done: 1387done:
1201#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1202 if (R->rs[Rs_imLocale]) 1389 if (rs[Rs_imLocale])
1203 setlocale (LC_CTYPE, R->locale); 1390 SET_LOCALE (locale);
1204#endif 1391#endif
1205} 1392}
1206 1393
1207/*
1208 * Try to open a XIM with the current modifiers, then see if we can
1209 * open a suitable preedit type
1210 */
1211/* INTPROTO */
1212Bool
1213rxvt_IM_get_IC(pR)
1214{
1215 int i, j, found;
1216 XIM xim;
1217 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg;
1220 const char *p;
1221 char **s;
1222 XIMStyles *xim_styles;
1223 XVaNestedList preedit_attr, status_attr;
1224 XIMCallback ximcallback;
1225
1226 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1227 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1228 if (xim == NULL)
1229 return False;
1230
1231 xim_styles = NULL;
1232 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1233 || !xim_styles || !xim_styles->count_styles) {
1234 XCloseIM(xim);
1235 return False;
1236 }
1237
1238 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1239 : "OverTheSpot,OffTheSpot,Root";
1240 s = rxvt_splitcommastring(p);
1241 for (i = found = 0; !found && s[i]; i++) {
1242 if (!STRCMP(s[i], "OverTheSpot"))
1243 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1244 else if (!STRCMP(s[i], "OffTheSpot"))
1245 R->input_style = (XIMPreeditArea | XIMStatusArea);
1246 else if (!STRCMP(s[i], "Root"))
1247 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1248
1249 for (j = 0; j < xim_styles->count_styles; j++)
1250 if (R->input_style == xim_styles->supported_styles[j]) {
1251 found = 1;
1252 break;
1253 }
1254 }
1255 for (i = 0; s[i]; i++)
1256 free(s[i]);
1257 free(s);
1258 XFree(xim_styles);
1259
1260 if (!found) {
1261 XCloseIM(xim);
1262 return False;
1263 }
1264
1265 ximcallback.callback = rxvt_IMDestroyCallback;
1266
1267/* XXX: not sure why we need this (as well as IC one below) */
1268 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1269
1270 preedit_attr = status_attr = NULL;
1271
1272 if (R->input_style & XIMPreeditPosition) {
1273 rxvt_setSize(aR_ & rect);
1274 rxvt_setPosition(aR_ & spot);
1275 rxvt_setColor(aR_ & fg, &bg);
1276
1277 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1278 XNSpotLocation, &spot,
1279 XNForeground, fg, XNBackground, bg,
1280 //XNFontSet, R->TermWin.fontset,
1281 NULL);
1282 } else if (R->input_style & XIMPreeditArea) {
1283 rxvt_setColor(aR_ & fg, &bg);
1284
1285 /*
1286 * The necessary width of preedit area is unknown
1287 * until create input context.
1288 */
1289 needed_rect.width = 0;
1290
1291 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1292
1293 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1294 XNForeground, fg, XNBackground, bg,
1295 //XNFontSet, R->TermWin.fontset,
1296 NULL);
1297 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1298 XNForeground, fg, XNBackground, bg,
1299 //XNFontSet, R->TermWin.fontset,
1300 NULL);
1301 }
1302 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1303 XNClientWindow, R->TermWin.parent[0],
1304 XNFocusWindow, R->TermWin.parent[0],
1305 XNDestroyCallback, &ximcallback,
1306 preedit_attr ? XNPreeditAttributes : NULL,
1307 preedit_attr,
1308 status_attr ? XNStatusAttributes : NULL,
1309 status_attr, NULL);
1310 if (preedit_attr)
1311 XFree(preedit_attr);
1312 if (status_attr)
1313 XFree(status_attr);
1314 if (R->Input_Context == NULL) {
1315 rxvt_print_error("failed to create input context");
1316 XCloseIM(xim);
1317 return False;
1318 }
1319 if (R->input_style & XIMPreeditArea)
1320 rxvt_IMSetStatusPosition(aR);
1321 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1322 return True;
1323}
1324
1325/* EXTPROTO */
1326void 1394void
1327rxvt_IMSetStatusPosition(pR) 1395rxvt_term::IMSetStatusPosition ()
1328{ 1396{
1329 XRectangle preedit_rect, status_rect, *needed_rect; 1397 XRectangle preedit_rect, status_rect, *needed_rect;
1330 XVaNestedList preedit_attr, status_attr; 1398 XVaNestedList preedit_attr, status_attr;
1331 1399
1332 if (R->Input_Context == NULL 1400 if (Input_Context == NULL
1333 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1334 || !rxvt_IMisRunning(aR)) 1402 || !IMisRunning ())
1335 return; 1403 return;
1336 1404
1337/* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1338 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1339 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1340 XFree(status_attr); 1408 XFree (status_attr);
1341 1409
1342 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1343 1411
1344 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1345 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1346 1414
1347 XSetICValues(R->Input_Context, 1415 XSetICValues (Input_Context,
1348 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1349 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1350 1418
1351 XFree(preedit_attr); 1419 XFree (preedit_attr);
1352 XFree(status_attr); 1420 XFree (status_attr);
1353} 1421}
1354#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1355 1423
1356/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1357rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

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