Skip to content

dbe.c: remove DISABLE_MI_BY_DEFAULT macro #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −9
Open

dbe.c: remove DISABLE_MI_BY_DEFAULT macro #1420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions dbe/dbe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,8 +1023,8 @@ DbeExtensionInit(void)
return;

DIX_FOR_EACH_SCREEN({
/* For each screen, set up DBE screen privates and init DIX and DDX
* interface.
/* For each screen, set up DBE screen privates and init DIX
* interface (DDX isn't supported anymore).
*/
if (!(pDbeScreenPriv = calloc(1, sizeof(DbeScreenPrivRec)))) {
/* If we can not alloc a window or screen private,
Expand All @@ -1042,9 +1042,6 @@ DbeExtensionInit(void)
dixSetPrivate(&walkScreen->devPrivates, &dbeScreenPrivKeyRec, pDbeScreenPriv);

{
/* We don't have DDX support for DBE anymore */

#ifndef DISABLE_MI_DBE_BY_DEFAULT
Copy link
Contributor

@stefan11111 stefan11111 Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was used for testing purposes, and might still be useful.

Also, if this is what you are concerned about: https://gcc.gnu.org/onlinedocs/cpp/Directives-Within-Macro-Arguments.html , It shouldn't cause any issues.
It's only really a problem if you do hacky stuff with it, like in the gcc example.

Copy link
Contributor

@metux metux Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe I've also posted an PR like this.
IMHO, it's really not needed anymore. (IIRC, historically, there have been DDX'es which disabled MI's DBE stuff and did it on their own)

/* Setup DIX. */
pDbeScreenPriv->SetupBackgroundPainter = DbeSetupBackgroundPainter;

Expand All @@ -1066,10 +1063,6 @@ DbeExtensionInit(void)
/* DDX initialization failed. Stub the screen. */
DbeStubScreen(pDbeScreenPriv, &nStubbedScreens);
}
#else
DbeStubScreen(pDbeScreenPriv, &nStubbedScreens);
#endif

}
});

Expand Down