Attachment #839559 for bug #884221

View | Details | Raw Unified | Return to bug 884221
Collapse All | Expand All




    KdKeyboardInfo *ki;
    KdPointerInfo *pi;

    KdAddKeyboardDriver(&EphyrKeyboardDriver);
    KdAddPointerDriver(&EphyrMouseDriver);

    if (!kdHasKbd) {
        ki = KdNewKeyboard();
        if (!ki)
            FatalError("Couldn't create Xephyr keyboard\n");
        ki->driver = &EphyrKeyboardDriver;
        KdAddKeyboard(ki);
    }
        }

    if (!kdHasPointer) {
        pi = KdNewPointer();
        if (!pi)
            FatalError("Couldn't create Xephyr pointer\n");
        pi->driver = &EphyrMouseDriver;
        KdAddPointer(pi);
        }
    }

    KdInitInput();

Return to bug 884221

Lines 70-94 InitInput(int argc, char **argv) Link Here

(-)a/hw/kdrive/ephyr/ephyrinit.c (-18 / +16 lines)
70	KdKeyboardInfo *ki;	70	KdKeyboardInfo *ki;
71	KdPointerInfo *pi;	71	KdPointerInfo *pi;
72		72
73	if (!SeatId) {	73	KdAddKeyboardDriver(&EphyrKeyboardDriver);
74	KdAddKeyboardDriver(&EphyrKeyboardDriver);	74	KdAddPointerDriver(&EphyrMouseDriver);
75	KdAddPointerDriver(&EphyrMouseDriver);	75
76		76	if (!kdHasKbd) {
77	if (!kdHasKbd) {	77	ki = KdNewKeyboard();
78	ki = KdNewKeyboard();	78	if (!ki)
79	if (!ki)	79	FatalError("Couldn't create Xephyr keyboard\n");
80	FatalError("Couldn't create Xephyr keyboard\n");	80	ki->driver = &EphyrKeyboardDriver;
81	ki->driver = &EphyrKeyboardDriver;	81	KdAddKeyboard(ki);
82	KdAddKeyboard(ki);	82	}
83	}
84		83
85	if (!kdHasPointer) {	84	if (!kdHasPointer) {
86	pi = KdNewPointer();	85	pi = KdNewPointer();
87	if (!pi)	86	if (!pi)
88	FatalError("Couldn't create Xephyr pointer\n");	87	FatalError("Couldn't create Xephyr pointer\n");
89	pi->driver = &EphyrMouseDriver;	88	pi->driver = &EphyrMouseDriver;
90	KdAddPointer(pi);	89	KdAddPointer(pi);
91	}
92	}	90	}
93		91
94	KdInitInput();	92	KdInitInput();