← Back to branch summary

~ubuntu-branches/ubuntu/precise/xterm/precise-updates

« back to all changes in this revision

Viewing changes to util.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2011-02-10 18:48:37 UTC
  • mto: (1.4.11 upstream) (11.1.24 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: james.westby@ubuntu.com-20110210184837-zr6xtudedxk969gp
Import upstream version 268

Show diffs side-by-side

added added

removed removed

Lines of Context:
util.c
1
 
/* $XTermId: util.c,v 1.541 2010/10/11 00:32:28 tom Exp $ */
 
1
/* $XTermId: util.c,v 1.543 2011/02/09 10:11:44 tom Exp $ */
2
2
 
3
3
/*
4
 
 * Copyright 1999-2009,2010 by Thomas E. Dickey
 
4
 * Copyright 1999-2010,2011 by Thomas E. Dickey
5
5
 *
6
6
 *                         All Rights Reserved
7
7
 *
1250
1250
        } while (!done);
1251
1251
 
1252
1252
        screen->protected_mode = saved_mode;
1253
 
        if (len <= 0) {
 
1253
        if ((int) len <= 0) {
1254
1254
            return 0;
1255
1255
        }
1256
1256
    }
1518
1518
    XEvent reply;
1519
1519
    XEvent *rep = &reply;
1520
1520
 
1521
 
    while (1) {
 
1521
    for (;;) {
1522
1522
        XWindowEvent(screen->display, VWindow(screen),
1523
1523
                     ExposureMask, &reply);
1524
1524
        switch (reply.type) {
1722
1722
    Pixel c = getXtermBackground(xw, xw->flags, color);
1723
1723
 
1724
1724
    TRACE(("set_background(%d) %#lx\n", color, c));
1725
 
    XSetWindowBackground(screen->display, VShellWindow, c);
 
1725
    XSetWindowBackground(screen->display, VShellWindow(xw), c);
1726
1726
    XSetWindowBackground(screen->display, VWindow(screen), c);
1727
1727
}
1728
1728
 
3403
3403
    TScreen *screen = TScreenOf(xw);
3404
3404
    long supp;
3405
3405
 
3406
 
    if (!XGetWMNormalHints(screen->display, XtWindow(SHELL_OF(xw)),
 
3406
    if (!XGetWMNormalHints(screen->display, VShellWindow(xw),
3407
3407
                           &xw->hints, &supp))
3408
3408
        memset(&xw->hints, 0, sizeof(xw->hints));
3409
3409
    TRACE_HINTS(&(xw->hints));