Mercurial > hg > xemacs-beta

comparison lisp/x-init.el @ 239:41f2f0e326e9 r20-5b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 434959a2fba3
children 157b30c96d03
comparison
equal deleted inserted replaced
238:b5f2e56b938d 239:41f2f0e326e9
235 ;; Those XFree86 people do some weird keysym stuff, too. 235 ;; Those XFree86 people do some weird keysym stuff, too.
236 ;; (load "x-win-xfree86"))))) 236 ;; (load "x-win-xfree86")))))
237 (x-win-init-xfree86))))) 237 (x-win-init-xfree86)))))
238 238
239 239
240 ;; Moved from x-toolbar.el, since InfoDock doesn't dump a x-toolbar.el.
241 (defun x-init-toolbar-from-resources (locale)
242 (x-init-specifier-from-resources
243 top-toolbar-height 'natnum locale
244 '("topToolBarHeight" . "TopToolBarHeight"))
245 (x-init-specifier-from-resources
246 bottom-toolbar-height 'natnum locale
247 '("bottomToolBarHeight" . "BottomToolBarHeight"))
248 (x-init-specifier-from-resources
249 left-toolbar-width 'natnum locale
250 '("leftToolBarWidth" . "LeftToolBarWidth"))
251 (x-init-specifier-from-resources
252 right-toolbar-width 'natnum locale
253 '("rightToolBarWidth" . "RightToolBarWidth"))
254 (x-init-specifier-from-resources
255 top-toolbar-border-width 'natnum locale
256 '("topToolBarBorderWidth" . "TopToolBarBorderWidth"))
257 (x-init-specifier-from-resources
258 bottom-toolbar-border-width 'natnum locale
259 '("bottomToolBarBorderWidth" . "BottomToolBarBorderWidth"))
260 (x-init-specifier-from-resources
261 left-toolbar-border-width 'natnum locale
262 '("leftToolBarBorderWidth" . "LeftToolBarBorderWidth"))
263 (x-init-specifier-from-resources
264 right-toolbar-border-width 'natnum locale
265 '("rightToolBarBorderWidth" . "RightToolBarBorderWidth")))
266
240 (defvar pre-x-win-initted nil) 267 (defvar pre-x-win-initted nil)
241 268
242 (defun init-pre-x-win () 269 (defun init-pre-x-win ()
243 "Initialize X Windows at startup (pre). Don't call this." 270 "Initialize X Windows at startup (pre). Don't call this."
244 (when (not pre-x-win-initted) 271 (when (not pre-x-win-initted)
276 "Initialize X Windows at startup (post). Don't call this." 303 "Initialize X Windows at startup (post). Don't call this."
277 (when (not post-x-win-initted) 304 (when (not post-x-win-initted)
278 ;; We can't load this until after the initial X device is created 305 ;; We can't load this until after the initial X device is created
279 ;; because the icon initialization needs to access the display to get 306 ;; because the icon initialization needs to access the display to get
280 ;; any toolbar-related color resources. 307 ;; any toolbar-related color resources.
281 (if (featurep 'toolbar) 308 (if (and (not (featurep 'infodock)) (featurep 'toolbar))
282 (init-x-toolbar)) 309 (init-x-toolbar))
310 (if (and (featurep 'infodock) (featurep 'toolbar))
311 (require 'id-x-toolbar))
283 (if (featurep 'mule) 312 (if (featurep 'mule)
284 (init-mule-x-win)) 313 (init-mule-x-win))
285 ;; these are only ever called if zmacs-regions is true. 314 ;; these are only ever called if zmacs-regions is true.
286 (add-hook 'zmacs-deactivate-region-hook 315 (add-hook 'zmacs-deactivate-region-hook
287 (lambda () 316 (lambda ()