DFBKana-update.patch

   1 --- DFBKana-0.3/src/dfbkana.c.orig      2002-04-22 16:57:20.000000000 +0200
   2 +++ DFBKana-0.3/src/dfbkana.c   2005-03-05 01:30:28.781401280 +0100
   3 @@ -17,9 +17,10 @@
   4   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111307, USA.
   5   */
   6
   7 -#include <directfb.h>
   8  #include "config.h"
   9
  10 +#include <directfb.h>
  11 +
  12  #include "dfbkana.h"
  13  #include "infowindow.h"
  14  #include "gridwindow.h"
  15 @@ -38,7 +39,7 @@
  16  int xres,yres,fontheight;
  17
  18  #ifdef DEFAULT_JAPANESE_FONT
  19 -char *japanese_fontname = JAPANESE_FONT;
  20 +char *japanese_fontname = DEFAULT_JAPANESE_FONT;
  21  #else
  22  char *japanese_fontname = NULL;
  23  #endif
  24 @@ -171,7 +172,7 @@
  25       DFBCHECK(DirectFBCreate( &dfb ));
  26
  27       /* create an input buffer for key events */
  28 -     DFBCHECK(dfb->CreateEventBuffer( dfb, DICAPS_KEYS, &keybuffer ));
  29 +     DFBCHECK(dfb->CreateInputEventBuffer( dfb, DICAPS_KEYS, DFB_TRUE, &keybuffer ));
  30
  31       DFBCHECK(dfb->GetDisplayLayer( dfb, DLID_PRIMARY, &layer ));
  32
  33 @@ -476,31 +477,31 @@
  34
  35            while (keybuffer->GetEvent( keybuffer, DFB_EVENT(&kevt) ) == DFB_OK) {
  36                 if (kevt.type == DIET_KEYPRESS)
  37 -                    switch (kevt.keycode) {
  38 -                    case DIKC_LEFT:
  39 +                    switch (DFB_LOWER_CASE(kevt.key_symbol)) {
  40 +                    case DIKS_CURSOR_LEFT:
  41                           if (--kana_window_pos < -1)
  42                                kana_window_pos = -1;
  43                           kanawindow_moveto( kana_window_pos );
  44                           break;
  45 -                    case DIKC_RIGHT:
  46 +                    case DIKS_CURSOR_RIGHT:
  47                           if (++kana_window_pos > 49)
  48                                kana_window_pos = 49;
  49                           kanawindow_moveto( kana_window_pos );
  50                           break;
  51 -                    case DIKC_UP:
  52 +                    case DIKS_CURSOR_UP:
  53                           kana_window_pos-=5;
  54                           if (kana_window_pos < -1)
  55                                kana_window_pos = -1;
  56                           kanawindow_moveto( kana_window_pos );
  57                           break;
  58 -                    case DIKC_DOWN:
  59 +                    case DIKS_CURSOR_DOWN:
  60                           kana_window_pos+=5;
  61                           if (kana_window_pos > 49)
  62                                kana_window_pos = 49;
  63                           kanawindow_moveto( kana_window_pos );
  64                           break;
  65 -                    case DIKC_ENTER:
  66 -                    case DIKC_OK:
  67 +                    case DIKS_ENTER:
  68 +                    case DIKS_OK:
  69                           if (kana_window_pos != -1) {
  70                                solve_kana( kana_nr, kana_window_pos, kana_mode, 0 );
  71                                kana_window_pos = -1;
  72 @@ -508,8 +509,8 @@
  73                                kanawindow_update( kana_nr, kana_mode );
  74                           }
  75                           break;
  76 -                    case DIKC_R:
  77 -                    case DIKC_2:
  78 +                    case 'r':
  79 +                   case '2':
  80                           grid_display_mode = !grid_display_mode;
  81                           gridwindow_setdisplaymode( grid_display_mode );
  82                           gridwindow_redraw( kana_mode );
  83 @@ -517,8 +518,8 @@
  84                                            "romanji off" : "romanji on",
  85                                            500 );
  86                           break;
  87 -                    case DIKC_1:
  88 -                    case DIKC_Q:
  89 +                    case '1':
  90 +                    case 'q':
  91                           kana_mode = !kana_mode;
  92                           if (grid_display_mode)
  93                                gridwindow_redraw( kana_mode );
  94 @@ -527,15 +528,15 @@
  95                                            katakanastring : hiraganastring,
  96                                            500 );
  97                           break;
  98 -                    case DIKC_B:
  99 -                    case DIKC_3:
 100 +                    case 'b':
 101 +                    case '3':
 102                           background_mode = !background_mode;
 103                           if (background_mode)
 104                                layer->SetBackgroundMode( layer, DLBM_IMAGE );
 105                           else
 106                                layer->SetBackgroundMode( layer, DLBM_COLOR );
 107                           break;
 108 -                    case DIKC_ESCAPE:
 109 +                    case DIKS_ESCAPE:
 110                           quit =1;
 111                      default:
 112                           break;