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.18 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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