Download as
Browse Code »

Commit 52364eddcde4823f8d80fe849535da92da31cb34

Authored by Perry Werneck
Committed by GitHub
2 parents aafda80f 4ae4ae0a
Exists in develop

Merge pull request #4 from PerryWerneck/develop 

Updating master after testing the develop version.
Showing 4 changed files with 15 additions and 3 deletions   Show diff stats
@@ -30,3 +30,5 @@ doxygen/html @@ -30,3 +30,5 @@ doxygen/html
30 *.lib 30 *.lib
31 *.exp 31 *.exp
32 *.pot 32 *.pot
  33 +*~
  34 +
client/src/session/remote/private.h
  Diff comments   View file @52364ed
@@ -167,6 +167,7 @@ @@ -167,6 +167,7 @@
167 unsigned short setCursor(unsigned short row, unsigned short col) override; 167 unsigned short setCursor(unsigned short row, unsigned short col) override;
168 unsigned short getCursorAddress() override; 168 unsigned short getCursorAddress() override;
169 Session::Cursor getCursorPosition() override; 169 Session::Cursor getCursorPosition() override;
  170 +
170 void setProperty(const char *name, const int value) override; 171 void setProperty(const char *name, const int value) override;
171 void setProperty(const char *name, const unsigned int value) override; 172 void setProperty(const char *name, const unsigned int value) override;
172 void setProperty(const char *name, const bool value) override; 173 void setProperty(const char *name, const bool value) override;
server/src/core/windows/start.c
  Diff comments   View file @52364ed
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 #include <lib3270/actions.h> 32 #include <lib3270/actions.h>
33 #include <lib3270/properties.h> 33 #include <lib3270/properties.h>
34 #include <lib3270/log.h> 34 #include <lib3270/log.h>
  35 +#include <lib3270/win32.h>
35 #include <ipc-glib.h> 36 #include <ipc-glib.h>
36 37
37 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) { 38 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) {
@@ -72,6 +73,12 @@ void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUS @@ -72,6 +73,12 @@ void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUS
72 73
73 g_message("Got session \"%c\"",id); 74 g_message("Got session \"%c\"",id);
74 75
  76 + // Update registry
  77 + {
  78 + g_autofree gchar * session_name = g_strdup_printf("%s:%c",name,id);
  79 + lib3270_win32_set_string(PACKAGE_NAME,"last_session",session_name);
  80 + }
  81 +
75 lib3270_set_session_id(ipc->hSession, id); 82 lib3270_set_session_id(ipc->hSession, id);
76 83
77 ipc->source->hPipe = hPipe; 84 ipc->source->hPipe = hPipe;
win/Makefile.msc
  Diff comments   View file @52364ed
@@ -34,6 +34,7 @@ OBJ_FILES= \ @@ -34,6 +34,7 @@ OBJ_FILES= \
34 client\src\core\events.obj \ 34 client\src\core\events.obj \
35 client\src\core\session.obj \ 35 client\src\core\session.obj \
36 client\src\core\windows\attribute.obj \ 36 client\src\core\windows\attribute.obj \
  37 + client\src\core\windows\dynamic\init.obj \
37 client\src\core\windows\pop.obj \ 38 client\src\core\windows\pop.obj \
38 client\src\core\windows\push.obj \ 39 client\src\core\windows\push.obj \
39 client\src\core\windows\request.obj \ 40 client\src\core\windows\request.obj \
@@ -48,13 +49,12 @@ OBJ_FILES= \ @@ -48,13 +49,12 @@ OBJ_FILES= \
48 client\src\host\string.obj \ 49 client\src\host\string.obj \
49 client\src\session\action.obj \ 50 client\src\session\action.obj \
50 client\src\session\get.obj \ 51 client\src\session\get.obj \
51 - client\src\session\set.obj \  
52 - client\src\session\tools.obj \  
53 client\src\session\local\actions.obj \ 52 client\src\session\local\actions.obj \
54 client\src\session\local\attribute.obj \ 53 client\src\session\local\attribute.obj \
55 client\src\session\local\events.obj \ 54 client\src\session\local\events.obj \
56 client\src\session\local\get.obj \ 55 client\src\session\local\get.obj \
57 client\src\session\local\init.obj \ 56 client\src\session\local\init.obj \
  57 + client\src\session\local\properties.obj \
58 client\src\session\local\set.obj \ 58 client\src\session\local\set.obj \
59 client\src\session\local\wait.obj \ 59 client\src\session\local\wait.obj \
60 client\src\session\remote\actions.obj \ 60 client\src\session\remote\actions.obj \
@@ -65,7 +65,9 @@ OBJ_FILES= \ @@ -65,7 +65,9 @@ OBJ_FILES= \
65 client\src\session\remote\tools.obj \ 65 client\src\session\remote\tools.obj \
66 client\src\session\remote\wait.obj \ 66 client\src\session\remote\wait.obj \
67 client\src\session\remote\windows\request.obj \ 67 client\src\session\remote\windows\request.obj \
68 - client\src\session\remote\windows\session.obj 68 + client\src\session\remote\windows\session.obj \
  69 + client\src\session\set.obj \
  70 + client\src\session\tools.obj
69 71
70 .cc.obj: 72 .cc.obj:
71 @echo Compiling... 73 @echo Compiling...