← Back to branch summary

~ubuntu-branches/ubuntu/precise/nvidia-settings/precise

« back to all changes in this revision

Viewing changes to src/XF86Config-parser/Keyboard.c

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone (tseliot)
  • Date: 2009-01-31 17:21:51 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090131172151-j7hdq3osfau2y51n
Tags: 180.25-0ubuntu1
https://launchpad.net/bugs/315667
* New upstream release (LP: #315667)
* debian/patches/02_add_missing_serverlayout.dpatch: drop patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/XF86Config-parser/Keyboard.c
126
126
            case KPROTOCOL:
127
127
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
128
128
                    Error (QUOTE_MSG, "Protocol");
129
 
                ptr->options = xconfigAddNewOption(ptr->options,
130
 
                                                   xconfigStrdup("Protocol"),
131
 
                                                   val.str);
 
129
                xconfigAddNewOption(&ptr->options, "Protocol", val.str);
132
130
                break;
133
131
            case AUTOREPEAT:
134
132
                if (xconfigGetSubToken (&(ptr->comment)) != NUMBER)
142
140
                sprintf(s, "%s %s", s1, s2);
143
141
                free(s1);
144
142
                free(s2);
145
 
                ptr->options =
146
 
                    xconfigAddNewOption(ptr->options,
147
 
                                        xconfigStrdup("AutoRepeat"), s);
 
143
                xconfigAddNewOption(&ptr->options, "AutoRepeat", s);
148
144
                break;
149
145
            case XLEDS:
150
146
                if (xconfigGetSubToken (&(ptr->comment)) != NUMBER)
178
174
                {
179
175
                case EOF_TOKEN:
180
176
                    xconfigErrorMsg(ParseErrorMsg, UNEXPECTED_EOF_MSG);
181
 
                    CLEANUP (ptr);
 
177
                    CLEANUP (&ptr);
182
178
                    return (NULL);
183
179
                    break;
184
180
                    
197
193
                                MOVED_TO_FLAGS_MSG, "VTSysReq");
198
194
                break;
199
195
            case XKBDISABLE:
200
 
                ptr->options = xconfigAddNewOption(ptr->options,
201
 
                                                   xconfigStrdup("XkbDisable"),
202
 
                                                   NULL);
 
196
                xconfigAddNewOption(&ptr->options, "XkbDisable", NULL);
203
197
                break;
204
198
            case XKBKEYMAP:
205
199
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
206
200
                    Error (QUOTE_MSG, "XKBKeymap");
207
 
                ptr->options = xconfigAddNewOption(ptr->options,
208
 
                                                   xconfigStrdup("XkbKeymap"),
209
 
                                                   val.str);
 
201
                xconfigAddNewOption(&ptr->options, "XkbKeymap", val.str);
210
202
                break;
211
203
            case XKBCOMPAT:
212
204
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
213
205
                    Error (QUOTE_MSG, "XKBCompat");
214
 
                ptr->options = xconfigAddNewOption(ptr->options,
215
 
                                                   xconfigStrdup("XkbCompat"),
216
 
                                                   val.str);
 
206
                xconfigAddNewOption(&ptr->options, "XkbCompat", val.str);
217
207
                break;
218
208
            case XKBTYPES:
219
209
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
220
210
                    Error (QUOTE_MSG, "XKBTypes");
221
 
                ptr->options = xconfigAddNewOption(ptr->options,
222
 
                                                   xconfigStrdup("XkbTypes"),
223
 
                                                   val.str);
 
211
                xconfigAddNewOption(&ptr->options, "XkbTypes", val.str);
224
212
                break;
225
213
            case XKBKEYCODES:
226
214
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
227
215
                    Error (QUOTE_MSG, "XKBKeycodes");
228
 
                ptr->options =
229
 
                    xconfigAddNewOption(ptr->options,
230
 
                                        xconfigStrdup("XkbKeycodes"),
231
 
                                        val.str);
 
216
                xconfigAddNewOption(&ptr->options, "XkbKeycodes", val.str);
232
217
                break;
233
218
            case XKBGEOMETRY:
234
219
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
235
220
                    Error (QUOTE_MSG, "XKBGeometry");
236
 
                ptr->options =
237
 
                    xconfigAddNewOption(ptr->options,
238
 
                                        xconfigStrdup("XkbGeometry"),
239
 
                                        val.str);
 
221
                xconfigAddNewOption(&ptr->options, "XkbGeometry", val.str);
240
222
                break;
241
223
            case XKBSYMBOLS:
242
224
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
243
225
                    Error (QUOTE_MSG, "XKBSymbols");
244
 
                ptr->options = xconfigAddNewOption(ptr->options,
245
 
                                                   xconfigStrdup("XkbSymbols"),
246
 
                                                   val.str);
 
226
                xconfigAddNewOption(&ptr->options, "XkbSymbols", val.str);
247
227
                break;
248
228
            case XKBRULES:
249
229
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
250
230
                    Error (QUOTE_MSG, "XKBRules");
251
 
                ptr->options = xconfigAddNewOption(ptr->options,
252
 
                                                   xconfigStrdup("XkbRules"),
253
 
                                                   val.str);
 
231
                xconfigAddNewOption(&ptr->options, "XkbRules", val.str);
254
232
                break;
255
233
            case XKBMODEL:
256
234
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
257
235
                    Error (QUOTE_MSG, "XKBModel");
258
 
                ptr->options = xconfigAddNewOption(ptr->options,
259
 
                                                   xconfigStrdup("XkbModel"),
260
 
                                                   val.str);
 
236
                xconfigAddNewOption(&ptr->options, "XkbModel", val.str);
261
237
                break;
262
238
            case XKBLAYOUT:
263
239
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
264
240
                    Error (QUOTE_MSG, "XKBLayout");
265
 
                ptr->options = xconfigAddNewOption(ptr->options,
266
 
                                                   xconfigStrdup("XkbLayout"),
267
 
                                                   val.str);
 
241
                xconfigAddNewOption(&ptr->options, "XkbLayout", val.str);
268
242
                break;
269
243
            case XKBVARIANT:
270
244
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
271
245
                    Error (QUOTE_MSG, "XKBVariant");
272
 
                ptr->options = xconfigAddNewOption(ptr->options,
273
 
                                                   xconfigStrdup("XkbVariant"),
274
 
                                                   val.str);
 
246
                xconfigAddNewOption(&ptr->options, "XkbVariant", val.str);
275
247
                break;
276
248
            case XKBOPTIONS:
277
249
                if (xconfigGetSubToken (&(ptr->comment)) != STRING)
278
250
                    Error (QUOTE_MSG, "XKBOptions");
279
 
                ptr->options = xconfigAddNewOption(ptr->options,
280
 
                                                   xconfigStrdup("XkbOptions"),
281
 
                                                   val.str);
 
251
                xconfigAddNewOption(&ptr->options, "XkbOptions", val.str);
282
252
                break;
283
253
            case PANIX106:
284
 
                ptr->options = xconfigAddNewOption(ptr->options,
285
 
                                                   xconfigStrdup("Panix106"),
286
 
                                                   NULL);
 
254
                xconfigAddNewOption(&ptr->options, "Panix106", NULL);
287
255
                break;
288
256
            case EOF_TOKEN:
289
257
                Error (UNEXPECTED_EOF_MSG, NULL);
296
264
    
297
265
    ptr->identifier = xconfigStrdup(CONF_IMPLICIT_KEYBOARD);
298
266
    ptr->driver = xconfigStrdup("keyboard");
299
 
    ptr->options = xconfigAddNewOption(ptr->options,
300
 
                                       xconfigStrdup("CoreKeyboard"), NULL);
 
267
    xconfigAddNewOption(&ptr->options, "CoreKeyboard", NULL);
301
268
    
302
269
    return ptr;
303
270
}