[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/14] ui/vc: rename kbd_put to qemu_text_console functions
|
From: |
marcandre . lureau |
|
Subject: |
[PULL 07/14] ui/vc: rename kbd_put to qemu_text_console functions |
|
Date: |
Tue, 12 Sep 2023 14:46:41 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
They are QemuTextConsole functions, let's make it clear.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/ui/console.h | 6 ++---
ui/console.c | 10 ++++----
ui/curses.c | 2 +-
ui/gtk.c | 6 ++---
ui/sdl2-input.c | 4 ++--
ui/sdl2.c | 2 +-
ui/vnc.c | 54 ++++++++++++++++++++++----------------------
ui/cocoa.m | 2 +-
8 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 9c362f0e87..26d63d17a2 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -112,9 +112,9 @@ bool qemu_mouse_set(int index, Error **errp);
#define QEMU_KEY_CTRL_PAGEUP 0xe406
#define QEMU_KEY_CTRL_PAGEDOWN 0xe407
-void kbd_put_keysym_console(QemuTextConsole *s, int keysym);
-bool kbd_put_qcode_console(QemuTextConsole *s, int qcode, bool ctrl);
-void kbd_put_string_console(QemuTextConsole *s, const char *str, int len);
+void qemu_text_console_put_keysym(QemuTextConsole *s, int keysym);
+bool qemu_text_console_put_qcode(QemuTextConsole *s, int qcode, bool ctrl);
+void qemu_text_console_put_string(QemuTextConsole *s, const char *str, int
len);
/* Touch devices */
typedef struct touch_slot {
diff --git a/ui/console.c b/ui/console.c
index 4c07791ac7..7c60fc7d18 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1135,7 +1135,7 @@ static void kbd_send_chars(QemuTextConsole *s)
}
/* called when an ascii key is pressed */
-void kbd_put_keysym_console(QemuTextConsole *s, int keysym)
+void qemu_text_console_put_keysym(QemuTextConsole *s, int keysym)
{
uint8_t buf[16], *q;
int c;
@@ -1217,7 +1217,7 @@ static const int ctrl_qcode_to_keysym[Q_KEY_CODE__MAX] = {
[Q_KEY_CODE_PGDN] = QEMU_KEY_CTRL_PAGEDOWN,
};
-bool kbd_put_qcode_console(QemuTextConsole *s, int qcode, bool ctrl)
+bool qemu_text_console_put_qcode(QemuTextConsole *s, int qcode, bool ctrl)
{
int keysym;
@@ -1225,16 +1225,16 @@ bool kbd_put_qcode_console(QemuTextConsole *s, int
qcode, bool ctrl)
if (keysym == 0) {
return false;
}
- kbd_put_keysym_console(s, keysym);
+ qemu_text_console_put_keysym(s, keysym);
return true;
}
-void kbd_put_string_console(QemuTextConsole *s, const char *str, int len)
+void qemu_text_console_put_string(QemuTextConsole *s, const char *str, int len)
{
int i;
for (i = 0; i < len && str[i]; i++) {
- kbd_put_keysym_console(s, str[i]);
+ qemu_text_console_put_keysym(s, str[i]);
}
}
diff --git a/ui/curses.c b/ui/curses.c
index 4ddbbae7cd..8bde8c5cf7 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -400,7 +400,7 @@ static void curses_refresh(DisplayChangeListener *dcl)
if (keysym == -1)
keysym = chr;
- kbd_put_keysym_console(NULL, keysym);
+ qemu_text_console_put_keysym(NULL, keysym);
}
}
}
diff --git a/ui/gtk.c b/ui/gtk.c
index a14d56168d..c05f9a3f83 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1190,12 +1190,12 @@ static gboolean gd_text_key_down(GtkWidget *widget,
QemuTextConsole *con = QEMU_TEXT_CONSOLE(vc->gfx.dcl.con);
if (key->keyval == GDK_KEY_Delete) {
- kbd_put_qcode_console(con, Q_KEY_CODE_DELETE, false);
+ qemu_text_console_put_qcode(con, Q_KEY_CODE_DELETE, false);
} else if (key->length) {
- kbd_put_string_console(con, key->string, key->length);
+ qemu_text_console_put_string(con, key->string, key->length);
} else {
int qcode = gd_map_keycode(gd_get_keycode(key));
- kbd_put_qcode_console(con, qcode, false);
+ qemu_text_console_put_qcode(con, qcode, false);
}
return TRUE;
}
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index a318cc5867..b02a89ee7c 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -49,10 +49,10 @@ void sdl2_process_key(struct sdl2_console *scon,
if (ev->type == SDL_KEYDOWN) {
switch (qcode) {
case Q_KEY_CODE_RET:
- kbd_put_keysym_console(s, '\n');
+ qemu_text_console_put_keysym(s, '\n');
break;
default:
- kbd_put_qcode_console(s, qcode, ctrl);
+ qemu_text_console_put_qcode(s, qcode, ctrl);
break;
}
}
diff --git a/ui/sdl2.c b/ui/sdl2.c
index dfa260a507..178cc054ab 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -484,7 +484,7 @@ static void handle_textinput(SDL_Event *ev)
}
if (QEMU_IS_TEXT_CONSOLE(con)) {
- kbd_put_string_console(QEMU_TEXT_CONSOLE(con), ev->text.text,
strlen(ev->text.text));
+ qemu_text_console_put_string(QEMU_TEXT_CONSOLE(con), ev->text.text,
strlen(ev->text.text));
}
}
diff --git a/ui/vnc.c b/ui/vnc.c
index 1fa4456744..22894b7b1f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1945,88 +1945,88 @@ static void do_key_event(VncState *vs, int down, int
keycode, int sym)
case 0xb8: /* Right ALT */
break;
case 0xc8:
- kbd_put_keysym_console(NULL, QEMU_KEY_UP);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_UP);
break;
case 0xd0:
- kbd_put_keysym_console(NULL, QEMU_KEY_DOWN);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_DOWN);
break;
case 0xcb:
- kbd_put_keysym_console(NULL, QEMU_KEY_LEFT);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_LEFT);
break;
case 0xcd:
- kbd_put_keysym_console(NULL, QEMU_KEY_RIGHT);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_RIGHT);
break;
case 0xd3:
- kbd_put_keysym_console(NULL, QEMU_KEY_DELETE);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_DELETE);
break;
case 0xc7:
- kbd_put_keysym_console(NULL, QEMU_KEY_HOME);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_HOME);
break;
case 0xcf:
- kbd_put_keysym_console(NULL, QEMU_KEY_END);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_END);
break;
case 0xc9:
- kbd_put_keysym_console(NULL, QEMU_KEY_PAGEUP);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_PAGEUP);
break;
case 0xd1:
- kbd_put_keysym_console(NULL, QEMU_KEY_PAGEDOWN);
+ qemu_text_console_put_keysym(NULL, QEMU_KEY_PAGEDOWN);
break;
case 0x47:
- kbd_put_keysym_console(NULL, numlock ? '7' : QEMU_KEY_HOME);
+ qemu_text_console_put_keysym(NULL, numlock ? '7' :
QEMU_KEY_HOME);
break;
case 0x48:
- kbd_put_keysym_console(NULL, numlock ? '8' : QEMU_KEY_UP);
+ qemu_text_console_put_keysym(NULL, numlock ? '8' :
QEMU_KEY_UP);
break;
case 0x49:
- kbd_put_keysym_console(NULL, numlock ? '9' : QEMU_KEY_PAGEUP);
+ qemu_text_console_put_keysym(NULL, numlock ? '9' :
QEMU_KEY_PAGEUP);
break;
case 0x4b:
- kbd_put_keysym_console(NULL, numlock ? '4' : QEMU_KEY_LEFT);
+ qemu_text_console_put_keysym(NULL, numlock ? '4' :
QEMU_KEY_LEFT);
break;
case 0x4c:
- kbd_put_keysym_console(NULL, '5');
+ qemu_text_console_put_keysym(NULL, '5');
break;
case 0x4d:
- kbd_put_keysym_console(NULL, numlock ? '6' : QEMU_KEY_RIGHT);
+ qemu_text_console_put_keysym(NULL, numlock ? '6' :
QEMU_KEY_RIGHT);
break;
case 0x4f:
- kbd_put_keysym_console(NULL, numlock ? '1' : QEMU_KEY_END);
+ qemu_text_console_put_keysym(NULL, numlock ? '1' :
QEMU_KEY_END);
break;
case 0x50:
- kbd_put_keysym_console(NULL, numlock ? '2' : QEMU_KEY_DOWN);
+ qemu_text_console_put_keysym(NULL, numlock ? '2' :
QEMU_KEY_DOWN);
break;
case 0x51:
- kbd_put_keysym_console(NULL, numlock ? '3' :
QEMU_KEY_PAGEDOWN);
+ qemu_text_console_put_keysym(NULL, numlock ? '3' :
QEMU_KEY_PAGEDOWN);
break;
case 0x52:
- kbd_put_keysym_console(NULL, '0');
+ qemu_text_console_put_keysym(NULL, '0');
break;
case 0x53:
- kbd_put_keysym_console(NULL, numlock ? '.' : QEMU_KEY_DELETE);
+ qemu_text_console_put_keysym(NULL, numlock ? '.' :
QEMU_KEY_DELETE);
break;
case 0xb5:
- kbd_put_keysym_console(NULL, '/');
+ qemu_text_console_put_keysym(NULL, '/');
break;
case 0x37:
- kbd_put_keysym_console(NULL, '*');
+ qemu_text_console_put_keysym(NULL, '*');
break;
case 0x4a:
- kbd_put_keysym_console(NULL, '-');
+ qemu_text_console_put_keysym(NULL, '-');
break;
case 0x4e:
- kbd_put_keysym_console(NULL, '+');
+ qemu_text_console_put_keysym(NULL, '+');
break;
case 0x9c:
- kbd_put_keysym_console(NULL, '\n');
+ qemu_text_console_put_keysym(NULL, '\n');
break;
default:
if (control) {
- kbd_put_keysym_console(NULL, sym & 0x1f);
+ qemu_text_console_put_keysym(NULL, sym & 0x1f);
} else {
- kbd_put_keysym_console(NULL, sym);
+ qemu_text_console_put_keysym(NULL, sym);
}
break;
}
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 90a89c5c8e..df6d13be38 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -784,7 +784,7 @@ - (void) handleMonitorInput:(NSEvent *)event
}
if (keysym) {
- kbd_put_keysym_console(NULL, keysym);
+ qemu_text_console_put_keysym(NULL, keysym);
}
}
--
2.41.0
- [PULL 00/14] Ui patches, marcandre . lureau, 2023/09/12
- [PULL 01/14] docs: vhost-user-gpu: add protocol changes for dmabuf modifiers, marcandre . lureau, 2023/09/12
- [PULL 02/14] contrib/vhost-user-gpu: add support for sending dmabuf modifiers, marcandre . lureau, 2023/09/12
- [PULL 03/14] vhost-user-gpu: support dmabuf modifiers, marcandre . lureau, 2023/09/12
- [PULL 04/14] vmmouse: replace DPRINTF with tracing, marcandre . lureau, 2023/09/12
- [PULL 05/14] vmmouse: use explicit code, marcandre . lureau, 2023/09/12
- [PULL 06/14] ui/vc: remove kbd_put_keysym() and update function calls, marcandre . lureau, 2023/09/12
- [PULL 07/14] ui/vc: rename kbd_put to qemu_text_console functions,
marcandre . lureau <=
- [PULL 08/14] ui/console: remove redundant format field, marcandre . lureau, 2023/09/12
- [PULL 09/14] ui/vc: preliminary QemuTextConsole changes before split, marcandre . lureau, 2023/09/12
- [PULL 10/14] ui/vc: split off the VC part from console.c, marcandre . lureau, 2023/09/12
- [PULL 11/14] ui/console: move DisplaySurface to its own header, marcandre . lureau, 2023/09/12
- [PULL 12/14] virtio-gpu/win32: set the destroy function on load, marcandre . lureau, 2023/09/12
- [PULL 13/14] ui: fix crash when there are no active_console, marcandre . lureau, 2023/09/12