From 3904a140da4f2868027c5375289d0e8ee9b34465 Mon Sep 17 00:00:00 2001
From: fredvs <fiens@hotmail.com>
Date: Wed, 20 Mar 2024 22:28:51 +0100
Subject: [PATCH] Fixed ppoll(timeout) for msetimer and added mcairoxlib.pas in
 /kernel/linux.

---
 lib/common/kernel/linux/mcairoxlib.pas | 61 ++++++++++++++++++++++++++
 lib/common/kernel/linux/mseguiintf.pas |  4 +-
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 lib/common/kernel/linux/mcairoxlib.pas

diff --git a/lib/common/kernel/linux/mcairoxlib.pas b/lib/common/kernel/linux/mcairoxlib.pas
new file mode 100644
index 000000000..351c08109
--- /dev/null
+++ b/lib/common/kernel/linux/mcairoxlib.pas
@@ -0,0 +1,61 @@
+unit mCairoXlib;
+{
+    This file is part of the Free Pascal libraries.
+    Copyright (c) 2003-2008 by the Free Pascal development team
+
+    Translation of cairo-ft.h 
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************
+
+ Translation of cairo-xlib.h version 1.4
+ by Jeffrey Pohlmeyer 
+ updated to version 1.4 by Luiz Américo Pereira Câmara 2007
+ 
+ - Translation and addition of cairo-xlib-xrender.h
+ - updated to version 1.12
+ by Valdinilson Lourenço da Cunha 2012
+
+ As per original authors wish, this file is dual licensed LGPL-MPL see the original file
+  cairo.pp for the full license.
+}
+
+{$mode ObjFpc}
+
+interface
+
+uses
+  Cairo, mx, mxlib, mxrender;
+  
+function  cairo_xlib_surface_create(dpy: PDisplay; drawable: TDrawable; visual: PVisual; width, height: LongInt): Pcairo_surface_t; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_create_for_bitmap(dpy: PDisplay; bitmap: TPixmap; screen: PScreen; width, height: LongInt): Pcairo_surface_t; cdecl; external LIB_CAIRO;
+procedure cairo_xlib_surface_set_size(surface: Pcairo_surface_t; width, height: LongInt); cdecl; external LIB_CAIRO;
+procedure cairo_xlib_surface_set_drawable(surface: Pcairo_surface_t; drawable: TDrawable; width, height: LongInt); cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_display(surface: Pcairo_surface_t): PDisplay; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_drawable(surface: Pcairo_surface_t): TDrawable; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_screen(surface: Pcairo_surface_t): PScreen; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_visual(surface: Pcairo_surface_t): PVisual; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_depth(surface: Pcairo_surface_t): LongInt; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_width(surface: Pcairo_surface_t): LongInt; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_height(surface: Pcairo_surface_t): LongInt; cdecl; external LIB_CAIRO;
+
+(* debug interface *)
+
+procedure cairo_xlib_device_debug_cap_xrender_version(device: Pcairo_device_t; major_version, minor_version: LongInt); cdecl; external LIB_CAIRO;
+procedure cairo_xlib_device_debug_set_precision(device: Pcairo_device_t; precision: LongInt); cdecl; external LIB_CAIRO;
+function  cairo_xlib_device_debug_get_precision(device: Pcairo_device_t): LongInt; cdecl; external LIB_CAIRO;
+
+(* xlib render *)
+
+function  cairo_xlib_surface_create_with_xrender_format (dpy: PDisplay; drawable: TDrawable; screen: PScreen; format: PXRenderPictFormat; width, height: LongInt): Pcairo_surface_t; cdecl; external LIB_CAIRO;
+function  cairo_xlib_surface_get_xrender_format(surface: Pcairo_surface_t): PXRenderPictFormat; cdecl; external LIB_CAIRO;
+
+implementation
+
+end.
diff --git a/lib/common/kernel/linux/mseguiintf.pas b/lib/common/kernel/linux/mseguiintf.pas
index 5760f1a91..6843627a9 100644
--- a/lib/common/kernel/linux/mseguiintf.pas
+++ b/lib/common/kernel/linux/mseguiintf.pas
@@ -6183,13 +6183,13 @@ function gui_getevent: tmseevent;
  
 {$ifdef linux} 
   {$ifdef glibc-table} 
-  i1:= ppoll(@pollinfo[0],length(pollinfo),1000);
+  i1:= ppoll(@pollinfo[0],length(pollinfo),timeout1.tv_sec);
  {$else}
   i1:= ppoll(@pollinfo[0],length(pollinfo),@timeout1,@sig1);
  {$endif}
 {$else} 
  {$ifdef darwin} 
-  i1:= ppoll(@pollinfo[0],length(pollinfo),1000);
+  i1:= ppoll(@pollinfo[0],length(pollinfo),timeout1.tv_sec);
  {$else}
   i1:= ppoll(@pollinfo[0],length(pollinfo),@timeout1,@sig1);
  {$endif}