~ubuntu-branches/ubuntu/trusty/libsdl2/trusty-proposed

« back to all changes in this revision

Viewing changes to test/testime.c

  • Committer: Package Import Robot
  • Author(s): Manuel A. Fernandez Montecelo
  • Date: 2013-12-28 12:31:19 UTC
  • mto: (7.1.3 sid)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: package-import@ubuntu.com-20131228123119-wehupm72qsjvh6vz
Tags: upstream-2.0.1+dfsg1
ImportĀ upstreamĀ versionĀ 2.0.1+dfsg1

Show diffs side-by-side

added added

removed removed

Lines of Context:
80
80
 
81
81
void usage()
82
82
{
83
 
    printf("usage: testime [--font fontfile]\n");
 
83
    SDL_Log("usage: testime [--font fontfile]\n");
84
84
    exit(0);
85
85
}
86
86
 
135
135
    markedRect.w = textRect.w - w;
136
136
    if (markedRect.w < 0)
137
137
    {
138
 
        // Stop text input because we cannot hold any more characters
 
138
        /* Stop text input because we cannot hold any more characters */
139
139
        SDL_StopTextInput();
140
140
        return;
141
141
    }
196
196
    int i;
197
197
    for (i = 0; i < state->num_windows; ++i) {
198
198
        SDL_Renderer *renderer = state->renderers[i];
 
199
        if (state->windows[i] == NULL)
 
200
            continue;
199
201
        SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
200
202
        SDL_RenderClear(renderer);
201
203
 
210
212
    SDL_Event event;
211
213
    const char *fontname = DEFAULT_FONT;
212
214
 
 
215
    /* Enable standard application logging */
 
216
    SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
 
217
 
213
218
    /* Initialize test framework */
214
219
    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
215
220
    if (!state) {
251
256
    font = TTF_OpenFont(fontname, DEFAULT_PTSIZE);
252
257
    if (! font)
253
258
    {
254
 
        fprintf(stderr, "Failed to find font: %s\n", TTF_GetError());
 
259
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to find font: %s\n", TTF_GetError());
255
260
        exit(-1);
256
261
    }
257
262
#endif
258
263
 
259
 
    printf("Using font: %s\n", fontname);
 
264
    SDL_Log("Using font: %s\n", fontname);
260
265
    atexit(SDL_Quit);
261
266
 
262
267
    InitInput();
321
326
                        break;
322
327
                    }
323
328
 
324
 
                    fprintf(stderr,
325
 
                            "Keyboard: scancode 0x%08X = %s, keycode 0x%08X = %s\n",
 
329
                    SDL_Log("Keyboard: scancode 0x%08X = %s, keycode 0x%08X = %s\n",
326
330
                            event.key.keysym.scancode,
327
331
                            SDL_GetScancodeName(event.key.keysym.scancode),
328
332
                            event.key.keysym.sym, SDL_GetKeyName(event.key.keysym.sym));
329
333
                    break;
330
334
 
331
335
                case SDL_TEXTINPUT:
332
 
                    if (SDL_strlen(event.text.text) == 0 || event.text.text[0] == '\n' ||
 
336
                    if (event.text.text[0] == '\0' || event.text.text[0] == '\n' ||
333
337
                        markedRect.w < 0)
334
338
                        break;
335
339
 
336
 
                    fprintf(stderr, "Keyboard: text input \"%s\"\n", event.text.text);
 
340
                    SDL_Log("Keyboard: text input \"%s\"\n", event.text.text);
337
341
 
338
342
                    if (SDL_strlen(text) + SDL_strlen(event.text.text) < sizeof(text))
339
343
                        SDL_strlcat(text, event.text.text, sizeof(text));
340
344
 
341
 
                    fprintf(stderr, "text inputed: %s\n", text);
 
345
                    SDL_Log("text inputed: %s\n", text);
342
346
 
343
 
                    // After text inputed, we can clear up markedText because it
344
 
                    // is committed
 
347
                    /* After text inputed, we can clear up markedText because it */
 
348
                    /* is committed */
345
349
                    markedText[0] = 0;
346
350
                    Redraw();
347
351
                    break;
348
352
 
349
353
                case SDL_TEXTEDITING:
350
 
                    fprintf(stderr, "text editing \"%s\", selected range (%d, %d)\n",
 
354
                    SDL_Log("text editing \"%s\", selected range (%d, %d)\n",
351
355
                            event.edit.text, event.edit.start, event.edit.length);
352
356
 
353
357
                    strcpy(markedText, event.edit.text);