Mercurial > audlegacy

comparison src/audacious/widgets/skin.c @ 2578:33911de063cb trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - change the order that hints are processed in.
author nenolod
date Sun, 25 Feb 2007 22:41:59 -0800
parents 1967594c1123
children 83afa9e1ac64
comparison
equal deleted inserted replaced
2577:1967594c1123 2578:33911de063cb
539 gchar *filename, *tmp; 539 gchar *filename, *tmp;
540 INIFile *inifile; 540 INIFile *inifile;
541 541
542 path_p = path_p ? path_p : skin->path; 542 path_p = path_p ? path_p : skin->path;
543 543
544 skin->properties.mainwin_othertext = FALSE;
545 skin->properties.mainwin_vis_x = 24;
546 skin->properties.mainwin_vis_y = 43;
547 skin->properties.mainwin_vis_width = 76;
548 skin->properties.mainwin_text_x = 112;
549 skin->properties.mainwin_text_y = 27;
550 skin->properties.mainwin_text_width = 153;
551 skin->properties.mainwin_infobar_x = 112;
552 skin->properties.mainwin_infobar_y = 43;
553 skin->properties.mainwin_number_0_x = 36;
554 skin->properties.mainwin_number_0_y = 26;
555 skin->properties.mainwin_number_1_x = 48;
556 skin->properties.mainwin_number_1_y = 26;
557 skin->properties.mainwin_number_2_x = 60;
558 skin->properties.mainwin_number_2_y = 26;
559 skin->properties.mainwin_number_3_x = 78;
560 skin->properties.mainwin_number_3_y = 26;
561 skin->properties.mainwin_number_4_x = 90;
562 skin->properties.mainwin_number_4_y = 26;
563 skin->properties.mainwin_playstatus_x = 24;
564 skin->properties.mainwin_playstatus_y = 28;
565 skin->properties.mainwin_menurow_visible = TRUE;
566 skin->properties.mainwin_volume_x = 107;
567 skin->properties.mainwin_volume_y = 57;
568 skin->properties.mainwin_balance_x = 177;
569 skin->properties.mainwin_balance_y = 57;
570 skin->properties.mainwin_position_x = 16;
571 skin->properties.mainwin_position_y = 72;
572 skin->properties.mainwin_othertext_is_status = FALSE;
573 skin->properties.mainwin_othertext_visible = skin->properties.mainwin_othertext;
574 skin->properties.mainwin_text_visible = TRUE;
575 skin->properties.mainwin_vis_visible = TRUE;
576 skin->properties.mainwin_previous_x = 16;
577 skin->properties.mainwin_previous_y = 88;
578 skin->properties.mainwin_play_x = 39;
579 skin->properties.mainwin_play_y = 88;
580 skin->properties.mainwin_pause_x = 62;
581 skin->properties.mainwin_pause_y = 88;
582 skin->properties.mainwin_stop_x = 85;
583 skin->properties.mainwin_stop_y = 88;
584 skin->properties.mainwin_next_x = 108;
585 skin->properties.mainwin_next_y = 88;
586 skin->properties.mainwin_eject_x = 136;
587 skin->properties.mainwin_eject_y = 89;
588 skin->properties.mainwin_width = 275;
589 skin_mask_info[0].width = skin->properties.mainwin_width;
590 skin->properties.mainwin_height = 116;
591 skin_mask_info[0].height = skin->properties.mainwin_height;
592 skin->properties.mainwin_about_x = 247;
593 skin->properties.mainwin_about_y = 83;
594 skin->properties.mainwin_shuffle_x = 164;
595 skin->properties.mainwin_shuffle_y = 89;
596 skin->properties.mainwin_repeat_x = 210;
597 skin->properties.mainwin_repeat_y = 89;
598 skin->properties.mainwin_eqbutton_x = 219;
599 skin->properties.mainwin_eqbutton_y = 58;
600 skin->properties.mainwin_plbutton_x = 242;
601 skin->properties.mainwin_plbutton_y = 58;
602 skin->properties.textbox_bitmap_font_width = 5;
603 skin->properties.textbox_bitmap_font_height = 6;
604 skin->properties.mainwin_minimize_x = 244;
605 skin->properties.mainwin_minimize_y = 3;
606 skin->properties.mainwin_shade_x = 254;
607 skin->properties.mainwin_shade_y = 3;
608 skin->properties.mainwin_close_x = 264;
609 skin->properties.mainwin_close_y = 3;
610
544 filename = find_file_recursively(path_p, "skin.hints"); 611 filename = find_file_recursively(path_p, "skin.hints");
545 612
546 if (filename == NULL) 613 if (filename == NULL)
547 return; 614 return;
548 615
549 inifile = open_ini_file(filename); 616 inifile = open_ini_file(filename);
550 617
551 skin->properties.mainwin_othertext = FALSE;
552 tmp = read_ini_string(inifile, "skin", "mainwinOthertext"); 618 tmp = read_ini_string(inifile, "skin", "mainwinOthertext");
553 619
554 if (tmp != NULL) 620 if (tmp != NULL)
555 { 621 {
556 skin->properties.mainwin_othertext = atoi(tmp); 622 skin->properties.mainwin_othertext = atoi(tmp);
557 g_free(tmp); 623 g_free(tmp);
558 } 624 }
559 625
560 skin->properties.mainwin_vis_x = 24;
561 tmp = read_ini_string(inifile, "skin", "mainwinVisX"); 626 tmp = read_ini_string(inifile, "skin", "mainwinVisX");
562 627
563 if (tmp != NULL) 628 if (tmp != NULL)
564 { 629 {
565 skin->properties.mainwin_vis_x = atoi(tmp); 630 skin->properties.mainwin_vis_x = atoi(tmp);
566 g_free(tmp); 631 g_free(tmp);
567 } 632 }
568 633
569 skin->properties.mainwin_vis_y = 43;
570 tmp = read_ini_string(inifile, "skin", "mainwinVisY"); 634 tmp = read_ini_string(inifile, "skin", "mainwinVisY");
571 635
572 if (tmp != NULL) 636 if (tmp != NULL)
573 { 637 {
574 skin->properties.mainwin_vis_y = atoi(tmp); 638 skin->properties.mainwin_vis_y = atoi(tmp);
575 g_free(tmp); 639 g_free(tmp);
576 } 640 }
577 641
578 skin->properties.mainwin_vis_width = 76;
579 tmp = read_ini_string(inifile, "skin", "mainwinVisWidth"); 642 tmp = read_ini_string(inifile, "skin", "mainwinVisWidth");
580 643
581 if (tmp != NULL) 644 if (tmp != NULL)
582 { 645 {
583 skin->properties.mainwin_vis_width = atoi(tmp); 646 skin->properties.mainwin_vis_width = atoi(tmp);
584 g_free(tmp); 647 g_free(tmp);
585 } 648 }
586 649
587 skin->properties.mainwin_text_x = 112;
588 tmp = read_ini_string(inifile, "skin", "mainwinTextX"); 650 tmp = read_ini_string(inifile, "skin", "mainwinTextX");
589 651
590 if (tmp != NULL) 652 if (tmp != NULL)
591 { 653 {
592 skin->properties.mainwin_text_x = atoi(tmp); 654 skin->properties.mainwin_text_x = atoi(tmp);
593 g_free(tmp); 655 g_free(tmp);
594 } 656 }
595 657
596 skin->properties.mainwin_text_y = 27;
597 tmp = read_ini_string(inifile, "skin", "mainwinTextY"); 658 tmp = read_ini_string(inifile, "skin", "mainwinTextY");
598 659
599 if (tmp != NULL) 660 if (tmp != NULL)
600 { 661 {
601 skin->properties.mainwin_text_y = atoi(tmp); 662 skin->properties.mainwin_text_y = atoi(tmp);
602 g_free(tmp); 663 g_free(tmp);
603 } 664 }
604 665
605 skin->properties.mainwin_text_width = 153;
606 tmp = read_ini_string(inifile, "skin", "mainwinTextWidth"); 666 tmp = read_ini_string(inifile, "skin", "mainwinTextWidth");
607 667
608 if (tmp != NULL) 668 if (tmp != NULL)
609 { 669 {
610 skin->properties.mainwin_text_width = atoi(tmp); 670 skin->properties.mainwin_text_width = atoi(tmp);
611 g_free(tmp); 671 g_free(tmp);
612 } 672 }
613 673
614 skin->properties.mainwin_infobar_x = 112;
615 tmp = read_ini_string(inifile, "skin", "mainwinInfoBarX"); 674 tmp = read_ini_string(inifile, "skin", "mainwinInfoBarX");
616 675
617 if (tmp != NULL) 676 if (tmp != NULL)
618 { 677 {
619 skin->properties.mainwin_infobar_x = atoi(tmp); 678 skin->properties.mainwin_infobar_x = atoi(tmp);
620 g_free(tmp); 679 g_free(tmp);
621 } 680 }
622 681
623 skin->properties.mainwin_infobar_y = 43;
624 tmp = read_ini_string(inifile, "skin", "mainwinInfoBarY"); 682 tmp = read_ini_string(inifile, "skin", "mainwinInfoBarY");
625 683
626 if (tmp != NULL) 684 if (tmp != NULL)
627 { 685 {
628 skin->properties.mainwin_infobar_y = atoi(tmp); 686 skin->properties.mainwin_infobar_y = atoi(tmp);
629 g_free(tmp); 687 g_free(tmp);
630 } 688 }
631 689
632 skin->properties.mainwin_number_0_x = 36;
633 tmp = read_ini_string(inifile, "skin", "mainwinNumber0X"); 690 tmp = read_ini_string(inifile, "skin", "mainwinNumber0X");
634 691
635 if (tmp != NULL) 692 if (tmp != NULL)
636 { 693 {
637 skin->properties.mainwin_number_0_x = atoi(tmp); 694 skin->properties.mainwin_number_0_x = atoi(tmp);
638 g_free(tmp); 695 g_free(tmp);
639 } 696 }
640 697
641 skin->properties.mainwin_number_0_y = 26;
642 tmp = read_ini_string(inifile, "skin", "mainwinNumber0Y"); 698 tmp = read_ini_string(inifile, "skin", "mainwinNumber0Y");
643 699
644 if (tmp != NULL) 700 if (tmp != NULL)
645 { 701 {
646 skin->properties.mainwin_number_0_y = atoi(tmp); 702 skin->properties.mainwin_number_0_y = atoi(tmp);
647 g_free(tmp); 703 g_free(tmp);
648 } 704 }
649 705
650 skin->properties.mainwin_number_1_x = 48;
651 tmp = read_ini_string(inifile, "skin", "mainwinNumber1X"); 706 tmp = read_ini_string(inifile, "skin", "mainwinNumber1X");
652 707
653 if (tmp != NULL) 708 if (tmp != NULL)
654 { 709 {
655 skin->properties.mainwin_number_1_x = atoi(tmp); 710 skin->properties.mainwin_number_1_x = atoi(tmp);
656 g_free(tmp); 711 g_free(tmp);
657 } 712 }
658 713
659 skin->properties.mainwin_number_1_y = 26;
660 tmp = read_ini_string(inifile, "skin", "mainwinNumber1Y"); 714 tmp = read_ini_string(inifile, "skin", "mainwinNumber1Y");
661 715
662 if (tmp != NULL) 716 if (tmp != NULL)
663 { 717 {
664 skin->properties.mainwin_number_1_y = atoi(tmp); 718 skin->properties.mainwin_number_1_y = atoi(tmp);
665 g_free(tmp); 719 g_free(tmp);
666 } 720 }
667 721
668 skin->properties.mainwin_number_2_x = 60;
669 tmp = read_ini_string(inifile, "skin", "mainwinNumber2X"); 722 tmp = read_ini_string(inifile, "skin", "mainwinNumber2X");
670 723
671 if (tmp != NULL) 724 if (tmp != NULL)
672 { 725 {
673 skin->properties.mainwin_number_2_x = atoi(tmp); 726 skin->properties.mainwin_number_2_x = atoi(tmp);
674 g_free(tmp); 727 g_free(tmp);
675 } 728 }
676 729
677 skin->properties.mainwin_number_2_y = 26;
678 tmp = read_ini_string(inifile, "skin", "mainwinNumber2Y"); 730 tmp = read_ini_string(inifile, "skin", "mainwinNumber2Y");
679 731
680 if (tmp != NULL) 732 if (tmp != NULL)
681 { 733 {
682 skin->properties.mainwin_number_2_y = atoi(tmp); 734 skin->properties.mainwin_number_2_y = atoi(tmp);
683 g_free(tmp); 735 g_free(tmp);
684 } 736 }
685 737
686 skin->properties.mainwin_number_3_x = 78;
687 tmp = read_ini_string(inifile, "skin", "mainwinNumber3X"); 738 tmp = read_ini_string(inifile, "skin", "mainwinNumber3X");
688 739
689 if (tmp != NULL) 740 if (tmp != NULL)
690 { 741 {
691 skin->properties.mainwin_number_3_x = atoi(tmp); 742 skin->properties.mainwin_number_3_x = atoi(tmp);
692 g_free(tmp); 743 g_free(tmp);
693 } 744 }
694 745
695 skin->properties.mainwin_number_3_y = 26;
696 tmp = read_ini_string(inifile, "skin", "mainwinNumber3Y"); 746 tmp = read_ini_string(inifile, "skin", "mainwinNumber3Y");
697 747
698 if (tmp != NULL) 748 if (tmp != NULL)
699 { 749 {
700 skin->properties.mainwin_number_3_y = atoi(tmp); 750 skin->properties.mainwin_number_3_y = atoi(tmp);
701 g_free(tmp); 751 g_free(tmp);
702 } 752 }
703 753
704 skin->properties.mainwin_number_4_x = 90;
705 tmp = read_ini_string(inifile, "skin", "mainwinNumber4X"); 754 tmp = read_ini_string(inifile, "skin", "mainwinNumber4X");
706 755
707 if (tmp != NULL) 756 if (tmp != NULL)
708 { 757 {
709 skin->properties.mainwin_number_4_x = atoi(tmp); 758 skin->properties.mainwin_number_4_x = atoi(tmp);
710 g_free(tmp); 759 g_free(tmp);
711 } 760 }
712 761
713 skin->properties.mainwin_number_4_y = 26;
714 tmp = read_ini_string(inifile, "skin", "mainwinNumber4Y"); 762 tmp = read_ini_string(inifile, "skin", "mainwinNumber4Y");
715 763
716 if (tmp != NULL) 764 if (tmp != NULL)
717 { 765 {
718 skin->properties.mainwin_number_4_y = atoi(tmp); 766 skin->properties.mainwin_number_4_y = atoi(tmp);
719 g_free(tmp); 767 g_free(tmp);
720 } 768 }
721 769
722 skin->properties.mainwin_playstatus_x = 24;
723 tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusX"); 770 tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusX");
724 771
725 if (tmp != NULL) 772 if (tmp != NULL)
726 { 773 {
727 skin->properties.mainwin_playstatus_x = atoi(tmp); 774 skin->properties.mainwin_playstatus_x = atoi(tmp);
728 g_free(tmp); 775 g_free(tmp);
729 } 776 }
730 777
731 skin->properties.mainwin_playstatus_y = 28;
732 tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusY"); 778 tmp = read_ini_string(inifile, "skin", "mainwinPlayStatusY");
733 779
734 if (tmp != NULL) 780 if (tmp != NULL)
735 { 781 {
736 skin->properties.mainwin_playstatus_y = atoi(tmp); 782 skin->properties.mainwin_playstatus_y = atoi(tmp);
737 g_free(tmp); 783 g_free(tmp);
738 } 784 }
739 785
740 skin->properties.mainwin_menurow_visible = TRUE;
741 tmp = read_ini_string(inifile, "skin", "mainwinMenurowVisible"); 786 tmp = read_ini_string(inifile, "skin", "mainwinMenurowVisible");
742 787
743 if (tmp != NULL) 788 if (tmp != NULL)
744 { 789 {
745 skin->properties.mainwin_menurow_visible = atoi(tmp); 790 skin->properties.mainwin_menurow_visible = atoi(tmp);
746 g_free(tmp); 791 g_free(tmp);
747 } 792 }
748 793
749 skin->properties.mainwin_volume_x = 107;
750 tmp = read_ini_string(inifile, "skin", "mainwinVolumeX"); 794 tmp = read_ini_string(inifile, "skin", "mainwinVolumeX");
751 795
752 if (tmp != NULL) 796 if (tmp != NULL)
753 { 797 {
754 skin->properties.mainwin_volume_x = atoi(tmp); 798 skin->properties.mainwin_volume_x = atoi(tmp);
755 g_free(tmp); 799 g_free(tmp);
756 } 800 }
757 801
758 skin->properties.mainwin_volume_y = 57;
759 tmp = read_ini_string(inifile, "skin", "mainwinVolumeY"); 802 tmp = read_ini_string(inifile, "skin", "mainwinVolumeY");
760 803
761 if (tmp != NULL) 804 if (tmp != NULL)
762 { 805 {
763 skin->properties.mainwin_volume_y = atoi(tmp); 806 skin->properties.mainwin_volume_y = atoi(tmp);
764 g_free(tmp); 807 g_free(tmp);
765 } 808 }
766 809
767 skin->properties.mainwin_balance_x = 177;
768 tmp = read_ini_string(inifile, "skin", "mainwinBalanceX"); 810 tmp = read_ini_string(inifile, "skin", "mainwinBalanceX");
769 811
770 if (tmp != NULL) 812 if (tmp != NULL)
771 { 813 {
772 skin->properties.mainwin_balance_x = atoi(tmp); 814 skin->properties.mainwin_balance_x = atoi(tmp);
773 g_free(tmp); 815 g_free(tmp);
774 } 816 }
775 817
776 skin->properties.mainwin_balance_y = 57;
777 tmp = read_ini_string(inifile, "skin", "mainwinBalanceY"); 818 tmp = read_ini_string(inifile, "skin", "mainwinBalanceY");
778 819
779 if (tmp != NULL) 820 if (tmp != NULL)
780 { 821 {
781 skin->properties.mainwin_balance_y = atoi(tmp); 822 skin->properties.mainwin_balance_y = atoi(tmp);
782 g_free(tmp); 823 g_free(tmp);
783 } 824 }
784 825
785 skin->properties.mainwin_position_x = 16;
786 tmp = read_ini_string(inifile, "skin", "mainwinPositionX"); 826 tmp = read_ini_string(inifile, "skin", "mainwinPositionX");
787 827
788 if (tmp != NULL) 828 if (tmp != NULL)
789 { 829 {
790 skin->properties.mainwin_position_x = atoi(tmp); 830 skin->properties.mainwin_position_x = atoi(tmp);
791 g_free(tmp); 831 g_free(tmp);
792 } 832 }
793 833
794 skin->properties.mainwin_position_y = 72;
795 tmp = read_ini_string(inifile, "skin", "mainwinPositionY"); 834 tmp = read_ini_string(inifile, "skin", "mainwinPositionY");
796 835
797 if (tmp != NULL) 836 if (tmp != NULL)
798 { 837 {
799 skin->properties.mainwin_position_y = atoi(tmp); 838 skin->properties.mainwin_position_y = atoi(tmp);
800 g_free(tmp); 839 g_free(tmp);
801 } 840 }
802 841
803 skin->properties.mainwin_othertext_is_status = FALSE;
804 tmp = read_ini_string(inifile, "skin", "mainwinOthertextIsStatus"); 842 tmp = read_ini_string(inifile, "skin", "mainwinOthertextIsStatus");
805 843
806 if (tmp != NULL) 844 if (tmp != NULL)
807 { 845 {
808 skin->properties.mainwin_othertext_is_status = atoi(tmp); 846 skin->properties.mainwin_othertext_is_status = atoi(tmp);
809 g_free(tmp); 847 g_free(tmp);
810 } 848 }
811 849
812 skin->properties.mainwin_othertext_visible = skin->properties.mainwin_othertext;
813 tmp = read_ini_string(inifile, "skin", "mainwinOthertextVisible"); 850 tmp = read_ini_string(inifile, "skin", "mainwinOthertextVisible");
814 851
815 if (tmp != NULL) 852 if (tmp != NULL)
816 { 853 {
817 skin->properties.mainwin_othertext_visible = atoi(tmp); 854 skin->properties.mainwin_othertext_visible = atoi(tmp);
818 g_free(tmp); 855 g_free(tmp);
819 } 856 }
820 857
821 skin->properties.mainwin_text_visible = TRUE;
822 tmp = read_ini_string(inifile, "skin", "mainwinTextVisible"); 858 tmp = read_ini_string(inifile, "skin", "mainwinTextVisible");
823 859
824 if (tmp != NULL) 860 if (tmp != NULL)
825 { 861 {
826 skin->properties.mainwin_text_visible = atoi(tmp); 862 skin->properties.mainwin_text_visible = atoi(tmp);
827 g_free(tmp); 863 g_free(tmp);
828 } 864 }
829 865
830 skin->properties.mainwin_vis_visible = TRUE;
831 tmp = read_ini_string(inifile, "skin", "mainwinVisVisible"); 866 tmp = read_ini_string(inifile, "skin", "mainwinVisVisible");
832 867
833 if (tmp != NULL) 868 if (tmp != NULL)
834 { 869 {
835 skin->properties.mainwin_vis_visible = atoi(tmp); 870 skin->properties.mainwin_vis_visible = atoi(tmp);
836 g_free(tmp); 871 g_free(tmp);
837 } 872 }
838 873
839 skin->properties.mainwin_previous_x = 16;
840 tmp = read_ini_string(inifile, "skin", "mainwinPreviousX"); 874 tmp = read_ini_string(inifile, "skin", "mainwinPreviousX");
841 875
842 if (tmp != NULL) 876 if (tmp != NULL)
843 { 877 {
844 skin->properties.mainwin_previous_x = atoi(tmp); 878 skin->properties.mainwin_previous_x = atoi(tmp);
845 g_free(tmp); 879 g_free(tmp);
846 } 880 }
847 881
848 skin->properties.mainwin_previous_y = 88;
849 tmp = read_ini_string(inifile, "skin", "mainwinPreviousY"); 882 tmp = read_ini_string(inifile, "skin", "mainwinPreviousY");
850 883
851 if (tmp != NULL) 884 if (tmp != NULL)
852 { 885 {
853 skin->properties.mainwin_previous_y = atoi(tmp); 886 skin->properties.mainwin_previous_y = atoi(tmp);
854 g_free(tmp); 887 g_free(tmp);
855 } 888 }
856 889
857 skin->properties.mainwin_play_x = 39;
858 tmp = read_ini_string(inifile, "skin", "mainwinPlayX"); 890 tmp = read_ini_string(inifile, "skin", "mainwinPlayX");
859 891
860 if (tmp != NULL) 892 if (tmp != NULL)
861 { 893 {
862 skin->properties.mainwin_play_x = atoi(tmp); 894 skin->properties.mainwin_play_x = atoi(tmp);
863 g_free(tmp); 895 g_free(tmp);
864 } 896 }
865 897
866 skin->properties.mainwin_play_y = 88;
867 tmp = read_ini_string(inifile, "skin", "mainwinPlayY"); 898 tmp = read_ini_string(inifile, "skin", "mainwinPlayY");
868 899
869 if (tmp != NULL) 900 if (tmp != NULL)
870 { 901 {
871 skin->properties.mainwin_play_y = atoi(tmp); 902 skin->properties.mainwin_play_y = atoi(tmp);
872 g_free(tmp); 903 g_free(tmp);
873 } 904 }
874 905
875 skin->properties.mainwin_pause_x = 62;
876 tmp = read_ini_string(inifile, "skin", "mainwinPauseX"); 906 tmp = read_ini_string(inifile, "skin", "mainwinPauseX");
877 907
878 if (tmp != NULL) 908 if (tmp != NULL)
879 { 909 {
880 skin->properties.mainwin_pause_x = atoi(tmp); 910 skin->properties.mainwin_pause_x = atoi(tmp);
881 g_free(tmp); 911 g_free(tmp);
882 } 912 }
883 913
884 skin->properties.mainwin_pause_y = 88;
885 tmp = read_ini_string(inifile, "skin", "mainwinPauseY"); 914 tmp = read_ini_string(inifile, "skin", "mainwinPauseY");
886 915
887 if (tmp != NULL) 916 if (tmp != NULL)
888 { 917 {
889 skin->properties.mainwin_pause_y = atoi(tmp); 918 skin->properties.mainwin_pause_y = atoi(tmp);
890 g_free(tmp); 919 g_free(tmp);
891 } 920 }
892 921
893 skin->properties.mainwin_stop_x = 85;
894 tmp = read_ini_string(inifile, "skin", "mainwinStopX"); 922 tmp = read_ini_string(inifile, "skin", "mainwinStopX");
895 923
896 if (tmp != NULL) 924 if (tmp != NULL)
897 { 925 {
898 skin->properties.mainwin_stop_x = atoi(tmp); 926 skin->properties.mainwin_stop_x = atoi(tmp);
899 g_free(tmp); 927 g_free(tmp);
900 } 928 }
901 929
902 skin->properties.mainwin_stop_y = 88;
903 tmp = read_ini_string(inifile, "skin", "mainwinStopY"); 930 tmp = read_ini_string(inifile, "skin", "mainwinStopY");
904 931
905 if (tmp != NULL) 932 if (tmp != NULL)
906 { 933 {
907 skin->properties.mainwin_stop_y = atoi(tmp); 934 skin->properties.mainwin_stop_y = atoi(tmp);
908 g_free(tmp); 935 g_free(tmp);
909 } 936 }
910 937
911 skin->properties.mainwin_next_x = 108;
912 tmp = read_ini_string(inifile, "skin", "mainwinNextX"); 938 tmp = read_ini_string(inifile, "skin", "mainwinNextX");
913 939
914 if (tmp != NULL) 940 if (tmp != NULL)
915 { 941 {
916 skin->properties.mainwin_next_x = atoi(tmp); 942 skin->properties.mainwin_next_x = atoi(tmp);
917 g_free(tmp); 943 g_free(tmp);
918 } 944 }
919 945
920 skin->properties.mainwin_next_y = 88;
921 tmp = read_ini_string(inifile, "skin", "mainwinNextY"); 946 tmp = read_ini_string(inifile, "skin", "mainwinNextY");
922 947
923 if (tmp != NULL) 948 if (tmp != NULL)
924 { 949 {
925 skin->properties.mainwin_next_y = atoi(tmp); 950 skin->properties.mainwin_next_y = atoi(tmp);
926 g_free(tmp); 951 g_free(tmp);
927 } 952 }
928 953
929 skin->properties.mainwin_eject_x = 136;
930 tmp = read_ini_string(inifile, "skin", "mainwinEjectX"); 954 tmp = read_ini_string(inifile, "skin", "mainwinEjectX");
931 955
932 if (tmp != NULL) 956 if (tmp != NULL)
933 { 957 {
934 skin->properties.mainwin_eject_x = atoi(tmp); 958 skin->properties.mainwin_eject_x = atoi(tmp);
935 g_free(tmp); 959 g_free(tmp);
936 } 960 }
937 961
938 skin->properties.mainwin_eject_y = 89;
939 tmp = read_ini_string(inifile, "skin", "mainwinEjectY"); 962 tmp = read_ini_string(inifile, "skin", "mainwinEjectY");
940 963
941 if (tmp != NULL) 964 if (tmp != NULL)
942 { 965 {
943 skin->properties.mainwin_eject_y = atoi(tmp); 966 skin->properties.mainwin_eject_y = atoi(tmp);
944 g_free(tmp); 967 g_free(tmp);
945 } 968 }
946 969
947 skin->properties.mainwin_width = 275;
948 tmp = read_ini_string(inifile, "skin", "mainwinWidth"); 970 tmp = read_ini_string(inifile, "skin", "mainwinWidth");
949 971
950 if (tmp != NULL) 972 if (tmp != NULL)
951 { 973 {
952 skin->properties.mainwin_width = atoi(tmp); 974 skin->properties.mainwin_width = atoi(tmp);
953 g_free(tmp); 975 g_free(tmp);
954 } 976 }
955 977
956 /* XXX: use of skin_mask_info here is bad */
957 skin_mask_info[0].width = skin->properties.mainwin_width;
958
959 skin->properties.mainwin_height = 116;
960 tmp = read_ini_string(inifile, "skin", "mainwinHeight"); 978 tmp = read_ini_string(inifile, "skin", "mainwinHeight");
961 979
962 if (tmp != NULL) 980 if (tmp != NULL)
963 { 981 {
964 skin->properties.mainwin_height = atoi(tmp); 982 skin->properties.mainwin_height = atoi(tmp);
965 g_free(tmp); 983 g_free(tmp);
966 } 984 }
967 985
968 /* XXX: use of skin_mask_info here is bad */
969 skin_mask_info[0].height = skin->properties.mainwin_height;
970
971 skin->properties.mainwin_about_x = 247;
972 tmp = read_ini_string(inifile, "skin", "mainwinAboutX"); 986 tmp = read_ini_string(inifile, "skin", "mainwinAboutX");
973 987
974 if (tmp != NULL) 988 if (tmp != NULL)
975 { 989 {
976 skin->properties.mainwin_about_x = atoi(tmp); 990 skin->properties.mainwin_about_x = atoi(tmp);
977 g_free(tmp); 991 g_free(tmp);
978 } 992 }
979 993
980 skin->properties.mainwin_about_y = 83;
981 tmp = read_ini_string(inifile, "skin", "mainwinAboutY"); 994 tmp = read_ini_string(inifile, "skin", "mainwinAboutY");
982 995
983 if (tmp != NULL) 996 if (tmp != NULL)
984 { 997 {
985 skin->properties.mainwin_about_y = atoi(tmp); 998 skin->properties.mainwin_about_y = atoi(tmp);
986 g_free(tmp); 999 g_free(tmp);
987 } 1000 }
988 1001
989 skin->properties.mainwin_shuffle_x = 164;
990 tmp = read_ini_string(inifile, "skin", "mainwinShuffleX"); 1002 tmp = read_ini_string(inifile, "skin", "mainwinShuffleX");
991 1003
992 if (tmp != NULL) 1004 if (tmp != NULL)
993 { 1005 {
994 skin->properties.mainwin_shuffle_x = atoi(tmp); 1006 skin->properties.mainwin_shuffle_x = atoi(tmp);
995 g_free(tmp); 1007 g_free(tmp);
996 } 1008 }
997 1009
998 skin->properties.mainwin_shuffle_y = 89;
999 tmp = read_ini_string(inifile, "skin", "mainwinShuffleY"); 1010 tmp = read_ini_string(inifile, "skin", "mainwinShuffleY");
1000 1011
1001 if (tmp != NULL) 1012 if (tmp != NULL)
1002 { 1013 {
1003 skin->properties.mainwin_shuffle_y = atoi(tmp); 1014 skin->properties.mainwin_shuffle_y = atoi(tmp);
1004 g_free(tmp); 1015 g_free(tmp);
1005 } 1016 }
1006 1017
1007 skin->properties.mainwin_repeat_x = 210;
1008 tmp = read_ini_string(inifile, "skin", "mainwinRepeatX"); 1018 tmp = read_ini_string(inifile, "skin", "mainwinRepeatX");
1009 1019
1010 if (tmp != NULL) 1020 if (tmp != NULL)
1011 { 1021 {
1012 skin->properties.mainwin_repeat_x = atoi(tmp); 1022 skin->properties.mainwin_repeat_x = atoi(tmp);
1013 g_free(tmp); 1023 g_free(tmp);
1014 } 1024 }
1015 1025
1016 skin->properties.mainwin_repeat_y = 89;
1017 tmp = read_ini_string(inifile, "skin", "mainwinRepeatY"); 1026 tmp = read_ini_string(inifile, "skin", "mainwinRepeatY");
1018 1027
1019 if (tmp != NULL) 1028 if (tmp != NULL)
1020 { 1029 {
1021 skin->properties.mainwin_repeat_y = atoi(tmp); 1030 skin->properties.mainwin_repeat_y = atoi(tmp);
1022 g_free(tmp); 1031 g_free(tmp);
1023 } 1032 }
1024 1033
1025 skin->properties.mainwin_eqbutton_x = 219;
1026 tmp = read_ini_string(inifile, "skin", "mainwinEQButtonX"); 1034 tmp = read_ini_string(inifile, "skin", "mainwinEQButtonX");
1027 1035
1028 if (tmp != NULL) 1036 if (tmp != NULL)
1029 { 1037 {
1030 skin->properties.mainwin_eqbutton_x = atoi(tmp); 1038 skin->properties.mainwin_eqbutton_x = atoi(tmp);
1031 g_free(tmp); 1039 g_free(tmp);
1032 } 1040 }
1033 1041
1034 skin->properties.mainwin_eqbutton_y = 58;
1035 tmp = read_ini_string(inifile, "skin", "mainwinEQButtonY"); 1042 tmp = read_ini_string(inifile, "skin", "mainwinEQButtonY");
1036 1043
1037 if (tmp != NULL) 1044 if (tmp != NULL)
1038 { 1045 {
1039 skin->properties.mainwin_eqbutton_y = atoi(tmp); 1046 skin->properties.mainwin_eqbutton_y = atoi(tmp);
1040 g_free(tmp); 1047 g_free(tmp);
1041 } 1048 }
1042 1049
1043 skin->properties.mainwin_plbutton_x = 242;
1044 tmp = read_ini_string(inifile, "skin", "mainwinPLButtonX"); 1050 tmp = read_ini_string(inifile, "skin", "mainwinPLButtonX");
1045 1051
1046 if (tmp != NULL) 1052 if (tmp != NULL)
1047 { 1053 {
1048 skin->properties.mainwin_plbutton_x = atoi(tmp); 1054 skin->properties.mainwin_plbutton_x = atoi(tmp);
1049 g_free(tmp); 1055 g_free(tmp);
1050 } 1056 }
1051 1057
1052 skin->properties.mainwin_plbutton_y = 58;
1053 tmp = read_ini_string(inifile, "skin", "mainwinPLButtonY"); 1058 tmp = read_ini_string(inifile, "skin", "mainwinPLButtonY");
1054 1059
1055 if (tmp != NULL) 1060 if (tmp != NULL)
1056 { 1061 {
1057 skin->properties.mainwin_plbutton_y = atoi(tmp); 1062 skin->properties.mainwin_plbutton_y = atoi(tmp);
1058 g_free(tmp); 1063 g_free(tmp);
1059 } 1064 }
1060 1065
1061 skin->properties.textbox_bitmap_font_width = 5;
1062 tmp = read_ini_string(inifile, "skin", "textboxBitmapFontWidth"); 1066 tmp = read_ini_string(inifile, "skin", "textboxBitmapFontWidth");
1063 1067
1064 if (tmp != NULL) 1068 if (tmp != NULL)
1065 { 1069 {
1066 skin->properties.textbox_bitmap_font_width = atoi(tmp); 1070 skin->properties.textbox_bitmap_font_width = atoi(tmp);
1067 g_free(tmp); 1071 g_free(tmp);
1068 } 1072 }
1069 1073
1070 skin->properties.textbox_bitmap_font_height = 6;
1071 tmp = read_ini_string(inifile, "skin", "textboxBitmapFontHeight"); 1074 tmp = read_ini_string(inifile, "skin", "textboxBitmapFontHeight");
1072 1075
1073 if (tmp != NULL) 1076 if (tmp != NULL)
1074 { 1077 {
1075 skin->properties.textbox_bitmap_font_height = atoi(tmp); 1078 skin->properties.textbox_bitmap_font_height = atoi(tmp);
1076 g_free(tmp); 1079 g_free(tmp);
1077 } 1080 }
1078 1081
1079 skin->properties.mainwin_minimize_x = 244;
1080 tmp = read_ini_string(inifile, "skin", "mainwinMinimizeX"); 1082 tmp = read_ini_string(inifile, "skin", "mainwinMinimizeX");
1081 1083
1082 if (tmp != NULL) 1084 if (tmp != NULL)
1083 { 1085 {
1084 skin->properties.mainwin_minimize_x = atoi(tmp); 1086 skin->properties.mainwin_minimize_x = atoi(tmp);
1085 g_free(tmp); 1087 g_free(tmp);
1086 } 1088 }
1087 1089
1088 skin->properties.mainwin_minimize_y = 3;
1089 tmp = read_ini_string(inifile, "skin", "mainwinMinimizeY"); 1090 tmp = read_ini_string(inifile, "skin", "mainwinMinimizeY");
1090 1091
1091 if (tmp != NULL) 1092 if (tmp != NULL)
1092 { 1093 {
1093 skin->properties.mainwin_minimize_y = atoi(tmp); 1094 skin->properties.mainwin_minimize_y = atoi(tmp);
1094 g_free(tmp); 1095 g_free(tmp);
1095 } 1096 }
1096 1097
1097 skin->properties.mainwin_shade_x = 254;
1098 tmp = read_ini_string(inifile, "skin", "mainwinShadeX"); 1098 tmp = read_ini_string(inifile, "skin", "mainwinShadeX");
1099 1099
1100 if (tmp != NULL) 1100 if (tmp != NULL)
1101 { 1101 {
1102 skin->properties.mainwin_shade_x = atoi(tmp); 1102 skin->properties.mainwin_shade_x = atoi(tmp);
1103 g_free(tmp); 1103 g_free(tmp);
1104 } 1104 }
1105 1105
1106 skin->properties.mainwin_shade_y = 3;
1107 tmp = read_ini_string(inifile, "skin", "mainwinShadeY"); 1106 tmp = read_ini_string(inifile, "skin", "mainwinShadeY");
1108 1107
1109 if (tmp != NULL) 1108 if (tmp != NULL)
1110 { 1109 {
1111 skin->properties.mainwin_shade_y = atoi(tmp); 1110 skin->properties.mainwin_shade_y = atoi(tmp);
1112 g_free(tmp); 1111 g_free(tmp);
1113 } 1112 }
1114 1113
1115 skin->properties.mainwin_close_x = 264;
1116 tmp = read_ini_string(inifile, "skin", "mainwinCloseX"); 1114 tmp = read_ini_string(inifile, "skin", "mainwinCloseX");
1117 1115
1118 if (tmp != NULL) 1116 if (tmp != NULL)
1119 { 1117 {
1120 skin->properties.mainwin_close_x = atoi(tmp); 1118 skin->properties.mainwin_close_x = atoi(tmp);
1121 g_free(tmp); 1119 g_free(tmp);
1122 } 1120 }
1123 1121
1124 skin->properties.mainwin_close_y = 3;
1125 tmp = read_ini_string(inifile, "skin", "mainwinCloseY"); 1122 tmp = read_ini_string(inifile, "skin", "mainwinCloseY");
1126 1123
1127 if (tmp != NULL) 1124 if (tmp != NULL)
1128 { 1125 {
1129 skin->properties.mainwin_close_y = atoi(tmp); 1126 skin->properties.mainwin_close_y = atoi(tmp);