diff -uNr gau-0.4.1.orig/Makefile.am gau-0.4.1/Makefile.am --- gau-0.4.1.orig/Makefile.am Fri Aug 6 21:29:43 1999 +++ gau-0.4.1/Makefile.am Wed Sep 22 22:19:04 1999 @@ -1,6 +1,6 @@ INCLUDES = -DHANGUL=1 -DUSE_XIM $(GTK_CFLAGS) -bin_PROGRAMS = gau +bin_PROGRAMS = gau gaui AUTOHEADER = true gau_SOURCES = \ @@ -30,7 +30,11 @@ tcp.c \ util.c \ zmodem.c \ - gnome-login-support.c + gnome-login-support.c \ + menu.c \ + help.c \ + connect.c \ + toolbar.c gau_LDADD = $(GTK_LIBS) $(UTIL_LIBS) @@ -112,8 +116,14 @@ rc/xpm/bluetree.xpm \ rc/xpm/flag.xpm.1 \ rc/xpm/flag.xpm.3 \ - rc/xpm/flag.xpm.5 - + rc/xpm/flag.xpm.5 \ + rc/xpm/connect.xpm \ + rc/xpm/disconnect.xpm \ + rc/xpm/chat.xpm \ + rc/xpm/capture.xpm \ + rc/xpm/write.xpm \ + rc/xpm/down.xpm \ + rc/xpm/up.xpm EXTRA_DIST = \ autogen.sh $(xpms) gau.spec.in $(rc_all) $(doc_all) $(misc_all) diff -uNr gau-0.4.1.orig/Makefile.in gau-0.4.1/Makefile.in --- gau-0.4.1.orig/Makefile.in Fri Aug 6 22:14:31 1999 +++ gau-0.4.1/Makefile.in Wed Sep 22 22:19:14 1999 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -45,9 +45,10 @@ AUTOMAKE = @AUTOMAKE@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -70,10 +71,10 @@ INCLUDES = -DHANGUL=1 -DUSE_XIM $(GTK_CFLAGS) -bin_PROGRAMS = gau +bin_PROGRAMS = gau gaui AUTOHEADER = true -gau_SOURCES = anipixmap.c ansiinput.c ansiterm.c autores.c bottom-menu.c chat.c control.c cphone.c dial.c gau.c gauchat.c iselect.c iselectmod.c misc.c modem.c mymenubar.c pty.c script.c scrolledchat.c scw.c selection.c signal.c status.c tcp.c util.c zmodem.c gnome-login-support.c +gau_SOURCES = anipixmap.c ansiinput.c ansiterm.c autores.c bottom-menu.c chat.c control.c cphone.c dial.c gau.c gauchat.c iselect.c iselectmod.c misc.c modem.c mymenubar.c pty.c script.c scrolledchat.c scw.c selection.c signal.c status.c tcp.c util.c zmodem.c gnome-login-support.c menu.c help.c connect.c toolbar.c gau_LDADD = $(GTK_LIBS) $(UTIL_LIBS) @@ -93,7 +94,7 @@ misc_all = misc/lrz/lrz.c.patch misc/grimview/Makefile misc/grimview/gzillabytesink.c misc/grimview/gzillabytesink.h misc/grimview/gzillagif.c misc/grimview/gzillagif.h misc/grimview/gzillaimage.c misc/grimview/gzillaimage.h misc/grimview/gzillaimgsink.c misc/grimview/gzillaimgsink.h misc/grimview/gzillajpeg.c misc/grimview/gzillajpeg.h misc/grimview/gzillastatus.h misc/grimview/grimview.c -rc_all = rc/auto-response rc/chollian.menu rc/gtkrc rc/now.menu rc/hitel.menu rc/phonelist rc/telnet-menu rc/chat-binding rc/gaurc rc/modem-menu rc/cap/INFO rc/down/INFO rc/script/INFO rc/script/01420.scr rc/script/hitel.scr rc/script/now.scr rc/script/01421.scr rc/script/chol-login.scr rc/script/local rc/script/snu.scr rc/script/114.scr rc/script/hitel-login.scr rc/script/now-login.scr rc/script/unitel.scr rc/xpm/INFO rc/xpm/flag.xpm.0 rc/xpm/flag.xpm.2 rc/xpm/flag.xpm.4 rc/xpm/flower.xpm rc/xpm/bluetree.xpm rc/xpm/flag.xpm.1 rc/xpm/flag.xpm.3 rc/xpm/flag.xpm.5 +rc_all = rc/auto-response rc/chollian.menu rc/gtkrc rc/now.menu rc/hitel.menu rc/phonelist rc/telnet-menu rc/chat-binding rc/gaurc rc/modem-menu rc/cap/INFO rc/down/INFO rc/script/INFO rc/script/01420.scr rc/script/hitel.scr rc/script/now.scr rc/script/01421.scr rc/script/chol-login.scr rc/script/local rc/script/snu.scr rc/script/114.scr rc/script/hitel-login.scr rc/script/now-login.scr rc/script/unitel.scr rc/xpm/INFO rc/xpm/flag.xpm.0 rc/xpm/flag.xpm.2 rc/xpm/flag.xpm.4 rc/xpm/flower.xpm rc/xpm/bluetree.xpm rc/xpm/flag.xpm.1 rc/xpm/flag.xpm.3 rc/xpm/flag.xpm.5 rc/xpm/connect.xpm rc/xpm/disconnect.xpm rc/xpm/chat.xpm rc/xpm/capture.xpm rc/xpm/write.xpm rc/xpm/down.xpm rc/xpm/up.xpm EXTRA_DIST = autogen.sh $(xpms) gau.spec.in $(rc_all) $(doc_all) $(misc_all) @@ -113,9 +114,14 @@ bottom-menu.o chat.o control.o cphone.o dial.o gau.o gauchat.o \ iselect.o iselectmod.o misc.o modem.o mymenubar.o pty.o script.o \ scrolledchat.o scw.o selection.o signal.o status.o tcp.o util.o \ -zmodem.o gnome-login-support.o +zmodem.o gnome-login-support.o menu.o help.o connect.o toolbar.o gau_DEPENDENCIES = gau_LDFLAGS = +gaui_SOURCES = gaui.c +gaui_OBJECTS = gaui.o +gaui_LDADD = $(LDADD) +gaui_DEPENDENCIES = +gaui_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) CFLAGS = @CFLAGS@ @@ -132,18 +138,26 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best -SOURCES = $(gau_SOURCES) -OBJECTS = $(gau_OBJECTS) +DEP_FILES = .deps/anipixmap.P .deps/ansiinput.P .deps/ansiterm.P \ +.deps/autores.P .deps/bottom-menu.P .deps/chat.P .deps/connect.P \ +.deps/control.P .deps/cphone.P .deps/dial.P .deps/gau.P .deps/gauchat.P \ +.deps/gaui.P .deps/gnome-login-support.P .deps/help.P .deps/iselect.P \ +.deps/iselectmod.P .deps/menu.P .deps/misc.P .deps/modem.P \ +.deps/mymenubar.P .deps/pty.P .deps/script.P .deps/scrolledchat.P \ +.deps/scw.P .deps/selection.P .deps/signal.P .deps/status.P .deps/tcp.P \ +.deps/toolbar.P .deps/util.P .deps/zmodem.P +SOURCES = $(gau_SOURCES) gaui.c +OBJECTS = $(gau_OBJECTS) gaui.o all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -203,8 +217,8 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -214,9 +228,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -323,63 +334,56 @@ -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile $(mkinstalldirs) $(distdir)/doc $(distdir)/misc/grimview \ $(distdir)/misc/lrz $(distdir)/rc $(distdir)/rc/cap \ $(distdir)/rc/down $(distdir)/rc/script $(distdir)/rc/xpm @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -anipixmap.o: anipixmap.c anipixmap.h -ansiinput.o: ansiinput.c ansiterm.h gau.h scrolledchat.h gauchat.h -ansiterm.o: ansiterm.c config.h gaupath.h ansiterm.h gau.h \ - scrolledchat.h gauchat.h -autores.o: autores.c gau.h ansiterm.h scrolledchat.h gauchat.h config.h \ - gaupath.h -bottom-menu.o: bottom-menu.c config.h gaupath.h ansiterm.h gau.h \ - scrolledchat.h gauchat.h -chat.o: chat.c gau.h ansiterm.h scrolledchat.h gauchat.h config.h \ - gaupath.h -control.o: control.c config.h gaupath.h mymenubar.h anipixmap.h \ - ansiterm.h gau.h scrolledchat.h gauchat.h -cphone.o: cphone.c config.h gaupath.h gau.h ansiterm.h scrolledchat.h \ - gauchat.h checked.xpm -dial.o: dial.c config.h gaupath.h ansiterm.h gau.h scrolledchat.h \ - gauchat.h -gau.o: gau.c config.h gaupath.h ansiterm.h selection.h gau.h \ - scrolledchat.h gauchat.h scw.h -gauchat.o: gauchat.c gau.h ansiterm.h scrolledchat.h gauchat.h -gnome-login-support.o: gnome-login-support.c config.h gaupath.h \ - gnome-login-support.h -iselect.o: iselect.c gau.h ansiterm.h scrolledchat.h gauchat.h config.h \ - gaupath.h -iselectmod.o: iselectmod.c -misc.o: misc.c config.h gaupath.h anipixmap.h gau.h ansiterm.h \ - scrolledchat.h gauchat.h -modem.o: modem.c config.h gaupath.h ansiterm.h gau.h scrolledchat.h \ - gauchat.h -mymenubar.o: mymenubar.c mymenubar.h -pty.o: pty.c config.h gaupath.h gnome-login-support.h -script.o: script.c config.h gaupath.h gau.h ansiterm.h scrolledchat.h \ - gauchat.h -scrolledchat.o: scrolledchat.c scrolledchat.h gauchat.h scw.h -scw.o: scw.c scw.h -selection.o: selection.c ansiterm.h gau.h scrolledchat.h gauchat.h -signal.o: signal.c config.h gaupath.h -status.o: status.c gau.h ansiterm.h scrolledchat.h gauchat.h -tcp.o: tcp.c config.h gaupath.h gau.h ansiterm.h scrolledchat.h \ - gauchat.h -util.o: util.c config.h gaupath.h gau.h ansiterm.h scrolledchat.h \ - gauchat.h -zmodem.o: zmodem.c config.h gaupath.h gau.h ansiterm.h scrolledchat.h \ - gauchat.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -406,7 +410,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(HEADERS) config.h all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) @@ -421,25 +425,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags \ + mostlyclean-compile mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-generic clean-am + distclean-tags distclean-depend distclean-generic \ + clean-am distclean: distclean-am -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am + maintainer-clean-depend maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -452,12 +458,14 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck all-recursive-am install-exec-local install-exec-am \ -install-exec install-data-local install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck all-recursive-am install-exec-local \ +install-exec-am install-exec install-data-local install-data-am \ +install-data install-am install uninstall-am uninstall all-redirect \ +all-am all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean all: gaui diff -uNr gau-0.4.1.orig/connect.c gau-0.4.1/connect.c --- gau-0.4.1.orig/connect.c Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/connect.c Mon Sep 20 00:14:55 1999 @@ -0,0 +1,82 @@ +#include "gau.h" + +#define LOCALHOST "localhost" + +/* Global Variable */ + +/* Connect DialogBox */ +static GtkWidget *connect_dialog; +static GtkWidget *connect_label; +static GtkWidget *connect_entry; +static GtkWidget *connect_ok_button; +static GtkWidget *connect_cancel_button; + +/* "수동 접속..." 메뉴를 선택하였을 때 호출되는 함수 */ +void +connect_cb (GtkWidget *widget, gpointer data) +{ + /* Create Dialog */ + connect_dialog = gtk_dialog_new(); + gtk_widget_set_usize(GTK_WIDGET(connect_dialog), 300, 150); + gtk_window_set_title(GTK_WINDOW(connect_dialog), "수동 접속"); + + /* Create Label */ + connect_label = gtk_label_new ("접속할 호스트의 이름 또는 IP 주소를 입력하세요:"); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (connect_dialog)->vbox), + connect_label, TRUE, TRUE, 0); + gtk_widget_show(connect_label); + + /* Create Entry */ + connect_entry = gtk_entry_new(); + gtk_entry_set_text (GTK_ENTRY (connect_entry), LOCALHOST); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (connect_dialog)->vbox), + connect_entry, TRUE, TRUE, 0); + gtk_widget_show(connect_entry); + + /* Create Ok Button */ + connect_ok_button = gtk_button_new_with_label ("Ok"); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (connect_dialog)->action_area), + connect_ok_button, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(connect_ok_button), "clicked", + GTK_SIGNAL_FUNC(connect_ok), NULL); + gtk_widget_show(connect_ok_button); + + /* Create Cancel Button */ + connect_cancel_button = gtk_button_new_with_label ("Cancel"); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (connect_dialog)->action_area), + connect_cancel_button, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(connect_cancel_button), "clicked", + GTK_SIGNAL_FUNC(connect_cancel), NULL); + gtk_widget_show(connect_cancel_button); + + /* Ok 버튼을 기본 버튼으로 정함 */ + gtk_widget_grab_focus(connect_ok_button); + + gtk_widget_show(connect_dialog); +} + +/* 접속 다이얼로그에서 Ok를 눌렀을 때 호출하는 함수 */ +void +connect_ok(GtkWidget *widget, gpointer data) +{ + /* 텔넷 접속 */ + /* hostname = gtk_entry_get_text(GTK_ENTRY(connect_entry)) */ + telnet_connect(gtk_entry_get_text(GTK_ENTRY(connect_entry)), NULL, NULL); + + /* 접속 다이얼로그 파괴 */ + gtk_widget_destroy (connect_dialog); +} + +/* 접속 다이얼로그에서 Cancel를 눌렀을 때 취소하는 함수 */ +void +connect_cancel(GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy (connect_dialog); +} + +/* "연결 끊기" 메뉴를 선택하였을 때 호출되는 함수 */ +void +disconnect_cb (GtkWidget *widget, gpointer data) +{ + telnet_hangup(); +} diff -uNr gau-0.4.1.orig/control.c gau-0.4.1/control.c --- gau-0.4.1.orig/control.c Sat Jul 24 15:10:05 1999 +++ gau-0.4.1/control.c Sat Sep 18 07:42:50 1999 @@ -55,29 +55,6 @@ GtkWidget *cancel_button, *chat_button; GtkWidget *write_button; -void capture_cb(GtkWidget * w, gpointer data); -void exit_cb(GtkWidget * w, gpointer data); -void disconnect_after_transfer_toggle_cb(GtkWidget * w, gpointer data); -void modem_attr_cb(GtkWidget * w, gpointer data); -void screen_save_cb(GtkWidget * w, gpointer data); -void chat_cb(GtkWidget * w, gpointer data); -void cancel_cb(GtkWidget * w, gpointer data); -void etc_menu_create(GtkWidget * w); -void script_menu_create(GtkWidget * box); -void nohang_exit_cb(void); -void screen_reset(void); -void run_scriptfile(GtkWidget * w, char *filename); -void toggle_local_echo(void); -void toggle_auto_response(GtkWidget * w, gpointer index); -void toggle_remote_echo(void); -void give_shell(void); -static void write_cb(GtkWidget * w, gpointer data); -static gint write_fragment(gpointer data); -static void write_signal_child_handler(void); -static void query_script_command(void); -static void set_crlf(GtkWidget * w, gpointer data); - - GtkWidget * add_menu_item (GtkWidget *menu, char *label, GtkSignalFunc func, gpointer data) { @@ -634,7 +611,7 @@ } -static void set_crlf(GtkWidget * w, gpointer data) +void set_crlf(GtkWidget * w, gpointer data) { crlf = GPOINTER_TO_INT(data); } diff -uNr gau-0.4.1.orig/gau.c gau-0.4.1/gau.c --- gau-0.4.1.orig/gau.c Sun Jul 4 00:10:35 1999 +++ gau-0.4.1/gau.c Sat Sep 18 13:05:24 1999 @@ -1,7 +1,6 @@ /* this file is a part of gau software, (C) Hwang chi-deok 1997, 1998, 1999 */ /* - * 이 프로그램의 저작권은 황치덕에게 있습니다. * 이 프로그램은 GNU GENERAL PUBLIC LICENSE에 의거 배포됩니다. * 이 프로그램의 사용으로인한 어떠한 신체적, 정신적, @@ -83,12 +82,15 @@ GtkWidget *hbox, *frame; GtkWidget *sc; GtkWidget *separator; + GtkWidget *menubar; + GtkWidget *toolbar; int i; + + gtk_init(&argc, &argv); check_personal_rc(); gtk_set_locale(); - gtk_init(&argc, &argv); if (strcmp(g_basename(argv[0]), "gaui") == 0) { extern int crlf; use_modem = FALSE; @@ -144,20 +146,30 @@ GTK_SIGNAL_FUNC(gtk_main_quit), NULL); gau_set_title(NULL); gtk_widget_set_name(main_win, "main"); - gtk_container_set_border_width(GTK_CONTAINER(main_win), 5); + gtk_container_set_border_width(GTK_CONTAINER(main_win), 1); - main_box = gtk_vbox_new(FALSE, 3); + main_box = gtk_vbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(main_win), main_box); + + /* 메인 메뉴 붙이기 */ + get_main_menu(main_win, &menubar); + gtk_box_pack_start(GTK_BOX(main_box), menubar, FALSE, TRUE, 0); + gtk_widget_show(menubar); + + /* 툴바 붙이기 */ + toolbar = get_toolbar(main_win); + gtk_container_add ( GTK_CONTAINER ( main_box ) , toolbar ); + gtk_widget_show(toolbar); - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_hbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(main_box), hbox); frame = gtk_frame_new(NULL); - gtk_container_set_border_width(GTK_CONTAINER(frame), 3); + gtk_container_set_border_width(GTK_CONTAINER(frame), 1); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_OUT); gtk_container_add(GTK_CONTAINER(hbox), frame); - term_box = gtk_vbox_new (FALSE, 0); + term_box = gtk_vbox_new (FALSE, 1); gtk_container_add(GTK_CONTAINER(frame), term_box); sc = scw_new (); diff -uNr gau-0.4.1.orig/gau.h gau-0.4.1/gau.h --- gau-0.4.1.orig/gau.h Thu Aug 5 21:23:54 1999 +++ gau-0.4.1/gau.h Sat Sep 18 13:55:17 1999 @@ -104,6 +104,27 @@ GtkWidget * add_menu_item (GtkWidget *menu, char *label, GtkSignalFunc func, gpointer data); void hangup_cb(GtkWidget *w, gpointer data); void screen_save_cb(GtkWidget * w, gpointer data); +void capture_cb(GtkWidget * w, gpointer data); +void exit_cb(GtkWidget * w, gpointer data); +void disconnect_after_transfer_toggle_cb(GtkWidget * w, gpointer data); +void modem_attr_cb(GtkWidget * w, gpointer data); +void screen_save_cb(GtkWidget * w, gpointer data); +void chat_cb(GtkWidget * w, gpointer data); +void cancel_cb(GtkWidget * w, gpointer data); +void etc_menu_create(GtkWidget * w); +void script_menu_create(GtkWidget * box); +void nohang_exit_cb(void); +void screen_reset(void); +void run_scriptfile(GtkWidget * w, char *filename); +void toggle_local_echo(void); +void toggle_auto_response(GtkWidget * w, gpointer index); +void toggle_remote_echo(void); +void give_shell(void); +void write_cb(GtkWidget * w, gpointer data); +gint write_fragment(gpointer data); +void write_signal_child_handler(void); +void query_script_command(void); +void set_crlf(GtkWidget * w, gpointer data); /* i_select.c */ void i_select_init(void); @@ -254,4 +275,23 @@ void check_personal_rc (void); char *get_string_from_user(char *label_text); +/* menu.c */ +void get_main_menu(GtkWidget *window, GtkWidget ** menubar); +void gtk_ifactory_cb (gpointer callback_data, guint callback_action, + GtkWidget *widget); + +/* help.c */ +void help_cb (GtkWidget *widget, gpointer data); +void help_cb_ok (GtkWidget *widget, gpointer data); +void about (GtkWidget *widget, gpointer data); +void about_ok (GtkWidget *widget, gpointer data); + +/* connect.c */ +void connect_cb (GtkWidget *widget, gpointer data); +void connect_ok(GtkWidget *widget, gpointer data); +void connect_cancel(GtkWidget *widget, gpointer data); +void disconnect_cb (GtkWidget *widget, gpointer data); + +/* toolbar.c */ +GtkWidget* get_toolbar(GtkWidget *window); #endif /* __GAU_H__ */ diff -uNr gau-0.4.1.orig/help.c gau-0.4.1/help.c --- gau-0.4.1.orig/help.c Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/help.c Sat Sep 18 18:21:27 1999 @@ -0,0 +1,87 @@ +#include "gau.h" +#include "config.h" +#include + +/* Global Variables */ +static GtkWidget *help_dialog; +static GtkWidget *about_dialog; + +/* "도움말-목차" 메뉴를 선택하면 호출되는 함수 */ +void +help_cb (GtkWidget *widget, gpointer data) +{ + GtkWidget *label; + GtkWidget *ok_button; + + /* 다이얼로그 생성 */ + help_dialog = gtk_dialog_new(); + + gtk_widget_set_usize(GTK_WIDGET(help_dialog), 500, 500); + gtk_window_set_title(GTK_WINDOW(help_dialog), "도움말"); + /* 도움말 라벨 - 파일 읽어 표시하는 것으로 고칠것... */ + label = gtk_label_new ("도움말입니다.\n여러분이 채워주실 곳이지요. =)"); + //label = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (help_dialog)->vbox), + label, TRUE, TRUE, 0); + gtk_widget_show(label); + + /* "Ok" 버튼 */ + ok_button = gtk_button_new_with_label ("Ok"); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (help_dialog)->action_area), + ok_button, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(ok_button), "clicked", + GTK_SIGNAL_FUNC(help_cb_ok), NULL); + /* set Ok Button as default */ + gtk_widget_grab_focus(ok_button); + + gtk_widget_show(ok_button); + + gtk_widget_show(help_dialog); +} + +void +help_cb_ok (GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy (help_dialog); +} + +/* "도움말-가우에 관하여..." 메뉴를 선택하면 호출되는 함수 */ +void +about (GtkWidget *widget, gpointer data) +{ + GtkWidget *about_label; + GtkWidget *about_ok_button; + char str[BUFSIZ]; + + /* Create Dialog */ + about_dialog = gtk_dialog_new(); + gtk_widget_set_usize(GTK_WIDGET(about_dialog), 300, 200); + gtk_window_set_title(GTK_WINDOW(about_dialog), "가우에 관하여..."); + + /* Create Label */ + sprintf(str, "가우\n%s\n\n(C) 황치덕 1997, 1998, 1999\n\nX 윈도우용 터미널 에뮬레이터, 통신 프로그램", VERSION); + about_label = gtk_label_new (str); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about_dialog)->vbox), + about_label, TRUE, TRUE, 0); + gtk_widget_show(about_label); + + /* Create Ok Button */ + about_ok_button = gtk_button_new_with_label ("Ok"); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about_dialog)->action_area), + about_ok_button, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(about_ok_button), "clicked", + GTK_SIGNAL_FUNC(about_ok), NULL); + gtk_widget_show(about_ok_button); + + /* set Ok Button as default */ + gtk_widget_grab_focus(about_ok_button); + + gtk_widget_show(about_dialog); +} + +/* Ok를 눌렀을 경우 호출되는 함수 */ +void +about_ok(GtkWidget *widget, gpointer data) +{ + gtk_widget_destroy (about_dialog); +} diff -uNr gau-0.4.1.orig/menu.c gau-0.4.1/menu.c --- gau-0.4.1.orig/menu.c Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/menu.c Sat Sep 18 14:00:50 1999 @@ -0,0 +1,133 @@ +/* example-start menu itemfactory.c */ + +#include "gau.h" +#include + +/* This is the GtkItemFactoryEntry structure used to generate new menus. + Item 1: The menu path. The letter after the underscore indicates an + accelerator key once the menu is open. + Item 2: The accelerator key for the entry + Item 3: The callback function. + Item 4: The callback action. This changes the parameters with + which the function is called. The default is 0. + Item 5: The item type, used to define what kind of an item it is. + Here are the possible values: + + NULL -> "" + "" -> "" + "" -> create a title item + "<Item>" -> create a simple item + "<CheckItem>" -> create a check item + "<ToggleItem>" -> create a toggle item + "<RadioItem>" -> create a radio item + <path> -> path of a radio item to link against + "<Separator>" -> create a separator + "<Branch>" -> create an item to hold sub items + "<LastBranch>" -> create a right justified branch +*/ + +static GtkItemFactoryEntry menu_items[] = { + {"/파일", NULL, NULL, 0, "<Branch>"}, + {"/파일/수동 접속...", NULL, connect_cb, 0, NULL}, + {"/파일/접속 끊기", NULL, disconnect_cb, 0, NULL}, + {"/파일/sep1", NULL, NULL, 0, "<Separator>"}, + {"/파일/끝내기", NULL, exit_cb, 0, NULL}, + {"/도구", NULL, NULL, 0, "<Branch>"}, + {"/도구/글쓰기", NULL, write_cb, 0, NULL}, + {"/도구/이야기 마당", NULL, chat_cb, 0, NULL}, + {"/도구/자동 반응...", NULL, ar_setup_cb, 0, NULL}, + {"/도구/sep1", NULL, NULL, 0, "<Separator>"}, + {"/도구/갈무리...", NULL, capture_cb, 0, NULL}, + {"/도구/화면 저장", NULL, screen_save_cb, 0, NULL}, + {"/도구/모든 화면 저장", NULL, screen_save_cb, 1, NULL}, /* 화면 저장과 동일하게 동작하므로 고칠 것 */ + {"/도구/화면 지움", NULL, screen_reset, 0, NULL}, + {"/도구/sep1", NULL, NULL, 0, "<Separator>"}, + {"/도구/파일 받기", NULL, run_rz, 0, NULL}, + {"/도구/파일 보내기", NULL, run_sz, 0, NULL}, + {"/옵션", NULL, NULL, 0, "<Branch>"}, + {"/옵션/라인피드", NULL, gtk_ifactory_cb, 1, "<CheckItem>"}, + {"/옵션/자동 파일 받기", NULL, gtk_ifactory_cb, 2, "<CheckItem>"}, + {"/옵션/자동 파일 보내기", NULL, gtk_ifactory_cb, 3, "<CheckItem>"}, + {"/옵션/갈무리때 ^M 없앰", NULL, gtk_ifactory_cb, 4, "<CheckItem>"}, + {"/옵션/Enter Key 바인딩", NULL, NULL, 0, "<Branch>"}, + {"/옵션/Enter Key 바인딩/CR", NULL, gtk_ifactory_cb, 5, "<RadioItem>"}, + {"/옵션/Enter Key 바인딩/LF", NULL, gtk_ifactory_cb, 6, "/옵션/Enter Key 바인딩/CR"}, + {"/옵션/Enter Key 바인딩/CR+LF", NULL, gtk_ifactory_cb, 7, "/옵션/Enter Key 바인딩/CR"}, + {"/도움말", NULL, NULL, 0, "<LastBranch>"}, + {"/도움말/목차", NULL, help_cb, 0, NULL}, + {"/도움말/sep1", NULL, NULL, 0, "<Separator>"}, + {"/도움말/가우에 관하여...", NULL, about, 0, NULL}, +}; + +/* RadioItem, CheckItem의 상태가 바뀔때 호출되는 Wrapper Function +또다른 해당 함수를 호출한다. */ +void +gtk_ifactory_cb (gpointer callback_data, + guint callback_action, + GtkWidget *widget) +{ + g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget)); + g_message ("guint = %d", callback_action ); + switch (callback_action) { + case 1: /* 라인피드*/ + break; + + case 2: /* 자동 파일 받기 */ + break; + + case 3: /* 자동 파일 보내기 */ + break; + + case 4: /* 갈무리때 ^M 없앰 */ + break; + + case 5: /* Enter Key => CR */ + break; + + case 6: /* Enter Key => LF */ + break; + + case 7: /* Enter Key => CR+LF */ + break; + + default: + g_message("gtk_ifactory_cb case문 실패 !"); + break; + + } + +} + +/* 메인 윈도우에서 메인 메뉴를 생성하는 함수 */ +void get_main_menu(GtkWidget *window, GtkWidget ** menubar) { + int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); + GtkItemFactory *item_factory; + GtkAccelGroup *accel_group; + + accel_group = gtk_accel_group_new(); + + /* This function initializes the item factory. + Param 1: The type of menu - can be GTK_TYPE_MENU_BAR, GTK_TYPE_MENU, + or GTK_TYPE_OPTION_MENU. + Param 2: The path of the menu. + Param 3: A pointer to a gtk_accel_group. The item factory sets up + the accelerator table while generating menus. + */ + + item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", + accel_group); + + /* This function generates the menu items. Pass the item factory, + the number of items in the array, the array itself, and any + callback data for the the menu items. */ + gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL); + + /* Attach the new accelerator group to the window. */ + gtk_accel_group_attach (accel_group, GTK_OBJECT (window)); + + if (menubar) + /* Finally, return the actual menu bar created by the item factory. */ + *menubar = gtk_item_factory_get_widget(item_factory, "<main>"); +} + +/* example-end */ diff -uNr gau-0.4.1.orig/rc/gtkrc gau-0.4.1/rc/gtkrc --- gau-0.4.1.orig/rc/gtkrc Thu Aug 6 19:36:16 1998 +++ gau-0.4.1/rc/gtkrc Sat Sep 18 07:04:11 1999 @@ -43,3 +43,4 @@ widget "*Button*" style "button" widget "*Menu*" style "button" widget "*main*" style "normal" +widget "*Dialog*" style "normal" diff -uNr gau-0.4.1.orig/rc/xpm/capture.xpm gau-0.4.1/rc/xpm/capture.xpm --- gau-0.4.1.orig/rc/xpm/capture.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/capture.xpm Sat Sep 18 07:31:46 1999 @@ -0,0 +1,31 @@ +/* XPM */ +static char*fullscreen[]={ +"22 22 6 1", +"b c #808080", +"a c #c0c0c0", +"# c #000000", +". c None", +"d c #c0ffff", +"c c #ffffff", +"......................", +"......................", +"......................", +"......................", +".....############.....", +"....#aaaaaaaaaaaa#....", +"....#abbbbbbbbbba#....", +"....#ab########ca#....", +"....#ab#dd#####ca#....", +"....#ab########ca#....", +"....#ab########ca#....", +"....#ab########ca#....", +"....#ab########ca#....", +"....#ab########ca#....", +"....#aaaaaaaaaaaa#....", +"....#bbbbbbbbbbbb#....", +".....############.....", +"......................", +"......................", +"......................", +"......................", +"......................"}; diff -uNr gau-0.4.1.orig/rc/xpm/chat.xpm gau-0.4.1/rc/xpm/chat.xpm --- gau-0.4.1.orig/rc/xpm/chat.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/chat.xpm Sat Sep 18 07:31:30 1999 @@ -0,0 +1,38 @@ +/* XPM */ +static char * ksirc_dock_xpm[] = { +"24 24 11 1", +" c None", +". c #303030", +"+ c #00FF00", +"@ c #008200", +"# c #0000FF", +"$ c #00C300", +"% c #0000C7", +"& c #000086", +"* c #000000", +"= c #FFFF00", +"- c #C7C300", +" ....... ", +" ..++++++@.. ", +" .++++++++###. ", +" .#++++++$@####. ", +" .##+++++++$@####. ", +" .###@++++++$@#####. ", +" .$###+++$$+@#####+. ", +" .#$###@+$@#$######$#. ", +" .$@####@+##########@. ", +" .%######@$@########%. ", +" .%%########@######%%. ", +" .%%%#######+$$###%%%. ", +" .&%%%#####$+++$%%%%&. ", +" .*****####@+++*****&. ", +" *=====*%%%%$+*=====* ", +" *=======*%%%%*=======* ", +"*-=====*==*%%*-**==**==*", +"*-====**==*%@*-*===*===*", +"*-========*&&*-========*", +"*-========*&&*-========*", +"*-====****...*-=*===*==*", +" *-===* *-=***==* ", +" *----* *-----* ", +" ***** ***** "}; diff -uNr gau-0.4.1.orig/rc/xpm/connect.xpm gau-0.4.1/rc/xpm/connect.xpm --- gau-0.4.1.orig/rc/xpm/connect.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/connect.xpm Sat Sep 18 07:31:09 1999 @@ -0,0 +1,22 @@ +/* XPM */ +static char * mini_connected_xpm[] = { +"16 14 5 1", +" c None", +". c #000000000000", +"X c #84207BDE7BDE", +"o c #F7BC10844210", +"O c #FFFFFFFF0000", +" ", +" ", +" .", +" XXXXXX ..", +" XooooooX ..", +" XXooooooooX..", +" XOOoooooooX ..", +" XO..ooooooooX..", +" XO. XooooooX ..", +"XO. XXXXXX ..", +"XO. .", +"XO. ", +" ", +" "}; diff -uNr gau-0.4.1.orig/rc/xpm/disconnect.xpm gau-0.4.1/rc/xpm/disconnect.xpm --- gau-0.4.1.orig/rc/xpm/disconnect.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/disconnect.xpm Sat Sep 18 07:31:13 1999 @@ -0,0 +1,22 @@ +/* XPM */ +static char * mini-connect_xpm[] = { +"16 14 5 1", +" c None", +". c black", +"X c gray50", +"o c red", +"O c yellow", +" ", +" . ", +" X .X ", +" XooX . ", +" Xoooo .X ", +" XooooooX ", +" XooooooX ", +" XoooooX. ", +" XooooX. ", +" XOXXXX. ", +" XOXX... ", +" XOXX ", +" XX ", +" X "}; diff -uNr gau-0.4.1.orig/rc/xpm/down.xpm gau-0.4.1/rc/xpm/down.xpm --- gau-0.4.1.orig/rc/xpm/down.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/down.xpm Sat Sep 18 07:40:32 1999 @@ -0,0 +1,29 @@ +/* XPM */ +static char * d_xpm[] = { +/* width height num_colors chars_per_pixel */ +"20 20 3 1", +/* colors */ +" s None c None", +". c #000000", +"X c #008080", +/* pixels */ +" ", +" ", +" ", +" .............. ", +" .XXXXXXXXXXXX. ", +" .XXXXXXXXXX. ", +" .XXXXXXXXXX. ", +" .XXXXXXXX. ", +" .XXXXXXXX. ", +" .XXXXXX. ", +" .XXXXXX. ", +" .XXXX. ", +" .XXXX. ", +" .XX. ", +" .XX. ", +" .. ", +" .. ", +" ", +" ", +" "}; diff -uNr gau-0.4.1.orig/rc/xpm/up.xpm gau-0.4.1/rc/xpm/up.xpm --- gau-0.4.1.orig/rc/xpm/up.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/up.xpm Sat Sep 18 07:40:36 1999 @@ -0,0 +1,29 @@ +/* XPM */ +static char * u_xpm[] = { +/* width height num_colors chars_per_pixel */ +"20 20 3 1", +/* colors */ +" s None c None", +". c #000000", +"X c #008080", +/* pixels */ +" ", +" ", +" ", +" .. ", +" .. ", +" .XX. ", +" .XX. ", +" .XXXX. ", +" .XXXX. ", +" .XXXXXX. ", +" .XXXXXX. ", +" .XXXXXXXX. ", +" .XXXXXXXX. ", +" .XXXXXXXXXX. ", +" .XXXXXXXXXX. ", +" .XXXXXXXXXXXX. ", +" .............. ", +" ", +" ", +" "}; diff -uNr gau-0.4.1.orig/rc/xpm/write.xpm gau-0.4.1/rc/xpm/write.xpm --- gau-0.4.1.orig/rc/xpm/write.xpm Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/rc/xpm/write.xpm Sat Sep 18 07:40:24 1999 @@ -0,0 +1,36 @@ +/* XPM */ +static char*kwrite[]={ +"16 16 17 1", +"o c #808080", +"k c #ffa858", +"h c #a0a0a4", +"d c #c0c0c0", +"a c #c05800", +"# c #000000", +"b c #ff8000", +"m c #004040", +"f c #ffff00", +"n c #303030", +"l c #800000", +"j c #ffdca8", +". c None", +"c c #c00000", +"i c #585858", +"e c #dcdcdc", +"g c #ffffff", +".........####...", +"........#abbc#..", +".......#dedbbb#.", +"......#bbdddbbc#", +".....#ffgbdhibc#", +"....#ffjkkbi#ic#", +"...#ffgkkki#dl#m", +"..#ffjkkkaai##mm", +".#kkbkkkaab##mm.", +".#jgjbkaab##mm..", +"#jgjjjbaba#mm...", +"#jjjjjbaa#mm....", +"#nojjkba#mm.....", +"##nkka##mm......", +"#####mmmm.......", +"...mmmm........."}; diff -uNr gau-0.4.1.orig/status.c gau-0.4.1/status.c --- gau-0.4.1.orig/status.c Wed Jul 21 22:28:36 1999 +++ gau-0.4.1/status.c Tue Sep 21 09:41:16 1999 @@ -30,7 +30,7 @@ status_bar(GtkWidget * box) { GtkWidget *frame; - GtkWidget *hbox; + //GtkWidget *hbox; status_label = gtk_label_new("가우"); gtk_box_pack_start(GTK_BOX(box), status_label, FALSE, FALSE, 2); @@ -45,7 +45,7 @@ gtk_container_add(GTK_CONTAINER(frame), time_label); // han input state - frame = gtk_frame_new(NULL); + /* frame = gtk_frame_new(NULL); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 5); @@ -53,7 +53,7 @@ gtk_container_add(GTK_CONTAINER(frame), hbox); han_input_label = gtk_label_new(" [영문] "); - gtk_container_add(GTK_CONTAINER(hbox), han_input_label); + gtk_container_add(GTK_CONTAINER(hbox), han_input_label); */ // in & out status report #if 0 diff -uNr gau-0.4.1.orig/toolbar.c gau-0.4.1/toolbar.c --- gau-0.4.1.orig/toolbar.c Thu Jan 1 09:00:00 1970 +++ gau-0.4.1/toolbar.c Sat Sep 18 18:10:57 1999 @@ -0,0 +1,111 @@ +#include "gau.h" +#include "gaupath.h" + +/* 툴바를 생성하는 함수 */ +GtkWidget* get_toolbar(GtkWidget *window) { + /* 툴바 */ + GtkWidget * toolbar; + GdkPixmap * icon; + GdkBitmap * mask; + GtkWidget * iconw; + GtkWidget * connect_button; + GtkWidget * disconnect_button; + GtkWidget * chat_button; + GtkWidget * capture_button; + + /* 툴바 붙이기 */ + toolbar = gtk_toolbar_new ( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH ); + + /* 아이콘 생성하고 툴바 아이템 붙이기 */ + /* now we create icon with mask: we'll reuse it to create + * icon widgets for toolbar items */ + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/connect.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); /* icon widget */ + connect_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), /* our toolbar */ + "접속", /* button label */ + "서버에 접속합니다", /* this button's tooltip */ + "Private", /* tooltip private info */ + iconw, /* icon widget */ + GTK_SIGNAL_FUNC (connect_cb), /* a signal */ + NULL ); + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/disconnect.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + disconnect_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "접속 끊기", + "접속을 끊습니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (disconnect_cb), + NULL ); + + gtk_toolbar_append_space ( GTK_TOOLBAR ( toolbar ) ); /*space after item*/ + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/chat.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + chat_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "이야기 마당", + "이야기를 합니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (chat_cb), + NULL ); + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/capture.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + capture_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "화면 저장", + "화면을 저장합니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (screen_save_cb), + 0 ); + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/write.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + capture_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "글쓰기", + "글을 씁니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (write_cb), + NULL ); + + gtk_toolbar_append_space ( GTK_TOOLBAR ( toolbar ) ); /*space after item*/ + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/down.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + capture_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "파일 받기", + "파일을 받습니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (run_rz), + NULL ); + + icon = gdk_pixmap_create_from_xpm( window->window, &mask, + &window->style->white, expand_path(GAU_PATH "/xpm/up.xpm")); + iconw = gtk_pixmap_new ( icon, mask ); + capture_button = + gtk_toolbar_append_item ( GTK_TOOLBAR (toolbar), + "파일 보내기", + "파일을 보냅니다", + "Private", + iconw, + GTK_SIGNAL_FUNC (run_sz), + NULL ); + + return toolbar; +} diff -uNr gau-0.4.1.orig/util.c gau-0.4.1/util.c --- gau-0.4.1.orig/util.c Sat Jul 24 15:14:51 1999 +++ gau-0.4.1/util.c Sat Sep 18 13:37:50 1999 @@ -14,15 +14,52 @@ #include "gau.h" +/* Ok를 눌렀을 경우 호출되는 함수 */ +void +ok_cb(GtkWidget *widget, gpointer data) +{ + exit(1); +} + + static void call_gau_install(void) { - fprintf (stderr, "먼저 gau-install을 실행시키십시오\n"); - fprintf (stderr, "gau-install은 가우실행에 필요한 개인 설정 파일들을\n"); - fprintf (stderr, "홈 디렉토리 아래 .gau라는 디렉토리아래로 복사해줄것입니다.\n"); - fprintf (stderr, "설명서를 잘 읽어보시고 각자의 상황에 맞도록 설정파일들을\n"); - fprintf (stderr, "고치신 후 다시 가우를 실행시키시기 바랍니다.\n"); - exit(1); + GtkWidget *window; + GtkWidget *label; + GtkWidget *button; + + /* gau-install */ + system("gau-install"); + + /* 다이얼로그 박스 띄우기 */ + window = gtk_dialog_new(); + gtk_window_set_title (GTK_WINDOW (window), "가우"); + + label = gtk_label_new ("설정 파일이 설치되지 않았습니다. 현재 설정 파일의 +설치를 마쳤습니다. 가우 실행에 필요한 개인 설정 파일들은 +홈 디렉토리 아래 .gau라는 디렉토리 아래로 복사됩니다. + +설명서를 잘 읽어보시고 여러분의 상황에 맞도록 설정파일들을 +고치신 후 다시 가우를 실행시키시기 바랍니다."); + + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), + label, TRUE, TRUE, 0); + gtk_widget_show (label); + + button = gtk_button_new_with_label ("Ok"); + /* "Ok" 콜백 함수 설정 */ + gtk_signal_connect(GTK_OBJECT(button), "clicked", \ + GTK_SIGNAL_FUNC(ok_cb), NULL); + + /* 버튼 붙이기 */ + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), + button, TRUE, TRUE, 0); + gtk_widget_show (button); + + gtk_widget_show (window); + + gtk_main(); } void ��