Patchwork [v2,5/5] ui: boolize 'full_screen'

login
register
mail settings
Submitter liguang
Date June 18, 2013, 3:45 a.m.
Message ID <1371527137-16949-5-git-send-email-lig.fnst@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/252109/
State New
Headers show

Comments

liguang - June 18, 2013, 3:45 a.m.
full_screen parameter for functions sdl_display_init,
cocoa_display_init, curses_display_init should be
boolized by actual usage.
also boolize 'full_screen' in vl.c

it may be bold for cocoa, so if it hurts,
these changes can be dropped.

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 include/ui/console.h |    6 +++---
 ui/curses.c          |    2 +-
 ui/sdl.c             |    2 +-
 vl.c                 |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
Michael Tokarev - June 19, 2013, 8:37 a.m.
18.06.2013 07:45, liguang wrote:
[]
> -void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
> +void sdl_display_init(DisplayState *ds, bool full_screen, int no_frame);

The same applies to no_frame, isn't it?

These conversions to bool are like this -- "thankless", because there are
so many of them all around, you touch one place and it becomes obvious
that nearby places should be touched too.  Like this:

> --- a/vl.c
> +++ b/vl.c
> @@ -198,7 +198,7 @@ static int rtc_utc = 1;
>  static int rtc_date_offset = -1; /* -1 means no change */
>  QEMUClock *rtc_clock;
>  int vga_interface_type = VGA_NONE;
> -static int full_screen = 0;
> +static bool full_screen = false;
>  static int no_frame = 0;
>  int no_quit = 0;

This no_quit is bool too... :) But I think _this_ one might be in a
separate patch.  But it is also display-specific.

Besides, I think we should rewamp this display init thing entirely,
making displays to be modules and implementing options parsing
properly.

I think I'll do that today, and will convert these to bools while
at it.

Thanks,

/mjt

Patch

diff --git a/include/ui/console.h b/include/ui/console.h
index 98edf41..e927229 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -306,10 +306,10 @@  CharDriverState *vc_init(ChardevVC *vc);
 void register_vc_handler(VcHandler *handler);
 
 /* sdl.c */
-void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
+void sdl_display_init(DisplayState *ds, bool full_screen, int no_frame);
 
 /* cocoa.m */
-void cocoa_display_init(DisplayState *ds, int full_screen);
+void cocoa_display_init(DisplayState *ds, bool full_screen);
 
 /* vnc.c */
 void vnc_display_init(DisplayState *ds);
@@ -331,7 +331,7 @@  static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)
 #endif
 
 /* curses.c */
-void curses_display_init(DisplayState *ds, int full_screen);
+void curses_display_init(DisplayState *ds, bool full_screen);
 
 /* input.c */
 int index_from_key(const char *key);
diff --git a/ui/curses.c b/ui/curses.c
index 289a955..aaee070 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -336,7 +336,7 @@  static const DisplayChangeListenerOps dcl_ops = {
     .dpy_text_cursor = curses_cursor_position,
 };
 
-void curses_display_init(DisplayState *ds, int full_screen)
+void curses_display_init(DisplayState *ds, bool full_screen)
 {
 #ifndef _WIN32
     if (!isatty(1)) {
diff --git a/ui/sdl.c b/ui/sdl.c
index 39a42d6..643e095 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -868,7 +868,7 @@  static const DisplayChangeListenerOps dcl_ops = {
     .dpy_cursor_define = sdl_mouse_define,
 };
 
-void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
+void sdl_display_init(DisplayState *ds, bool full_screen, int no_frame)
 {
     int flags;
     uint8_t data = 0;
diff --git a/vl.c b/vl.c
index f94ec9c..d474f76 100644
--- a/vl.c
+++ b/vl.c
@@ -198,7 +198,7 @@  static int rtc_utc = 1;
 static int rtc_date_offset = -1; /* -1 means no change */
 QEMUClock *rtc_clock;
 int vga_interface_type = VGA_NONE;
-static int full_screen = 0;
+static bool full_screen = false;
 static int no_frame = 0;
 int no_quit = 0;
 CharDriverState *serial_hds[MAX_SERIAL_PORTS];
@@ -3520,7 +3520,7 @@  int main(int argc, char **argv, char **envp)
 		loadvm = optarg;
 		break;
             case QEMU_OPTION_full_screen:
-                full_screen = 1;
+                full_screen = true;
                 break;
             case QEMU_OPTION_no_frame:
                 no_frame = 1;