Download as
Browse Code »

Commit f1a757a4f2d77206755fb3e22394c49f50648a79

Authored by Perry Werneck
1 parent 0c538e09
Exists in master

Incluindo mais métodos no serviço.

Showing 3 changed files with 197 additions and 165 deletions   Show diff stats
@@ -374,3 +374,29 @@ void pw3270_dbus_get_secure_state(PW3270Dbus *object, const gchar *id, DBusGMeth @@ -374,3 +374,29 @@ void pw3270_dbus_get_secure_state(PW3270Dbus *object, const gchar *id, DBusGMeth
374 dbus_g_method_return(context,(int) lib3270_get_secure(ses->host)); 374 dbus_g_method_return(context,(int) lib3270_get_secure(ses->host));
375 375
376 } 376 }
  377 +
  378 +void pw3270_dbus_get_is_protected_at(PW3270Dbus *object, const gchar *id, int row, int col, DBusGMethodInvocation *context) {
  379 +
  380 + struct session * ses = session_find(id);
  381 +
  382 + if(!ses) {
  383 + pw3270_dbus_return_error(context,ENOENT);
  384 + return;
  385 + }
  386 +
  387 + dbus_g_method_return(context,(int) lib3270_get_is_protected_at(ses->host, row, col));
  388 +
  389 +}
  390 +
  391 +void pw3270_dbus_get_is_protected(PW3270Dbus *object, const gchar *id, int baddr, DBusGMethodInvocation *context) {
  392 +
  393 + struct session * ses = session_find(id);
  394 +
  395 + if(!ses) {
  396 + pw3270_dbus_return_error(context,ENOENT);
  397 + return;
  398 + }
  399 +
  400 + dbus_g_method_return(context,(int) lib3270_get_is_protected(ses->host, baddr));
  401 +
  402 +}
src/pw3270service.xml
  Diff comments   View file @f1a757a
@@ -2,157 +2,172 @@ @@ -2,157 +2,172 @@
2 2
3 <node name="/br/com/bb/pw3270/service"> 3 <node name="/br/com/bb/pw3270/service">
4 4
5 - <interface name="br.com.bb.pw3270.service">  
6 -  
7 - <method name="getRevision">  
8 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
9 - <arg type="s" name="revision" direction="out" />  
10 - </method>  
11 -  
12 - <method name="getVersion">  
13 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
14 - <arg type="s" name="revision" direction="out" />  
15 - </method>  
16 -  
17 - <method name="createSession">  
18 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
19 - <arg type="s" name="id" direction="out" />  
20 - </method>  
21 -  
22 - <method name="destroySession">  
23 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
24 - <arg type="s" name="id" direction="in" />  
25 - <arg type="i" name="rc" direction="out" />  
26 - </method>  
27 -  
28 - <method name="connect">  
29 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
30 - <arg type="s" name="id" direction="in" />  
31 - <arg type="s" name="uri" direction="in" />  
32 - <arg type="i" name="rc" direction="out" />  
33 - </method>  
34 -  
35 - <method name="disconnect">  
36 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
37 - <arg type="s" name="id" direction="in" />  
38 - <arg type="i" name="rc" direction="out" />  
39 - </method>  
40 -  
41 - <method name="enter">  
42 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
43 - <arg type="s" name="id" direction="in" />  
44 - <arg type="i" name="result" direction="out" />  
45 - </method>  
46 -  
47 - <method name="pfKey">  
48 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
49 - <arg type="s" name="id" direction="in" />  
50 - <arg type="i" name="key" direction="in" />  
51 - <arg type="i" name="result" direction="out" />  
52 - </method>  
53 -  
54 - <method name="paKey">  
55 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
56 - <arg type="s" name="id" direction="in" />  
57 - <arg type="i" name="key" direction="in" />  
58 - <arg type="i" name="result" direction="out" />  
59 - </method>  
60 -  
61 - <method name="setTextAt">  
62 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
63 - <arg type="s" name="id" direction="in" />  
64 - <arg type="i" name="row" direction="in" />  
65 - <arg type="i" name="col" direction="in" />  
66 - <arg type="s" name="text" direction="in" />  
67 - <arg type="i" name="result" direction="out" />  
68 - </method>  
69 -  
70 - <method name="cmpTextAt">  
71 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
72 - <arg type="s" name="id" direction="in" />  
73 - <arg type="i" name="row" direction="in" />  
74 - <arg type="i" name="col" direction="in" />  
75 - <arg type="s" name="text" direction="in" />  
76 - <arg type="i" name="result" direction="out" />  
77 - </method>  
78 -  
79 - <method name="getTextAt">  
80 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
81 - <arg type="s" name="id" direction="in" />  
82 - <arg type="i" name="row" direction="in" />  
83 - <arg type="i" name="col" direction="in" />  
84 - <arg type="i" name="len" direction="in" />  
85 - <arg type="s" name="text" direction="out" />  
86 - </method>  
87 -  
88 - <method name="isReady">  
89 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
90 - <arg type="s" name="id" direction="in" />  
91 - <arg type="i" name="result" direction="out" />  
92 - </method>  
93 -  
94 - <method name="chkId">  
95 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
96 - <arg type="s" name="id" direction="in" />  
97 - <arg type="i" name="result" direction="out" />  
98 - </method>  
99 -  
100 - <method name="isConnected">  
101 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
102 - <arg type="s" name="id" direction="in" />  
103 - <arg type="i" name="result" direction="out" />  
104 - </method>  
105 -  
106 - <method name="getConnectionState">  
107 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
108 - <arg type="s" name="id" direction="in" />  
109 - <arg type="i" name="status" direction="out" />  
110 - </method>  
111 -  
112 - <method name="getScreenHeight">  
113 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
114 - <arg type="s" name="id" direction="in" />  
115 - <arg type="i" name="height" direction="out" />  
116 - </method>  
117 -  
118 - <method name="getScreenWidth">  
119 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
120 - <arg type="s" name="id" direction="in" />  
121 - <arg type="i" name="width" direction="out" />  
122 - </method>  
123 -  
124 - <method name="getScreenLength">  
125 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
126 - <arg type="s" name="id" direction="in" />  
127 - <arg type="i" name="length" direction="out" />  
128 - </method>  
129 -  
130 - <method name="setAutoClose">  
131 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
132 - <arg type="s" name="id" direction="in" />  
133 - <arg type="i" name="timer" direction="in" />  
134 - <arg type="i" name="rc" direction="out" />  
135 - </method>  
136 -  
137 - <method name="setTimeout">  
138 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
139 - <arg type="s" name="id" direction="in" />  
140 - <arg type="i" name="timer" direction="in" />  
141 - <arg type="i" name="rc" direction="out" />  
142 - </method>  
143 -  
144 - <method name="getProgramMessage">  
145 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
146 - <arg type="s" name="id" direction="in" />  
147 - <arg type="i" name="status" direction="out" />  
148 - </method>  
149 -  
150 - <method name="getSecureState">  
151 - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>  
152 - <arg type="s" name="id" direction="in" />  
153 - <arg type="i" name="status" direction="out" />  
154 - </method>  
155 -  
156 - </interface> 5 + <interface name="br.com.bb.pw3270.service">
  6 +
  7 + <method name="getRevision">
  8 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  9 + <arg type="s" name="revision" direction="out" />
  10 + </method>
  11 +
  12 + <method name="getVersion">
  13 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  14 + <arg type="s" name="revision" direction="out" />
  15 + </method>
  16 +
  17 + <method name="createSession">
  18 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  19 + <arg type="s" name="id" direction="out" />
  20 + </method>
  21 +
  22 + <method name="destroySession">
  23 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  24 + <arg type="s" name="id" direction="in" />
  25 + <arg type="i" name="rc" direction="out" />
  26 + </method>
  27 +
  28 + <method name="connect">
  29 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  30 + <arg type="s" name="id" direction="in" />
  31 + <arg type="s" name="uri" direction="in" />
  32 + <arg type="i" name="rc" direction="out" />
  33 + </method>
  34 +
  35 + <method name="disconnect">
  36 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  37 + <arg type="s" name="id" direction="in" />
  38 + <arg type="i" name="rc" direction="out" />
  39 + </method>
  40 +
  41 + <method name="enter">
  42 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  43 + <arg type="s" name="id" direction="in" />
  44 + <arg type="i" name="result" direction="out" />
  45 + </method>
  46 +
  47 + <method name="pfKey">
  48 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  49 + <arg type="s" name="id" direction="in" />
  50 + <arg type="i" name="key" direction="in" />
  51 + <arg type="i" name="result" direction="out" />
  52 + </method>
  53 +
  54 + <method name="paKey">
  55 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  56 + <arg type="s" name="id" direction="in" />
  57 + <arg type="i" name="key" direction="in" />
  58 + <arg type="i" name="result" direction="out" />
  59 + </method>
  60 +
  61 + <method name="setTextAt">
  62 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  63 + <arg type="s" name="id" direction="in" />
  64 + <arg type="i" name="row" direction="in" />
  65 + <arg type="i" name="col" direction="in" />
  66 + <arg type="s" name="text" direction="in" />
  67 + <arg type="i" name="result" direction="out" />
  68 + </method>
  69 +
  70 + <method name="cmpTextAt">
  71 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  72 + <arg type="s" name="id" direction="in" />
  73 + <arg type="i" name="row" direction="in" />
  74 + <arg type="i" name="col" direction="in" />
  75 + <arg type="s" name="text" direction="in" />
  76 + <arg type="i" name="result" direction="out" />
  77 + </method>
  78 +
  79 + <method name="getTextAt">
  80 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  81 + <arg type="s" name="id" direction="in" />
  82 + <arg type="i" name="row" direction="in" />
  83 + <arg type="i" name="col" direction="in" />
  84 + <arg type="i" name="len" direction="in" />
  85 + <arg type="s" name="text" direction="out" />
  86 + </method>
  87 +
  88 + <method name="isReady">
  89 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  90 + <arg type="s" name="id" direction="in" />
  91 + <arg type="i" name="result" direction="out" />
  92 + </method>
  93 +
  94 + <method name="chkId">
  95 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  96 + <arg type="s" name="id" direction="in" />
  97 + <arg type="i" name="result" direction="out" />
  98 + </method>
  99 +
  100 + <method name="isConnected">
  101 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  102 + <arg type="s" name="id" direction="in" />
  103 + <arg type="i" name="result" direction="out" />
  104 + </method>
  105 +
  106 + <method name="getConnectionState">
  107 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  108 + <arg type="s" name="id" direction="in" />
  109 + <arg type="i" name="status" direction="out" />
  110 + </method>
  111 +
  112 + <method name="getScreenHeight">
  113 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  114 + <arg type="s" name="id" direction="in" />
  115 + <arg type="i" name="height" direction="out" />
  116 + </method>
  117 +
  118 + <method name="getScreenWidth">
  119 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  120 + <arg type="s" name="id" direction="in" />
  121 + <arg type="i" name="width" direction="out" />
  122 + </method>
  123 +
  124 + <method name="getScreenLength">
  125 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  126 + <arg type="s" name="id" direction="in" />
  127 + <arg type="i" name="length" direction="out" />
  128 + </method>
  129 +
  130 + <method name="setAutoClose">
  131 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  132 + <arg type="s" name="id" direction="in" />
  133 + <arg type="i" name="timer" direction="in" />
  134 + <arg type="i" name="rc" direction="out" />
  135 + </method>
  136 +
  137 + <method name="setTimeout">
  138 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  139 + <arg type="s" name="id" direction="in" />
  140 + <arg type="i" name="timer" direction="in" />
  141 + <arg type="i" name="rc" direction="out" />
  142 + </method>
  143 +
  144 + <method name="getProgramMessage">
  145 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  146 + <arg type="s" name="id" direction="in" />
  147 + <arg type="i" name="status" direction="out" />
  148 + </method>
  149 +
  150 + <method name="getSecureState">
  151 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  152 + <arg type="s" name="id" direction="in" />
  153 + <arg type="i" name="status" direction="out" />
  154 + </method>
  155 +
  156 + <method name="getIsProtected">
  157 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  158 + <arg type="s" name="id" direction="in" />
  159 + <arg type="i" name="addr" direction="in" />
  160 + <arg type="i" name="result" direction="out" />
  161 + </method>
  162 +
  163 + <method name="getIsProtectedAt">
  164 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  165 + <arg type="s" name="id" direction="in" />
  166 + <arg type="i" name="row" direction="in" />
  167 + <arg type="i" name="col" direction="in" />
  168 + <arg type="i" name="result" direction="out" />
  169 + </method>
  170 +
  171 + </interface>
157 172
158 </node> 173 </node>
@@ -89,36 +89,30 @@ @@ -89,36 +89,30 @@
89 void pw3270_dbus_get_program_message(PW3270Dbus *object, const gchar *id, DBusGMethodInvocation *context); 89 void pw3270_dbus_get_program_message(PW3270Dbus *object, const gchar *id, DBusGMethodInvocation *context);
90 void pw3270_dbus_get_secure_state(PW3270Dbus *object, const gchar *id, DBusGMethodInvocation *context); 90 void pw3270_dbus_get_secure_state(PW3270Dbus *object, const gchar *id, DBusGMethodInvocation *context);
91 91
  92 + void pw3270_dbus_get_is_protected_at(PW3270Dbus *object, const gchar *id, int row, int col, DBusGMethodInvocation *context);
  93 + void pw3270_dbus_get_is_protected(PW3270Dbus *object, const gchar *id, int baddr, DBusGMethodInvocation *context);
  94 +
92 /* 95 /*
93 void pw3270_dbus_quit(PW3270Dbus *object, DBusGMethodInvocation *context); 96 void pw3270_dbus_quit(PW3270Dbus *object, DBusGMethodInvocation *context);
94 void pw3270_dbus_get_ur_l(PW3270Dbus *object, DBusGMethodInvocation *context); 97 void pw3270_dbus_get_ur_l(PW3270Dbus *object, DBusGMethodInvocation *context);
95 void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context); 98 void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context);
96 99
97 - void pw3270_dbus_get_message_id(PW3270Dbus *object, DBusGMethodInvocation *context);  
98 void pw3270_dbus_get_connection_state(PW3270Dbus *object, DBusGMethodInvocation *context); 100 void pw3270_dbus_get_connection_state(PW3270Dbus *object, DBusGMethodInvocation *context);
99 - void pw3270_dbus_get_secure_state(PW3270Dbus *object, DBusGMethodInvocation *context);  
100 101
101 H3270 * pw3270_dbus_get_session_handle(PW3270Dbus *object); 102 H3270 * pw3270_dbus_get_session_handle(PW3270Dbus *object);
102 GError * pw3270_dbus_get_error_from_errno(int code); 103 GError * pw3270_dbus_get_error_from_errno(int code);
103 104
104 - void pw3270_dbus_is_ready(PW3270Dbus *object, DBusGMethodInvocation *context);  
105 void pw3270_dbus_in_tn3270_e(PW3270Dbus *object, DBusGMethodInvocation *context); 105 void pw3270_dbus_in_tn3270_e(PW3270Dbus *object, DBusGMethodInvocation *context);
106 106
107 void pw3270_dbus_set_cursor_at(PW3270Dbus *object, int row, int col, DBusGMethodInvocation *context); 107 void pw3270_dbus_set_cursor_at(PW3270Dbus *object, int row, int col, DBusGMethodInvocation *context);
108 void pw3270_dbus_set_cursor_address(PW3270Dbus *object, int addr, DBusGMethodInvocation *context); 108 void pw3270_dbus_set_cursor_address(PW3270Dbus *object, int addr, DBusGMethodInvocation *context);
109 void pw3270_dbus_get_cursor_address(PW3270Dbus *object, DBusGMethodInvocation *context); 109 void pw3270_dbus_get_cursor_address(PW3270Dbus *object, DBusGMethodInvocation *context);
110 110
111 -  
112 void pw3270_dbus_set_toggle(PW3270Dbus *object, int id, int value, DBusGMethodInvocation *context); 111 void pw3270_dbus_set_toggle(PW3270Dbus *object, int id, int value, DBusGMethodInvocation *context);
113 112
114 - void pw3270_dbus_wait_for_ready(PW3270Dbus *object, int timeout, DBusGMethodInvocation *context);  
115 -  
116 void pw3270_dbus_get_field_start(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context); 113 void pw3270_dbus_get_field_start(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context);
117 void pw3270_dbus_get_field_length(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context); 114 void pw3270_dbus_get_field_length(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context);
118 - void pw3270_dbus_get_next_unprotected(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context);  
119 -  
120 - void pw3270_dbus_get_is_protected(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context);  
121 - void pw3270_dbus_get_is_protected_at(PW3270Dbus *object, int row, int col, DBusGMethodInvocation *context); 115 + void pw3270_dbus_get_next_unprotected(PW3270Dbus *object, int baddr, DBusGMethodInvocation *context);
122 116
123 void pw3270_dbus_set_script(PW3270Dbus *object, const gchar *text, int mode, DBusGMethodInvocation *context); 117 void pw3270_dbus_set_script(PW3270Dbus *object, const gchar *text, int mode, DBusGMethodInvocation *context);
124 118
@@ -127,9 +121,6 @@ @@ -127,9 +121,6 @@
127 void pw3270_dbus_action(PW3270Dbus *object, const gchar *text, DBusGMethodInvocation *context); 121 void pw3270_dbus_action(PW3270Dbus *object, const gchar *text, DBusGMethodInvocation *context);
128 122
129 // Actions 123 // Actions
130 - void pw3270_dbus_enter(PW3270Dbus *object, DBusGMethodInvocation *context);  
131 - void pw3270_dbus_pf_key(PW3270Dbus *object, int key, DBusGMethodInvocation *context);  
132 - void pw3270_dbus_pa_key(PW3270Dbus *object, int key, DBusGMethodInvocation *context);  
133 void pw3270_dbus_get_text(PW3270Dbus *object, int offset, int len, DBusGMethodInvocation *context); 124 void pw3270_dbus_get_text(PW3270Dbus *object, int offset, int len, DBusGMethodInvocation *context);
134 void pw3270_dbus_input(PW3270Dbus *object, const gchar *utftext, DBusGMethodInvocation *context); 125 void pw3270_dbus_input(PW3270Dbus *object, const gchar *utftext, DBusGMethodInvocation *context);
135 126