Check-in [14895c3eba]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fixes in window manager frame colors
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 14895c3eba01e5c0ed594e7fe2edf61a73286bbb
User & Date: chw 2014-11-06 06:40:29
Context
2014-11-09
16:04
fixed wrong counts in argument checking. check-in: 90b413515e user: chw tags: trunk
2014-11-06
06:40
fixes in window manager frame colors check-in: 14895c3eba user: chw tags: trunk
2014-11-05
06:25
fixes in root resizing check-in: c51e858b05 user: chw tags: trunk, The Gunpowder Plot
Changes

Changes to jni/sdl2tk/sdl/SdlTkDecframe.c.

573
574
575
576
577
578
579
580

581

582
583
584
585
586
587
588
589
590
591

592

593
594
595
596
597
598
599
600
601
602

603

604
605
606
607
608
609
610
...
629
630
631
632
633
634
635
636
637
638
639
640

641
642
643
644
645
646
647
	return;
    }

    if (_DFInfo.bgGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = 0xFFD9D9D9;

	values.background = 0x00000000;

	_DFInfo.bgGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }
    if (_DFInfo.lightGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = 0xFFFFFFFF;

	values.background = 0x00000000;

	_DFInfo.lightGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }
    if (_DFInfo.darkGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = 0xFF828282;

	values.background = 0x00000000;

	_DFInfo.darkGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }

    bgGC = _DFInfo.bgGC;
................................................................................
    /* right */
    SdlTkGfxFillRect(d, bgGC,
		     w - SdlTkX.dec_frame_width, 0,
		     SdlTkX.dec_frame_width, h);

    if (_w->dec->active) {
	unsigned long fg = darkGC->foreground;
	Uint8 r, g, b;

	SDL_GetRGB(fg, SdlTkX.sdlsurf->format, &r, &g, &b);
	darkGC->foreground = SDL_MapRGB(SdlTkX.sdlsurf->format,
					r | 0x10, g | 0x10, b | 0x10);

	titlePixel = darkGC->foreground;
	/* top */
	SdlTkGfxFillRect(d, darkGC,
			 0, 0,
			 w, SdlTkX.dec_title_height - 1);
	/* bottom */
        SdlTkGfxFillRect(d, darkGC,







|
>
|
>









|
>
|
>









|
>
|
>







 







<

<

<
>







573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
...
635
636
637
638
639
640
641

642

643

644
645
646
647
648
649
650
651
	return;
    }

    if (_DFInfo.bgGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0xd9, 0xd9, 0xd9);
	values.background = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0x00, 0x00, 0x00);
	_DFInfo.bgGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }
    if (_DFInfo.lightGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0xff, 0xff, 0xff);
	values.background = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0x00, 0x00, 0x00);
	_DFInfo.lightGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }
    if (_DFInfo.darkGC == None) {
	XGCValues values;

	values.graphics_exposures = False;
	values.foreground = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0x82, 0x82, 0x82);
	values.background = SDL_MapRGB(SdlTkX.sdlsurf->format,
				       0x00, 0x00, 0x00);
	_DFInfo.darkGC =
	    XCreateGC(SdlTkX.display, SdlTkX.screen->root,
		      GCGraphicsExposures|GCForeground|GCBackground,
		      &values);
    }

    bgGC = _DFInfo.bgGC;
................................................................................
    /* right */
    SdlTkGfxFillRect(d, bgGC,
		     w - SdlTkX.dec_frame_width, 0,
		     SdlTkX.dec_frame_width, h);

    if (_w->dec->active) {
	unsigned long fg = darkGC->foreground;



	darkGC->foreground = SDL_MapRGB(SdlTkX.sdlsurf->format,

					0x92, 0x92, 0x92);
	titlePixel = darkGC->foreground;
	/* top */
	SdlTkGfxFillRect(d, darkGC,
			 0, 0,
			 w, SdlTkX.dec_title_height - 1);
	/* bottom */
        SdlTkGfxFillRect(d, darkGC,

Changes to jni/sdl2tk/sdl/SdlTkX.c.

5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
    _w->visRgn = SdlTkRgnPoolGet();
    _w->visRgnInParent = SdlTkRgnPoolGet();
    _w->clazz = InputOutput;

    screen->root = (Window) _w;
    screen->display = display;
    values.graphics_exposures = False;
    values.foreground = 0x00000000;
    values.background = 0xFFFFFFFF;
    screen->default_gc =
	XCreateGC(display, screen->root,
		  GCGraphicsExposures|GCForeground|GCBackground,
		  &values);

    /* Nasty globals */
    SdlTkX.display = display;







|
|







5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
    _w->visRgn = SdlTkRgnPoolGet();
    _w->visRgnInParent = SdlTkRgnPoolGet();
    _w->clazz = InputOutput;

    screen->root = (Window) _w;
    screen->display = display;
    values.graphics_exposures = False;
    values.foreground = screen->black_pixel;
    values.background = screen->white_pixel;
    screen->default_gc =
	XCreateGC(display, screen->root,
		  GCGraphicsExposures|GCForeground|GCBackground,
		  &values);

    /* Nasty globals */
    SdlTkX.display = display;