← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xorg-server/maverick

« back to all changes in this revision

Viewing changes to hw/xquartz/darwin.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xquartz/darwin.c
45
45
#include "site.h"
46
46
#include "globals.h"
47
47
#include "dix.h"
 
48
#include "xkbsrv.h"
48
49
 
49
50
#include <X11/extensions/XI.h>
50
51
#include <X11/extensions/XIproto.h>
463
464
 */
464
465
void InitInput( int argc, char **argv )
465
466
{
 
467
    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
 
468
                          .variant = NULL, .options = NULL };
 
469
    /* We need to really have rules... or something... */
 
470
    XkbSetRulesDflts(&rmlvo);
 
471
 
466
472
    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
467
473
    RegisterKeyboardDevice( darwinKeyboard );
468
474
    darwinKeyboard->name = strdup("keyboard");