summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-08-02BSD MakefileHEADobsdMatthieu Herrb
2024-05-19Draw truecolor icons using dual-color half blocksmasterEden Bynever
The vast majority of monospaced fonts are roughly half as wide as they are tall; to account for this when displaying icons, `xprop` draws each pixel twice in the horizontal, which nicely evens out the proportions. This patch utilizes the Lower Half Block character (▄) to obtain the same result in a quarter of the space. By setting both a background and a foreground color, we can draw two pixels per character cell, thereby halving the apparent height of an icon rather than doubling its width. Signed-off-by: Eden Bynever <edenbynever@proton.me> Part-of: <https://gitlab.freedesktop.org/xorg/app/xprop/-/merge_requests/10>
2024-02-03xprop 1.2.7xprop-1.2.7Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-12-07Fix C23 build by renaming variable 'true'Alan Coopersmith
Reported by gcc 13.2 with -std=gnu2x: xprop.c: In function ‘Handle_Question_Mark’: xprop.c:1291:10: error: expected identifier or ‘(’ before ‘true’ 1291 | long true; | ^~~~ xprop.c:1293:49: error: lvalue required as unary ‘&’ operand 1293 | dformat = Scan_Exp(dformat, thunks, format, &true); | ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-03xprop 1.2.6xprop-1.2.6Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-14Variable scope reductions as suggested by cppcheckAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-14Resolve many gcc -Wsign-compare warningsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-14Rename "dpy" function arguments to "display" to avoid shadowing globalAlan Coopersmith
Clears many gcc -Wshadow warnings Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-14Declare help() and print_help() as staticAlan Coopersmith
Resolves gcc -Wmissing-prototypes warnings Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-14Mark help(), usage(), and grammar() with _X_NORETURN _X_COLDAlan Coopersmith
Resolves gcc -Wsuggest-attribute=noreturn warning Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-08gitlab CI: stop requiring Signed-off-by in commitsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-12-07Build xz tarballs instead of bzip2Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-12-07gitlab CI: add a basic build testAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2021-11-28Fix spelling/wording issuesAlan Coopersmith
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2020-11-19xprop 1.2.5xprop-1.2.5Keith Packard
Signed-off-by: Keith Packard <keithp@keithp.com>
2020-11-17Check return value from ioctl(TIOCGWINSZ)Keith Packard
Make sure the function succeeded before looking at the return value. Signed-off-by: Keith Packard <keithp@keithp.com>
2020-11-17Correct icon buffer width computation for truecolor terminalsKeith Packard
Fix the test when computing size necessary for true color output to use 'is_truecolor_term' instead of 'is_utf8_locale'. A non-utf8 locale with a true color terminal would have under-allocated the buffer. Also, check for truecolor first to match the output code. This doesn't fix the fact that this code over-allocates by a factor of two in this case, but that at least won't cause memory corruption. Signed-off-by: Keith Packard <keithp@keithp.com>
2020-11-17Free string list returned from XmbTextPropertyToTextListKeith Packard
Make sure we clean up after this call by using the XFreeStringList function. Signed-off-by: Keith Packard <keithp@keithp.com>
2020-11-17Make output with unknown width terminal the same as old codeKeith Packard
Auto-detecting the terminal width and eliding icons that are too wide is a nice new feature, but we shouldn't change the behaviour when that width is not detectable (e.g., when output to a file). Change the default terminal width from 80 to 144 + 8 to get back to the previous output format. Signed-off-by: Keith Packard <keithp@keithp.com>
2020-11-01Fix formatting of back-to-back not shown icons.Pierre-Loup A. Griffais
Otherwise looks like this: Icon (48 x 48): (not shown) Icon (64 x 64): (not shown) Icon (128 x 128): (not shown)
2020-11-01Support true color output for icons if the terminal advertises it.Pierre-Loup A. Griffais
2020-11-01Fix aspect ratio for icon display by using two characters per icon pixel.Pierre-Loup A. Griffais
2020-11-01Break down memory allocation logic and fix overallocating for UTF8.Pierre-Loup A. Griffais
We need up to 3 bytes per character in UTF8 mode, not 4.
2020-11-01Don't display icons if they would line-wrap.Pierre-Loup A. Griffais
Assuming we can query the terminal width.
2020-04-11Add missing `-help` functionJason Nader
`-help` is mentioned in the manpages, but actually running `xprop -help` results in xprop exiting with status 1 as it doesn't recognise the option. This has been the source of major confusion here: https://github.com/franciscolourenco/done/issues/77#issuecomment-612404448 Signed-off-by: Jason Nader <jason.nader@protonmail.com>
2019-03-09xprop 1.2.4xprop-1.2.4Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-03-03Fix -Wsign-compare warning in dsimple.cAlan Coopersmith
dsimple.c:322:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i=0; i<nchildren; i++) { ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2019-02-09Fix typo in xprop.manpmav99
2018-11-21Update configure.ac bug URL for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-16Update README for gitlab migrationAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-05-05Add missing braces around else clause in Read_Quoted()Alan Coopersmith
Found by gcc 7.3: xprop.c: In function ‘Read_Quoted’: xprop.c:163:8: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] } else ^~~~ xprop.c:164:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ ptr++[0] = c; length--; ^~~~~~ Introduced in initial commit to X Consortium RCS in 1987: https://cgit.freedesktop.org/~alanc/xc-historical/commit/xc/programs/xprop/xprop.c?id=18ea83d7457743936e99a574b50e208f7697f096 Actual effect is minimal - for every \-escaped newline in the DFORMAT portion of a xprop formats file, xprop subtracted one byte too many from the count of bytes still available in the buffer, which could lead it to return an error of "Bad format file format: dformat too long." when there was still room left. Since the original buffer size was 10,000 bytes, and the current size is 500,000 bytes, it's unlikely anyone ever hit this in real usage. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-03-09xprop 1.2.3xprop-1.2.3Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-26autogen: add default patch prefixMihail Konev
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26autogen.sh: use quoted string variablesEmil Velikov
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer
Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2015-09-28Free the data returned by Format_Icons()Eirik Byrkjeflot Anonsen
Signed-off-by: Eirik Byrkjeflot Anonsen <eirik@eirikba.org>
2015-09-28Free the data returned by XGetWindowProperty()Eirik Byrkjeflot Anonsen
Signed-off-by: Eirik Byrkjeflot Anonsen <eirik@eirikba.org>
2015-09-22Free the data returned by XListProperties()Eirik Byrkjeflot Anonsen
Signed-off-by: Eirik Byrkjeflot Anonsen <eirik@eirikba.org>
2015-09-22Free the thunks used by Show_PropEirik Byrkjeflot Anonsen
Signed-off-by: Eirik Byrkjeflot Anonsen <eirik@eirikba.org>
2014-06-03Add -version option to print program versionAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-03Print which option was in error along with usage messageAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-03autogen.sh: Honor NOCONFIGURE=1Alan Coopersmith
See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-03configure: Drop AM_MAINTAINER_MODEAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-08-08xprop 1.2.2xprop-1.2.2Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-19Mark usage() as noreturn, as suggested by gcc -Wmissing-noreturnAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-19Fix const conversion warnings from gccAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-22Add unicode argument to Format_Len_String to reduce code duplicationAlan Coopersmith
Allows us to get rid of a second copy of the code that differed only in the unicode argument passed on to Format_String. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-22Replace strlen/malloc/memcpy set with strdupAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-20Mark FatalError() as taking printf-style argumentsAlan Coopersmith
Silences -Wformat-nonliteral warnings about passing through unknown format arguments to vfprintf. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-20config: Add missing AC_CONFIG_SRCDIRAlan Coopersmith
Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>