Download as
Browse Code »

Commit f9c5ddcf81aa9efa27f1fb0f56c469d7d01af49e

Authored by Perry Werneck
1 parent 5f00f1c1
Exists in master and in 1 other branch develop

Ajustando processo de compilação de teste dos widgets.

Showing 6 changed files with 44 additions and 167 deletions   Show diff stats
Makefile.in
  Diff comments   View file @f9c5ddc
... ... @@ -34,7 +34,7 @@ SOURCES= \
34 34 $(wildcard src/dialogs/*.c)
35 35  
36 36 TEST_SOURCES= \
37   - $(wildcard testprogram/*.c)
  37 + $(wildcard src/testprogram/*.c)
38 38  
39 39 #---[ Tools ]----------------------------------------------------------------------------
40 40  
... ... @@ -341,7 +341,8 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
341 341  
342 342 @$(MKDIR) `dirname $@`
343 343 @echo $< ...
344   - @$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
  344 + $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
  345 +
345 346  
346 347 run: \
347 348 $(BINDBG)/$(LIBNAME)@EXEEXT@
... ...
src/include/v3270/filetransfer.h
  Diff comments   View file @f9c5ddc
... ... @@ -50,34 +50,34 @@
50 50 typedef struct _v3270ftClass v3270ftClass;
51 51  
52 52  
53   - GtkWidget * v3270ft_new(void);
54   - GType v3270ft_get_type(void);
55   - void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt);
56   - LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget);
57   - void v3270ft_reset(GtkWidget *widget);
58   - gboolean v3270ft_is_valid(GtkWidget *widget);
59   - guint v3270ft_get_length(GtkWidget *widget);
60   - void v3270ft_select_first(GtkWidget *widget);
61   - void v3270ft_select_last(GtkWidget *widget);
62   - void v3270ft_select_previous(GtkWidget *widget);
63   - void v3270ft_select_next(GtkWidget *widget);
64   - void v3270ft_remove_selected(GtkWidget *widget);
65   - void v3270ft_remove_all(GtkWidget *widget);
66   - void v3270ft_save(GtkWidget *widget,const gchar *filename);
67   - void v3270ft_load(GtkWidget *widget,const gchar *filename);
  53 + LIB3270_EXPORT GtkWidget * v3270ft_new(void);
  54 + LIB3270_EXPORT GType v3270ft_get_type(void);
  55 + LIB3270_EXPORT void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt);
  56 + LIB3270_EXPORT LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget);
  57 + LIB3270_EXPORT void v3270ft_reset(GtkWidget *widget);
  58 + LIB3270_EXPORT gboolean v3270ft_is_valid(GtkWidget *widget);
  59 + LIB3270_EXPORT guint v3270ft_get_length(GtkWidget *widget);
  60 + LIB3270_EXPORT void v3270ft_select_first(GtkWidget *widget);
  61 + LIB3270_EXPORT void v3270ft_select_last(GtkWidget *widget);
  62 + LIB3270_EXPORT void v3270ft_select_previous(GtkWidget *widget);
  63 + LIB3270_EXPORT void v3270ft_select_next(GtkWidget *widget);
  64 + LIB3270_EXPORT void v3270ft_remove_selected(GtkWidget *widget);
  65 + LIB3270_EXPORT void v3270ft_remove_all(GtkWidget *widget);
  66 + LIB3270_EXPORT void v3270ft_save(GtkWidget *widget,const gchar *filename);
  67 + LIB3270_EXPORT void v3270ft_load(GtkWidget *widget,const gchar *filename);
68 68  
69   - gboolean v3270ft_has_selected(GtkWidget *widget);
70   - gboolean v3270ft_has_next(GtkWidget *widget);
  69 + LIB3270_EXPORT gboolean v3270ft_has_selected(GtkWidget *widget);
  70 + LIB3270_EXPORT gboolean v3270ft_has_next(GtkWidget *widget);
71 71  
72   - const gchar * v3270ft_get_local_filename(GtkWidget *widget);
73   - const gchar * v3270ft_get_remote_filename(GtkWidget *widget);
  72 + LIB3270_EXPORT const gchar * v3270ft_get_local_filename(GtkWidget *widget);
  73 + LIB3270_EXPORT const gchar * v3270ft_get_remote_filename(GtkWidget *widget);
74 74  
75   - void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text);
76   - guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data);
  75 + LIB3270_EXPORT void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text);
  76 + LIB3270_EXPORT guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data);
77 77  
78   - gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED;
  78 + LIB3270_EXPORT gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED;
79 79  
80   - gint v3270ft_transfer(GtkWidget *dialog, H3270 *session);
  80 + LIB3270_EXPORT gint v3270ft_transfer(GtkWidget *dialog, H3270 *session);
81 81  
82 82 G_END_DECLS
83 83  
... ...
src/v3270/private.h
  Diff comments   View file @f9c5ddc
... ... @@ -27,7 +27,6 @@
27 27 *
28 28 */
29 29  
30   -#include <gtk/gtk.h>
31 30 #include <config.h>
32 31  
33 32 #define ENABLE_NLS
... ... @@ -36,9 +35,8 @@
36 35 #include <libintl.h>
37 36 #include <glib/gi18n.h>
38 37  
39   -#ifndef V3270_H_INCLUDED
40   - #include <v3270.h>
41   -#endif
  38 +#include <gtk/gtk.h>
  39 +#include <v3270.h>
42 40  
43 41 G_BEGIN_DECLS
44 42  
... ...
src/v3270ft/private.h
  Diff comments   View file @f9c5ddc
... ... @@ -32,6 +32,14 @@
32 32  
33 33 #define PRIVATE_H_INCLUDED 1
34 34  
  35 + #include <config.h>
  36 +
  37 + #define ENABLE_NLS
  38 + #define GETTEXT_PACKAGE PACKAGE_NAME
  39 +
  40 + #include <libintl.h>
  41 + #include <glib/gi18n.h>
  42 +
35 43 #include <v3270/filetransfer.h>
36 44 #include <v3270/ftprogress.h>
37 45 #include <lib3270.h>
... ...
src/v3270ft/testprogram.c
View file @5f00f1c
... ... @@ -1,132 +0,0 @@
1   -/*
2   - * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
3   - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4   - * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob
5   - * o nome G3270.
6   - *
7   - * Copyright (C) <2008> <Banco do Brasil S.A.>
8   - *
9   - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
10   - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
11   - * Free Software Foundation.
12   - *
13   - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
14   - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
15   - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
16   - * obter mais detalhes.
17   - *
18   - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
19   - * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
20   - * St, Fifth Floor, Boston, MA 02110-1301 USA
21   - *
22   - * Este programa está nomeado como testprogram.c e possui - linhas de código.
23   - *
24   - * Contatos:
25   - *
26   - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
27   - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
28   - *
29   - */
30   -
31   - #include <v3270.h>
32   - #include <v3270/filetransfer.h>
33   - #include <v3270/ftprogress.h>
34   - #include <stdlib.h>
35   -
36   - /*---[ Implement ]----------------------------------------------------------------------------------*/
37   -
38   -static gboolean popup_menu(GtkWidget *widget, gboolean selected, gboolean online, GdkEventButton *event, gpointer user_data) {
39   -
40   - if(!online)
41   - return FALSE;
42   -
43   - GtkWidget * dialog = v3270ft_new();
44   -
45   - v3270ft_load(dialog,"transfer.xml");
46   -
47   - gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(widget)));
48   -
49   - do {
50   -
51   - gtk_widget_show_all(dialog);
52   -
53   - switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
54   - case GTK_RESPONSE_APPLY:
55   - case GTK_RESPONSE_OK:
56   - case GTK_RESPONSE_YES:
57   - gtk_widget_hide(dialog);
58   - v3270ft_transfer(dialog,v3270_get_session(widget));
59   - break;
60   -
61   - case GTK_RESPONSE_CANCEL:
62   - case GTK_RESPONSE_NO:
63   - case GTK_RESPONSE_DELETE_EVENT:
64   - v3270ft_remove_all(dialog);
65   - break;
66   -
67   - default:
68   - g_warning("Unexpected response from v3270ft");
69   - }
70   -
71   - } while(v3270ft_get_length(dialog) > 0);
72   -
73   - gtk_widget_destroy(dialog);
74   -
75   - return TRUE;
76   -
77   -}
78   -
79   -static void activate(GtkApplication* app, gpointer user_data) {
80   -
81   - const gchar * search[] = {
82   -
83   - g_get_user_config_dir(),
84   - g_get_user_data_dir(),
85   - g_get_home_dir(),
86   - NULL
87   -
88   - };
89   -
90   - GtkWidget * window = gtk_application_window_new(app);
91   - GtkWidget * terminal = v3270_new();
92   - gchar * filename = NULL;
93   -
94   - // Setup terminal
95   - GKeyFile * conf = g_key_file_new();
96   -
97   - g_key_file_load_from_dirs(conf,"pw3270.conf",(const gchar **) search, &filename,G_KEY_FILE_NONE,NULL);
98   - g_message("Configuration from %s",filename);
99   -
100   - // v3270_set_from_keyfile(terminal,conf);
101   -
102   - g_key_file_unref(conf);
103   -
104   - v3270_connect(terminal);
105   -
106   - g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL);
107   -
108   - // Setup and show window
109   - gtk_window_set_title(GTK_WINDOW(window), "Window");
110   - gtk_window_set_position(GTK_WINDOW(window),GTK_WIN_POS_CENTER);
111   - gtk_window_set_default_size (GTK_WINDOW (window), 800, 500);
112   - gtk_container_add(GTK_CONTAINER(window),terminal);
113   - gtk_widget_show_all (window);
114   -
115   -}
116   -
117   -int main (int argc, char **argv) {
118   -
119   - GtkApplication *app;
120   - int status;
121   -
122   - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
123   -
124   - g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
125   -
126   - status = g_application_run (G_APPLICATION (app), argc, argv);
127   - g_object_unref (app);
128   -
129   - g_message("rc=%d",status);
130   - return status;
131   -}
132   -
v3270.cbp
  Diff comments   View file @f9c5ddc
... ... @@ -3,6 +3,7 @@
3 3 <FileVersion major="1" minor="6" />
4 4 <Project>
5 5 <Option title="3270 terminal widget for gtk" />
  6 + <Option makefile_is_custom="1" />
6 7 <Option pch_mode="2" />
7 8 <Option compiler="gcc" />
8 9 <Build>
... ... @@ -40,27 +41,28 @@
40 41 <Add option="`pkg-config --libs gtk+-3.0 lib3270`" />
41 42 <Add option="-fPIC" />
42 43 </Linker>
43   - <ExtraCommands>
44   - <Add before="/usr/bin/glib-genmarshal --prefix=v3270 --header src/v3270/v3270.marshal &gt; src/v3270/marshal.h" />
45   - <Add before="/usr/bin/glib-genmarshal --prefix=v3270ft --header src/v3270ft/v3270ft.marshal &gt; src/v3270ft/marshal.h" />
46   - </ExtraCommands>
47 44 <Unit filename="src/dialogs/hostselect.c">
48 45 <Option compilerVar="CC" />
49 46 </Unit>
50 47 <Unit filename="src/dialogs/hostselect.h" />
51 48 <Unit filename="src/include/accessible.h" />
  49 + <Unit filename="src/include/config.h" />
52 50 <Unit filename="src/include/hostselect.h" />
  51 + <Unit filename="src/include/v3270.h" />
  52 + <Unit filename="src/include/v3270/filetransfer.h" />
  53 + <Unit filename="src/include/v3270/ftprogress.h" />
  54 + <Unit filename="src/testprogram/testprogram.c">
  55 + <Option compilerVar="CC" />
  56 + </Unit>
53 57 <Unit filename="src/v3270/accessible.c">
54 58 <Option compilerVar="CC" />
55 59 </Unit>
56   - <Unit filename="src/v3270/accessible.h" />
57 60 <Unit filename="src/v3270/charset.c">
58 61 <Option compilerVar="CC" />
59 62 </Unit>
60 63 <Unit filename="src/v3270/draw.c">
61 64 <Option compilerVar="CC" />
62 65 </Unit>
63   - <Unit filename="src/v3270/hostselect.h" />
64 66 <Unit filename="src/v3270/iocallback.c">
65 67 <Option compilerVar="CC" />
66 68 </Unit>
... ...