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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
136 $rem += $_ - $i; 130 $rem += $_ - $i;
137 $_ = $i; 131 $_ = $i;
138 } 132 }
139} 133}
140 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
141# call when resolution changes etc. 151# call when resolution changes etc.
142sub rescale_widgets { 152sub rescale_widgets {
143 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
144 154
145 for my $widget (values %WIDGET) { 155 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $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}; 158 $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}; 159 $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}; 160 $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}; 161 $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}; 162 $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}; 163 $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}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 } 165 }
156
157 $widget->reconfigure;
158 } 166 }
167
168 reconfigure_widgets;
159} 169}
160 170
161############################################################################# 171#############################################################################
162 172
163package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
195 %$self = (); 205 %$self = ();
196} 206}
197 207
198sub show { 208sub show {
199 my ($self) = @_; 209 my ($self) = @_;
200
201 return if $self->{parent}; 210 return if $self->{parent};
202 211
203 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
204} 213}
205 214
206sub hide { 215sub show_centered {
207 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
208 234
209 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 $self->focus_out;
239}
240
241sub hide {
242 my ($self) = @_;
243
244 $self->set_invisible;
211 245
212 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
213 if $self->{parent}; 247 if $self->{parent};
214} 248}
215 249
… …
282 316
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 317 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 318 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 319}
286 320
321sub set_tooltip {
322 my ($self, $tooltip) = @_;
323
324 $self->{tooltip} = $tooltip;
325
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip;
329 }
330}
331
287# translate global coordinates to local coordinate system 332# translate global coordinates to local coordinate system
288sub coord2local { 333sub coord2local {
289 my ($self, $x, $y) = @_; 334 my ($self, $x, $y) = @_;
290 335
291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 336 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
… …
304 return if $FOCUS == $self; 349 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
306 351
307 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
308 353
309 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
310 355
311 $focus->update if $focus; 356 $focus->update if $focus;
312 $FOCUS->update; 357 $FOCUS->update;
313} 358}
314 359
… …
317 362
318 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
319 364
320 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
321 366
322 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
323 368
324 $focus->update if $focus; #? 369 $focus->update if $focus; #?
370
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS;
325} 373}
326 374
327sub mouse_motion { } 375sub mouse_motion { }
328sub button_up { } 376sub button_up { }
329sub key_down { } 377sub key_down { }
330sub key_up { } 378sub key_up { }
331 379
332sub button_down { 380sub button_down {
333 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
334 382
335 $self->focus_in; 383 $self->focus_in;
… …
405 Scalar::Util::weaken ($self->{parent} = $parent); 453 Scalar::Util::weaken ($self->{parent} = $parent);
406 454
407 # TODO: req_w _does_change after ->reconfigure 455 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 456 $self->check_size
409 unless exists $self->{req_w}; 457 unless exists $self->{req_w};
458
459 $self->show;
410} 460}
411 461
412sub check_size { 462sub check_size {
413 my ($self, $forced) = @_; 463 my ($self, $forced) = @_;
414 464
… …
427 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
428 478
429 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
430} 480}
431 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
432sub emit { 488sub emit {
433 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
434 490
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
436} 493}
437 494
438sub DESTROY { 495sub DESTROY {
439 my ($self) = @_; 496 my ($self) = @_;
440 497
… …
455 my $class = shift; 512 my $class = shift;
456 513
457 # range [value, low, high, page] 514 # range [value, low, high, page]
458 515
459 $class->SUPER::new ( 516 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 517 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 518 #active_bg => [1, 1, 1, 0.5],
462 @_ 519 @_
463 ) 520 )
464} 521}
465 522
466sub _draw { 523sub _draw {
467 my ($self) = @_; 524 my ($self) = @_;
468 525
526 my $color = $FOCUS == $self && $self->{active_bg}
527 ? $self->{active_bg}
528 : $self->{bg};
529
530 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 531 my ($w, $h) = @$self{qw(w h)};
470 532
471 glEnable GL_BLEND; 533 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 535 glColor @$color;
474 536
475 glBegin GL_QUADS; 537 glBegin GL_QUADS;
476 glVertex 0 , 0; 538 glVertex 0 , 0;
477 glVertex 0 , $h; 539 glVertex 0 , $h;
478 glVertex $w, $h; 540 glVertex $w, $h;
479 glVertex $w, 0; 541 glVertex $w, 0;
480 glEnd; 542 glEnd;
481 543
482 glDisable GL_BLEND; 544 glDisable GL_BLEND;
545 }
483} 546}
484 547
485############################################################################# 548#############################################################################
486 549
487package CFClient::UI::Empty; 550package CFClient::UI::Empty;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
674 737
675 $self->_render; 738 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 739 };
684} 740}
685 741
686sub _draw { 742sub _draw {
687 my ($self) = @_; 743 my ($self) = @_;
… …
691 my $tex = $self->{texture} 747 my $tex = $self->{texture}
692 or return; 748 or return;
693 749
694 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
697 753
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 755
700 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
701} 757}
… …
708 764
709sub size_request { 765sub size_request {
710 my ($self) = @_; 766 my ($self) = @_;
711 767
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 769
715 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
716} 771}
717 772
718sub size_allocate { 773sub size_allocate {
719 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
720 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
721 $self->update; 779 $self->update;
722} 780}
723 781
724sub set_offset { 782sub set_offset {
725 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
779 837
780 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
781 vertical => 1, 839 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 841 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
785 }, 843 },
786 ; 844 ;
787 845
788 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 847 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 848 slider => $slider,
791 @_, 849 @_,
792 ); 850 );
793 851
794 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 853 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
797 855
798 $self 856 $self
857}
858
859sub size_allocate {
860 my ($self, $w, $h) = @_;
861
862 $self->SUPER::size_allocate ($w, $h);
863
864 my $child = $self->{vp}->child;
865 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 866}
800 867
801#TODO# update range on size_allocate depending on child 868#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 869# update viewport offset on scroll
803 870
… …
857 my $class = shift; 924 my $class = shift;
858 925
859 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
860 927
861 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
864 border => 0.6, 931 border => 0.6,
865 toplevel => 1, 932 is_toplevel => 1,
866 can_events => 1, 933 can_events => 1,
867 @_ 934 @_
868 ); 935 );
869 936
870 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 938 align => 0,
… …
895 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
896 963
897 $h -= List::Util::max 0, $self->border * 2; 964 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 965 $w -= List::Util::max 0, $self->border * 2;
899 966
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 968 if $self->{title};
902 969
903 $self->child->configure ($self->border, $self->border, $w, $h); 970 $self->child->configure ($self->border, $self->border, $w, $h);
904} 971}
905 972
… …
1266 1333
1267############################################################################# 1334#############################################################################
1268 1335
1269package CFClient::UI::Label; 1336package CFClient::UI::Label;
1270 1337
1271our @ISA = CFClient::UI::Base::; 1338our @ISA = CFClient::UI::DrawBG::;
1272 1339
1273use CFClient::OpenGL; 1340use CFClient::OpenGL;
1274 1341
1275sub new { 1342sub new {
1276 my ($class, %arg) = @_; 1343 my ($class, %arg) = @_;
1277 1344
1278 my $self = $class->SUPER::new ( 1345 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1346 fg => [1, 1, 1],
1347 #bg => none
1348 #active_bg => none
1280 #font => default_font 1349 #font => default_font
1281 #text => initial text 1350 #text => initial text
1282 #markup => initial narkup 1351 #markup => initial narkup
1352 #max_w => maximum pixel width
1353 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1354 layout => (new CFClient::Layout),
1284 fontsize => 1, 1355 fontsize => 1,
1285 align => -1, 1356 align => -1,
1286 valign => -1, 1357 valign => -1,
1287 padding => 2, 1358 padding => 2,
… …
1302 } 1373 }
1303 1374
1304 $self 1375 $self
1305} 1376}
1306 1377
1307sub escape { 1378sub escape($) {
1308 local $_ = $_[1]; 1379 local $_ = $_[0];
1309 1380
1310 s/&/&amp;/g; 1381 s/&/&amp;/g;
1311 s/>/&gt;/g; 1382 s/>/&gt;/g;
1312 s/</&lt;/g; 1383 s/</&lt;/g;
1313 1384
1314 $_[1] 1385 $_
1315} 1386}
1316 1387
1317sub update { 1388sub update {
1318 my ($self) = @_; 1389 my ($self) = @_;
1319 1390
… …
1352sub size_request { 1423sub size_request {
1353 my ($self) = @_; 1424 my ($self) = @_;
1354 1425
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1427 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1431
1359 my ($w, $h) = $self->{layout}->size; 1432 my ($w, $h) = $self->{layout}->size;
1360 1433
1361 if (exists $self->{template}) { 1434 if (exists $self->{template}) {
… …
1391} 1464}
1392 1465
1393sub _draw { 1466sub _draw {
1394 my ($self) = @_; 1467 my ($self) = @_;
1395 1468
1469 $self->SUPER::_draw; # draw background, if applicable
1470
1396 my $tex = $self->{texture} ||= do { 1471 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1472 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1473 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1474 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1478
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1479 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1480
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1483 : ($self->{w} - $tex->{w}) * 0.5);
1407 1484
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1487 : ($self->{h} - $tex->{h}) * 0.5);
1411 1488
1412 $tex 1489 $tex
1413 }; 1490 };
1414 1491
1415 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
… …
1443 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1444 can_hover => 1, 1521 can_hover => 1,
1445 can_focus => 1, 1522 can_focus => 1,
1446 valign => 0, 1523 valign => 0,
1447 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1448 @_ 1526 @_
1449 ) 1527 )
1450} 1528}
1451 1529
1452sub _set_text { 1530sub _set_text {
… …
1462 $self->{text} = $text; 1540 $self->{text} = $text;
1463 1541
1464 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1466 1544
1467 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1468} 1546}
1469 1547
1470sub set_text { 1548sub set_text {
1471 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1472 1550
1473 $self->{cursor} = length $text; 1551 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1552 $self->_set_text ($text);
1553 $self->update;
1475 $self->check_size; 1554 $self->check_size;
1476 $self->update;
1477} 1555}
1478 1556
1479sub get_text { 1557sub get_text {
1480 $_[0]{text} 1558 $_[0]{text}
1481} 1559}
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1596 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1597 $self->_emit ('escape');
1520 } elsif ($uni) { 1598 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1600 }
1523 1601
1524 $self->_set_text ($text); 1602 $self->_set_text ($text);
1525 $self->update; 1603 $self->update;
1604 $self->check_size;
1526} 1605}
1527 1606
1528sub focus_in { 1607sub focus_in {
1529 my ($self) = @_; 1608 my ($self) = @_;
1530 1609
… …
1610 if ($sym == 13) { 1689 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1616 $self->update; 1695 $self->update;
1617 1696
1618 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1659 my $class = shift; 1738 my $class = shift;
1660 1739
1661 $class->SUPER::new ( 1740 $class->SUPER::new (
1662 padding => 4, 1741 padding => 4,
1663 fg => [1, 1, 1], 1742 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1743 active_fg => [0, 0, 1],
1666 can_hover => 1, 1744 can_hover => 1,
1667 align => 0, 1745 align => 0,
1668 valign => 0, 1746 valign => 0,
1669 can_events => 1, 1747 can_events => 1,
1670 @_ 1748 @_
1671 ) 1749 )
1672} 1750}
1673 1751
1752sub activate { }
1753
1674sub button_up { 1754sub button_up {
1675 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1676 1756
1757 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate");
1680 }
1681} 1760}
1682 1761
1683sub _draw { 1762sub _draw {
1684 my ($self) = @_; 1763 my ($self) = @_;
1685 1764
… …
1717 1796
1718 $class->SUPER::new ( 1797 $class->SUPER::new (
1719 padding => 2, 1798 padding => 2,
1720 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1800 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1803 state => 0,
1723 can_hover => 1, 1804 can_hover => 1,
1724 @_ 1805 @_
1725 ) 1806 )
1726} 1807}
… …
1735 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1736 1817
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1741 } 1822 }
1742} 1823}
1743 1824
1744sub _draw { 1825sub _draw {
1745 my ($self) = @_; 1826 my ($self) = @_;
… …
2018 # TODO: req_w/h are wrong with vertical 2099 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2100 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2026 vertical => 0, 2109 vertical => 0,
2027 can_hover => 1, 2110 can_hover => 1,
2028 inner_pad => .05, 2111 inner_pad => 0.02,
2029 @_ 2112 @_
2030 ); 2113 );
2031 2114
2032 $self->set_value ($self->{range}[0]); 2115 $self->set_value ($self->{range}[0]);
2033 $self->update; 2116 $self->update;
2034 2117
2035 $self 2118 $self
2036} 2119}
2037 2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2038sub set_value { 2129sub set_value {
2039 my ($self, $value) = @_; 2130 my ($self, $value) = @_;
2040 2131
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2133
2043 $hi = $lo + 1 if $hi <= $lo; 2134 $hi = $lo + 1 if $hi <= $lo;
2044 2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2045 $value = $lo if $value < $lo; 2138 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2139 $value = $hi - $page if $value > $hi - $page;
2047 2140
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2142 if $unit;
2050 2143
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2145
2055 if ($value != $old_value) { 2146 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2147 $self->_emit (changed => $value);
2057 $self->update; 2148 $self->update;
2058 } 2149 }
2059} 2150}
2060 2151
2061sub size_request { 2152sub size_request {
… …
2069 2160
2070sub button_down { 2161sub button_down {
2071 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2072 2163
2073 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::button_down ($ev, $x, $y);
2165
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167
2074 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2075} 2169}
2076 2170
2077sub mouse_motion { 2171sub mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
… …
2080 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2176
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2178
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2180
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088 } 2182 }
2089} 2183}
2090 2184
2091sub update { 2185sub update {
2092 my ($self) = @_; 2186 my ($self) = @_;
2093 2187
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]); 2189 $self->set_value ($self->{range}[0]);
2096 2190
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2098 2193
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2195
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2198
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2199 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2200 $value = $value * $self->{scale} + $self->{offset};
2105 2201
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2203 $self->{knob_w} = $knob_w;
2113 }); 2204 });
2114 2205
2115 $self->SUPER::update; 2206 $self->SUPER::update;
2116} 2207}
2117 2208
… …
2123 glScale $self->{w}, $self->{h}; 2214 glScale $self->{w}, $self->{h};
2124 2215
2125 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2127 2218
2219 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2221 }
2131 2222
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2225
… …
2141 # draw handle 2232 # draw handle
2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2233 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143 2234
2144 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2145} 2236}
2237
2238#############################################################################
2239
2240package CFClient::UI::ValSlider;
2241
2242our @ISA = CFClient::UI::HBox::;
2243
2244sub new {
2245 my ($class, %arg) = @_;
2246
2247 my $range = delete $arg{range};
2248
2249 my $self = $class->SUPER::new (
2250 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2251 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2252 to_value => sub { shift },
2253 from_value => sub { shift },
2254 %arg,
2255 );
2256
2257 $self->{slider}->connect (changed => sub {
2258 my ($self, $value) = @_;
2259 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2260 $self->{parent}->emit (changed => $value);
2261 });
2262
2263# $self->{entry}->connect (changed => sub {
2264# my ($self, $value) = @_;
2265# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2266# $self->{parent}->emit (changed => $value);
2267# });
2268
2269 $self->add ($self->{slider}, $self->{entry});
2270
2271 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2272
2273 $self
2274}
2275
2276sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) }
2146 2278
2147############################################################################# 2279#############################################################################
2148 2280
2149package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2150 2282
… …
2180 2312
2181 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2314 $self->reflow;
2183} 2315}
2184 2316
2185sub text_height {
2186 my ($self, $text) = @_;
2187
2188 my $layout = $self->{layout};
2189
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w});
2192 $layout->set_markup ($text);
2193
2194 ($layout->size)[1]
2195}
2196
2197sub reflow {
2198 my ($self) = @_;
2199
2200 $self->{need_reflow}++;
2201 $self->update;
2202}
2203
2204sub size_allocate { 2317sub size_allocate {
2205 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2206 2319
2207 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2208 2321
… …
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2212 2325
2213 $self->reflow; 2326 $self->reflow;
2214} 2327}
2215 2328
2329sub text_size {
2330 my ($self, $text, $indent) = @_;
2331
2332 my $layout = $self->{layout};
2333
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent);
2336 $layout->set_markup ($text);
2337
2338 $layout->size
2339}
2340
2341sub reflow {
2342 my ($self) = @_;
2343
2344 $self->{need_reflow}++;
2345 $self->update;
2346}
2347
2348sub set_offset {
2349 my ($self, $offset) = @_;
2350
2351 # todo: base offset on lines or so, not on pixels
2352 $self->{children}[1]->set_value ($offset);
2353}
2354
2355sub clear {
2356 my ($self) = @_;
2357
2358 $self->{par} = [];
2359 $self->{height} = 0;
2360 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2361}
2362
2216sub add_paragraph { 2363sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2218 2365
2219 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2220 2367 my ($w, $h) = $self->text_size ($line);
2221 my $height = $self->text_height ($text);
2222
2223 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2224 2371
2225 push @{$self->{par}}, [$height, $color, $text];
2226
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2372 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228 $self->{children}[1]->update;
2229} 2373}
2230 2374
2231sub update { 2375sub update {
2232 my ($self) = @_; 2376 my ($self) = @_;
2233 2377
… …
2236 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2237 2381
2238 delete $self->{texture}; 2382 delete $self->{texture};
2239 2383
2240 $ROOT->on_post_alloc ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2241 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2388 my $height = 0;
2243 2389
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2245 for @{$self->{par}}; 2394 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]);
2397 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h;
2401 }
2402
2403 $height += $_->[1];
2404 }
2246 2405
2247 $self->{height} = $height; 2406 $self->{height} = $height;
2248 2407
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250 2409
2251 delete $self->{texture}; 2410 delete $self->{texture};
2252 } 2411 }
2253 2412
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2257 2416
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2417 my $top = int $self->{children}[1]{range}[0];
2262 2418
2263 my $y0 = $top; 2419 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2420 my $y1 = $top + $H;
2265 2421
2266 my $y = 0; 2422 my $y = 0;
2267 2423
2268 my $layout = $self->{layout}; 2424 my $layout = $self->{layout};
2269 2425
2270 $layout->set_font ($self->{font}) if $self->{font}; 2426 $layout->set_font ($self->{font}) if $self->{font};
2271 2427
2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2431
2272 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2273 my $h = $par->[0]; 2433 my $h = $par->[1];
2274 2434
2275 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2436 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]);
2277 $layout->set_markup ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2278 2439
2279 my ($W, $H) = $layout->size; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2441
2442 glRasterPos $par->[3], $y - $y0;
2443 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281 } 2444 }
2282 2445
2283 $y += $h; 2446 $y += $h;
2284 } 2447 }
2285 2448
2286 glDisable GL_TEXTURE_2D; 2449 glDisable GL_BLEND;
2287 }; 2450 };
2288 }); 2451 });
2289} 2452}
2290 2453
2291sub _draw { 2454sub _draw {
2292 my ($self) = @_; 2455 my ($self) = @_;
2293 2456
2294 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2299 2462
2300 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2301 2464
2302} 2465}
… …
2371 2534
2372 # TODO: use animation 2535 # TODO: use animation
2373 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open"); 2539 $self->_emit ("open");
2377 } else { 2540 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close"); 2542 $self->_emit ("close");
2380 } 2543 }
2381 2544
2382 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2383} 2546}
2384 2547
2385############################################################################# 2548#############################################################################
2386 2549
2387package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2401 2564
2402sub set_tooltip_from { 2565sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2566 my ($self, $widget) = @_;
2404 2567
2405 $self->add (new CFClient::UI::Label 2568 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2569 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2571 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2572 fg => [0, 0, 0, 1],
2573 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2574 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2575 );
2412} 2576}
2413 2577
2414sub size_request { 2578sub size_request {
2415 my ($self) = @_; 2579 my ($self) = @_;
… …
2461use CFClient::OpenGL; 2625use CFClient::OpenGL;
2462 2626
2463sub new { 2627sub new {
2464 my $class = shift; 2628 my $class = shift;
2465 2629
2466 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2467 aspect => 1, 2631 aspect => 1,
2468 @_, 2632 @_,
2469 ) 2633 );
2634
2635 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self);
2637
2638 $self->{timer} = Event->timer (
2639 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2640 hard => 1,
2641 interval => $self->{animspeed},
2642 cb => sub {
2643 ++$widget->{frame};
2644 $widget->update;
2645 },
2646 );
2647 }
2648
2649 $self
2470} 2650}
2471 2651
2472sub size_request { 2652sub size_request {
2473 (32, 8) 2653 (32, 8)
2474} 2654}
2475 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2476sub _draw { 2664sub _draw {
2477 my ($self) = @_; 2665 my ($self) = @_;
2478 2666
2479 return unless $::CONN;#d# manage and cache textures differently 2667 return unless $::CONN;
2668
2669 my $face;
2670
2671 if ($self->{frame}) {
2672 my $anim = $::CONN->{anim}[$self->{anim}];
2673
2674 $face = $anim->[ $self->{frame} % @$anim ]
2675 if $anim && @$anim;
2676 }
2677
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2679
2482 # TODO animation
2483 if ($tex) { 2680 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2489 } 2686 }
2490} 2687}
2491 2688
2689sub DESTROY {
2690 my ($self) = @_;
2691
2692 $self->{timer}->cancel
2693 if $self->{timer};
2694
2695 $self->SUPER::DESTROY;
2696}
2697
2492############################################################################# 2698#############################################################################
2493 2699
2494package CFClient::UI::InventoryItem; 2700package CFClient::UI::InventoryItem;
2495 2701
2496our @ISA = CFClient::UI::HBox::; 2702our @ISA = CFClient::UI::HBox::;
2497 2703
2498sub new { 2704sub _item_to_desc {
2499 my $class = shift; 2705 my ($item) = @_;
2500 2706
2501 my %args = @_; 2707 my $desc =
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2 2708 $item->{nrof} < 2
2506 ? $item->{name} 2709 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}"; 2710 : "$item->{nrof} × $item->{name_pl}";
2508 2711
2509 $item->{flags} & Crossfire::Protocol::F_OPEN 2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)"; 2713 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED 2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)"; 2715 and $desc .= " (applied)";
… …
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED 2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)"; 2723 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED 2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *"; 2725 and $desc .= " *";
2523 2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2524 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2525 can_hover => 1, 2740 can_hover => 1,
2526 can_events => 1, 2741 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub { 2744 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2531 2746
2532 # todo: maybe put examine on 1? but should just be a tooltip :( 2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2533 if ($ev->{button} == 1) { 2756 } elsif ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2757 $::CONN->send ("examine $item->{tag}");
2535 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2538 my @menu_items = ( 2761 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [ 2773 )
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ], 2774 ),
2547 ); 2775 );
2548 2776
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 } 2778 }
2551 2779
2552 1 2780 1
2553 }, 2781 },
2554 %args 2782 %args
2555 ); 2783 );
2784
2556 2785
2557 $self->add (new CFClient::UI::Face 2786 $self->add (new CFClient::UI::Face
2558 can_events => 0, 2787 can_events => 0,
2559 face => $item->{face}, 2788 face => $item->{face},
2560 anim => $item->{anim}, 2789 anim => $item->{anim},
2561 animspeed => $item->{animspeed}, 2790 animspeed => $item->{animspeed},
2562 ); 2791 );
2563 2792
2564 $self->add (new CFClient::UI::Label 2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2565 can_events => 0, 2794
2566 text => $desc, 2795 $self->{item} = $item;
2567 ); 2796
2797 $self->update_item;
2568 2798
2569 $self 2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2570} 2808}
2571 2809
2572############################################################################# 2810#############################################################################
2573 2811
2574package CFClient::UI::Inventory; 2812package CFClient::UI::Inventory;
… …
2577 2815
2578sub new { 2816sub new {
2579 my $class = shift; 2817 my $class = shift;
2580 2818
2581 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2583 @_, 2821 @_,
2584 ); 2822 );
2585 2823
2586 $self 2824 $self
2587} 2825}
… …
2598 } @$items; 2836 } @$items;
2599 2837
2600 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2601 2839
2602 for my $item (@items) { 2840 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2 2841 $item->{item} = $item;
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2608 } 2844 }
2609 2845
2846 my $i = 0;
2847 for (@items) {
2610 $self->{scrolled}->add (@items); 2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2611 2852
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613} 2854}
2614 2855
2615sub size_request { 2856sub size_request {
… …
2657 2898
2658# popup given the event (must be a mouse button down event currently) 2899# popup given the event (must be a mouse button down event currently)
2659sub popup { 2900sub popup {
2660 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2661 2902
2662 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2663 2904
2664 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self; 2906 $GRAB = $self;
2666 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2667 2908
… …
2682 2923
2683 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB; 2925 undef $GRAB;
2685 $self->hide; 2926 $self->hide;
2686 2927
2687 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2689 } 2930 }
2690} 2931}
2691 2932
2692############################################################################# 2933#############################################################################
2693 2934
2694package CFClient::UI::Statusbox; 2935package CFClient::UI::Statusbox;
2695 2936
2696our @ISA = CFClient::UI::VBox::; 2937our @ISA = CFClient::UI::VBox::;
2938
2939sub new {
2940 my $class = shift;
2941
2942 $class->SUPER::new (
2943 fontsize => 0.8,
2944 @_,
2945 )
2946}
2697 2947
2698sub reorder { 2948sub reorder {
2699 my ($self) = @_; 2949 my ($self) = @_;
2700 my $NOW = time; 2950 my $NOW = time;
2701 2951
… …
2721 : $item->{text}; 2971 : $item->{text};
2722 2972
2723 for ($short) { 2973 for ($short) {
2724 s/^\s+//; 2974 s/^\s+//;
2725 s/\s+/ /g; 2975 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 2976 }
2729 2977
2730 new CFClient::UI::Label 2978 new CFClient::UI::Label
2731 markup => $short, 2979 markup => $short,
2732 tooltip => $item->{tooltip}, 2980 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 2981 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 2982 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 2983 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 2985 fg => $item->{fg},
2737 can_events => 1, 2986 can_events => 1,
2738 can_hover => 1 2987 can_hover => 1
2739 }; 2988 };
2740 } 2989 }
… …
2767 $self->{item}{$group} = { 3016 $self->{item}{$group} = {
2768 id => ++$self->{id}, 3017 id => ++$self->{id},
2769 text => $text, 3018 text => $text,
2770 timeout => $timeout, 3019 timeout => $timeout,
2771 tooltip => $text, 3020 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 3021 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 3022 pri => 0,
2775 count => 1, 3023 count => 1,
2776 %arg, 3024 %arg,
2777 }; 3025 };
2778 } 3026 }
2779 3027
2780 $self->reorder; 3028 $self->reorder;
2781} 3029}
2782 3030
3031sub reconfigure {
3032 my ($self) = @_;
3033
3034 delete $_->{label}
3035 for values %{ $self->{item} || {} };
3036
3037 $self->reorder;
3038 $self->SUPER::reconfigure;
3039}
3040
2783############################################################################# 3041#############################################################################
2784 3042
2785package CFClient::UI::Root; 3043package CFClient::UI::Root;
2786 3044
2787our @ISA = CFClient::UI::Container::; 3045our @ISA = CFClient::UI::Container::;
… …
2817} 3075}
2818 3076
2819sub size_allocate { 3077sub size_allocate {
2820 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2821 3079
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828 for my $child ($self->children) { 3080 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830 3082
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x}; 3084 if exists $child->{req_x};
… …
2861} 3113}
2862 3114
2863sub add { 3115sub add {
2864 my ($self, @children) = @_; 3116 my ($self, @children) = @_;
2865 3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
2866 for my $child (@children) { 3124 for my $child (@children) {
2867 $child->{toplevel} = 1; 3125 $child->{is_toplevel} = 1;
2868 3126
2869 # integerise window positions 3127 # integerise window positions
2870 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
2872 } 3130 }
2873 3131
2874 $self->SUPER::add (@children); 3132 $self->SUPER::add (@children);
3133}
3134
3135sub remove {
3136 my ($self, @children) = @_;
3137
3138 $self->SUPER::remove (@children);
3139
3140 while (@children) {
3141 my $w = pop @children;
3142 push @children, $w->children;
3143 $w->set_invisible;
3144 }
2875} 3145}
2876 3146
2877sub on_refresh { 3147sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2879 3149
… …
2932 $w = 0 if $w < 0; 3202 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0; 3203 $h = 0 if $h < 0;
2934 3204
2935 $widget->{w} = $w; 3205 $widget->{w} = $w;
2936 $widget->{h} = $h; 3206 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h); 3207 $widget->emit (size_allocate => $w, $h);
2939 } 3208 }
2940 } 3209 }
2941 3210
2942 while ($self->{post_alloc_hook}) { 3211 while ($self->{post_alloc_hook}) {
… …
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2950 3219
2951 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3221 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3224 glLoadIdentity;
2956 3225
2957 $self->_draw; 3226 $self->_draw;
2958} 3227}
… …
2960############################################################################# 3229#############################################################################
2961 3230
2962package CFClient::UI; 3231package CFClient::UI;
2963 3232
2964$ROOT = new CFClient::UI::Root; 3233$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3234$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3235
29671 32361
2968 3237

Diff Legend

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