From d6fd80001bacd65e647a7971751a81859c2d887d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 27 Nov 2007 19:31:19 +0000 Subject: fixed some minor bugs, should be ready to use; I added a [popup] to the help patch svn path=/trunk/externals/hcs/; revision=9055 --- keyboard_layout.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'keyboard_layout.c') diff --git a/keyboard_layout.c b/keyboard_layout.c index 4c7c88e..54c6664 100755 --- a/keyboard_layout.c +++ b/keyboard_layout.c @@ -3,10 +3,10 @@ * ported to Pd by Hans-Christoph Steiner from f0.keyboard_layout.c */ -#ifdef __APPLE__ - #include "m_pd.h" +#ifdef __APPLE__ #include +#endif static t_class *keyboard_layout_class; @@ -16,22 +16,7 @@ typedef struct _keyboard_layout { t_outlet* x_status_outlet; } 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; - } - } -} -*/ +#ifdef __APPLE__ //---------------------------------------------------------------------------------------------- void keyboard_layout_bang(t_keyboard_layout *x) { @@ -44,7 +29,7 @@ void keyboard_layout_bang(t_keyboard_layout *x) { KLGetKeyboardLayoutProperty(currentLayoutRef, kKLName, (const void **)&keyboardName); CFStringGetCString(keyboardName, cKeyboardName, 100, kCFStringEncodingASCII); - outlet_anything(x->x_data_outlet, gensym(cKeyboardName), 0, NULL); + outlet_symbol(x->x_data_outlet, gensym(cKeyboardName)); } void keyboard_layout_menu(t_keyboard_layout *x) { @@ -108,10 +93,8 @@ void keyboard_layout_setup(void) { 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 + post("f0.keyboard_layout v1.1-ub; distributed under GNU GPL license"); } -- cgit v1.2.1