Função para emulação de entradas de teclado passa a receber uma estrutura de sessão como argumento

perry.werneck@gmail.com
1 parent c0840359
Showing 5 changed files with 37 additions and 30 deletions Show diff stats
latest/src/gtk2/screen.c
latest/src/include/lib3270.h
latest/src/lib/ft.c
latest/src/lib/kybd.c
latest/src/lib/macros.c
@@ -207,7 +207,8 @@
     }
     // NOTE (perry#1#): Is it the best way?
-    Input_String((const unsigned char *) input);
+//    Input_String((const unsigned char *) input);
+	lib3270_set_string(hSession, (const unsigned char *) input);
     g_free(input);
  }
@@ -242,6 +242,27 @@
 	LIB3270_EXPORT LIB3270_CSTATE lib3270_get_connection_state(H3270 *h);
 	/**
+	 * Pretend that a sequence of keys was entered at the keyboard.
+	 *
+	 * "Pasting" means that the sequence came from the clipboard.  Returns are
+	 * ignored; newlines mean "move to beginning of next line"; tabs and formfeeds
+	 * become spaces.  Backslashes are not special, but ASCII ESC characters are
+	 * used to signify 3270 Graphic Escapes.
+	 *
+	 * "Not pasting" means that the sequence is a login string specified in the
+	 * hosts file, or a parameter to the String action.  Returns are "move to
+	 * beginning of next line"; newlines mean "Enter AID" and the termination of
+	 * processing the string.  Backslashes are processed as in C.
+	 *
+	 * @param s			String to input.
+	 * @param len		Size of the string (or -1 to null terminated strings)
+	 * @param pasting	pasting flag (See comments).
+	 *
+	 * @return The number of unprocessed characters.
+	 */
+	LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int pasting);
+
+	/**
 	 * Set string at current cursor position.
 	 *
 	 * Returns are ignored; newlines mean "move to beginning of next line";
@@ -262,7 +262,7 @@ static const struct filetransfer_callbacks	*callbacks = NULL;		// Callbacks to m
 	Trace("Command: \"%s\"",buffer);
-	(void) emulate_input(buffer, strlen(buffer), False);
+	(void) lib3270_emulate_input(NULL, buffer, strlen(buffer), False);
 	// Get this thing started.
 	set_ft_state(FT_AWAIT_ACK);
@@ -3081,7 +3081,7 @@ xim_lookup(XKeyEvent *event)
 /*
  * Key action by string
- */
+ */ /*
 void Input_String(const unsigned char *str)
 {
 //	reset_idle_timer();
@@ -3093,7 +3093,7 @@ void Input_String(const unsigned char *str)
 		str++;
 	}
 	screen_disp(&h3270);
-}
+} */
 /*
  * Key action.
@@ -3312,36 +3312,16 @@ remargin(int lmargin)
 	return True;
 }
-/**
- * Pretend that a sequence of keys was entered at the keyboard.
- *
- * "Pasting" means that the sequence came from the X clipboard.  Returns are
- * ignored; newlines mean "move to beginning of next line"; tabs and formfeeds
- * become spaces.  Backslashes are not special, but ASCII ESC characters are
- * used to signify 3270 Graphic Escapes.
- *
- * "Not pasting" means that the sequence is a login string specified in the
- * hosts file, or a parameter to the String action.  Returns are "move to
- * beginning of next line"; newlines mean "Enter AID" and the termination of
- * processing the string.  Backslashes are processed as in C.
- *
- * @param s		String to input.
- * @param len		Size of the string (or -1 to null terminated strings)
- * @param pasting	pasting flag (See comments).
- *
- * @Returns the number of unprocessed characters.
- */
-LIB3270_EXPORT int emulate_input(char *s, int len, int pasting)
+LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int pasting)
 {
-	enum {
-	    BASE, BACKSLASH, BACKX, BACKP, BACKPA, BACKPF, OCTAL, HEX, XGE
-	} state = BASE;
+	enum { BASE, BACKSLASH, BACKX, BACKP, BACKPA, BACKPF, OCTAL, HEX, XGE } state = BASE;
 	int literal = 0;
 	int nc = 0;
 	enum iaction ia = pasting ? IA_PASTE : IA_STRING;
-	int orig_addr = h3270.cursor_addr;
-	int orig_col = BA_TO_COL(h3270.cursor_addr);
+	int orig_addr;
+	int orig_col;
 	Boolean skipped = False;
+
 #if defined(X3270_DBCS) /*[*/
 	unsigned char ebc[2];
 	unsigned char cx;
@@ -3354,6 +3334,11 @@ LIB3270_EXPORT int emulate_input(char *s, int len, int pasting)
 	char *ws;
 #endif /*]*/
+	CHECK_SESSION_HANDLE(session);
+
+	orig_addr = session->cursor_addr;
+	orig_col  = BA_TO_COL(session->cursor_addr);
+
 	if(len < 0)
 		len = strlen(s);
@@ -212,7 +212,7 @@
 	}
 	if(str)
-		Input_String((unsigned char *) str);
+		lib3270_set_string(NULL, (const unsigned char *) str);
 	return strdup(get_state(hSession));
  }
	@@ -207,7 +207,8 @@		@@ -207,7 +207,8 @@
207	}	207	}
208		208
209	// NOTE (perry#1#): Is it the best way?	209	// NOTE (perry#1#): Is it the best way?
210	- Input_String((const unsigned char *) input);	210	+// Input_String((const unsigned char *) input);
		211	+ lib3270_set_string(hSession, (const unsigned char *) input);
211		212
212	g_free(input);	213	g_free(input);
213	}	214	}
	@@ -242,6 +242,27 @@		@@ -242,6 +242,27 @@
242	LIB3270_EXPORT LIB3270_CSTATE lib3270_get_connection_state(H3270 *h);	242	LIB3270_EXPORT LIB3270_CSTATE lib3270_get_connection_state(H3270 *h);
243		243
244	/**	244	/**
		245	+ * Pretend that a sequence of keys was entered at the keyboard.
		246	+ *
		247	+ * "Pasting" means that the sequence came from the clipboard. Returns are
		248	+ * ignored; newlines mean "move to beginning of next line"; tabs and formfeeds
		249	+ * become spaces. Backslashes are not special, but ASCII ESC characters are
		250	+ * used to signify 3270 Graphic Escapes.
		251	+ *
		252	+ * "Not pasting" means that the sequence is a login string specified in the
		253	+ * hosts file, or a parameter to the String action. Returns are "move to
		254	+ * beginning of next line"; newlines mean "Enter AID" and the termination of
		255	+ * processing the string. Backslashes are processed as in C.
		256	+ *
		257	+ * @param s String to input.
		258	+ * @param len Size of the string (or -1 to null terminated strings)
		259	+ * @param pasting pasting flag (See comments).
		260	+ *
		261	+ * @return The number of unprocessed characters.
		262	+ */
		263	+ LIB3270_EXPORT int lib3270_emulate_input(H3270 session, char s, int len, int pasting);
		264	+
		265	+ /**
245	* Set string at current cursor position.	266	* Set string at current cursor position.
246	*	267	*
247	* Returns are ignored; newlines mean "move to beginning of next line";	268	* Returns are ignored; newlines mean "move to beginning of next line";
	@@ -262,7 +262,7 @@ static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to m		@@ -262,7 +262,7 @@ static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to m
262		262
263	Trace("Command: \"%s\"",buffer);	263	Trace("Command: \"%s\"",buffer);
264		264
265	- (void) emulate_input(buffer, strlen(buffer), False);	265	+ (void) lib3270_emulate_input(NULL, buffer, strlen(buffer), False);
266		266
267	// Get this thing started.	267	// Get this thing started.
268	set_ft_state(FT_AWAIT_ACK);	268	set_ft_state(FT_AWAIT_ACK);
	@@ -212,7 +212,7 @@		@@ -212,7 +212,7 @@
212	}	212	}
213		213
214	if(str)	214	if(str)
215	- Input_String((unsigned char *) str);	215	+ lib3270_set_string(NULL, (const unsigned char *) str);
216		216
217	return strdup(get_state(hSession));	217	return strdup(get_state(hSession));
218	}	218	}