← Back to branch summary

~ubuntu-branches/ubuntu/dapper/rxvt-unicode/dapper

« back to all changes in this revision

Viewing changes to src/keyboard.C

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2006-01-16 16:51:28 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20060116165128-dmz1wi3x3e17gu43
Tags: 7.0-1
http://bugs.debian.org/347718
* New upstream release
  + autodetection of (incorrect) Latin1 in pure UTF-8 environment works
    again (closes: #347718)
* removed the font name preset, automatic selection works acceptably well

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/keyboard.C
48
48
keysym_t keyboard_manager::stock_keymap[] = {
49
49
  /* examples */
50
50
  /*        keysym,                state, range,               handler,              str */
51
 
//{XK_ISO_Left_Tab,                    0,     1,      keysym_t::NORMAL,           "\033[Z"},
 
51
//{XK_ISO_Left_Tab,                    0,     1,      keysym_t::STRING,           "\033[Z"},
52
52
//{            'a',                    0,    26, keysym_t::RANGE_META8,           "a" "%c"},
53
53
//{            'a',          ControlMask,    26, keysym_t::RANGE_META8,          "" "%c"},
54
54
//{        XK_Left,                    0,     4,        keysym_t::LIST,     ".\033[.DACB."},
55
55
//{        XK_Left,            ShiftMask,     4,        keysym_t::LIST,     ".\033[.dacb."},
56
56
//{        XK_Left,          ControlMask,     4,        keysym_t::LIST,     ".\033O.dacb."},
57
 
//{         XK_Tab,          ControlMask,     1,      keysym_t::NORMAL,      "\033<C-Tab>"},
58
 
//{  XK_apostrophe,          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-'>"},
59
 
//{       XK_slash,          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-/>"},
60
 
//{   XK_semicolon,          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-;>"},
61
 
//{       XK_grave,          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-`>"},
62
 
//{       XK_comma,          ControlMask,     1,      keysym_t::NORMAL,     "\033<C-\054>"},
63
 
//{      XK_Return,          ControlMask,     1,      keysym_t::NORMAL,   "\033<C-Return>"},
64
 
//{      XK_Return,            ShiftMask,     1,      keysym_t::NORMAL,   "\033<S-Return>"},
65
 
//{            ' ',            ShiftMask,     1,      keysym_t::NORMAL,    "\033<S-Space>"},
66
 
//{            '.',          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-.>"},
 
57
//{         XK_Tab,          ControlMask,     1,      keysym_t::STRING,      "\033<C-Tab>"},
 
58
//{  XK_apostrophe,          ControlMask,     1,      keysym_t::STRING,        "\033<C-'>"},
 
59
//{       XK_slash,          ControlMask,     1,      keysym_t::STRING,        "\033<C-/>"},
 
60
//{   XK_semicolon,          ControlMask,     1,      keysym_t::STRING,        "\033<C-;>"},
 
61
//{       XK_grave,          ControlMask,     1,      keysym_t::STRING,        "\033<C-`>"},
 
62
//{       XK_comma,          ControlMask,     1,      keysym_t::STRING,     "\033<C-\054>"},
 
63
//{      XK_Return,          ControlMask,     1,      keysym_t::STRING,   "\033<C-Return>"},
 
64
//{      XK_Return,            ShiftMask,     1,      keysym_t::STRING,   "\033<S-Return>"},
 
65
//{            ' ',            ShiftMask,     1,      keysym_t::STRING,    "\033<S-Space>"},
 
66
//{            '.',          ControlMask,     1,      keysym_t::STRING,        "\033<C-.>"},
67
67
//{            '0',          ControlMask,    10,       keysym_t::RANGE,   "0" "\033<C-%c>"},
68
68
//{            '0', MetaMask|ControlMask,    10,       keysym_t::RANGE, "0" "\033<M-C-%c>"},
69
69
//{            'a', MetaMask|ControlMask,    26,       keysym_t::RANGE, "a" "\033<M-C-%c>"},
76
76
  if (strncmp (str, "command:", 8) == 0)
77
77
    rt->cmd_write (str + 8, strlen (str) - 8);
78
78
  else if (strncmp (str, "perl:", 5) == 0)
79
 
    PERL_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STRING, str + 5, DT_END));
 
79
    HOOK_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STR, str + 5, DT_END));
80
80
  else
81
81
    rt->tt_write (str, strlen (str));
82
82
}
203
203
      key->state  = state;
204
204
      key->range  = 1;
205
205
      key->str    = translation;
206
 
      key->type   = keysym_t::NORMAL;
 
206
      key->type   = keysym_t::STRING;
207
207
 
208
208
      if (strncmp (translation, "list", 4) == 0 && translation [4])
209
209
        {
293
293
 
294
294
          switch (key.type)
295
295
            {
296
 
              case keysym_t::NORMAL:
 
296
              case keysym_t::STRING:
297
297
                output_string (term, str);
298
298
                break;
299
299