Mercurial > audlegacy

comparison src/audacious/ui_main.c @ 3024:883713b145f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use button-press-event signals
author Tomasz Mon <desowin@gmail.com>
date Tue, 10 Jul 2007 17:00:43 +0200
parents 49ce30748980
children bd32633b4de2
comparison
equal deleted inserted replaced
3023:49ce30748980 3024:883713b145f8
475 gtk_main_quit(); 475 gtk_main_quit();
476 476
477 exit(EXIT_SUCCESS); 477 exit(EXIT_SUCCESS);
478 } 478 }
479 479
480 void 480 gboolean
481 mainwin_vis_cb(void) 481 mainwin_num_clicked(GtkWidget *widget, GdkEventButton *event)
482 { 482 {
483 cfg.vis_type++; 483 if (event->button == 1) {
484 484 change_timer_mode();
485 if (cfg.vis_type > VIS_OFF) 485 } else if (event->button == 3)
486 cfg.vis_type = VIS_ANALYZER; 486 return FALSE;
487 487
488 mainwin_vis_set_type(cfg.vis_type); 488 return TRUE;
489 } 489 }
490 490
491 void 491 gboolean
492 mainwin_vis_menu_cb(void) 492 mainwin_vis_cb(GtkWidget *widget, GdkEventButton *event)
493 { 493 {
494 gint x, y; 494 if (event->button == 1) {
495 gdk_window_get_pointer(NULL, &x, &y, NULL); 495 cfg.vis_type++;
496 ui_manager_popup_menu_show(GTK_MENU(mainwin_visualization_menu), 496
497 x, y, 3, GDK_CURRENT_TIME); 497 if (cfg.vis_type > VIS_OFF)
498 cfg.vis_type = VIS_ANALYZER;
499
500 mainwin_vis_set_type(cfg.vis_type);
501 } else if (event->button == 3) {
502 gint x, y;
503 gdk_window_get_pointer(NULL, &x, &y, NULL);
504 ui_manager_popup_menu_show(GTK_MENU(mainwin_visualization_menu),
505 x, y, 3, event->time);
506 }
507 return TRUE;
498 } 508 }
499 509
500 static void 510 static void
501 mainwin_destroy(GtkWidget * widget, gpointer data) 511 mainwin_destroy(GtkWidget * widget, gpointer data)
502 { 512 {
1119 draw_main_window(FALSE); 1129 draw_main_window(FALSE);
1120 } 1130 }
1121 1131
1122 if ((event->button == 1) && event->type != GDK_2BUTTON_PRESS && 1132 if ((event->button == 1) && event->type != GDK_2BUTTON_PRESS &&
1123 widget_contains(WIDGET(mainwin_svis), event->x, event->y) ) { 1133 widget_contains(WIDGET(mainwin_svis), event->x, event->y) ) {
1124 mainwin_vis_cb(); 1134 /* it'll get sorted out when svis will become UiSvis */
1125 } 1135 }
1126 1136
1127 if (event->button == 3) { 1137 if (event->button == 3) {
1128 if (widget_contains(WIDGET(mainwin_svis), event->x, event->y)) { 1138 if (widget_contains(WIDGET(mainwin_svis), event->x, event->y)) {
1129 ui_manager_popup_menu_show(GTK_MENU(mainwin_visualization_menu), event->x_root, 1139 ui_manager_popup_menu_show(GTK_MENU(mainwin_visualization_menu), event->x_root,
2831 2841
2832 mainwin_playstatus = 2842 mainwin_playstatus =
2833 create_playstatus(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 24, 28); 2843 create_playstatus(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 24, 28);
2834 2844
2835 mainwin_minus_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 36, 26, SKIN_NUMBERS); 2845 mainwin_minus_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 36, 26, SKIN_NUMBERS);
2836 g_signal_connect(mainwin_minus_num, "clicked", change_timer_mode, NULL); 2846 g_signal_connect(mainwin_minus_num, "button-press-event", G_CALLBACK(mainwin_num_clicked), NULL);
2837 2847
2838 mainwin_10min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 48, 26, SKIN_NUMBERS); 2848 mainwin_10min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 48, 26, SKIN_NUMBERS);
2839 g_signal_connect(mainwin_10min_num, "clicked", change_timer_mode, NULL); 2849 g_signal_connect(mainwin_10min_num, "button-press-event", G_CALLBACK(mainwin_num_clicked), NULL);
2840 2850
2841 mainwin_min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 60, 26, SKIN_NUMBERS); 2851 mainwin_min_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 60, 26, SKIN_NUMBERS);
2842 g_signal_connect(mainwin_min_num, "clicked", change_timer_mode, NULL); 2852 g_signal_connect(mainwin_min_num, "button-press-event", G_CALLBACK(mainwin_num_clicked), NULL);
2843 2853
2844 mainwin_10sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 78, 26, SKIN_NUMBERS); 2854 mainwin_10sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 78, 26, SKIN_NUMBERS);
2845 g_signal_connect(mainwin_10sec_num, "clicked", change_timer_mode, NULL); 2855 g_signal_connect(mainwin_10sec_num, "button-press-event", G_CALLBACK(mainwin_num_clicked), NULL);
2846 2856
2847 mainwin_sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 90, 26, SKIN_NUMBERS); 2857 mainwin_sec_num = ui_skinned_number_new(SKINNED_WINDOW(mainwin)->fixed, 90, 26, SKIN_NUMBERS);
2848 g_signal_connect(mainwin_sec_num, "clicked", change_timer_mode, NULL); 2858 g_signal_connect(mainwin_sec_num, "button-press-event", G_CALLBACK(mainwin_num_clicked), NULL);
2849 2859
2850 mainwin_about = ui_skinned_button_new(); 2860 mainwin_about = ui_skinned_button_new();
2851 ui_skinned_small_button_setup(mainwin_about, SKINNED_WINDOW(mainwin)->fixed, 247, 83, 20, 25); 2861 ui_skinned_small_button_setup(mainwin_about, SKINNED_WINDOW(mainwin)->fixed, 247, 83, 20, 25);
2852 g_signal_connect(mainwin_about, "clicked", show_about_window, NULL); 2862 g_signal_connect(mainwin_about, "clicked", show_about_window, NULL);
2853 g_signal_connect(mainwin_about, "right-clicked", mainwin_about_cb, NULL ); 2863 g_signal_connect(mainwin_about, "right-clicked", mainwin_about_cb, NULL );
2854 2864
2855 mainwin_vis = ui_vis_new(SKINNED_WINDOW(mainwin)->fixed, 24, 43, 76); 2865 mainwin_vis = ui_vis_new(SKINNED_WINDOW(mainwin)->fixed, 24, 43, 76);
2856 g_signal_connect(mainwin_vis, "clicked", mainwin_vis_cb, NULL); 2866 g_signal_connect(mainwin_vis, "button-press-event", G_CALLBACK(mainwin_vis_cb), NULL);
2857 g_signal_connect(mainwin_vis, "right-clicked", mainwin_vis_menu_cb, NULL);
2858
2859 mainwin_svis = create_svis(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 79, 5); 2867 mainwin_svis = create_svis(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 79, 5);
2860 2868
2861 mainwin_position = 2869 mainwin_position =
2862 create_hslider(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 16, 72, 248, 2870 create_hslider(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 16, 72, 248,
2863 10, 248, 0, 278, 0, 29, 10, 10, 0, 0, 219, NULL, 2871 10, 248, 0, 278, 0, 29, 10, 10, 0, 0, 219, NULL,