Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1420
Modified Files: keyboard_layout.c keyboard_layout-help.pd Log Message: fixed some minor bugs, should be ready to use; I added a [popup] to the help patch
Index: keyboard_layout.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/keyboard_layout.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** keyboard_layout.c 27 Nov 2007 19:05:36 -0000 1.1 --- keyboard_layout.c 27 Nov 2007 19:31:19 -0000 1.2 *************** *** 4,11 **** */
- #ifdef __APPLE__ - #include "m_pd.h" #include <Carbon/Carbon.h>
static t_class *keyboard_layout_class; --- 4,11 ---- */
#include "m_pd.h" + #ifdef __APPLE__ #include <Carbon/Carbon.h> + #endif
static t_class *keyboard_layout_class; *************** *** 17,36 **** } t_keyboard_layout;
! /* ! void keyboard_layout_assist(t_keyboard_layout *x, Object *m, long msg, long arg, char *dst) { ! if(msg==ASSIST_INLET) { ! sprintf(dst, "bang to get current, symbol to set"); ! } else if(msg==ASSIST_OUTLET) { ! switch(arg) { ! case 0: ! sprintf(dst, "current keyboard layout (symbol)"); ! break; ! case 1: ! sprintf(dst, "dump outlet (for menu)"); ! break; ! } ! } ! } ! */
//---------------------------------------------------------------------------------------------- --- 17,21 ---- } t_keyboard_layout;
! #ifdef __APPLE__
//---------------------------------------------------------------------------------------------- *************** *** 45,49 **** CFStringGetCString(keyboardName, cKeyboardName, 100, kCFStringEncodingASCII); ! outlet_anything(x->x_data_outlet, gensym(cKeyboardName), 0, NULL); }
--- 30,34 ---- CFStringGetCString(keyboardName, cKeyboardName, 100, kCFStringEncodingASCII); ! outlet_symbol(x->x_data_outlet, gensym(cKeyboardName)); }
*************** *** 109,116 **** class_addmethod(keyboard_layout_class, (t_method)keyboard_layout_menu, gensym("menu"), 0); - // class_addmethod(keyboard_layout_class, (t_method)keyboard_layout_assist, - // gensym("assist"), A_CANT, 0); ! post("f0.keyboard_layout v1.1-ub; distributed under GNU GPL license"); //target specific }
--- 94,99 ---- class_addmethod(keyboard_layout_class, (t_method)keyboard_layout_menu, gensym("menu"), 0); ! post("f0.keyboard_layout v1.1-ub; distributed under GNU GPL license"); }
Index: keyboard_layout-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/keyboard_layout-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** keyboard_layout-help.pd 27 Nov 2007 19:05:36 -0000 1.1 --- keyboard_layout-help.pd 27 Nov 2007 19:31:19 -0000 1.2 *************** *** 1,10 **** ! #N canvas 246 251 576 362 10; ! #X obj 206 158 keyboard_layout; ! #X obj 279 239 pddp/print; ! #X obj 92 247 pddp/print; ! #X msg 205 94 bang; ! #X msg 233 125 menu; ! #X connect 0 0 2 0; ! #X connect 0 1 1 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; --- 1,20 ---- ! ..#N canvas 94 505 576 362 10; ! #X obj 116 144 keyboard_layout; ! #X msg 118 32 bang; ! #X msg 146 63 menu; ! #X obj 242 244 flatspace/popup 124 25 #ffffff language; ! #X msg 179 205 options; ! #X obj 179 182 route clear; ! #X symbolatom 116 277 0 0 0 0 - - -; ! #X text 185 64 see all options in the popup menu; ! #X obj 308 111 symbol; ! #X text 250 283 select a new input method with the popup menu; ! #X connect 0 0 6 0; ! #X connect 0 1 5 0; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 3 1 8 0; ! #X connect 4 0 3 0; ! #X connect 5 0 4 0; ! #X connect 5 1 3 0; ! #X connect 8 0 0 0;