ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
240 268
241sub size_allocate { 269sub size_allocate {
242 # nothing to be done 270 # nothing to be done
243} 271}
244 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
245sub children { 280sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 281}
259 282
260sub set_max_size { 283sub set_max_size {
261 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
262 285
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
265} 299}
266 300
267# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
268sub coord2local { 302sub coord2local {
269 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
358 glEnd; 392 glEnd;
359 glPopMatrix; 393 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 395 }
362} 396}
363 397
364sub _draw { 398sub _draw {
365 my ($self) = @_; 399 my ($self) = @_;
… …
382sub set_parent { 416sub set_parent {
383 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
384 418
385 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
386 420
421 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 422 $self->check_size
388 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
389} 424}
390 425
391sub check_size { 426sub check_size {
392 my ($self) = @_; 427 my ($self, $forced) = @_;
393 428
429 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 431}
396 432
397sub update { 433sub update {
398 my ($self) = @_; 434 my ($self) = @_;
… …
414} 450}
415 451
416sub DESTROY { 452sub DESTROY {
417 my ($self) = @_; 453 my ($self) = @_;
418 454
455 delete $WIDGET{$self+0};
419 #$self->deactivate; 456 #$self->deactivate;
420} 457}
421 458
422############################################################################# 459#############################################################################
423 460
… …
432 my $class = shift; 469 my $class = shift;
433 470
434 # range [value, low, high, page] 471 # range [value, low, high, page]
435 472
436 $class->SUPER::new ( 473 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
439 @_ 476 @_
440 ) 477 )
441} 478}
442 479
443sub _draw { 480sub _draw {
444 my ($self) = @_; 481 my ($self) = @_;
445 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
447 489
448 glEnable GL_BLEND; 490 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
451 493
452 glBegin GL_QUADS; 494 glBegin GL_QUADS;
453 glVertex 0 , 0; 495 glVertex 0 , 0;
454 glVertex 0 , $h; 496 glVertex 0 , $h;
455 glVertex $w, $h; 497 glVertex $w, $h;
456 glVertex $w, 0; 498 glVertex $w, 0;
457 glEnd; 499 glEnd;
458 500
459 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
460} 503}
461 504
462############################################################################# 505#############################################################################
463 506
464package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
508 $self->{children} = [ 551 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 553 @{$self->{children}}, @widgets
511 ]; 554 ];
512 555
513 $self->check_size; 556 $self->check_size (1);
514 $self->update; 557 $self->update;
515} 558}
516 559
517sub children { 560sub children {
518 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
625} 668}
626 669
627sub update { 670sub update {
628 my ($self) = @_; 671 my ($self) = @_;
629 672
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 674 $self->SUPER::update;
632} 675}
633 676
634sub size_allocate { 677sub size_allocate {
635 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
667 710
668 my $tex = $self->{texture} 711 my $tex = $self->{texture}
669 or return; 712 or return;
670 713
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 716 glColor 0, 0, 0, 1;
676 717
677 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 719
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
681} 721}
682 722
683############################################################################# 723#############################################################################
684 724
… …
776 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
777 817
778 $self 818 $self
779} 819}
780 820
781#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 822# update viewport offset on scroll
783 823
784############################################################################# 824#############################################################################
785 825
786package CFClient::UI::Frame; 826package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 830use CFClient::OpenGL;
791 831
792sub new { 832sub new {
793 my $class = shift; 833 my $class = shift;
794 834
795 my $self = $class->SUPER::new ( 835 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 836 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 837 @_,
800 ); 838 )
801
802 $self
803} 839}
804 840
805sub _draw { 841sub _draw {
806 my ($self) = @_; 842 my ($self) = @_;
807 843
808 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
809 846
810 glEnable GL_BLEND; 847 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 850
815# glBegin GL_QUADS; 851 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 852 glVertex 0 , 0;
818# glVertex 0 , $h; 853 glVertex 0 , $h;
819# glVertex $w, $h; 854 glVertex $w, $h;
820# glVertex $w, 0; 855 glVertex $w, 0;
821# glEnd; 856 glEnd;
822 857
823
824 $self->child->draw;
825 glDisable GL_BLEND; 858 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
827} 862}
828 863
829############################################################################# 864#############################################################################
830 865
831package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
845 880
846 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
849 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
850 can_events => 1, 886 can_events => 1,
851 @_ 887 @_
852 ); 888 );
853 889
854 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
879 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
880 916
881 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
883 919
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 921 if $self->{title};
886 922
887 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
888} 924}
889 925
… …
947 my ($self) = @_; 983 my ($self) = @_;
948 984
949 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 987
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 990
957 my $border = $self->border; 991 my $border = $self->border;
958 992
959 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 998
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1000 my $bg = $tex[0];
967 1001
968 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
973 1007
974 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
978 1013
979 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1015
983 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
984 1017
985 $self->child->draw; 1018 $self->child->draw;
986} 1019}
… …
1253 1286
1254############################################################################# 1287#############################################################################
1255 1288
1256package CFClient::UI::Label; 1289package CFClient::UI::Label;
1257 1290
1258our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1259 1292
1260use CFClient::OpenGL; 1293use CFClient::OpenGL;
1261 1294
1262sub new { 1295sub new {
1263 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1264 1297
1265 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1267 #font => default_font 1302 #font => default_font
1303 #text => initial text
1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1307 layout => (new CFClient::Layout),
1268 fontsize => 1, 1308 fontsize => 1,
1269 text => "",
1270 align => -1, 1309 align => -1,
1271 valign => -1, 1310 valign => -1,
1272 padding => 2, 1311 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1312 can_events => 0,
1275 %arg 1313 %arg
1276 ); 1314 );
1277 1315
1278 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1319 $self->{template} = $layout;
1282 } 1320 }
1283 1321
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1323 $self->set_markup (delete $self->{markup});
1324 } else {
1325 $self->set_text (delete $self->{text});
1326 }
1286 1327
1287 $self 1328 $self
1288} 1329}
1289 1330
1290sub escape { 1331sub escape($) {
1291 local $_ = $_[1]; 1332 local $_ = $_[0];
1292 1333
1293 s/&/&amp;/g; 1334 s/&/&amp;/g;
1294 s/>/&gt;/g; 1335 s/>/&gt;/g;
1295 s/</&lt;/g; 1336 s/</&lt;/g;
1296 1337
1297 $_[1] 1338 $_
1298} 1339}
1299 1340
1300sub update { 1341sub update {
1301 my ($self) = @_; 1342 my ($self) = @_;
1302 1343
… …
1308 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1309 1350
1310 return if $self->{text} eq "T$text"; 1351 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1352 $self->{text} = "T$text";
1312 1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1314 1356
1315 $self->update; 1357 $self->update;
1316 $self->check_size; 1358 $self->check_size;
1317} 1359}
… …
1320 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1321 1363
1322 return if $self->{text} eq "M$markup"; 1364 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1365 $self->{text} = "M$markup";
1324 1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1326 1371
1327 $self->update; 1372 $self->update;
1328 $self->check_size; 1373 $self->check_size;
1329} 1374}
… …
1331sub size_request { 1376sub size_request {
1332 my ($self) = @_; 1377 my ($self) = @_;
1333 1378
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1384
1338 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1339 1386
1340 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1370} 1417}
1371 1418
1372sub _draw { 1419sub _draw {
1373 my ($self) = @_; 1420 my ($self) = @_;
1374 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1375 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1379 new_from_layout CFClient::Texture $self->{layout} 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1436 : ($self->{w} - $tex->{w}) * 0.5);
1437
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1440 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1380 }; 1443 };
1381 1444
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1447
1448 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1402 1454
1403 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1456}
1406 1457
1407############################################################################# 1458#############################################################################
1408 1459
1409package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1444 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1445 1496
1446 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1447} 1498}
1448 1499
1449sub get_text {
1450 $_[0]{text}
1451}
1452
1453sub size_request {
1454 my ($self) = @_;
1455
1456 my ($w, $h) = $self->SUPER::size_request;
1457
1458 ($w + 1, $h) # add 1 for cursor
1459}
1460
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text { 1500sub set_text {
1468 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1469 1502
1470 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1471 $self->_set_text ($text); 1504 $self->_set_text ($text);
1472 $self->update; 1505 $self->update;
1506 $self->check_size;
1507}
1508
1509sub get_text {
1510 $_[0]{text}
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 my ($w, $h) = $self->SUPER::size_request;
1517
1518 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473} 1525}
1474 1526
1475sub key_down { 1527sub key_down {
1476 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1477 1529
… …
1479 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1481 1533
1482 my $text = $self->get_text; 1534 my $text = $self->get_text;
1483 1535
1484 if ($sym == 8) { 1536 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1549 $self->emit ('escape');
1498 } elsif ($uni) { 1550 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1552 }
1501 1553
1502 $self->_set_text ($text); 1554 $self->_set_text ($text);
1503 $self->update; 1555 $self->update;
1556 $self->check_size;
1504} 1557}
1505 1558
1506sub focus_in { 1559sub focus_in {
1507 my ($self) = @_; 1560 my ($self) = @_;
1508 1561
… …
1637 my $class = shift; 1690 my $class = shift;
1638 1691
1639 $class->SUPER::new ( 1692 $class->SUPER::new (
1640 padding => 4, 1693 padding => 4,
1641 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1644 can_hover => 1, 1696 can_hover => 1,
1645 align => 0, 1697 align => 0,
1646 valign => 0, 1698 valign => 0,
1647 can_events => 1, 1699 can_events => 1,
… …
1665 1717
1666 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1668 } 1720 }
1669 1721
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1675 1725
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1727
1678 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1729
1681 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1682} 1731}
1683 1732
1684############################################################################# 1733#############################################################################
… …
1698 1747
1699 $class->SUPER::new ( 1748 $class->SUPER::new (
1700 padding => 2, 1749 padding => 2,
1701 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 1754 state => 0,
1704 can_hover => 1, 1755 can_hover => 1,
1705 @_ 1756 @_
1706 ) 1757 )
1707} 1758}
… …
1731 1782
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733 1784
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1786
1736 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1737 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1792}
1747 1793
1748############################################################################# 1794#############################################################################
1749 1795
1750package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1794 1840
1795 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1796 } 1842 }
1797 1843
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1846
1803 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1848
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1807} 1850}
1808 1851
1809############################################################################# 1852#############################################################################
1810 1853
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
2000 2043
2001sub new { 2044sub new {
2002 my $class = shift; 2045 my $class = shift;
2003 2046
2004 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2005 2048
2006 # TODO: 0-width page 2049 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2051 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2013 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2015 vertical => 0, 2060 vertical => 0,
2016 can_hover => 1, 2061 can_hover => 1,
2017 inner_pad => 5, 2062 inner_pad => .05,
2018 @_ 2063 @_
2019 ); 2064 );
2020 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2021 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
2022} 2093}
2023 2094
2024sub size_request { 2095sub size_request {
2025 my ($self) = @_; 2096 my ($self) = @_;
2026 2097
… …
2039 2110
2040sub mouse_motion { 2111sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2042 2113
2043 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2045 2132
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2047 2134
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2050 2136
2051 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2139
2057 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2058 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
2059 } 2147 });
2060}
2061 2148
2062# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068} 2150}
2069 2151
2070sub _draw { 2152sub _draw {
2071 my ($self) = @_; 2153 my ($self) = @_;
2072 2154
2073 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2074 2156
2075 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2076 2158
2077 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2079 2161
2080 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2164 }
2085 2165
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2168
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2171
2112 # draw background 2172 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2174
2115 # draw handle 2175 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2177
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2120} 2179}
2121 2180
2122############################################################################# 2181#############################################################################
2123 2182
… …
2134 fontsize => 1, 2193 fontsize => 1,
2135 can_events => 0, 2194 can_events => 0,
2136 #font => default_font 2195 #font => default_font
2137 @_, 2196 @_,
2138 2197
2139 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2140 par => [], 2199 par => [],
2141 height => 0, 2200 height => 0,
2142 children => [ 2201 children => [
2143 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
… …
2162 2221
2163 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2164 2223
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2168 2227
2169 ($layout->size)[1] 2228 ($layout->size)[1]
2170} 2229}
2171 2230
2172sub reflow { 2231sub reflow {
… …
2210 2269
2211 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2212 2271
2213 delete $self->{texture}; 2272 delete $self->{texture};
2214 2273
2215 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2216 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2276 my $height = 0;
2218 2277
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2220 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2228 2287
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2230 glClearColor 0, 0, 0, 0; 2289 glClearColor 0, 0, 0, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2232 2291
2233 glEnable GL_BLEND;
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237 2294
2238 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2239 2296
… …
2248 2305
2249 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2307 my $h = $par->[0];
2251 2308
2252 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2253 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2254 2312
2255 glColor @{ $par->[1] };
2256 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2258 } 2315 }
2259 2316
2260 $y += $h; 2317 $y += $h;
2261 } 2318 }
2262 2319
2263 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND;
2265 }; 2321 };
2266 }); 2322 });
2267} 2323}
2268 2324
2269sub _draw { 2325sub _draw {
2270 my ($self) = @_; 2326 my ($self) = @_;
2271 2327
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2333
2281 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2282 2335
2283} 2336}
2284 2337
… …
2378 @_, 2431 @_,
2379 can_events => 0, 2432 can_events => 0,
2380 ) 2433 )
2381} 2434}
2382 2435
2383sub set_markup { 2436sub set_tooltip_from {
2384 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2385 2438
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2388 $self->add ($self->{label}); 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8,
2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2446 );
2389} 2447}
2390 2448
2391sub size_request { 2449sub size_request {
2392 my ($self) = @_; 2450 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2451
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2453
2398 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2399} 2455}
… …
2405} 2461}
2406 2462
2407sub _draw { 2463sub _draw {
2408 my ($self) = @_; 2464 my ($self) = @_;
2409 2465
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2412 2467
2413 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2414 2469
2415 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2481 glVertex 0 , $h;
2427 glVertex $w, $h; 2482 glVertex $w, $h;
2428 glVertex $w, 0; 2483 glVertex $w, 0;
2429 glEnd; 2484 glEnd;
2430 2485
2431 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2435} 2488}
2436 2489
2437############################################################################# 2490#############################################################################
2438 2491
… …
2461 return unless $::CONN;#d# manage and cache textures differently 2514 return unless $::CONN;#d# manage and cache textures differently
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2463 2516
2464 # TODO animation 2517 # TODO animation
2465 if ($tex) { 2518 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2524 }
2475} 2525}
2476 2526
2477############################################################################# 2527#############################################################################
2478 2528
2479package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2480 2530
2481our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2482 2558
2483sub new { 2559sub new {
2484 my $class = shift; 2560 my $class = shift;
2485 2561
2486 my %args = @_; 2562 my %args = @_;
2487 2563
2488 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2489 2565
2490 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2567
2495 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2496 can_hover => 1, 2569 can_hover => 1,
2497 can_events => 1, 2570 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2573 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2502 2575
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2512 [ 2593 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ], 2596 ],
2520 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2600 }
2522 2601
2523 1 2602 1
2524 }, 2603 },
2525 %args 2604 %args
2526 ); 2605 );
2606
2527 2607
2528 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2609 can_events => 0,
2530 face => $item->{face}, 2610 face => $item->{face},
2531 anim => $item->{anim}, 2611 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2533 ); 2613 );
2534 2614
2535 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2616
2537 text => $desc, 2617 $self->{item} = $item;
2538 ); 2618
2619 $self->update_item;
2539 2620
2540 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2541} 2630}
2542 2631
2543############################################################################# 2632#############################################################################
2544 2633
2545package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2561 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2562 2651
2563 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2564 return unless $items; 2653 return unless $items;
2565 2654
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2567 2659
2568 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2569 2661
2570 for my $item (@items) { 2662 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2576 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2577 2668
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579} 2670}
2580 2671
2581sub size_request { 2672sub size_request {
… …
2655 } 2746 }
2656} 2747}
2657 2748
2658############################################################################# 2749#############################################################################
2659 2750
2751package CFClient::UI::Statusbox;
2752
2753our @ISA = CFClient::UI::VBox::;
2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2764sub reorder {
2765 my ($self) = @_;
2766 my $NOW = time;
2767
2768 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 }
2771
2772 my @widgets;
2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2779 my $count = 10 + 1;
2780 for my $item (@items) {
2781 last unless --$count;
2782
2783 push @widgets, $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2789 for ($short) {
2790 s/^\s+//;
2791 s/\s+/ /g;
2792 }
2793
2794 new CFClient::UI::Label
2795 markup => $short,
2796 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2802 can_events => 1,
2803 can_hover => 1
2804 };
2805 }
2806
2807 $self->clear;
2808 $self->SUPER::add (reverse @widgets);
2809}
2810
2811sub add {
2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2834 text => $text,
2835 timeout => $timeout,
2836 tooltip => $text,
2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2840 %arg,
2841 };
2842 }
2843
2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2855}
2856
2857#############################################################################
2858
2660package CFClient::UI::Root; 2859package CFClient::UI::Root;
2661 2860
2662our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2663 2862
2664use CFClient::OpenGL; 2863use CFClient::OpenGL;
… …
2692} 2891}
2693 2892
2694sub size_allocate { 2893sub size_allocate {
2695 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2696 2895
2697 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2698 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2699 2898
2700 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2701 for my $child ($self->children) { 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712 2901
2713 for my $child ($self->children) { 2902 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2718 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2719 } 2915 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 2916}
2724 2917
2725sub coord2local { 2918sub coord2local {
2726 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2727 2920
… …
2740 $self->check_size; 2933 $self->check_size;
2741 $::WANT_REFRESH++; 2934 $::WANT_REFRESH++;
2742} 2935}
2743 2936
2744sub add { 2937sub add {
2745 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2746 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2747 # integerise window positions 2943 # integerise window positions
2748 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2749 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2750 2947
2751 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2752} 2949}
2753 2950
2754sub on_refresh { 2951sub on_refresh {
2755 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2756 2953
2757 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2758} 2955}
2759 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2760sub draw { 2963sub draw {
2761 my ($self) = @_; 2964 my ($self) = @_;
2965
2966 while ($self->{refresh_hook}) {
2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2762 2970
2763 if ($self->{check_size}) { 2971 if ($self->{check_size}) {
2764 my @queue = ([], []); 2972 my @queue = ([], []);
2765 2973
2766 for (;;) { 2974 for (;;) {
… …
2774 2982
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)} 2984 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request; 2985 : $widget->size_request;
2778 2986
2987 if (delete $widget->{force_alloc}
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781 2990
2782 $widget->{req_w} = $w; 2991 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h; 2992 $widget->{req_h} = $h;
2784 2993
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786 2995
2787 $widget->{parent}->check_size 2996 $widget->{parent}->check_size
2788 if $widget->{parent}; 2997 if $widget->{parent};
2789 } 2998 }
2790 } 2999 }
… …
2802 $widget->size_allocate ($w, $h); 3011 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h); 3012 $widget->emit (size_allocate => $w, $h);
2804 } 3013 }
2805 } 3014 }
2806 3015
2807 while ($self->{refresh_hook}) { 3016 while ($self->{post_alloc_hook}) {
2808 $_->() 3017 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3018 for values %{delete $self->{post_alloc_hook}};
2810 } 3019 }
2811 3020
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2825############################################################################# 3034#############################################################################
2826 3035
2827package CFClient::UI; 3036package CFClient::UI;
2828 3037
2829$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3040
28321 30411
2833 3042

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines