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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.215 by root, Fri May 19 03:49:48 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
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) = @_;
… …
644 687
645sub render_child { 688sub render_child {
646 my ($self) = @_; 689 my ($self) = @_;
647 690
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.5, 0.5, 0.5, 1;
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) = @_;
… …
668 my $tex = $self->{texture} 704 my $tex = $self->{texture}
669 or return; 705 or return;
670 706
671 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
674 710
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 712
677 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
678} 714}
… …
773 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
774 810
775 $self 811 $self
776} 812}
777 813
778#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 815# update viewport offset on scroll
780 816
781############################################################################# 817#############################################################################
782 818
783package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 823use CFClient::OpenGL;
788 824
789sub new { 825sub new {
790 my $class = shift; 826 my $class = shift;
791 827
792 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 829 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 830 @_,
797 ); 831 )
798
799 $self
800} 832}
801 833
802sub _draw { 834sub _draw {
803 my ($self) = @_; 835 my ($self) = @_;
804 836
805 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
806 839
807 glEnable GL_BLEND; 840 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 843
812# glBegin GL_QUADS; 844 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 845 glVertex 0 , 0;
815# glVertex 0 , $h; 846 glVertex 0 , $h;
816# glVertex $w, $h; 847 glVertex $w, $h;
817# glVertex $w, 0; 848 glVertex $w, 0;
818# glEnd; 849 glEnd;
819 850
820
821 $self->child->draw;
822 glDisable GL_BLEND; 851 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
824} 855}
825 856
826############################################################################# 857#############################################################################
827 858
828package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
842 873
843 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
846 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
847 can_events => 1, 879 can_events => 1,
848 @_ 880 @_
849 ); 881 );
850 882
851 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
876 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
877 909
878 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
880 912
881 $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)
882 if $self->{title}; 914 if $self->{title};
883 915
884 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
885} 917}
886 918
… …
944 my ($self) = @_; 976 my ($self) = @_;
945 977
946 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 980
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 983
954 my $border = $self->border; 984 my $border = $self->border;
955 985
956 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 991
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 993 my $bg = $tex[0];
964 994
965 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
970 1000
971 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
975 1006
976 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1008
980 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
981 1010
982 $self->child->draw; 1011 $self->child->draw;
983} 1012}
… …
1250 1279
1251############################################################################# 1280#############################################################################
1252 1281
1253package CFClient::UI::Label; 1282package CFClient::UI::Label;
1254 1283
1255our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1256 1285
1257use CFClient::OpenGL; 1286use CFClient::OpenGL;
1258 1287
1259sub new { 1288sub new {
1260 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1261 1290
1262 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1264 #font => default_font 1295 #font => default_font
1265 #text => initial text 1296 #text => initial text
1266 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1268 fontsize => 1, 1301 fontsize => 1,
1269 align => -1, 1302 align => -1,
1270 valign => -1, 1303 valign => -1,
1271 padding => 2, 1304 padding => 2,
… …
1286 } 1319 }
1287 1320
1288 $self 1321 $self
1289} 1322}
1290 1323
1291sub escape { 1324sub escape($) {
1292 local $_ = $_[1]; 1325 local $_ = $_[0];
1293 1326
1294 s/&/&amp;/g; 1327 s/&/&amp;/g;
1295 s/>/&gt;/g; 1328 s/>/&gt;/g;
1296 s/</&lt;/g; 1329 s/</&lt;/g;
1297 1330
1298 $_[1] 1331 $_
1299} 1332}
1300 1333
1301sub update { 1334sub update {
1302 my ($self) = @_; 1335 my ($self) = @_;
1303 1336
… …
1336sub size_request { 1369sub size_request {
1337 my ($self) = @_; 1370 my ($self) = @_;
1338 1371
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $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});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1377
1343 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1344 1379
1345 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1375} 1410}
1376 1411
1377sub _draw { 1412sub _draw {
1378 my ($self) = @_; 1413 my ($self) = @_;
1379 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1380 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $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});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1424
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1426
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1391 1430
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1395 1434
1396 $tex 1435 $tex
1397 }; 1436 };
1398 1437
1399 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1454sub set_text { 1493sub set_text {
1455 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1456 1495
1457 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1459 $self->check_size; 1499 $self->check_size;
1460 $self->update;
1461} 1500}
1462 1501
1463sub get_text { 1502sub get_text {
1464 $_[0]{text} 1503 $_[0]{text}
1465} 1504}
… …
1485 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1487 1526
1488 my $text = $self->get_text; 1527 my $text = $self->get_text;
1489 1528
1490 if ($sym == 8) { 1529 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1542 $self->emit ('escape');
1504 } elsif ($uni) { 1543 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1545 }
1507 1546
1508 $self->_set_text ($text); 1547 $self->_set_text ($text);
1509 $self->update; 1548 $self->update;
1549 $self->check_size;
1510} 1550}
1511 1551
1512sub focus_in { 1552sub focus_in {
1513 my ($self) = @_; 1553 my ($self) = @_;
1514 1554
… …
1643 my $class = shift; 1683 my $class = shift;
1644 1684
1645 $class->SUPER::new ( 1685 $class->SUPER::new (
1646 padding => 4, 1686 padding => 4,
1647 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1650 can_hover => 1, 1689 can_hover => 1,
1651 align => 0, 1690 align => 0,
1652 valign => 0, 1691 valign => 0,
1653 can_events => 1, 1692 can_events => 1,
… …
1701 1740
1702 $class->SUPER::new ( 1741 $class->SUPER::new (
1703 padding => 2, 1742 padding => 2,
1704 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1705 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],
1706 state => 0, 1747 state => 0,
1707 can_hover => 1, 1748 can_hover => 1,
1708 @_ 1749 @_
1709 ) 1750 )
1710} 1751}
… …
1734 1775
1735 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;
1736 1777
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1779
1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1739 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1746} 1785}
1747 1786
1748############################################################################# 1787#############################################################################
1749 1788
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1997 2036
1998sub new { 2037sub new {
1999 my $class = shift; 2038 my $class = shift;
2000 2039
2001 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2002 2041
2003 # TODO: 0-width page 2042 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2044 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2008 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],
2009 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2010 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2012 vertical => 0, 2053 vertical => 0,
2013 can_hover => 1, 2054 can_hover => 1,
2014 inner_pad => 5, 2055 inner_pad => .05,
2015 @_ 2056 @_
2016 ); 2057 );
2017 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2018 $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 }
2019} 2086}
2020 2087
2021sub size_request { 2088sub size_request {
2022 my ($self) = @_; 2089 my ($self) = @_;
2023 2090
… …
2036 2103
2037sub mouse_motion { 2104sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2039 2106
2040 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
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2042 2125
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2044 2127
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2047 2129
2048 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2132
2054 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2055 $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;
2056 } 2140 });
2057}
2058 2141
2059# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2143}
2066 2144
2067sub _draw { 2145sub _draw {
2068 my ($self) = @_; 2146 my ($self) = @_;
2069 2147
2070 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2071 2149
2072 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2073 2151
2074 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2076 2154
2155 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2157 }
2082 2158
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2161
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2164
2107 # draw background 2165 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2167
2110 # draw handle 2168 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2170
2113 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2114} 2172}
2115 2173
2116############################################################################# 2174#############################################################################
… …
2204 2262
2205 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2206 2264
2207 delete $self->{texture}; 2265 delete $self->{texture};
2208 2266
2209 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2269 my $height = 0;
2212 2270
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2214 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2219 2277
2220 delete $self->{texture}; 2278 delete $self->{texture};
2221 } 2279 }
2222 2280
2223 $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 {
2224 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2226 2284
2227 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229 2287
… …
2369} 2427}
2370 2428
2371sub set_tooltip_from { 2429sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2373 2431
2374 $self->{label} = new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2435 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2439 );
2381 $self->add ($self->{label});
2382} 2440}
2383 2441
2384sub size_request { 2442sub size_request {
2385 my ($self) = @_; 2443 my ($self) = @_;
2386 2444
… …
2396} 2454}
2397 2455
2398sub _draw { 2456sub _draw {
2399 my ($self) = @_; 2457 my ($self) = @_;
2400 2458
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2403 2460
2404 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2405 2462
2406 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2474 glVertex 0 , $h;
2418 glVertex $w, $h; 2475 glVertex $w, $h;
2419 glVertex $w, 0; 2476 glVertex $w, 0;
2420 glEnd; 2477 glEnd;
2421 2478
2422 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2426} 2481}
2427 2482
2428############################################################################# 2483#############################################################################
2429 2484
… …
2466 2521
2467package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2468 2523
2469our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2470 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}
2551
2471sub new { 2552sub new {
2472 my $class = shift; 2553 my $class = shift;
2473 2554
2474 my %args = @_; 2555 my %args = @_;
2475 2556
2476 my $item = delete $args{item}; 2557 my $item = delete $args{item};
2477 2558
2478 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2560
2483 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2484 can_hover => 1, 2562 can_hover => 1,
2485 can_events => 1, 2563 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub { 2566 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2490 2568
2491 # 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 :(
2492 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
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2498 items => [
2499 ["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") }],
2500 [ 2586 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") }, 2588 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ], 2589 ],
2508 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2593 }
2510 2594
2511 1 2595 1
2512 }, 2596 },
2513 %args 2597 %args
2514 ); 2598 );
2599
2515 2600
2516 $self->add (new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2602 can_events => 0,
2518 face => $item->{face}, 2603 face => $item->{face},
2519 anim => $item->{anim}, 2604 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2605 animspeed => $item->{animspeed},
2521 ); 2606 );
2522 2607
2523 $self->add (new CFClient::UI::Label 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2609
2525 text => $desc, 2610 $self->{item} = $item;
2526 ); 2611
2612 $self->update_item;
2527 2613
2528 $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);
2529} 2623}
2530 2624
2531############################################################################# 2625#############################################################################
2532 2626
2533package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2549 my ($self, $items) = @_; 2643 my ($self, $items) = @_;
2550 2644
2551 $self->{scrolled}->clear; 2645 $self->{scrolled}->clear;
2552 return unless $items; 2646 return unless $items;
2553 2647
2554 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;
2555 2652
2556 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2557 2654
2558 for my $item (@items) { 2655 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $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 ();
2564 } 2658 }
2659
2660 $self->{scrolled}->add (@items);
2565 2661
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2663}
2568 2664
2569sub size_request { 2665sub size_request {
… …
2647 2743
2648package CFClient::UI::Statusbox; 2744package CFClient::UI::Statusbox;
2649 2745
2650our @ISA = CFClient::UI::VBox::; 2746our @ISA = CFClient::UI::VBox::;
2651 2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2652sub reorder { 2757sub reorder {
2653 my ($self) = @_; 2758 my ($self) = @_;
2654 my $NOW = time; 2759 my $NOW = time;
2655 2760
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2761 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2763 }
2659 2764
2660 my @widgets; 2765 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2662 my $count = 10 + 1; 2772 my $count = 10 + 1;
2663 for my $item (@items) { 2773 for my $item (@items) {
2664 last unless --$count; 2774 last unless --$count;
2665 2775
2666 push @widgets, $item->{label} ||= do { 2776 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2777 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2669 for ($short) { 2782 for ($short) {
2670 s/^\s+//; 2783 s/^\s+//;
2671 s/\012.*//s; 2784 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2785 }
2675 2786
2676 new CFClient::UI::Label 2787 new CFClient::UI::Label
2677 markup => $short, 2788 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2789 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2790 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2791 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2792 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2793 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg},
2683 can_events => 1, 2795 can_events => 1,
2684 can_hover => 1, 2796 can_hover => 1
2685 }; 2797 };
2686 } 2798 }
2687 2799
2688 $self->clear; 2800 $self->clear;
2689 $self->SUPER::add (@widgets); 2801 $self->SUPER::add (reverse @widgets);
2690} 2802}
2691 2803
2692sub add { 2804sub add {
2693 my ($self, $text, %arg) = @_; 2805 my ($self, $text, %arg) = @_;
2694 2806
2695 my $item = { 2807 $text =~ s/^\s+//;
2696 time => time, 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},
2697 text => $text, 2827 text => $text,
2698 timeout => 60, 2828 timeout => $timeout,
2699 tooltip => $text, 2829 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2702 %arg, 2833 %arg,
2834 };
2703 }; 2835 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2836
2710 $self->reorder; 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;
2711} 2848}
2712 2849
2713############################################################################# 2850#############################################################################
2714 2851
2715package CFClient::UI::Root; 2852package CFClient::UI::Root;
… …
2747} 2884}
2748 2885
2749sub size_allocate { 2886sub size_allocate {
2750 my ($self, $w, $h) = @_; 2887 my ($self, $w, $h) = @_;
2751 2888
2752 my $old_w = $self->{old_w}; 2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 2891
2755 if ($old_w && $old_h) { 2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767 2894
2768 for my $child ($self->children) { 2895 for my $child ($self->children) {
2769 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)};
2770 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
2771 $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;
2772 $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
2773 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2774 } 2908 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 2909}
2779 2910
2780sub coord2local { 2911sub coord2local {
2781 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2782 2913
… …
2795 $self->check_size; 2926 $self->check_size;
2796 $::WANT_REFRESH++; 2927 $::WANT_REFRESH++;
2797} 2928}
2798 2929
2799sub add { 2930sub add {
2800 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2801 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2802 # integerise window positions 2936 # integerise window positions
2803 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2805 2940
2806 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2807} 2942}
2808 2943
2809sub on_refresh { 2944sub on_refresh {
2810 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2811 2946
2812 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2813} 2948}
2814 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2815sub draw { 2956sub draw {
2816 my ($self) = @_; 2957 my ($self) = @_;
2958
2959 while ($self->{refresh_hook}) {
2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2817 2963
2818 if ($self->{check_size}) { 2964 if ($self->{check_size}) {
2819 my @queue = ([], []); 2965 my @queue = ([], []);
2820 2966
2821 for (;;) { 2967 for (;;) {
… …
2829 2975
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 2977 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 2978 : $widget->size_request;
2833 2979
2980 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 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#
2836 2983
2837 $widget->{req_w} = $w; 2984 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 2985 $widget->{req_h} = $h;
2839 2986
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 2988
2842 $widget->{parent}->check_size 2989 $widget->{parent}->check_size
2843 if $widget->{parent}; 2990 if $widget->{parent};
2844 } 2991 }
2845 } 2992 }
… …
2857 $widget->size_allocate ($w, $h); 3004 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3005 $widget->emit (size_allocate => $w, $h);
2859 } 3006 }
2860 } 3007 }
2861 3008
2862 while ($self->{refresh_hook}) { 3009 while ($self->{post_alloc_hook}) {
2863 $_->() 3010 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3011 for values %{delete $self->{post_alloc_hook}};
2865 } 3012 }
2866 3013
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2880############################################################################# 3027#############################################################################
2881 3028
2882package CFClient::UI; 3029package CFClient::UI;
2883 3030
2884$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3033
28871 30341
2888 3035

Diff Legend

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