Diff

Differences From Artifact [321d6db447]:

To Artifact [a799fe028a]:


1577
1578
1579
1580
1581
1582
1583


1584

1585
1586

1587
1588
1589
1590








1591
1592
1593
1594
1595






1596

1597
1598
1599
1600
1601
1602




1603
1604
1605
1606


1607
1608
1609




1610
1611
1612
1613






1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625


1626
1627
1628




1629
1630
1631
1632


1633
1634
1635
1636





1637
1638
1639
1640



1641
1642
1643



1644
1645
1646



1647
1648
1649



1650
1651
1652



1653
1654
1655
























1656
1657
1658
1659
1660
1661
1662
1577
1578
1579
1580
1581
1582
1583
1584
1585

1586
1587

1588
1589



1590
1591
1592
1593
1594
1595
1596
1597





1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608



1609
1610
1611
1612




1613
1614



1615
1616
1617
1618




1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634


1635
1636



1637
1638
1639
1640




1641
1642




1643
1644
1645
1646
1647




1648
1649
1650
1651


1652
1653
1654
1655


1656
1657
1658
1659


1660
1661
1662
1663


1664
1665
1666
1667


1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698







+
+
-
+

-
+

-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+

+



-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+










-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+

-
-
+
+
+

-
-
+
+
+

-
-
+
+
+

-
-
+
+
+

-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







}

char *get_x_display(void)
{
    return gdk_get_display();
}

char *app_name = "pterm";

int main(int argc, char **argv)
int do_cmdline(int argc, char **argv, int do_everything)
{
    extern int pty_master_fd;	       /* declared in pty.c */
    int err = 0;
    extern char **pty_argv;	       /* declared in pty.c */
    extern void pty_pre_init(void);    /* declared in pty.c */
    int err = 0;


    /*
     * Macros to make argument handling easier.
     */
#define EXPECTS_ARG do { \
    if (--argc <= 0) { \
	err = 1; \
	fprintf(stderr, "pterm: %s expects an argument\n", p); \
    pty_pre_init();

    gtk_init(&argc, &argv);

    do_defaults(NULL, &cfg);
    } else \
	val = *++argv; \
} while (0)
#define SECOND_PASS_ONLY do { \
    if (!do_everything) continue; \
} while (0)

    char *val;
    while (--argc > 0) {
	char *p = *++argv;
	if (!strcmp(p, "-fn")) {
	    if (--argc > 0) {
		strncpy(cfg.font, *++argv, sizeof(cfg.font));
		cfg.font[sizeof(cfg.font)-1] = '\0';
	    EXPECTS_ARG;
	    SECOND_PASS_ONLY;
	    strncpy(cfg.font, val, sizeof(cfg.font));
	    cfg.font[sizeof(cfg.font)-1] = '\0';
	    } else
		err = 1, fprintf(stderr, "pterm: -fn expects an argument\n");
	}
	if (!strcmp(p, "-fb")) {

	} else if (!strcmp(p, "-fb")) {
	    if (--argc > 0) {
		strncpy(cfg.boldfont, *++argv, sizeof(cfg.boldfont));
		cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0';
	    EXPECTS_ARG;
	    SECOND_PASS_ONLY;
	    strncpy(cfg.boldfont, val, sizeof(cfg.boldfont));
	    cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0';
	    } else
		err = 1, fprintf(stderr, "pterm: -fb expects an argument\n");
	}
	if (!strcmp(p, "-e")) {

	} else if (!strcmp(p, "-e")) {
	    /* This option swallows all further arguments. */
	    if (!do_everything)
		break;

	    if (--argc > 0) {
		int i;
		pty_argv = smalloc((argc+1) * sizeof(char *));
		++argv;
		for (i = 0; i < argc; i++)
		    pty_argv[i] = argv[i];
		pty_argv[argc] = NULL;
		break;		       /* finished command-line processing */
	    } else
		err = 1, fprintf(stderr, "pterm: -e expects an argument\n");
	}
	if (!strcmp(p, "-T")) {

	} else if (!strcmp(p, "-T")) {
	    if (--argc > 0) {
		strncpy(cfg.wintitle, *++argv, sizeof(cfg.wintitle));
		cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0';
	    EXPECTS_ARG;
	    SECOND_PASS_ONLY;
	    strncpy(cfg.wintitle, val, sizeof(cfg.wintitle));
	    cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0';
	    } else
		err = 1, fprintf(stderr, "pterm: -T expects an argument\n");
	}
	if (!strcmp(p, "-log")) {

	} else if (!strcmp(p, "-log")) {
	    if (--argc > 0) {
		strncpy(cfg.logfilename, *++argv, sizeof(cfg.logfilename));
		cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
		cfg.logtype = LGTYP_DEBUG;
	    EXPECTS_ARG;
	    SECOND_PASS_ONLY;
	    strncpy(cfg.logfilename, val, sizeof(cfg.logfilename));
	    cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
	    cfg.logtype = LGTYP_DEBUG;
	    } else
		err = 1, fprintf(stderr, "pterm: -log expects an argument\n");
	}
	if (!strcmp(p, "-hide")) {

	} else if (!strcmp(p, "-hide")) {
	    SECOND_PASS_ONLY;
	    cfg.hide_mouseptr = 1;
	}
	if (!strcmp(p, "-ut-")) {

	} else if (!strcmp(p, "-ut-")) {
	    SECOND_PASS_ONLY;
	    cfg.stamp_utmp = 0;
	}
	if (!strcmp(p, "-ls-")) {

	} else if (!strcmp(p, "-ls-")) {
	    SECOND_PASS_ONLY;
	    cfg.login_shell = 0;
	}
	if (!strcmp(p, "-nethack")) {

	} else if (!strcmp(p, "-nethack")) {
	    SECOND_PASS_ONLY;
	    cfg.nethack_keypad = 1;
	}
	if (!strcmp(p, "-sb-")) {

	} else if (!strcmp(p, "-sb-")) {
	    SECOND_PASS_ONLY;
	    cfg.scrollbar = 0;
	}
    }

	} else if (!strcmp(p, "-name")) {
	    EXPECTS_ARG;
	    app_name = val;
	}
    }

    return err;
}

int main(int argc, char **argv)
{
    extern int pty_master_fd;	       /* declared in pty.c */
    extern void pty_pre_init(void);    /* declared in pty.c */

    pty_pre_init();

    gtk_init(&argc, &argv);

    if (do_cmdline(argc, argv, 0))     /* pre-defaults pass to get -class */
	exit(1);
    do_defaults(NULL, &cfg);
    if (do_cmdline(argc, argv, 1))     /* post-defaults, do everything */
	exit(1);

    inst->fonts[0] = gdk_font_load(cfg.font);
    if (!inst->fonts[0]) {
	fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
	exit(1);
    }
    if (cfg.boldfont[0]) {