From b2a1b2d40cd9a5b0b86c622acf05e2593dd61a14 Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Tue, 28 Dec 2010 19:07:58 +0000 Subject: Allow multiple urls to be selected with -n --- xxxterm.1 | 9 +++++---- xxxterm.c | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/xxxterm.1 b/xxxterm.1 index 9d71d65..9df7049 100644 --- a/xxxterm.1 +++ b/xxxterm.1 @@ -25,8 +25,8 @@ .Bk -words .Op Fl STtV .Op Fl f Ar file -.Op Fl n Ar url -.Op Ar uri ... +.Op Fl n +.Op Ar url ... .Ek .Sh DESCRIPTION .Nm @@ -75,9 +75,10 @@ Disable the toolbar. Disable visualization of tabs. .It Fl t Disable tabs. -.It Fl n Ar url +.It Fl n Open a new tab in a running -.Nm . +.Nm +for each specified url. This option requires enable_socket to be enabled. .It Fl V Display version and exit. diff --git a/xxxterm.c b/xxxterm.c index fbf3f67..7a6d415 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -4183,7 +4183,7 @@ void usage(void) { fprintf(stderr, - "%s [-STVt][-f file][-n url] url ...\n", __progname); + "%s [-nSTVt][-f file] url ...\n", __progname); exit(0); } @@ -4191,13 +4191,13 @@ int main(int argc, char *argv[]) { struct stat sb; - int c, focus = 1, s; + int c, focus = 1, s, optn = 0; char conf[PATH_MAX] = { '\0' }; char file[PATH_MAX]; char *env_proxy = NULL; FILE *f = NULL; - while ((c = getopt(argc, argv, "STVf:tn:")) != -1) { + while ((c = getopt(argc, argv, "STVf:tn")) != -1) { switch (c) { case 'S': showurl = 0; @@ -4215,8 +4215,8 @@ main(int argc, char *argv[]) tabless = 1; break; case 'n': - send_url_to_socket(optarg); - exit(0); + optn = 1; + break; default: usage(); /* NOTREACHED */ @@ -4225,6 +4225,16 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + if (optn) { + while (argc) { + send_url_to_socket(argv[0]); + + argc--; + argv++; + } + exit(0); + } + TAILQ_INIT(&tabs); RB_INIT(&hl); RB_INIT(&js_wl); -- cgit 1.4.1-2-gfad0 n' name='h' value='hlt'/>
path: root/002test.cc
blob: 13398bb5769888e712fa0e99ab34ff92c95c7099 (plain) (tree) 
b8757483 ^


9a81d746 ^

b8757483 ^

c02478c4 ^





51530916 ^



5f05e954 ^


51530916 ^

6a9d8191 ^

51530916 ^


1ba81b0f ^

b39ceb27 ^

2ed1aa9c ^

51530916 ^


1ba81b0f ^

51530916 ^

60c566ea ^

54e4548d ^

51530916 ^

2ed1aa9c ^

51530916 ^



60c566ea ^

54e4548d ^

51530916 ^


2ed1aa9c ^

51530916 ^


de49fb42 ^



b39ceb27 ^

df0b469f ^

b39ceb27 ^







51530916 ^

b39ceb27 ^

6c96a437 ^

9e608a77 ^

6c96a437 ^

6c1376f8 ^

9e608a77 ^


b39ceb27 ^

5a9e3a11 ^

683d53ca ^

b39ceb27 ^



683d53ca ^


b39ceb27 ^

df0b469f ^

ccd792da ^

51530916 ^

ac0e9db5 ^

7d13531e ^




eb3a527a ^



b5ab709c ^

fb4836dc ^

b5ab709c ^

eef0251c ^

51530916 ^


0f125d5f ^

ad6eb923 ^



86acd630 ^


b24eb476 ^

eb3a527a ^

65ccad4c ^

b24eb476 ^

40be2522 ^

eb3a527a ^




37537bf3 ^










51530916 ^

f2043a73 ^

1
2

3

4

5
6
7
8
9

10
11
12

13
14

15

16

17
18

19

20

21

22
23

24

25

26

27

28

29

30
31
32

33

34

35
36

37

38
39

40
41
42

43

44

45
46
47
48
49
50
51

52

53

54

55

56

57

58
59

60

61

62

63
64
65

66
67

68

69

70

71

72

73
74
75
76

77
78
79

80

81

82

83

84
85

86

87
88
89

90
91

92

93

94

95

96

97
98
99
100

101
102
103
104
105
106
107
108
109
110

111

112