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

Diff Legend

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