vdisp/dummy, x11_common: IWYU

Author: MartinPulec

src/video_display/dummy.c

@@ -35,19 +35,17 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-
 #include <assert.h>
 #include <stdbool.h>
+#include <stdio.h>            // for printf
 #include <stdlib.h>
 #include <string.h>
 
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
 #include "pixfmt_conv.h"
+#include "types.h"            // for codec_t, R10k, RGBA, UYVY, tile, v210
 #include "utils/color_out.h"
 #include "utils/macros.h"
 #include "utils/misc.h"
@@ -56,6 +54,8 @@
 #include "video_codec.h"
 #include "video_display.h"
 
+struct module;
+
 #define DEFAULT_DUMP_LEN 32
 #define MOD_NAME "[dummy] "
 
@@ -179,7 +179,7 @@ static void *display_dummy_init(struct module *parent, const char *cfg, unsigned
         memcpy(s.codecs, default_codecs, sizeof default_codecs);
         int rgb_shift_init[] = DEFAULT_RGB_SHIFT_INIT;
         memcpy(s.rgb_shift, &rgb_shift_init, sizeof s.rgb_shift);
-        char *ccpy = alloca(strlen(cfg) + 1);
+        char ccpy[strlen(cfg) + 1];
         strcpy(ccpy, cfg);
 
         if (!dummy_parse_opts(&s, ccpy)) {

src/x11_common.c

@@ -44,19 +44,16 @@
  * connection and XInitThreads() is called (this also may not be required).
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
-
 #include "x11_common.h"
 
+#include <X11/Xlib.h>                // for Display, XInternAtom, False, XCh...
+#include <limits.h>                  // for LONG_MAX
 #include <pthread.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <stdbool.h>                 // for bool, true
+#include <stdio.h>                   // for NULL, fprintf, stderr, size_t
+#include <stdlib.h>                  // for calloc, abort, free
+#include <string.h>                  // for memcpy
 
-#include "debug.h"
 #include "utils/resource_manager.h"
 
 #define resource_symbol "X11-state"
@@ -80,7 +77,7 @@ struct x11_state *get_state() {
         if(!state->initialized) {
                 state->display = NULL;
                 pthread_mutex_init(&state->lock, NULL);
-                state->display_opened_here = TRUE;
+                state->display_opened_here = true;
                 state->ref_num = 0;
                 state->initialized = true;
         }
@@ -101,7 +98,7 @@ void x11_set_display(void *disp)
                 abort();
         }
         s->display = d;
-        s->display_opened_here = FALSE;
+        s->display_opened_here = false;
         pthread_mutex_unlock(&s->lock);
 }
 
@@ -110,7 +107,7 @@ void * x11_acquire_display(void)
         struct x11_state *s = get_state();
         if(!s->display) {
                 s->display = XOpenDisplay(0);
-                s->display_opened_here = TRUE;
+                s->display_opened_here = true;
         }
 
         if ( !s->display )

src/x11_common.h

@@ -35,6 +35,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <X11/X.h>     // for Window
 #include <X11/Xlib.h>
 
 #ifdef __cplusplus