Changeset View
Changeset View
Standalone View
Standalone View
main_wayland.cpp
Show First 20 Lines • Show All 744 Lines • ▼ Show 20 Line(s) | 742 | if (hasOutputCountOption) { | |||
---|---|---|---|---|---|
745 | if (ok) { | 745 | if (ok) { | ||
746 | outputCount = qMax(1, count); | 746 | outputCount = qMax(1, count); | ||
747 | } | 747 | } | ||
748 | } | 748 | } | ||
749 | 749 | | |||
750 | if (hasWindowedOption && parser.isSet(windowedOption)) { | 750 | if (hasWindowedOption && parser.isSet(windowedOption)) { | ||
751 | if (hasX11Option && parser.isSet(x11DisplayOption)) { | 751 | if (hasX11Option && parser.isSet(x11DisplayOption)) { | ||
752 | deviceIdentifier = parser.value(x11DisplayOption).toUtf8(); | 752 | deviceIdentifier = parser.value(x11DisplayOption).toUtf8(); | ||
753 | } else if (!(hasWaylandOption && parser.isSet(waylandDisplayOption))) { | | |||
754 | deviceIdentifier = qgetenv("DISPLAY"); | | |||
755 | } | | |||
756 | if (!deviceIdentifier.isEmpty()) { | | |||
757 | pluginName = KWin::s_x11Plugin; | 753 | pluginName = KWin::s_x11Plugin; | ||
758 | } else if (hasWaylandOption) { | 754 | } else if (hasWaylandOption && parser.isSet(waylandDisplayOption)) { | ||
759 | if (parser.isSet(waylandDisplayOption)) { | | |||
760 | deviceIdentifier = parser.value(waylandDisplayOption).toUtf8(); | 755 | deviceIdentifier = parser.value(waylandDisplayOption).toUtf8(); | ||
761 | } else { | | |||
762 | deviceIdentifier = qgetenv("WAYLAND_DISPLAY"); | | |||
763 | } | | |||
764 | if (!deviceIdentifier.isEmpty()) { | | |||
765 | pluginName = KWin::s_waylandPlugin; | 756 | pluginName = KWin::s_waylandPlugin; | ||
766 | } | 757 | } | ||
767 | } | 758 | } | ||
768 | } | | |||
769 | if (hasFramebufferOption && parser.isSet(framebufferOption)) { | 759 | if (hasFramebufferOption && parser.isSet(framebufferOption)) { | ||
770 | pluginName = KWin::s_fbdevPlugin; | 760 | pluginName = KWin::s_fbdevPlugin; | ||
771 | deviceIdentifier = parser.value(framebufferDeviceOption).toUtf8(); | 761 | deviceIdentifier = parser.value(framebufferDeviceOption).toUtf8(); | ||
772 | } | 762 | } | ||
773 | #if HAVE_LIBHYBRIS | 763 | #if HAVE_LIBHYBRIS | ||
774 | if (hasHwcomposerOption && parser.isSet(hwcomposerOption)) { | 764 | if (hasHwcomposerOption && parser.isSet(hwcomposerOption)) { | ||
775 | pluginName = KWin::s_hwcomposerPlugin; | 765 | pluginName = KWin::s_hwcomposerPlugin; | ||
776 | } | 766 | } | ||
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines |