fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 00:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'vfb-verbosity' into 'master'

Browse source 
vfb: allow to set the verbosity with a parameter

See merge request xorg/xserver!315
This commit is contained in:
Ignacio Casal 2025-12-07 11:23:25 +00:00
commit 690f1f6aa0
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
hw/vfb/InitOutput.c
View file

@ -141,6 +141,7 @@ typedef enum { NORMAL_MEMORY_FB, SHARED_MEMORY_FB, MMAPPED_FILE_FB } fbMemType;
static fbMemType fbmemtype = NORMAL_MEMORY_FB;
static char needswap = 0;
static Bool Render = TRUE;
static int verbose = 0;
#define swapcopy16(_dst, _src) \
if (needswap) { CARD16 _s = _src; cpswaps(_s, _dst); } \
@ -295,6 +296,7 @@ ddxInputThreadInit(void)
void
ddxUseMsg(void)
{
ErrorF("-verbose [n] verbose startup messages\n");
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
ErrorF("-pixdepths list-of-int support given pixmap depths\n");
ErrorF("+/-render turn on/off RENDER extension support"
@ -316,6 +318,16 @@ ddxUseMsg(void)
VFB_DEFAULT_NUM_CRTCS);
}
static int
vfbSetVerbosity(int verb)
{
int save = verbose;
verbose = verb;
LogSetParameter(XLOG_VERBOSITY, verb);
return save;
}
int
ddxProcessArgument(int argc, char *argv[], int i)
{
@ -328,6 +340,21 @@ ddxProcessArgument(int argc, char *argv[], int i)
firstTime = FALSE;
}
if (!strcmp(argv[i], "-verbose")) {
if (++i < argc && argv[i]) {
char *end;
long val;
val = strtol(argv[i], &end, 0);
if (*end == '\0') {
vfbSetVerbosity(val);
return 2;
}
}
vfbSetVerbosity(++verbose);
return 1;
}
if (lastScreen == -1)
currentScreen = vfbInitializeScreenInfo(&defaultScreenInfo);
else