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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
240 265
241sub size_allocate { 266sub size_allocate {
242 # nothing to be done 267 # nothing to be done
243} 268}
244 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
245sub children { 277sub 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 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258} 278}
259 279
260sub set_max_size { 280sub set_max_size {
261 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
262 282
… …
355 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
358 glEnd; 378 glEnd;
359 glPopMatrix; 379 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 381 }
362} 382}
363 383
364sub _draw { 384sub _draw {
365 my ($self) = @_; 385 my ($self) = @_;
… …
380} 400}
381 401
382sub set_parent { 402sub set_parent {
383 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
384 404
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
387} 410}
388 411
389sub check_size { 412sub check_size {
390 my ($self) = @_; 413 my ($self, $forced) = @_;
391 414
415 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 417}
394 418
395sub update { 419sub update {
396 my ($self) = @_; 420 my ($self) = @_;
… …
412} 436}
413 437
414sub DESTROY { 438sub DESTROY {
415 my ($self) = @_; 439 my ($self) = @_;
416 440
441 delete $WIDGET{$self+0};
417 #$self->deactivate; 442 #$self->deactivate;
418} 443}
419 444
420############################################################################# 445#############################################################################
421 446
… …
506 $self->{children} = [ 531 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 533 @{$self->{children}}, @widgets
509 ]; 534 ];
510 535
511 $_->check_size 536 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 537 $self->update;
515} 538}
516 539
517sub children { 540sub children {
518 @{ $_[0]{children} } 541 @{ $_[0]{children} }
… …
625} 648}
626 649
627sub update { 650sub update {
628 my ($self) = @_; 651 my ($self) = @_;
629 652
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 654 $self->SUPER::update;
632} 655}
633 656
634sub size_allocate { 657sub size_allocate {
635 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
667 690
668 my $tex = $self->{texture} 691 my $tex = $self->{texture}
669 or return; 692 or return;
670 693
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 696 glColor 0, 0, 0, 1;
676 697
677 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 699
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
681} 701}
682 702
683############################################################################# 703#############################################################################
684 704
… …
776 $self->add ($self->{slider}); 796 $self->add ($self->{slider});
777 797
778 $self 798 $self
779} 799}
780 800
781#TODO# update range on size_allocate depeneing on child 801#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 802# update viewport offset on scroll
783 803
784############################################################################# 804#############################################################################
785 805
786package CFClient::UI::Frame; 806package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 810use CFClient::OpenGL;
791 811
792sub new { 812sub new {
793 my $class = shift; 813 my $class = shift;
794 814
795 my $self = $class->SUPER::new ( 815 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 816 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 817 @_,
800 ); 818 )
801
802 $self
803} 819}
804 820
805sub _draw { 821sub _draw {
806 my ($self) = @_; 822 my ($self) = @_;
807 823
808 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
809 826
810 glEnable GL_BLEND; 827 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 830
815# glBegin GL_QUADS; 831 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 832 glVertex 0 , 0;
818# glVertex 0 , $h; 833 glVertex 0 , $h;
819# glVertex $w, $h; 834 glVertex $w, $h;
820# glVertex $w, 0; 835 glVertex $w, 0;
821# glEnd; 836 glEnd;
822 837
823
824 $self->child->draw;
825 glDisable GL_BLEND; 838 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
827} 842}
828 843
829############################################################################# 844#############################################################################
830 845
831package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
845 860
846 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
849 border => 0.6, 864 border => 0.6,
865 toplevel => 1,
850 can_events => 1, 866 can_events => 1,
851 @_ 867 @_
852 ); 868 );
853 869
854 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
… …
947 my ($self) = @_; 963 my ($self) = @_;
948 964
949 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 967
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 970
957 my $border = $self->border; 971 my $border = $self->border;
958 972
959 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 978
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 980 my $bg = $tex[0];
967 981
968 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
973 987
974 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
978 993
979 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 995
983 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
984 997
985 $self->child->draw; 998 $self->child->draw;
986} 999}
… …
1213} 1226}
1214 1227
1215sub size_allocate { 1228sub size_allocate {
1216 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1217 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1218 my $children = $self->{children}; 1233 my $children = $self->{children};
1219 1234
1220 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1221 1236
1222 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1261 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1262 1277
1263 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1265 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1266 fontsize => 1, 1284 fontsize => 1,
1267 text => "",
1268 align => -1, 1285 align => -1,
1269 valign => -1, 1286 valign => -1,
1270 padding => 2, 1287 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1288 can_events => 0,
1273 %arg 1289 %arg
1274 ); 1290 );
1275 1291
1276 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1295 $self->{template} = $layout;
1280 } 1296 }
1281 1297
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1284 1303
1285 $self 1304 $self
1286} 1305}
1287 1306
1288sub escape { 1307sub escape {
… …
1306 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1307 1326
1308 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1310 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1312 1332
1313 $self->update; 1333 $self->update;
1314 $self->check_size; 1334 $self->check_size;
1315} 1335}
… …
1318 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1319 1339
1320 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1322 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1324 1347
1325 $self->update; 1348 $self->update;
1326 $self->check_size; 1349 $self->check_size;
1327} 1350}
… …
1369 1392
1370sub _draw { 1393sub _draw {
1371 my ($self) = @_; 1394 my ($self) = @_;
1372 1395
1373 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1377 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1378 }; 1413 };
1379 1414
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1417
1418 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1400 1424
1401 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1426}
1404 1427
1405############################################################################# 1428#############################################################################
1406 1429
1407package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1442 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1443 1466
1444 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1445} 1468}
1446 1469
1470sub set_text {
1471 my ($self, $text) = @_;
1472
1473 $self->{cursor} = length $text;
1474 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477}
1478
1447sub get_text { 1479sub get_text {
1448 $_[0]{text} 1480 $_[0]{text}
1449} 1481}
1450 1482
1451sub size_request { 1483sub size_request {
… …
1458 1490
1459sub size_allocate { 1491sub size_allocate {
1460 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1461 1493
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471} 1495}
1472 1496
1473sub key_down { 1497sub key_down {
1474 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1475 1499
… …
1477 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1479 1503
1480 my $text = $self->get_text; 1504 my $text = $self->get_text;
1481 1505
1482 if ($sym == 8) { 1506 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1519 $self->emit ('escape');
1496 } elsif ($uni) { 1520 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1522 }
1499 1523
… …
1663 1687
1664 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1666 } 1690 }
1667 1691
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1673 1695
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1697
1676 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1699
1679 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1680} 1701}
1681 1702
1682############################################################################# 1703#############################################################################
… …
1729 1750
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1752
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1754
1734 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1735 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1760}
1745 1761
1746############################################################################# 1762#############################################################################
1747 1763
1748package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1792 1808
1793 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1794 } 1810 }
1795 1811
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1814
1801 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1816
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1805} 1818}
1806 1819
1807############################################################################# 1820#############################################################################
1808 1821
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1998 2011
1999sub new { 2012sub new {
2000 my $class = shift; 2013 my $class = shift;
2001 2014
2002 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
2003 2016
2004 # TODO: 0-width page 2017 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2019 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
… …
2010 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2024 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2025 req_h => $::WIDTH / 80,
2013 vertical => 0, 2026 vertical => 0,
2014 can_hover => 1, 2027 can_hover => 1,
2015 inner_pad => 5, 2028 inner_pad => .05,
2016 @_ 2029 @_
2017 ); 2030 );
2018 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
2019 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
2020} 2059}
2021 2060
2022sub size_request { 2061sub size_request {
2023 my ($self) = @_; 2062 my ($self) = @_;
2024 2063
… …
2037 2076
2038sub mouse_motion { 2077sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
2040 2079
2041 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2098
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2100
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2102
2049 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2105
2055 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
2057 } 2113 });
2058}
2059 2114
2060# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2116}
2067 2117
2068sub _draw { 2118sub _draw {
2069 my ($self) = @_; 2119 my ($self) = @_;
2070 2120
2071 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2072 2122
2073 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2074 2124
2075 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2077 2127
2078 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2130 }
2083 2131
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2134
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2137
2110 # draw background 2138 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2140
2113 # draw handle 2141 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2143
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2118} 2145}
2119 2146
2120############################################################################# 2147#############################################################################
2121 2148
… …
2132 fontsize => 1, 2159 fontsize => 1,
2133 can_events => 0, 2160 can_events => 0,
2134 #font => default_font 2161 #font => default_font
2135 @_, 2162 @_,
2136 2163
2137 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
2138 par => [], 2165 par => [],
2139 height => 0, 2166 height => 0,
2140 children => [ 2167 children => [
2141 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
… …
2160 2187
2161 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
2162 2189
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w}); 2191 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text); 2192 $layout->set_markup ($text);
2166 2193
2167 ($layout->size)[1] 2194 ($layout->size)[1]
2168} 2195}
2169 2196
2170sub reflow { 2197sub reflow {
… …
2208 2235
2209 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2210 2237
2211 delete $self->{texture}; 2238 delete $self->{texture};
2212 2239
2213 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2214 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2242 my $height = 0;
2216 2243
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2218 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2226 2253
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2228 glClearColor 0, 0, 0, 0; 2255 glClearColor 0, 0, 0, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
2230 2257
2231 glEnable GL_BLEND;
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235 2260
2236 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
2237 2262
… …
2246 2271
2247 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2273 my $h = $par->[0];
2249 2274
2250 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2251 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
2252 2278
2253 glColor @{ $par->[1] };
2254 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2256 } 2281 }
2257 2282
2258 $y += $h; 2283 $y += $h;
2259 } 2284 }
2260 2285
2261 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND;
2263 }; 2287 };
2264 }); 2288 });
2265} 2289}
2266 2290
2267sub _draw { 2291sub _draw {
2268 my ($self) = @_; 2292 my ($self) = @_;
2269 2293
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2296 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2299
2279 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
2280 2301
2281} 2302}
2282 2303
… …
2376 @_, 2397 @_,
2377 can_events => 0, 2398 can_events => 0,
2378 ) 2399 )
2379} 2400}
2380 2401
2381sub set_markup { 2402sub set_tooltip_from {
2382 my ($self, $text) = @_; 2403 my ($self, $widget) = @_;
2383 2404
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2405 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2406 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8,
2409 fg => [0, 0, 0, 1],
2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 );
2387} 2412}
2388 2413
2389sub size_request { 2414sub size_request {
2390 my ($self) = @_; 2415 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2416
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2418
2396 ($w + 4, $h + 4) 2419 ($w + 4, $h + 4)
2397} 2420}
… …
2403} 2426}
2404 2427
2405sub _draw { 2428sub _draw {
2406 my ($self) = @_; 2429 my ($self) = @_;
2407 2430
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2410 2432
2411 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2412 2434
2413 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2446 glVertex 0 , $h;
2425 glVertex $w, $h; 2447 glVertex $w, $h;
2426 glVertex $w, 0; 2448 glVertex $w, 0;
2427 glEnd; 2449 glEnd;
2428 2450
2429 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2433} 2453}
2434 2454
2435############################################################################# 2455#############################################################################
2436 2456
… …
2459 return unless $::CONN;#d# manage and cache textures differently 2479 return unless $::CONN;#d# manage and cache textures differently
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2461 2481
2462 # TODO animation 2482 # TODO animation
2463 if ($tex) { 2483 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2486 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2489 }
2473} 2490}
2474 2491
2475############################################################################# 2492#############################################################################
2476 2493
… …
2481sub new { 2498sub new {
2482 my $class = shift; 2499 my $class = shift;
2483 2500
2484 my %args = @_; 2501 my %args = @_;
2485 2502
2486 my $item = $args{item}; 2503 my $item = delete $args{item};
2487 2504
2488 my $desc = $item->{nrof} < 2 2505 my $desc = $item->{nrof} < 2
2489 ? $item->{name} 2506 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}"; 2507 : "$item->{nrof} $item->{name_pl}";
2491 2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2492 2523
2493 my $self = $class->SUPER::new ( 2524 my $self = $class->SUPER::new (
2494 can_hover => 1, 2525 can_hover => 1,
2495 can_events => 1, 2526 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc) 2527 tooltip => (CFClient::UI::Label->escape ($desc)
… …
2502 if ($ev->{button} == 1) { 2533 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) { 2535 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}"); 2536 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) { 2537 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new ( 2538 my @menu_items = (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2510 [ 2543 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") }, 2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ], 2546 ],
2518 )->popup ($ev); 2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519 } 2550 }
2520 2551
2521 1 2552 1
2522 }, 2553 },
2523 %args 2554 %args
2524 ); 2555 );
2556
2525 $self->add(new CFClient::UI::Face 2557 $self->add (new CFClient::UI::Face
2526 can_events => 0, 2558 can_events => 0,
2527 face => $item->{face}, 2559 face => $item->{face},
2528 anim => $item->{anim}, 2560 anim => $item->{anim},
2529 animspeed => $item->{animspeed}); 2561 animspeed => $item->{animspeed},
2562 );
2563
2530 $self->add(new CFClient::UI::Label 2564 $self->add (new CFClient::UI::Label
2531 can_events => 0, 2565 can_events => 0,
2532 text => $desc); 2566 text => $desc,
2567 );
2533 2568
2534 $self 2569 $self
2535} 2570}
2536 2571
2537############################################################################# 2572#############################################################################
… …
2555 my ($self, $items) = @_; 2590 my ($self, $items) = @_;
2556 2591
2557 $self->{scrolled}->clear; 2592 $self->{scrolled}->clear;
2558 return unless $items; 2593 return unless $items;
2559 2594
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2561 2599
2562 $self->{real_items} = \@items; 2600 $self->{real_items} = \@items;
2563 2601
2564 for my $item (@items) { 2602 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2 2603 my $desc = $item->{nrof} < 2
2566 ? $item->{name} 2604 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}"; 2605 : "$item->{nrof} $item->{name_pl}";
2568 2606
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2570 } 2608 }
2609
2610 $self->{scrolled}->add (@items);
2571 2611
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573} 2613}
2574 2614
2575sub size_request { 2615sub size_request {
… …
2649 } 2689 }
2650} 2690}
2651 2691
2652############################################################################# 2692#############################################################################
2653 2693
2694package CFClient::UI::Statusbox;
2695
2696our @ISA = CFClient::UI::VBox::;
2697
2698sub reorder {
2699 my ($self) = @_;
2700 my $NOW = time;
2701
2702 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 }
2705
2706 my @widgets;
2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2713 my $count = 10 + 1;
2714 for my $item (@items) {
2715 last unless --$count;
2716
2717 push @widgets, $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2723 for ($short) {
2724 s/^\s+//;
2725 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 }
2729
2730 new CFClient::UI::Label
2731 markup => $short,
2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize},
2736 fg => $item->{fg},
2737 can_events => 1,
2738 can_hover => 1
2739 };
2740 }
2741
2742 $self->clear;
2743 $self->SUPER::add (reverse @widgets);
2744}
2745
2746sub add {
2747 my ($self, $text, %arg) = @_;
2748
2749 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2769 text => $text,
2770 timeout => $timeout,
2771 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2776 %arg,
2777 };
2778 }
2779
2780 $self->reorder;
2781}
2782
2783#############################################################################
2784
2654package CFClient::UI::Root; 2785package CFClient::UI::Root;
2655 2786
2656our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2657 2788
2658use CFClient::OpenGL; 2789use CFClient::OpenGL;
… …
2686} 2817}
2687 2818
2688sub size_allocate { 2819sub size_allocate {
2689 my ($self, $w, $h) = @_; 2820 my ($self, $w, $h) = @_;
2690 2821
2691 my $old_w = $self->{old_w}; 2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2692 my $old_h = $self->{old_h}; 2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2693 2824
2694 if ($old_w && $old_h) { 2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2695 for my $child ($self->children) { 2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706 2827
2707 for my $child ($self->children) { 2828 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2712 $child->configure ($X, $Y, $W, $H); 2840 $child->configure ($X, $Y, $W, $H);
2713 } 2841 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 2842}
2718 2843
2719sub coord2local { 2844sub coord2local {
2720 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2721 2846
… …
2734 $self->check_size; 2859 $self->check_size;
2735 $::WANT_REFRESH++; 2860 $::WANT_REFRESH++;
2736} 2861}
2737 2862
2738sub add { 2863sub add {
2739 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2740 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2741 # integerise window positions 2869 # integerise window positions
2742 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2744 2873
2745 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2746} 2875}
2747 2876
2748sub on_refresh { 2877sub on_refresh {
2749 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2750 2879
2751 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2752} 2881}
2753 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2754sub draw { 2889sub draw {
2755 my ($self) = @_; 2890 my ($self) = @_;
2891
2892 while ($self->{refresh_hook}) {
2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2756 2896
2757 if ($self->{check_size}) { 2897 if ($self->{check_size}) {
2758 my @queue = ([], []); 2898 my @queue = ([], []);
2759 2899
2760 for (;;) { 2900 for (;;) {
… …
2768 2908
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)} 2910 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request; 2911 : $widget->size_request;
2772 2912
2913 if (delete $widget->{force_alloc}
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916
2774 $widget->{req_w} = $w; 2917 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h; 2918 $widget->{req_h} = $h;
2776 2919
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778 2921
2779 $widget->{parent}->check_size 2922 $widget->{parent}->check_size
2780 if $widget->{parent}; 2923 if $widget->{parent};
2781 } 2924 }
2782 } 2925 }
2783 } 2926 }
2784 2927
2785 while ($self->{size_alloc}) { 2928 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) { 2929 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_; 2930 my ($widget, $w, $h) = @$_;
2931
2932 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0;
2788 2934
2789 $widget->{w} = $w; 2935 $widget->{w} = $w;
2790 $widget->{h} = $h; 2936 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h); 2937 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h); 2938 $widget->emit (size_allocate => $w, $h);
2793 } 2939 }
2794 } 2940 }
2795 2941
2796 while ($self->{refresh_hook}) { 2942 while ($self->{post_alloc_hook}) {
2797 $_->() 2943 $_->()
2798 for values %{delete $self->{refresh_hook}}; 2944 for values %{delete $self->{post_alloc_hook}};
2799 } 2945 }
2800 2946
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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