comparison src/dfb_supp.c @ 1066:292fbb86d8f3

Merge from the HEAD
author wycc
date Tue, 30 Nov 2010 03:57:36 +0800
parents e415c55b4a0d
children 7b4e80ab671a
comparison
equal deleted inserted replaced
1065:eb3719020866 1066:292fbb86d8f3
22 */ 22 */
23 struct _X_kb_info { 23 struct _X_kb_info {
24 int keycode_min, keycode_max; 24 int keycode_min, keycode_max;
25 int ksym_per_code; 25 int ksym_per_code;
26 subject_t *kbevents; 26 subject_t *kbevents;
27 ob_factory_t *ob_factory; 27 observer_factory_t *observer_factory;
28 }; 28 };
29 29
30 /* @} */ 30 /* @} */
31 #define MAX_MONITORS 200 31 #define MAX_MONITORS 200
32 typedef struct { 32 typedef struct {
456 mb_tman_t *X_MB_tman(void *rt) { 456 mb_tman_t *X_MB_tman(void *rt) {
457 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt; 457 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt;
458 return xmb_rt->tman; 458 return xmb_rt->tman;
459 } 459 }
460 460
461 ob_factory_t *X_MB_ob_factory(void *rt) { 461 observer_factory_t *X_MB_observer_factory(void *rt) {
462 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt; 462 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt;
463 ob_factory_t *factory; 463 observer_factory_t *factory;
464 464
465 factory = rdman_get_ob_factory(xmb_rt->rdman); 465 factory = rdman_get_observer_factory(xmb_rt->rdman);
466 return factory; 466 return factory;
467 } 467 }
468 468
469 mb_img_ldr_t *X_MB_img_ldr(void *rt) { 469 mb_img_ldr_t *X_MB_img_ldr(void *rt) {
470 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt; 470 X_MB_runtime_t *xmb_rt = (X_MB_runtime_t *) rt;
523 X_MB_remove_event, 523 X_MB_remove_event,
524 X_MB_handle_connection, 524 X_MB_handle_connection,
525 X_MB_kbevents, 525 X_MB_kbevents,
526 X_MB_rdman, 526 X_MB_rdman,
527 X_MB_tman, 527 X_MB_tman,
528 X_MB_ob_factory, 528 X_MB_observer_factory,
529 X_MB_img_ldr 529 X_MB_img_ldr
530 }; 530 };
531 531
532 /*! \defgroup x_supp_nodejs_sup Export functions for supporting nodejs plugin. 532 /*! \defgroup x_supp_nodejs_sup Export functions for supporting nodejs plugin.
533 * 533 *