home *** CD-ROM | disk | FTP | other *** search
/ Source Code 1994 March / Source_Code_CD-ROM_Walnut_Creek_March_1994.iso / compsrcs / x / volume18 / x11fix16 / part03 < prev    next >
Encoding:
Text File  |  1992-08-02  |  12.9 KB  |  390 lines
  1. Newsgroups: comp.sources.x
  2. Path: uunet!haven.umd.edu!darwin.sura.net!mips!msi!dcmartin
  3. From: Bob Scheifler <rws@expo.lcs.mit.edu>
  4. Subject: v18i080: X11R5 public fix #16, Part03/03
  5. Message-ID: <1992Aug3.143909.29963@msi.com>
  6. Originator: dcmartin@fascet
  7. Sender: dcmartin@msi.com (David C. Martin - Moderator)
  8. Organization: Molecular Simulations, Inc.
  9. References: <csx-18i078-X11-fix16@uunet.UU.NET>
  10. Date: Mon, 3 Aug 1992 14:39:09 GMT
  11. Approved: dcmartin@msi.com
  12. Lines: 376
  13.  
  14. Submitted-by: Bob Scheifler <rws@expo.lcs.mit.edu>
  15. Posting-number: Volume 18, Issue 80
  16. Archive-name: X11-fix16/part03
  17.  
  18. #!/bin/sh
  19. # this is part.03 (part 3 of a multipart archive)
  20. # do not concatenate these parts, unpack them in order with /bin/sh
  21. # file fix-16 continued
  22. #
  23. if test ! -r _shar_seq_.tmp; then
  24.     echo 'Please unpack part 1 first!'
  25.     exit 1
  26. fi
  27. (read Scheck
  28.  if test "$Scheck" != 3; then
  29.     echo Please unpack part "$Scheck" next!
  30.     exit 1
  31.  else
  32.     exit 0
  33.  fi
  34. ) < _shar_seq_.tmp || exit 1
  35. if test ! -f _shar_wnt_.tmp; then
  36.     echo 'x - still skipping fix-16'
  37. else
  38. echo 'x - continuing file fix-16'
  39. sed 's/^X//' << 'SHAR_EOF' >> 'fix-16' &&
  40. !         XSelectInput( ic->core.im->core.display, ic->core.client_window,
  41. !               war.your_event_mask );
  42. X      }
  43. +     return(ret);
  44. + }
  45. X  
  46. X  char *
  47. X  _Ximp_SetICValueData(ic, values, mode, change_mask)
  48. ***************
  49. *** 144,158 ****
  50. X          else if(strcmp(p->name, XNClientWindow)==0) {
  51. X              if(!(ic->ximp_icpart->value_mask & XIMP_CLIENT_WIN)) {
  52. X                  if(mode == XIMP_SET_IC && (ic->ximp_icpart->icid)) {
  53. !                     _Ximp_IM_SendMessage(ic, XIMP_DESTROY, NULL, NULL, NULL);
  54. !                     XDestroyWindow(ic->core.im->core.display,
  55. !                                ic->core.client_window);
  56. !                     ic->core.client_window = (Window)p->value;
  57. X                      ic->ximp_icpart->value_mask |= XIMP_CLIENT_WIN;
  58. X                      if(_Ximp_SetOpenXIMP(ic, mode) == False) {
  59. X                          return_name = p->name;
  60. X                          break;
  61. X                          }
  62. X                      *change_mask = NULL;
  63. X                      }
  64. X                  else { /* XIMP_CREATE_IC | (XIMP_SET_IC && XIMP_START_IC) */
  65. --- 240,264 ----
  66. X          else if(strcmp(p->name, XNClientWindow)==0) {
  67. X              if(!(ic->ximp_icpart->value_mask & XIMP_CLIENT_WIN)) {
  68. X                  if(mode == XIMP_SET_IC && (ic->ximp_icpart->icid)) {
  69. !                     long    icid_old, icid_new;
  70. !                     Window    client_window;
  71. ! 
  72. !                     icid_old = ic->ximp_icpart->icid;
  73. !                     client_window = ic->core.client_window;
  74. X                      ic->ximp_icpart->value_mask |= XIMP_CLIENT_WIN;
  75. +                     ic->core.client_window = (Window)p->value;
  76. X                      if(_Ximp_SetOpenXIMP(ic, mode) == False) {
  77. X                          return_name = p->name;
  78. +                         ic->ximp_icpart->value_mask &= ~XIMP_CLIENT_WIN;
  79. +                         ic->core.client_window = client_window;
  80. X                          break;
  81. X                          }
  82. +                     icid_new = ic->ximp_icpart->icid;
  83. +                     ic->ximp_icpart->icid = icid_old;
  84. +                     _Ximp_IM_SendMessage(ic, XIMP_DESTROY, NULL, NULL, NULL);
  85. +                     ic->ximp_icpart->icid = icid_new;
  86. +                     XDestroyWindow(ic->core.im->core.display,
  87. +                                client_window);
  88. X                      *change_mask = NULL;
  89. X                      }
  90. X                  else { /* XIMP_CREATE_IC | (XIMP_SET_IC && XIMP_START_IC) */
  91. ***************
  92. *** 333,339 ****
  93. X                  for(i = 0, len = 0; i < list_ret; i++) {
  94. X                      len += strlen(name_list[i]);
  95. X                      }
  96. !                 tmp = Xmalloc(len + i + 1);
  97. X                  tmp[0] = NULL;
  98. X                  for(i = 0; i < list_ret; i++) {
  99. X                      strcat(tmp, name_list[i]);
  100. --- 439,448 ----
  101. X                  for(i = 0, len = 0; i < list_ret; i++) {
  102. X                      len += strlen(name_list[i]);
  103. X                      }
  104. !                 if( (tmp = Xmalloc(len + i + 1)) == NULL ) {
  105. !                     return_name = p->name;
  106. !                     return( False );
  107. !                 }
  108. X                  tmp[0] = NULL;
  109. X                  for(i = 0; i < list_ret; i++) {
  110. X                      strcat(tmp, name_list[i]);
  111. ***************
  112. *** 480,486 ****
  113. X                  for(i = 0, len = 0; i < list_ret; i++) {
  114. X                      len += strlen(name_list[i]);
  115. X                      }
  116. !                 tmp = Xmalloc(len + i + 1);
  117. X                  tmp[0] = NULL;
  118. X                  for(i = 0; i < list_ret; i++) {
  119. X                      strcat(tmp, name_list[i]);
  120. --- 589,598 ----
  121. X                  for(i = 0, len = 0; i < list_ret; i++) {
  122. X                      len += strlen(name_list[i]);
  123. X                      }
  124. !                 if( (tmp = Xmalloc(len + i + 1)) == NULL ) {
  125. !                     return_name = p->name;
  126. !                     return( False );
  127. !                 }
  128. X                  tmp[0] = NULL;
  129. X                  for(i = 0; i < list_ret; i++) {
  130. X                      strcat(tmp, name_list[i]);
  131. *** /tmp/d14669    Sat Aug  1 11:17:05 1992
  132. --- mit/lib/X/Ximp/XimpRm.c    Sat Aug  1 11:16:54 1992
  133. ***************
  134. *** 1,8 ****
  135. ! /* $XConsortium: XimpRm.c,v 1.4 92/04/14 13:29:56 rws Exp $ */
  136. X  /******************************************************************
  137. X  
  138. X                Copyright 1991, 1992 by FUJITSU LIMITED
  139. !               Copyright 1991, 1992 by Sony Corporaion
  140. X  
  141. X  Permission to use, copy, modify, distribute, and sell this software
  142. X  and its documentation for any purpose is hereby granted without fee,
  143. --- 1,8 ----
  144. ! /* $XConsortium: XimpRm.c,v 1.5 92/07/29 10:16:22 rws Exp $ */
  145. X  /******************************************************************
  146. X  
  147. X                Copyright 1991, 1992 by FUJITSU LIMITED
  148. !               Copyright 1991, 1992 by Sony Corporation
  149. X  
  150. X  Permission to use, copy, modify, distribute, and sell this software
  151. X  and its documentation for any purpose is hereby granted without fee,
  152. ***************
  153. *** 26,32 ****
  154. X  OR PERFORMANCE OF THIS SOFTWARE.
  155. X  
  156. X    Author: Takashi Fujiwara     FUJITSU LIMITED 
  157. !           Makoto Wakamatsu     Sony Corporaion
  158. X  
  159. X  ******************************************************************/
  160. X  
  161. --- 26,32 ----
  162. X  OR PERFORMANCE OF THIS SOFTWARE.
  163. X  
  164. X    Author: Takashi Fujiwara     FUJITSU LIMITED 
  165. !           Makoto Wakamatsu     Sony Corporation
  166. X  
  167. X  ******************************************************************/
  168. X  
  169. ***************
  170. *** 175,181 ****
  171. X      {
  172. X      char         res_name[256];
  173. X      char         res_class[256];
  174. !     char        *str_type[50];
  175. X      XrmValue     value;
  176. X      Bool         ret = False;
  177. X      KeySym         keysym = NoSymbol;
  178. --- 175,181 ----
  179. X      {
  180. X      char         res_name[256];
  181. X      char         res_class[256];
  182. !     char        *str_type;
  183. X      XrmValue     value;
  184. X      Bool         ret = False;
  185. X      KeySym         keysym = NoSymbol;
  186. ***************
  187. *** 189,195 ****
  188. X      strcat(res_name, "inputserver");
  189. X      strcat(res_class, "Inputserver");
  190. X      if(XrmGetResource(im->core.rdb, res_name, res_class,
  191. !                 str_type, &value) == True) { 
  192. X          if(strcmp(value.addr, "off") == 0) {
  193. X              /* Keysym */
  194. X              _Ximp_Get_resource_name(im, res_name, res_class);
  195. --- 189,195 ----
  196. X      strcat(res_name, "inputserver");
  197. X      strcat(res_class, "Inputserver");
  198. X      if(XrmGetResource(im->core.rdb, res_name, res_class,
  199. !                 &str_type, &value) == True) { 
  200. X          if(strcmp(value.addr, "off") == 0) {
  201. X              /* Keysym */
  202. X              _Ximp_Get_resource_name(im, res_name, res_class);
  203. ***************
  204. *** 196,202 ****
  205. X              strcat(res_name, "startkeysym");
  206. X              strcat(res_class, "Startkeysym");
  207. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  208. !                 str_type, &value) == True) { 
  209. X                  keysym = XStringToKeysym(value.addr);
  210. X                  }
  211. X              ret = False;
  212. --- 196,202 ----
  213. X              strcat(res_name, "startkeysym");
  214. X              strcat(res_class, "Startkeysym");
  215. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  216. !                 &str_type, &value) == True) { 
  217. X                  keysym = XStringToKeysym(value.addr);
  218. X                  }
  219. X              ret = False;
  220. ***************
  221. *** 220,226 ****
  222. X              strcat(res_name, "processStartKeys");
  223. X              strcat(res_class, "ProcessStartKeys");
  224. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  225. !                         str_type, &value)  == True) {
  226. X                  char    *string, *ss, c;
  227. X                  char    *line;
  228. X  
  229. --- 220,226 ----
  230. X              strcat(res_name, "processStartKeys");
  231. X              strcat(res_class, "ProcessStartKeys");
  232. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  233. !                         &str_type, &value)  == True) {
  234. X                  char    *string, *ss, c;
  235. X                  char    *line;
  236. X  
  237. ***************
  238. *** 249,255 ****
  239. X      strcat(res_name, "callbackEncoding");
  240. X      strcat(res_class, "CallbackEncoding");
  241. X      if(XrmGetResource(im->core.rdb, res_name, res_class,
  242. !                 str_type, &value) == True) { 
  243. X          if(strcmp(value.addr, "wchar") == 0) {
  244. X              im->ximp_impart->use_wchar = True;
  245. X              }
  246. --- 249,255 ----
  247. X      strcat(res_name, "callbackEncoding");
  248. X      strcat(res_class, "CallbackEncoding");
  249. X      if(XrmGetResource(im->core.rdb, res_name, res_class,
  250. !                 &str_type, &value) == True) { 
  251. X          if(strcmp(value.addr, "wchar") == 0) {
  252. X              im->ximp_impart->use_wchar = True;
  253. X              }
  254. ***************
  255. *** 267,273 ****
  256. X      Ximp_XIM     im;
  257. X      char         res_name[256];
  258. X      char         res_class[256];
  259. !     char        *str_type[50];
  260. X      XrmValue     value;
  261. X      Colormap     default_colormap;
  262. X      XColor         screen_def, exact_def;
  263. --- 267,273 ----
  264. X      Ximp_XIM     im;
  265. X      char         res_name[256];
  266. X      char         res_class[256];
  267. !     char        *str_type;
  268. X      XrmValue     value;
  269. X      Colormap     default_colormap;
  270. X      XColor         screen_def, exact_def;
  271. ***************
  272. *** 284,290 ****
  273. X              strcat(res_name, "preedit.background");
  274. X              strcat(res_class, "Preedit.Background");
  275. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  276. !                     str_type, &value) == True) { 
  277. X                  default_colormap = DefaultColormap(
  278. X                          im->core.display,
  279. X                          DefaultScreen(im->core.display) );
  280. --- 284,290 ----
  281. X              strcat(res_name, "preedit.background");
  282. X              strcat(res_class, "Preedit.Background");
  283. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  284. !                     &str_type, &value) == True) { 
  285. X                  default_colormap = DefaultColormap(
  286. X                          im->core.display,
  287. X                          DefaultScreen(im->core.display) );
  288. ***************
  289. *** 304,310 ****
  290. X              strcat(res_name, "preedit.foreground");
  291. X              strcat(res_class, "Preedit.Foreground");
  292. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  293. !                     str_type, &value) == True) { 
  294. X                  default_colormap = DefaultColormap(
  295. X                          im->core.display,
  296. X                          DefaultScreen(im->core.display) );
  297. --- 304,310 ----
  298. X              strcat(res_name, "preedit.foreground");
  299. X              strcat(res_class, "Preedit.Foreground");
  300. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  301. !                     &str_type, &value) == True) { 
  302. X                  default_colormap = DefaultColormap(
  303. X                          im->core.display,
  304. X                          DefaultScreen(im->core.display) );
  305. ***************
  306. *** 324,330 ****
  307. X              strcat(res_name, "preedit.linespacing");
  308. X              strcat(res_class, "Preedit.Linespacing");
  309. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  310. !                     str_type, &value) == True) { 
  311. X                  num = atoi(value.addr);
  312. X                  ic->core.preedit_attr.line_space = num;
  313. X                  ic->ximp_icpart->preedit_attr.LineSpacing = 
  314. --- 324,330 ----
  315. X              strcat(res_name, "preedit.linespacing");
  316. X              strcat(res_class, "Preedit.Linespacing");
  317. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  318. !                     &str_type, &value) == True) { 
  319. X                  num = atoi(value.addr);
  320. X                  ic->core.preedit_attr.line_space = num;
  321. X                  ic->ximp_icpart->preedit_attr.LineSpacing = 
  322. ***************
  323. *** 341,347 ****
  324. X              strcat(res_name, "status.background");
  325. X              strcat(res_class, "Status.Background");
  326. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  327. !                     str_type, &value) == True) { 
  328. X                  default_colormap = DefaultColormap(
  329. X                          im->core.display,
  330. X                          DefaultScreen(im->core.display) );
  331. --- 341,347 ----
  332. X              strcat(res_name, "status.background");
  333. X              strcat(res_class, "Status.Background");
  334. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  335. !                     &str_type, &value) == True) { 
  336. X                  default_colormap = DefaultColormap(
  337. X                          im->core.display,
  338. X                          DefaultScreen(im->core.display) );
  339. ***************
  340. *** 362,368 ****
  341. X              strcat(res_name, "status.foreground");
  342. X              strcat(res_class, "Status.Foreground");
  343. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  344. !                     str_type, &value) == True) { 
  345. X                  default_colormap = DefaultColormap(
  346. X                          im->core.display,
  347. X                          DefaultScreen(im->core.display) );
  348. --- 362,368 ----
  349. X              strcat(res_name, "status.foreground");
  350. X              strcat(res_class, "Status.Foreground");
  351. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  352. !                     &str_type, &value) == True) { 
  353. X                  default_colormap = DefaultColormap(
  354. X                          im->core.display,
  355. X                          DefaultScreen(im->core.display) );
  356. ***************
  357. *** 382,388 ****
  358. X              strcat(res_name, "status.linespacing");
  359. X              strcat(res_class, "Status.Linespacing");
  360. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  361. !                     str_type, &value) == True) { 
  362. X                  num = atoi(value.addr);
  363. X                  ic->core.status_attr.line_space = num;
  364. X                  ic->ximp_icpart->status_attr.LineSpacing = 
  365. --- 382,388 ----
  366. X              strcat(res_name, "status.linespacing");
  367. X              strcat(res_class, "Status.Linespacing");
  368. X              if(XrmGetResource(im->core.rdb, res_name, res_class,
  369. !                     &str_type, &value) == True) { 
  370. X                  num = atoi(value.addr);
  371. X                  ic->core.status_attr.line_space = num;
  372. X                  ic->ximp_icpart->status_attr.LineSpacing = 
  373. SHAR_EOF
  374. echo 'File fix-16 is complete' &&
  375. chmod 0644 fix-16 ||
  376. echo 'restore of fix-16 failed'
  377. Wc_c="`wc -c < 'fix-16'`"
  378. test 109408 -eq "$Wc_c" ||
  379.     echo 'fix-16: original size 109408, current size' "$Wc_c"
  380. rm -f _shar_wnt_.tmp
  381. fi
  382. rm -f _shar_seq_.tmp
  383. echo You have unpacked the last part
  384. exit 0
  385. -- 
  386. Senior Systems Scientist        mail: dcmartin@msi.com
  387. Molecular Simulations, Inc.        uucp: uunet!dcmartin
  388. 796 North Pastoria Avenue        at&t: 408/522-9236
  389. Sunnyvale, California 94086        fax: 408/732-0831
  390.