From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 14 Jun 2024 12:56:25 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sI4bY-005t6B-32 for lore@lore.pengutronix.de; Fri, 14 Jun 2024 12:56:25 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sI4bX-0000kK-Nr; Fri, 14 Jun 2024 12:56:23 +0200 Received: from mail-dbaeur03on20601.outbound.protection.outlook.com ([2a01:111:f403:260d::601] helo=EUR03-DBA-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sI39S-0007ZZ-EW; Fri, 14 Jun 2024 11:23:19 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gPe80g9f6o0YFrF5XVhEkJfbgAXPzLuMbwmje2q0eNZTrMlzLXywClL8T7EfoOAcbZ4crcP04AwjGjMoNUEzh8G+wv75PZHiI2KwRnXjP8o/92Kh/kNFQpceViNkfnD+TOyLYDhGEwcTR5WV6R66wBch40w3RWWPrS/dkzs8R955Sze6BbUCANFc9Ow9GQiC34P3Sk4zNdze/BsIByARqytdWsmhEkDQGN0eSU/HltnCwy/fen2ZgEghOZIuyiBFvBnLQmNm0I5h3ONBPi8ZK05pSJlXmgqvM2PQEG9aMvKeUFjxKWl9cDc97o0ZAIDLOPhTVHYrdyZXC8nmRBWEPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9AcDsyrHX5JM+8u5+g2fJ1pKIvII9tAwVu4dzNqdns4=; b=FWZdH+KRbXrV2Xuv/VLzoKD8gL1CbA4zX9KPhjnid7qv8v4bi7yxJf9LPHPLPvzfwc/cqrylY73fE3t+sWdGMbeKEssodahvU4sULamtXlaLtHB3WTutnGJzgHUScJi4bV7RgU8lAe1ZSr9ziJ63hDTW6cTWXDho5FQATGz2qlM8+04IEDbF0QcAy7XkE9UGsWshI+NddD0GpqEfGwXm5Bp3QiBCjMBhv3kBJ5R/v93JMaQ7HhMNTqMXmfd4qU2uQ581qpKezwSXk4uEJVLoqMcFsjq9Tvb5kxNUxtIlWECKksTMNmdNxlOcn3WFRO3RomLFVN/FDvaw5xdMbNJltg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=pengutronix.de smtp.mailfrom=leica-geosystems.com.cn; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=leica-geosystems.com.cn; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com.cn; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9AcDsyrHX5JM+8u5+g2fJ1pKIvII9tAwVu4dzNqdns4=; b=A+lM6y1sa8x3bai5Js0pWb7eJulZDfCGSQy1PvsG+sLN72wUSWDjIkmDHlKUDlzPBpKfQypKXwv0FK3w0XE0bG7ss9MryQump2jcbuANTaQybtbftMxowYseM1CWtGNGXCTrMBEDAA0FsSOMnuaLSdvs6tuhaMLWfiUNGdf5J04= Received: from AS8PR04CA0076.eurprd04.prod.outlook.com (2603:10a6:20b:313::21) by AS5PR06MB8680.eurprd06.prod.outlook.com (2603:10a6:20b:677::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Fri, 14 Jun 2024 09:23:16 +0000 Received: from AMS0EPF000001A1.eurprd05.prod.outlook.com (2603:10a6:20b:313:cafe::92) by AS8PR04CA0076.outlook.office365.com (2603:10a6:20b:313::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.25 via Frontend Transport; Fri, 14 Jun 2024 09:23:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com.cn; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com.cn; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com.cn designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; pr=C Received: from hexagon.com (193.8.40.94) by AMS0EPF000001A1.mail.protection.outlook.com (10.167.16.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Fri, 14 Jun 2024 09:23:16 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Fri, 14 Jun 2024 11:23:13 +0200 From: LI Qingwu To: Qing-wu.Li@leica-geosystems.com.cn, oss-tools@pengutronix.de, m.felsch@pengutronix.de Date: Fri, 14 Jun 2024 11:23:08 +0200 Message-Id: <20240614092308.1429018-4-Qing-wu.Li@leica-geosystems.com.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614092308.1429018-1-Qing-wu.Li@leica-geosystems.com.cn> References: <20240614092308.1429018-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-OriginalArrivalTime: 14 Jun 2024 09:23:13.0531 (UTC) FILETIME=[7B361CB0:01DABE3C] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001A1:EE_|AS5PR06MB8680:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: ed109e73-da19-4847-8499-08dc8c539fa9 X-SET-LOWER-SCL-SCANNER: YES X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230035|1800799019|36860700008|82310400021|376009; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Q5tU/vkFAKfd34qbWaK8QXyPcX+GDVRcpFCcWgVrS1r3jEAHQpbA6a2FScAA?= =?us-ascii?Q?sq7PeGYirgXW1vxiHIKeyG6truBOmN2ikQnr6IF+6YLCApaUg25ZxrDmTSbp?= =?us-ascii?Q?ttaojLxEUDMBPL6tSVELuvG6JPTF1tGWrJ/SGDPwipCw8AdCBzeBz0o4l2gO?= =?us-ascii?Q?R04PpezpuUuokDu9JsMbd87It/9TdzebEfWBP2L7D23WTl0wl3o/8cieHjWW?= =?us-ascii?Q?dDsh30tyn92x39E/dSxUwxGmEvg+P3hFNlEE06NzExvTBhhjfKcqXTGnsoPL?= =?us-ascii?Q?Mww5pP2JI/cSb9j8QaKXn++bIDYcuaAZasCGRTfuqZSstmcuIgKIskJ/MNG5?= =?us-ascii?Q?3Wv6eqlpo5e1YUZxBwPBxBjRjnAmzTRllXPfHb/vnFMdl7A9ljQFLemPj0Fk?= =?us-ascii?Q?R/AMfotVV2zFv1lCvnmw/aBmYF77rca27XeDbQNKmAgzOyS7ldvtlQvHY0bW?= =?us-ascii?Q?M1OKFua9TwDq7NtUpDhK2DYKKdHRXPIoDp8CT5VKut4ydvw7eINkvcZkGlx3?= =?us-ascii?Q?gN4fkkcKUzSDmAtLNKcC7df0KOXDzMnS9I5E+MVJBsYS8xRurkZsM73Tpmv8?= =?us-ascii?Q?D1UtyOx4XgKlK3b+cbWELCAil62DQKIMNO9FTNNXm3mCEl/S0VVnxpsMd5MF?= =?us-ascii?Q?OzslGIfyyxntY1SnDePcNcxyNjPOV9xXfG/N/FMaLyrf78hUQ5rLynw3MNnu?= =?us-ascii?Q?g395/viBeqs8BceP+MWWTInjVeo8IG3sTI1ogZluGdSM6x1Luq03n3To145W?= =?us-ascii?Q?GhklavLcem7XCMnyvzARaOAMQ0yVlQLxOt+Z8VxR7wLyFtNFJyzmySmKL7rL?= =?us-ascii?Q?NJ2SpkfqVYmNwMqTzwo//LTNHUJl1AIwdnNx4wiVJWuvwX8xuvr8X+yNZstA?= =?us-ascii?Q?9bXyTcI2vRYfYO1rItNC0/Gch03w8PehNW3guqhEhI/q1cGXCCGjmMZJt/22?= =?us-ascii?Q?ke6+2g1FcWAnU9/AG4uu+U1k0ssG0Mxn+xcsTo8rfVUECQVnDTxgdQ+keTTC?= =?us-ascii?Q?rNMP+8bfl3FOuPyRewX4YTeNC+et6GOTWMf9aSY5t2dVRFWetAsrAARaBkcY?= =?us-ascii?Q?orWR6NYG5VWNao4gPo44j5YGPEIxRkDZFU9vVpAcQC5jN3npHyywp1Y+1iLY?= =?us-ascii?Q?yhWYctx/RfpcKgSiVLcUj1ZzXj2iRUuMrB72zCJW9NOGKK24q+HG0sSbqJp+?= =?us-ascii?Q?TL5i7b+NQoNCQnd4Sx4vJSGoisTQIL3j2wRnvN9dlmf3EN0iRSG4Vzbmkkyv?= =?us-ascii?Q?CxQiM/WyRRTjXDvXAXcYjWHwoZUHY3GFZDkfNe+ybHPkHaI2famb4mL+JiHJ?= =?us-ascii?Q?NWSfrJWCamhbs/Saty0cTKjNiobM4klAGbNqiRdD8eisxrvPHGr186tjxT+7?= =?us-ascii?Q?w8zo4tHNHzESiNXHJdqvcpx+yKcvM0BdVmqALIjNopFH+lDPOQ=3D=3D?= X-Forefront-Antispam-Report: CIP:193.8.40.94; CTRY:CH; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:hexagon.com; PTR:ahersrvdom50.leica-geosystems.com; CAT:NONE; SFS:(13230035)(1800799019)(36860700008)(82310400021)(376009); DIR:OUT; SFP:1101; X-OriginatorOrg: leica-geosystems.com.cn X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:23:16.7691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed109e73-da19-4847-8499-08dc8c539fa9 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a; Ip=[193.8.40.94]; Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A1.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR06MB8680 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 X-Mailman-Approved-At: Fri, 14 Jun 2024 12:56:20 +0200 Subject: [OSS-Tools] [PATCH platsch V4 4/4] Add spinner executable for boot animation and text show X-BeenThere: oss-tools@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: Pengutronix Public Open-Source-Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "OSS-Tools" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: oss-tools-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false This commit introduces a new executable, spinner, which supports two types of animations for boot sequences: 1 static PNG and text support. 2 rotates square PNG images per frame 3 shows a sequence of square images from a strip of PNG images. Signed-off-by: LI Qingwu --- README.rst | 37 ++++++ meson.build | 24 ++++ meson_options.txt | 1 + spinner.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++ spinner_conf.c | 67 +++++++++++ spinner_conf.h | 33 +++++ 6 files changed, 461 insertions(+) create mode 100644 meson_options.txt create mode 100644 spinner.c create mode 100644 spinner_conf.c create mode 100644 spinner_conf.h diff --git a/README.rst b/README.rst index f1c0812..a0f7f7e 100644 --- a/README.rst +++ b/README.rst @@ -149,3 +149,40 @@ Compiling Instructions meson setup build meson compile -C build + + +Spinner - Splash Screen with Animation +====================================== + +The `spinner` executable is designed to provide boot animations. It supports two types of animations: + +1. **static PNG and text support**: Show a static png image and text. +1. **Square PNG Rotation Animation**: Rotates a square PNG image. +2. **Sequence Move Rectangle Animation**: Displays a sequence of square images from a strip of PNG images. + +spinner Configuration +--------------------- + +The configuration for the `spinner` executable is read from a configuration file, +with a default path of `/usr/share/platsch/spinner.conf`. +The directory of the configuration file can be set via the `platsch_directory` environment variable. + + +spinner Configuration +--------------------- + +Here is a sample of a configuration file (`spinner.conf`): + +.. code-block:: ini + + symbol="/usr/share/platsch/Spinner.png" + fps=20 + text="" + text_x=350 + text_y=400 + text_font="Sans" + text_size=30 + +Set text to empty if you don't want to display any text. +Set the symbol to empty if you don't want to display any animation. +The background image is indicated by ``--directory`` and ``--basename``. diff --git a/meson.build b/meson.build index 4c2ad7b..46413a0 100644 --- a/meson.build +++ b/meson.build @@ -10,3 +10,27 @@ libplatsch = static_library('libplatsch', install: true, include_directories: include_directories('.') ) + +# Create the spinner executable if SPINNER true +if get_option('SPINNER') + spinner_dep = [ + dependency('cairo', required: true), + dependency('libdrm', required: true) + ] + + spinner_src = [ + 'spinner.c', + 'spinner_conf.c' + ] + + args = ['-DSPINNER'] + + executable('spinner', + spinner_src, + dependencies: spinner_dep, + link_with: libplatsch, + c_args: args, + install: true, + include_directories: include_directories('.') + ) +endif diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..d1149fe --- /dev/null +++ b/meson_options.txt @@ -0,0 +1 @@ +option('SPINNER', type: 'boolean', value: false, description: 'Enable spinner build') diff --git a/spinner.c b/spinner.c new file mode 100644 index 0000000..ef9ee6b --- /dev/null +++ b/spinner.c @@ -0,0 +1,299 @@ + +#include +#include +#include + +#include "libplatsch.h" +#include "spinner_conf.h" + +typedef struct spinner { + cairo_format_t fmt; + cairo_surface_t *background_surface; + cairo_surface_t *symbol_surface; + cairo_surface_t *drawing_surface; + cairo_t *cr_background; + cairo_t *cr_drawing; + cairo_t *disp_cr; + int background_height; + int background_width; + int display_height; + int display_width; + int symbol_height; + int symbol_width; + struct modeset_dev *dev; + struct spinner *next; +} spinner_t; + +void on_draw_Sequence_animation(cairo_t *cr, spinner_t *data) +{ + static int current_frame; + int num_frames = data->symbol_width / data->symbol_height; + int frame_width = data->symbol_height; + + cairo_set_source_surface(cr, data->background_surface, 0, 0); + cairo_paint(cr); + + cairo_save(cr); + + cairo_translate(cr, data->display_width / 2, data->display_height / 2); + + cairo_set_source_surface(cr, data->symbol_surface, + -frame_width / 2 - current_frame * frame_width, -frame_width / 2); + + cairo_rectangle(cr, -frame_width / 2, -frame_width / 2, frame_width, frame_width); + cairo_clip(cr); + cairo_paint(cr); + + cairo_restore(cr); + + current_frame = (current_frame + 1) % num_frames; +} + +void on_draw_rotation_animation(cairo_t *cr, spinner_t *data) +{ + static float angle = 0.0; + + cairo_set_source_surface(cr, data->background_surface, 0, 0); + cairo_paint(cr); + cairo_save(cr); + cairo_translate(cr, data->background_width / 2, data->background_height / 2); + cairo_rotate(cr, angle); + cairo_translate(cr, -data->symbol_width / 2, -data->symbol_height / 2); + cairo_set_source_surface(cr, data->symbol_surface, 0, 0); + cairo_paint(cr); + cairo_restore(cr); + angle += 0.1; + if (angle > 2 * M_PI) + angle = 0.0; +} + +static uint32_t convert_to_cairo_format(uint32_t format) +{ + switch (format) { + case DRM_FORMAT_RGB565: + return CAIRO_FORMAT_RGB16_565; + case DRM_FORMAT_XRGB8888: + return CAIRO_FORMAT_ARGB32; + } + return CAIRO_FORMAT_INVALID; +} + +static void cairo_draw_text(cairo_t *cr, Config config) +{ + if (strlen(config.text) > 0) { + cairo_select_font_face(cr, config.text_font, CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size(cr, (double)config.text_size); + cairo_move_to(cr, config.text_x, config.text_y); + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_show_text(cr, config.text); + } +} + +static int cairo_create_display_surface(struct modeset_dev *dev, spinner_t *spinner_node) +{ + cairo_surface_t *disp_surface = cairo_image_surface_create_for_data( + dev->map, convert_to_cairo_format(dev->format->format), dev->width, dev->height, + dev->stride); + if (cairo_surface_status(disp_surface)) { + error("Failed to create cairo surface\n"); + return EXIT_FAILURE; + } + spinner_node->display_width = cairo_image_surface_get_width(disp_surface); + spinner_node->display_height = cairo_image_surface_get_height(disp_surface); + spinner_node->fmt = cairo_image_surface_get_format(disp_surface); + spinner_node->disp_cr = cairo_create(disp_surface); + return EXIT_SUCCESS; +} + +// create a surface and paint background image +static int cairo_create_background_surface(spinner_t *spinner_node, Config config, const char *dir, + const char *base) +{ + char filename[128]; + int ret; + + ret = snprintf(filename, sizeof(filename), "%s/%s.png", dir, base); + if (ret >= sizeof(filename)) { + error("Failed to fit filename into buffer\n"); + return EXIT_FAILURE; + } + + spinner_node->background_surface = cairo_image_surface_create( + spinner_node->fmt, spinner_node->display_width, spinner_node->display_height); + if (cairo_surface_status(spinner_node->background_surface)) { + error("Failed to create background surface\n"); + return EXIT_FAILURE; + } + + cairo_surface_t *bk_img_surface = cairo_image_surface_create_from_png(filename); + + if (cairo_surface_status(bk_img_surface)) { + error("Failed to create cairo surface from %s\n", filename); + return EXIT_FAILURE; + } + + int image_width = cairo_image_surface_get_width(bk_img_surface); + int image_height = cairo_image_surface_get_height(bk_img_surface); + double scale_x = (double)spinner_node->display_width / image_width; + double scale_y = (double)spinner_node->display_height / image_height; + + spinner_node->cr_background = cairo_create(spinner_node->background_surface); + cairo_scale(spinner_node->cr_background, scale_x, scale_y); + cairo_set_source_surface(spinner_node->cr_background, bk_img_surface, 0, 0); + + spinner_node->background_width = + cairo_image_surface_get_width(spinner_node->background_surface); + spinner_node->background_height = + cairo_image_surface_get_height(spinner_node->background_surface); + + cairo_paint(spinner_node->cr_background); + cairo_draw_text(spinner_node->cr_background, config); + return EXIT_SUCCESS; +} + +static int cairo_create_symbol_surface(spinner_t *spinner_node, Config config) +{ + if (strlen(config.symbol) == 0) + return EXIT_FAILURE; + + spinner_node->symbol_surface = cairo_image_surface_create_from_png(config.symbol); + if (cairo_surface_status(spinner_node->symbol_surface)) { + error("Failed loading %s\n", config.symbol); + spinner_node->symbol_surface = NULL; + return EXIT_FAILURE; + } + spinner_node->symbol_width = cairo_image_surface_get_width(spinner_node->symbol_surface); + spinner_node->symbol_height = cairo_image_surface_get_height(spinner_node->symbol_surface); + return EXIT_SUCCESS; +} + +int main(int argc, char *argv[]) +{ + bool pid1 = getpid() == 1; + char filename[128]; + Config config = DEFAULT_CONFIG; + const char *base = "splash"; + const char *dir = "/usr/share/platsch"; + const char *env; + int ret; + long elapsed_time; + + spinner_t *spinner_list = NULL, *spinner_node = NULL, *spinner_iter = NULL; + struct modeset_dev *iter; + struct timeval start, end; + + env = getenv("platsch_directory"); + if (env) + dir = env; + + env = getenv("platsch_basename"); + if (env) + base = env; + + ret = snprintf(filename, sizeof(filename), "%s/spinner.conf", dir); + if (ret >= sizeof(filename)) { + error("Failed to fit filename\n"); + return EXIT_FAILURE; + } + + parseConfig(filename, &config); + + struct modeset_dev *modeset_list = init(); + + if (!modeset_list) { + error("Failed to initialize modeset\n"); + return EXIT_FAILURE; + } + + for (iter = modeset_list; iter; iter = iter->next) { + spinner_node = (spinner_t *)malloc(sizeof(spinner_t)); + if (!spinner_node) { + error("Failed to allocate memory for spinner_node\n"); + return EXIT_FAILURE; + } + memset(spinner_node, 0, sizeof(*spinner_node)); + + if (cairo_create_display_surface(iter, spinner_node)) + return EXIT_FAILURE; + + if (cairo_create_background_surface(spinner_node, config, dir, base)) + return EXIT_FAILURE; + + cairo_create_symbol_surface(spinner_node, config); + + spinner_node->drawing_surface = cairo_image_surface_create( + spinner_node->fmt, spinner_node->display_width, spinner_node->display_height); + if (cairo_surface_status(spinner_node->drawing_surface)) { + error("Failed to create drawing surface\n"); + return EXIT_FAILURE; + } + // create cairo context for drawing surface to avoid frlickering + spinner_node->cr_drawing = cairo_create(spinner_node->drawing_surface); + // draw static image with text as first frame + cairo_set_source_surface(spinner_node->disp_cr, spinner_node->background_surface, 0, + 0); + cairo_paint(spinner_node->disp_cr); + update_display(iter); + + spinner_node->next = spinner_list; + spinner_list = spinner_node; + } + + char **initsargv; + + ret = fork(); + if (ret < 0) + error("failed to fork for init: %m\n"); + else if (ret == 0) + /* + * Always fork to make sure that got the required + * resources for drawing the animation in the child. + */ + goto drawing; + + if (pid1) { + initsargv = calloc(sizeof(argv[0]), argc + 1); + + if (!initsargv) { + error("failed to allocate argv for init\n"); + return EXIT_FAILURE; + } + memcpy(initsargv, argv, argc * sizeof(argv[0])); + initsargv[0] = "/sbin/init"; + initsargv[argc] = NULL; + + execv("/sbin/init", initsargv); + + error("failed to exec init: %m\n"); + + return EXIT_FAILURE; + } + return 0; + +drawing: + while (true) { + gettimeofday(&start, NULL); + for (spinner_iter = spinner_list; spinner_iter; spinner_iter = spinner_iter->next) { + if (spinner_node->symbol_surface == NULL) + usleep(1000000 / config.fps); + if (spinner_node->symbol_width / spinner_node->symbol_height > 2) + on_draw_Sequence_animation(spinner_iter->cr_drawing, spinner_iter); + else + on_draw_rotation_animation(spinner_iter->cr_drawing, spinner_iter); + + cairo_set_source_surface(spinner_iter->disp_cr, + spinner_iter->drawing_surface, 0, 0); + cairo_paint(spinner_iter->disp_cr); + } + gettimeofday(&end, NULL); + elapsed_time = + (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec); + + long sleep_time = (1000000 / config.fps) - elapsed_time; + + if (sleep_time > 0) + usleep(sleep_time); + } + redirect_stdfd(); +} diff --git a/spinner_conf.c b/spinner_conf.c new file mode 100644 index 0000000..491b1c3 --- /dev/null +++ b/spinner_conf.c @@ -0,0 +1,67 @@ +#include "spinner_conf.h" +#include + +int parseConfig(const char *filename, Config *config) +{ + char *value_end; + char *value_start; + char key[MAX_LINE_LENGTH]; + char line[MAX_LINE_LENGTH]; + char value[MAX_LINE_LENGTH]; + FILE *file; + + file = fopen(filename, "r"); + if (file == NULL) { + fprintf(stderr, "Unable to open file: %s\n", filename); + return -EFAULT; + } + + while (fgets(line, sizeof(line), file)) { + if (strlen(line) > MAX_LINE_LENGTH) { + fprintf(stderr, "conf string too long\n"); + continue; + } + if (line[0] != '#' && sscanf(line, "%[^=]=%[^\n]", key, value) == 2) { + value_start = strchr(line, '=') + 1; + value_end = line + strlen(line) - 1; + + while (isspace(*value_start)) + value_start++; + while (isspace(*value_end) || *value_end == '"') + value_end--; + + if (*value_start == '"') + value_start++; + if (*value_end == '"') + value_end--; + + if (value_end < value_start) { + memset(value, 0, sizeof(value)); + continue; + } else { + strncpy(value, value_start, value_end - value_start + 1); + value[value_end - value_start + 1] = '\0'; + value[sizeof(value) - 1] = '\0'; + } + value[MAX_LINE_LENGTH - 1] = '\0'; + + if (strcmp(key, "symbol") == 0) { + strncpy(config->symbol, value, MAX_LINE_LENGTH); + } else if (strcmp(key, "text") == 0) { + strncpy(config->text, value, MAX_LINE_LENGTH); + } else if (strcmp(key, "fps") == 0) { + config->fps = atoi(value); + } else if (strcmp(key, "text_x") == 0) { + config->text_x = atoi(value); + } else if (strcmp(key, "text_y") == 0) { + config->text_y = atoi(value); + } else if (strcmp(key, "text_font") == 0) { + strncpy(config->text_font, value, MAX_LINE_LENGTH); + } else if (strcmp(key, "text_size") == 0) { + config->text_size = atoi(value); + } + } + } + fclose(file); + return 0; +} diff --git a/spinner_conf.h b/spinner_conf.h new file mode 100644 index 0000000..4f8501b --- /dev/null +++ b/spinner_conf.h @@ -0,0 +1,33 @@ +#include +#include +#include +#include + +#ifndef __SPINNER_CONF_H__ +#define __SPINNER_CONF_H__ + + +#define MAX_LINE_LENGTH 128 + +typedef struct { + char symbol[MAX_LINE_LENGTH]; + int fps; + int text_x; + int text_y; + char text_font[MAX_LINE_LENGTH]; + int text_size; + char text[MAX_LINE_LENGTH]; +} Config; + +int parseConfig(const char *filename, Config *config); + +#define DEFAULT_CONFIG { \ + .symbol = "", \ + .fps = 20, \ + .text_x = 0, \ + .text_y = 0, \ + .text_font = "Sans", \ + .text_size = 30, \ + .text = "" \ +} +#endif -- 2.34.1