comparison src/frame-x.c @ 867:804517e16990

[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 6728e641994e
children a07667553efc
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
492 } 492 }
493 493
494 static Lisp_Object 494 static Lisp_Object
495 color_to_string (Widget w, unsigned long pixel) 495 color_to_string (Widget w, unsigned long pixel)
496 { 496 {
497 Intbyte buf[255]; 497 Ibyte buf[255];
498 498
499 XColor color; 499 XColor color;
500 color.pixel = pixel; 500 color.pixel = pixel;
501 XQueryColor (XtDisplay (w), w->core.colormap, &color); 501 XQueryColor (XtDisplay (w), w->core.colormap, &color);
502 qxesprintf (buf, "#%04x%04x%04x", color.red, color.green, color.blue); 502 qxesprintf (buf, "#%04x%04x%04x", color.red, color.green, color.blue);
651 651
652 /* Functions called only from `x_set_frame_properties' to set 652 /* Functions called only from `x_set_frame_properties' to set
653 individual properties. */ 653 individual properties. */
654 654
655 static void 655 static void
656 x_set_frame_text_value (struct frame *f, Intbyte *value, 656 x_set_frame_text_value (struct frame *f, Ibyte *value,
657 String Xt_resource_name, 657 String Xt_resource_name,
658 String Xt_resource_encoding_name) 658 String Xt_resource_encoding_name)
659 { 659 {
660 Atom encoding = XA_STRING; 660 Atom encoding = XA_STRING;
661 String new_XtValue = (String) value; 661 String new_XtValue = (String) value;
662 String old_XtValue = NULL; 662 String old_XtValue = NULL;
663 663
664 #ifdef MULE 664 #ifdef MULE
665 Intbyte *ptr; 665 Ibyte *ptr;
666 /* Optimize for common ASCII case */ 666 /* Optimize for common ASCII case */
667 for (ptr = value; *ptr; ptr++) 667 for (ptr = value; *ptr; ptr++)
668 if (!byte_ascii_p (*ptr)) 668 if (!byte_ascii_p (*ptr))
669 { 669 {
670 const char * tmp; 670 const char * tmp;
685 XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 2); 685 XtSetValues (FRAME_X_SHELL_WIDGET (f), al, 2);
686 } 686 }
687 } 687 }
688 688
689 static void 689 static void
690 x_set_title_from_intbyte (struct frame *f, Intbyte *name) 690 x_set_title_from_ibyte (struct frame *f, Ibyte *name)
691 { 691 {
692 x_set_frame_text_value (f, name, XtNtitle, XtNtitleEncoding); 692 x_set_frame_text_value (f, name, XtNtitle, XtNtitleEncoding);
693 } 693 }
694 694
695 static void 695 static void
696 x_set_icon_name_from_intbyte (struct frame *f, Intbyte *name) 696 x_set_icon_name_from_ibyte (struct frame *f, Ibyte *name)
697 { 697 {
698 x_set_frame_text_value (f, name, XtNiconName, XtNiconNameEncoding); 698 x_set_frame_text_value (f, name, XtNiconName, XtNiconNameEncoding);
699 } 699 }
700 700
701 /* Set the initial frame size as specified. This function is used 701 /* Set the initial frame size as specified. This function is used
1264 for (ii = 0; ii < transferInfo->dropData->numItems; ii++) 1264 for (ii = 0; ii < transferInfo->dropData->numItems; ii++)
1265 { 1265 {
1266 filePath = transferInfo->dropData->data.files[ii]; 1266 filePath = transferInfo->dropData->data.files[ii];
1267 hurl = dnd_url_hexify_string ((char *)filePath, "file:"); 1267 hurl = dnd_url_hexify_string ((char *)filePath, "file:");
1268 /* #### Mule-izing required */ 1268 /* #### Mule-izing required */
1269 l_data = Fcons (make_string ((Intbyte* )hurl, 1269 l_data = Fcons (make_string ((Ibyte* )hurl,
1270 strlen (hurl)), 1270 strlen (hurl)),
1271 l_data); 1271 l_data);
1272 xfree (hurl); 1272 xfree (hurl);
1273 } 1273 }
1274 } 1274 }
1286 for (ii = 0; ii < transferInfo->dropData->numItems; ii++) 1286 for (ii = 0; ii < transferInfo->dropData->numItems; ii++)
1287 { 1287 {
1288 /* let us forget this name thing for now... */ 1288 /* let us forget this name thing for now... */
1289 /* filePath = transferInfo->dropData->data.buffers[ii].name; 1289 /* filePath = transferInfo->dropData->data.buffers[ii].name;
1290 path = (filePath == NULL) ? Qnil 1290 path = (filePath == NULL) ? Qnil
1291 : make_string ((Intbyte *)filePath, strlen (filePath)); */ 1291 : make_string ((Ibyte *)filePath, strlen (filePath)); */
1292 /* what, if the data is no text, and how can I tell it? */ 1292 /* what, if the data is no text, and how can I tell it? */
1293 l_data = Fcons ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ), 1293 l_data = Fcons ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ),
1294 make_string ((Intbyte *)"8bit", 4), 1294 make_string ((Ibyte *)"8bit", 4),
1295 make_string ((Intbyte *)transferInfo->dropData->data.buffers[ii].bp, 1295 make_string ((Ibyte *)transferInfo->dropData->data.buffers[ii].bp,
1296 transferInfo->dropData->data.buffers[ii].size) ), 1296 transferInfo->dropData->data.buffers[ii].size) ),
1297 l_data ); 1297 l_data );
1298 } 1298 }
1299 drag_not_done = 0; 1299 drag_not_done = 0;
1300 unbind_to (speccount); 1300 unbind_to (speccount);
2287 different program. Since the ID is an unsigned long, we return it as 2287 different program. Since the ID is an unsigned long, we return it as
2288 a string. 2288 a string.
2289 */ 2289 */
2290 (frame)) 2290 (frame))
2291 { 2291 {
2292 Intbyte str[255]; 2292 Ibyte str[255];
2293 struct frame *f = decode_x_frame (frame); 2293 struct frame *f = decode_x_frame (frame);
2294 2294
2295 qxesprintf (str, "%lu", XtWindow (FRAME_X_TEXT_WIDGET (f))); 2295 qxesprintf (str, "%lu", XtWindow (FRAME_X_TEXT_WIDGET (f)));
2296 return build_intstring (str); 2296 return build_intstring (str);
2297 } 2297 }
2819 CONSOLE_HAS_METHOD (x, set_frame_position); 2819 CONSOLE_HAS_METHOD (x, set_frame_position);
2820 CONSOLE_HAS_METHOD (x, frame_property); 2820 CONSOLE_HAS_METHOD (x, frame_property);
2821 CONSOLE_HAS_METHOD (x, internal_frame_property_p); 2821 CONSOLE_HAS_METHOD (x, internal_frame_property_p);
2822 CONSOLE_HAS_METHOD (x, frame_properties); 2822 CONSOLE_HAS_METHOD (x, frame_properties);
2823 CONSOLE_HAS_METHOD (x, set_frame_properties); 2823 CONSOLE_HAS_METHOD (x, set_frame_properties);
2824 CONSOLE_HAS_METHOD (x, set_title_from_intbyte); 2824 CONSOLE_HAS_METHOD (x, set_title_from_ibyte);
2825 CONSOLE_HAS_METHOD (x, set_icon_name_from_intbyte); 2825 CONSOLE_HAS_METHOD (x, set_icon_name_from_ibyte);
2826 CONSOLE_HAS_METHOD (x, frame_visible_p); 2826 CONSOLE_HAS_METHOD (x, frame_visible_p);
2827 CONSOLE_HAS_METHOD (x, frame_totally_visible_p); 2827 CONSOLE_HAS_METHOD (x, frame_totally_visible_p);
2828 CONSOLE_HAS_METHOD (x, frame_iconified_p); 2828 CONSOLE_HAS_METHOD (x, frame_iconified_p);
2829 CONSOLE_HAS_METHOD (x, set_frame_pointer); 2829 CONSOLE_HAS_METHOD (x, set_frame_pointer);
2830 CONSOLE_HAS_METHOD (x, set_frame_icon); 2830 CONSOLE_HAS_METHOD (x, set_frame_icon);