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.216 by root, Fri May 19 16:43: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) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
651 694
652 $self->_render; 695 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 696 };
661} 697}
662 698
663sub _draw { 699sub _draw {
664 my ($self) = @_; 700 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
667 703
668 my $tex = $self->{texture} 704 my $tex = $self->{texture}
669 or return; 705 or return;
670 706
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
676 710
677 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 712
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
681} 714}
682 715
683############################################################################# 716#############################################################################
684 717
… …
776 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
777 810
778 $self 811 $self
779} 812}
780 813
781#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 815# update viewport offset on scroll
783 816
784############################################################################# 817#############################################################################
785 818
786package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 823use CFClient::OpenGL;
791 824
792sub new { 825sub new {
793 my $class = shift; 826 my $class = shift;
794 827
795 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 829 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 830 @_,
800 ); 831 )
801
802 $self
803} 832}
804 833
805sub _draw { 834sub _draw {
806 my ($self) = @_; 835 my ($self) = @_;
807 836
808 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
809 839
810 glEnable GL_BLEND; 840 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 843
815# glBegin GL_QUADS; 844 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 845 glVertex 0 , 0;
818# glVertex 0 , $h; 846 glVertex 0 , $h;
819# glVertex $w, $h; 847 glVertex $w, $h;
820# glVertex $w, 0; 848 glVertex $w, 0;
821# glEnd; 849 glEnd;
822 850
823
824 $self->child->draw;
825 glDisable GL_BLEND; 851 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
827} 855}
828 856
829############################################################################# 857#############################################################################
830 858
831package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
845 873
846 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
849 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
850 can_events => 1, 879 can_events => 1,
851 @_ 880 @_
852 ); 881 );
853 882
854 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
879 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
880 909
881 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
883 912
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 914 if $self->{title};
886 915
887 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
888} 917}
889 918
… …
947 my ($self) = @_; 976 my ($self) = @_;
948 977
949 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 980
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 983
957 my $border = $self->border; 984 my $border = $self->border;
958 985
959 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 991
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 993 my $bg = $tex[0];
967 994
968 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
973 1000
974 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
978 1006
979 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1008
983 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
984 1010
985 $self->child->draw; 1011 $self->child->draw;
986} 1012}
… …
1253 1279
1254############################################################################# 1280#############################################################################
1255 1281
1256package CFClient::UI::Label; 1282package CFClient::UI::Label;
1257 1283
1258our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1259 1285
1260use CFClient::OpenGL; 1286use CFClient::OpenGL;
1261 1287
1262sub new { 1288sub new {
1263 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1264 1290
1265 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1267 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1268 fontsize => 1, 1301 fontsize => 1,
1269 text => "",
1270 align => -1, 1302 align => -1,
1271 valign => -1, 1303 valign => -1,
1272 padding => 2, 1304 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1305 can_events => 0,
1275 %arg 1306 %arg
1276 ); 1307 );
1277 1308
1278 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1312 $self->{template} = $layout;
1282 } 1313 }
1283 1314
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1286 1320
1287 $self 1321 $self
1288} 1322}
1289 1323
1290sub escape { 1324sub escape($) {
1291 local $_ = $_[1]; 1325 local $_ = $_[0];
1292 1326
1293 s/&/&amp;/g; 1327 s/&/&amp;/g;
1294 s/>/&gt;/g; 1328 s/>/&gt;/g;
1295 s/</&lt;/g; 1329 s/</&lt;/g;
1296 1330
1297 $_[1] 1331 $_
1298} 1332}
1299 1333
1300sub update { 1334sub update {
1301 my ($self) = @_; 1335 my ($self) = @_;
1302 1336
… …
1308 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1309 1343
1310 return if $self->{text} eq "T$text"; 1344 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1345 $self->{text} = "T$text";
1312 1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1314 1349
1315 $self->update; 1350 $self->update;
1316 $self->check_size; 1351 $self->check_size;
1317} 1352}
… …
1320 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1321 1356
1322 return if $self->{text} eq "M$markup"; 1357 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1358 $self->{text} = "M$markup";
1324 1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1326 1364
1327 $self->update; 1365 $self->update;
1328 $self->check_size; 1366 $self->check_size;
1329} 1367}
… …
1331sub size_request { 1369sub size_request {
1332 my ($self) = @_; 1370 my ($self) = @_;
1333 1371
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1377
1338 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1339 1379
1340 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1370} 1410}
1371 1411
1372sub _draw { 1412sub _draw {
1373 my ($self) = @_; 1413 my ($self) = @_;
1374 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1375 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1379 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1380 }; 1436 };
1381 1437
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1440
1441 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1442 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}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1402 1447
1403 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1449}
1406 1450
1407############################################################################# 1451#############################################################################
1408 1452
1409package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1444 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1445 1489
1446 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1447} 1491}
1448 1492
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 { 1493sub set_text {
1468 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1469 1495
1470 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1471 $self->_set_text ($text); 1497 $self->_set_text ($text);
1472 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473} 1518}
1474 1519
1475sub key_down { 1520sub key_down {
1476 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1477 1522
… …
1479 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1481 1526
1482 my $text = $self->get_text; 1527 my $text = $self->get_text;
1483 1528
1484 if ($sym == 8) { 1529 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1542 $self->emit ('escape');
1498 } elsif ($uni) { 1543 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1545 }
1501 1546
1502 $self->_set_text ($text); 1547 $self->_set_text ($text);
1503 $self->update; 1548 $self->update;
1549 $self->check_size;
1504} 1550}
1505 1551
1506sub focus_in { 1552sub focus_in {
1507 my ($self) = @_; 1553 my ($self) = @_;
1508 1554
… …
1637 my $class = shift; 1683 my $class = shift;
1638 1684
1639 $class->SUPER::new ( 1685 $class->SUPER::new (
1640 padding => 4, 1686 padding => 4,
1641 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1644 can_hover => 1, 1689 can_hover => 1,
1645 align => 0, 1690 align => 0,
1646 valign => 0, 1691 valign => 0,
1647 can_events => 1, 1692 can_events => 1,
… …
1665 1710
1666 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1668 } 1713 }
1669 1714
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1675 1718
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1720
1678 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1722
1681 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1682} 1724}
1683 1725
1684############################################################################# 1726#############################################################################
… …
1698 1740
1699 $class->SUPER::new ( 1741 $class->SUPER::new (
1700 padding => 2, 1742 padding => 2,
1701 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 1747 state => 0,
1704 can_hover => 1, 1748 can_hover => 1,
1705 @_ 1749 @_
1706 ) 1750 )
1707} 1751}
… …
1731 1775
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733 1777
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1779
1736 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1737 glEnable GL_TEXTURE_2D; 1782 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); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1785}
1747 1786
1748############################################################################# 1787#############################################################################
1749 1788
1750package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1794 1833
1795 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1796 } 1835 }
1797 1836
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1839
1803 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1841
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1807} 1843}
1808 1844
1809############################################################################# 1845#############################################################################
1810 1846
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
2000 2036
2001sub new { 2037sub new {
2002 my $class = shift; 2038 my $class = shift;
2003 2039
2004 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2005 2041
2006 # TODO: 0-width page 2042 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2044 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2013 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2015 vertical => 0, 2053 vertical => 0,
2016 can_hover => 1, 2054 can_hover => 1,
2017 inner_pad => 5, 2055 inner_pad => .05,
2018 @_ 2056 @_
2019 ); 2057 );
2020 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2021 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2022} 2086}
2023 2087
2024sub size_request { 2088sub size_request {
2025 my ($self) = @_; 2089 my ($self) = @_;
2026 2090
… …
2039 2103
2040sub mouse_motion { 2104sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2042 2106
2043 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2045 2125
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2047 2127
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2050 2129
2051 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $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 2132
2057 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2058 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2059 } 2140 });
2060}
2061 2141
2062# the inner_* stuff is for generating a padding for the slider handle, 2142 $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} 2143}
2069 2144
2070sub _draw { 2145sub _draw {
2071 my ($self) = @_; 2146 my ($self) = @_;
2072 2147
2073 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2074 2149
2075 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2076 2151
2077 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2079 2154
2155 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2157 }
2085 2158
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2161
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; 2162 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2164
2112 # draw background 2165 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2167
2115 # draw handle 2168 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2170
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2120} 2172}
2121 2173
2122############################################################################# 2174#############################################################################
2123 2175
… …
2134 fontsize => 1, 2186 fontsize => 1,
2135 can_events => 0, 2187 can_events => 0,
2136 #font => default_font 2188 #font => default_font
2137 @_, 2189 @_,
2138 2190
2139 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2140 par => [], 2192 par => [],
2141 height => 0, 2193 height => 0,
2142 children => [ 2194 children => [
2143 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
… …
2162 2214
2163 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2164 2216
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2168 2220
2169 ($layout->size)[1] 2221 ($layout->size)[1]
2170} 2222}
2171 2223
2172sub reflow { 2224sub reflow {
… …
2210 2262
2211 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2212 2264
2213 delete $self->{texture}; 2265 delete $self->{texture};
2214 2266
2215 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2216 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2269 my $height = 0;
2218 2270
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2220 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2225 2277
2226 delete $self->{texture}; 2278 delete $self->{texture};
2227 } 2279 }
2228 2280
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2230 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2232 2284
2233 glEnable GL_BLEND;
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237 2287
2238 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2239 2289
… …
2248 2298
2249 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2300 my $h = $par->[0];
2251 2301
2252 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2253 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2254 2305
2255 glColor @{ $par->[1] };
2256 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2258 } 2308 }
2259 2309
2260 $y += $h; 2310 $y += $h;
2261 } 2311 }
2262 2312
2263 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND;
2265 }; 2314 };
2266 }); 2315 });
2267} 2316}
2268 2317
2269sub _draw { 2318sub _draw {
2270 my ($self) = @_; 2319 my ($self) = @_;
2271 2320
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2326
2281 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2282 2328
2283} 2329}
2284 2330
… …
2378 @_, 2424 @_,
2379 can_events => 0, 2425 can_events => 0,
2380 ) 2426 )
2381} 2427}
2382 2428
2383sub set_markup { 2429sub set_tooltip_from {
2384 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2385 2431
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2388 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2389} 2440}
2390 2441
2391sub size_request { 2442sub size_request {
2392 my ($self) = @_; 2443 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2444
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2446
2398 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2399} 2448}
… …
2405} 2454}
2406 2455
2407sub _draw { 2456sub _draw {
2408 my ($self) = @_; 2457 my ($self) = @_;
2409 2458
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2412 2460
2413 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2414 2462
2415 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2474 glVertex 0 , $h;
2427 glVertex $w, $h; 2475 glVertex $w, $h;
2428 glVertex $w, 0; 2476 glVertex $w, 0;
2429 glEnd; 2477 glEnd;
2430 2478
2431 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2435} 2481}
2436 2482
2437############################################################################# 2483#############################################################################
2438 2484
… …
2461 return unless $::CONN;#d# manage and cache textures differently 2507 return unless $::CONN;#d# manage and cache textures differently
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2463 2509
2464 # TODO animation 2510 # TODO animation
2465 if ($tex) { 2511 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2514 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2517 }
2475} 2518}
2476 2519
2477############################################################################# 2520#############################################################################
2478 2521
2479package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2480 2523
2481our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2482 2551
2483sub new { 2552sub new {
2484 my $class = shift; 2553 my $class = shift;
2485 2554
2486 my %args = @_; 2555 my %args = @_;
2487 2556
2488 my $item = delete $args{item}; 2557 my $item = delete $args{item};
2489 2558
2490 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2560
2495 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2496 can_hover => 1, 2562 can_hover => 1,
2497 can_events => 1, 2563 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2566 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2502 2568
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) { 2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2512 [ 2586 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") }, 2588 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 ], 2589 ],
2520 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2593 }
2522 2594
2523 1 2595 1
2524 }, 2596 },
2525 %args 2597 %args
2526 ); 2598 );
2599
2527 2600
2528 $self->add (new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2602 can_events => 0,
2530 face => $item->{face}, 2603 face => $item->{face},
2531 anim => $item->{anim}, 2604 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2605 animspeed => $item->{animspeed},
2533 ); 2606 );
2534 2607
2535 $self->add (new CFClient::UI::Label 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2609
2537 text => $desc, 2610 $self->{item} = $item;
2538 ); 2611
2612 $self->update_item;
2539 2613
2540 $self 2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2541} 2623}
2542 2624
2543############################################################################# 2625#############################################################################
2544 2626
2545package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2561 my ($self, $items) = @_; 2643 my ($self, $items) = @_;
2562 2644
2563 $self->{scrolled}->clear; 2645 $self->{scrolled}->clear;
2564 return unless $items; 2646 return unless $items;
2565 2647
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2567 2652
2568 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2569 2654
2570 for my $item (@items) { 2655 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); 2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2576 } 2658 }
2659
2660 $self->{scrolled}->add (@items);
2577 2661
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579} 2663}
2580 2664
2581sub size_request { 2665sub size_request {
… …
2655 } 2739 }
2656} 2740}
2657 2741
2658############################################################################# 2742#############################################################################
2659 2743
2744package CFClient::UI::Statusbox;
2745
2746our @ISA = CFClient::UI::VBox::;
2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2757sub reorder {
2758 my ($self) = @_;
2759 my $NOW = time;
2760
2761 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 }
2764
2765 my @widgets;
2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2772 my $count = 10 + 1;
2773 for my $item (@items) {
2774 last unless --$count;
2775
2776 push @widgets, $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2782 for ($short) {
2783 s/^\s+//;
2784 s/\s+/ /g;
2785 }
2786
2787 new CFClient::UI::Label
2788 markup => $short,
2789 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2848}
2849
2850#############################################################################
2851
2660package CFClient::UI::Root; 2852package CFClient::UI::Root;
2661 2853
2662our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
2663 2855
2664use CFClient::OpenGL; 2856use CFClient::OpenGL;
… …
2692} 2884}
2693 2885
2694sub size_allocate { 2886sub size_allocate {
2695 my ($self, $w, $h) = @_; 2887 my ($self, $w, $h) = @_;
2696 2888
2697 my $old_w = $self->{old_w}; 2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2698 my $old_h = $self->{old_h}; 2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2699 2891
2700 if ($old_w && $old_h) { 2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2701 for my $child ($self->children) { 2893 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 2894
2713 for my $child ($self->children) { 2895 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $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; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2718 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2719 } 2908 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 2909}
2724 2910
2725sub coord2local { 2911sub coord2local {
2726 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2727 2913
… …
2740 $self->check_size; 2926 $self->check_size;
2741 $::WANT_REFRESH++; 2927 $::WANT_REFRESH++;
2742} 2928}
2743 2929
2744sub add { 2930sub add {
2745 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2746 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2747 # integerise window positions 2936 # integerise window positions
2748 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2749 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2750 2940
2751 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2752} 2942}
2753 2943
2754sub on_refresh { 2944sub on_refresh {
2755 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2756 2946
2757 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2758} 2948}
2759 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2760sub draw { 2956sub draw {
2761 my ($self) = @_; 2957 my ($self) = @_;
2958
2959 while ($self->{refresh_hook}) {
2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2762 2963
2763 if ($self->{check_size}) { 2964 if ($self->{check_size}) {
2764 my @queue = ([], []); 2965 my @queue = ([], []);
2765 2966
2766 for (;;) { 2967 for (;;) {
… …
2774 2975
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)} 2977 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request; 2978 : $widget->size_request;
2778 2979
2980 if (delete $widget->{force_alloc}
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781 2983
2782 $widget->{req_w} = $w; 2984 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h; 2985 $widget->{req_h} = $h;
2784 2986
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786 2988
2787 $widget->{parent}->check_size 2989 $widget->{parent}->check_size
2788 if $widget->{parent}; 2990 if $widget->{parent};
2789 } 2991 }
2790 } 2992 }
… …
2802 $widget->size_allocate ($w, $h); 3004 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h); 3005 $widget->emit (size_allocate => $w, $h);
2804 } 3006 }
2805 } 3007 }
2806 3008
2807 while ($self->{refresh_hook}) { 3009 while ($self->{post_alloc_hook}) {
2808 $_->() 3010 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3011 for values %{delete $self->{post_alloc_hook}};
2810 } 3012 }
2811 3013
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2825############################################################################# 3027#############################################################################
2826 3028
2827package CFClient::UI; 3029package CFClient::UI;
2828 3030
2829$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3033
28321 30341
2833 3035

Diff Legend

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