comparison src/device-x.c @ 5126:2a462149bd6a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents b5df3737028a 92dc90c0bb40
children a9c41067dd88
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1 /* Device functions for X windows. 1 /* Device functions for X windows.
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1994, 1995 Free Software Foundation, Inc. 3 Copyright (C) 1994, 1995 Free Software Foundation, Inc.
4 Copyright (C) 2001, 2002, 2004 Ben Wing. 4 Copyright (C) 2001, 2002, 2004, 2010 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
484 int out_count, d; 484 int out_count, d;
485 485
486 vi_in.visualid = XVisualIDFromVisual (visual); 486 vi_in.visualid = XVisualIDFromVisual (visual);
487 vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask, 487 vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask,
488 &vi_in, &out_count); 488 &vi_in, &out_count);
489 if (! vi_out) ABORT (); 489 assert (vi_out);
490 d = vi_out [0].depth; 490 d = vi_out [0].depth;
491 XFree ((char *) vi_out); 491 XFree ((char *) vi_out);
492 return d; 492 return d;
493 } 493 }
494 494
1560 return Qnil; 1560 return Qnil;
1561 1561
1562 db = XtDatabase (display); 1562 db = XtDatabase (display);
1563 codesys = coding_system_of_xrm_database (db); 1563 codesys = coding_system_of_xrm_database (db);
1564 Dynarr_add (name_Extbyte_dynarr, '.'); 1564 Dynarr_add (name_Extbyte_dynarr, '.');
1565 Dynarr_add_lisp_string (name_Extbyte_dynarr, name, Qbinary); 1565 Dynarr_add_ext_lisp_string (name_Extbyte_dynarr, name, Qbinary);
1566 Dynarr_add (class_Extbyte_dynarr, '.'); 1566 Dynarr_add (class_Extbyte_dynarr, '.');
1567 Dynarr_add_lisp_string (class_Extbyte_dynarr, class_, Qbinary); 1567 Dynarr_add_ext_lisp_string (class_Extbyte_dynarr, class_, Qbinary);
1568 Dynarr_add (name_Extbyte_dynarr, '\0'); 1568 Dynarr_add (name_Extbyte_dynarr, '\0');
1569 Dynarr_add (class_Extbyte_dynarr, '\0'); 1569 Dynarr_add (class_Extbyte_dynarr, '\0');
1570 1570
1571 name_string = Dynarr_begin (name_Extbyte_dynarr); 1571 name_string = Dynarr_begin (name_Extbyte_dynarr);
1572 class_string = Dynarr_begin (class_Extbyte_dynarr); 1572 class_string = Dynarr_begin (class_Extbyte_dynarr);