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.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.142 by root, Sat Feb 19 04:16:49 2005 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */
36 35
37#include <csignal> 36#include <csignal>
38#include <cstring> 37#include <cstring>
39 38
40#ifdef TTY_GID_SUPPORT 39#ifdef TTY_GID_SUPPORT
… …
253 //if (menuBar.win) 252 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win); 253 // XDestroyWindow (disp, menuBar.win);
255#endif 254#endif
256 delete TermWin.drawable; 255 delete TermWin.drawable;
257 // destroy all windows 256 // destroy all windows
258 if (TermWin.parent[0] && !rs[Rs_embed]) 257 if (TermWin.parent[0]
258#if ENABLE_XEMBED
259 && !rs[Rs_embed]
260#endif
261 )
259 XDestroyWindow (disp, TermWin.parent[0]); 262 XDestroyWindow (disp, TermWin.parent[0]);
260 } 263 }
261 264
262 // TODO: free pixcolours, colours should become part of rxvt_display 265 // TODO: free pixcolours, colours should become part of rxvt_display
263 266
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
587 590
588 return p; 591 return p;
589} 592}
590 593
591/* INTPROTO */
592void * 594void *
593rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
594{ 596{
595 void *p = calloc (number, size); 597 void *p = calloc (number, size);
596 598
… …
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
599 601
600 return p; 602 return p;
601} 603}
602 604
603/* INTPROTO */
604void * 605void *
605rxvt_realloc (void *ptr, size_t size) 606rxvt_realloc (void *ptr, size_t size)
606{ 607{
607 void *p = realloc (ptr, size); 608 void *p = realloc (ptr, size);
608 609
… …
844 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
845 846
846#if 0 847#if 0
847 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
848 if (cmd_pid) /* force through to the command */ 849 if (cmd_pid) /* force through to the command */
849 kill (cmd_pid, SIGWINCH); 850 kill (-cmd_pid, SIGWINCH);
850#endif 851#endif
851} 852}
852 853
853/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
854/* set_fonts () - load and set the various fonts 855/* set_fonts () - load and set the various fonts
… …
1249 XWindowAttributes wattr; 1250 XWindowAttributes wattr;
1250 1251
1251 if (width == 0 || height == 0) 1252 if (width == 0 || height == 0)
1252 { 1253 {
1253 XGetWindowAttributes (display->display, display->root, &wattr); 1254 XGetWindowAttributes (display->display, display->root, &wattr);
1255
1254 if (width == 0) 1256 if (width == 0)
1255 width = wattr.width - szHint.base_width; 1257 width = wattr.width - szHint.base_width;
1256 if (height == 0) 1258 if (height == 0)
1257 height = wattr.height - szHint.base_height; 1259 height = wattr.height - szHint.base_height;
1258 } 1260 }

Diff Legend

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