Automatically set a default window size if unset

This resolves problems when the window manager does not set a default
size. I noticed this while using KDE3's KWin. Previously it went unfixed
because my main window manger always assigns a size. This should resolve
the problem.

  * Added DEFAULT_WINDOW_WIDTH and DEFAULT_WINDOW_HEIGHT
    * DEFAULT_WINDOW_WIDTH = 600
    * DEFAULT_WINDOW_HEIGHT =  800
  * If either height or width is missing from the svte configuration
    in the users directory, use the defaults.

3 files changed, 14 insertions, 6 deletions

diff --git a/config.mk b/config.mk
index 58b302f..e6b173a 100644
--- a/config.mk
+++ b/config.mk
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 # svte version:
 VERSION = 0.1.4.1
 
@@ -28,20 +27,16 @@ MANPREFIX = ${PREFIX}/share/man
 
 
 # includes and libs
-
 GTKINC=$(shell pkg-config --cflags gtk+-2.0 vte )
 GTKLIB=-lvte
 
 INCS = -I. -I/usr/include ${GTKINC}
 LIBS = -L/usr/lib -lc ${GTKLIB}
+
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
 CFLAGS = -mtune=native -std=gnu99 -O3 ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-
 # compiler and linker
 CC = cc
diff --git a/defaults.h b/defaults.h
index 3e36bf8..0cad826 100644
--- a/defaults.h
+++ b/defaults.h
@@ -42,6 +42,14 @@
 #define DEFAULT_ALLOW_BOLD TRUE
 #endif
 
+#ifndef DEFAULT_WINDOW_HEIGHT
+#define DEFAULT_WINDOW_HEIGHT 800
+#endif
+
+#ifndef DEFAULT_WINDOW_WIDTH
+#define DEFAULT_WINDOW_WIDTH 600
+#endif
+
 #ifndef DEFAULT_NUM_SCROLLBACK_LINES
 #define DEFAULT_NUM_SCROLLBACK_LINES -1
 #endif
diff --git a/svte.c b/svte.c
index 3cc4477..44827f6 100644
--- a/svte.c
+++ b/svte.c
@@ -572,6 +572,11 @@ static void parse_config_file(gchar *config_file) {
     config->font = DEFAULT_FONT;
   }
 
+  if (NULL == config->window_width || NULL == config->window_height) {
+    config->window_width = DEFAULT_WINDOW_WIDTH;
+    config->window_height = DEFAULT_WINDOW_HEIGHT;
+  }
+
   if(NULL == config->browser_command) {
     config->browser_command = DEFAULT_BROWSER_COMMAND; 
   }