Blame

Date:
Message:
append killed tabs when parsing session to preserve the order The other option, less intrusive, would be to send the killed tabs in reverse order, but it'd seems strange when looking at the session file otherwise. So, add a `append' flag to kill_tab to optionally append the killed tab instead of pre-pending it.
Actions:
History | Blob | Raw File
  1 1fce2e75 2021-08-14 op /*

  2 1fce2e75 2021-08-14 op  * Copyright (c) 2021 Omar Polo <op@omarpolo.com>

  3 1fce2e75 2021-08-14 op  *

  4 1fce2e75 2021-08-14 op  * Permission to use, copy, modify, and distribute this software for any

  5 1fce2e75 2021-08-14 op  * purpose with or without fee is hereby granted, provided that the above

  6 1fce2e75 2021-08-14 op  * copyright notice and this permission notice appear in all copies.

  7 1fce2e75 2021-08-14 op  *

  8 1fce2e75 2021-08-14 op  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

  9 1fce2e75 2021-08-14 op  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 10 1fce2e75 2021-08-14 op  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 11 1fce2e75 2021-08-14 op  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 12 1fce2e75 2021-08-14 op  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 13 1fce2e75 2021-08-14 op  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 14 1fce2e75 2021-08-14 op  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 15 1fce2e75 2021-08-14 op  */

 16 1fce2e75 2021-08-14 op 

 17 1fce2e75 2021-08-14 op #include "compat.h"

 18 1fce2e75 2021-08-14 op 

 19 1fce2e75 2021-08-14 op #include <errno.h>

 20 1fce2e75 2021-08-14 op #include <stdio.h>

 21 1fce2e75 2021-08-14 op #include <stdlib.h>

 22 1fce2e75 2021-08-14 op #include <string.h>

 23 1fce2e75 2021-08-14 op #include <unistd.h>

 24 1fce2e75 2021-08-14 op 

 25 1fce2e75 2021-08-14 op #include "defaults.h"

 26 b9fcc0e9 2021-10-08 op #include "fs.h"

 27 1fce2e75 2021-08-14 op #include "minibuffer.h"

 28 1fce2e75 2021-08-14 op #include "parser.h"

 29 1fce2e75 2021-08-14 op #include "session.h"

 30 1fce2e75 2021-08-14 op #include "ui.h"

 31 1fce2e75 2021-08-14 op 

 32 1fce2e75 2021-08-14 op static struct event	 autosaveev;

 33 1fce2e75 2021-08-14 op 

 34 1fce2e75 2021-08-14 op void

 35 1fce2e75 2021-08-14 op switch_to_tab(struct tab *tab)

 36 1fce2e75 2021-08-14 op {

 37 1fce2e75 2021-08-14 op 	current_tab = tab;

 38 1fce2e75 2021-08-14 op 	tab->flags &= ~TAB_URGENT;

 39 1fce2e75 2021-08-14 op 

 40 ea639250 2021-01-02 op 	if (operating && tab->flags & TAB_LAZY) {

 41 ea639250 2021-01-02 op 		tab->flags ^= TAB_LAZY;

 42 ea639250 2021-01-02 op 		load_url_in_tab(tab, tab->hist_cur->h, NULL, 1);

 43 ea639250 2021-01-02 op 	}

 44 1fce2e75 2021-08-14 op }

 45 1fce2e75 2021-08-14 op 

 46 1fce2e75 2021-08-14 op unsigned int

 47 1fce2e75 2021-08-14 op tab_new_id(void)

 48 1fce2e75 2021-08-14 op {

 49 1fce2e75 2021-08-14 op 	static uint32_t tab_counter;

 50 1fce2e75 2021-08-14 op 

 51 1fce2e75 2021-08-14 op 	return tab_counter++;

 52 1fce2e75 2021-08-14 op }

 53 1fce2e75 2021-08-14 op 

 54 1fce2e75 2021-08-14 op struct tab *

 55 1fce2e75 2021-08-14 op new_tab(const char *url, const char *base, struct tab *after)

 56 1fce2e75 2021-08-14 op {

 57 1fce2e75 2021-08-14 op 	struct tab	*tab;

 58 1fce2e75 2021-08-14 op 

 59 87aeb47b 2021-08-18 op 	ui_schedule_redraw();

 60 1fce2e75 2021-08-14 op 	autosave_hook();

 61 1fce2e75 2021-08-14 op 

 62 1fce2e75 2021-08-14 op 	if ((tab = calloc(1, sizeof(*tab))) == NULL) {

 63 1fce2e75 2021-08-14 op 		event_loopbreak();

 64 1fce2e75 2021-08-14 op 		return NULL;

 65 1fce2e75 2021-08-14 op 	}

 66 1fce2e75 2021-08-14 op 

 67 1fce2e75 2021-08-14 op 	TAILQ_INIT(&tab->hist.head);

 68 1fce2e75 2021-08-14 op 

 69 1fce2e75 2021-08-14 op 	TAILQ_INIT(&tab->buffer.head);

 70 1fce2e75 2021-08-14 op 	TAILQ_INIT(&tab->buffer.page.head);

 71 1fce2e75 2021-08-14 op 

 72 1fce2e75 2021-08-14 op 	tab->id = tab_new_id();

 73 1fce2e75 2021-08-14 op 

 74 1fce2e75 2021-08-14 op 	if (after != NULL)

 75 1fce2e75 2021-08-14 op 		TAILQ_INSERT_AFTER(&tabshead, after, tab, tabs);

 76 1fce2e75 2021-08-14 op 	else

 77 1fce2e75 2021-08-14 op 		TAILQ_INSERT_TAIL(&tabshead, tab, tabs);

 78 1fce2e75 2021-08-14 op 

 79 ea639250 2021-01-02 op 	if (!operating)

 80 ea639250 2021-01-02 op 		tab->flags |= TAB_LAZY;

 81 1fce2e75 2021-08-14 op 	load_url_in_tab(tab, url, base, 0);

 82 ea639250 2021-01-02 op 	switch_to_tab(tab);

 83 1fce2e75 2021-08-14 op 	return tab;

 84 1fce2e75 2021-08-14 op }

 85 1fce2e75 2021-08-14 op 

 86 1fce2e75 2021-08-14 op /*

 87 6c74799d 2022-01-05 op  * Move a tab from the tablist to the killed tab list and erase its

 88 05de8ac3 2022-01-06 op  * contents.  Append should always be 0 to prepend tabs so unkill_tab

 89 05de8ac3 2022-01-06 op  * can work correctly; appending is only useful during startup when

 90 05de8ac3 2022-01-06 op  * receiving the list of killed tabs to keep the correct order.

 91 05de8ac3 2022-01-06 op  * NB: doesn't update the current_tab.

 92 1fce2e75 2021-08-14 op  */

 93 1fce2e75 2021-08-14 op void

 94 05de8ac3 2022-01-06 op kill_tab(struct tab *tab, int append)

 95 1fce2e75 2021-08-14 op {

 96 6c74799d 2022-01-05 op 	int count;

 97 6c74799d 2022-01-05 op 

 98 1fce2e75 2021-08-14 op 	stop_tab(tab);

 99 6c74799d 2022-01-05 op 	erase_buffer(&tab->buffer);

100 6c74799d 2022-01-05 op 	TAILQ_REMOVE(&tabshead, tab, tabs);

101 87aeb47b 2021-08-18 op 	ui_schedule_redraw();

102 1fce2e75 2021-08-14 op 	autosave_hook();

103 1fce2e75 2021-08-14 op 

104 1fce2e75 2021-08-14 op 	if (evtimer_pending(&tab->loadingev, NULL))

105 1fce2e75 2021-08-14 op 		evtimer_del(&tab->loadingev);

106 1fce2e75 2021-08-14 op 

107 05de8ac3 2022-01-06 op 	if (append)

108 05de8ac3 2022-01-06 op 		TAILQ_INSERT_TAIL(&ktabshead, tab, tabs);

109 05de8ac3 2022-01-06 op 	else

110 05de8ac3 2022-01-06 op 		TAILQ_INSERT_HEAD(&ktabshead, tab, tabs);

111 6c74799d 2022-01-05 op 

112 6c74799d 2022-01-05 op 	/* gc closed tabs */

113 6c74799d 2022-01-05 op 	count = 0;

114 6c74799d 2022-01-05 op 	TAILQ_FOREACH(tab, &ktabshead, tabs)

115 6c74799d 2022-01-05 op 		count++;

116 6c74799d 2022-01-05 op 	while (count > max_killed_tabs) {

117 6c74799d 2022-01-05 op 		count--;

118 6c74799d 2022-01-05 op 		free_tab(TAILQ_LAST(&ktabshead, tabshead));

119 6c74799d 2022-01-05 op 	}

120 6c74799d 2022-01-05 op }

121 6c74799d 2022-01-05 op 

122 6c74799d 2022-01-05 op /*

123 265508d0 2022-01-05 op  * Resurrects the lastest killed tab and returns it.  The tab is already

124 6c74799d 2022-01-05 op  * added to the tab list with the TAB_LAZY flag set.  NB: this doesn't

125 6c74799d 2022-01-05 op  * update current_tab.

126 6c74799d 2022-01-05 op  */

127 6c74799d 2022-01-05 op struct tab *

128 6c74799d 2022-01-05 op unkill_tab(void)

129 6c74799d 2022-01-05 op {

130 6c74799d 2022-01-05 op 	struct tab *t;

131 6c74799d 2022-01-05 op 

132 6c74799d 2022-01-05 op 	if (TAILQ_EMPTY(&ktabshead))

133 6c74799d 2022-01-05 op 		return NULL;

134 6c74799d 2022-01-05 op 

135 6c74799d 2022-01-05 op 	autosave_hook();

136 6c74799d 2022-01-05 op 

137 6c74799d 2022-01-05 op 	t = TAILQ_FIRST(&ktabshead);

138 6c74799d 2022-01-05 op 	TAILQ_REMOVE(&ktabshead, t, tabs);

139 6c74799d 2022-01-05 op 	TAILQ_INSERT_TAIL(&tabshead, t, tabs);

140 6c74799d 2022-01-05 op 	t->flags |= TAB_LAZY;

141 6c74799d 2022-01-05 op 	return t;

142 6c74799d 2022-01-05 op }

143 6c74799d 2022-01-05 op 

144 6c74799d 2022-01-05 op /*

145 1b45e5df 2022-01-05 op  * Free every resource linked to the tab, including the tab itself, and

146 1b45e5df 2022-01-05 op  * removes it from the *killed* tablist.

147 6c74799d 2022-01-05 op  */

148 6c74799d 2022-01-05 op void

149 6c74799d 2022-01-05 op free_tab(struct tab *tab)

150 6c74799d 2022-01-05 op {

151 6c74799d 2022-01-05 op 	TAILQ_REMOVE(&ktabshead, tab, tabs);

152 bf935370 2022-01-05 op 	hist_clear(&tab->hist);

153 1fce2e75 2021-08-14 op 	free(tab);

154 1fce2e75 2021-08-14 op }

155 1fce2e75 2021-08-14 op 

156 1fce2e75 2021-08-14 op void

157 1fce2e75 2021-08-14 op stop_tab(struct tab *tab)

158 1fce2e75 2021-08-14 op {

159 1fce2e75 2021-08-14 op 	ui_send_net(IMSG_STOP, tab->id, NULL, 0);

160 1fce2e75 2021-08-14 op }

161 1fce2e75 2021-08-14 op 

162 6c74799d 2022-01-05 op static inline void

163 6c74799d 2022-01-05 op sendtab(struct tab *tab, int killed)

164 1fce2e75 2021-08-14 op {

165 f8c6e753 2021-12-30 op 	struct session_tab	 st;

166 1040cc7f 2021-01-02 op 	struct session_tab_hist	 sth;

167 1040cc7f 2021-01-02 op 	struct hist		*h;

168 1040cc7f 2021-01-02 op 	int			 future;

169 1fce2e75 2021-08-14 op 

170 6c74799d 2022-01-05 op 	memset(&st, 0, sizeof(st));

171 d0971653 2021-09-15 op 

172 6c74799d 2022-01-05 op 	if (tab == current_tab)

173 6c74799d 2022-01-05 op 		st.flags |= TAB_CURRENT;

174 6c74799d 2022-01-05 op 	if (killed)

175 6c74799d 2022-01-05 op 		st.flags |= TAB_KILLED;

176 1fce2e75 2021-08-14 op 

177 6c74799d 2022-01-05 op 	strlcpy(st.uri, tab->hist_cur->h, sizeof(st.uri));

178 6c74799d 2022-01-05 op 	strlcpy(st.title, tab->buffer.page.title, sizeof(st.title));

179 6c74799d 2022-01-05 op 	ui_send_fs(IMSG_SESSION_TAB, 0, &st, sizeof(st));

180 f8c6e753 2021-12-30 op 

181 6c74799d 2022-01-05 op 	future = 0;

182 6c74799d 2022-01-05 op 	TAILQ_FOREACH(h, &tab->hist.head, entries) {

183 6c74799d 2022-01-05 op 		if (h == tab->hist_cur) {

184 6c74799d 2022-01-05 op 			future = 1;

185 6c74799d 2022-01-05 op 			continue;

186 6c74799d 2022-01-05 op 		}

187 1fce2e75 2021-08-14 op 

188 6c74799d 2022-01-05 op 		memset(&sth, 0, sizeof(sth));

189 6c74799d 2022-01-05 op 		strlcpy(sth.uri, h->h, sizeof(sth.uri));

190 6c74799d 2022-01-05 op 		sth.future = future;

191 6c74799d 2022-01-05 op 		ui_send_fs(IMSG_SESSION_TAB_HIST, 0, &sth, sizeof(sth));

192 6c74799d 2022-01-05 op 	}

193 1040cc7f 2021-01-02 op 

194 6c74799d 2022-01-05 op }

195 1040cc7f 2021-01-02 op 

196 6c74799d 2022-01-05 op void

197 6c74799d 2022-01-05 op save_session(void)

198 6c74799d 2022-01-05 op {

199 6c74799d 2022-01-05 op 	struct tab		*tab;

200 1fce2e75 2021-08-14 op 

201 6c74799d 2022-01-05 op 	if (safe_mode)

202 6c74799d 2022-01-05 op 		return;

203 6c74799d 2022-01-05 op 

204 6c74799d 2022-01-05 op 	ui_send_fs(IMSG_SESSION_START, 0, NULL, 0);

205 6c74799d 2022-01-05 op 

206 6c74799d 2022-01-05 op 	TAILQ_FOREACH(tab, &tabshead, tabs)

207 6c74799d 2022-01-05 op 		sendtab(tab, 0);

208 6c74799d 2022-01-05 op 	TAILQ_FOREACH(tab, &ktabshead, tabs)

209 6c74799d 2022-01-05 op 		sendtab(tab, 1);

210 6c74799d 2022-01-05 op 

211 1fce2e75 2021-08-14 op 	ui_send_fs(IMSG_SESSION_END, 0, NULL, 0);

212 1fce2e75 2021-08-14 op }

213 1fce2e75 2021-08-14 op 

214 1fce2e75 2021-08-14 op void

215 1fce2e75 2021-08-14 op autosave_init(void)

216 1fce2e75 2021-08-14 op {

217 1fce2e75 2021-08-14 op 	evtimer_set(&autosaveev, autosave_timer, NULL);

218 1fce2e75 2021-08-14 op }

219 1fce2e75 2021-08-14 op 

220 1fce2e75 2021-08-14 op void

221 1fce2e75 2021-08-14 op autosave_timer(int fd, short event, void *data)

222 1fce2e75 2021-08-14 op {

223 1fce2e75 2021-08-14 op 	save_session();

224 1fce2e75 2021-08-14 op }

225 1fce2e75 2021-08-14 op 

226 1fce2e75 2021-08-14 op /*

227 1fce2e75 2021-08-14 op  * Function to be called in "interesting" places where we may want to

228 1fce2e75 2021-08-14 op  * schedule an autosave (like on new tab or before loading an url.)

229 1fce2e75 2021-08-14 op  */

230 1fce2e75 2021-08-14 op void

231 1fce2e75 2021-08-14 op autosave_hook(void)

232 1fce2e75 2021-08-14 op {

233 1fce2e75 2021-08-14 op 	struct timeval tv;

234 1fce2e75 2021-08-14 op 

235 1fce2e75 2021-08-14 op 	if (autosave <= 0)

236 1fce2e75 2021-08-14 op 		return;

237 1fce2e75 2021-08-14 op 

238 1fce2e75 2021-08-14 op 	if (!evtimer_pending(&autosaveev, NULL)) {

239 1fce2e75 2021-08-14 op 		tv.tv_sec = autosave;

240 1fce2e75 2021-08-14 op 		tv.tv_usec = 0;

241 1fce2e75 2021-08-14 op 

242 1fce2e75 2021-08-14 op 		evtimer_add(&autosaveev, &tv);

243 1fce2e75 2021-08-14 op 	}

244 1fce2e75 2021-08-14 op }