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.32 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.42 by pcg, Sun Feb 22 10:38:11 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 92#endif
92#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
94#endif 95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
95 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 103{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 105}
105 106
106rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
107{ 108{
108 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
109 close (cmd_fd); 110 close (cmd_fd);
110 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
111 scr_release (); 131 scr_release ();
112 132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
113 free (locale); 137 free (locale);
114 free (codeset); 138 free (codeset);
115 139
116#ifndef NO_SETOWNER_TTYDEV 140 delete envv;
117 privileged_ttydev (RESTORE); 141 delete argv;
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset;
127
128 displays.put (display);
129} 142}
130 143
131void 144void
132rxvt_term::destroy () 145rxvt_term::destroy ()
133{ 146{
134 if (display) 147 if (display)
135 { 148 {
136 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]);
138
139 rootwin_ev.stop (display); 149 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 150 termwin_ev.stop (display);
141 vt_ev.stop (display); 151 vt_ev.stop (display);
142
143#ifdef USE_XIM 152#ifdef USE_XIM
144 im_destroy (); 153 im_destroy ();
145 im_ev.stop (display); 154 im_ev.stop (display);
146#endif 155#endif
147#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
… …
253 create_windows (argc, argv); 262 create_windows (argc, argv);
254 263
255 init_xlocale (); 264 init_xlocale ();
256 265
257 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 267
262#if 0 268#if 0
263#ifdef DEBUG_X
264 XSynchronize (display->display, True); 269 XSynchronize (display->display, True);
265#endif
266#endif 270#endif
267 271
268#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
… …
284 rootwin_ev.start (display, display->root); 288 rootwin_ev.start (display, display->root);
285 289
286 XMapWindow (display->display, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
288 292
289 init_env ();
290 init_command (cmd_argv); 293 init_command (cmd_argv);
291 294
292 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
293 296
294 check_ev.start (); 297 check_ev.start ();
… …
712 * init = 1 - initialize 715 * init = 1 - initialize
713 * 716 *
714 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
716 */ 719 */
717void 720bool
718rxvt_term::change_font (int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
719{} 722{
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);
720 734
721void 735 if (fs && fs->populate (fontname))
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
722rxvt_term::font_up_down (int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
723{} 761{
762 return false;
763}
724 764
725/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
728void 768void
… …
873#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 914 xpmb = "default;";
875#endif 915#endif
876 break; 916 break;
877 } 917 }
918
878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv (env_colorfgbg);
880 920
881#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 923 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 924 {
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1030
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 1032 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 1033 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear (); 1034 scr_clear ();
1000#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1036 resize_pixmap ();
1002#endif 1037#endif
1003 1038
… …
1309 if (Input_Context) 1344 if (Input_Context)
1310 return; 1345 return;
1311 1346
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1348 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1349 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1350#endif
1316 1351
1317 p = rs[Rs_inputMethod]; 1352 p = rs[Rs_inputMethod];
1318 if (p && *p) 1353 if (p && *p)
1319 { 1354 {
… …
1350 goto done; 1385 goto done;
1351 1386
1352done: 1387done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1389 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1390 SET_LOCALE (locale);
1356#endif 1391#endif
1357} 1392}
1358 1393
1359void 1394void
1360rxvt_term::IMSetStatusPosition () 1395rxvt_term::IMSetStatusPosition ()

Diff Legend

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