Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ltris2 for openSUSE:Factory checked in at 2024-12-02 16:58:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ltris2 (Old) and /work/SRC/openSUSE:Factory/.ltris2.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ltris2" Mon Dec 2 16:58:52 2024 rev:3 rq:1227573 version:2.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ltris2/ltris2.changes 2024-10-13 17:34:26.472141451 +0200 +++ /work/SRC/openSUSE:Factory/.ltris2.new.28523/ltris2.changes 2024-12-02 16:59:08.601223818 +0100 @@ -1,0 +2,10 @@ +Sat Nov 30 13:45:24 UTC 2024 - Martin Hauke <mar...@gmx.de> + +- Update to version 2.0.3 + * added three different window modes: 66%, 50% and 25% of screen + height to allow more choice with all the different resolutions + and monitor sizes. + The previous window mode was 66% and could be quite large on + bigger 4k monitors. + +------------------------------------------------------------------- Old: ---- ltris2-2.0.2.tar.gz New: ---- ltris2-2.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ltris2.spec ++++++ --- /var/tmp/diff_new_pack.kuOET1/_old 2024-12-02 16:59:09.225250001 +0100 +++ /var/tmp/diff_new_pack.kuOET1/_new 2024-12-02 16:59:09.225250001 +0100 @@ -17,7 +17,7 @@ Name: ltris2 -Version: 2.0.2 +Version: 2.0.3 Release: 0 Summary: Tetris Clone with Multiplayer and CPU Opponents License: GPL-3.0-or-later ++++++ ltris2-2.0.2.tar.gz -> ltris2-2.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/Changelog new/ltris2-2.0.3/Changelog --- old/ltris2-2.0.2/Changelog 2024-10-12 11:11:03.000000000 +0200 +++ new/ltris2-2.0.3/Changelog 2024-11-24 17:46:10.000000000 +0100 @@ -1,3 +1,6 @@ +2.0.3: +- added different window modes (2024/11/22 MS) + 2.0.2: - apply autoshift changes to current game (2024/10/07 MS) - added custom cursor and hide it while playing (2024/10/05 MS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/configure new/ltris2-2.0.3/configure --- old/ltris2-2.0.2/configure 2024-10-12 11:11:32.000000000 +0200 +++ new/ltris2-2.0.3/configure 2024-11-24 17:46:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ltris2 2.0.2. +# Generated by GNU Autoconf 2.71 for ltris2 2.0.3. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ # Identity of this package. PACKAGE_NAME='ltris2' PACKAGE_TARNAME='ltris2' -PACKAGE_VERSION='2.0.2' -PACKAGE_STRING='ltris2 2.0.2' +PACKAGE_VERSION='2.0.3' +PACKAGE_STRING='ltris2 2.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1351,7 +1351,7 @@ # 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 ltris2 2.0.2 to adapt to many kinds of systems. +\`configure' configures ltris2 2.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1422,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ltris2 2.0.2:";; + short | recursive ) echo "Configuration of ltris2 2.0.3:";; esac cat <<\_ACEOF @@ -1530,7 +1530,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ltris2 configure 2.0.2 +ltris2 configure 2.0.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1925,7 +1925,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ltris2 $as_me 2.0.2, which was +It was created by ltris2 $as_me 2.0.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3416,7 +3416,7 @@ # Define the identity of the package. PACKAGE='ltris2' - VERSION='2.0.2' + VERSION='2.0.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -10924,7 +10924,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ltris2 $as_me 2.0.2, which was +This file was extended by ltris2 $as_me 2.0.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10992,7 +10992,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ltris2 config.status 2.0.2 +ltris2 config.status 2.0.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/configure.ac new/ltris2-2.0.3/configure.ac --- old/ltris2-2.0.2/configure.ac 2024-10-12 11:11:25.000000000 +0200 +++ new/ltris2-2.0.3/configure.ac 2024-11-24 17:46:42.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.71]) -AC_INIT([ltris2],[2.0.2]) +AC_INIT([ltris2],[2.0.3]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/po/de.po new/ltris2-2.0.3/po/de.po --- old/ltris2-2.0.2/po/de.po 2024-10-12 11:11:34.000000000 +0200 +++ new/ltris2-2.0.3/po/de.po 2024-11-24 17:46:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ltris2 2.0\n" "Report-Msgid-Bugs-To: kulka...@gmx.net\n" -"POT-Creation-Date: 2024-10-12 11:11+0200\n" +"POT-Creation-Date: 2024-11-24 17:46+0100\n" "PO-Revision-Date: 2024-07-13 11:10+0200\n" "Last-Translator: Michael <kulka...@gmx.net>\n" "Language-Team: German <translation-team...@lists.sourceforge.net>\n" @@ -34,7 +34,7 @@ msgid "Enter Name" msgstr "" -#: src/view.cpp:46 src/view.cpp:388 +#: src/view.cpp:46 src/view.cpp:401 msgid "Normal" msgstr "" @@ -58,27 +58,43 @@ msgid "(Re)" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "50 FPS" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "60 FPS" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "200 FPS" msgstr "" -#: src/view.cpp:388 +#: src/view.cpp:401 msgid "Defensive" msgstr "" -#: src/view.cpp:388 +#: src/view.cpp:401 msgid "Aggressive" msgstr "" -#: src/view.cpp:391 +#: src/view.cpp:402 +msgid "Fullscreen" +msgstr "" + +#: src/view.cpp:403 +msgid "Small Window" +msgstr "" + +#: src/view.cpp:403 +msgid "Medium Window" +msgstr "" + +#: src/view.cpp:403 +msgid "Large Window" +msgstr "" + +#: src/view.cpp:407 msgid "" "This is your starting level which will be ignored for mode 'Figures' (always " "starts at level 0).\n" @@ -87,7 +103,7 @@ "(the higher the starting level the more lines)." msgstr "" -#: src/view.cpp:395 +#: src/view.cpp:411 msgid "" "Normal: Starts with an empty bowl. Try to survive as long as possible.\n" "\n" @@ -97,7 +113,7 @@ "Vs Human/CPU/2xCPU: Play against another human or one or two CPU opponents." msgstr "" -#: src/view.cpp:398 +#: src/view.cpp:414 msgid "" "Modern: Enables all that stuff that makes tetris casual like ghost piece, " "wall-kicks, hold, DAS charge during ARE (allows to shift next piece faster), " @@ -107,79 +123,79 @@ "very interesting." msgstr "" -#: src/view.cpp:416 src/view.cpp:529 +#: src/view.cpp:432 src/view.cpp:545 msgid "New Game" msgstr "" -#: src/view.cpp:417 src/view.cpp:439 +#: src/view.cpp:433 src/view.cpp:455 msgid "Multiplayer Options" msgstr "" -#: src/view.cpp:418 src/view.cpp:531 +#: src/view.cpp:434 src/view.cpp:547 msgid "Controls" msgstr "" -#: src/view.cpp:419 src/view.cpp:428 src/view.cpp:464 +#: src/view.cpp:435 src/view.cpp:444 src/view.cpp:480 msgid "Player 1" msgstr "" -#: src/view.cpp:420 src/view.cpp:429 src/view.cpp:465 +#: src/view.cpp:436 src/view.cpp:445 src/view.cpp:481 msgid "Player 2" msgstr "" -#: src/view.cpp:421 src/view.cpp:533 +#: src/view.cpp:437 src/view.cpp:549 msgid "Audio" msgstr "" -#: src/view.cpp:422 src/view.cpp:532 +#: src/view.cpp:438 src/view.cpp:548 msgid "Graphics" msgstr "" -#: src/view.cpp:426 +#: src/view.cpp:442 msgid "Start Game" msgstr "" -#: src/view.cpp:432 +#: src/view.cpp:448 msgid "Game Mode" msgstr "" -#: src/view.cpp:434 +#: src/view.cpp:450 msgid "Game Style" msgstr "" -#: src/view.cpp:435 +#: src/view.cpp:451 msgid "Classic" msgstr "" -#: src/view.cpp:435 +#: src/view.cpp:451 msgid "Modern" msgstr "" -#: src/view.cpp:436 +#: src/view.cpp:452 msgid "Starting Level" msgstr "" -#: src/view.cpp:444 +#: src/view.cpp:460 msgid "Holes" msgstr "" -#: src/view.cpp:445 +#: src/view.cpp:461 msgid "Number of holes in sent lines." msgstr "" -#: src/view.cpp:447 +#: src/view.cpp:463 msgid "Random Holes" msgstr "" -#: src/view.cpp:448 +#: src/view.cpp:464 msgid "If multiple lines are sent, each line has different holes." msgstr "" -#: src/view.cpp:451 +#: src/view.cpp:467 msgid "CPU Style" msgstr "" -#: src/view.cpp:452 +#: src/view.cpp:468 msgid "" "Defensive: Clears any lines.\n" "Normal: Mostly goes for two lines.\n" @@ -189,31 +205,31 @@ "completing multiple lines at the expense of a balanced bowl contents." msgstr "" -#: src/view.cpp:454 +#: src/view.cpp:470 msgid "CPU Drop Delay" msgstr "" -#: src/view.cpp:457 +#: src/view.cpp:473 msgid "CPU Speed" msgstr "" -#: src/view.cpp:467 +#: src/view.cpp:483 msgid "Auto-Shift Delay" msgstr "" -#: src/view.cpp:468 +#: src/view.cpp:484 msgid "Initial delay before auto shift starts. Classic DAS has 270." msgstr "" -#: src/view.cpp:470 +#: src/view.cpp:486 msgid "Auto-Shift Speed" msgstr "" -#: src/view.cpp:471 +#: src/view.cpp:487 msgid "Delay between auto shift steps. Classic DAS has 100." msgstr "" -#: src/view.cpp:478 +#: src/view.cpp:494 msgid "" "Left/Right: horizontal movement\n" "Rotate Left/Right: piece rotation\n" @@ -222,122 +238,114 @@ "Hold: put current piece to hold (only for modern style)" msgstr "" -#: src/view.cpp:483 +#: src/view.cpp:499 msgid "Left" msgstr "" -#: src/view.cpp:484 +#: src/view.cpp:500 msgid "Right" msgstr "" -#: src/view.cpp:485 +#: src/view.cpp:501 msgid "Rotate Left" msgstr "" -#: src/view.cpp:486 +#: src/view.cpp:502 msgid "Rotate Right" msgstr "" -#: src/view.cpp:487 +#: src/view.cpp:503 msgid "Down" msgstr "" -#: src/view.cpp:488 +#: src/view.cpp:504 msgid "Drop" msgstr "" -#: src/view.cpp:489 src/vgame.cpp:481 +#: src/view.cpp:505 src/vgame.cpp:481 msgid "Hold" msgstr "" -#: src/view.cpp:495 +#: src/view.cpp:511 msgid "Theme" msgstr "" -#: src/view.cpp:496 +#: src/view.cpp:512 msgid "Select theme. (not applied yet)" msgstr "" -#: src/view.cpp:498 +#: src/view.cpp:514 msgid "Mode" msgstr "" -#: src/view.cpp:499 +#: src/view.cpp:515 msgid "Select mode. (not applied yet)" msgstr "" -#: src/view.cpp:500 -msgid "Window" -msgstr "" - -#: src/view.cpp:500 -msgid "Fullscreen" -msgstr "" - -#: src/view.cpp:501 +#: src/view.cpp:517 msgid "Apply Theme&Mode" msgstr "" -#: src/view.cpp:502 +#: src/view.cpp:518 msgid "Apply the above settings." msgstr "" -#: src/view.cpp:504 +#: src/view.cpp:520 msgid "Animations" msgstr "" -#: src/view.cpp:506 +#: src/view.cpp:522 msgid "Smooth Drop" msgstr "" -#: src/view.cpp:507 +#: src/view.cpp:523 msgid "Drop piece block-by-block or smoothly. Does not affect drop speed." msgstr "" -#: src/view.cpp:509 +#: src/view.cpp:525 msgid "Frame Limit" msgstr "" -#: src/view.cpp:515 +#: src/view.cpp:531 msgid "Sound" msgstr "" -#: src/view.cpp:516 +#: src/view.cpp:532 msgid "Volume" msgstr "" -#: src/view.cpp:518 +#: src/view.cpp:534 msgid "Buffer Size" msgstr "" -#: src/view.cpp:519 +#: src/view.cpp:535 msgid "" "Reduce buffer size if you experience sound delays. Might have more CPU " "impact though. (not applied yet)" msgstr "" -#: src/view.cpp:521 +#: src/view.cpp:537 msgid "Channels" msgstr "" -#: src/view.cpp:522 +#: src/view.cpp:538 msgid "" "More channels gives more sound variety, less channels less (not applied yet)" msgstr "" -#: src/view.cpp:524 +#: src/view.cpp:540 msgid "Apply Size&Channels" msgstr "" -#: src/view.cpp:525 +#: src/view.cpp:541 msgid "Apply above settings" msgstr "" -#: src/view.cpp:535 +#: src/view.cpp:551 msgid "Quit" msgstr "" -#: src/view.cpp:878 +#: src/view.cpp:894 msgid "Hiscores" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/po/ltris2.pot new/ltris2-2.0.3/po/ltris2.pot --- old/ltris2-2.0.2/po/ltris2.pot 2024-10-12 11:11:34.000000000 +0200 +++ new/ltris2-2.0.3/po/ltris2.pot 2024-11-24 17:46:51.000000000 +0100 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ltris2 2.0.2\n" +"Project-Id-Version: ltris2 2.0.3\n" "Report-Msgid-Bugs-To: kulka...@gmx.net\n" -"POT-Creation-Date: 2024-10-12 11:11+0200\n" +"POT-Creation-Date: 2024-11-24 17:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -33,7 +33,7 @@ msgid "Enter Name" msgstr "" -#: src/view.cpp:46 src/view.cpp:388 +#: src/view.cpp:46 src/view.cpp:401 msgid "Normal" msgstr "" @@ -57,27 +57,43 @@ msgid "(Re)" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "50 FPS" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "60 FPS" msgstr "" -#: src/view.cpp:385 +#: src/view.cpp:398 msgid "200 FPS" msgstr "" -#: src/view.cpp:388 +#: src/view.cpp:401 msgid "Defensive" msgstr "" -#: src/view.cpp:388 +#: src/view.cpp:401 msgid "Aggressive" msgstr "" -#: src/view.cpp:391 +#: src/view.cpp:402 +msgid "Fullscreen" +msgstr "" + +#: src/view.cpp:403 +msgid "Small Window" +msgstr "" + +#: src/view.cpp:403 +msgid "Medium Window" +msgstr "" + +#: src/view.cpp:403 +msgid "Large Window" +msgstr "" + +#: src/view.cpp:407 msgid "" "This is your starting level which will be ignored for mode 'Figures' (always " "starts at level 0).\n" @@ -86,7 +102,7 @@ "(the higher the starting level the more lines)." msgstr "" -#: src/view.cpp:395 +#: src/view.cpp:411 msgid "" "Normal: Starts with an empty bowl. Try to survive as long as possible.\n" "\n" @@ -96,7 +112,7 @@ "Vs Human/CPU/2xCPU: Play against another human or one or two CPU opponents." msgstr "" -#: src/view.cpp:398 +#: src/view.cpp:414 msgid "" "Modern: Enables all that stuff that makes tetris casual like ghost piece, " "wall-kicks, hold, DAS charge during ARE (allows to shift next piece faster), " @@ -106,79 +122,79 @@ "very interesting." msgstr "" -#: src/view.cpp:416 src/view.cpp:529 +#: src/view.cpp:432 src/view.cpp:545 msgid "New Game" msgstr "" -#: src/view.cpp:417 src/view.cpp:439 +#: src/view.cpp:433 src/view.cpp:455 msgid "Multiplayer Options" msgstr "" -#: src/view.cpp:418 src/view.cpp:531 +#: src/view.cpp:434 src/view.cpp:547 msgid "Controls" msgstr "" -#: src/view.cpp:419 src/view.cpp:428 src/view.cpp:464 +#: src/view.cpp:435 src/view.cpp:444 src/view.cpp:480 msgid "Player 1" msgstr "" -#: src/view.cpp:420 src/view.cpp:429 src/view.cpp:465 +#: src/view.cpp:436 src/view.cpp:445 src/view.cpp:481 msgid "Player 2" msgstr "" -#: src/view.cpp:421 src/view.cpp:533 +#: src/view.cpp:437 src/view.cpp:549 msgid "Audio" msgstr "" -#: src/view.cpp:422 src/view.cpp:532 +#: src/view.cpp:438 src/view.cpp:548 msgid "Graphics" msgstr "" -#: src/view.cpp:426 +#: src/view.cpp:442 msgid "Start Game" msgstr "" -#: src/view.cpp:432 +#: src/view.cpp:448 msgid "Game Mode" msgstr "" -#: src/view.cpp:434 +#: src/view.cpp:450 msgid "Game Style" msgstr "" -#: src/view.cpp:435 +#: src/view.cpp:451 msgid "Classic" msgstr "" -#: src/view.cpp:435 +#: src/view.cpp:451 msgid "Modern" msgstr "" -#: src/view.cpp:436 +#: src/view.cpp:452 msgid "Starting Level" msgstr "" -#: src/view.cpp:444 +#: src/view.cpp:460 msgid "Holes" msgstr "" -#: src/view.cpp:445 +#: src/view.cpp:461 msgid "Number of holes in sent lines." msgstr "" -#: src/view.cpp:447 +#: src/view.cpp:463 msgid "Random Holes" msgstr "" -#: src/view.cpp:448 +#: src/view.cpp:464 msgid "If multiple lines are sent, each line has different holes." msgstr "" -#: src/view.cpp:451 +#: src/view.cpp:467 msgid "CPU Style" msgstr "" -#: src/view.cpp:452 +#: src/view.cpp:468 msgid "" "Defensive: Clears any lines.\n" "Normal: Mostly goes for two lines.\n" @@ -188,31 +204,31 @@ "completing multiple lines at the expense of a balanced bowl contents." msgstr "" -#: src/view.cpp:454 +#: src/view.cpp:470 msgid "CPU Drop Delay" msgstr "" -#: src/view.cpp:457 +#: src/view.cpp:473 msgid "CPU Speed" msgstr "" -#: src/view.cpp:467 +#: src/view.cpp:483 msgid "Auto-Shift Delay" msgstr "" -#: src/view.cpp:468 +#: src/view.cpp:484 msgid "Initial delay before auto shift starts. Classic DAS has 270." msgstr "" -#: src/view.cpp:470 +#: src/view.cpp:486 msgid "Auto-Shift Speed" msgstr "" -#: src/view.cpp:471 +#: src/view.cpp:487 msgid "Delay between auto shift steps. Classic DAS has 100." msgstr "" -#: src/view.cpp:478 +#: src/view.cpp:494 msgid "" "Left/Right: horizontal movement\n" "Rotate Left/Right: piece rotation\n" @@ -221,122 +237,114 @@ "Hold: put current piece to hold (only for modern style)" msgstr "" -#: src/view.cpp:483 +#: src/view.cpp:499 msgid "Left" msgstr "" -#: src/view.cpp:484 +#: src/view.cpp:500 msgid "Right" msgstr "" -#: src/view.cpp:485 +#: src/view.cpp:501 msgid "Rotate Left" msgstr "" -#: src/view.cpp:486 +#: src/view.cpp:502 msgid "Rotate Right" msgstr "" -#: src/view.cpp:487 +#: src/view.cpp:503 msgid "Down" msgstr "" -#: src/view.cpp:488 +#: src/view.cpp:504 msgid "Drop" msgstr "" -#: src/view.cpp:489 src/vgame.cpp:481 +#: src/view.cpp:505 src/vgame.cpp:481 msgid "Hold" msgstr "" -#: src/view.cpp:495 +#: src/view.cpp:511 msgid "Theme" msgstr "" -#: src/view.cpp:496 +#: src/view.cpp:512 msgid "Select theme. (not applied yet)" msgstr "" -#: src/view.cpp:498 +#: src/view.cpp:514 msgid "Mode" msgstr "" -#: src/view.cpp:499 +#: src/view.cpp:515 msgid "Select mode. (not applied yet)" msgstr "" -#: src/view.cpp:500 -msgid "Window" -msgstr "" - -#: src/view.cpp:500 -msgid "Fullscreen" -msgstr "" - -#: src/view.cpp:501 +#: src/view.cpp:517 msgid "Apply Theme&Mode" msgstr "" -#: src/view.cpp:502 +#: src/view.cpp:518 msgid "Apply the above settings." msgstr "" -#: src/view.cpp:504 +#: src/view.cpp:520 msgid "Animations" msgstr "" -#: src/view.cpp:506 +#: src/view.cpp:522 msgid "Smooth Drop" msgstr "" -#: src/view.cpp:507 +#: src/view.cpp:523 msgid "Drop piece block-by-block or smoothly. Does not affect drop speed." msgstr "" -#: src/view.cpp:509 +#: src/view.cpp:525 msgid "Frame Limit" msgstr "" -#: src/view.cpp:515 +#: src/view.cpp:531 msgid "Sound" msgstr "" -#: src/view.cpp:516 +#: src/view.cpp:532 msgid "Volume" msgstr "" -#: src/view.cpp:518 +#: src/view.cpp:534 msgid "Buffer Size" msgstr "" -#: src/view.cpp:519 +#: src/view.cpp:535 msgid "" "Reduce buffer size if you experience sound delays. Might have more CPU " "impact though. (not applied yet)" msgstr "" -#: src/view.cpp:521 +#: src/view.cpp:537 msgid "Channels" msgstr "" -#: src/view.cpp:522 +#: src/view.cpp:538 msgid "" "More channels gives more sound variety, less channels less (not applied yet)" msgstr "" -#: src/view.cpp:524 +#: src/view.cpp:540 msgid "Apply Size&Channels" msgstr "" -#: src/view.cpp:525 +#: src/view.cpp:541 msgid "Apply above settings" msgstr "" -#: src/view.cpp:535 +#: src/view.cpp:551 msgid "Quit" msgstr "" -#: src/view.cpp:878 +#: src/view.cpp:894 msgid "Hiscores" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/src/vconfig.cpp new/ltris2-2.0.3/src/vconfig.cpp --- old/ltris2-2.0.2/src/vconfig.cpp 2024-10-05 19:01:55.000000000 +0200 +++ new/ltris2-2.0.3/src/vconfig.cpp 2024-11-23 12:58:29.000000000 +0100 @@ -78,7 +78,7 @@ /* graphics */ animations = 1; - fullscreen = 1; + windowmode = WM_FULLSCREEN; fps = 1; showfps = 0; smoothdrop = 1; @@ -145,7 +145,7 @@ fp.get("channels", channels); fp.get("animations", animations); - fp.get("fullscreen", fullscreen); + fp.get("windowmode", windowmode); fp.get("fps", fps); fp.get("showfps", showfps); fp.get("smoothdrop", smoothdrop); @@ -204,7 +204,7 @@ ofs << "channels=" << channels << "\n"; ofs << "animations=" << animations << "\n"; - ofs << "fullscreen=" << fullscreen << "\n"; + ofs << "windowmode=" << windowmode << "\n"; ofs << "fps=" << fps << "\n"; ofs << "showfps=" << showfps << "\n"; ofs << "smoothdrop=" << smoothdrop << "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/src/vconfig.h new/ltris2-2.0.3/src/vconfig.h --- old/ltris2-2.0.2/src/vconfig.h 2024-10-05 19:01:23.000000000 +0200 +++ new/ltris2-2.0.3/src/vconfig.h 2024-11-23 12:58:29.000000000 +0100 @@ -29,7 +29,12 @@ GT_VSHUMAN, GT_VSCPU, GT_VSCPU2, - GT_NUM + GT_NUM, + + WM_FULLSCREEN = 0, + WM_SMALL, + WM_MEDIUM, + WM_LARGE }; typedef struct { @@ -84,7 +89,7 @@ /* graphics */ int animations; - int fullscreen; /* 0 = window, 1 = fullscreen */ + int windowmode; /* 0 = fullscreen, see WM_* above */ int fps; /* frames per second: 0 - no limit, 1 - 100, 2 - 200 */ int showfps; int smoothdrop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ltris2-2.0.2/src/view.cpp new/ltris2-2.0.3/src/view.cpp --- old/ltris2-2.0.2/src/view.cpp 2024-10-07 19:59:00.000000000 +0200 +++ new/ltris2-2.0.3/src/view.cpp 2024-11-23 12:58:29.000000000 +0100 @@ -63,32 +63,45 @@ printf(" In case connection to gamepad gets lost, you can press F5 to reconnect.\n"); } - init(themeNames[vconfig.themeid], vconfig.fullscreen); + init(themeNames[vconfig.themeid], vconfig.windowmode); } /** (Re)Initialize window, theme and menu. - * t is theme name, f is fullscreen. */ -void View::init(string t, uint f, bool reinit) + * t is theme name, wmode is window mode. */ +void View::init(string t, uint wmode, bool reinit) { - _loginfo("%sInitializing view (theme=%s, fullscreen=%d)\n", - reinit?_("(Re)"):"",t.c_str(),f); + _loginfo("%sInitializing view (theme=%s, windowmode=%d)\n", + reinit?_("(Re)"):"",t.c_str(),wmode); /* determine resolution */ int idx = renderer.getDisplayId(); int sw = 640, sh = 480; SDL_DisplayMode mode; SDL_GetCurrentDisplayMode(idx,&mode); - if (f) { + switch (wmode) { + case WM_FULLSCREEN: sw = mode.w; sh = mode.h; - } else { - /* window is half screen's width and 4:3 */ - sw = mode.w / 2; - sh = 3 * sw / 4; + break; + case WM_SMALL: + sh = mode.h / 4; + break; + case WM_MEDIUM: + sh = mode.h / 2; + break; + case WM_LARGE: + sh = mode.h * 2 / 3; + break; + } + if (wmode != WM_FULLSCREEN) { + /* finalize window resolution */ + if (sh < 360) + sh = 360; + sw = sh / 3 * 4; } /* (re)create main window */ - renderer.create("LTris2", sw, sh, f ); + renderer.create("LTris2", sw, sh, wmode == WM_FULLSCREEN); /* load theme */ theme.load(t, renderer); @@ -386,6 +399,9 @@ const int bufSizes[] = { 256, 512, 1024, 2048, 4096 }; const int channelNums[] = { 8, 16, 32 }; const char *cpuStyleNames[] = {_("Defensive"), _("Normal"), _("Aggressive")}; + const char *windowModeNames[] = { _("Fullscreen"), + _("Small Window"), _("Medium Window"), _("Large Window") + }; /* longer hints */ string hStartingLevel = _("This is your starting level which will be ignored " \ @@ -497,7 +513,7 @@ AID_NONE,vconfig.themeid,themeNames)); mGraphics->add(new MenuItemList(_("Mode"), _("Select mode. (not applied yet)"), - AID_NONE,vconfig.fullscreen,_("Window"),_("Fullscreen"))); + AID_NONE,vconfig.windowmode,windowModeNames,4)); mGraphics->add(new MenuItem(_("Apply Theme&Mode"), _("Apply the above settings."),AID_APPLYTHEMEMODE)); mGraphics->add(new MenuItemSep()); @@ -724,7 +740,7 @@ * loop otherwise left mouse button event is * screwed for the first click*/ waitForInputRelease(); - init(themeNames[vconfig.themeid],vconfig.fullscreen,true); + init(themeNames[vconfig.themeid],vconfig.windowmode,true); curMenu = graphicsMenu; break; case AID_HELP: