| … | |
… | |
| 15 | * - extensive modifications |
15 | * - extensive modifications |
| 16 | * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> |
16 | * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> |
| 17 | * |
17 | * |
| 18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
| 19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
| 20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 3 of the License, or |
| 21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
| 22 | * |
22 | * |
| 23 | * This program is distributed in the hope that it will be useful, |
23 | * This program is distributed in the hope that it will be useful, |
| 24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| … | |
… | |
| 239 | |
239 | |
| 240 | #if USE_XIM |
240 | #if USE_XIM |
| 241 | im_destroy (); |
241 | im_destroy (); |
| 242 | #endif |
242 | #endif |
| 243 | scrollBar.destroy (); |
243 | scrollBar.destroy (); |
|
|
244 | |
|
|
245 | if (gc) |
| 244 | if (gc) XFreeGC (dpy, gc); |
246 | XFreeGC (dpy, gc); |
| 245 | |
247 | |
| 246 | delete drawable; |
248 | delete drawable; |
|
|
249 | |
| 247 | // destroy all windows |
250 | // destroy all windows |
| 248 | if (parent) |
251 | if (parent) |
| 249 | XDestroyWindow (dpy, parent); |
252 | XDestroyWindow (dpy, parent); |
| 250 | |
253 | |
| 251 | for (int i = 0; i < TOTAL_COLORS; i++) |
254 | for (int i = 0; i < TOTAL_COLORS; i++) |
| … | |
… | |
| 273 | free (selection.clip_text); |
276 | free (selection.clip_text); |
| 274 | free (locale); |
277 | free (locale); |
| 275 | free (v_buffer); |
278 | free (v_buffer); |
| 276 | |
279 | |
| 277 | delete selection_req; |
280 | delete selection_req; |
|
|
281 | |
|
|
282 | if (memcmp (env, envv->begin (), envv->size () * sizeof (char *))) |
|
|
283 | rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n"); |
|
|
284 | |
|
|
285 | delete env; |
| 278 | |
286 | |
| 279 | delete envv; |
287 | delete envv; |
| 280 | delete argv; |
288 | delete argv; |
| 281 | |
289 | |
| 282 | #ifdef KEYSYM_RESOURCE |
290 | #ifdef KEYSYM_RESOURCE |
| … | |
… | |
| 1367 | unsigned long fg, bg; |
1375 | unsigned long fg, bg; |
| 1368 | const char *p; |
1376 | const char *p; |
| 1369 | char **s; |
1377 | char **s; |
| 1370 | XIMStyles *xim_styles; |
1378 | XIMStyles *xim_styles; |
| 1371 | |
1379 | |
| 1372 | set_environ (envv); |
1380 | set_environ (env); |
| 1373 | |
1381 | |
| 1374 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1382 | if (!((p = XSetLocaleModifiers (modifiers)) && *p)) |
| 1375 | return false; |
1383 | return false; |
| 1376 | |
1384 | |
| 1377 | input_method = display->get_xim (locale, modifiers); |
1385 | input_method = display->get_xim (locale, modifiers); |
| 1378 | if (input_method == NULL) |
1386 | if (input_method == NULL) |
| 1379 | return false; |
1387 | return false; |
| … | |
… | |
| 1687 | rxvt_term::update_background () |
1695 | rxvt_term::update_background () |
| 1688 | { |
1696 | { |
| 1689 | if (update_background_ev.is_active ()) |
1697 | if (update_background_ev.is_active ()) |
| 1690 | return; |
1698 | return; |
| 1691 | |
1699 | |
| 1692 | bg_flags &= BG_INHIBIT_RENDER; |
|
|
| 1693 | |
|
|
| 1694 | if (!mapped) |
|
|
| 1695 | return; |
|
|
| 1696 | |
|
|
| 1697 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1700 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
| 1698 | |
1701 | |
| 1699 | if (to_wait <= 0.) |
1702 | if (to_wait <= 0.) |
| 1700 | bg_render (); |
1703 | bg_render (); |
| 1701 | else |
1704 | else |
