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.33 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 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.
… …
79 vt_ev (this, &rxvt_term::x_cb), 80 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 81#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 82 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 83#endif
83#ifdef MENUBAR 84#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 85 menubar_ev (this, &rxvt_term::x_cb),
85#endif 86#endif
86#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 89#endif
89#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
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),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
94#endif 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);
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 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
135
136 delete PixColors;
137
138 displays.put (display);
110 139
111 scr_release (); 140 scr_release ();
112 141
113 free (env_windowid); 142 free (env_windowid);
114 free (env_display); 143 free (env_display);
115 free (env_term); 144 free (env_term);
116 free (env_colorfgbg); 145 free (env_colorfgbg);
117 free (locale); 146 free (locale);
118 free (codeset); 147 free (codeset);
119 148
120#ifndef NO_SETOWNER_TTYDEV
121 privileged_ttydev (RESTORE);
122#endif
123#ifdef UTMP_SUPPORT
124 privileged_utmp (RESTORE);
125#endif
126
127 // TODO: free pixcolours, colours should become part of rxvt_display
128
129 delete PixColors;
130 delete TermWin.fontset;
131
132 displays.put (display);
133
134 delete envv; 149 delete envv;
135 delete argv; 150 delete argv;
136} 151}
137 152
138void 153void
139rxvt_term::destroy () 154rxvt_term::destroy ()
140{ 155{
141 if (display) 156 if (display)
142 { 157 {
143 if (TermWin.parent[0])
144 XDestroyWindow (display->display, TermWin.parent[0]);
145
146 rootwin_ev.stop (display); 158 rootwin_ev.stop (display);
147 termwin_ev.stop (display); 159 termwin_ev.stop (display);
148 vt_ev.stop (display); 160 vt_ev.stop (display);
149
150#ifdef USE_XIM 161#ifdef USE_XIM
151 im_destroy (); 162 im_destroy ();
152 im_ev.stop (display); 163 im_ev.stop (display);
153#endif 164#endif
154#ifdef HAVE_SCROLLBARS 165#ifdef HAVE_SCROLLBARS
… …
247 258
248 const char **cmd_argv = init_resources (argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
249 260
250 set_locale (""); 261 set_locale ("");
251 262
252#if (MENUBAR_MAX) 263#if MENUBAR_MAX
253 menubar_read (rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
254#endif 265#endif
255#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
256 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
257 scrollBar.setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
… …
260 create_windows (argc, argv); 271 create_windows (argc, argv);
261 272
262 init_xlocale (); 273 init_xlocale ();
263 274
264 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
265#ifdef RXVT_GRAPHICS
266 Gr_reset (); /* reset graphics */
267#endif
268 276
269#if 0 277#if 0
270#ifdef DEBUG_X
271 XSynchronize (display->display, True); 278 XSynchronize (display->display, True);
272#endif
273#endif 279#endif
274 280
275#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
276 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
277 resize_scrollbar (); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
278#endif 284#endif
279#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
280 if (menubar_visible (r)) 286 if (menubar_visible ())
281 XMapWindow (display->display, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
282#endif 288#endif
283#ifdef TRANSPARENT 289#ifdef TRANSPARENT
284 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
285 { 291 {
… …
718 * init = 1 - initialize 724 * init = 1 - initialize
719 * 725 *
720 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
721 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
722 */ 728 */
723void 729bool
724rxvt_term::change_font (int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
725{} 731{
732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
726 743
727void 744 if (fs && fs->populate (fontname))
745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 // TODO: screen needs to be told about new fonts
753
754 if (TermWin.parent[0])
755 {
756 resize_all_windows (0, 0, 0);
757 scr_remap_chars ();
758 scr_touch (true);
759 }
760
761 return true;
762 }
763 }
764
765 return false;
766}
767
768bool
728rxvt_term::font_up_down (int n, int direction) 769rxvt_term::font_up_down (int n, int direction)
729{} 770{
771 return false;
772}
730 773
731/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
732/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
733/* xterm sequences - title, iconName, color (exptl) */ 776/* xterm sequences - title, iconName, color (exptl) */
734void 777void
… …
995 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1038 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
996 1039
997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1040 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
998 window_vt_y, TermWin_TotalWidth (), 1041 window_vt_y, TermWin_TotalWidth (),
999 TermWin_TotalHeight ()); 1042 TermWin_TotalHeight ());
1000#ifdef RXVT_GRAPHICS
1001 if (old_height)
1002 Gr_Resize (old_width - szHint.base_width,
1003 old_height - szHint.base_height);
1004#endif
1005 scr_clear (); 1043 scr_clear ();
1006#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1007 resize_pixmap (); 1045 resize_pixmap ();
1008#endif 1046#endif
1009 1047
… …
1315 if (Input_Context) 1353 if (Input_Context)
1316 return; 1354 return;
1317 1355
1318#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1319 if (rs[Rs_imLocale]) 1357 if (rs[Rs_imLocale])
1320 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1358 SET_LOCALE (rs[Rs_imLocale]);
1321#endif 1359#endif
1322 1360
1323 p = rs[Rs_inputMethod]; 1361 p = rs[Rs_inputMethod];
1324 if (p && *p) 1362 if (p && *p)
1325 { 1363 {
… …
1356 goto done; 1394 goto done;
1357 1395
1358done: 1396done:
1359#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1397#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1360 if (rs[Rs_imLocale]) 1398 if (rs[Rs_imLocale])
1361 setlocale (LC_CTYPE, locale); 1399 SET_LOCALE (locale);
1362#endif 1400#endif
1363} 1401}
1364 1402
1365void 1403void
1366rxvt_term::IMSetStatusPosition () 1404rxvt_term::IMSetStatusPosition ()

Diff Legend

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