CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 21:24:14 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: drmmode_display.c
radeon_bo_helper.c

Log Message:
fix a couple of issues found while testing new drm.

- actually check the return value of radeon_bo_open() in a three places
- for create_pixmap_for_fbcon(), release the bo when jumping to
  'out_free_fb'.  fixes memory leak.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.2 xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.3
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.2	Fri Feb  7 23:36:50 2020
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c	Sun Jul 11 21:24:14 2021
@@ -373,7 +373,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
 	RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
 	RADEONInfoPtr info = RADEONPTR(pScrn);
 	PixmapPtr pixmap = info->fbcon_pixmap;
-	struct radeon_buffer *bo;
+	struct radeon_buffer *bo = NULL;
 	drmModeFBPtr fbcon;
 	struct drm_gem_flink flink;
 
@@ -405,7 +405,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
 	bo->ref_count = 1;
 
 	bo->bo.radeon = radeon_bo_open(drmmode->bufmgr, flink.name, 0, 0, 0, 0);
-	if (!bo) {
+	if (!bo->bo.radeon) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Couldn't open BO for fbcon handle\n");
 		goto out_free_fb;
@@ -415,8 +415,8 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
 	  fbcon->depth, fbcon->bpp, fbcon->pitch,
 	  bo);
 	info->fbcon_pixmap = pixmap;
-	radeon_buffer_unref();
 out_free_fb:
+	radeon_buffer_unref();
 	drmModeFreeFB(fbcon);
 	return pixmap;
 }

Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.3 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.4
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.3	Sat Jun  1 07:25:41 2019
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c	Sun Jul 11 21:24:14 2021
@@ -308,7 +308,7 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn
 bo->bo.radeon = radeon_bo_open(info->bufmgr, 0, size, base_align,
    domain, flags);
 
-if (bo && tiling && radeon_bo_set_tiling(bo->bo.radeon, tiling, pitch) == 0)
+if (bo->bo.radeon && tiling && radeon_bo_set_tiling(bo->bo.radeon, tiling, pitch) == 0)
 	*new_tiling = tiling;
 
 *new_pitch = pitch;
@@ -504,7 +504,7 @@ Bool radeon_set_shared_pixmap_backing(Pi
 #endif
 
 bo->bo.radeon = radeon_gem_bo_open_prime(info->bufmgr, ihandle, size);
-if (!bo)
+if (!bo->bo.radeon)
 goto error;
 
 bo->ref_count = 1;

CVS commit: xsrc/external/mit/MesaLib.old

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 20:40:59 UTC 2021

Removed Files:
xsrc/external/mit/MesaLib.old/dist: Makefile.am Makefile.in aclocal.m4
autogen.sh configure configure.ac install-gallium-links.mk
install-lib-links.mk
xsrc/external/mit/MesaLib.old/dist/bin: ar-lib compile config.guess
config.sub depcomp install-sh ltmain.sh missing perf-annotate-jit
test-driver
xsrc/external/mit/MesaLib.old/dist/docs: COPYING GL3.txt autoconf.html
mangling.html openvg.html patents.txt
xsrc/external/mit/MesaLib.old/dist/docs/specs: MESA_agp_offset.spec
MESA_set_3dfx_mode.spec
xsrc/external/mit/MesaLib.old/dist/doxygen: shader.doxy
xsrc/external/mit/MesaLib.old/dist/include/GL: wmesa.h
xsrc/external/mit/MesaLib.old/dist/include/GL/internal: sarea.h
xsrc/external/mit/MesaLib.old/dist/include/VG: openvg.h vgext.h
vgplatform.h vgu.h
xsrc/external/mit/MesaLib.old/dist/include/c99: inttypes.h stdbool.h
stdint.h
xsrc/external/mit/MesaLib.old/dist/m4: ax_check_compile_flag.m4
ax_gcc_builtin.m4 ax_prog_bison.m4 ax_prog_flex.m4 ax_pthread.m4
xsrc/external/mit/MesaLib.old/dist/src: Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/egl/docs:
EGL_MESA_screen_surface
xsrc/external/mit/MesaLib.old/dist/src/egl/drivers/dri2: Android.mk
Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/egl/main: Android.mk Makefile.am
Makefile.in Makefile.sources SConscript egl.pc.in eglcompiler.h
eglmisc.c eglmisc.h eglmode.c eglmode.h eglmutex.h eglscreen.c
eglscreen.h eglstring.c eglstring.h
xsrc/external/mit/MesaLib.old/dist/src/egl/wayland: Makefile.am
Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-drm:
Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-egl:
Makefile.am Makefile.in wayland-egl-priv.h
wayland-egl-symbols-check wayland-egl.c wayland-egl.pc.in
xsrc/external/mit/MesaLib.old/dist/src/gallium: Automake.inc
Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary: Makefile.am
Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/os:
os_memory.h os_memory_aligned.h os_memory_debug.h os_memory_stdc.h
os_misc.c os_misc.h os_time.c os_time.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipe-loader:
Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipebuffer:
pb_buffer_malloc.c pb_bufmgr_alt.c pb_bufmgr_ondemand.c
pb_bufmgr_pool.c
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/target-helpers:
inline_drm_helper.h inline_wrapper_sw_helper.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/util:
u_atomic.h u_caps.c u_caps.h u_clear.h u_cpu_detect.c
u_cpu_detect.h u_debug.c u_debug.h u_double_list.h u_dynarray.h
u_format_r11g11b10f.h u_format_rgb9e5.h u_hash.c u_hash.h u_init.h
u_keymap.c u_keymap.h u_linkage.c u_linkage.h u_math.c u_math.h
u_memory.h u_simple_list.h u_slab.c u_slab.h u_snprintf.c
u_staging.c u_staging.h u_string.h u_time.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/docs: d3d11ddi.txt
llvm-todo.txt
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno:
Makefile.am Makefile.in adreno_common.xml.h adreno_pm4.xml.h
freedreno_lowering.c freedreno_lowering.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a2xx:
a2xx.xml.h fd2_compiler.c fd2_compiler.h ir-a2xx.c ir-a2xx.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a3xx:
a3xx.xml.h fd3_util.c fd3_util.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/ir3:
disasm-a3xx.c instr-a3xx.h ir3.c ir3.h ir3_compiler.c
ir3_compiler.h ir3_compiler_old.c ir3_cp.c ir3_depth.c ir3_dump.c
ir3_flatten.c ir3_ra.c ir3_sched.c ir3_shader.c ir3_shader.h
ir3_visitor.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/galahad:
Makefile.am Makefile.in Makefile.sources SConscript glhd_context.c
glhd_context.h glhd_objects.c glhd_objects.h glhd_public.h
glhd_screen.c glhd_screen.h
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/i915:
Makefile.am Makefile.in
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/identity:
Makefile.am Makefile.in Makefile.sources SConscript id_context.c
id_context.h id_objects.c 

CVS commit: xsrc/external/mit/MesaLib7/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 01:14:05 UTC 2021

Removed Files:
xsrc/external/mit/MesaLib7/dist/include/GL: gl.h gl_mangle.h glext.h
glfbdev.h glu.h glu_mangle.h glx.h glx_mangle.h glxext.h mesa_wgl.h
osmesa.h vms_x_fix.h wglext.h wmesa.h
xsrc/external/mit/MesaLib7/dist/include/GL/internal: dri_interface.h
sarea.h
xsrc/external/mit/MesaLib7/dist/include/GLES: egl.h gl.h glext.h
glplatform.h
xsrc/external/mit/MesaLib7/dist/include/GLES2: gl2.h gl2ext.h
gl2platform.h
xsrc/external/mit/MesaLib7/dist/include/KHR: khrplatform.h
xsrc/external/mit/MesaLib7/dist/include/c99: inttypes.h stdbool.h
stdint.h
xsrc/external/mit/MesaLib7/dist/include/pci_ids: i810_pci_ids.h
i915_pci_ids.h i965_pci_ids.h pci_id_driver_map.h r200_pci_ids.h
r300_pci_ids.h r600_pci_ids.h radeon_pci_ids.h
xsrc/external/mit/MesaLib7/dist/src/gallium/auxiliary/util: dbghelp.h
u_atomic.h u_bitmask.c u_bitmask.h u_blit.c u_blit.h u_blitter.c
u_blitter.h u_box.h u_cache.c u_cache.h u_caps.c u_caps.h u_clear.h
u_cpu_detect.c u_cpu_detect.h u_debug.c u_debug.h
u_debug_describe.c u_debug_describe.h u_debug_memory.c
u_debug_refcnt.c u_debug_refcnt.h u_debug_stack.c u_debug_stack.h
u_debug_symbol.c u_debug_symbol.h u_dirty_flags.h
u_dirty_surfaces.h u_dl.c u_dl.h u_double_list.h u_draw.c u_draw.h
u_draw_quad.c u_draw_quad.h u_dump.h u_dump_defines.c
u_dump_state.c u_dynarray.h u_fifo.h u_format.c u_format.csv
u_format.h u_format_latc.c u_format_latc.h u_format_other.c
u_format_other.h u_format_pack.py u_format_parse.py
u_format_r11g11b10f.h u_format_rgb9e5.h u_format_rgtc.c
u_format_rgtc.h u_format_s3tc.c u_format_s3tc.h u_format_srgb.h
u_format_srgb.py u_format_table.py u_format_tests.c
u_format_tests.h u_format_yuv.c u_format_yuv.h u_format_zs.c
u_format_zs.h u_framebuffer.c u_framebuffer.h u_gen_mipmap.c
u_gen_mipmap.h u_half.h u_half.py u_handle_table.c u_handle_table.h
u_hash.c u_hash.h u_hash_table.c u_hash_table.h u_index_modify.c
u_index_modify.h u_init.h u_inlines.h u_keymap.c u_keymap.h
u_linear.c u_linear.h u_linkage.c u_linkage.h u_math.c u_math.h
u_memory.h u_mm.c u_mm.h u_network.c u_network.h u_pack_color.h
u_pointer.h u_prim.h u_pstipple.c u_pstipple.h u_rect.c u_rect.h
u_resource.c u_ringbuffer.c u_ringbuffer.h u_sampler.c u_sampler.h
u_simple_list.h u_simple_screen.h u_simple_shaders.c
u_simple_shaders.h u_slab.c u_slab.h u_snprintf.c u_split_prim.h
u_sse.h u_staging.c u_staging.h u_string.h u_surface.c u_surface.h
u_surfaces.c u_surfaces.h u_texture.c u_texture.h u_tile.c u_tile.h
u_time.h u_transfer.c u_transfer.h u_upload_mgr.c u_upload_mgr.h
u_vbuf_mgr.c u_vbuf_mgr.h
xsrc/external/mit/MesaLib7/dist/src/glsl: Makefile Makefile.template
README SConscript ast.h ast_expr.cpp ast_function.cpp
ast_to_hir.cpp ast_type.cpp builtin_function.cpp builtin_stubs.cpp
builtin_types.h builtin_variables.h glsl_lexer.cpp glsl_lexer.ll
glsl_parser.cpp glsl_parser.h glsl_parser.yy glsl_parser_extras.cpp
glsl_parser_extras.h glsl_symbol_table.cpp glsl_symbol_table.h
glsl_types.cpp glsl_types.h hir_field_selection.cpp ir.cpp ir.h
ir_basic_block.cpp ir_basic_block.h ir_clone.cpp
ir_constant_expression.cpp ir_expression_flattening.cpp
ir_expression_flattening.h ir_function.cpp
ir_function_can_inline.cpp ir_function_detect_recursion.cpp
ir_function_inlining.h ir_hierarchical_visitor.cpp
ir_hierarchical_visitor.h ir_hv_accept.cpp ir_import_prototypes.cpp
ir_optimization.h ir_print_visitor.cpp ir_print_visitor.h
ir_reader.cpp ir_reader.h ir_rvalue_visitor.cpp ir_rvalue_visitor.h
ir_set_program_inouts.cpp ir_validate.cpp ir_variable.cpp
ir_variable_refcount.cpp ir_variable_refcount.h ir_visitor.h
link_functions.cpp linker.cpp linker.h list.h loop_analysis.cpp
loop_analysis.h loop_controls.cpp loop_unroll.cpp lower_discard.cpp
lower_if_to_cond_assign.cpp lower_instructions.cpp lower_jumps.cpp
lower_mat_op_to_vec.cpp lower_noise.cpp
lower_texture_projection.cpp
lower_variable_index_to_cond_assign.cpp
lower_vec_index_to_cond_assign.cpp lower_vec_index_to_swizzle.cpp
lower_vector.cpp main.cpp opt_algebraic.cpp
opt_constant_folding.cpp opt_constant_propagation.cpp
opt_constant_variable.cpp 

CVS commit: xsrc/external/mit/libdrm

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 00:41:13 UTC 2021

Modified Files:
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_vamgr.c
Added Files:
xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h

Log Message:
avoid 'visibility' attribute on static functions.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
diff -u xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.4
--- xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.3	Sun Jul 11 00:31:54 2021
+++ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c	Sun Jul 11 00:41:13 2021
@@ -69,7 +69,7 @@ drm_private void amdgpu_vamgr_deinit(str
 	pthread_mutex_destroy(>bo_va_mutex);
 }
 
-static drm_private int
+static int
 amdgpu_vamgr_subtract_hole(struct amdgpu_bo_va_hole *hole, uint64_t start_va,
 			   uint64_t end_va)
 {
@@ -97,7 +97,7 @@ amdgpu_vamgr_subtract_hole(struct amdgpu
 	return 0;
 }
 
-static drm_private int
+static int
 amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t size,
 		 uint64_t alignment, uint64_t base_required,
 		 bool search_from_top, uint64_t *va_out)

Added files:

Index: xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h
diff -u /dev/null xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h:1.1
--- /dev/null	Sun Jul 11 00:41:13 2021
+++ xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h	Sun Jul 11 00:41:13 2021
@@ -0,0 +1,48 @@
+/* AUTOMATICALLY GENERATED by gen_table_fourcc.py. You should modify
+   that script instead of adding here entries manually! */
+static const struct drmFormatModifierInfo drm_format_modifier_table[] = {
+{ DRM_MODIFIER_INVALID(NONE, INVALID_MODIFIER) },
+{ DRM_MODIFIER_LINEAR(NONE, LINEAR) },
+{ DRM_MODIFIER_INTEL(X_TILED, X_TILED) },
+{ DRM_MODIFIER_INTEL(Y_TILED, Y_TILED) },
+{ DRM_MODIFIER_INTEL(Yf_TILED, Yf_TILED) },
+{ DRM_MODIFIER_INTEL(Y_TILED_CCS, Y_TILED_CCS) },
+{ DRM_MODIFIER_INTEL(Yf_TILED_CCS, Yf_TILED_CCS) },
+{ DRM_MODIFIER_INTEL(Y_TILED_GEN12_RC_CCS, Y_TILED_GEN12_RC_CCS) },
+{ DRM_MODIFIER_INTEL(Y_TILED_GEN12_MC_CCS, Y_TILED_GEN12_MC_CCS) },
+{ DRM_MODIFIER(SAMSUNG, 64_32_TILE, 64_32_TILE) },
+{ DRM_MODIFIER(SAMSUNG, 16_16_TILE, 16_16_TILE) },
+{ DRM_MODIFIER(QCOM, COMPRESSED, COMPRESSED) },
+{ DRM_MODIFIER(VIVANTE, TILED, TILED) },
+{ DRM_MODIFIER(VIVANTE, SUPER_TILED, SUPER_TILED) },
+{ DRM_MODIFIER(VIVANTE, SPLIT_TILED, SPLIT_TILED) },
+{ DRM_MODIFIER(VIVANTE, SPLIT_SUPER_TILED, SPLIT_SUPER_TILED) },
+{ DRM_MODIFIER(NVIDIA, TEGRA_TILED, TEGRA_TILED) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_ONE_GOB, 16BX2_BLOCK_ONE_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_TWO_GOB, 16BX2_BLOCK_TWO_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_FOUR_GOB, 16BX2_BLOCK_FOUR_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_EIGHT_GOB, 16BX2_BLOCK_EIGHT_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_SIXTEEN_GOB, 16BX2_BLOCK_SIXTEEN_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_THIRTYTWO_GOB, 16BX2_BLOCK_THIRTYTWO_GOB) },
+{ DRM_MODIFIER(BROADCOM, VC4_T_TILED, VC4_T_TILED) },
+{ DRM_MODIFIER(BROADCOM, SAND32, SAND32) },
+{ DRM_MODIFIER(BROADCOM, SAND64, SAND64) },
+{ DRM_MODIFIER(BROADCOM, SAND128, SAND128) },
+{ DRM_MODIFIER(BROADCOM, SAND256, SAND256) },
+{ DRM_MODIFIER(BROADCOM, UIF, UIF) },
+{ DRM_MODIFIER(ARM, 16X16_BLOCK_U_INTERLEAVED, 16X16_BLOCK_U_INTERLEAVED) },
+{ DRM_MODIFIER(ALLWINNER, TILED, TILED) },
+};
+static const struct drmFormatModifierVendorInfo drm_format_modifier_vendor_table[] = {
+{ DRM_FORMAT_MOD_VENDOR_NONE, "NONE" },
+{ DRM_FORMAT_MOD_VENDOR_INTEL, "INTEL" },
+{ DRM_FORMAT_MOD_VENDOR_AMD, "AMD" },
+{ DRM_FORMAT_MOD_VENDOR_NVIDIA, "NVIDIA" },
+{ DRM_FORMAT_MOD_VENDOR_SAMSUNG, "SAMSUNG" },
+{ DRM_FORMAT_MOD_VENDOR_QCOM, "QCOM" },
+{ DRM_FORMAT_MOD_VENDOR_VIVANTE, "VIVANTE" },
+{ DRM_FORMAT_MOD_VENDOR_BROADCOM, "BROADCOM" },
+{ DRM_FORMAT_MOD_VENDOR_ARM, "ARM" },
+{ DRM_FORMAT_MOD_VENDOR_ALLWINNER, "ALLWINNER" },
+{ DRM_FORMAT_MOD_VENDOR_AMLOGIC, "AMLOGIC" },
+};

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 00:31:55 UTC 2021

Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_vamgr.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c misc.c ptyx.h xterm.h
xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/intel: .gitignore
xsrc/external/mit/libdrm/dist/intel/tests: .gitignore
xsrc/external/mit/libdrm/dist/tegra: .gitignore
xsrc/external/mit/libdrm/dist/tests/nouveau: .gitignore
xsrc/external/mit/libdrm/dist/tests/tegra: .gitignore

Log Message:
merge xterm 368 and libdrm 2.4.107.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/intel/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/intel/tests/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/tegra/.gitignore
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/nouveau/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/tegra/.gitignore
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/xterm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.28 xsrc/external/mit/libdrm/dist/xf86drm.c:1.29
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.28	Tue Apr 27 03:02:37 2021
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Sun Jul 11 00:31:53 2021
@@ -61,6 +61,7 @@
 #include 
 #endif
 #include 
+#include 
 
 #if defined(__FreeBSD__)
 #include 
@@ -76,6 +77,7 @@
 
 #include "xf86drm.h"
 #include "libdrm_macros.h"
+#include "drm_fourcc.h"
 
 #include "util_math.h"
 
@@ -128,6 +130,362 @@ static drmServerInfoPtr drm_server_info;
 static bool drmNodeIsDRM(int maj, int min);
 static char *drmGetMinorNameForFD(int fd, int type);
 
+#define DRM_MODIFIER(v, f, f_name) \
+   .modifier = DRM_FORMAT_MOD_##v ## _ ##f, \
+   .modifier_name = #f_name
+
+#define DRM_MODIFIER_INVALID(v, f_name) \
+   .modifier = DRM_FORMAT_MOD_INVALID, .modifier_name = #f_name
+
+#define DRM_MODIFIER_LINEAR(v, f_name) \
+   .modifier = DRM_FORMAT_MOD_LINEAR, .modifier_name = #f_name
+
+/* Intel is abit special as the format doesn't follow other vendors naming
+ * scheme */
+#define DRM_MODIFIER_INTEL(f, f_name) \
+   .modifier = I915_FORMAT_MOD_##f, .modifier_name = #f_name
+
+struct drmFormatModifierInfo {
+uint64_t modifier;
+const char *modifier_name;
+};
+
+struct drmFormatModifierVendorInfo {
+uint8_t vendor;
+const char *vendor_name;
+};
+
+#include "generated_static_table_fourcc.h"
+
+struct drmVendorInfo {
+uint8_t vendor;
+char *(*vendor_cb)(uint64_t modifier);
+};
+
+struct drmFormatVendorModifierInfo {
+uint64_t modifier;
+const char *modifier_name;
+};
+
+static char *
+drmGetFormatModifierNameFromArm(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromNvidia(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromAmd(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromAmlogic(uint64_t modifier);
+
+static const struct drmVendorInfo modifier_format_vendor_table[] = {
+{ DRM_FORMAT_MOD_VENDOR_ARM, drmGetFormatModifierNameFromArm },
+{ DRM_FORMAT_MOD_VENDOR_NVIDIA, drmGetFormatModifierNameFromNvidia },
+{ DRM_FORMAT_MOD_VENDOR_AMD, drmGetFormatModifierNameFromAmd },
+{ DRM_FORMAT_MOD_VENDOR_AMLOGIC, drmGetFormatModifierNameFromAmlogic },
+};
+
+#ifndef AFBC_FORMAT_MOD_MODE_VALUE_MASK
+#define AFBC_FORMAT_MOD_MODE_VALUE_MASK	0x000fULL
+#endif
+
+static const struct drmFormatVendorModifierInfo arm_mode_value_table[] = {
+{ AFBC_FORMAT_MOD_YTR,  "YTR" },
+{ AFBC_FORMAT_MOD_SPLIT,"SPLIT" },
+{ AFBC_FORMAT_MOD_SPARSE,   "SPARSE" },
+{ AFBC_FORMAT_MOD_CBR,  "CBR" },
+{ AFBC_FORMAT_MOD_TILED,"TILED" },
+{ AFBC_FORMAT_MOD_SC,   "SC" },
+{ AFBC_FORMAT_MOD_DB,   "DB" },
+{ AFBC_FORMAT_MOD_BCH,  "BCH" },
+{ AFBC_FORMAT_MOD_USM,  "USM" },
+};
+
+static bool is_x_t_amd_gfx9_tile(uint64_t tile)

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jul 11 00:13:27 UTC 2021

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in pl
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: devices.c
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Bus.c
xf86Config.c xf86Helper.c xf86str.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/randr: randrstr.h
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xf86Build.h xorg-config.h xorg-server.h

Log Message:
merge xorg-server 1.20.12 and xkeyboard-config 2.33.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/pl
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86str.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.6 -r1.7 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/randr/randrstr.h
cvs rdiff -u -r1.41 -r1.42 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.22 -r1.23 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.20 xsrc/external/mit/xkeyboard-config/dist/configure:1.21
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.20	Tue Apr 27 03:38:48 2021
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sun Jul 11 00:13:26 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.33.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.32'
-PACKAGE_STRING='xkeyboard-config 2.32'
+PACKAGE_VERSION='2.33'
+PACKAGE_STRING='xkeyboard-config 2.33'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -717,6 +717,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -807,6 +808,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1059,6 +1061,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 10 23:28:58 UTC 2021

Modified Files:
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c SetFPath.c
Removed Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libXfixes/dist: README

Log Message:
merge libX11 1.7.2, and libXfixes 6.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r0 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \
xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \
xsrc/external/mit/libX11/dist/m4/ltversion.m4 \
xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libX11/dist/src/FontNames.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/SetFPath.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXfixes/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/src/Font.c
diff -u xsrc/external/mit/libX11/dist/src/Font.c:1.8 xsrc/external/mit/libX11/dist/src/Font.c:1.9
--- xsrc/external/mit/libX11/dist/src/Font.c:1.8	Wed May 19 08:20:08 2021
+++ xsrc/external/mit/libX11/dist/src/Font.c	Sat Jul 10 23:28:58 2021
@@ -102,7 +102,7 @@ XFontStruct *XLoadQueryFont(
 XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);
 #endif
 
-if (strlen(name) >= USHRT_MAX)
+if (name != NULL && strlen(name) >= USHRT_MAX)
 return NULL;
 if (_XF86LoadQueryLocaleFont(dpy, name, _result, (Font *)0))
   return font_result;
@@ -656,7 +656,7 @@ int _XF86LoadQueryLocaleFont(
XFontStruct **xfp,
Font *fidp)
 {
-int l;
+size_t l;
 const char *charset, *p;
 char buf[256];
 XFontStruct *fs;
@@ -664,7 +664,7 @@ int _XF86LoadQueryLocaleFont(
 
 if (!name)
 	return 0;
-l = (int) strlen(name);
+l = strlen(name);
 if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-' || l >= USHRT_MAX)
 	return 0;
 charset = NULL;
@@ -677,11 +677,11 @@ int _XF86LoadQueryLocaleFont(
 	charset = "ISO8859-1";
 	p = charset + 7;
 }
-if (l - 2 - (p - charset) < 0)
+if (l - 2 < p - charset)
 	return 0;
 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
 	return 0;
-if (strlen(p + 1) + (size_t) l - 1 >= sizeof(buf) - 1)
+if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
 	return 0;
 strcpy(buf, name);
 strcpy(buf + l - 1, p + 1);

Index: xsrc/external/mit/libX11/dist/src/FontNames.c
diff -u xsrc/external/mit/libX11/dist/src/FontNames.c:1.10 xsrc/external/mit/libX11/dist/src/FontNames.c:1.11
--- xsrc/external/mit/libX11/dist/src/FontNames.c:1.10	Wed May 19 08:20:08 2021
+++ xsrc/external/mit/libX11/dist/src/FontNames.c	Sat Jul 10 23:28:58 2021
@@ -51,7 +51,7 @@ int *actualCount)	/* RETURN */
 register xListFontsReq *req;
 unsigned long rlen = 0;
 
-if (strlen(pattern) >= USHRT_MAX)
+if (pattern != NULL && strlen(pattern) >= USHRT_MAX)
 return NULL;
 
 LockDisplay(dpy);

Index: xsrc/external/mit/libX11/dist/src/SetFPath.c
diff -u xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2 xsrc/external/mit/libX11/dist/src/SetFPath.c:1.3
--- xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2	Wed May 19 08:28:15 2021
+++ xsrc/external/mit/libX11/dist/src/SetFPath.c	Sat Jul 10 23:28:58 2021
@@ -38,7 +38,7 @@ XSetFontPath (
 char **directories,
 int ndirs)
 {
-	register int n = 0;
+	register size_t n = 0;
 	register int i;
 	register int nbytes;
 	char *p;
@@ -49,7 +49,7 @@ XSetFontPath (
 	GetReq (SetFontPath, req);
 	req->nFonts = ndirs;
 	for (i = 0; i < ndirs; i++) {
-		n = (int) ((size_t) n + (safestrlen (directories[i]) + 1));
+		n = n + (safestrlen (directories[i]) + 1);
 		if (n >= USHRT_MAX) {
 			UnlockDisplay(dpy);
 			SyncHandle();
@@ -65,9 +65,9 @@ XSetFontPath (
 		char	*tmp = p;
 
 		for (i = 0; i < ndirs; i++) {
-			register int length = (int) safestrlen (directories[i]);
+			size_t length = safestrlen (directories[i]);
 			*p = length;
-			memcpy (p + 1, directories[i], (size_t)length);
+			memcpy (p + 1, directories[i], length);
 			p += length + 1;
 		}
 		Data (dpy, tmp, nbytes);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun Jul  4 07:03:16 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
elide cast warning: error: cast from pointer to integer of different size


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.15
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14	Sat Jul  3 05:43:29 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sun Jul  4 03:03:16 2021
@@ -61,7 +61,7 @@ volatile unsigned char *ioBase = MAP_FAI
 
 /* XXX why the hell is this necessary?! */
 #if defined(__arm__) || defined(__mips__)
-unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
+unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)(intptr_t)MAP_FAILED;
 #endif
 
 Bool

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Sat Jul  3 09:43:29 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Add missing include of compiler.h and make all declarations of
IOPortBase consistent.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.18
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17	Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Sat Jul  3 09:43:29 2021
@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *bas
 #define PORT_SIZE short
 #endif
 
-extern unsigned int IOPortBase;  /* Memory mapped I/O port area */
+extern unsigned PORT_SIZE IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13	Fri Jul  2 19:31:47 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Sat Jul  3 09:43:29 2021
@@ -36,6 +36,7 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
+#include "compiler.h"
 #include "bus/Pci.h"
 
 /***/

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Fri Jul  2 19:31:47 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
use PORT_SIZE from compiler.h instead of int.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12	Tue Jun  1 20:33:22 2021
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Fri Jul  2 15:31:47 2021
@@ -60,7 +60,7 @@ volatile unsigned char *ioBase = MAP_FAI
 
 /* XXX why the hell is this necessary?! */
 #if defined(__arm__) || defined(__mips__)
-unsigned int IOPortBase = (int)MAP_FAILED;
+unsigned PORT_SIZE IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
 #endif
 
 Bool
@@ -95,7 +95,7 @@ xf86DisableIO()
 munmap(__UNVOLATILE(ioBase), 0x1);
 ioBase = MAP_FAILED;
 #ifdef __arm__
-IOPortBase = (unsigned int)MAP_FAILED;
+IOPortBase = (unsigned PORT_SIZE)MAP_FAILED;
 #endif
 }
 #endif

CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Wed Jun  9 07:25:57 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c pnozz_regs.h

Log Message:
Add some acceleration using the P9100 quad and blit commands:
- for solid fill (quad)
- for pixmap copy (blit) when source and destination pitch are the same


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_regs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.3 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.4
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.3	Thu May 27 20:20:43 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c	Wed Jun  9 07:25:57 2021
@@ -1,7 +1,6 @@
 /*
  * SBus Weitek P9100 EXA support
- */
-/*-
+ *
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -79,11 +78,9 @@ static CARD32 PnozzDrawROP[] = {
 #define waitReady(pPnozz) while((pnozz_read_4(pPnozz, ENGINE_STATUS) & \
 (ENGINE_BUSY | BLITTER_BUSY)) !=0 )
 
-void PnozzInitEngine(PnozzPtr);
+/* From pnozz_accel.c */
 void pnozz_write_colour(PnozzPtr pPnozz, int reg, CARD32 colour);
 
-extern CARD32 MaxClip, junk;
-
 static void
 PnozzWaitMarker(ScreenPtr pScreen, int Marker)
 {
@@ -110,8 +107,10 @@ PnozzPrepareCopy
 waitReady(pPnozz);
 pnozz_write_4(pPnozz, RASTER_OP, (PnozzCopyROP[alu] & 0xff));
 pnozz_write_4(pPnozz, PLANE_MASK, planemask);
-pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap) / pPnozz->width;
+pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap);
 
+if (exaGetPixmapPitch(pSrcPixmap) != exaGetPixmapPitch(pDstPixmap))
+	return FALSE;
 return TRUE;
 }
 
@@ -130,24 +129,25 @@ PnozzCopy
 ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
 CARD32 src, dst, srcw, dstw;
-int doff = exaGetPixmapOffset(pDstPixmap) / pPnozz->width;
+int soff = pPnozz->srcoff / exaGetPixmapPitch(pDstPixmap);
+int doff = exaGetPixmapOffset(pDstPixmap) / exaGetPixmapPitch(pDstPixmap);
 
 src = (((xSrc << pPnozz->depthshift) & 0x1fff) << 16) |
-	((ySrc + pPnozz->srcoff) & 0x1fff);
+	((ySrc + soff) & 0x1fff);
 dst = (((xDst << pPnozz->depthshift) & 0x1fff) << 16) |
 	((yDst + doff) & 0x1fff);
-srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) | 
-((ySrc + pPnozz->srcoff + h - 1) & 0x1fff);
+srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) |
+	((ySrc + soff + h) & 0x1fff);
 dstw = xDst + w) << pPnozz->depthshift) - 1) << 16) |
-((yDst + doff + h - 1) & 0x1fff);
+	((yDst + doff + h) & 0x1fff);
 
 waitReady(pPnozz);
-
 pnozz_write_4(pPnozz, ABS_XY0, src);
 pnozz_write_4(pPnozz, ABS_XY1, srcw);
 pnozz_write_4(pPnozz, ABS_XY2, dst);
 pnozz_write_4(pPnozz, ABS_XY3, dstw);
-junk = pnozz_read_4(pPnozz, COMMAND_BLIT);
+pnozz_read_4(pPnozz, COMMAND_BLIT);
+
 exaMarkSync(pDstPixmap->drawable.pScreen);
 }
 
@@ -172,7 +172,8 @@ PnozzPrepareSolid(
 
 waitReady(pPnozz);
 pnozz_write_colour(pPnozz, FOREGROUND_COLOR, fg);
-pnozz_write_4(pPnozz, RASTER_OP, PnozzDrawROP[alu] & 0xff);
+pnozz_write_colour(pPnozz, BACKGROUND_COLOR, fg);
+pnozz_write_4(pPnozz, RASTER_OP, ROP_PAT);
 pnozz_write_4(pPnozz, PLANE_MASK, planemask);
 pnozz_write_4(pPnozz, COORD_INDEX, 0);
 
@@ -189,15 +190,18 @@ PnozzSolid(
 {
 ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
-int w = x2 - x - 1;
-int h = y2 - y - 1;
+int doff = exaGetPixmapOffset(pPixmap);
 
 waitReady(pPnozz);
-pnozz_write_4(pPnozz, RECT_RTW_XY, ((x & 0x1fff) << 16) | 
-(y & 0x1fff));
-pnozz_write_4(pPnozz, RECT_RTP_XY, (((w & 0x1fff) << 16) | 
-(h & 0x1fff)));
-junk = pnozz_read_4(pPnozz, COMMAND_QUAD);
+pnozz_write_4(pPnozz, ABS_XY0, (((x + doff) & 0x1fff) << 16) |
+	(y & 0x1fff));
+pnozz_write_4(pPnozz, ABS_XY1, (((x + doff) & 0x1fff) << 16) |
+	(y2 & 0x1fff));
+pnozz_write_4(pPnozz, ABS_XY2, (((x2 + doff) & 0x1fff) << 16) |
+	(y2 & 0x1fff));
+pnozz_write_4(pPnozz, ABS_XY3, (((x2 + doff) & 0x1fff) << 16) |
+	(y & 0x1fff));
+pnozz_read_4(pPnozz, COMMAND_QUAD);
 exaMarkSync(pPixmap->drawable.pScreen);
 }
 
@@ -208,8 +212,6 @@ PnozzEXAInit(ScreenPtr pScreen)
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
 ExaDriverPtr pExa;
 
-PnozzInitEngine(pPnozz);
-
 pExa = exaDriverAlloc();
 if (!pExa)
 	return FALSE;
@@ -223,7 +225,8 @@ PnozzEXAInit(ScreenPtr pScreen)
 
 /* round to multiple of pixmap pitch */
 

CVS commit: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd

[Rin Okuyama]

Module Name:xsrc
Committed By:   rin
Date:   Wed Jun  2 15:01:18 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Declare IOPortBase for mips, as done for xorg-server.

Fix build for sgimips, which still uses xorg-server.old.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.1.1.1	Thu Jun  9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/ppc_video.c	Wed Jun  2 15:01:18 2021
@@ -145,7 +145,7 @@ xf86EnableInterrupts()
 }
 
 /* XXX why the hell is this necessary?! */
-#ifdef __arm__
+#if defined(__arm__) || defined(__mips__)
 unsigned int IOPortBase = (int)MAP_FAILED;
 #endif
 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Wed Jun  2 00:33:22 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c

Log Message:
Provide canonical declaration of IOPortBase for MIPS here, too.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.11	Tue Sep 27 19:10:47 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c	Wed Jun  2 00:33:22 2021
@@ -59,7 +59,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 volatile unsigned char *ioBase = MAP_FAILED;
 
 /* XXX why the hell is this necessary?! */
-#ifdef __arm__
+#if defined(__arm__) || defined(__mips__)
 unsigned int IOPortBase = (int)MAP_FAILED;
 #endif
 

CVS commit: xsrc/external/mit

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Mon May 31 21:44:20 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/dist/src: drmmode_display.h
xsrc/external/mit/xf86-video-ati-kms/dist/src: drmmode_display.h
xsrc/external/mit/xf86-video-chips/dist/util: AsmMacros.h
xsrc/external/mit/xf86-video-geode/dist/src: geode.h gx_video.c
lx_driver.c panel.c
xsrc/external/mit/xf86-video-geode/dist/src/panel: panel.c
xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810: i810.h
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810.h
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.h
via_sii164.h via_vt1632.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h

Log Message:
Avoid multiple definitions of the same variable.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c \
xsrc/external/mit/xf86-video-geode/dist/src/panel.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
diff -u xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.1.1.7 xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.2
--- xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.1.1.7	Sat Jun  1 06:38:21 2019
+++ xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h	Mon May 31 21:44:19 2021
@@ -289,7 +289,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crt
 			 uint64_t *ust, uint32_t *result_seq);
 
 
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
 
 
 #endif

Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.1.1.9 xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.1.1.9	Sat Jun  1 07:24:16 2019
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h	Mon May 31 21:44:19 2021
@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crt
 			 uint64_t *ust, uint32_t *result_seq);
 
 
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
 
 
 #endif

Index: xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
diff -u xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.1.1.2 xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.2
--- xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.1.1.2	Wed Jun 10 00:46:36 2009
+++ xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h	Mon May 31 21:44:19 2021
@@ -129,7 +129,7 @@ unsigned long port;
 }
 #else
 #ifdef __arm32__
-unsigned int IOPortBase;  /* Memory mapped I/O port area */
+extern unsigned int IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(port, val)

Index: xsrc/external/mit/xf86-video-geode/dist/src/geode.h
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.6 xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.7
--- xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.6	Tue Jan  1 00:34:52 2019
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode.h	Mon May 31 21:44:19 2021
@@ -343,7 +343,7 @@ typedef struct _geodeRec {
 
 /* option flags are self-explanatory */
 #ifdef HAVE_LX
-enum {
+enum LX_GeodeOpts {
 LX_OPTION_SW_CURSOR,
 LX_OPTION_HW_CURSOR,
 LX_OPTION_NOCOMPRESSION,
@@ -357,11 +357,11 @@ enum {
 LX_OPTION_FBSIZE,
 LX_OPTION_PANEL_MODE,

CVS commit: xsrc/external/mit/MesaLib/dist/src

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Sun May 30 01:53:31 UTC 2021

Modified Files:
xsrc/external/mit/MesaLib/dist/src/amd/common: ac_llvm_helper.cpp
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm:
lp_bld_format_srgb.c lp_bld_init.c lp_bld_misc.cpp

Log Message:
Support LLVM 13, mostly from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp
cvs rdiff -u -r1.1.1.2 -r1.2 \

xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp:1.1.1.2	Tue Sep 24 16:31:46 2019
+++ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_llvm_helper.cpp	Sun May 30 01:53:30 2021
@@ -34,6 +34,7 @@
 #include "ac_llvm_build.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -129,9 +130,15 @@ struct ac_compiler_passes *ac_create_llv
 
 	llvm::TargetMachine *TM = reinterpret_cast(tm);
 
+#if HAVE_LLVM < 0x900
 	if (TM->addPassesToEmitFile(p->passmgr, p->ostream,
 nullptr,
 llvm::TargetMachine::CGFT_ObjectFile)) {
+#else
+	if (TM->addPassesToEmitFile(p->passmgr, p->ostream,
+nullptr,
+llvm::CGFT_ObjectFile)) {
+#endif
 		fprintf(stderr, "amd: TargetMachine can't emit a file of this type!\n");
 		delete p;
 		return NULL;
@@ -214,6 +221,9 @@ LLVMValueRef ac_build_atomic_rmw(struct 
 	unsigned SSID = llvm::unwrap(ctx->context)->getOrInsertSyncScopeID(sync_scope);
 	return llvm::wrap(llvm::unwrap(ctx->builder)->CreateAtomicRMW(
 		binop, llvm::unwrap(ptr), llvm::unwrap(val),
+#if LLVM_VERSION_MAJOR >= 13
+		llvm::MaybeAlign(0),
+#endif
 		llvm::AtomicOrdering::SequentiallyConsistent, SSID));
 }
 
@@ -223,6 +233,9 @@ LLVMValueRef ac_build_atomic_cmp_xchg(st
 	unsigned SSID = llvm::unwrap(ctx->context)->getOrInsertSyncScopeID(sync_scope);
 	return llvm::wrap(llvm::unwrap(ctx->builder)->CreateAtomicCmpXchg(
 			  llvm::unwrap(ptr), llvm::unwrap(cmp), llvm::unwrap(val),
+#if LLVM_VERSION_MAJOR >= 13
+			  llvm::MaybeAlign(0),
+#endif
 			  llvm::AtomicOrdering::SequentiallyConsistent,
 			  llvm::AtomicOrdering::SequentiallyConsistent, SSID));
 }

Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c:1.1.1.2	Sun Mar 10 03:42:46 2019
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c	Sun May 30 01:53:30 2021
@@ -66,7 +66,7 @@
  * @author Roland Scheidegger 
  */
 
-
+#include 
 #include "util/u_debug.h"
 
 #include "lp_bld_type.h"

Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c:1.1.1.4	Tue Sep 24 16:54:21 2019
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_init.c	Sun May 30 01:53:30 2021
@@ -167,7 +167,9 @@ create_pass_manager(struct gallivm_state
*/
   LLVMAddReassociatePass(gallivm->passmgr);
   LLVMAddPromoteMemoryToRegisterPass(gallivm->passmgr);
+#if HAVE_LLVM < 0xd00
   LLVMAddConstantPropagationPass(gallivm->passmgr);
+#endif
   LLVMAddInstructionCombiningPass(gallivm->passmgr);
   LLVMAddGVNPass(gallivm->passmgr);
}
Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.1.1.4	Tue Sep 24 16:54:24 2019
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp	Sun May 30 01:53:30 2021
@@ -72,7 +72,7 @@
 
 #include 
 
-#if HAVE_LLVM >= 0x0305
+#if HAVE_LLVM >= 0x0305 && HAVE_LLVM < 0xa00
 #include 
 #endif
 #include 

CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Thu May 27 20:20:43 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Don't nest comments.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.2 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.3
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.2	Thu May 27 20:20:22 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c	Thu May 27 20:20:43 2021
@@ -1,6 +1,6 @@
 /*
  * SBus Weitek P9100 EXA support
- *
+ */
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.

CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src

[Joerg Sonnenberger]

Module Name:xsrc
Committed By:   joerg
Date:   Thu May 27 20:20:22 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Don't define MaxClip and junk twice, fixing build with -fno-common.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.1 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.2
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.1	Thu May 27 04:48:10 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c	Thu May 27 20:20:22 2021
@@ -82,7 +82,7 @@ static CARD32 PnozzDrawROP[] = {
 void PnozzInitEngine(PnozzPtr);
 void pnozz_write_colour(PnozzPtr pPnozz, int reg, CARD32 colour);
 
-CARD32 MaxClip, junk;
+extern CARD32 MaxClip, junk;
 
 static void
 PnozzWaitMarker(ScreenPtr pScreen, int Marker)

CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Thu May 27 04:48:10 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz.h pnozz_accel.c
pnozz_cursor.c pnozz_driver.c
Added Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: compat-api.h pnozz_exa.c

Log Message:
Add support for EXA, so that the pnozz driver works again with Xorg.
Note, that only minimal acceleration is currently supported.

Thanks to macallan for the pointers to get this working.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-video-pnozz/dist/src/compat-api.h \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_cursor.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.1 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.2
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.1	Wed Aug 26 22:28:26 2009
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h	Thu May 27 04:48:10 2021
@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $NetBSD: pnozz.h,v 1.1 2009/08/26 22:28:26 macallan Exp $ */
+/* $NetBSD: pnozz.h,v 1.2 2021/05/27 04:48:10 jdc Exp $ */
 
 #ifndef PNOZZ_H
 #define PNOZZ_H
@@ -29,10 +29,14 @@
 #include "xf86_OSproc.h"
 #include "xf86RamDac.h"
 #include 
+#include 
 #include "gcstruct.h"
 #include "pnozz_regs.h"
 #include "xf86sbusBus.h"
+#ifdef HAVE_XAA_H
 #include "xaa.h"
+#endif
+#include "exa.h"
 
 typedef struct {
 	unsigned int fg, bg;			/* FG/BG colors for stipple */
@@ -53,19 +57,29 @@ typedef struct {
 	int		width;
 	int		height, scanlinesize, maxheight;
 	int		depthshift;
+	int		vidmem;
 
 	sbusDevicePtr	psdp;
+	struct fbcursor Cursor;
 	Bool		HWCursor;
 	Bool		NoAccel;
+	Bool		useXAA;
 	CloseScreenProcPtr CloseScreen;
 	
 	xf86CursorInfoPtr CursorInfoRec;
-	struct fbcursor Cursor;
+	unsigned int	CursorXY;
+	int		CursorBg, CursorFg;
+	Bool		CursorEnabled;
+	unsigned int	cursmask[32];	/* cursor mask bits */
+	unsigned int	cursbits[32];	/* what to show where mask enabled */
 	unsigned char pal[9];
 	
 	OptionInfoPtr	Options;
-	XAAInfoRecPtr	pXAA;
+	ExaDriverPtr	pExa;
+	int		srcoff;
+#ifdef HAVE_XAA_H
 	unsigned char	*buffers[2];
+#endif
 	/*
 	 * XXX this is enough for everything a SPARCbook could do on it's
 	 * internal display but not necessarily for an external one
@@ -114,7 +128,9 @@ unsigned char pnozz_read_dac_ctl_reg(Pno
 void pnozz_write_dac_cmap_reg(PnozzPtr, int, unsigned int);
 
 int PnozzAccelInit(ScrnInfoPtr);
+Bool PnozzDGAInit(ScreenPtr);
+int PnozzEXAInit(ScreenPtr);
 void PnozzHideCursor(ScrnInfoPtr);
 void PnozzShowCursor(ScrnInfoPtr);
 
-#endif /* CG6_H */
+#endif /* PNOZZ_H */

Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c:1.2 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c:1.3
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c:1.2	Wed May 25 14:15:26 2011
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_accel.c	Thu May 27 04:48:10 2021
@@ -20,15 +20,15 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $NetBSD: pnozz_accel.c,v 1.2 2011/05/25 14:15:26 christos Exp $ */
+/* $NetBSD: pnozz_accel.c,v 1.3 2021/05/27 04:48:10 jdc Exp $ */
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "pnozz.h"
+#include "pnozz_regs.h"
+#include "dgaproc.h"
 
 static CARD32 PnozzCopyROP[] = {
 	/*GXclear*/		0,
@@ -68,6 +68,31 @@ static CARD32 PnozzDrawROP[] = {
 	/*GXset*/		ROP_PAT
 };
 
+/* DGA stuff */
+
+static Bool Pnozz_OpenFramebuffer(ScrnInfoPtr pScrn, char **,
+unsigned char **mem, int *, int *, int *);
+static Bool Pnozz_SetMode(ScrnInfoPtr, DGAModePtr);
+static void Pnozz_SetViewport(ScrnInfoPtr, int, int, int);
+static int Pnozz_GetViewport(ScrnInfoPtr);
+static void Pnozz_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void Pnozz_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+
+static void PnozzSync(ScrnInfoPtr);
+
+static DGAFunctionRec Pnozz_DGAFuncs = {
+Pnozz_OpenFramebuffer,
+NULL,
+Pnozz_SetMode,
+Pnozz_SetViewport,
+Pnozz_GetViewport,
+PnozzSync,
+Pnozz_FillRect,
+

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

[Roland Illig]

Module Name:xsrc
Committed By:   rillig
Date:   Fri May 21 19:09:50 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c

Log Message:
xf86-video-nv: fix Clang build on amd64, i386, macppc

xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:258:49: error:
passing 'char *' to parameter of type 'Uchar *' (aka 'unsigned char *')
converts between pointers to integer types with different sign
[-Werror,-Wpointer-sign]

tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
   ^~


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.3
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2	Thu Mar 25 17:22:02 2021
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c	Fri May 21 19:09:50 2021
@@ -246,10 +246,10 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
 if (!MonInfo) {
 	/* ask wsdisplay */
 	struct wsdisplayio_edid_info ei;
-	char *buffer;
+	Uchar *buffer;
 	xf86MonPtr tmp;
 
-	buffer = malloc(1024);
+	buffer = malloc(1024);	/* XXX: missing null check */
 	ei.edid_data = buffer;
 	ei.buffer_size = 1024;
 	if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {

CVS commit: xsrc/external/mit/libX11/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed May 19 08:28:16 UTC 2021

Modified Files:
xsrc/external/mit/libX11/dist/src: SetFPath.c

Log Message:
include  always, not if HAVE_CONFIG_H is set.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/SetFPath.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/src/SetFPath.c
diff -u xsrc/external/mit/libX11/dist/src/SetFPath.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2
--- xsrc/external/mit/libX11/dist/src/SetFPath.c:1.1.1.6	Wed May 19 08:19:12 2021
+++ xsrc/external/mit/libX11/dist/src/SetFPath.c	Wed May 19 08:28:15 2021
@@ -26,8 +26,8 @@ in this Software without prior written a
 
 #ifdef HAVE_CONFIG_H
 #include 
-#include 
 #endif
+#include 
 #include "Xlibint.h"
 
 #define safestrlen(s) ((s) ? strlen(s) : 0)

CVS commit: xsrc/external/mit/libX11/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed May 19 08:20:08 UTC 2021

Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c

Log Message:
merge libX11 1.7.1.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/FontNames.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.7
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6	Sun Aug 30 04:53:28 2020
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man	Wed May 19 08:20:08 2021
@@ -160,7 +160,7 @@ The
 .B XGetGCValues
 function returns the components specified by valuemask for the specified GC.
 If the valuemask contains a valid set of GC mask bits
-.Pn ( GCFunction ,
+.RB ( GCFunction ,
 .BR GCPlaneMask ,
 .BR GCForeground ,
 .BR GCBackground ,
@@ -332,7 +332,6 @@ T}	T{
 (1L<<22)
 T}
 .TE
-.IN "XGCValues" "" "@DEF@"
 .LP
 .EX
 /\&* Values */
@@ -373,7 +372,7 @@ is typically the most useful because it 
 but special applications may use other functions,
 particularly in concert with particular planes of a color display.
 The 16 GC functions, defined in
-.hN X11/X.h ,
+.BR X11/X.h ,
 are:
 .\" are listed in Table 5-1 along with the
 .\"the associated hexadecimal code
@@ -506,10 +505,8 @@ _
 .TE
 .LP
 Many graphics operations depend on either pixel values or planes in a GC.
-.IN "Pixel value"
 The planes attribute is of type long, and it specifies which planes of the
 destination are to be modified, one bit per plane.
-.IN "Plane" "mask"
 A monochrome display has only one plane and
 will be the least significant bit of the word.
 As planes are added to the display hardware, they will occupy more
@@ -623,7 +620,6 @@ T}
 .TE
 .LP
 The cap-style defines how the endpoints of a path are drawn:
-.IN "Graphics context" "path"
 .TS
 lw(1.0i) lw(4.5i).
 T{

Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.7 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.8
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.7	Tue Apr 27 06:14:35 2021
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre	Wed May 19 08:20:08 2021
@@ -924,9 +924,11 @@ XCOMM Part 3
		: "ē"   U0113 # LATIN SMALL LETTER E WITH MACRON
   	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
 	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
+	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
 	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
   	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
 	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
+	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
 	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
	: "Ė"   U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
	: "Ė"   U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
@@ -960,14 +962,18 @@ XCOMM Part 3
   	: "ĝ"   U011D # LATIN SMALL LETTER G WITH CIRCUMFLEX
   	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
 	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
+	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
			: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
+   			: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
 	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
		: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
		: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
		: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
   	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
 	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
+	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
			: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
+   			: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
 	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
		: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
		: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
@@ -1016,9 +1022,11 @@ XCOMM Part 3
		: "ī"   U012B # LATIN SMALL LETTER I WITH MACRON
   	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE
 	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE
+	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE

CVS commit: xsrc/external/mit/xterm/dist

[Roland Illig]

Module Name:xsrc
Committed By:   rillig
Date:   Sat May 15 19:30:15 UTC 2021

Modified Files:
xsrc/external/mit/xterm/dist: misc.c

Log Message:
xterm: fix Clang build on i386

xsrc/external/mit/xterm/dist/misc.c:3250:47: error: format specifies
type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned
int') [-Werror,-Wformat]


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/misc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.20 xsrc/external/mit/xterm/dist/misc.c:1.21
--- xsrc/external/mit/xterm/dist/misc.c:1.20	Mon May 10 12:29:11 2021
+++ xsrc/external/mit/xterm/dist/misc.c	Sat May 15 19:30:15 2021
@@ -3247,7 +3247,7 @@ xtermAllocColor(XtermWidget xw, XColor *
 
 if (have == 0 || have > MAX_U_STRING) {
 	if (resource.reportColors) {
-	printf("color  (ignored, length %lu)\n", have);
+	printf("color  (ignored, length %lu)\n", (unsigned long)have);
 	}
 } else if (XParseColor(screen->display, cmap, spec, def)) {
 	XColor save_def = *def;

CVS commit: xsrc/external/mit/xterm

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Mon May 10 12:29:12 UTC 2021

Modified Files:
xsrc/external/mit/xterm/dist: misc.c
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
revert previous, do it differently and explain why.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.19 xsrc/external/mit/xterm/dist/misc.c:1.20
--- xsrc/external/mit/xterm/dist/misc.c:1.19	Sun May  9 12:55:36 2021
+++ xsrc/external/mit/xterm/dist/misc.c	Mon May 10 08:29:11 2021
@@ -6563,7 +6563,7 @@ xioerror(Display *dpy)
 return 0;			/* appease the compiler */
 }
 
-void _X_NORETURN
+void
 xt_error(String message)
 {
 xtermWarning("Xt error: %s\n", message);

Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.17 xsrc/external/mit/xterm/include/xtermcfg.h:1.18
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.17	Mon Apr 26 22:11:31 2021
+++ xsrc/external/mit/xterm/include/xtermcfg.h	Mon May 10 08:29:11 2021
@@ -98,7 +98,16 @@
 #define HAVE_SETPGID 1		/* AC_CHECK_FUNCS(setpgid) */
 #define HAVE_STDINT_H 1		/* AC_PROG_CC_STDC */
 #define HAVE_STDLIB_H 1		/* AC_CHECK_HEADERS(stdlib.h) */
+#if 0
+/*
+ * clang treats _Noreturn and __attribute__((__noreturn__)) differently,
+ * so we end up labeling xt_error() with _Noreturn and using it in
+ * XtSetErrorHandler which is marked with the attribute noreturn, and clang
+ * complains. IMHO this is a bug in clang. We tell everyone that we don't
+ * have the header, so we use the attribute consistently and everyone is happy.
+ */
 #define HAVE_STDNORETURN_H 1		/* CF_C11_NORETURN */
+#endif
 #define HAVE_STRFTIME 1		/* AC_CHECK_FUNCS(strftime) */
 /* #undef HAVE_SYS_TIME_H */		/* AC_HEADER_TIME */
 #define HAVE_SYS_TTYDEFAULTS_H 1	/* AC_CHECK_HEADERS(sys/ttydefaults.h) */

CVS commit: xsrc/external/mit/libXaw/dist/src

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun May  9 16:58:57 UTC 2021

Modified Files:
xsrc/external/mit/libXaw/dist/src: TextAction.c

Log Message:
fix casts and types to make it compile with clang


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/external/mit/libXaw/dist/src/TextAction.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXaw/dist/src/TextAction.c
diff -u xsrc/external/mit/libXaw/dist/src/TextAction.c:1.1.1.7 xsrc/external/mit/libXaw/dist/src/TextAction.c:1.2
--- xsrc/external/mit/libXaw/dist/src/TextAction.c:1.1.1.7	Mon Apr 26 17:23:18 2021
+++ xsrc/external/mit/libXaw/dist/src/TextAction.c	Sun May  9 12:58:57 2021
@@ -89,7 +89,7 @@ static Bool GetBlockBoundaries(TextWidge
 static int FormRegion(TextWidget, XawTextPosition, XawTextPosition,
 		  XawTextPosition*, int);
 static void GetSelection(Widget, Time, String*, Cardinal);
-static char *IfHexConvertHexElseReturnParam(char*, int*);
+static char *IfHexConvertHexElseReturnParam(const char*, int*);
 static void InsertNewCRs(TextWidget, XawTextPosition, XawTextPosition,
 			 XawTextPosition*, int);
 static int InsertNewLineAndBackupInternal(TextWidget);
@@ -421,7 +421,7 @@ _SelectionReceived(Widget w, XtPointer c
 	fprintf(stderr, "Xaw Text Widget: An attempt was made to insert "
 		"an illegal selection.\n");
 
-	textprop.value = (const unsigned char *)" >> ILLEGAL SELECTION << ";
+	textprop.value = (unsigned char *)" >> ILLEGAL SELECTION << ";
 	textprop.nitems = strlen((char *) textprop.value);
 	if (XwcTextPropertyToTextList(d, , , )
 		!=  Success
@@ -3215,9 +3215,9 @@ InsertChar(Widget w, XEvent *event, Stri
  *
  * NOTE:In neither case will there be strings to free. */
 static char *
-IfHexConvertHexElseReturnParam(char *param, int *len_return)
+IfHexConvertHexElseReturnParam(const char *param, int *len_return)
 {
-char *p;		/* steps through param char by char */
+const char *p;	/* steps through param char by char */
 char c;		/* holds the character pointed to by p */
 int ind;		/* steps through hexval buffer char by char */
 static char hexval[XawTextActionMaxHexChars];
@@ -3225,8 +3225,7 @@ IfHexConvertHexElseReturnParam(char *par
 
 /* reject if it doesn't begin with 0x and at least one more character. */
 if ((param[0] != '0') || (param[1] != 'x') || (param[2] == '\0')) {
-	*len_return = (int)strlen(param);
-	return(param);
+	goto out;
 }
 
 /* Skip the 0x; go character by character shifting and adding. */
@@ -3253,8 +3252,7 @@ IfHexConvertHexElseReturnParam(char *par
 	if (++ind < XawTextActionMaxHexChars)
 		hexval[ind] = '\0';
 	else {
-		*len_return = (int)strlen(param);
-		return(param);
+		goto out;
 	}
 	}
 }
@@ -3266,9 +3264,9 @@ IfHexConvertHexElseReturnParam(char *par
 }
 
 /* Else, there were non-hex chars or odd digit count, so... */
-
+out:
 *len_return = (int)strlen(param);
-return (param);			   /* ...return the verbatim string. */
+return ((char *)param);			   /* ...return the verbatim string. */
 }
 
 /* InsertString() - action
@@ -3370,7 +3368,7 @@ DisplayCaret(Widget w, XEvent *event, St
 
 if (*num_params > 0) {	/* default arg is "True" */
 	XrmValue from, to;
-	from.size = (unsigned)strlen(from.addr = params[0]);
+	from.size = (unsigned)strlen(from.addr = (char *)params[0]);
 	XtConvert(w, XtRString, , XtRBoolean, );
 
 	if (to.addr != NULL)

CVS commit: xsrc/external/mit/libXaw/dist/src

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun May  9 16:58:19 UTC 2021

Modified Files:
xsrc/external/mit/libXaw/dist/src: Pixmap.c

Log Message:
make this compile again under clang:
- factor out duplicated code
- add casts
- plug memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libXaw/dist/src/Pixmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXaw/dist/src/Pixmap.c
diff -u xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.1.1.6 xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.2
--- xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.1.1.6	Mon Apr 26 17:23:18 2021
+++ xsrc/external/mit/libXaw/dist/src/Pixmap.c	Sun May  9 12:58:19 2021
@@ -699,6 +699,27 @@ GetResourcePixmapPath(Display *display)
 	pixmap_path = default_path;
 }
 
+static const char *
+GetFileName(XawParams *params, Screen *screen)
+{
+  static SubstitutionRec sub[] = {
+{'H',   NULL},
+{'N',   NULL},
+{'T',   "pixmaps"},
+{'P',   PROJECT_ROOT},
+  };
+  if (params->name[0] != '/' && params->name[0] != '.')
+{
+  if (!sub[0].substitution)
+	sub[0].substitution = getenv("HOME");
+  sub[1].substitution = (char *)params->name;
+  if (pixmap_path == NULL)
+	GetResourcePixmapPath(DisplayOfScreen(screen));
+  return XtFindFile(pixmap_path, sub, XtNumber(sub), NULL);
+}
+   return params->name;
+}
+
 static Bool
 BitmapLoader(XawParams *params, Screen *screen, Colormap colormap, int depth,
 	 Pixmap *pixmap_return, Pixmap *mask_return,
@@ -712,13 +733,7 @@ BitmapLoader(XawParams *params, Screen *
   int hotX, hotY;
   XawArgVal *argval;
   Bool retval = False;
-  static SubstitutionRec sub[] = {
-{'H',   NULL},
-{'N',   NULL},
-{'T',   "bitmaps"},
-{'P',   PROJECT_ROOT},
-  };
-  char *filename;
+  const char *filename;
 
   fg = BlackPixelOfScreen(screen);
   bg = WhitePixelOfScreen(screen);
@@ -742,19 +757,9 @@ BitmapLoader(XawParams *params, Screen *
 	return (False);
 }
 
-  if (params->name[0] != '/' && params->name[0] != '.')
-{
-  if (!sub[0].substitution)
-	sub[0].substitution = getenv("HOME");
-  sub[1].substitution = params->name;
-  if (pixmap_path == NULL)
-	GetResourcePixmapPath(DisplayOfScreen(screen));
-  filename = XtFindFile(pixmap_path, sub, XtNumber(sub), NULL);
-  if (!filename)
-	return (FALSE);
-}
-  else
-filename = params->name;
+  filename = GetFileName(params, screen);
+  if (!filename)
+return (FALSE);
 
   if (XReadBitmapFileData(filename, , , ,
 			  , ) == BitmapSuccess)
@@ -774,7 +779,7 @@ BitmapLoader(XawParams *params, Screen *
 }
 
   if (filename != params->name)
-XtFree(filename);
+XtFree((char *)filename);
 
   return (retval);
 }
@@ -827,7 +832,7 @@ GradientLoader(XawParams *params, Screen
 
   value = NULL;
   if ((argval = XawFindArgVal(params, "start")) != NULL)
-value = argval->value;
+value = (char *)argval->value;
   if (value && !XAllocNamedColor(DisplayOfScreen(screen), colormap, value,
 			, ))
 return (False);
@@ -838,7 +843,7 @@ GradientLoader(XawParams *params, Screen
 }
   value = NULL;
   if ((argval = XawFindArgVal(params, "end")) != NULL)
-value = argval->value;
+value = (char *)argval->value;
   if (value && !XAllocNamedColor(DisplayOfScreen(screen), colormap, value,
 			, ))
 return (False);
@@ -932,31 +937,16 @@ XPixmapLoader(XawParams *params, Screen 
   XpmAttributes xpm_attributes;
   XawArgVal *argval;
   unsigned int closeness = 4000;
-  static SubstitutionRec sub[] = {
-{'H',   NULL},
-{'N',   NULL},
-{'T',   "pixmaps"},
-{'P',   PROJECT_ROOT},
-  };
+  Bool retval = False;
   const char *filename;
 
   if ((argval = XawFindArgVal(params, "closeness")) != NULL
   && argval->value)
 closeness = (unsigned)atoi(argval->value);
 
-  if (params->name[0] != '/' && params->name[0] != '.')
-{
-  if (!sub[0].substitution)
-	sub[0].substitution = getenv("HOME");
-  sub[1].substitution = params->name;
-  if (pixmap_path == NULL)
-	GetResourcePixmapPath(DisplayOfScreen(screen));
-  filename = XtFindFile(pixmap_path, sub, XtNumber(sub), NULL);
-  if (!filename)
-	return (False);
-}
-  else
-filename = params->name;
+  filename = GetFileName(params, screen);
+  if (!filename)
+return (FALSE);
 
   xpm_attributes.colormap = colormap;
   xpm_attributes.closeness = closeness;
@@ -968,10 +958,12 @@ XPixmapLoader(XawParams *params, Screen 
   *width_return = (Dimension)xpm_attributes.width;
   *height_return = (Dimension)xpm_attributes.height;
 
-  return (True);
+  retval = True;
 }
 
-  return (False);
+  if (filename != params->name)
+XtFree((char *)filename);
+  return (retval);
 }
 
 void

CVS commit: xsrc/external/mit/xterm/dist

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun May  9 16:55:36 UTC 2021

Modified Files:
xsrc/external/mit/xterm/dist: misc.c

Log Message:
make xt_error() dead for the benefit of clang


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/misc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.18 xsrc/external/mit/xterm/dist/misc.c:1.19
--- xsrc/external/mit/xterm/dist/misc.c:1.18	Mon Apr 26 21:58:18 2021
+++ xsrc/external/mit/xterm/dist/misc.c	Sun May  9 12:55:36 2021
@@ -6563,7 +6563,7 @@ xioerror(Display *dpy)
 return 0;			/* appease the compiler */
 }
 
-void
+void _X_NORETURN
 xt_error(String message)
 {
 xtermWarning("Xt error: %s\n", message);

CVS commit: xsrc/external/mit/xorgproto/dist/include/X11

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun May  9 16:13:39 UTC 2021

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xfuncproto.h

Log Message:
Use __noreturn__ instead of noreturn because  #defines
noreturn _Noreturn and this gives clang a heartache.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h
diff -u xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.1.1.2 xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.2
--- xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.1.1.2	Mon Apr 26 17:10:17 2021
+++ xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h	Sun May  9 12:13:39 2021
@@ -150,7 +150,7 @@ in this Software without prior written a
 #if __has_attribute(noreturn) \
 || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
 || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define _X_NORETURN __attribute((noreturn))
+# define _X_NORETURN __attribute__((__noreturn__))
 #else
 # define _X_NORETURN
 #endif /* GNUC  */

CVS commit: xsrc/external/mit/libX11/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 06:14:35 UTC 2021

Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: XlibInt.c
Removed Files:
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8: Compose.pre XI18N_OBJS
XLC_LOCALE.pre

Log Message:
merge libX11 1.7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XI18N_OBJS \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XLC_LOCALE.pre
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/src/XlibInt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.10
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9	Fri Jul 31 19:29:52 2020
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4	Tue Apr 27 06:14:35 2021
@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
   echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >_MESSAGE_LOG_FD
   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>_MESSAGE_LOG_FD
-  echo "$AR cru libconftest.a conftest.o" >_MESSAGE_LOG_FD
-  $AR cru libconftest.a conftest.o 2>_MESSAGE_LOG_FD
+  echo "$AR cr libconftest.a conftest.o" >_MESSAGE_LOG_FD
+  $AR cr libconftest.a conftest.o 2>_MESSAGE_LOG_FD
   echo "$RANLIB libconftest.a" >_MESSAGE_LOG_FD
   $RANLIB libconftest.a 2>_MESSAGE_LOG_FD
   cat > conftest.c << _LT_EOF
@@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
 _LT_DECL([], [AR], [1], [The archiver])
 _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 
@@ -4063,7 +4063,8 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
 # Now try to grab the symbols.
 nlist=conftest.nm
-if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >_MESSAGE_LOG_FD
+if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>_MESSAGE_LOG_FD && test -s "$nlist"; then
   # Try sorting and uniquifying the output.
   if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 ;;
+  # flang / f18. f95 an alias for gfortran or flang on Debian
+  flang* | f18* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+;;
   # icc used to be incompatible with GCC.
   # ICC 10 doesn't accept -KPIC any more.
   icc* | ifort*)
@@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; 
   # Commands to make compiler produce verbose output that lists
   # what "hidden" libraries, object files and flags are used when
   # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
 else
   GXX=no
@@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; 
 # explicitly linking system object files so we need to strip them
 # from the output so that they don't get included in the library
 # dependencies.
-output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 ;;
   *)
 if test yes = "$GXX"; then
@@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; 
 	# explicitly linking system object files so we need to strip them
 	# from 

CVS commit: xsrc/external/mit/xorg-server.old/dist/Xi

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 05:19:51 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server.old/dist/Xi: chgfctl.c

Log Message:
pull across the fixes for CVE-2021-3472.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c
diff -u xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c	Tue Apr 27 05:19:51 2021
@@ -468,8 +468,11 @@ ProcXChangeFeedbackControl(ClientPtr cli
 case StringFeedbackClass:
 {
 	char n;
-	xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
+xStringFeedbackCtl *f;
 
+REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq,
+sizeof(xStringFeedbackCtl));
+f = ((xStringFeedbackCtl *) [1]);
 	if (client->swapped) {
 if (len < bytes_to_int32(sizeof(xStringFeedbackCtl)))
 return BadLength;

CVS commit: xsrc/external/mit/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 04:01:42 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
update for xorg-server 1.20.11.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.40 xsrc/external/mit/xorg-server/include/dix-config.h:1.41
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.40	Sat Dec  5 22:44:37 2020
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Tue Apr 27 04:01:42 2021
@@ -125,9 +125,6 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 
-/* Define to 1 if you have the libdispatch (GCD) available */
-/* #undef HAVE_LIBDISPATCH */
-
 /* Define to 1 if you have the  header file. */
 /* #undef HAVE_LINUX_AGPGART_H */
 
@@ -358,7 +355,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.11 xsrc/external/mit/xorg-server/include/version-config.h:1.12
--- xsrc/external/mit/xorg-server/include/version-config.h:1.11	Sat Dec  5 22:44:37 2020
+++ xsrc/external/mit/xorg-server/include/version-config.h	Tue Apr 27 04:01:42 2021
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.10"
+#define VENDOR_MAN_VERSION "Version 1.20.11"
 
 /* Vendor name */
 /* #define VENDOR_NAME "The X.Org Foundation" */
 
 /* Vendor release */
-#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.21 xsrc/external/mit/xorg-server/include/xorg-config.h:1.22
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.21	Sat Dec  5 22:44:37 2020
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Tue Apr 27 04:01:42 2021
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.21 xsrc/external/mit/xorg-server/include/xorg-server.h:1.22
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.21	Sat Dec  5 22:44:37 2020
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Tue Apr 27 04:01:42 2021
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 04:01:25 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: chgfctl.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz: console_redirect.c
console_redirect.h quartzCocoa.m quartzCommon.h

Log Message:
merge xorg-server 1.20.11.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/console_redirect.c \
xsrc/external/mit/xorg-server/dist/hw/xquartz/console_redirect.h
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/quartzCocoa.m \
xsrc/external/mit/xorg-server/dist/hw/xquartz/quartzCommon.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.8 xsrc/external/mit/xorg-server/dist/configure:1.9
--- xsrc/external/mit/xorg-server/dist/configure:1.8	Sat Dec  5 20:34:03 2020
+++ xsrc/external/mit/xorg-server/dist/configure	Tue Apr 27 04:01:25 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.10.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.11.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.10'
-PACKAGE_STRING='xorg-server 1.20.10'
+PACKAGE_VERSION='1.20.11'
+PACKAGE_STRING='xorg-server 1.20.11'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2045,7 +2045,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.20.10 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2116,7 +2116,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.10:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.11:";;
esac
   cat <<\_ACEOF
 
@@ -2307,10 +2307,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 1.20.10)
+  (default: 1.20.11)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 1.20.10)
+  CFBundleShortVersionString (default: 1.20.11)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2567,7 +2567,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.20.10
+xorg-server configure 1.20.11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3276,7 +3276,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.20.10, which was
+It was created by xorg-server $as_me 1.20.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3624,8 +3624,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2020-12-01"
-RELEASE_NAME="Chicken Pot Pie"
+RELEASE_DATE="2021-04-13"
+RELEASE_NAME="Arroz con Pollo"
 
 
 am__api_version='1.16'
@@ -4143,7 +4143,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.20.10'
+ VERSION='1.20.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23778,7 +23778,7 @@ _ACEOF
 if test "${with_bundle_version+set}" = set; then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else
-   BUNDLE_VERSION="1.20.10"
+   BUNDLE_VERSION="1.20.11"
 fi
 
 
@@ -24772,14 +24772,6 @@ $as_echo "$xorg_cv_Carbon_framework" >&6
 			fi
 		fi
 
-		ac_fn_c_check_func "$LINENO" "dispatch_async" 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 03:38:48 UTC 2021

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in at in ir
lk pl sy
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: sl-c3x00
ws003sh ws007sh ws011sh ws020sh

Log Message:
merge xkeyboard-config 2.32, reduce local diffs


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/lk
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/pl
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/sy
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.19 xsrc/external/mit/xkeyboard-config/dist/configure:1.20
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.19	Sun Feb 23 11:14:17 2020
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Tue Apr 27 03:38:48 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.29.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.29'
-PACKAGE_STRING='xkeyboard-config 2.29'
+PACKAGE_VERSION='2.32'
+PACKAGE_STRING='xkeyboard-config 2.32'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.29 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.32 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.29:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.32:";;
esac
   cat <<\_ACEOF
 
@@ -1497,7 +1497,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.29
+xkeyboard-config configure 2.32
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1677,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.29, which was
+It was created by xkeyboard-config $as_me 2.32, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2025,7 +2025,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
+ # change version in meson.build as well
 
 am__api_version='1.16'
 
@@ -2542,7 +2542,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.29'
+ VERSION='2.32'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7051,7 +7051,10 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile 

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 03:02:37 UTC 2021

Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/man: drm-kms.xml drm-memory.xml drm.xml
drmAvailable.xml drmHandleEvent.xml drmModeGetResources.xml

Log Message:
merge libdrm 2.4.105.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/man/drm-kms.xml \
xsrc/external/mit/libdrm/dist/man/drm.xml
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libdrm/dist/man/drm-memory.xml \
xsrc/external/mit/libdrm/dist/man/drmAvailable.xml \
xsrc/external/mit/libdrm/dist/man/drmHandleEvent.xml \
xsrc/external/mit/libdrm/dist/man/drmModeGetResources.xml
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.27 xsrc/external/mit/libdrm/dist/xf86drm.c:1.28
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.27	Sun Nov  1 10:01:30 2020
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Tue Apr 27 03:02:37 2021
@@ -128,6 +128,22 @@ static drmServerInfoPtr drm_server_info;
 static bool drmNodeIsDRM(int maj, int min);
 static char *drmGetMinorNameForFD(int fd, int type);
 
+static unsigned log2_int(unsigned x)
+{
+unsigned l;
+
+if (x < 2) {
+return 0;
+}
+for (l = 2; ; l++) {
+if ((unsigned)(1 << l) > x) {
+return l - 1;
+}
+}
+return 0;
+}
+
+
 drm_public void drmSetServerInfo(drmServerInfoPtr info)
 {
 drm_server_info = info;
@@ -700,7 +716,7 @@ static int drmOpenByName(const char *nam
 int  retcode;
 
 sprintf(proc_name, "/proc/dri/%d/name", i);
-if ((fd = open(proc_name, 0, 0)) >= 0) {
+if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) {
 retcode = read(fd, buf, sizeof(buf)-1);
 close(fd);
 if (retcode) {
@@ -1339,7 +1355,12 @@ drm_public drmBufInfoPtr drmGetBufInfo(i
 
 retval = drmMalloc(sizeof(*retval));
 retval->count = info.count;
-retval->list  = drmMalloc(info.count * sizeof(*retval->list));
+if (!(retval->list = drmMalloc(info.count * sizeof(*retval->list {
+drmFree(retval);
+drmFree(info.list);
+return NULL;
+}
+
 for (i = 0; i < info.count; i++) {
 retval->list[i].count = info.list[i].count;
 retval->list[i].size  = info.list[i].size;
@@ -2826,7 +2847,7 @@ static bool drmNodeIsDRM(int maj, int mi
 snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm",
  maj, min);
 return stat(path, ) == 0;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
 char name[SPECNAMELEN];
 
 if (!devname_r(makedev(maj, min), S_IFCHR, name, sizeof(name)))
@@ -2939,7 +2960,7 @@ static char *drmGetMinorNameForFD(int fd
 
 closedir(sysdir);
 return NULL;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
 struct stat sbuf;
 char dname[SPECNAMELEN];
 const char *mname;
@@ -3384,7 +3405,7 @@ static int drmParsePciBusInfo(int maj, i
 info->func = pinfo.func;
 
 return 0;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
 return get_sysctl_pci_bus_info(maj, min, info);
 #else
 #warning "Missing implementation of drmParsePciBusInfo"
@@ -3595,7 +3616,7 @@ out:
 device->subdevice_id = pinfo.subdevice_id;
 
 return 0;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
 drmPciBusInfo info;
 struct pci_conf_io pc;
 struct pci_match_conf patterns[1];
@@ -4172,7 +4193,7 @@ static void drmFoldDuplicatedDevices(drm
 for (j = i + 1; j < count; j++) {
 if (drmDevicesEqual(local_devices[i], local_devices[j])) {
 local_devices[i]->available_nodes |= local_devices[j]->available_nodes;
-node_type = log2(local_devices[j]->available_nodes);
+node_type = log2_int(local_devices[j]->available_nodes);
 memcpy(local_devices[i]->nodes[node_type],
local_devices[j]->nodes[node_type], drmGetMaxNodeName());
 drmFreeDevice(_devices[j]);
@@ -4427,6 +4448,10 @@ drm_public int drmGetDevices2(uint32_t f
 }
 
 

CVS commit: xsrc/external/mit/xterm/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 02:11:31 UTC 2021

Modified Files:
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
fix the value of STDC_NORETURN


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.16 xsrc/external/mit/xterm/include/xtermcfg.h:1.17
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.16	Tue Apr 27 01:58:18 2021
+++ xsrc/external/mit/xterm/include/xtermcfg.h	Tue Apr 27 02:11:31 2021
@@ -200,7 +200,7 @@
 /* #undef PROCFS_ROOT */		/* CF_ARG_ENABLE(exec-xterm) */
 #define SCROLLBAR_RIGHT 1		/* CF_ARG_ENABLE(rightbar) */
 #define SIG_ATOMIC_T volatile sig_atomic_t		/* CF_SIG_ATOMIC_T */
-#define STDC_NORETURN 1			/* CF_C11_NORETURN */
+#define STDC_NORETURN _Noreturn			/* CF_C11_NORETURN */
 /* #undef SVR4 */			/* CF_SVR4, imake */
 /* #undef SYSV */			/* CF_SYSV, imake */
 #define TIME_WITH_SYS_TIME 1	/* AC_HEADER_TIME */

CVS commit: xsrc/external/mit/xterm

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 01:58:19 UTC 2021

Modified Files:
xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h
resize.c xterm.h xterm.man
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
merge xterm 367.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/dist/misc.c \
xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/dist/fontutils.c
diff -u xsrc/external/mit/xterm/dist/fontutils.c:1.8 xsrc/external/mit/xterm/dist/fontutils.c:1.9
--- xsrc/external/mit/xterm/dist/fontutils.c:1.8	Thu Feb 11 12:24:39 2021
+++ xsrc/external/mit/xterm/dist/fontutils.c	Tue Apr 27 01:58:18 2021
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.701 2021/02/02 00:40:30 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.703 2021/03/02 00:25:24 tom Exp $ */
 
 /*
  * Copyright 1998-2020,2021 by Thomas E. Dickey
@@ -1020,6 +1020,20 @@ noUsableXft(XtermWidget xw, const char *
 }
 #endif
 
+XFontStruct *
+xtermLoadQueryFont(XtermWidget xw, const char *name)
+{
+XFontStruct *result = NULL;
+size_t have = strlen(name);
+if (have == 0 || have > MAX_U_STRING) {
+	;			/* just ignore it */
+} else {
+	TScreen *screen = TScreenOf(xw);
+	result = XLoadQueryFont(screen->display, name);
+}
+return result;
+}
+
 /*
  * Open the given font and verify that it is non-empty.  Return a null on
  * failure.
@@ -1031,12 +1045,11 @@ xtermOpenFont(XtermWidget xw,
 	  Bool force)
 {
 Bool code = False;
-TScreen *screen = TScreenOf(xw);
 
 TRACE(("xtermOpenFont %d:%d '%s'\n",
 	   result->warn, xw->misc.fontWarnings, NonNull(name)));
 if (!IsEmpty(name)) {
-	if ((result->fs = XLoadQueryFont(screen->display, name)) != 0) {
+	if ((result->fs = xtermLoadQueryFont(xw, name)) != 0) {
 	code = True;
 	if (EmptyFont(result->fs)) {
 		xtermCloseFont(xw, result);
@@ -5105,7 +5118,7 @@ save2FontList(XtermWidget xw,
 		next[count++] = value;
 		next[count] = 0;
 		*list = next;
-		TRACE(("... saved %s %s %lu:%s\n",
+		TRACE(("... saved \"%s\" \"%s\" %lu:\"%s\"\n",
 			   whichFontList(xw, target),
 			   whichFontList2(xw, *list),
 			   (unsigned long) count,
@@ -5163,7 +5176,8 @@ allocFontList(XtermWidget xw,
 	int pass;
 	char **list = 0;
 
-	TRACE(("allocFontList %s %s '%s'\n", whichFontEnum(which), name, blob));
+	TRACE(("allocFontList %s name=\"%s\" source=\"%s\"\n",
+	   whichFontEnum(which), name, blob));
 
 	for (pass = 0; pass < 2; ++pass) {
 	unsigned count = 0;

Index: xsrc/external/mit/xterm/dist/linedata.c
diff -u xsrc/external/mit/xterm/dist/linedata.c:1.6 xsrc/external/mit/xterm/dist/linedata.c:1.7
--- xsrc/external/mit/xterm/dist/linedata.c:1.6	Thu Feb 11 12:24:39 2021
+++ xsrc/external/mit/xterm/dist/linedata.c	Tue Apr 27 01:58:18 2021
@@ -1,7 +1,7 @@
-/* $XTermId: linedata.c,v 1.97 2019/06/30 19:10:53 tom Exp $ */
+/* $XTermId: linedata.c,v 1.99 2021/03/08 00:24:12 tom Exp $ */
 
 /*
- * Copyright 2009-2018,2019 by Thomas E. Dickey
+ * Copyright 2009-2019,2021 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -251,7 +251,7 @@ saveCellData(TScreen *screen,
 			  && (limits == NULL
   || (column + 1) >= limits->right)));
 	if (blank) {
-		item->charData = (Char) ' ';
+		item->charData = (CharData) ' ';
 	}
 	item->combSize = blank ? 0 : ld->combSize;
 	for_each_combData(off, item) {

Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.17 xsrc/external/mit/xterm/dist/misc.c:1.18
--- xsrc/external/mit/xterm/dist/misc.c:1.17	Thu Feb 11 12:24:39 2021
+++ xsrc/external/mit/xterm/dist/misc.c	Tue Apr 27 01:58:18 2021
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.968 2021/02/10 00:50:59 tom Exp $ */
+/* $XTermId: misc.c,v 1.979 2021/03/24 00:27:48 tom Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -67,7 +67,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -220,7 +219,7 @@ unselectwindow(XtermWidget xw, int flag)
 
 if (screen->hide_pointer && screen->pointer_mode < pFocused) {
 	screen->hide_pointer = False;
-	xtermDisplayCursor(xw);
+	xtermDisplayPointer(xw);
 }
 
 screen->select &= ~flag;
@@ -314,16 +313,16 @@ do_xevents(XtermWidget xw)
 }
 
 void
-xtermDisplayCursor(XtermWidget xw)
+xtermDisplayPointer(XtermWidget xw)
 {
 TScreen *screen = TScreenOf(xw);
 
 if (screen->Vshow) {
 	if 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 01:47:40 UTC 2021

Modified Files:
xsrc/external/mit/xkbcomp/dist: expr.c utils.h
Removed Files:
xsrc/external/mit/util-macros/dist: README

Log Message:
merge util-macros 1.19.3 and xkbcomp 1.4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/util-macros/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkbcomp/dist/expr.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkbcomp/dist/utils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkbcomp/dist/expr.c
diff -u xsrc/external/mit/xkbcomp/dist/expr.c:1.3 xsrc/external/mit/xkbcomp/dist/expr.c:1.4
--- xsrc/external/mit/xkbcomp/dist/expr.c:1.3	Wed Apr 27 07:23:01 2016
+++ xsrc/external/mit/xkbcomp/dist/expr.c	Tue Apr 27 01:47:40 2021
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -149,7 +149,7 @@ ExprResolveLhs(ExprDef * expr,
 *index_rtrn = expr->value.array.entry;
 return True;
 }
-WSGO1("Unexpected operator %d in ResolveLhs\n", expr->op);
+WSGO("Unexpected operator %d in ResolveLhs\n", expr->op);
 return False;
 }
 
@@ -299,7 +299,7 @@ ExprResolveModIndex(ExprDef * expr,
 case ExprValue:
 if (expr->type != TypeInt)
 {
-ERROR1
+ERROR
 ("Found constant of type %s where a modifier mask was expected\n",
  exprTypeText(expr->type));
 return False;
@@ -307,7 +307,7 @@ ExprResolveModIndex(ExprDef * expr,
 else if ((expr->value.ival >= XkbNumModifiers)
  || (expr->value.ival < 0))
 {
-ERROR2("Illegal modifier index (%d, must be 0..%d)\n",
+ERROR("Illegal modifier index (%d, must be 0..%d)\n",
expr->value.ival, XkbNumModifiers - 1);
 return False;
 }
@@ -325,7 +325,7 @@ ExprResolveModIndex(ExprDef * expr,
 None, expr->value.str, TypeInt, val_rtrn);
 }
 if (!ok)
-ERROR1("Cannot determine modifier index for \"%s\"\n",
+ERROR("Cannot determine modifier index for \"%s\"\n",
XkbAtomText(NULL, expr->value.str, XkbMessage));
 break;
 case ExprFieldRef:
@@ -351,12 +351,12 @@ ExprResolveModIndex(ExprDef * expr,
 bogus = "assignment";
 break;
 default:
-WSGO1("Unknown operator %d in ResolveModIndex\n", expr->op);
+WSGO("Unknown operator %d in ResolveModIndex\n", expr->op);
 return False;
 }
 if (bogus)
 {
-ERROR1("Modifier index must be a name or number, %s ignored\n",
+ERROR("Modifier index must be a name or number, %s ignored\n",
bogus);
 return False;
 }
@@ -389,7 +389,7 @@ ExprResolveBoolean(ExprDef * expr,
 case ExprValue:
 if (expr->type != TypeBoolean)
 {
-ERROR1
+ERROR
 ("Found constant of type %s where boolean was expected\n",
  exprTypeText(expr->type));
 return False;
@@ -421,7 +421,7 @@ ExprResolveBoolean(ExprDef * expr,
 None, expr->value.str, TypeBoolean, val_rtrn);
 }
 if (!ok)
-ERROR1("Identifier \"%s\" of type int is unknown\n",
+ERROR("Identifier \"%s\" of type int is unknown\n",

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Apr 27 01:22:56 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
nv_driver.c
xsrc/external/mit/xprop/include: config.h

Log Message:
merge xf86-video-nouveau 1.0.17 and xprop 1.2.5.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xprop/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.11 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.12
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.11	Sun Mar  3 11:09:04 2019
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c	Tue Apr 27 01:22:55 2021
@@ -162,6 +162,8 @@ drmmode_events = {
 	.prev = _events,
 };
 
+static bool warned = false;
+
 static void
 drmmode_event_handler(int fd, unsigned int frame, unsigned int tv_sec,
 		  unsigned int tv_usec, void *event_data)
@@ -169,7 +171,10 @@ drmmode_event_handler(int fd, unsigned i
 	const uint64_t ust = (uint64_t)tv_sec * 100 + tv_usec;
 	struct drmmode_event *e = event_data;
 
+	int counter = 0;
+
 	xorg_list_for_each_entry(e, _events, head) {
+		counter++;
 		if (e == event_data) {
 			xorg_list_del(>head);
 			e->func((void *)(e + 1), e->name, ust, frame);
@@ -177,6 +182,12 @@ drmmode_event_handler(int fd, unsigned i
 			break;
 		}
 	}
+
+	if (counter > 100 && !warned) {
+		xf86DrvMsg(0, X_WARNING,
+			   "Event handler iterated %d times\n", counter);
+		warned = true;
+	}
 }
 
 void
@@ -1548,7 +1559,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn
 	}
 
 	ppix = screen->GetScreenPixmap(screen);
-	if (pNv->AccelMethod >= NONE)
+	if (pNv->AccelMethod > NONE)
 		nouveau_bo_ref(pNv->scanout, _pixmap(ppix)->bo);
 	screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
    (pNv->AccelMethod > NONE || pNv->ShadowPtr) ?

Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.3 xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.4
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.3	Sun Mar  3 09:44:37 2019
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c	Tue Apr 27 01:22:55 2021
@@ -1084,7 +1084,8 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 pNv->Options, OPTION_WFB, FALSE);
 #endif
 
-		pNv->tiled_scanout = TRUE;
+		if (pNv->Architecture >= NV_ARCH_10)
+			pNv->tiled_scanout = TRUE;
 	}
 
 	pNv->ce_enabled =
@@ -1377,6 +1378,9 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 			pNv->wfb_enabled = FALSE;
 #endif
 			pNv->tiled_scanout = FALSE;
+			pScrn->capabilities &= ~(RR_Capability_SourceOutput |
+		 RR_Capability_SourceOffload |
+		 RR_Capability_SinkOutput);
 			pScrn->displayWidth = nv_pitch_align(pNv,
 			 pScrn->virtualX,
 			 pScrn->depth);
@@ -1497,7 +1501,7 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 
 	xf86SetBlackWhitePixels(pScreen);
 
-	if (nouveau_present_init(pScreen))
+	if (pNv->AccelMethod == EXA && nouveau_present_init(pScreen))
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 			   "Hardware support for Present enabled\n");
 	else

Index: xsrc/external/mit/xprop/include/config.h
diff -u xsrc/external/mit/xprop/include/config.h:1.6 xsrc/external/mit/xprop/include/config.h:1.7
--- xsrc/external/mit/xprop/include/config.h:1.6	Sun Mar 11 09:59:14 2018
+++ xsrc/external/mit/xprop/include/config.h	Tue Apr 27 01:22:56 2021
@@ -47,7 +47,7 @@
 #define PACKAGE_NAME "xprop"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xprop 1.2.3"
+#define PACKAGE_STRING "xprop 1.2.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xprop"
@@ -56,7 +56,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.3"
+#define PACKAGE_VERSION "1.2.5"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -65,10 +65,10 @@
 #define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 5
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.2.3"
+#define VERSION "1.2.5"

CVS commit: xsrc/external/mit/ctwm/dist

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Mon Apr 12 06:42:31 UTC 2021

Modified Files:
xsrc/external/mit/ctwm/dist: add_window.c

Log Message:
Reapply font calculation fix.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/ctwm/dist/add_window.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/add_window.c
diff -u xsrc/external/mit/ctwm/dist/add_window.c:1.3 xsrc/external/mit/ctwm/dist/add_window.c:1.4
--- xsrc/external/mit/ctwm/dist/add_window.c:1.3	Sun Apr 11 10:11:57 2021
+++ xsrc/external/mit/ctwm/dist/add_window.c	Mon Apr 12 06:42:31 2021
@@ -1000,7 +1000,7 @@ AddWindow(Window w, AWType wtype, IconMg
    tmp_win->name, namelen,
    _rect, _rect);
 width = SIZE_HINDENT + ink_rect.width;
-height = logical_rect.height + SIZE_VINDENT * 2;
+height = Scr->SizeFont.height + SIZE_VINDENT * 2;
 
 XmbTextExtents(Scr->SizeFont.font_set,
    ": ", 2,  NULL, _rect);

CVS commit: xsrc/external/mit/ctwm

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Apr 11 11:00:30 UTC 2021

Added Files:
xsrc/external/mit/ctwm: prepare-import.sh
Removed Files:
xsrc/external/mit/ctwm/dist: CHANGES.html CMakeLists.txt Doxyfile.in
README.html image_jpeg.c image_jpeg.h sound.c sound.h
xsrc/external/mit/ctwm/dist/examples: example.ctwmrc levitte.ctwmrc
peterc.ctwmrc
xsrc/external/mit/ctwm/dist/gen: ctwm.1.html
xsrc/external/mit/ctwm/dist/minibuild: README.md defs.mk main.mk
mkmk.sh
xsrc/external/mit/ctwm/dist/tools: ctwm.astyle mk_atoms.sh
mk_ctf_info.sh mk_deftwmrc.sh mk_event_names.sh mk_function_bits.sh
mk_tar.sh mk_version_in.sh rewrite_version_bzr.sh
rewrite_version_git.sh try_all_opts.pl

Log Message:
Remove some files we don't need, add a prepare-import script to automate it


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/ctwm/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/CHANGES.html \
xsrc/external/mit/ctwm/dist/CMakeLists.txt \
xsrc/external/mit/ctwm/dist/Doxyfile.in \
xsrc/external/mit/ctwm/dist/README.html \
xsrc/external/mit/ctwm/dist/image_jpeg.c \
xsrc/external/mit/ctwm/dist/image_jpeg.h
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/ctwm/dist/sound.c \
xsrc/external/mit/ctwm/dist/sound.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/ctwm/dist/examples/example.ctwmrc \
xsrc/external/mit/ctwm/dist/examples/levitte.ctwmrc \
xsrc/external/mit/ctwm/dist/examples/peterc.ctwmrc
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/gen/ctwm.1.html
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/minibuild/README.md \
xsrc/external/mit/ctwm/dist/minibuild/defs.mk \
xsrc/external/mit/ctwm/dist/minibuild/main.mk \
xsrc/external/mit/ctwm/dist/minibuild/mkmk.sh
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/tools/ctwm.astyle \
xsrc/external/mit/ctwm/dist/tools/mk_atoms.sh \
xsrc/external/mit/ctwm/dist/tools/mk_ctf_info.sh \
xsrc/external/mit/ctwm/dist/tools/mk_deftwmrc.sh \
xsrc/external/mit/ctwm/dist/tools/mk_event_names.sh \
xsrc/external/mit/ctwm/dist/tools/mk_function_bits.sh \
xsrc/external/mit/ctwm/dist/tools/mk_tar.sh \
xsrc/external/mit/ctwm/dist/tools/mk_version_in.sh \
xsrc/external/mit/ctwm/dist/tools/rewrite_version_bzr.sh \
xsrc/external/mit/ctwm/dist/tools/rewrite_version_git.sh \
xsrc/external/mit/ctwm/dist/tools/try_all_opts.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: xsrc/external/mit/ctwm/prepare-import.sh
diff -u /dev/null xsrc/external/mit/ctwm/prepare-import.sh:1.1
--- /dev/null	Sun Apr 11 11:00:30 2021
+++ xsrc/external/mit/ctwm/prepare-import.sh	Sun Apr 11 11:00:29 2021
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2021/04/11 11:00:29 nia Exp $
+#
+# Run this script and check for additional files and
+# directories to prune, only relevant content is included.
+
+set -e
+
+cd dist
+rm -f CMakeLists.txt Doxyfile.in
+rm -f README.html CHANGES.html
+rm -f system.ctwmrc examples/*.ctwmrc
+rm -f tools/*.sh tools/*.pl tools/*.astyle
+rm -f minibuild/*.mk minibuild/*.sh minibuild/*.md
+rm -f gen/ctwm.1.html
+rm -f image_jpeg.c image_jpeg.h
+rm -f sound.c sound.h

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Apr 11 10:51:49 UTC 2021

Removed Files:
xsrc/external/mit/ctwm/dist: gram.tab.c gram.tab.h lex.c

Log Message:
Remove accidental duplicates of autogenerated files


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/ctwm/dist/gram.tab.c \
xsrc/external/mit/ctwm/dist/lex.c
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/ctwm/dist/gram.tab.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Apr 11 10:11:58 UTC 2021

Modified Files:
xsrc/external/mit/ctwm/dist: add_window.c add_window.h clicktofocus.c
clicktofocus.h ctwm.h cursor.c cursor.h events.h gc.c gc.h
gram.tab.h gram.y iconmgr.c iconmgr.h icons.c icons.h lex.l list.c
list.h menus.c menus.h mwmhints.c mwmhints.h parse.c parse.h
screen.h session.c session.h sound.c sound.h types.h util.c util.h
version.c version.h vscreen.c vscreen.h windowbox.c windowbox.h
Added Files:
xsrc/external/mit/ctwm/dist: ctwm.1 ctwm_atoms.c ctwm_atoms.h
ctwm_config.h event_names_table.h ewmh_atoms.c ewmh_atoms.h
functions_deferral.h functions_defs.h
functions_dispatch_execution.h functions_parse_table.h
Removed Files:
xsrc/external/mit/ctwm/dist: CHANGES Imakefile Imakefile.local-template
PROBLEMS README README.VMS README.gnome TODO TODO.gnome
ctwm.axp_opt ctwm.c ctwm.com ctwm.man ctwm.spec ctwm.txt
ctwm.vax_opt demolib.c descrip.local-template descrip.mms
descrip.submms events.c example.ctwmrc gendeftwmrc.com gnome.c
gnome.h gnomewindefs.h gram.c_VMS gram.h_VMS gtw.c levitte.ctwmrc
lex.c_VMS libctwm.c link.com lnm.c lnm.h make.com mk_tar.sh
peterc.ctwmrc resize.c resize.h siconify.bm sound.doc system.ctwmrc
system.ctwmrc.gnome twm.h vms.txt vms2.txt vms_cmd_services.c
vms_cmd_services.h workmgr.c workmgr.h

Log Message:
Merge ctwm-4-0-3

# CTWM Change History

## 4.0.3  (2019-07-21)

### Bugfixes

1. Perform various manipulations and overrides of `WM_HINTS` property
   when it gets reset during runtime, like we do when initially adopting
   the window.  The most visible effect of this was in windows that don't
   give a focus hint (which we override to give focus), but then reset
   `WM_HINTS` later and still don't give us a hint, where we wound up not
   re-overriding previously.  Reported for `xvile` by Wayne Cuddy.

1. The font height estimation changes in 4.0.0 were not applied correctly
   when UseThreeDMenus was set, leading to some odd vertical misalignment
   of the text with some fonts.  Reported by Wayne Cuddy.

1. A failure in OTP consistency checks caused by the handling of
   transients of fullscreen windows has been fixed.  This manifested as
   failures in OtpCheckConsistencyVS() assertions.

## 4.0.2  (2018-08-25)

### Backward-Incompatible Changes And Removed Features

1. The `UseThreeDIconBorders` config var has been removed.  It came in
   silently and undocumented in 3.4 and has never done anything.

1. The attempts to use DNS lookups for setting the `HOSTNAME` `m4` variable
   have been removed; it is now just a duplicate of `CLIENTHOST`.

### New Features

1. The EWMH `_NET_WM_NAME` property is now supported, and used for the
   window name in place of the ICCCM `WM_NAME` when set.  By default, we
   also accept `UTF8_STRING` encoded `WM_NAME` as a result of this
   change; see below for var to restore historical strictness.

1. The EWMH `_NET_WM_ICON_NAME` property is now supported, and used for
   the icon name in place of the ICCCM `WM_ICON_NAME` when set.  Similar
   comments as above apply to the encodings.

1. Support has been added for `CTWM_WM_NAME` and `CTWM_WM_ICON_NAME`
   properties, which will override any window/icon names otherwise
   specified.  This may be useful for applications that set unhelpful
   names themselves, or for manually adjusting labelling.  These
   properties can be set from the command line via `xprop`; as an
   example, `xprop -f CTWM_WM_NAME 8u -set CTWM_WM_NAME "awesome
   windowsauce"`.  See `xprop(1)` manual for details; the `s`, `t`, and
   `u` field type specifiers will all work.

1. When no icon name is set for a window, we've always used the window
   name for the icon name as well.  But that only happened the first time
   the window name is set; after that, the icon name is stuck at the
   first name.  It now updates along with the window name, if no icon
   name is set.

1. All icon manager windows will now have the `TwmIconManager` class set
   on them, so they can be addressed en mass by other config like
   `NoTitle` by that class name.

### New Config Options

1. Added `DontNameDecorations` config option to disable setting names on
   the X windows we create for window decoration (added in 4.0.0).  These
   have been reported to confuse `xwit`, and might do the same for other
   tools that don't expect to find them on non-end-app windows.  Reported
   by Frank Steiner.

1. Added `StrictWinNameEncoding` config option to enable historical
   behavior, where we're reject invalid property encoding for window
   naming properties (like a `UTF8_STRING` encoded `WM_NAME`).

### Bugfixes

1. Fix up broken parsing of `IconifyStyle "sweep"`.  Bug was introduced
   in 4.0.0.

1. When multiple X Screens are used, 

CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Thu Mar 25 17:22:02 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_setup.c

Log Message:
try WSDISPLAYIO_GET_EDID if DDC2 fails
now my iMac G5 correctly identifies its display


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c:1.1.1.5	Sun Mar  5 01:55:42 2017
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c	Thu Mar 25 17:22:02 2021
@@ -25,8 +25,16 @@
 #include "config.h"
 #endif
 
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
 #include "nv_include.h"
 
+#ifdef __NetBSD__
+#include 
+#include 
+#include 
+#endif
+
 /*
  * Override VGA I/O routines.
  */
@@ -234,6 +242,26 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
 #else
 MonInfo = xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn), pNv->I2C);
 #endif
+#ifdef __NetBSD__
+if (!MonInfo) {
+	/* ask wsdisplay */
+	struct wsdisplayio_edid_info ei;
+	char *buffer;
+	xf86MonPtr tmp;
+
+	buffer = malloc(1024);
+	ei.edid_data = buffer;
+	ei.buffer_size = 1024;
+	if (ioctl(xf86Info.consoleFd, WSDISPLAYIO_GET_EDID, ) != -1) {
+	xf86Msg(X_INFO, "got %d bytes worth of EDID from wsdisplay\n",
+		ei.data_size);
+	tmp = xf86InterpretEEDID(pScrn->scrnIndex, buffer);
+	tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+	MonInfo = tmp;
+	}
+	free(buffer);
+}
+#endif
 if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
   "DDC detected a %s:\n", MonInfo->features.input_type ?

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Mar 22 14:10:06 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h

Log Message:
Explicitly include dix-config.h for HAVE_foo definitions referred in os.h.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7	Sun Feb  7 16:55:18 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Mon Mar 22 14:10:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.7 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.8 2021/03/22 14:10:06 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -51,6 +51,7 @@
 #include 
 
 /* dix */
+#include 
 #include 
 #include 
 #include 

CVS commit: xsrc/external/mit/xorg-server/dist/hw

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Mar 17 15:02:27 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c
x68kMouse.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c sunMouse.c

Log Message:
Fixes "FatalError re-entered, aborting" error when Xservers get SIGSEGV.

Handle a new DEVICE_ABORT mode perperly in deviceProc funtions.
Also don't exit via FatalError() on an unknown mode because it looks
upstream assumes DDX deviceProc functions don't treat it fatal:
 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.11 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.11	Thu Mar 11 12:08:57 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Wed Mar 17 15:02:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.11 2021/03/11 12:08:57 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -160,8 +160,9 @@ x68kKbdProc(DeviceIntPtr pDev,	/* Keyboa
 RemoveNotifyFd(x68kKbdPriv.fd);
 pKeyboard->on = FALSE;
 break;
-default:
-FatalError("Unknown keyboard operation\n");
+
+case DEVICE_ABORT:
+break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10	Thu Mar 11 12:08:57 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Wed Mar 17 15:02:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.11 2021/03/17 15:02:27 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -195,6 +195,8 @@ x68kMouseProc(DeviceIntPtr device, int w
 		ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
 	break;
 
+	case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9	Thu Mar 11 13:12:34 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Wed Mar 17 15:02:27 2021
@@ -692,8 +692,9 @@ sunKbdProc(DeviceIntPtr device, int what
 	RemoveNotifyFd(pPriv->fd);
 	pKeyboard->on = FALSE;
 	break;
-default:
-	FatalError("Unknown keyboard operation\n");
+
+case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4	Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Wed Mar 17 15:02:27 2021
@@ -180,6 +180,9 @@ sunMouseProc(DeviceIntPtr device, int wh
 	pMouse->on = FALSE;
 	RemoveNotifyFd(sunPtrPriv.fd);
 	break;
+
+	case DEVICE_ABORT:
+	break;
 }
 return Success;
 }

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 13:12:34 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Avoid polluting console on non-fatal errors.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8	Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Thu Mar 11 13:12:34 2021
@@ -191,7 +191,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
 #endif
 };
 if (ioctl (fd, KIOCSLED, (caddr_t)_tab[ctrl->leds & SUN_LED_MASK]) == -1)
-	ErrorF("Failed to set keyboard lights\n");
+	LogMessage(X_ERROR, "Failed to set keyboard lights\n");
 #endif
 }
 
@@ -218,13 +218,13 @@ bell(int fd, int duration)
 
 kbdCmd = KBD_CMD_BELL;
 if (ioctl (fd, KIOCCMD, ) == -1) {
- 	ErrorF("Failed to activate bell\n");
+ 	LogMessage(X_ERROR, "Failed to activate bell\n");
 	return;
 }
 if (duration) usleep (duration);
 kbdCmd = KBD_CMD_NOBELL;
 if (ioctl (fd, KIOCCMD, ) == -1)
-	ErrorF("Failed to deactivate bell\n");
+	LogMessage(X_ERROR, "Failed to deactivate bell\n");
 }
 
 static void
@@ -394,7 +394,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
 	pPriv->click = ctrl->click;
 	kbdClickCmd = pPriv->click ? KBD_CMD_CLICK : KBD_CMD_NOCLICK;
 	if (ioctl (pPriv->fd, KIOCCMD, ) == -1)
- 	ErrorF("Failed to set keyclick\n");
+ 	LogMessage(X_ERROR, "Failed to set keyclick\n");
 }
 if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
 	DoLEDs(device, ctrl, pPriv);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 12:08:57 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c x68kGraph.c
x68kKbd.c x68kMouse.c x68kText.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.8 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -50,12 +50,12 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 
 /* open frame buffer */
 if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
-ErrorF( "Can't open frame buffer" );
+ErrorF( "Can't open frame buffer\n" );
 return FALSE;
 }
 /* get frame buffer infomation */
 if ( ioctl( pPriv->fd, GRFIOCGINFO,  ) == -1 ) {
-ErrorF( "Can't get grfinfo" );
+ErrorF( "Can't get grfinfo\n" );
 return FALSE;
 }
 pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
@@ -64,7 +64,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
 if ( pPriv->reg == (FbReg *)-1) {
-ErrorF( "Can't map frame buffer" );
+ErrorF( "Can't map frame buffer\n" );
 return FALSE;
 }
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
@@ -114,7 +114,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 
 /* unmap and close frame buffer */
 if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
-ErrorF("Can't unmap frame buffer");
+ErrorF("Can't unmap frame buffer\n");
 close(pPriv->fd);
 }
 

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -195,7 +195,7 @@ x68kGraphInit(ScreenPtr pScreen, int arg
 
 /* store private record into screen */
 if (!dixRegisterPrivateKey(, PRIVATE_SCREEN, 0)) {
-ErrorF("dixRegisterPrivateKey failed");
+ErrorF("dixRegisterPrivateKey failed\n");
 return FALSE;
 }
 x68kSetScreenPrivate(pScreen, pPriv);
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9	Sun Feb  7 16:55:18 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -136,7 +136,7 @@ x68kMouseProc(DeviceIntPtr device, int w
 	case DEVICE_INIT:
 pMouse->devicePrivate = (void *) 
 if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
-ErrorF("Can't open mouse device");
+ErrorF("Can't open mouse device\n");
 return !Success;
 }
 	pMouse->on = FALSE;
@@ -165,18 +165,18 @@ x68kMouseProc(DeviceIntPtr device, int w
 
 	case 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 11:54:41 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c sunFbs.c sunInit.c
sunKbd.c sunMouse.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Thu Mar 11 11:54:41 2021
@@ -120,7 +120,7 @@ CGUpdateColormap(ScreenPtr pScreen, int 
 sunCmap.blue = [dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOPUTCMAP, ) < 0) {
-	ErrorF("CGUpdateColormap");
+	ErrorF("CGUpdateColormap\n");
 	FatalError( "CGUpdateColormap: FBIOPUTCMAP failed\n" );
 }
 }
@@ -137,7 +137,7 @@ CGGetColormap(ScreenPtr pScreen, int dex
 sunCmap.blue = [dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOGETCMAP, ) < 0) {
-	ErrorF("CGGetColormap");
+	ErrorF("CGGetColormap\n");
 	FatalError( "CGGetColormap: FBIOGETCMAP failed\n" );
 }
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3	Sun Jul 26 07:35:37 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c	Thu Mar 11 11:54:41 2021
@@ -99,7 +99,7 @@ sunMemoryMap(size_t len, off_t off, int 
 
 #if !defined(__bsdi__) && !defined(_MAP_NEW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 if ((addr = (caddr_t) valloc (mapsize)) == NULL) {
-	ErrorF("Couldn't allocate frame buffer memory");
+	ErrorF("Couldn't allocate frame buffer memory\n");
 	(void) close (fd);
 	return NULL;
 }
@@ -121,7 +121,7 @@ sunMemoryMap(size_t len, off_t off, int 
 		PROT_READ | PROT_WRITE, MAP_SHARED,
 		fd, off);
 if (mapaddr == (void *) -1) {
-	ErrorF("mapping frame buffer memory");
+	ErrorF("mapping frame buffer memory\n");
 	(void) close (fd);
 	mapaddr = NULL;
 }
@@ -134,7 +134,7 @@ sunScreenAllocate(ScreenPtr pScreen)
 sunScreenPtrpPrivate;
 
 if (!dixRegisterPrivateKey(, PRIVATE_SCREEN, 0)) {
-	ErrorF("dixRegisterPrivateKey failed");
+	ErrorF("dixRegisterPrivateKey failed\n");
 	return FALSE;
 }
 pPrivate = calloc(1, sizeof (sunScreenRec));
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3	Sat Nov 21 03:02:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Thu Mar 11 11:54:41 2021
@@ -133,7 +133,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 switch (what) {
 	case DEVICE_INIT:
 	if (pMouse != >public) {
-		ErrorF ("Cannot open non-system mouse");
+		ErrorF ("Cannot open non-system mouse\n");
 		return !Success;
 	}
 	if (sunPtrPriv.fd == -1)
@@ -156,12 +156,12 @@ sunMouseProc(DeviceIntPtr device, int wh
 
 	case DEVICE_ON:
 	if (ioctl (sunPtrPriv.fd, VUIDGFORMAT, ) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDGFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDGFORMAT\n");
 		return !Success;
 	}
 	format = VUID_FIRM_EVENT;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 		return !Success;
 	}
 	sunPtrPriv.bmask = 0;
@@ -173,7 +173,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 	case DEVICE_CLOSE:
 	pMouse->on = FALSE;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1)
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 	break;
 
 	case DEVICE_OFF:
@@ -210,7 +210,7 @@ sunMouseGetEvents(int fd, Bool on, int *
 	*pNumEvents = 0;
 	*pAgain = FALSE;
 	} else {
-	ErrorF("sunMouseGetEvents read");
+	ErrorF("sunMouseGetEvents read\n");
 	FatalError ("Could not read from mouse");
 	}
 } else {

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9	Tue Aug 11 06:49:09 2020
+++ 

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Mar  2 10:21:09 UTC 2021

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
Restore defaults.

The actual config now lives in src and we don't want merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.8 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.9
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.8	Thu Sep 24 05:38:16 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Tue Mar  2 10:21:09 2021
@@ -1,383 +1,181 @@
 #
-# $NetBSD: system.ctwmrc,v 1.8 2020/09/24 05:38:16 nia Exp $
+# $XConsortium: system.twmrc,v 1.8 91/04/23 21:10:58 gildea Exp $
 #
-# ctwmrc by nia
+# Default twm configuration file; needs to be kept small to conserve string
+# space in systems whose compilers don't handle medium-sized strings.
 #
-# An attempt to strike a usability balance that makes keys and buttons
-# do the thing users of various operating systems expect them to do.
+# Sites should tailor this file, providing any extra title buttons, menus, etc.
+# that may be appropriate for their environment.  For example, if most of the
+# users were accustomed to uwm, the defaults could be set up not to decorate
+# any windows and to use meta-keys.
 #
-# Most things should be possible to accomplish with only the keyboard.
-#
-# Also, mostly inoffensive colours (avoiding potentially inaccessible
-# combinations like red-green).
-#
-
-# don't use the default buttons or key bindings, we define our own
-NoDefaults
-
-ShowWorkSpaceManager
-ShowIconManager
-
-# 3D icon managers do not seemingly honor IconManagerHighlight,
-# which makes them slightly less useful
-#UseThreeDIconManagers
-#UseThreeDWMap
-UseThreeDBorders
-#UseThreeDMenus
-UseThreeDTitles
-
-ThreeDBorderWidth 3
-
-# TODO: we can use syscmd() in combination with xdpyinfo to detect
-# HiDPI screens and set appropiate fonts.
-#
-# need some good scaled bitmap fonts imported - terminus or spleen
-# would be good candidates
-MenuFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
-TitleFont"-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
-IconManagerFont  "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
-IconFont "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
-ResizeFont   "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*"
-WorkSpaceFont"-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
 
+NoGrabServer
 RestartPreviousState
-
 DecorateTransients
+TitleFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+ResizeFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+MenuFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+IconFont	"-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
+IconManagerFont	"-adobe-helvetica-bold-r-normal--*-100-*-*-*"
+ShowWorkSpaceManager			# start with workspace manager up
+UseThreeDMenus
+UseThreeDTitles
+UseThreeDIconManagers
+UseThreeDBorders
+UseThreeDWMap
+SunkFocusWindowTitle
 
-# hide window contents while altering windows for performance
-NoOpaqueMove
-NoOpaqueResize
-
-SloppyFocus
-
-AutoOccupy
-AutoRelativeResize
-
-CenterFeedbackWindow
-
-NoGrabServer
-
-RaiseOnClick
-
-DontMoveOff
-MoveOffResistance	  150
-
-ConstrainedMoveTime   0
-
-IgnoreLockModifier
-
-# Not actually that random.
-# Means that windows do not have to be placed by hand with a mouse,
-# which helps if you are using a keyboard only.
-RandomPlacement  "on"
-
-MoveDelta 3
-ClearShadowContrast   50
-DarkShadowContrast50
-MovePackResistance100
-
-RaiseWhenAutoUnSqueeze
-ShortAllWindowsMenus
-
-#BeNiceToColorMap
-
-NoStackMode
-
-StayUpMenus
-WarpToDefaultMenuEntry
-MenuShadowDepth  1
-
-NoTitleFocus
-
-# warp through all windows in the current workspace
-WindowRing
-WarpRingOnScreen
-
-NoTitleHighlight
-
-TitleButtonShadowDepth1
-TitleShadowDepth  1
-TitleButtonBorderWidth0
-TitlePadding  0
-TitleJustification"left"
-ButtonIndent  0
-FramePadding		  0
-
-LeftTitleButton   ":xpm:dot"  = f.menu "titleops"
-RightTitleButton  ":xpm:resize"   = f.resize
-RightTitleButton  ":xpm:cross"= f.delete
-
-BorderWidth   4
-BorderShadowDepth 2
-BorderResizeCursors
-
-MaxIconTitleWidth 120
-NoIconManagerFocus
-IconManagerShadowDepth1
-IconManagerGeometry   "200x-1-1+0" 1
-IconifyByUnmapping
-
-ReallyMoveInWorkspaceManager
-MapWindowCurrentWorkSpace {  "black" "firebrick" }
-DontToggleWorkSpaceManagerState
-DontWarpCursorInWMap
-NoShowOccupyAll	
-ReverseCurrentWorkspace	
-StartInMapState
-WMgrHorizButtonIndent 0
-WMgrVertButtonIndent  0
-WorkSpaceManagerGeometry  "70x270-4-4" 1
-
-WorkSpaces 
-{
-"1"{ "lavender" 

CVS commit: xsrc/external/mit/ctwm/dist

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Sat Feb 27 16:20:15 UTC 2021

Modified Files:
xsrc/external/mit/ctwm/dist: add_window.c

Log Message:
Use font height to compute height of resize popup for placing a window.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/add_window.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/add_window.c
diff -u xsrc/external/mit/ctwm/dist/add_window.c:1.1 xsrc/external/mit/ctwm/dist/add_window.c:1.2
--- xsrc/external/mit/ctwm/dist/add_window.c:1.1	Thu Sep  3 22:16:33 2015
+++ xsrc/external/mit/ctwm/dist/add_window.c	Sat Feb 27 16:20:15 2021
@@ -862,7 +862,7 @@ TwmWindow *AddWindow(Window w, int iconm
 			   tmp_win->name, namelen,
 			   _rect, _rect);
 	width = SIZE_HINDENT + ink_rect.width;
-	height = logical_rect.height + SIZE_VINDENT * 2;
+	height = Scr->SizeFont.height + SIZE_VINDENT * 2;
 	XmbTextExtents(Scr->SizeFont.font_set,
 			   ": ", 2,  _rect, _rect);
 	Scr->SizeStringOffset = width + logical_rect.width;

CVS commit: xsrc/external/mit/xterm/dist

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sat Feb 27 15:37:38 UTC 2021

Modified Files:
xsrc/external/mit/xterm/dist: resize.c

Log Message:
Provide an escape ifdef to avoid all the X headers


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.2 xsrc/external/mit/xterm/dist/resize.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/dist/resize.c
diff -u xsrc/external/mit/xterm/dist/resize.c:1.1.1.9 xsrc/external/mit/xterm/dist/resize.c:1.2
--- xsrc/external/mit/xterm/dist/resize.c:1.1.1.9	Thu Feb 11 07:19:55 2021
+++ xsrc/external/mit/xterm/dist/resize.c	Sat Feb 27 10:37:38 2021
@@ -57,11 +57,15 @@
 #include 
 #include 
 
+#ifdef RESIZE_ONLY
+#include "resize.h"
+#else
 #include 
 #include 
 #include 
 #include 
 #include 
+#endif
 
 #ifndef USE_TERMINFO		/* avoid conflict with configure script */
 #if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__) || defined(__UNIXWARE__)

CVS commit: xsrc/external/mit/xterm/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Feb 17 03:03:28 UTC 2021

Modified Files:
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
define OPT_SIXEL_GRAPHICS here like everything else, rather than
than Makefile.  (OPT_GRAPHICS is already defined here.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.14 xsrc/external/mit/xterm/include/xtermcfg.h:1.15
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.14	Thu Feb 11 12:24:39 2021
+++ xsrc/external/mit/xterm/include/xtermcfg.h	Wed Feb 17 03:03:27 2021
@@ -182,7 +182,7 @@
 /* #undef OPT_SELECTION_OPS */	/* CF_ARG_DISABLE(selection-ops) */
 #define OPT_SELECT_REGEX 1		/* CF_ARG_DISABLE(regex) */
 /* #undef OPT_SESSION_MGT */		/* CF_ARG_DISABLE(session-mgt) */
-/* #undef OPT_SIXEL_GRAPHICS */	/* CF_ARG_ENABLE(sixel-graphics) */
+#define OPT_SIXEL_GRAPHICS 1	/* CF_ARG_ENABLE(sixel-graphics) */
 /* #undef OPT_SUN_FUNC_KEYS */	/* CF_ARG_ENABLE(sun-fkeys) */
 #define OPT_TCAP_FKEYS 1		/* CF_ARG_ENABLE(tcap-fkeys) */
 #define OPT_TCAP_QUERY 1		/* CF_ARG_ENABLE(tcap-query) */

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Feb  7 16:55:18 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kMouse.c
Added Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: mouseEmu3btn.c
mouseEmu3btn.h

Log Message:
Add "Emulate3Buttons" support to the X68k Xorg based monolithic server.

Based on "Emulate3Buttons" functions in the xf86-input-mouse driver,
with various refactoring and cleanups:
- rewrite a magic three-dimensional array for a finate state machine
  with proper named structures etc.
- separate 3 button emulation functions from other stuff

See my post on port-x68k@ (and tech-x11@) for more details:
 https://mail-index.netbsd.org/port-x68k/2021/02/05/msg74.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/mouseEmu3btn.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/mouseEmu3btn.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6	Tue Nov  3 15:52:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Sun Feb  7 16:55:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.7 2021/02/07 16:55:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -64,6 +64,7 @@
 #include 
 
 #include "x68kReg.h"
+#include "mouseEmu3btn.h"
 
 /*
  * X68k dependent screen record
@@ -106,6 +107,7 @@ typedef struct _X68kFbProcRec {
 typedef struct _X68kMousePriv {
 int fd;
 int bmask;
+MouseEmu3btn emu3btn;
 } X68kMousePriv, *X68kMousePrivPtr;
 
 typedef struct _X68kKbdPriv {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8	Fri Nov 20 19:06:56 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sun Feb  7 16:55:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.8 2020/11/20 19:06:56 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -128,6 +128,9 @@ x68kMouseProc(DeviceIntPtr device, int w
 BYTE	map[4];
 Atom btn_labels[3] = {0};
 Atom axes_labels[2] = { 0, 0 };
+MouseEmu3btnPtr pEmu3btn;
+Bool emu3enable;
+int emu3timeout;
 
 switch (what) {
 	case DEVICE_INIT:
@@ -149,6 +152,15 @@ x68kMouseProc(DeviceIntPtr device, int w
 	InitPointerDeviceStruct(pMouse, map, 3, btn_labels,
 		x68kMouseCtrl, GetMotionHistorySize(),
 		2, axes_labels);
+
+	/* Initialize emulation 3 buttons settings */
+	emu3enable = TRUE;			/* XXX should be configurable */
+	emu3timeout = EMU3B_DEF_TIMEOUT;	/* XXX should be configurable */
+	if (emu3enable) {
+		pEmu3btn = 
+		Emulate3ButtonsEnable(pEmu3btn, device, emu3timeout);
+	}
+
 	break;
 
 	case DEVICE_ON:
@@ -279,10 +291,14 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 	 * for a single state change. Should we get a button event which
 	 * reflects the current state of affairs, that event is discarded.
 	 *
-	 * Mouse buttons start at 1.
+	 * Mouse buttons start at 1 as defined in .
+	 *
+	 * The bmask stores which buttons are currently pressed.
+	 * This bmask is also used for Emulate3Buttons functions that
+	 * assume the left button is LSB as defined in mouseEmu3btn.c.
 	 */
 	buttons = (fe->id - MS_LEFT) + 1;
-	bmask = 1 << buttons;
+	bmask = 1 << (buttons - 1);
 	if (fe->value == VKEY_UP) {
 	if (pPriv->bmask & bmask) {
 		type = ButtonRelease;
@@ -298,9 +314,14 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 		return;
 	}
 	}
-	flag = POINTER_RELATIVE;
-	valuator_mask_zero();
-	QueuePointerEvents(device, type, buttons, flag, );
+	if (buttons == Button1 || buttons == Button3) {
+	/* Handle middle button emulation */
+	Emulate3ButtonsQueueEvent(>emu3btn, type, buttons, pPriv->bmask);
+	} else {
+	flag = POINTER_RELATIVE;
+	valuator_mask_zero();
+	QueuePointerEvents(device, type, buttons, flag, );
+	}
 	break;
 case LOC_X_DELTA:
 	valuators[0] = fe->value;

Added files:

Index: 

CVS commit: xsrc/external/mit/libXxf86dga/dist/src

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jan 23 14:41:04 UTC 2021

Modified Files:
xsrc/external/mit/libXxf86dga/dist/src: XF86DGA.c

Log Message:
Fix "no output of xdpyinfo(1) on redirect or pipe" problem.

XF86cleanup() in libXxf86dga invoked via atexit(3)
(or __attribute__((__destructor__)) in NetBSD xsrc)
calls _exit(2) directly so fflush(3) via normal exit(3)
is not called.  Analyzed by rin@, ryo@, and soda@:
 https://mail-index.netbsd.org/tech-x11/2021/01/20/msg002192.html

Should be pulled up to netbsd-9.

XXX1: The original XF86cleanup() is not async-signale-safe.
XXX2: XF86DGAGetVideo() implicitly overrides signal handlers.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c
diff -u xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.2 xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.3
--- xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.2	Fri Jan  4 18:59:45 2019
+++ xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c	Sat Jan 23 14:41:04 2021
@@ -650,14 +650,14 @@ static void
 #ifdef __NetBSD__
 __attribute__ ((__destructor__))
 #endif
-XF86cleanup(int sig)
+XF86cleanup_atexit(void)
 {
 ScrPtr sp;
 int i;
 static char beenhere = 0;
 
 if (beenhere)
-	_exit(3);
+	return;
 beenhere = 1;
 
 for (i = 0; i < numScrs; i++) {
@@ -665,6 +665,14 @@ XF86cleanup(int sig)
 	XF86DGADirectVideo(sp->display, sp->screen, 0);
 	XSync(sp->display, False);
 }
+}
+
+static void
+XF86cleanup(int sig)
+{
+/* XXX FIXME XF86cleanup_atexit() is not async-signal-safe */
+XF86cleanup_atexit();
+
 _exit(3);
 }
 
@@ -707,7 +715,7 @@ XF86DGAGetVideo(
 if (!beenHere) {
 	beenHere = 1;
 #ifndef __NetBSD__
-	atexit((void(*)(void))XF86cleanup);
+	atexit((void(*)(void))XF86cleanup_atexit);
 #endif
 	/* one shot XF86cleanup attempts */
 	signal(SIGSEGV, XF86cleanup);

CVS commit: xsrc/external/mit/xorg-server/dist/hw

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Dec  8 10:33:47 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c

Log Message:
add dummy ddxInputThreadInit() if INPUTTHREAD is defined.
fixes sun3 build and should fix x68k build too.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9	Sun Nov  1 11:40:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Tue Dec  8 10:33:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -261,4 +261,13 @@ OsVendorFatalError(const char *f, va_lis
 {
 }
 
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
 /* EOF x68kInit.c */

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5	Thu Aug 13 05:12:35 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Tue Dec  8 10:33:47 2020
@@ -190,6 +190,15 @@ AbortDDX(enum ExitCode error)
 LogClose(error);
 }
 
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
 /* Called by GiveUp(). */
 void
 ddxGiveUp(enum ExitCode error)

CVS commit: xsrc/external/mit/xorg-server.old/dist/xkb

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 23:36:45 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/xkb: xkb.c

Log Message:
merge security fixes for xkb, as found in these xserver gitlab
commits:

270e439739e023463e7e0719a4eede69d45f7a3f - xkb: only swap once in XkbSetMap
446ff2d3177087b8173fa779fa5b77a2a128988b - Check SetMap request length carefully
87c64fc5b0db9f62f4e361444f4b60501ebf67b9 - Fix XkbSetDeviceInfo() and 
SetDeviceIndicators() heap overflows
de940e06f8733d87bbb857aef85d830053442cfe - xkb: fix key type index check in 
_XkbSetMapChecks
f7cd1276bbd4fe3a9700096dec33b52b8440788d - Correct bounds checking in 
XkbSetNames()

i haven't tested these run OK, and it was a 33 out of 34 hunks
did not apply cleanly, but they merge was still largely the
same (patch failed due to whitespace changes mostly), and i am
able to build-test successfully.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c
diff -u xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.1.1.1	Thu Jun  9 09:08:01 2016
+++ xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c	Sat Dec  5 23:36:45 2020
@@ -151,6 +151,19 @@ static RESTYPE	RT_XKBCLIENT;
 #define	CHK_REQ_KEY_RANGE(err,first,num,r)  \
 	CHK_REQ_KEY_RANGE2(err,first,num,r,client->errorValue,BadValue)
 
+static Bool
+_XkbCheckRequestBounds(ClientPtr client, void *stuff, void *from, void *to) {
+char *cstuff = (char *)stuff;
+char *cfrom = (char *)from;
+char *cto = (char *)to;
+
+return cfrom < cto &&
+   cfrom >= cstuff &&
+   cfrom < cstuff + ((size_t)client->req_len << 2) &&
+   cto >= cstuff &&
+   cto <= cstuff + ((size_t)client->req_len << 2);
+}
+
 /******/
 
 int
@@ -1550,7 +1563,8 @@ CheckKeyTypes(	ClientPtr	client,
 		xkbSetMapReq *	req,
 		xkbKeyTypeWireDesc **wireRtrn,
 		int	 *	nMapsRtrn,
-		CARD8 *		mapWidthRtrn)
+		CARD8 *		mapWidthRtrn,
+		Bool doswap)
 {
 unsigned		nMaps;
 register unsigned	i,n;
@@ -1588,7 +1602,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 }
 for (i=0;inTypes;i++) {
 	unsigned	width;
-	if (client->swapped) {
+if (client->swapped && doswap) {
 	register int s;
 	swaps(>virtualMods,s);
 	}
@@ -1615,7 +1629,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 	mapWire= (xkbKTSetMapEntryWireDesc *)[1];
 	preWire= (xkbModsWireDesc *)[wire->nMapEntries];
 	for (n=0;nnMapEntries;n++) {
-		if (client->swapped) {
+if (client->swapped && doswap) {
 		register int s;
 		swaps([n].virtualMods,s);
 		}
@@ -1634,7 +1648,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 		return 0;
 		}
 		if (wire->preserve) {
-		if (client->swapped) {
+		if (client->swapped && doswap) {
 			register int s;
 			swaps([n].virtualMods,s);
 		}
@@ -1673,7 +1687,8 @@ CheckKeySyms(	ClientPtr		client,
 		CARD8 *	 		mapWidths,
 		CARD16 *	 	symsPerKey,
 		xkbSymMapWireDesc **	wireRtrn,
-		int *			errorRtrn)
+		int *			errorRtrn,
+		Bool			doswap)
 {
 register unsigned	i;
 XkbSymMapPtr		map;
@@ -1685,7 +1700,7 @@ xkbSymMapWireDesc*	wire = *wireRtrn;
 for (i=0;inKeySyms;i++) {
 	KeySym *pSyms;
 	register unsigned nG;
-	if (client->swapped) {
+	if (client->swapped && doswap) {
 	swaps(>nSyms,nG);
 	}
 	nG = XkbNumGroups(wire->groupInfo);
@@ -2322,13 +2337,99 @@ XkbServerMapPtr		srv = xkbi->desc->serve
 }
 return (char *)wire;
 }
+ 
+#define _add_check_len(new) \
+if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \
+else len += new
+
+/**
+ * Check the length of the SetMap request
+ */
+static int
+_XkbSetMapCheckLength(xkbSetMapReq *req)
+{
+size_t len = sz_xkbSetMapReq, req_len = req->length << 2;
+xkbKeyTypeWireDesc *keytype;
+xkbSymMapWireDesc *symmap;
+BOOL preserve;
+int i, map_count, nSyms;
+
+if (req_len < len)
+goto bad;
+/* types */
+if (req->present & XkbKeyTypesMask) {
+keytype = (xkbKeyTypeWireDesc *)(req + 1);
+for (i = 0; i < req->nTypes; i++) {
+_add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc));
+if (req->flags & XkbSetMapResizeTypes) {
+_add_check_len(keytype->nMapEntries
+   * sz_xkbKTSetMapEntryWireDesc);
+preserve = keytype->preserve;
+map_count = keytype->nMapEntries;
+if (preserve) {
+_add_check_len(map_count * sz_xkbModsWireDesc);
+}
+keytype += 1;
+keytype = (xkbKeyTypeWireDesc *)
+  

CVS commit: xsrc/external/mit/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 22:44:37 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
bump version for xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.39 xsrc/external/mit/xorg-server/include/dix-config.h:1.40
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.39	Sat Dec  5 20:34:05 2020
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Sat Dec  5 22:44:37 2020
@@ -358,7 +358,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.10 xsrc/external/mit/xorg-server/include/version-config.h:1.11
--- xsrc/external/mit/xorg-server/include/version-config.h:1.10	Sun Feb 23 11:09:41 2020
+++ xsrc/external/mit/xorg-server/include/version-config.h	Sat Dec  5 22:44:37 2020
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.6"
+#define VENDOR_MAN_VERSION "Version 1.20.10"
 
 /* Vendor name */
 /* #define VENDOR_NAME "The X.Org Foundation" */
 
 /* Vendor release */
-#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.20 xsrc/external/mit/xorg-server/include/xorg-config.h:1.21
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.20	Sun Feb 23 10:26:56 2020
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Sat Dec  5 22:44:37 2020
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.20 xsrc/external/mit/xorg-server/include/xorg-server.h:1.21
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.20	Sun Feb 23 10:58:12 2020
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Sat Dec  5 22:44:37 2020
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

CVS commit: xsrc/external/mit/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 20:34:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: xichangehierarchy.c
xipassivegrab.c
xsrc/external/mit/xorg-server/dist/dix: devices.c events.c
xsrc/external/mit/xorg-server/dist/exa: exa_accel.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc: xf86DDC.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_init.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os: backtrace.c io.c
xsrc/external/mit/xorg-server/dist/test/xi1:
protocol-xchangedevicecontrol.c
xsrc/external/mit/xorg-server/dist/test/xi2:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
xsrc/external/mit/xorg-server/include: dix-config.h

Log Message:
merge xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/exa/exa_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/os/backtrace.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/os/io.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/xkb/xkb.c
cvs rdiff -u -r1.38 -r1.39 xsrc/external/mit/xorg-server/include/dix-config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.7 xsrc/external/mit/xorg-server/dist/configure:1.8
--- xsrc/external/mit/xorg-server/dist/configure:1.7	Sun Feb 23 10:26:21 2020
+++ xsrc/external/mit/xorg-server/dist/configure	Sat Dec  5 20:34:03 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.6.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.10.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.6'
-PACKAGE_STRING='xorg-server 1.20.6'
+PACKAGE_VERSION='1.20.10'
+PACKAGE_STRING='xorg-server 1.20.10'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -947,6 +947,8 @@ PRESENT_FALSE
 PRESENT_TRUE
 GLX_SYS_LIBS
 GLX_DEFINES
+HASHTABLE_FALSE
+HASHTABLE_TRUE
 GLX_FALSE
 GLX_TRUE
 GL_LIBS
@@ -1236,6 +1238,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1530,6 +1533,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1782,6 +1786,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Nov 21 03:02:09 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunMouse.c

Log Message:
valuator_mask_zero() is enough for mouse button events.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2	Thu Aug 13 05:12:35 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Sat Nov 21 03:02:09 2020
@@ -283,7 +283,7 @@ sunMouseEnqueueEvent(DeviceIntPtr device
 	}
 	}
 	flag = POINTER_RELATIVE;
-	valuator_mask_set_range(, 0, 0, NULL);
+	valuator_mask_zero();
 	QueuePointerEvents(device, type, buttons, flag, );
 	break;
 case LOC_X_DELTA:

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 20 19:06:56 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kMouse.c

Log Message:
valuator_mask_zero() is enough for mouse button events.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.7	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Fri Nov 20 19:06:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.8 2020/11/20 19:06:56 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -299,7 +299,7 @@ x68kMouseEnqueueEvent(DeviceIntPtr devic
 	}
 	}
 	flag = POINTER_RELATIVE;
-	valuator_mask_set_range(, 0, 0, NULL);
+	valuator_mask_zero();
 	QueuePointerEvents(device, type, buttons, flag, );
 	break;
 case LOC_X_DELTA:

CVS commit: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 20 18:09:00 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k: x68kConfig.c

Log Message:
Sync with xorg-server:

 Report which settings are chosen per a config file in the log file.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.4 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.5
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.4	Thu Nov  5 16:06:08 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c	Fri Nov 20 18:09:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.4 2020/11/05 16:06:08 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.5 2020/11/20 18:09:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -112,16 +112,20 @@ const char *hostConfigFilename = "/etc/X
 const char *siteConfigFilename = X11_LIBDIR "/X68kConfig";
 const char *configFilename = NULL;
 static FILE *config;
-char modeSet = FALSE;
+static char modeSet = FALSE;
 
 static int parseCommand(void);
+static void logConfig(void);
 
 int
 x68kConfig(void)
 {
-if (configFilename)
+MessageType filefrom = X_DEFAULT;
+
+if (configFilename) {
 	config = fopen(configFilename, "r");
-else {
+	filefrom = X_CMDLINE;
+} else {
 	configFilename = hostConfigFilename;
 	config = fopen(configFilename, "r");
 	if (config == NULL) {
@@ -131,11 +135,15 @@ x68kConfig(void)
 }
 if (config == NULL)
 	FatalError("Can't open X68kConfig file");
+
+LogMessage(filefrom, "Using config file: \"%s\"\n", configFilename);
+
 while (parseCommand())
 ;
 fclose(config);
 if (!modeSet)
 FatalError("No mode set.");
+logConfig();
 return 1;
 }
 
@@ -143,7 +151,7 @@ x68kConfig(void)
 /*-
  *   X68KConfig parsing part
  *---*/
-void parseError(int line, const char *str, ...);
+static void parseError(int line, const char *str, ...);
 
 enum TokenType {
 TOKEN_EOF,
@@ -255,7 +263,7 @@ static void parseMouse(int argc, Token *
 static void parseKeyboard(int argc, Token **argv);
 static void parseMode(int argc, Token **argv);
 
-Command command[] = {
+static const Command command[] = {
 { "ModeDef", parseModeDef },
 { "Mouse", parseMouse },
 { "Keyboard", parseKeyboard },
@@ -263,6 +271,24 @@ Command command[] = {
 };
 #define NCOMMANDS (sizeof(command)/sizeof(command[0]))
 
+static const char *x68kTypeStr[] = {
+	[X68K_FB_NULL]= NULL,
+	[X68K_FB_TEXT]= "Text",
+	[X68K_FB_GRAPHIC] = "Graphic",
+};
+#define NTYPES (sizeof(x68kTypeStr) / sizeof(x68kTypeStr[0]))
+
+static const char *x68kClassStr[] = {
+	[StaticGray]  = "StaticGray",
+	[GrayScale]   = "GrayScale",
+	[StaticColor] = "StaticColor",
+	[PseudoColor] = "PseudoColor",
+	[TrueColor]   = "TrueColor",
+	[DirectColor] = "DirectColor",
+};
+#define NCLASSES (sizeof(x68kClassStr) / sizeof(x68kClassStr[0]))
+#define ClassInvalid	(-1)
+
 /*-
  * function "parseCommand"
  *
@@ -333,13 +359,13 @@ parseCommand(void)
  *  purpose:  examine the number of arguments and the type of each
  *argument.
  *  argument: (int)n : correct number of arguments
- *(enum TokenType *)type : table of types
+ *(const enum TokenType *)type : table of types
  *(int)argc_m1   : actual number of arguments
  *(Token **)argv : command and arguments
  *  returns:  nothing
  *---*/
 static void
-checkArguments(int n, enum TokenType *type, int argc_m1, Token **argv)
+checkArguments(int n, const enum TokenType *type, int argc_m1, Token **argv)
 {
 int i;
 
@@ -359,7 +385,7 @@ checkArguments(int n, enum TokenType *ty
 
 typedef struct _Mode {
 struct _Mode *next;
-char *name;
+const char *name;
 int type;
 int depth;
 int class;
@@ -367,7 +393,8 @@ typedef struct _Mode {
 X68kFbReg reg;
 } Mode;
 
-Mode *modeList = NULL;
+static Mode *modeList = NULL;
+static Mode *modeChosen;
 
 /*-
  * function "parseModeDef"
@@ -379,7 +406,7 @@ Mode *modeList = NULL;
 static void
 parseModeDef(int argc, Token **argv)
 {
-enum TokenType argtype[] = {
+ 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Mon Nov 16 16:46:28 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c

Log Message:
Report which settings are chosen per a config file in the log file.

Also reorganize a logging strategy in parseError() and
make several variables and functions static or const.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6	Tue Nov  3 16:59:38 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Mon Nov 16 16:46:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.6 2020/11/03 16:59:38 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.7 2020/11/16 16:46:28 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -112,16 +112,20 @@ const char *hostConfigFilename = "/etc/X
 const char *siteConfigFilename = X11_LIBDIR "/X68kConfig";
 const char *configFilename = NULL;
 static FILE *config;
-char modeSet = FALSE;
+static char modeSet = FALSE;
 
 static int parseCommand(void);
+static void logConfig(void);
 
 int
 x68kConfig(void)
 {
-if (configFilename)
+MessageType filefrom = X_DEFAULT;
+
+if (configFilename) {
 	config = fopen(configFilename, "r");
-else {
+	filefrom = X_CMDLINE;
+} else {
 	configFilename = hostConfigFilename;
 	config = fopen(configFilename, "r");
 	if (config == NULL) {
@@ -131,11 +135,15 @@ x68kConfig(void)
 }
 if (config == NULL)
 	FatalError("Can't open X68kConfig file");
+
+LogMessage(filefrom, "Using config file: \"%s\"\n", configFilename);
+
 while (parseCommand())
 ;
 fclose(config);
 if (!modeSet)
 FatalError("No mode set.");
+logConfig();
 return 1;
 }
 
@@ -143,7 +151,7 @@ x68kConfig(void)
 /*-
  *   X68KConfig parsing part
  *---*/
-void parseError(int line, const char *str, ...);
+static void parseError(int line, const char *str, ...);
 
 enum TokenType {
 TOKEN_EOF,
@@ -255,7 +263,7 @@ static void parseMouse(int argc, Token *
 static void parseKeyboard(int argc, Token **argv);
 static void parseMode(int argc, Token **argv);
 
-Command command[] = {
+static const Command command[] = {
 { "ModeDef", parseModeDef },
 { "Mouse", parseMouse },
 { "Keyboard", parseKeyboard },
@@ -263,6 +271,24 @@ Command command[] = {
 };
 #define NCOMMANDS (sizeof(command)/sizeof(command[0]))
 
+static const char *x68kTypeStr[] = {
+	[X68K_FB_NULL]= NULL,
+	[X68K_FB_TEXT]= "Text",
+	[X68K_FB_GRAPHIC] = "Graphic",
+};
+#define NTYPES (sizeof(x68kTypeStr) / sizeof(x68kTypeStr[0]))
+
+static const char *x68kClassStr[] = {
+	[StaticGray]  = "StaticGray",
+	[GrayScale]   = "GrayScale",
+	[StaticColor] = "StaticColor",
+	[PseudoColor] = "PseudoColor",
+	[TrueColor]   = "TrueColor",
+	[DirectColor] = "DirectColor",
+};
+#define NCLASSES (sizeof(x68kClassStr) / sizeof(x68kClassStr[0]))
+#define ClassInvalid	(-1)
+
 /*-
  * function "parseCommand"
  *
@@ -333,13 +359,13 @@ parseCommand(void)
  *  purpose:  examine the number of arguments and the type of each
  *argument.
  *  argument: (int)n : correct number of arguments
- *(enum TokenType *)type : table of types
+ *(const enum TokenType *)type : table of types
  *(int)argc_m1   : actual number of arguments
  *(Token **)argv : command and arguments
  *  returns:  nothing
  *---*/
 static void
-checkArguments(int n, enum TokenType *type, int argc_m1, Token **argv)
+checkArguments(int n, const enum TokenType *type, int argc_m1, Token **argv)
 {
 int i;
 
@@ -359,7 +385,7 @@ checkArguments(int n, enum TokenType *ty
 
 typedef struct _Mode {
 struct _Mode *next;
-char *name;
+const char *name;
 int type;
 int depth;
 int class;
@@ -367,7 +393,8 @@ typedef struct _Mode {
 X68kFbReg reg;
 } Mode;
 
-Mode *modeList = NULL;
+static Mode *modeList = NULL;
+static Mode *modeChosen;
 
 /*-
  * function "parseModeDef"
@@ -379,7 +406,7 @@ Mode *modeList = NULL;
 static void
 parseModeDef(int 

CVS commit: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 13 17:49:57 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k: X68kConfig

Log Message:
Sync with xorg-server: Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.2 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.3
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.2	Thu Nov  5 16:06:08 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig	Fri Nov 13 17:49:57 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.2 2020/11/05 16:06:08 tsutsui Exp $
+;; $NetBSD: X68kConfig,v 1.3 2020/11/13 17:49:57 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -81,7 +81,7 @@
   105040)
 
 ;
-; 1024x762x4bit StaticGray
+; 1024x768x4bit StaticGray
 ; CRTC-R20 = 0x041a(1050) VIDEOC-R0 = 0x0004
 ;
 (ModeDef NeedsMultiScan Graphic 4 StaticGray  1024 768

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Nov 13 17:45:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: X68kConfig

Log Message:
Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2	Tue Nov  3 15:27:45 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig	Fri Nov 13 17:45:05 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.2 2020/11/03 15:27:45 tsutsui Exp $
+;; $NetBSD: X68kConfig,v 1.3 2020/11/13 17:45:05 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -81,7 +81,7 @@
   105040)
 
 ;
-; 1024x762x4bit StaticGray
+; 1024x768x4bit StaticGray
 ; CRTC-R20 = 0x041a(1050) VIDEOC-R0 = 0x0004
 ;
 (ModeDef NeedsMultiScan Graphic 4 StaticGray  1024 768

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov  7 21:20:46 UTC 2020

Added Files:
xsrc/external/mit/libdrm/dist: configure

Log Message:
add minimal 'configure' script that finds the versions, and
doesn't end up with an empty version in the .pc file.

pointed out by Michael Scholz in private email.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libdrm/dist/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: xsrc/external/mit/libdrm/dist/configure
diff -u /dev/null xsrc/external/mit/libdrm/dist/configure:1.3
--- /dev/null	Sat Nov  7 21:20:46 2020
+++ xsrc/external/mit/libdrm/dist/configure	Sat Nov  7 21:20:46 2020
@@ -0,0 +1,8 @@
+# XXX hack for netbsd pkgconfig processing.
+
+# Identity of this package.
+PACKAGE_NAME='libdrm'
+PACKAGE_TARNAME='libdrm'
+PACKAGE_VERSION='2.4.102'
+PACKAGE_STRING='libdrm 2.4.102'
+PACKAGE_URL=''

CVS commit: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Nov  5 16:06:08 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k: X68kConfig
x68k.h x68kConfig.c x68kFb.c x68kGraph.c x68kInit.c x68kKbd.c
x68kReg.h x68kText.c

Log Message:
Cherry-pick Xorg version independent changes from xorg-server.

 Normalize #include paths.
 Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.
 Fix a suspicious chunk disabled on xfree 4.x migration as sunKbd.c does.
 Restore video mode properly on exit even on CRT Mode 19 (640x480 31kHz VGA).
 Add ModeDef for 640x480x4bit PseudoColor.
 Avoid a use of __UNVOLATILE(3).
 Remove unnecessary pointer casts from malloc(3).
 Use exact-width interger types properly for register accesses etc.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig:1.1.1.1	Thu Jun  9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/X68kConfig	Thu Nov  5 16:06:08 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $
+;; $NetBSD: X68kConfig,v 1.2 2020/11/05 16:06:08 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -52,6 +52,14 @@
 919   17   81  5675   40  552   27
78930)
 
+;
+; 640x480x4bit PseudoColor
+; CRTC-R20 = 0x0417(1047) VIDEOC-R0 = 0x0004
+;
+(ModeDef Pseudo16Color640x480 Graphic 4 PseudoColor  640 480
+99   11   13   93  5241   33  513   27
+  104740)
+
 ;;
 ;; tricky modes
 ;;
@@ -100,6 +108,7 @@
 ;(Mode Monochrome1024x768)
 ;(Mode Pseudo16Color1024x768)
 ;(Mode NeedsMultiScan)
+;(Mode Pseudo16Color640x480)
 
 ;;
 ;; input devices

Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.2 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.3
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.2	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h	Thu Nov  5 16:06:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.3 2020/11/05 16:06:08 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -43,12 +43,12 @@
 #include 
 
 /* generic X */
-#include 
-#include 
+#include 
+#include 
 #define XK_KATAKANA
-#include 
+#include 
 #define NEED_EVENTS
-#include 
+#include 
 
 /* dix */
 #include 
@@ -79,7 +79,7 @@ typedef struct _X68kScreenRec {
 int scr_height; /* screen height   */
 int dpi;/* dots per inch   */
 uint8_t *fb;/* frame buffer VA */
-volatile FbReg *reg;/* control register VA */
+FbReg *reg; /* control register VA */
 X68kFbReg x68kreg;  /* control register*/
 int mapsize;/* size of mapped memory */
 ColormapPtr installedMap;   /* installed colormap*/

Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.3 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.4
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.3	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c	Thu Nov  5 16:06:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.3 

CVS commit: xsrc/external/mit/libepoxy/src

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Wed Nov  4 22:46:20 UTC 2020

Modified Files:
xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c
gl_generated_dispatch.c glx_generated_dispatch.c

Log Message:
fix lint build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \
xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c
diff -u xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.5 xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.6
--- xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.5	Sun Nov  1 23:47:22 2020
+++ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c	Wed Nov  4 17:46:20 2020
@@ -11,7 +11,7 @@
 #include "dispatch_common.h"
 #include "epoxy/egl.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__lint__)
 #define EPOXY_NOINLINE __attribute__((noinline))
 #elif defined (_MSC_VER)
 #define EPOXY_NOINLINE __declspec(noinline)

Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c
diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.6 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.7
--- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.6	Sun Nov  1 23:47:22 2020
+++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c	Wed Nov  4 17:46:20 2020
@@ -26,7 +26,7 @@
 #include "dispatch_common.h"
 #include "epoxy/gl.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__lint__)
 #define EPOXY_NOINLINE __attribute__((noinline))
 #elif defined (_MSC_VER)
 #define EPOXY_NOINLINE __declspec(noinline)
Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c
diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.6 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.7
--- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.6	Sun Nov  1 23:47:22 2020
+++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c	Wed Nov  4 17:46:20 2020
@@ -26,7 +26,7 @@
 #include "dispatch_common.h"
 #include "epoxy/glx.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__lint__)
 #define EPOXY_NOINLINE __attribute__((noinline))
 #elif defined (_MSC_VER)
 #define EPOXY_NOINLINE __declspec(noinline)

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Nov  4 17:16:13 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c x68kGraph.c
x68kKbd.c x68kReg.h x68kText.c

Log Message:
Use exact-width interger types properly for register accesses etc.

No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6	Tue Nov  3 15:52:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Wed Nov  4 17:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -132,7 +132,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 static void
 x68kRegSetup(X68kScreenRec *pPriv)
 {
-u_short pr20 = pPriv->reg->crtc.r20;
+uint16_t pr20 = pPriv->reg->crtc.r20;
 
 /* timing registers */
 if ( (pr20 & 0x0003) < (pPriv->x68kreg.crtc.r20 & 0x0003) ||
@@ -175,7 +175,7 @@ x68kSaveScreen(ScreenPtr pScreen, Bool o
 {
 X68kScreenRec *pPriv = x68kGetScreenPrivate(pScreen);
 static int status = FALSE;
-static u_short r2;
+static uint16_t r2;
 
 if (on == SCREEN_SAVER_ON || on == SCREEN_SAVER_CYCLE) {
 if (!status) {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8	Tue Nov  3 16:59:38 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Wed Nov  4 17:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.8 2020/11/03 16:59:38 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -125,7 +125,7 @@ static int x68kListInstalledColormaps(Sc
 static void x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs);
 
 static void x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
-   u_char *rmap, u_char *gmap, u_char *bmap);
+   uint8_t *rmap, uint8_t *gmap, uint8_t *bmap);
 
 /*-
  * function "x68kGraphOpen"  [ X68kFBProc function ]
@@ -147,7 +147,7 @@ x68kGraphOpen(X68kScreenRec *pPriv)
 if (pPriv->depth == 15 && pPriv->class == TrueColor) {
 /* for 32768 TrueColor mode */
 	int i;
-	u_short x = 0x0001;
+	uint16_t x = 0x0001;
 	for ( i = 0; i < 256; ) {
 	pPriv->reg->gpal[i++] = x;
 	pPriv->reg->gpal[i++] = x;
@@ -353,7 +353,7 @@ x68kInstallColormap(ColormapPtr cmap)
 register int i;
 register Entry *pent;
 register VisualPtr pVisual = cmap->pVisual;
-u_char   rmap[256], gmap[256], bmap[256];
+uint8_t   rmap[256], gmap[256], bmap[256];
 unsigned long rMask, gMask, bMask;
 int	oRed, oGreen, oBlue;
 
@@ -454,7 +454,7 @@ static void
 x68kStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs)
 {
 X68kScreenRec *pPriv = x68kGetScreenPrivate(pmap->pScreen);
-u_char rmap[256], gmap[256], bmap[256];
+uint8_t rmap[256], gmap[256], bmap[256];
 xColorItem expanddefs[256];
 register int i;
 
@@ -481,20 +481,20 @@ x68kStoreColors(ColormapPtr pmap, int nd
  *  argument: (ScreenPtr)pScreen: screen
  *(int)dex  : colormap index
  *(int)count: count for updating
- *(u_char *)[rgb]map: each map
+ *(uint8_t *)[rgb]map: each map
  *  returns:  nothing
  *---*/
 static void
 x68kUpdateColormap(ScreenPtr pScreen, int dex, int count,
-   u_char *rmap, u_char *gmap, u_char *bmap)
+   uint8_t *rmap, uint8_t *gmap, uint8_t *bmap)
 {
 X68kScreenRec *pPriv = 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 16:59:38 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c
x68kGraph.c

Log Message:
Remove unnecessary pointer casts from malloc(3).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.5	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c	Tue Nov  3 16:59:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.5 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.6 2020/11/03 16:59:38 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -176,7 +176,7 @@ getToken(void)
 static int line = 1;
 Token *ret;
 
-ret = (Token *)malloc(sizeof(Token));
+ret = malloc(sizeof(Token));
 if (ret == NULL)
 FatalError("Out of memory");
 while (TRUE) {
@@ -202,7 +202,7 @@ getToken(void)
 /* is a symbol? */
 if (isalpha(c)) {
 int i = 0;
-ret->content.symbol = (char *)malloc(32 * sizeof(char));
+ret->content.symbol = malloc(32 * sizeof(char));
 if (ret->content.symbol == NULL)
 FatalError("Out of memory");
 do {
@@ -295,7 +295,7 @@ parseCommand(void)
 break;
 }
 argc++;
-argv = (Token **)realloc(argv, sizeof(Token *) * argc);
+argv = realloc(argv, sizeof(Token *) * argc);
 if (argv == NULL)
 FatalError("Out of memory");
 argv[argc-1] = token;
@@ -395,7 +395,7 @@ parseModeDef(int argc, Token **argv)
 
 checkArguments(18, argtype, argc-1, argv);
 
-mode = (Mode *)malloc(sizeof(Mode));
+mode = malloc(sizeof(Mode));
 if (mode == NULL)
 FatalError("Out of memory");
 mode->name = strdup(argv[1]->content.symbol);
@@ -545,7 +545,7 @@ parseMode(int argc, Token **argv)
 x68kFbProc[0].open = x68kGraphOpen;
 x68kFbProc[0].init = x68kGraphInit;
 x68kFbProc[0].close = x68kGraphClose;
-	x68kFormat = (PixmapFormatRec*) malloc (sizeof(PixmapFormatRec));
+	x68kFormat = malloc (sizeof(PixmapFormatRec));
 	x68kFormat->scanlinePad = BITMAP_SCANLINE_PAD;
 x68kFormat->bitsPerPixel = 16;
 switch (mode->depth) {

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.7	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Tue Nov  3 16:59:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.7 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.8 2020/11/03 16:59:38 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -264,9 +264,9 @@ x68kCfbFinishScreenInit(
 
 ndepths = 1;
 nvisuals = 1;
-depths = (DepthPtr)malloc( sizeof(DepthRec) );
-visuals = (VisualPtr)malloc( sizeof(VisualRec) );
-vid = (VisualID *)malloc( sizeof(VisualID) );
+depths = malloc( sizeof(DepthRec) );
+visuals = malloc( sizeof(VisualRec) );
+vid = malloc( sizeof(VisualID) );
 if( !depths || !visuals || !vid ) {
 free( depths );
 free( visuals );
@@ -296,9 +296,9 @@ x68kCfbFinishScreenInit(
 
 ndepths = 1;
 nvisuals = 1;
-depths = (DepthPtr)malloc( sizeof(DepthRec) );
-visuals = (VisualPtr)malloc( sizeof(VisualRec) );
-vid = (VisualID *)malloc( sizeof(VisualID) );
+depths = malloc( sizeof(DepthRec) );
+visuals = malloc( sizeof(VisualRec) );
+vid = malloc( sizeof(VisualID) );
 if( !depths || !visuals || !vid ) {
 free( depths );
 free( visuals );

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:52:57 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kFb.c
x68kReg.h

Log Message:
Avoid a use of __UNVOLATILE(3).  Tested on XM6i.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.5	Wed Jul 22 21:24:20 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.5 2020/07/22 21:24:20 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -79,7 +79,7 @@ typedef struct _X68kScreenRec {
 int scr_height; /* screen height   */
 int dpi;/* dots per inch   */
 uint8_t *fb;/* frame buffer VA */
-volatile FbReg *reg;/* control register VA */
+FbReg *reg; /* control register VA */
 X68kFbReg x68kreg;  /* control register*/
 int mapsize;/* size of mapped memory */
 ColormapPtr installedMap;   /* installed colormap*/
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5	Tue Nov  3 15:25:21 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.5 2020/11/03 15:25:21 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.6 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -113,7 +113,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 x68kRegSetup(pPriv);
 
 /* unmap and close frame buffer */
-if ( munmap(__UNVOLATILE(pPriv->reg), pPriv->mapsize) == -1 )
+if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
 ErrorF("Can't unmap frame buffer");
 close(pPriv->fd);
 }

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.3	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h	Tue Nov  3 15:52:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kReg.h,v 1.3 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kReg.h,v 1.4 2020/11/03 15:52:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -28,11 +28,11 @@
  * CRT controller
  */
 typedef struct {
-u_short r00, r01, r02, r03, r04, r05, r06, r07;
-u_short r08, r09, r10, r11, r12, r13, r14, r15;
-u_short r16, r17, r18, r19, r20, r21, r22, r23;
+volatile u_short r00, r01, r02, r03, r04, r05, r06, r07;
+volatile u_short r08, r09, r10, r11, r12, r13, r14, r15;
+volatile u_short r16, r17, r18, r19, r20, r21, r22, r23;
 char pad0[0x450];
-u_short ctrl;
+volatile u_short ctrl;
 char pad1[0x1b7e];
 } Crtc;
 
@@ -47,11 +47,11 @@ typedef struct {
  * video controller
  */
 typedef struct {
-u_short r0;
+volatile u_short r0;
 char pad0[0xfe];
-u_short r1;
+volatile u_short r1;
 char pad1[0xfe];
-u_short r2;
+volatile u_short r2;
 char pad2[0x19fe];
 } Videoc;
 
@@ -63,9 +63,9 @@ typedef struct {
 
 /* system port */
 typedef struct {
-u_short r1, r2, r3, r4;
+volatile u_short r1, r2, r3, r4;
 u_short pad0[2];
-u_short r5, r6;
+volatile u_short r5, r6;
 u_short pad[0x1ff0];
 } Sysport;
 
@@ -74,8 +74,8 @@ typedef struct {
  */
 typedef struct {
 Crtc crtc;
-u_short gpal[256];/* graphic palette */
-u_short tpal[256]; /* text palette */
+volatile u_short gpal[256];/* graphic palette */
+volatile u_short tpal[256]; /* text palette */
 Videoc videoc;
 u_short pad0[0xa000];
 Sysport sysport;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:27:45 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: X68kConfig

Log Message:
Add ModeDef for 640x480x4bit PseudoColor.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig:1.1	Sat Mar  1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/X68kConfig	Tue Nov  3 15:27:45 2020
@@ -1,4 +1,4 @@
-;; $NetBSD: X68kConfig,v 1.1 2014/03/01 19:34:47 tsutsui Exp $
+;; $NetBSD: X68kConfig,v 1.2 2020/11/03 15:27:45 tsutsui Exp $
 ;;
 ;; X68kConfig: sample configuration for X68k
 ;; written by Yasushi Yamasaki
@@ -52,6 +52,14 @@
 919   17   81  5675   40  552   27
78930)
 
+;
+; 640x480x4bit PseudoColor
+; CRTC-R20 = 0x0417(1047) VIDEOC-R0 = 0x0004
+;
+(ModeDef Pseudo16Color640x480 Graphic 4 PseudoColor  640 480
+99   11   13   93  5241   33  513   27
+  104740)
+
 ;;
 ;; tricky modes
 ;;
@@ -100,6 +108,7 @@
 ;(Mode Monochrome1024x768)
 ;(Mode Pseudo16Color1024x768)
 ;(Mode NeedsMultiScan)
+;(Mode Pseudo16Color640x480)
 
 ;;
 ;; input devices

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  3 15:25:21 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c

Log Message:
Restore video mode properly on exit even on CRT Mode 19 (640x480 31kHz VGA).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.4	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Tue Nov  3 15:25:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.4 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.5 2020/11/03 15:25:21 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -30,6 +30,8 @@ static void x68kRegSetup(X68kScreenRec *
 
 DevPrivateKeyRec x68kScreenPrivateKeyRec;
 
+static int cons_dwidth;
+
 /*-
  * function "x68kFbCommonOpen"
  *
@@ -68,6 +70,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
 
 x68kRegSetup( pPriv );
+cons_dwidth = gi.gd_dwidth;
 
 return TRUE;
 }
@@ -83,7 +86,8 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 void
 x68kFbCommonClose(X68kScreenRec *pPriv)
 {
-X68kFbReg graphNone = {
+static const X68kFbReg graphNone_mode16 = {
+	/* CRT mode 16 (768x512 31.5kHz) */
 { 137,14, 28, 124,
   567, 5, 40, 552,
27, 0,  0,   0,
@@ -93,8 +97,19 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 { 0x0004, 0x21e4, 0x0020 },
 0
 };
+static const X68kFbReg graphNone_mode19 = {
+	/* CRT mode 19 (640x480 31.5kHz VGA mode) */
+{  99,11, 13,  93,
+  524, 1, 33, 513,
+   27, 0,  0,   0,
+0, 0,  0,   0,
+0, 0,  0,   0,
+   0x0417, 0,  0,   0, 0 },
+{ 0x0004, 0x21e4, 0x0020 },
+0
+};
 /* change video mode */
-pPriv->x68kreg = graphNone;
+pPriv->x68kreg = (cons_dwidth == 640) ? graphNone_mode19 : graphNone_mode16;
 x68kRegSetup(pPriv);
 
 /* unmap and close frame buffer */

CVS commit: xsrc/external/mit/libepoxy/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov  2 06:25:35 UTC 2020

Modified Files:
xsrc/external/mit/libepoxy/include: config.h

Log Message:
ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libepoxy/include/config.h
diff -u xsrc/external/mit/libepoxy/include/config.h:1.2 xsrc/external/mit/libepoxy/include/config.h:1.3
--- xsrc/external/mit/libepoxy/include/config.h:1.2	Mon Nov  2 04:47:22 2020
+++ xsrc/external/mit/libepoxy/include/config.h	Mon Nov  2 06:25:35 2020
@@ -10,8 +10,10 @@
 /* build WGL tests */
 /* #undef BUILD_WGL */
 
+#if 0 /* in Makefile */
 /* Whether EGL support is enabled */
 #define ENABLE_EGL 1
+#endif
 
 /* Whether GLX support is enabled */
 #define ENABLE_GLX 1

CVS commit: xsrc/external/mit/libepoxy

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov  2 04:47:22 UTC 2020

Modified Files:
xsrc/external/mit/libepoxy/dist: configure
xsrc/external/mit/libepoxy/include: config.h
xsrc/external/mit/libepoxy/src: egl_generated.h
egl_generated_dispatch.c gl_generated.h gl_generated_dispatch.c
glx_generated.h glx_generated_dispatch.c

Log Message:
new generated files for libepoxy 1.5.4.  update the fake configure version.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/dist/configure
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/libepoxy/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/src/egl_generated.h \
xsrc/external/mit/libepoxy/src/gl_generated.h \
xsrc/external/mit/libepoxy/src/glx_generated.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \
xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: xsrc/external/mit/libepoxy/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov  2 04:46:30 UTC 2020

Modified Files:
xsrc/external/mit/libepoxy/dist/src: dispatch_common.c
dispatch_common.h
Removed Files:
xsrc/external/mit/libepoxy/dist: .gitignore
xsrc/external/mit/libepoxy/dist/test: egl_and_glx_different_pointers.c

Log Message:
merge libepoxy 1.5.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libepoxy/dist/.gitignore
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libepoxy/dist/test/egl_and_glx_different_pointers.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4 xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.5
--- xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4	Tue Jul  9 21:55:21 2019
+++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c	Mon Nov  2 04:46:29 2020
@@ -41,7 +41,7 @@
  * \section features_sec Features
  *
  *   - Automatically initializes as new GL functions are used.
- *   - GL 4.4 core and compatibility context support.
+ *   - GL 4.6 core and compatibility context support.
  *   - GLES 1/2/3 context support.
  *   - Knows about function aliases so (e.g.) `glBufferData()` can be
  * used with `GL_ARB_vertex_buffer_object` implementations, along
@@ -173,30 +173,33 @@
 
 #include "dispatch_common.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
 #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-#elif defined(ANDROID)
+#define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
+#define GLES1_LIB "libGLESv1_CM.so"
+#define GLES2_LIB "libGLESv2.so"
+#elif defined(__ANDROID__)
 #define GLX_LIB "libGLESv2.so"
-#else
-#ifdef __NetBSD__
+#elif __NetBSD__
 #define GLX_LIB "libGL.so"
-#else
-#define GLX_LIB "libGL.so.1"
-#endif
 #endif
 
 #if defined(ANDROID) || defined(__NetBSD__)
 #define EGL_LIB "libEGL.so"
 #define GLES1_LIB "libGLESv1_CM.so"
 #define GLES2_LIB "libGLESv2.so"
-#elif defined _WIN32
+#elif defined(_WIN32)
 #define EGL_LIB "libEGL.dll"
 #define GLES1_LIB "libGLES_CM.dll"
 #define GLES2_LIB "libGLESv2.dll"
+#define OPENGL_LIB "OPENGL32"
 #else
+#define GLVND_GLX_LIB "libGLX.so.1"
+#define GLX_LIB "libGL.so.1"
 #define EGL_LIB "libEGL.so.1"
 #define GLES1_LIB "libGLESv1_CM.so.1"
 #define GLES2_LIB "libGLESv2.so.2"
+#define OPENGL_LIB "libOpenGL.so.0"
 #endif
 
 #ifdef __GNUC__
@@ -230,13 +233,18 @@ struct api {
 pthread_mutex_t mutex;
 #endif
 
-/* dlopen() return value for libGL.so.1. */
+/*
+ * dlopen() return value for the GLX API. This is libGLX.so.1 if the
+ * runtime is glvnd-enabled, else libGL.so.1
+ */
 void *glx_handle;
 
 /*
- * dlopen() return value for OS X's GL library.
+ * dlopen() return value for the desktop GL library.
  *
- * On linux, glx_handle is used instead.
+ * On Windows this is OPENGL32. On OSX this is classic libGL. On Linux
+ * this is either libOpenGL (if the runtime is glvnd-enabled) or
+ * classic libGL.so.1
  */
 void *gl_handle;
 
@@ -290,14 +298,13 @@ library_init(void)
 }
 
 static bool
-get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
+get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool load)
 {
 if (*handle)
 return true;
 
 if (!library_initialized) {
-fprintf(stderr,
-"Attempting to dlopen() while in the dynamic linker.\n");
+fputs("Attempting to dlopen() while in the dynamic linker.\n", stderr);
 abort();
 }
 
@@ -306,11 +313,15 @@ get_dlopen_handle(void **handle, const c
 #else
 pthread_mutex_lock();
 if (!*handle) {
-*handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+int flags = RTLD_LAZY | RTLD_LOCAL;
+if (!load)
+flags |= RTLD_NOLOAD;
+
+*handle = dlopen(lib_name, flags);
 if (!*handle) {
 if (exit_on_fail) {
 fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
-exit(1);
+abort();
 } else {
 (void)dlerror();
 }
@@ -323,15 +334,11 @@ get_dlopen_handle(void **handle, const c
 }
 
 static void *
-do_dlsym(void **handle, const char *lib_name, const char *name,
- bool exit_on_fail)
+do_dlsym(void **handle, const char *name, bool exit_on_fail)
 {
 void *result;
 const char *error = "";
 
-if (!get_dlopen_handle(handle, lib_name, exit_on_fail))
-return NULL;
-
 #ifdef _WIN32
 result = GetProcAddress(*handle, name);
 #else
@@ -340,8 +347,8 @@ do_dlsym(void **handle, const char *lib_

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Nov  1 11:44:55 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c

Log Message:
Fix a suspicious chunk disabled on xfree 4.x migration as sunKbd.c does.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8	Sat Aug  1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sun Nov  1 11:44:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.8 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.9 2020/11/01 11:44:55 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -185,10 +185,8 @@ x68kInitModMap(KeySymsRec *KeySyms, CARD
 KeySyms->minKeyCode += MIN_KEYCODE;
 KeySyms->maxKeyCode += MIN_KEYCODE;
 }
-#if 0
 if (KeySyms->maxKeyCode > MAX_KEYCODE)
-KeySyms->maxKeyCode += MAX_KEYCODE;
-#endif
+KeySyms->maxKeyCode = MAX_KEYCODE;
 for (i = KeySyms->minKeyCode;
  i < KeySyms->maxKeyCode; i++) {
 switch (KeySyms->map[(i-KeySyms->minKeyCode)*4]) {

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Nov  1 11:40:53 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c

Log Message:
Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8	Sat Aug  1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sun Nov  1 11:40:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.8 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -75,9 +75,35 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 static int nscreens;
 
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "X68K."
+#endif
+
 void
 OsVendorInit(void)
 {
+static int inited;
+
+if (!inited) {
+	const char *logfile;
+	char *lf;
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+	logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+	if (asprintf(, "%s%%s" LOGSUFFIX, logfile) == -1)
+	FatalError("Cannot allocate space for the log file name\n");
+	LogInit(lf, LOGOLDSUFFIX);
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+	free(lf);
+
+	inited = 1;
+}
 }
 
 #ifdef GLXEXT
@@ -178,6 +204,7 @@ AbortDDX(enum ExitCode error)
 fb = x68kGetFbProcRec(i);
 (*fb->close)(screen);
 }
+LogClose(error);
 }
 
 /*-

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov  1 11:08:41 UTC 2020

Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
Removed Files:
xsrc/external/mit/libxcb/dist: README
xsrc/external/mit/xcb-proto/dist: README

Log Message:
merge libxcb and xcb-proto 1.14.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/README
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcb-proto/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.8
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7	Fri Dec 28 22:16:48 2018
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c	Sun Nov  1 11:08:40 2020
@@ -1025,6 +1025,7 @@ int _xcb_in_read(xcb_connection_t *c)
 }
 }
 #endif
+c->in.total_read += n;
 c->in.queue_len += n;
 }
 while(read_packet(c))
@@ -1051,7 +1052,7 @@ int _xcb_in_read(xcb_connection_t *c)
 }
 #endif
 #ifndef _WIN32
-if((n > 0) || (n < 0 && errno == EAGAIN))
+if((n > 0) || (n < 0 && (errno == EAGAIN || errno == EINTR)))
 #else
 if((n > 0) || (n < 0 && WSAGetLastError() == WSAEWOULDBLOCK))
 #endif /* !_WIN32 */

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov  1 10:24:51 UTC 2020

Modified Files:
xsrc/external/mit/fonttosfnt/dist: struct.c
Removed Files:
xsrc/external/mit/font-alias/dist: README

Log Message:
merge font-alias 1.0.4 and fonttosfnt 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-alias/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fonttosfnt/dist/struct.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fonttosfnt/dist/struct.c
diff -u xsrc/external/mit/fonttosfnt/dist/struct.c:1.3 xsrc/external/mit/fonttosfnt/dist/struct.c:1.4
--- xsrc/external/mit/fonttosfnt/dist/struct.c:1.3	Sun Dec 30 08:51:05 2018
+++ xsrc/external/mit/fonttosfnt/dist/struct.c	Sun Nov  1 10:24:51 2020
@@ -42,8 +42,32 @@ makeFont(void)
 font->weight = 500;
 font->width = 5;
 font->italicAngle = 0;
-font->underlinePosition = - TWO_SIXTEENTH;
-font->underlineThickness = TWO_SIXTEENTH;
+font->pxMetrics.height = UNDEF;
+font->pxMetrics.maxX = UNDEF;
+font->pxMetrics.minX = UNDEF;
+font->pxMetrics.maxY = UNDEF;
+font->pxMetrics.minY = UNDEF;
+font->pxMetrics.xHeight = UNDEF;
+font->pxMetrics.capHeight = UNDEF;
+font->pxMetrics.maxAwidth = UNDEF;
+font->pxMetrics.awidth = UNDEF;
+font->pxMetrics.ascent = UNDEF;
+font->pxMetrics.descent = UNDEF;
+font->pxMetrics.underlinePosition = UNDEF;
+font->pxMetrics.underlineThickness = UNDEF;
+font->metrics.height = UNDEF;
+font->metrics.maxX = UNDEF;
+font->metrics.minX = UNDEF;
+font->metrics.maxY = UNDEF;
+font->metrics.minY = UNDEF;
+font->metrics.xHeight = UNDEF;
+font->metrics.capHeight = UNDEF;
+font->metrics.maxAwidth = UNDEF;
+font->metrics.awidth = UNDEF;
+font->metrics.ascent = UNDEF;
+font->metrics.descent = UNDEF;
+font->metrics.underlinePosition = UNDEF;
+font->metrics.underlineThickness = UNDEF;
 font->foundry = makeName("UNKN");
 font->strikes = NULL;
 return font;
@@ -401,19 +425,12 @@ strikeBitmapIndex(StrikePtr strike, Cmap
 return STRIKE_BITMAP(strike, code);
 }
 
-void
-strikeMetrics(StrikePtr strike,
-  int *width_max_return, 
-  int *x_min_return, int *y_min_return,
-  int *x_max_return, int *y_max_return)
+int
+strikeMaxWidth(StrikePtr strike)
 {
 BitmapPtr bitmap;
 int i;
 int width_max = 0;
-int x_min = 1;
-int y_min = 1;
-int x_max = -1;
-int y_max = -1;
 
 for(i = 0; i < FONT_CODES; i++) {
 bitmap = STRIKE_BITMAP(strike, i);
@@ -421,21 +438,9 @@ strikeMetrics(StrikePtr strike,
 continue;
 if(bitmap->advanceWidth > width_max)
 width_max = bitmap->advanceWidth;
-if(bitmap->horiBearingX < x_min)
-x_min = bitmap->horiBearingX;
-if(bitmap->horiBearingY > y_max)
-y_max = bitmap->horiBearingY;
-if(bitmap->horiBearingX + bitmap->width > x_max)
-x_max = bitmap->horiBearingX + bitmap->width;
-if(bitmap->horiBearingY - bitmap->height < y_min)
-y_min = bitmap->horiBearingY - bitmap->height;
 }
 
-if(width_max_return) *width_max_return = width_max;
-if(x_min_return) *x_min_return = x_min;
-if(y_min_return) *y_min_return = y_min;
-if(x_max_return) *x_max_return = x_max;
-if(y_max_return) *y_max_return = y_max;
+return width_max;
 }
 
 int
@@ -453,7 +458,7 @@ glyphMetrics(FontPtr font, int code,
 if(bitmap) {
 if(width_return)
 *width_return = 
-(((float)bitmap->advanceWidth + 0.5) / strike->sizeX) *
+(((float)bitmap->advanceWidth) / strike->sizeX) *
 TWO_SIXTEENTH;
 if(x_min_return)
 *x_min_return =
@@ -463,17 +468,13 @@ glyphMetrics(FontPtr font, int code,
 *y_min_return =
 (((float)bitmap->horiBearingY - bitmap->height) 
  / strike->sizeY) * TWO_SIXTEENTH;
-/* For the following two, 0.9 instead of 0.5 might make
-   more sense.  However, using different rounding rules
-   for x_max and awidth causes problems for detecting
-   charcell fonts. */
 if(x_max_return)
 *x_max_return =
-(((float)bitmap->horiBearingX + bitmap->width + 0.5)
+(((float)bitmap->horiBearingX + bitmap->width)
  / strike->sizeX) * TWO_SIXTEENTH;
 if(y_max_return)
 *y_max_return =
-(((float)bitmap->horiBearingY + 0.5) / strike->sizeY) *
+(((float)bitmap->horiBearingY) / strike->sizeY) *
 TWO_SIXTEENTH;
 return 1;
 }
@@ -482,33 +483,3 @@ 

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov  1 10:01:30 UTC 2020

Modified Files:
xsrc/external/mit/libdrm/dist: util_math.h xf86drm.c

Log Message:
fix build cornflakes from libdrm 2.4.102.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/util_math.h
cvs rdiff -u -r1.26 -r1.27 xsrc/external/mit/libdrm/dist/xf86drm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/util_math.h
diff -u xsrc/external/mit/libdrm/dist/util_math.h:1.2 xsrc/external/mit/libdrm/dist/util_math.h:1.3
--- xsrc/external/mit/libdrm/dist/util_math.h:1.2	Sun Jan 21 21:49:51 2018
+++ xsrc/external/mit/libdrm/dist/util_math.h	Sun Nov  1 10:01:30 2020
@@ -29,6 +29,7 @@
 #define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))
 
 #define __align_mask(value, mask)  (((value) + (mask)) & ~(mask))
+#undef ALIGN
 #define ALIGN(value, alignment)__align_mask(value, (__typeof__(value))((alignment) - 1))
 
 #endif /*_UTIL_MATH_H_*/

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.26 xsrc/external/mit/libdrm/dist/xf86drm.c:1.27
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.26	Sun Nov  1 09:57:37 2020
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Sun Nov  1 10:01:30 2020
@@ -3132,7 +3132,7 @@ static int drmParseSubsystemType(int maj
 int ret;
 
 /* Get the type of device we're looking for to pick the right pathname.  */
-type = drmGetMinorType(min);
+type = drmGetMinorType(maj, min);
 if (type == -1)
 	return -ENODEV;
 
@@ -3302,7 +3302,7 @@ static int drmParsePciBusInfo(int maj, i
 int ret;
 
 /* Get the type of device we're looking for to pick the right pathname.  */
-type = drmGetMinorType(min);
+type = drmGetMinorType(maj, min);
 if (type == -1)
 	return -ENODEV;
 

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov  1 09:57:41 UTC 2020

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Added Files:
xsrc/external/mit/libdrm/dist: Android.mk
xsrc/external/mit/libdrm/dist/freedreno: Android.mk
xsrc/external/mit/libdrm/dist/intel: Android.mk
xsrc/external/mit/libdrm/dist/libkms: Android.mk
xsrc/external/mit/libdrm/dist/nouveau: Android.mk
xsrc/external/mit/libdrm/dist/radeon: Android.mk
xsrc/external/mit/libdrm/dist/tests/modetest: Android.mk
Removed Files:
xsrc/external/mit/libdrm/dist: Makefile.am Makefile.in aclocal.m4
config.h.in configure configure.ac
xsrc/external/mit/libdrm/dist/amdgpu: Makefile.am Makefile.in
amdgpu-symbol-check
xsrc/external/mit/libdrm/dist/build-aux: compile config.guess
config.sub depcomp install-sh ltmain.sh missing test-driver
xsrc/external/mit/libdrm/dist/data: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/etnaviv: Makefile.am Makefile.in
etnaviv-symbol-check
xsrc/external/mit/libdrm/dist/exynos: Makefile.am Makefile.in
exynos-symbol-check
xsrc/external/mit/libdrm/dist/freedreno: Makefile.am Makefile.in
freedreno-symbol-check
xsrc/external/mit/libdrm/dist/intel: Makefile.am Makefile.in
intel-symbol-check
xsrc/external/mit/libdrm/dist/intel/tests: gen4-3d.batch.sh
gen5-3d.batch.sh gen6-3d.batch.sh gen7-2d-copy.batch.sh
gen7-3d.batch.sh gm45-3d.batch.sh
xsrc/external/mit/libdrm/dist/libkms: Makefile.am Makefile.in
kms-symbol-check
xsrc/external/mit/libdrm/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libdrm/dist/man: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/nouveau: Makefile.am Makefile.in
nouveau-symbol-check
xsrc/external/mit/libdrm/dist/omap: Makefile.am Makefile.in
omap-symbol-check
xsrc/external/mit/libdrm/dist/radeon: Makefile.am Makefile.in
radeon-symbol-check
xsrc/external/mit/libdrm/dist/tegra: Makefile.am Makefile.in
tegra-symbol-check
xsrc/external/mit/libdrm/dist/tests: Makefile.am Makefile.in random.c
xsrc/external/mit/libdrm/dist/tests/amdgpu: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/etnaviv: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/exynos: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/kms: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/kmstest: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/modeprint: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/modetest: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/nouveau: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/proptest: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/radeon: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/tegra: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/util: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/vbltest: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/vc4: Makefile.am Makefile.in

Log Message:
merge libdrm 2.4.102.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libdrm/dist/Android.mk
cvs rdiff -u -r1.1.1.12 -r0 xsrc/external/mit/libdrm/dist/Makefile.am
cvs rdiff -u -r1.1.1.15 -r0 xsrc/external/mit/libdrm/dist/Makefile.in
cvs rdiff -u -r1.1.1.16 -r0 xsrc/external/mit/libdrm/dist/aclocal.m4
cvs rdiff -u -r1.1.1.10 -r0 xsrc/external/mit/libdrm/dist/config.h.in
cvs rdiff -u -r1.1.1.19 -r0 xsrc/external/mit/libdrm/dist/configure \
xsrc/external/mit/libdrm/dist/configure.ac
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.25 -r1.26 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/build-aux/compile \
xsrc/external/mit/libdrm/dist/build-aux/depcomp \
xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh
cvs 

CVS commit: xsrc/external/mit/xf86-video-vboxvideo/dist/src

[Jason R Thorpe]

Module Name:xsrc
Committed By:   thorpej
Date:   Thu Oct 22 20:47:23 UTC 2020

Modified Files:
xsrc/external/mit/xf86-video-vboxvideo/dist/src: Makefile.am
Makefile.in edid.c getmode.c helpers.c pointer.c setmode.c
vboxvideo.c vbva.c
Added Files:
xsrc/external/mit/xf86-video-vboxvideo/dist/src: vboxvideo_drv.h
Removed Files:
xsrc/external/mit/xf86-video-vboxvideo/dist/src: vboxvideo.h

Log Message:
Rename vboxvideo.h -> vboxvideo_drv.h, so that this can be built on
a host with a case-insensitive + case-preserving file system.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/setmode.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/vbva.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo_drv.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.1.1.1 xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am:1.1.1.1	Wed Jan  9 23:50:31 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am	Thu Oct 22 20:47:23 2020
@@ -59,7 +59,7 @@ vboxvideo_drv_la_SOURCES = \
  vboxvideo.c \
  VBoxVideoErr.h \
  VBoxVideoGuest.h \
- vboxvideo.h \
+ vboxvideo_drv.h \
  VBoxVideo.h \
  VBoxVideoIPRT.h \
  VBoxVideoVBE.h \
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.1.1.1 xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in:1.1.1.1	Wed Jan  9 23:50:31 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in	Thu Oct 22 20:47:23 2020
@@ -408,7 +408,7 @@ vboxvideo_drv_la_SOURCES = \
  vboxvideo.c \
  VBoxVideoErr.h \
  VBoxVideoGuest.h \
- vboxvideo.h \
+ vboxvideo_drv.h \
  VBoxVideo.h \
  VBoxVideoIPRT.h \
  VBoxVideoVBE.h \
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.1.1.1 xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c:1.1.1.1	Wed Jan  9 23:50:31 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c	Thu Oct 22 20:47:23 2020
@@ -1,4 +1,4 @@
-/* $Id: edid.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: edid.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  *
  * Linux Additions X11 graphics driver, EDID construction
@@ -39,7 +39,7 @@
 #include "misc.h"
 #include "xf86DDC.h"
 #include "xf86Crtc.h"
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 
 enum { EDID_SIZE = 128 };
 
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c:1.1.1.1 xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c:1.1.1.1	Wed Jan  9 23:50:31 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c	Thu Oct 22 20:47:23 2020
@@ -1,4 +1,4 @@
-/* $Id: getmode.c,v 1.1.1.1 2019/01/09 23:50:31 mrg Exp $ */
+/* $Id: getmode.c,v 1.2 2020/10/22 20:47:23 thorpej Exp $ */
 /** @file
  * VirtualBox X11 Additions graphics driver dynamic video mode functions.
  */
@@ -25,7 +25,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 
 #define NEED_XF86_TYPES
 #include "xf86.h"
Index: xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c
diff -u xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c:1.1.1.1 xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c:1.2
--- xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c:1.1.1.1	Wed Jan  9 23:50:31 2019
+++ xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c	Thu Oct 22 20:47:23 2020
@@ -20,7 +20,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "vboxvideo.h"
+#include "vboxvideo_drv.h"
 #include "os.h"
 #include "propertyst.h"
 #include "windowstr.h"
Index: 

CVS commit: xsrc/external/mit/freetype/dist

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Wed Oct 21 14:55:07 UTC 2020

Modified Files:
xsrc/external/mit/freetype/dist: CMakeLists.txt ChangeLog ChangeLog.20
ChangeLog.21 ChangeLog.22 ChangeLog.23 ChangeLog.24 Makefile README
README.git autogen.sh configure modules.cfg vms_make.com
xsrc/external/mit/freetype/dist/builds: detect.mk exports.mk
freetype.mk link_dos.mk link_std.mk modules.mk toplevel.mk
xsrc/external/mit/freetype/dist/builds/amiga: README makefile
makefile.os4 smakefile
xsrc/external/mit/freetype/dist/builds/amiga/include/config: ftconfig.h
ftmodule.h
xsrc/external/mit/freetype/dist/builds/amiga/src/base: ftdebug.c
ftsystem.c
xsrc/external/mit/freetype/dist/builds/ansi: ansi-def.mk ansi.mk
xsrc/external/mit/freetype/dist/builds/beos: beos-def.mk beos.mk
detect.mk
xsrc/external/mit/freetype/dist/builds/cmake: iOS.cmake
xsrc/external/mit/freetype/dist/builds/compiler: ansi-cc.mk bcc-dev.mk
bcc.mk emx.mk gcc-dev.mk gcc.mk intelc.mk unix-lcc.mk visualage.mk
visualc.mk watcom.mk win-lcc.mk
xsrc/external/mit/freetype/dist/builds/dos: detect.mk dos-def.mk
dos-emx.mk dos-gcc.mk dos-wat.mk
xsrc/external/mit/freetype/dist/builds/mac: ftmac.c
xsrc/external/mit/freetype/dist/builds/os2: detect.mk os2-def.mk
os2-dev.mk os2-gcc.mk
xsrc/external/mit/freetype/dist/builds/symbian: bld.inf freetype.mmp
xsrc/external/mit/freetype/dist/builds/unix: aclocal.m4 config.guess
config.sub configure configure.ac configure.raw detect.mk
freetype-config.in freetype2.m4 ft-munmap.m4 ftsystem.c install.mk
unix-cc.in unix-def.in unix-dev.mk unix-lcc.mk unix.mk unixddef.mk
xsrc/external/mit/freetype/dist/builds/vms: ftconfig.h ftsystem.c
xsrc/external/mit/freetype/dist/builds/wince: ftdebug.c
xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce: freetype.vcproj
index.html
xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce: freetype.vcproj
index.html
xsrc/external/mit/freetype/dist/builds/windows: detect.mk ftdebug.c
w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk
w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk
xsrc/external/mit/freetype/dist/builds/windows/vc2010: index.html
xsrc/external/mit/freetype/dist/builds/windows/visualc: freetype.vcproj
index.html
xsrc/external/mit/freetype/dist/builds/windows/visualce: freetype.dsp
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/devel: ft2build.h ftoption.h
xsrc/external/mit/freetype/dist/docs: CHANGES CUSTOMIZE DEBUG INSTALL
INSTALL.ANY INSTALL.CROSS INSTALL.GNU INSTALL.UNIX INSTALL.VMS TODO
formats.txt freetype-config.1 raster.txt release
xsrc/external/mit/freetype/dist/include: ft2build.h
xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h
ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcid.h fterrdef.h
fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h
ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h
ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h
ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h
ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h
xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h
ftheader.h ftmodule.h ftoption.h ftstdlib.h
xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h
ftcalc.h ftdebug.h ftgloadr.h ftmemory.h ftobjs.h ftrfork.h
ftserv.h ftstream.h fttrace.h ftvalid.h psaux.h pshints.h sfnt.h
t1types.h tttypes.h
xsrc/external/mit/freetype/dist/include/freetype/internal/services:
svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h
svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h
svttcmap.h svtteng.h svttglyf.h svwinfnt.h
xsrc/external/mit/freetype/dist/src/autofit: afangles.c afblue.c
afblue.cin afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afcover.h
afdummy.c afdummy.h aferrors.h afglobal.c afglobal.h afhints.c
afhints.h afindic.c afindic.h aflatin.c aflatin.h aflatin2.c
aflatin2.h afloader.c afloader.h afmodule.c afmodule.h afranges.c
afranges.h afscript.h afstyles.h aftypes.h afwarp.c afwarp.h
afwrtsys.h autofit.c module.mk rules.mk
xsrc/external/mit/freetype/dist/src/base: ftadvanc.c ftbase.c ftbase.h
ftbbox.c ftbdf.c ftbitmap.c ftcalc.c ftcid.c ftdbgmem.c ftdebug.c
ftfntfmt.c ftfstype.c ftgasp.c ftgloadr.c 

CVS commit: xsrc/external/mit/xcompmgr

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Wed Oct 14 12:30:39 UTC 2020

Removed Files:
xsrc/external/mit/xcompmgr: COPYING ChangeLog INSTALL Makefile.am
Makefile.in README.md aclocal.m4 compile config.guess config.h.in
config.sub configure configure.ac depcomp install-sh missing
xcompmgr.c
xsrc/external/mit/xcompmgr/man: Makefile.am Makefile.in xcompmgr.man

Log Message:
Remove incorrectly imported files


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcompmgr/COPYING \
xsrc/external/mit/xcompmgr/ChangeLog xsrc/external/mit/xcompmgr/INSTALL \
xsrc/external/mit/xcompmgr/Makefile.am \
xsrc/external/mit/xcompmgr/Makefile.in \
xsrc/external/mit/xcompmgr/README.md \
xsrc/external/mit/xcompmgr/aclocal.m4 xsrc/external/mit/xcompmgr/compile \
xsrc/external/mit/xcompmgr/config.guess \
xsrc/external/mit/xcompmgr/config.h.in \
xsrc/external/mit/xcompmgr/config.sub \
xsrc/external/mit/xcompmgr/configure \
xsrc/external/mit/xcompmgr/configure.ac \
xsrc/external/mit/xcompmgr/depcomp xsrc/external/mit/xcompmgr/install-sh \
xsrc/external/mit/xcompmgr/missing xsrc/external/mit/xcompmgr/xcompmgr.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcompmgr/man/Makefile.am \
xsrc/external/mit/xcompmgr/man/Makefile.in \
xsrc/external/mit/xcompmgr/man/xcompmgr.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Mon Oct 12 12:11:55 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Scale XTerm and other X11 apps using the same DPI detection as ctwm


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.7 xsrc/external/mit/xdm/dist/config/Xsession.in:1.8
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.7	Mon Oct 12 11:46:17 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Mon Oct 12 12:11:55 2020
@@ -52,6 +52,11 @@ XCOMM The startup script is not intended
 startup=$HOME/.xsession
 resources=$HOME/.Xresources
 
+fontsize=$(/usr/X11R7/libexec/ctwm_font_size)
+if ! [ -n "$fontsize" ]; then
+	fontsize=16
+fi
+
 if [ -s "$startup" ]; then
 	if [ -x "$startup" ]; then
 		exec "$startup"
@@ -68,6 +73,23 @@ else
 *VT100.foreground: grey90
 *VT100.background: black
 #endif
+*VT100.allowBoldFonts:  false
+*VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XClipboard*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XConsole*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XFontSel*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xfd*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xgc*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmag*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmessage*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 	fi
 	BINDIR/xsetroot -cursor_name left_ptr

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.10
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9	Mon Oct 12 11:46:17 2020
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Mon Oct 12 12:11:55 2020
@@ -23,6 +23,11 @@ if [ -f $sysmodmap ]; then
 XMODMAP $sysmodmap
 fi
 
+fontsize=$(/usr/X11R7/libexec/ctwm_font_size)
+if ! [ -n "$fontsize" ]; then
+	fontsize=16
+fi
+
 if [ -f "$userresources" ]; then
 #ifdef __APPLE__
 if [ -x /usr/bin/cpp ] ; then
@@ -40,6 +45,23 @@ else
 *VT100.foreground: grey90
 *VT100.background: black
 #endif
+*VT100.allowBoldFonts:  false
+*VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XClipboard*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XConsole*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XFontSel*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xfd*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xgc*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmag*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmessage*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 fi
 

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Mon Oct 12 11:46:17 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
more 'welcoming' default root window pointer


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.6 xsrc/external/mit/xdm/dist/config/Xsession.in:1.7
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.6	Sun Oct 11 10:09:09 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Mon Oct 12 11:46:17 2020
@@ -70,6 +70,7 @@ else
 #endif
 EOF
 	fi
+	BINDIR/xsetroot -cursor_name left_ptr
 	BINDIR/xsetroot -solid 'rgb:00/22/44'
 	BINDIR/uxterm &
 	exec BINDIR/ctwm -W

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8	Sun Oct 11 10:09:09 2020
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Mon Oct 12 11:46:17 2020
@@ -56,6 +56,7 @@ if [ -d XINITDIR/xinitrc.d ] ; then
 	unset f
 fi
 
+XSETROOT -cursor_name left_ptr
 XSETROOT -solid 'rgb:00/22/44'
 UXTERM &
 exec CTWM -W

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun Oct 11 10:09:09 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
nice default xsetroot


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.5 xsrc/external/mit/xdm/dist/config/Xsession.in:1.6
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.5	Fri Oct  2 13:45:07 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun Oct 11 10:09:09 2020
@@ -70,6 +70,7 @@ else
 #endif
 EOF
 	fi
+	BINDIR/xsetroot -solid 'rgb:00/22/44'
 	BINDIR/uxterm &
 	exec BINDIR/ctwm -W
 fi

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.7 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.7	Fri Oct  2 13:45:07 2020
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Sun Oct 11 10:09:09 2020
@@ -56,5 +56,6 @@ if [ -d XINITDIR/xinitrc.d ] ; then
 	unset f
 fi
 
+XSETROOT -solid 'rgb:00/22/44'
 UXTERM &
 exec CTWM -W

CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

[Jared D. McNeill]

Module Name:xsrc
Committed By:   jmcneill
Date:   Sat Oct 10 21:50:53 UTC 2020

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.h

Log Message:
If we get an absolute pointer event and we can query the min/max X and Y
values reported and it is in raw mode, use the screen dimensions to scale
the coordinates to fit the screen before feeding the event to the X server.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.5 xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.6
--- xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.5	Wed Jul 22 09:42:15 2015
+++ xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c	Sat Oct 10 21:50:53 2020
@@ -384,6 +384,42 @@ FindDevice(InputInfoPtr pInfo, const cha
 #define NUMEVENTS 64
 
 static void
+wsconsAutoCalibrate(InputInfoPtr pInfo)
+{
+MouseDevPtr pMse;
+int width, height;
+struct wsmouse_calibcoords cal;
+
+pMse = pInfo->private;
+width = screenInfo.screens[pMse->screenNo]->width;
+height = screenInfo.screens[pMse->screenNo]->height;
+
+if (width != pMse->lastScreenWidth || height != pMse->lastScreenHeight) {
+if (ioctl(pInfo->fd, WSMOUSEIO_GCALIBCOORDS, ) == 0 &&
+cal.minx != cal.maxy && cal.miny != cal.maxy) {
+
+xf86Msg(X_INFO, "%s: auto-calibrating abs pointer for %dx%d screen\n",
+pInfo->name, width, height);
+
+pMse->minX = cal.minx;
+pMse->minY = cal.miny;
+pMse->maxX = cal.maxx;
+pMse->maxY = cal.maxy;
+pMse->translateAbs =
+cal.samplelen == WSMOUSE_CALIBCOORDS_RESET;
+}
+pMse->lastScreenWidth = width;
+pMse->lastScreenHeight = height;
+}
+}
+
+static int
+wsconsTranslate(InputInfoPtr pInfo, int scrRange, int rawMin, int rawMax, int rawVal)
+{
+return ((rawVal - rawMin) * scrRange) / (rawMax - rawMin);
+}
+
+static void
 wsconsReadInput(InputInfoPtr pInfo)
 {
 MouseDevPtr pMse;
@@ -394,6 +430,9 @@ wsconsReadInput(InputInfoPtr pInfo)
 
 pMse = pInfo->private;
 
+if (pMse->autoCalibrate)
+wsconsAutoCalibrate(pInfo);
+
 XisbBlockDuration(pMse->buffer, -1);
 pBuf = (unsigned char *)eventList;
 n = 0;
@@ -434,11 +473,17 @@ wsconsReadInput(InputInfoPtr pInfo)
 #endif
 	case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
 	x = event->value;
+if (pMse->translateAbs)
+x = wsconsTranslate(pInfo, pMse->lastScreenWidth,
+pMse->minX, pMse->maxX, x);
 	xf86PostMotionEvent(pInfo->dev, TRUE, 0, 1, x);
 	++event;
 	continue;
 	case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
 	y = event->value;
+if (pMse->translateAbs)
+y = wsconsTranslate(pInfo, pMse->lastScreenWidth,
+pMse->minY, pMse->maxY, y);
 	xf86PostMotionEvent(pInfo->dev, TRUE, 1, 1, y);
 	++event;
 	continue;
@@ -480,6 +525,19 @@ wsconsPreInit(InputInfoPtr pInfo, const 
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
 pInfo->flags |= XI86_CONFIGURED;
 #endif
+
+pMse->autoCalibrate = xf86SetBoolOption(pInfo->options, "AutoCalibrate", TRUE);
+xf86Msg(X_CONFIG, "%s: auto calibration %sabled\n",
+pInfo->name, pMse->autoCalibrate ? "en" : "dis"); 
+
+pMse->screenNo = xf86SetIntOption(pInfo->options, "ScreenNo", 0);
+if (pMse->screenNo >= screenInfo.numScreens ||
+pMse->screenNo < 0) {
+pMse->screenNo = 0;
+}
+xf86Msg(X_CONFIG, "%s: associated screen: %d\n",
+pInfo->name, pMse->screenNo); 
+
 return TRUE;
 }
 #endif

Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.6 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.7
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.6	Wed Jun  5 07:11:16 2013
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h	Sat Oct 10 21:50:53 2020
@@ -262,6 +262,15 @@ typedef struct _MouseDevRec {
 int doubleClickOldSourceState;
 int lastMappedButtons;
 int buttonMap[MSE_MAXBUTTONS];
+int autoCalibrate;
+int lastScreenWidth;
+int lastScreenHeight;
+int screenNo;
+int minX;
+int minY;
+int maxX;
+int maxY;
+int translateAbs;
 } MouseDevRec, *MouseDevPtr;
 
 #endif /* _XF86OSMOUSE_H_ */

CVS commit: xsrc/external/mit/libpciaccess/dist/src

[Jared D. McNeill]

Module Name:xsrc
Committed By:   jmcneill
Date:   Fri Oct  9 10:48:18 UTC 2020

Modified Files:
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
Oops, avoid shadow declaration (fixes pci_system_netbsd_count_buses)


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.19 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.20
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.19	Thu Oct  8 23:04:34 2020
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Fri Oct  9 10:48:18 2020
@@ -924,7 +924,7 @@ pci_system_netbsd_open_device(int unit)
 static int
 pci_system_netbsd_count_buses(void)
 {
-	int pcifd, nbuses;
+	int pcifd;
 
 	do {
 		pcifd = pci_system_netbsd_open_device(nbuses);

CVS commit: xsrc/external/mit/libpciaccess/dist/src

[Jared D. McNeill]

Module Name:xsrc
Committed By:   jmcneill
Date:   Thu Oct  8 23:04:34 UTC 2020

Modified Files:
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
Fix crash when more than 32 pci(4) devices are attached.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.18 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.19
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.18	Fri Oct 26 11:17:33 2018
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Thu Oct  8 23:04:34 2020
@@ -66,7 +66,7 @@ typedef struct _pcibus {
 	int maxdevs;	/* maximum number of devices */
 } PciBus;
 
-static PciBus buses[32];	/* indexed by pci_device.domain */
+static PciBus *buses = NULL;	/* indexed by pci_device.domain */
 static int nbuses = 0;		/* number of buses found */
 
 /*
@@ -99,7 +99,7 @@ pci_read(int domain, int bus, int dev, i
 {
 	uint32_t rval;
 
-	if ((domain < 0) || (domain > nbuses))
+	if ((domain < 0) || (domain >= nbuses))
 		return -1;
 
 	if (pcibus_conf_read(buses[domain].fd, (unsigned int)bus,
@@ -115,7 +115,7 @@ static int
 pci_write(int domain, int bus, int dev, int func, uint32_t reg, uint32_t val)
 {
 
-	if ((domain < 0) || (domain > nbuses))
+	if ((domain < 0) || (domain >= nbuses))
 		return -1;
 
 	return pcibus_conf_write(buses[domain].fd, (unsigned int)bus,
@@ -127,7 +127,7 @@ pci_nfuncs(int domain, int bus, int dev)
 {
 	uint32_t hdr;
 
-	if ((domain < 0) || (domain > nbuses))
+	if ((domain < 0) || (domain >= nbuses))
 		return -1;
 
 	if (pci_read(domain, bus, dev, 0, PCI_BHLC_REG, ) != 0)
@@ -907,13 +907,42 @@ static const struct pci_system_methods n
 	.has_kernel_driver = pci_device_netbsd_has_kernel_driver,
 };
 
+static int
+pci_system_netbsd_open_device(int unit)
+{
+	char netbsd_devname[32];
+	int pcifd;
+
+	snprintf(netbsd_devname, 32, "/dev/pci%d", unit);
+	pcifd = open(netbsd_devname, O_RDWR | O_CLOEXEC);
+	if (pcifd == -1)
+		pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
+
+	return pcifd;
+}
+
+static int
+pci_system_netbsd_count_buses(void)
+{
+	int pcifd, nbuses;
+
+	do {
+		pcifd = pci_system_netbsd_open_device(nbuses);
+		if (pcifd != -1) {
+			close(pcifd);
+			nbuses++;
+		}
+	} while (pcifd != -1);
+
+	return nbuses;
+}
+
 int
 pci_system_netbsd_create(void)
 {
 	struct pci_device_private *device;
-	int bus, dev, func, ndevs, nfuncs, domain, pcifd;
+	int bus, dev, func, ndevs, nfuncs, domain, pcifd, n;
 	uint32_t reg;
-	char netbsd_devname[32];
 	struct pciio_businfo businfo;
 
 	pci_sys = calloc(1, sizeof(struct pci_system));
@@ -921,19 +950,18 @@ pci_system_netbsd_create(void)
 	pci_sys->methods = _pci_methods;
 
 	ndevs = 0;
-	nbuses = 0;
-	snprintf(netbsd_devname, 32, "/dev/pci%d", nbuses);
-	pcifd = open(netbsd_devname, O_RDWR | O_CLOEXEC);
-	if (pcifd == -1)
-		pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
+	nbuses = pci_system_netbsd_count_buses();
+	if (nbuses > 0)
+		buses = calloc(nbuses, sizeof(PciBus));
+
+	for (n = 0; n < nbuses; n++) {
+		pcifd = pci_system_netbsd_open_device(n);
 
-	while (pcifd > 0) {
 		ioctl(pcifd, PCI_IOC_BUSINFO, );
-		buses[nbuses].fd = pcifd;
-		buses[nbuses].num = bus = businfo.busno;
-		buses[nbuses].maxdevs = businfo.maxdevs;
-		domain = nbuses;
-		nbuses++;
+		buses[n].fd = pcifd;
+		buses[n].num = bus = businfo.busno;
+		buses[n].maxdevs = businfo.maxdevs;
+		domain = n;
 		for (dev = 0; dev < businfo.maxdevs; dev++) {
 			nfuncs = pci_nfuncs(domain, bus, dev);
 			for (func = 0; func < nfuncs; func++) {
@@ -947,10 +975,6 @@ pci_system_netbsd_create(void)
 ndevs++;
 			}
 		}
-		snprintf(netbsd_devname, 32, "/dev/pci%d", nbuses);
-		pcifd = open(netbsd_devname, O_RDWR);
-		if (pcifd == -1)
-			pcifd = open(netbsd_devname, O_RDONLY | O_CLOEXEC);
 	}
 
 	pci_sys->num_devices = ndevs;

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri Oct  2 13:45:07 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Slightly nicer default colors for various X11 apps


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.4 xsrc/external/mit/xdm/dist/config/Xsession.in:1.5
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.4	Fri Oct  2 07:33:47 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Fri Oct  2 13:45:07 2020
@@ -61,6 +61,14 @@ if [ -s "$startup" ]; then
 else
 	if [ -r "$resources" ]; then
 		BINDIR/xrdb -load "$resources"
+	else
+		BINDIR/xrdb -load - <

CVS commit: xsrc/external/mit/xdm/dist/config

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri Oct  2 07:33:47 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in

Log Message:
remove redundant $


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/config/Xsession.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.3 xsrc/external/mit/xdm/dist/config/Xsession.in:1.4
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.3	Tue Sep 22 14:32:03 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Fri Oct  2 07:33:47 2020
@@ -62,6 +62,6 @@ else
 	if [ -r "$resources" ]; then
 		BINDIR/xrdb -load "$resources"
 	fi
-	$BINDIR/uxterm &
+	BINDIR/uxterm &
 	exec BINDIR/ctwm -W
 fi

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Thu Sep 24 05:38:16 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
volume key bindings


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.7 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.8
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.7	Wed Sep 23 15:32:13 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Thu Sep 24 05:38:16 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.7 2020/09/23 15:32:13 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.8 2020/09/24 05:38:16 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -326,6 +326,10 @@ Button3 = mod4	: window 	: f.resize
 "8"  = mod4 : all : f.gotoworkspace "8"
 "9"  = mod4 : all : f.gotoworkspace "9"
 
+"XF86AudioRaiseVolume" = : all : !"mixerctl -w outputs.master+=5"
+"XF86AudioLowerVolume" = : all : !"mixerctl -w outputs.master-=5"
+"XF86AudioMute"= : all : !"mixerctl -w outputs.master=0"
+
 #
 # "Windows" style keyboard shortcuts
 #

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Wed Sep 23 15:32:13 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
enable the ctwm applications menu


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.6 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.7
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.6	Wed Sep 23 07:02:58 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Wed Sep 23 15:32:13 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.6 2020/09/23 07:02:58 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.7 2020/09/23 15:32:13 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -195,15 +195,14 @@ menu "NetBSD"
 " Calculator"		!"xcalc &"
 " Clock"			!"xclock -digital &"
 " XEyes"			!"xeyes &"
-#""f.separator
-#" Applications"		f.menu "appmenu"
+""f.separator
+" Applications"		f.menu "appmenu"
 ""f.separator
 " Restart CTWM"		f.twmrc
 " Quit"			f.quit
 }
 
-# TODO: import and integrate this script
-#syscmd(/usr/X11R7/libexec/ctwm_menu)
+syscmd(/usr/X11R7/libexec/ctwm_app_menu)
 
 menu "titleops"
 {

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Wed Sep 23 07:02:59 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
fix syntax. it only wants the number of columns.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.5 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.6
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.5	Wed Sep 23 07:01:49 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Wed Sep 23 07:02:58 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.5 2020/09/23 07:01:49 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.6 2020/09/23 07:02:58 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -126,7 +126,7 @@ ReverseCurrentWorkspace	
 StartInMapState
 WMgrHorizButtonIndent 0
 WMgrVertButtonIndent  0
-WorkSpaceManagerGeometry  "70x270-4-4" 1 5
+WorkSpaceManagerGeometry  "70x270-4-4" 1
 
 WorkSpaces 
 {

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Wed Sep 23 07:01:49 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
fix syntax. ctwm does not use ,


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.4 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.5
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.4	Tue Sep 22 23:20:59 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Wed Sep 23 07:01:49 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.4 2020/09/22 23:20:59 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.5 2020/09/23 07:01:49 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -118,7 +118,7 @@ IconManagerGeometry   "200x-1-1+0" 1
 IconifyByUnmapping
 
 ReallyMoveInWorkspaceManager
-MapWindowCurrentWorkSpace {  "black", "firebrick" }
+MapWindowCurrentWorkSpace {  "black" "firebrick" }
 DontToggleWorkSpaceManagerState
 DontWarpCursorInWMap
 NoShowOccupyAll	

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 22 23:20:59 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
avoid stippling effect in titlebars


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.3 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.4
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.3	Tue Sep 22 21:28:10 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Tue Sep 22 23:20:59 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.3 2020/09/22 21:28:10 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.4 2020/09/22 23:20:59 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -93,6 +93,8 @@ NoTitleFocus
 WindowRing
 WarpRingOnScreen
 
+NoTitleHighlight
+
 TitleButtonShadowDepth1
 TitleShadowDepth  1
 TitleButtonBorderWidth0

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 22 21:28:10 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
add menu entries for workspace occupation


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.2 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.3
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.2	Tue Sep 22 21:08:56 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Tue Sep 22 21:28:10 2020
@@ -1,5 +1,5 @@
 #
-# $NetBSD: system.ctwmrc,v 1.2 2020/09/22 21:08:56 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.3 2020/09/22 21:28:10 nia Exp $
 #
 # ctwmrc by nia
 #
@@ -211,6 +211,9 @@ menu "titleops"
 " Resize"  f.resize
 " Move"f.move
 "" f.separator
+" Occupy ..."  f.occupy
+" Occupy All"  f.occupyall
+"" f.separator
 " Raise"   f.raise
 " Lower"   f.lower
 "" f.separator

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 22 21:08:56 UTC 2020

Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc

Log Message:
replace default ctwmrc by mine from tech-x11


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/system.ctwmrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.1 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.2
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.1	Thu Sep  3 22:16:33 2015
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc	Tue Sep 22 21:08:56 2020
@@ -1,181 +1,375 @@
 #
-# $XConsortium: system.twmrc,v 1.8 91/04/23 21:10:58 gildea Exp $
+# $NetBSD: system.ctwmrc,v 1.2 2020/09/22 21:08:56 nia Exp $
 #
-# Default twm configuration file; needs to be kept small to conserve string
-# space in systems whose compilers don't handle medium-sized strings.
+# ctwmrc by nia
 #
-# Sites should tailor this file, providing any extra title buttons, menus, etc.
-# that may be appropriate for their environment.  For example, if most of the
-# users were accustomed to uwm, the defaults could be set up not to decorate
-# any windows and to use meta-keys.
+# An attempt to strike a usability balance that makes keys and buttons
+# do the thing users of various operating systems expect them to do.
+#
+# Most things should be possible to accomplish with only the keyboard.
+#
+# Also, mostly inoffensive colours (avoiding potentially inaccessible
+# combinations like red-green).
 #
 
-NoGrabServer
+# don't use the default buttons or key bindings, we define our own
+NoDefaults
+
+ShowWorkSpaceManager
+ShowIconManager
+
+# 3D icon managers do not seemingly honor IconManagerHighlight,
+# which makes them slightly less useful
+#UseThreeDIconManagers
+#UseThreeDWMap
+UseThreeDBorders
+#UseThreeDMenus
+UseThreeDTitles
+
+ThreeDBorderWidth 3
+
+# TODO: we can use syscmd() in combination with xdpyinfo to detect
+# HiDPI screens and set appropiate fonts.
+#
+# need some good scaled bitmap fonts imported - terminus or spleen
+# would be good candidates
+MenuFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+TitleFont"-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
+IconManagerFont  "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+IconFont "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
+ResizeFont   "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*"
+WorkSpaceFont"-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+
 RestartPreviousState
+
 DecorateTransients
-TitleFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
-ResizeFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
-MenuFont	"-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
-IconFont	"-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
-IconManagerFont	"-adobe-helvetica-bold-r-normal--*-100-*-*-*"
-ShowWorkSpaceManager			# start with workspace manager up
-UseThreeDMenus
-UseThreeDTitles
-UseThreeDIconManagers
-UseThreeDBorders
-UseThreeDWMap
-SunkFocusWindowTitle
 
-WorkSpaceManagerGeometry"360x60+60-0" 4
-WorkSpaces {
-"One"   {"#686B9F" "white" "DeepSkyBlue3" "white" "xpm:background8.xpm"}
-"Two"   {"#619AAE" "white" "firebrick" "white" "plaid"}
-"Three" {"#727786" "white" "brown"}
-"Four"  {"#8C5b7A" "white" "MidnightBlue"}
-
-"Five"  {"#727786" "white" "firebrick"}
-"Six"   {"#619AAE" "white" "DeepSkyBlue3"}
-"Seven" {"#8C5b7A" "white" "chartreuse4"}
-"Eight" {"#686B9F" "white" "MidnightBlue"}
+# hide window contents while altering windows for performance
+NoOpaqueMove
+NoOpaqueResize
+
+SloppyFocus
+
+AutoOccupy
+AutoRelativeResize
+
+CenterFeedbackWindow
+
+NoGrabServer
+
+RaiseOnClick
+
+DontMoveOff
+MoveOffResistance	  150
+
+ConstrainedMoveTime   0
+
+IgnoreLockModifier
+
+# Not actually that random.
+# Means that windows do not have to be placed by hand with a mouse,
+# which helps if you are using a keyboard only.
+RandomPlacement  "on"
+
+MoveDelta 3
+ClearShadowContrast   50
+DarkShadowContrast50
+MovePackResistance100
+
+RaiseWhenAutoUnSqueeze
+ShortAllWindowsMenus
+
+#BeNiceToColorMap
+
+NoStackMode
+
+StayUpMenus
+WarpToDefaultMenuEntry
+MenuShadowDepth  1
+
+NoTitleFocus
+
+# warp through all windows in the current workspace
+WindowRing
+WarpRingOnScreen
+
+TitleButtonShadowDepth1
+TitleShadowDepth  1
+TitleButtonBorderWidth0
+TitlePadding  0
+TitleJustification"left"
+ButtonIndent  0
+FramePadding		  0
+
+LeftTitleButton   ":xpm:dot"  = f.menu "titleops"
+RightTitleButton  ":xpm:resize"   = f.resize
+RightTitleButton  ":xpm:cross"= f.delete
+
+BorderWidth   4
+BorderShadowDepth 2
+BorderResizeCursors
+
+MaxIconTitleWidth 120
+NoIconManagerFocus
+IconManagerShadowDepth 

CVS commit: xsrc/external/mit/xsm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 22 16:20:40 UTC 2020

Modified Files:
xsrc/external/mit/xsm/dist: system.xsm

Log Message:
update the default xsm session to ctwm/uxterm


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xsm/dist/system.xsm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xsm/dist/system.xsm
diff -u xsrc/external/mit/xsm/dist/system.xsm:1.1.1.1 xsrc/external/mit/xsm/dist/system.xsm:1.2
--- xsrc/external/mit/xsm/dist/system.xsm:1.1.1.1	Wed Jul 30 04:38:48 2008
+++ xsrc/external/mit/xsm/dist/system.xsm	Tue Sep 22 16:20:39 2020
@@ -1,4 +1,4 @@
-! $Xorg: system.xsm,v 1.3 2000/08/17 19:55:06 cpqbld Exp $
-twm
+! $NetBSD: system.xsm,v 1.2 2020/09/22 16:20:39 nia Exp $
+ctwm
 smproxy
-xterm
+uxterm

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Tue Sep 22 14:32:03 UTC 2020

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
turn off the ctwm "welcome" screen

while this is nice for Branding(tm), it adds a slight delay to startup,
which is slightly annoying, and a departure from how we've done things
previously.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.2 xsrc/external/mit/xdm/dist/config/Xsession.in:1.3
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.2	Tue Sep 22 14:22:54 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Tue Sep 22 14:32:03 2020
@@ -63,5 +63,5 @@ else
 		BINDIR/xrdb -load "$resources"
 	fi
 	$BINDIR/uxterm &
-	exec BINDIR/ctwm
+	exec BINDIR/ctwm -W
 fi

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.5 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.6
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.5	Tue Sep 22 14:20:47 2020
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Tue Sep 22 14:32:03 2020
@@ -49,4 +49,4 @@ if [ -d XINITDIR/xinitrc.d ] ; then
 fi
 
 UXTERM &
-exec CTWM
+exec CTWM -W