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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 52 $TOOLTIP->show;
31 53
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 55
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
37 58
38 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
39 } 62 }
40 63
41 return; 64 return;
42 } 65 }
43 } 66 }
… …
47 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
71 check_tooltip; 94 check_tooltip;
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 check_tooltip;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
131 for (@$vals) { 148 for (@$vals) {
132 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
153}
154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
136} 187}
137 188
138############################################################################# 189#############################################################################
139 190
140package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
153 can_events => 1, 204 can_events => 1,
154 @_ 205 @_
155 }, $class; 206 }, $class;
156 207
157 for (keys %$self) { 208 for (keys %$self) {
158 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
160 } 211 }
161 } 212 }
162 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
163 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
164} 234}
165 235
166sub destroy { 236sub destroy {
167 my ($self) = @_; 237 my ($self) = @_;
168 238
… …
176 return if $self->{parent}; 246 return if $self->{parent};
177 247
178 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
179} 249}
180 250
181sub hide { 251sub center {
182 my ($self) = @_; 252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
183 283
184 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
186 299
187 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
188 if $self->{parent}; 301 if $self->{parent};
189} 302}
190 303
… …
199} 312}
200 313
201sub set_size { 314sub set_size {
202 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
203 316
204 $self->{user_w} = $w; 317 $self->{def_w} = $w;
205 $self->{user_h} = $h; 318 $self->{def_h} = $h;
206 319
207 $self->check_size; 320 $self->check_size;
208} 321}
209 322
210sub size_request { 323sub size_request {
… …
232 $self->{y} = $y; 345 $self->{y} = $y;
233 $self->update; 346 $self->update;
234 } 347 }
235 348
236 if ($self->{w} != $w || $self->{h} != $h) { 349 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 351 }
244} 352}
245 353
246sub size_allocate { 354sub size_allocate {
247 # nothing to be done 355 # nothing to be done
248} 356}
249 357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
250sub children { 365sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 366}
264 367
265sub set_max_size { 368sub set_max_size {
266 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
267 370
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 373}
271 374
272# return top left coordinates 375sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 376 my ($self, $tooltip) = @_;
275 377
276 $self->{parent} 378 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 379 $tooltip =~ s/\s+$//;
278 380
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 381 return if $self->{tooltip} eq $tooltip;
382
383 $self->{tooltip} = $tooltip;
384
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip;
388 }
280} 389}
281 390
282# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
283sub coord2local { 392sub coord2local {
284 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
285 394
286 my ($X, $Y) = $self->_topleft; 395 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 396}
289 397
290# translate local coordinates to global coordinate system 398# translate local coordinates to global coordinate system
291sub coord2global { 399sub coord2global {
292 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
293 401
294 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 403}
297 404
298sub focus_in { 405sub focus_in {
299 my ($self) = @_; 406 my ($self) = @_;
300 407
301 return if $FOCUS == $self; 408 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
303 410
304 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
305 412
306 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
307 414
308 $focus->update if $focus; 415 $focus->update if $focus;
309 $FOCUS->update; 416 $FOCUS->update;
310} 417}
311 418
… …
314 421
315 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
316 423
317 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
318 425
319 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
320 427
321 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
322} 432}
323 433
324sub mouse_motion { } 434sub mouse_motion { }
325sub button_up { } 435sub button_up { }
326sub key_down { } 436sub key_down { }
327sub key_up { } 437sub key_up { }
328 438
329sub button_down { 439sub button_down {
330 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
331 441
332 $self->focus_in; 442 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 477 glPushMatrix;
368 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 481 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
375 glEnd; 485 glEnd;
376 glPopMatrix; 486 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 488 }
379} 489}
380 490
381sub _draw { 491sub _draw {
382 my ($self) = @_; 492 my ($self) = @_;
… …
398 508
399sub set_parent { 509sub set_parent {
400 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
401 511
402 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
403} 517}
404 518
405sub check_size { 519sub check_size {
406 my ($self) = @_; 520 my ($self, $forced) = @_;
407 521
408 $self->{parent} 522 $self->{force_alloc} = 1 if $forced;
409 or return 1; 523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 524}
430 525
431sub update { 526sub update {
432 my ($self) = @_; 527 my ($self) = @_;
433 528
… …
439 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
440 535
441 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 537}
443 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
444sub emit { 545sub emit {
445 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
446 547
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
448} 554}
449 555
450sub DESTROY { 556sub DESTROY {
451 my ($self) = @_; 557 my ($self) = @_;
452 558
559 delete $WIDGET{$self+0};
453 #$self->deactivate; 560 #$self->deactivate;
454} 561}
455 562
456############################################################################# 563#############################################################################
457 564
… …
466 my $class = shift; 573 my $class = shift;
467 574
468 # range [value, low, high, page] 575 # range [value, low, high, page]
469 576
470 $class->SUPER::new ( 577 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 578 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 579 #active_bg => [1, 1, 1, 0.5],
473 @_ 580 @_
474 ) 581 )
475} 582}
476 583
477sub _draw { 584sub _draw {
478 my ($self) = @_; 585 my ($self) = @_;
479 586
587 my $color = $FOCUS == $self && $self->{active_bg}
588 ? $self->{active_bg}
589 : $self->{bg};
590
591 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 592 my ($w, $h) = @$self{qw(w h)};
481 593
482 glEnable GL_BLEND; 594 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 596 glColor @$color;
485 597
486 glBegin GL_QUADS; 598 glBegin GL_QUADS;
487 glVertex 0 , 0; 599 glVertex 0 , 0;
488 glVertex 0 , $h; 600 glVertex 0 , $h;
489 glVertex $w, $h; 601 glVertex $w, $h;
490 glVertex $w, 0; 602 glVertex $w, 0;
491 glEnd; 603 glEnd;
492 604
493 glDisable GL_BLEND; 605 glDisable GL_BLEND;
606 }
494} 607}
495 608
496############################################################################# 609#############################################################################
497 610
498package CFClient::UI::Empty; 611package CFClient::UI::Empty;
… …
542 $self->{children} = [ 655 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 656 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 657 @{$self->{children}}, @widgets
545 ]; 658 ];
546 659
547 $_->check_size 660 $self->check_size (1);
548 for @widgets;
549
550 $self->update; 661 $self->update;
551} 662}
552 663
553sub children { 664sub children {
554 @{ $_[0]{children} } 665 @{ $_[0]{children} }
… …
560 delete $child->{parent}; 671 delete $child->{parent};
561 $child->hide; 672 $child->hide;
562 673
563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564 675
565 $self->check_size; 676 $self->check_size (1);
566 $self->update; 677 $self->update;
567} 678}
568 679
569sub clear { 680sub clear {
570 my ($self) = @_; 681 my ($self) = @_;
… …
661} 772}
662 773
663sub update { 774sub update {
664 my ($self) = @_; 775 my ($self) = @_;
665 776
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 778 $self->SUPER::update;
668} 779}
669 780
670sub size_allocate { 781sub size_allocate {
671 my ($self, $w, $h) = @_; 782 my ($self, $w, $h) = @_;
… …
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0; 796 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT; 797 glClear GL_COLOR_BUFFER_BIT;
687 798
688 $self->_render; 799 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 }; 800 };
697} 801}
698 802
699sub _draw { 803sub _draw {
700 my ($self) = @_; 804 my ($self) = @_;
… …
702 my ($w, $h) = ($self->w, $self->h); 806 my ($w, $h) = ($self->w, $self->h);
703 807
704 my $tex = $self->{texture} 808 my $tex = $self->{texture}
705 or return; 809 or return;
706 810
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 811 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 813 glColor 1, 1, 1, 1;
712 814
713 $tex->draw_quad (0, 0, $w, $h); 815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 816
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 817 glDisable GL_TEXTURE_2D;
717} 818}
718 819
719############################################################################# 820#############################################################################
720 821
721package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
722 823
723our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
724 825
826sub new {
827 my $class = shift;
828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
725sub size_request { 836sub size_request {
726 my ($self) = @_; 837 my ($self) = @_;
727 838
728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
730 840
731 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
732} 845}
733 846
734sub size_allocate { 847sub size_allocate {
735 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
736 849
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
853 $self->child->configure (0, 0, $w, $h);
737 $self->update; 854 $self->update;
738} 855}
739 856
740sub set_offset { 857sub set_offset {
741 my ($self, $x, $y) = @_; 858 my ($self, $x, $y) = @_;
… …
744 $self->{view_y} = int $y; 861 $self->{view_y} = int $y;
745 862
746 $self->update; 863 $self->update;
747} 864}
748 865
749# hmm, this does not work for topleft of $self... but we should not aks for that 866# hmm, this does not work for topleft of $self... but we should not ask for that
750sub _topleft { 867sub coord2local {
751 my ($self, $x, $y) = @_; 868 my ($self, $x, $y) = @_;
752 869
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 870 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
871}
872
873sub coord2global {
874 my ($self, $x, $y) = @_;
875
876 $x = List::Util::min $self->{w}, $x - $self->{view_x};
877 $y = List::Util::min $self->{h}, $y - $self->{view_y};
878
879 $self->SUPER::coord2global ($x, $y)
754} 880}
755 881
756sub find_widget { 882sub find_widget {
757 my ($self, $x, $y) = @_; 883 my ($self, $x, $y) = @_;
758 884
… …
783 my $class = shift; 909 my $class = shift;
784 910
785 my $self; 911 my $self;
786 912
787 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
788 vertical => 1, 914 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub { 916 on_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 917 $self->{vp}->set_offset (0, $_[1]);
792 }, 918 },
793 ; 919 ;
794 920
795 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort), 922 vp => (new CFClient::UI::ViewPort expand => 1),
797 slider => $slider, 923 slider => $slider,
798 @_, 924 @_,
799 ); 925 );
800 926
801 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
… …
803 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
804 930
805 $self 931 $self
806} 932}
807 933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942}
943
944sub size_allocate {
945 my ($self, $w, $h) = @_;
946
947 $self->SUPER::size_allocate ($w, $h);
948
949 my $child = $self->{vp}->child;
950 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
951}
952
808#TODO# update range on size_allocate depeneing on child 953#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 954# update viewport offset on scroll
810 955
811############################################################################# 956#############################################################################
812 957
813package CFClient::UI::Frame; 958package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 962use CFClient::OpenGL;
818 963
819sub new { 964sub new {
820 my $class = shift; 965 my $class = shift;
821 966
822 my $self = $class->SUPER::new ( 967 $class->SUPER::new (
823 bg => [1, 1, 1, 1], 968 bg => undef,
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_ 969 @_,
827 ); 970 )
828
829 $self
830} 971}
831 972
832sub _draw { 973sub _draw {
833 my ($self) = @_; 974 my ($self) = @_;
834 975
835 my ($w, $h) = ($self->{w}, $self->{h}); 976 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)};
836 978
837 glEnable GL_BLEND; 979 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 981 glColor @{ $self->{bg} };
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841 982
842# glBegin GL_QUADS; 983 glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0; 984 glVertex 0 , 0;
845# glVertex 0 , $h; 985 glVertex 0 , $h;
846# glVertex $w, $h; 986 glVertex $w, $h;
847# glVertex $w, 0; 987 glVertex $w, 0;
848# glEnd; 988 glEnd;
849 989
850
851 $self->child->draw;
852 glDisable GL_BLEND; 990 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D; 991 }
992
993 $self->SUPER::_draw;
854} 994}
855 995
856############################################################################# 996#############################################################################
857 997
858package CFClient::UI::FancyFrame; 998package CFClient::UI::FancyFrame;
… …
866 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
867 1007
868sub new { 1008sub new {
869 my $class = shift; 1009 my $class = shift;
870 1010
871 # TODO: user_x, user_y, overwrite moveto?
872
873 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
876 border => 0.6, 1014 border => 0.6,
1015 is_toplevel => 1,
877 can_events => 1, 1016 can_events => 1,
878 @_ 1017 @_
879 ); 1018 );
880 1019
881 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
882 align => 0, 1021 align => 0,
… …
906 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
907 1046
908 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
909 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
910 1049
911 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912 if $self->{title}; 1051 if $self->{title};
913 1052
914 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
915} 1054}
916 1055
… …
935 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
936 1075
937 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
939 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
943 $self->check_size; 1084 $self->check_size;
944 }; 1085 };
945 1086
946 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
947 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
950 $self->{motion} = sub { 1091 $self->{motion} = sub {
951 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
952 1093
953 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
954 1095
955 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
956 $self->update; 1100 $self->update;
957 }; 1101 };
958 } 1102 }
959} 1103}
960 1104
… …
974 my ($self) = @_; 1118 my ($self) = @_;
975 1119
976 my ($w, $h ) = ($self->{w}, $self->{h}); 1120 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 1122
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 1123 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1125
984 my $border = $self->border; 1126 my $border = $self->border;
985 1127
986 glColor @{ $self->{border_bg} }; 1128 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1133
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1135 my $bg = $tex[0];
994 1136
995 # TODO: repeat texture not scale 1137 # TODO: repeat texture not scale
… …
999 glColor @{ $self->{bg} }; 1141 glColor @{ $self->{bg} };
1000 1142
1001 $bg->{s} = $rep_x; 1143 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y; 1144 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1; 1145 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 }
1005 1148
1006 glDisable GL_TEXTURE_2D; 1149 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 1150
1010 $self->{title}->draw if $self->{title}; 1151 $self->{title}->draw if $self->{title};
1011 1152
1012 $self->child->draw; 1153 $self->child->draw;
1013} 1154}
… …
1025sub new { 1166sub new {
1026 my $class = shift; 1167 my $class = shift;
1027 1168
1028 $class->SUPER::new ( 1169 $class->SUPER::new (
1029 col_expand => [], 1170 col_expand => [],
1030 @_ 1171 @_,
1031 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1177}
1033 1178
1034sub add { 1179sub add {
1035 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
1036 1181
1037 $child->set_parent ($self); 1182 $child->set_parent ($self);
1038 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
1039 1184
1040 $child->check_size; 1185 $self->check_size (1);
1041} 1186}
1042 1187
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
1047# TODO: move to container class maybe? send childs a signal on removal? 1188# TODO: move to container class maybe? send children a signal on removal?
1048sub clear { 1189sub clear {
1049 my ($self) = @_; 1190 my ($self) = @_;
1050 1191
1051 my @children = $self->children; 1192 my @children = $self->children;
1052 delete $self->{children}; 1193 delete $self->{children};
… …
1054 for (@children) { 1195 for (@children) {
1055 delete $_->{parent}; 1196 delete $_->{parent};
1056 $_->hide; 1197 $_->hide;
1057 } 1198 }
1058 1199
1200 $self->check_size (1);
1059 $self->update; 1201 $self->update;
1060} 1202}
1061 1203
1062sub get_wh { 1204sub get_wh {
1063 my ($self) = @_; 1205 my ($self) = @_;
… …
1095sub size_allocate { 1237sub size_allocate {
1096 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1097 1239
1098 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1099 1241
1100 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1101 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1102 1244
1103 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1104 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1105 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1106 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1160 } 1302 }
1161} 1303}
1162 1304
1163############################################################################# 1305#############################################################################
1164 1306
1165package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1166
1167# TODO: wrap into common Box base class
1168 1308
1169our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1170 1310
1171sub size_request { 1311sub size_request {
1172 my ($self) = @_; 1312 my ($self) = @_;
1173 1313
1174 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1175 1315 ? (
1176 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1177 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1178 (List::Util::max map $_->[1], @alloc), 1318 )
1179 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1180} 1323}
1181 1324
1182sub size_allocate { 1325sub size_allocate {
1183 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1184 1327
1185 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1186
1187 my $children = $self->{children}; 1329 my $children = $self->{children};
1188 1330
1189 my @h = map $_->{req_w}, @$children; 1331 my @req;
1190 1332
1191 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1192 1334 @req = ($space / (@$children || 1)) x @$children;
1193 if ($req_h > $h) {
1194 # ah well, not enough space
1195 $_ *= $h / $req_h for @h;
1196 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1197 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1198 $exp ||= 1;
1199 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1200 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1201 my $child = $children->[$_];
1202
1203 my $alloc_h = $h[$_];
1204 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1205 $h[$_] = $alloc_h;
1206 } 1349 }
1207 } 1350 }
1208 1351
1209 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1210 1353
1211 my $y = 0; 1354 my $pos = 0;
1212 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1213 my $child = $children->[$_];
1214 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1215 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1216 1358
1217 $y += $h; 1359 $pos += $alloc;
1218 } 1360 }
1219 1361
1220 1 1362 1
1221} 1363}
1222 1364
1223############################################################################# 1365#############################################################################
1224 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1225package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1226 1383
1227# TODO: wrap into common Box base class
1228
1229our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1230 1385
1231sub size_request { 1386sub new {
1232 my ($self) = @_; 1387 my $class = shift;
1233 1388
1234 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1235 1390 vertical => 1,
1236 ( 1391 @_,
1237 (List::Util::max map $_->[0], @alloc),
1238 (List::Util::sum map $_->[1], @alloc),
1239 ) 1392 )
1240} 1393}
1241 1394
1242sub size_allocate {
1243 my ($self, $w, $h) = @_;
1244
1245 my $children = $self->{children};
1246
1247 my @h = map $_->{req_h}, @$children;
1248
1249 my $req_h = List::Util::sum @h;
1250
1251 if ($req_h > $h) {
1252 # ah well, not enough space
1253 $_ *= $h / $req_h for @h;
1254 } else {
1255 my $exp = List::Util::sum map $_->{expand}, @$children;
1256 $exp ||= 1;
1257
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260
1261 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure (0, $y, $w, $h);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1395#############################################################################
1280 1396
1281package CFClient::UI::Label; 1397package CFClient::UI::Label;
1282 1398
1283our @ISA = CFClient::UI::Base::; 1399our @ISA = CFClient::UI::DrawBG::;
1284 1400
1285use CFClient::OpenGL; 1401use CFClient::OpenGL;
1286 1402
1287sub new { 1403sub new {
1288 my ($class, %arg) = @_; 1404 my ($class, %arg) = @_;
1289 1405
1290 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1407 fg => [1, 1, 1],
1408 #bg => none
1409 #active_bg => none
1292 #font => default_font 1410 #font => default_font
1411 #text => initial text
1412 #markup => initial narkup
1413 #max_w => maximum pixel width
1414 ellipsise => 3, # end
1415 layout => (new CFClient::Layout),
1293 fontsize => 1, 1416 fontsize => 1,
1294 text => "",
1295 align => -1, 1417 align => -1,
1296 valign => -1, 1418 valign => -1,
1297 padding => 2, 1419 padding => 2,
1298 layout => new CFClient::Layout,
1299 can_events => 0, 1420 can_events => 0,
1300 %arg 1421 %arg
1301 ); 1422 );
1302 1423
1303 if (exists $self->{template}) { 1424 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1425 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1426 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1427 $self->{template} = $layout;
1307 } 1428 }
1308 1429
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1430 if (exists $self->{markup}) {
1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1431 $self->set_markup (delete $self->{markup});
1432 } else {
1433 $self->set_text (delete $self->{text});
1434 }
1311 1435
1312 $self 1436 $self
1313} 1437}
1314 1438
1315sub escape { 1439sub escape($) {
1316 local $_ = $_[1]; 1440 local $_ = $_[0];
1317 1441
1318 s/&/&amp;/g; 1442 s/&/&amp;/g;
1319 s/>/&gt;/g; 1443 s/>/&gt;/g;
1320 s/</&lt;/g; 1444 s/</&lt;/g;
1321 1445
1322 $_[1] 1446 $_
1323} 1447}
1324 1448
1325sub update { 1449sub update {
1326 my ($self) = @_; 1450 my ($self) = @_;
1327 1451
… …
1333 my ($self, $text) = @_; 1457 my ($self, $text) = @_;
1334 1458
1335 return if $self->{text} eq "T$text"; 1459 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1460 $self->{text} = "T$text";
1337 1461
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1463 $self->{layout}->set_text ($text);
1339 1464
1340 delete $self->{texture};
1341 $self->update; 1465 $self->update;
1342 $self->check_size; 1466 $self->check_size;
1343} 1467}
1344 1468
1345sub set_markup { 1469sub set_markup {
1346 my ($self, $markup) = @_; 1470 my ($self, $markup) = @_;
1347 1471
1348 return if $self->{text} eq "M$markup"; 1472 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1473 $self->{text} = "M$markup";
1350 1474
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1478 $self->{layout}->set_markup ($markup);
1352 1479
1353 delete $self->{texture};
1354 $self->update; 1480 $self->update;
1355 $self->check_size; 1481 $self->check_size;
1356} 1482}
1357 1483
1358sub size_request { 1484sub size_request {
1359 my ($self) = @_; 1485 my ($self) = @_;
1360 1486
1361 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1487 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1); 1488 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1492
1365 my ($w, $h) = $self->{layout}->size; 1493 my ($w, $h) = $self->{layout}->size;
1366 1494
1367 if (exists $self->{template}) { 1495 if (exists $self->{template}) {
… …
1397} 1525}
1398 1526
1399sub _draw { 1527sub _draw {
1400 my ($self) = @_; 1528 my ($self) = @_;
1401 1529
1530 $self->SUPER::_draw; # draw background, if applicable
1531
1402 my $tex = $self->{texture} ||= do { 1532 my $tex = $self->{texture} ||= do {
1533 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1534 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1535 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539
1406 new_from_layout CFClient::Texture $self->{layout} 1540 my $tex = new_from_layout CFClient::Texture $self->{layout};
1541
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1544 : ($self->{w} - $tex->{w}) * 0.5);
1545
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1548 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1407 }; 1551 };
1408 1552
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1555
1556 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1557 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1429 1562
1430 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1564}
1433 1565
1434############################################################################# 1566#############################################################################
1435 1567
1436package CFClient::UI::EntryBase; 1568package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1450 can_hover => 1, 1582 can_hover => 1,
1451 can_focus => 1, 1583 can_focus => 1,
1452 valign => 0, 1584 valign => 0,
1453 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1454 @_ 1587 @_
1455 ) 1588 )
1456} 1589}
1457 1590
1458sub _set_text { 1591sub _set_text {
… …
1468 $self->{text} = $text; 1601 $self->{text} = $text;
1469 1602
1470 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1472 1605
1473 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1474}
1475
1476sub get_text {
1477 $_[0]{text}
1478}
1479
1480sub size_request {
1481 my ($self) = @_;
1482
1483 my ($w, $h) = $self->SUPER::size_request;
1484
1485 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492} 1607}
1493 1608
1494sub set_text { 1609sub set_text {
1495 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1496 1611
1497 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1498 $self->_set_text ($text); 1613 $self->_set_text ($text);
1499 $self->update; 1614 $self->update;
1615 $self->check_size;
1616}
1617
1618sub get_text {
1619 $_[0]{text}
1620}
1621
1622sub size_request {
1623 my ($self) = @_;
1624
1625 my ($w, $h) = $self->SUPER::size_request;
1626
1627 ($w + 1, $h) # add 1 for cursor
1500} 1628}
1501 1629
1502sub key_down { 1630sub key_down {
1503 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1504 1632
… …
1506 my $sym = $ev->{sym}; 1634 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1635 my $uni = $ev->{unicode};
1508 1636
1509 my $text = $self->get_text; 1637 my $text = $self->get_text;
1510 1638
1511 if ($sym == 8) { 1639 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1640 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1641 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1642 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1643 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1644 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1645 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1646 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1651 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1652 $self->_emit ('escape');
1525 } elsif ($uni) { 1653 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1655 }
1528 1656
1529 $self->_set_text ($text); 1657 $self->_set_text ($text);
1530 $self->update; 1658 $self->update;
1659 $self->check_size;
1531} 1660}
1532 1661
1533sub focus_in { 1662sub focus_in {
1534 my ($self) = @_; 1663 my ($self) = @_;
1535 1664
… …
1615 if ($sym == 13) { 1744 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1621 $self->update; 1750 $self->update;
1622 1751
1623 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1664 my $class = shift; 1793 my $class = shift;
1665 1794
1666 $class->SUPER::new ( 1795 $class->SUPER::new (
1667 padding => 4, 1796 padding => 4,
1668 fg => [1, 1, 1], 1797 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1798 active_fg => [0, 0, 1],
1671 can_hover => 1, 1799 can_hover => 1,
1672 align => 0, 1800 align => 0,
1673 valign => 0, 1801 valign => 0,
1674 can_events => 1, 1802 can_events => 1,
1675 @_ 1803 @_
1676 ) 1804 )
1677} 1805}
1678 1806
1807sub activate { }
1808
1679sub button_up { 1809sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1681 1811
1812 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1815}
1687 1816
1688sub _draw { 1817sub _draw {
1689 my ($self) = @_; 1818 my ($self) = @_;
1690 1819
… …
1692 1821
1693 if ($GRAB == $self) { 1822 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1823 $self->{fg} = $self->{active_fg};
1695 } 1824 }
1696 1825
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1826 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1828 glColor 0, 0, 0, 1;
1702 1829
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1830 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1831
1705 glDisable GL_TEXTURE_2D; 1832 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1833
1708 $self->SUPER::_draw; 1834 $self->SUPER::_draw;
1709} 1835}
1710 1836
1711############################################################################# 1837#############################################################################
… …
1725 1851
1726 $class->SUPER::new ( 1852 $class->SUPER::new (
1727 padding => 2, 1853 padding => 2,
1728 fg => [1, 1, 1], 1854 fg => [1, 1, 1],
1729 active_fg => [1, 1, 0], 1855 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5],
1730 state => 0, 1858 state => 0,
1731 can_hover => 1, 1859 can_hover => 1,
1732 @_ 1860 @_
1733 ) 1861 )
1734} 1862}
… …
1743 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1744 1872
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1749 } 1877 }
1750} 1878}
1751 1879
1752sub _draw { 1880sub _draw {
1753 my ($self) = @_; 1881 my ($self) = @_;
… …
1758 1886
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760 1888
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1890
1763 glEnable GL_BLEND; 1891 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892
1764 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1894 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1896}
1774 1897
1775############################################################################# 1898#############################################################################
1776 1899
1777package CFClient::UI::Image; 1900package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1943 glTranslate 0, -$self->{w}, 0;
1821 1944
1822 ($w, $h) = ($h, $w); 1945 ($w, $h) = ($h, $w);
1823 } 1946 }
1824 1947
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1948 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1949 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1950
1830 $tex->draw_quad (0, 0, $w, $h); 1951 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1952
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1953 glDisable GL_TEXTURE_2D;
1834} 1954}
1835 1955
1836############################################################################# 1956#############################################################################
1837 1957
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2146 qw(s1_slider.png s1_slider_bg.png);
2027 2147
2028sub new { 2148sub new {
2029 my $class = shift; 2149 my $class = shift;
2030 2150
2031 # range [value, low, high, page] 2151 # range [value, low, high, page, unit]
2032 2152
2033 # TODO: 0-width page 2153 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2154 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2155 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
2038 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5],
2039 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2162 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2163 req_h => $::WIDTH / 80,
2042 vertical => 0, 2164 vertical => 0,
2043 can_hover => 1, 2165 can_hover => 1,
2044 inner_pad => 5, 2166 inner_pad => 0.02,
2045 @_ 2167 @_
2046 ); 2168 );
2047 2169
2170 $self->set_value ($self->{range}[0]);
2171 $self->update;
2172
2048 $self 2173 $self
2174}
2175
2176sub set_range {
2177 my ($self, $range) = @_;
2178
2179 ($range, $self->{range}) = ($self->{range}, $range);
2180
2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2183}
2184
2185sub set_value {
2186 my ($self, $value) = @_;
2187
2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2189
2190 $hi = $lo + 1 if $hi <= $lo;
2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2194 $value = $lo if $value < $lo;
2195 $value = $hi - $page if $value > $hi - $page;
2196
2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2198 if $unit;
2199
2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2201
2202 if ($value != $old_value) {
2203 $self->_emit (changed => $value);
2204 $self->update;
2205 }
2049} 2206}
2050 2207
2051sub size_request { 2208sub size_request {
2052 my ($self) = @_; 2209 my ($self) = @_;
2053 2210
… …
2059 2216
2060sub button_down { 2217sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2062 2219
2063 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::button_down ($ev, $x, $y);
2221
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223
2064 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
2065} 2225}
2066 2226
2067sub mouse_motion { 2227sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
2069 2229
2070 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2232
2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2238 }
2239}
2240
2241sub update {
2242 my ($self) = @_;
2243
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2245 $self->set_value ($self->{range}[0]);
2246
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
2072 2249
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2251
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2254
2078 $x -= $inner_pad_px; # substract the padding 2255 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2256 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2257
2084 $self->emit (changed => $x); 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2259 $self->{knob_w} = $knob_w;
2086 } 2260 });
2087}
2088 2261
2089# the inner_* stuff is for generating a padding for the slider handle, 2262 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2263}
2096 2264
2097sub _draw { 2265sub _draw {
2098 my ($self) = @_; 2266 my ($self) = @_;
2099 2267
2100 $self->SUPER::_draw (); 2268 $self->SUPER::_draw ();
2101 2269
2102 my ($w, $h) = @$self{qw(w h)}; 2270 glScale $self->{w}, $self->{h};
2103 2271
2104 if ($self->{vertical}) { 2272 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2273 # draw a vertical slider like a rotated horizontal slider
2106 2274
2275 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2276 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2277 }
2112 2278
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2279 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2280 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2281
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2284
2139 # draw background 2285 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2286 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2287
2142 # draw handle 2288 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2289 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2290
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2147} 2292}
2293
2294#############################################################################
2295
2296package CFClient::UI::ValSlider;
2297
2298our @ISA = CFClient::UI::HBox::;
2299
2300sub new {
2301 my ($class, %arg) = @_;
2302
2303 my $range = delete $arg{range};
2304
2305 my $self = $class->SUPER::new (
2306 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2307 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2308 to_value => sub { shift },
2309 from_value => sub { shift },
2310 %arg,
2311 );
2312
2313 $self->{slider}->connect (changed => sub {
2314 my ($self, $value) = @_;
2315 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2316 $self->{parent}->emit (changed => $value);
2317 });
2318
2319# $self->{entry}->connect (changed => sub {
2320# my ($self, $value) = @_;
2321# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2322# $self->{parent}->emit (changed => $value);
2323# });
2324
2325 $self->add ($self->{slider}, $self->{entry});
2326
2327 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2328
2329 $self
2330}
2331
2332sub set_range { shift->{slider}->set_range (@_) }
2333sub set_value { shift->{slider}->set_value (@_) }
2148 2334
2149############################################################################# 2335#############################################################################
2150 2336
2151package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2152 2338
… …
2161 fontsize => 1, 2347 fontsize => 1,
2162 can_events => 0, 2348 can_events => 0,
2163 #font => default_font 2349 #font => default_font
2164 @_, 2350 @_,
2165 2351
2166 layout => (new CFClient::Layout), 2352 layout => (new CFClient::Layout 1),
2167 par => [], 2353 par => [],
2168 height => 0, 2354 height => 0,
2169 children => [ 2355 children => [
2170 (new CFClient::UI::Empty expand => 1), 2356 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2357 (new CFClient::UI::Slider vertical => 1),
… …
2182 2368
2183 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2370 $self->reflow;
2185} 2371}
2186 2372
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2373sub size_allocate {
2207 my ($self, $w, $h) = @_; 2374 my ($self, $w, $h) = @_;
2208 2375
2209 $self->SUPER::size_allocate ($w, $h); 2376 $self->SUPER::size_allocate ($w, $h);
2210 2377
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2381
2215 $self->reflow; 2382 $self->reflow;
2216} 2383}
2217 2384
2385sub text_size {
2386 my ($self, $text, $indent) = @_;
2387
2388 my $layout = $self->{layout};
2389
2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $layout->set_width ($self->{children}[0]{w} - $indent);
2392 $layout->set_markup ($text);
2393
2394 $layout->size
2395}
2396
2397sub reflow {
2398 my ($self) = @_;
2399
2400 $self->{need_reflow}++;
2401 $self->update;
2402}
2403
2404sub set_offset {
2405 my ($self, $offset) = @_;
2406
2407 # todo: base offset on lines or so, not on pixels
2408 $self->{children}[1]->set_value ($offset);
2409}
2410
2411sub clear {
2412 my ($self) = @_;
2413
2414 $self->{par} = [];
2415 $self->{height} = 0;
2416 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2417}
2418
2218sub add_paragraph { 2419sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2220 2421
2221 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
2222 2423 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
2226 2427
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2428 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230 $self->{children}[1]->update;
2231} 2429}
2232 2430
2233sub update { 2431sub update {
2234 my ($self) = @_; 2432 my ($self) = @_;
2235 2433
… …
2237 2435
2238 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2239 2437
2240 delete $self->{texture}; 2438 delete $self->{texture};
2241 2439
2242 $ROOT->on_refresh ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2243 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2444 my $height = 0;
2245 2445
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2247 for @{$self->{par}}; 2450 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]);
2453 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h;
2457 }
2458
2459 $height += $_->[1];
2460 }
2248 2461
2249 $self->{height} = $height; 2462 $self->{height} = $height;
2250 2463
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2465
2253 delete $self->{texture}; 2466 delete $self->{texture};
2254 } 2467 }
2255 2468
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257 glClearColor 0, 0, 0, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2259 2472
2473 my $top = int $self->{children}[1]{range}[0];
2474
2475 my $y0 = $top;
2476 my $y1 = $top + $H;
2477
2478 my $y = 0;
2479
2480 my $layout = $self->{layout};
2481
2482 $layout->set_font ($self->{font}) if $self->{font};
2483
2260 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2487
2276 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2489 my $h = $par->[1];
2278 2490
2279 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2492 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]);
2280 $layout->set_text ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2281 2495
2282 glColor @{ $par->[1] }; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2497
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2498 glRasterPos $par->[3], $y - $y0;
2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285 } 2500 }
2286 2501
2287 $y += $h; 2502 $y += $h;
2288 } 2503 }
2289 2504
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2505 glDisable GL_BLEND;
2292 }; 2506 };
2293 }); 2507 });
2294} 2508}
2295 2509
2296sub _draw { 2510sub _draw {
2297 my ($self) = @_; 2511 my ($self) = @_;
2298 2512
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2515 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2518
2308 $self->{children}[1]->draw; 2519 $self->{children}[1]->draw;
2309 2520
2310} 2521}
2311 2522
… …
2359 2570
2360sub new { 2571sub new {
2361 my $class = shift; 2572 my $class = shift;
2362 2573
2363 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2364 state => 0, 2575 state => 0,
2365 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2366 @_ 2577 @_
2367 ); 2578 );
2368 2579
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2580 $self
2375} 2581}
2376 2582
2377sub toggle_flopper { 2583sub toggle_flopper {
2378 my ($self) = @_; 2584 my ($self) = @_;
2379 2585
2380 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2587}
2392 2588
2393############################################################################# 2589#############################################################################
2394 2590
2395package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2405 @_, 2601 @_,
2406 can_events => 0, 2602 can_events => 0,
2407 ) 2603 )
2408} 2604}
2409 2605
2410sub set_markup { 2606sub set_tooltip_from {
2411 my ($self, $text) = @_; 2607 my ($self, $widget) = @_;
2412 2608
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2609 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2610 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8,
2613 fg => [0, 0, 0, 1],
2614 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP),
2616 );
2416} 2617}
2417 2618
2418sub size_request { 2619sub size_request {
2419 my ($self) = @_; 2620 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2621
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2622 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2623
2425 ($w + 4, $h + 4) 2624 ($w + 4, $h + 4)
2426} 2625}
… …
2432} 2631}
2433 2632
2434sub _draw { 2633sub _draw {
2435 my ($self) = @_; 2634 my ($self) = @_;
2436 2635
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2636 glTranslate 0.375, 0.375;
2439 2637
2440 my ($w, $h) = @$self{qw(w h)}; 2638 my ($w, $h) = @$self{qw(w h)};
2441 2639
2442 glColor 1, 0.8, 0.4; 2640 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2651 glVertex 0 , $h;
2454 glVertex $w, $h; 2652 glVertex $w, $h;
2455 glVertex $w, 0; 2653 glVertex $w, 0;
2456 glEnd; 2654 glEnd;
2457 2655
2458 glPopMatrix; 2656 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2657 $self->SUPER::_draw;
2462} 2658}
2463 2659
2464############################################################################# 2660#############################################################################
2465 2661
… …
2470use CFClient::OpenGL; 2666use CFClient::OpenGL;
2471 2667
2472sub new { 2668sub new {
2473 my $class = shift; 2669 my $class = shift;
2474 2670
2475 $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2476 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2477 @_, 2674 @_,
2478 ) 2675 );
2676
2677 if ($self->{anim} && $self->{animspeed}) {
2678 Scalar::Util::weaken (my $widget = $self);
2679
2680 $self->{timer} = Event->timer (
2681 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2682 hard => 1,
2683 interval => $self->{animspeed},
2684 cb => sub {
2685 ++$widget->{frame};
2686 $widget->update;
2687 },
2688 );
2689 }
2690
2691 $self
2479} 2692}
2480 2693
2481sub size_request { 2694sub size_request {
2482 (32, 8) 2695 (32, 8)
2483} 2696}
2484 2697
2698sub update {
2699 my ($self) = @_;
2700
2701 return unless $self->{visible};
2702
2703 $self->SUPER::update;
2704}
2705
2485sub _draw { 2706sub _draw {
2486 my ($self) = @_; 2707 my ($self) = @_;
2487 2708
2488 return unless $::CONN;#d# manage and cache textures differently 2709 return unless $::CONN;
2710
2711 my $face;
2712
2713 if ($self->{frame}) {
2714 my $anim = $::CONN->{anim}[$self->{anim}];
2715
2716 $face = $anim->[ $self->{frame} % @$anim ]
2717 if $anim && @$anim;
2718 }
2719
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490 2721
2491 # TODO animation
2492 if ($tex) { 2722 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2723 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2725 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2728 }
2502} 2729}
2503 2730
2504############################################################################# 2731sub DESTROY {
2732 my ($self) = @_;
2505 2733
2734 $self->{timer}->cancel
2735 if $self->{timer};
2736
2737 $self->SUPER::DESTROY;
2738}
2739
2740#############################################################################
2741
2506package CFClient::UI::InventoryItem; 2742package CFClient::UI::Inventory;
2507 2743
2508our @ISA = CFClient::UI::HBox::; 2744our @ISA = CFClient::UI::ScrolledWindow::;
2509 2745
2510sub new { 2746sub new {
2511 my $class = shift; 2747 my $class = shift;
2512 2748
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new ( 2749 my $self = $class->SUPER::new (
2523 can_hover => 1, 2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_, 2751 @_,
2578 ); 2752 );
2579 2753
2580 $self 2754 $self
2581} 2755}
… …
2584 my ($self, $items) = @_; 2758 my ($self, $items) = @_;
2585 2759
2586 $self->{scrolled}->clear; 2760 $self->{scrolled}->clear;
2587 return unless $items; 2761 return unless $items;
2588 2762
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2590 2767
2591 $self->{real_items} = \@items; 2768 $self->{real_items} = \@items;
2592 2769
2770 my $row = 0;
2593 for my $item (@items) { 2771 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2772 CFClient::Item::update_widgets $item;
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597 2773
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2599 } 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2600 2777
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2778 $row++;
2602} 2779 }
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607} 2780}
2608 2781
2609############################################################################# 2782#############################################################################
2610 2783
2611package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2646 2819
2647# popup given the event (must be a mouse button down event currently) 2820# popup given the event (must be a mouse button down event currently)
2648sub popup { 2821sub popup {
2649 my ($self, $ev) = @_; 2822 my ($self, $ev) = @_;
2650 2823
2651 $self->emit ("popdown"); 2824 $self->_emit ("popdown");
2652 2825
2653 # maybe save $GRAB? must be careful about events... 2826 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self; 2827 $GRAB = $self;
2655 $self->{button} = $ev->{button}; 2828 $self->{button} = $ev->{button};
2656 2829
… …
2671 2844
2672 if ($ev->{button} == $self->{button}) { 2845 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB; 2846 undef $GRAB;
2674 $self->hide; 2847 $self->hide;
2675 2848
2676 $self->emit ("popdown"); 2849 $self->_emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover}; 2850 $self->{hover}[1]->() if $self->{hover};
2678 } 2851 }
2679} 2852}
2680 2853
2681############################################################################# 2854#############################################################################
2682 2855
2856package CFClient::UI::Statusbox;
2857
2858our @ISA = CFClient::UI::VBox::;
2859
2860sub new {
2861 my $class = shift;
2862
2863 $class->SUPER::new (
2864 fontsize => 0.8,
2865 @_,
2866 )
2867}
2868
2869sub reorder {
2870 my ($self) = @_;
2871 my $NOW = time;
2872
2873 while (my ($k, $v) = each %{ $self->{item} }) {
2874 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875 }
2876
2877 my @widgets;
2878
2879 my @items = sort {
2880 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} };
2883
2884 my $count = 10 + 1;
2885 for my $item (@items) {
2886 last unless --$count;
2887
2888 push @widgets, $item->{label} ||= do {
2889 # TODO: doesn't handle markup well (read as: at all)
2890 my $short = $item->{count} > 1
2891 ? "<b>$item->{count} ×</b> $item->{text}"
2892 : $item->{text};
2893
2894 for ($short) {
2895 s/^\s+//;
2896 s/\s+/ /g;
2897 }
2898
2899 new CFClient::UI::Label
2900 markup => $short,
2901 tooltip => $item->{tooltip},
2902 tooltip_font => $::FONT_PROP,
2903 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg},
2907 can_events => 1,
2908 can_hover => 1
2909 };
2910 }
2911
2912 $self->clear;
2913 $self->SUPER::add (reverse @widgets);
2914}
2915
2916sub add {
2917 my ($self, $text, %arg) = @_;
2918
2919 $text =~ s/^\s+//;
2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2923
2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2925
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927
2928 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) {
2930 $item->{count}++;
2931 } else {
2932 $item->{count} = 1;
2933 $item->{text} = $item->{tooltip} = $text;
2934 }
2935 $item->{id} = ++$self->{id};
2936 $item->{timeout} = $timeout;
2937 delete $item->{label};
2938 } else {
2939 $self->{item}{$group} = {
2940 id => ++$self->{id},
2941 text => $text,
2942 timeout => $timeout,
2943 tooltip => $text,
2944 fg => [0.8, 0.8, 0.8, 0.8],
2945 pri => 0,
2946 count => 1,
2947 %arg,
2948 };
2949 }
2950
2951 $self->reorder;
2952}
2953
2954sub reconfigure {
2955 my ($self) = @_;
2956
2957 delete $_->{label}
2958 for values %{ $self->{item} || {} };
2959
2960 $self->reorder;
2961 $self->SUPER::reconfigure;
2962}
2963
2964#############################################################################
2965
2683package CFClient::UI::Root; 2966package CFClient::UI::Root;
2684 2967
2685our @ISA = CFClient::UI::Container::; 2968our @ISA = CFClient::UI::Container::;
2686 2969
2687use CFClient::OpenGL; 2970use CFClient::OpenGL;
2688 2971
2972sub new {
2973 my $class = shift;
2974
2975 $class->SUPER::new (
2976 visible => 1,
2977 @_,
2978 )
2979}
2980
2981sub configure {
2982 my ($self, $x, $y, $w, $h) = @_;
2983
2984 $self->{w} = $w;
2985 $self->{h} = $h;
2986}
2987
2689sub check_size { 2988sub check_size {
2690 my ($self) = @_; 2989 my ($self) = @_;
2691 2990
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2693} 2993}
2694 2994
2695sub size_request { 2995sub size_request {
2696 my ($self) = @_; 2996 my ($self) = @_;
2697 2997
… …
2699} 2999}
2700 3000
2701sub size_allocate { 3001sub size_allocate {
2702 my ($self, $w, $h) = @_; 3002 my ($self, $w, $h) = @_;
2703 3003
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2722}
2723
2724sub configure {
2725 my ($self, $x, $y, $w, $h) = @_;
2726
2727 $self->SUPER::configure ($x, $y, $w, $h);
2728
2729 for my $child ($self->children) { 3004 for my $child ($self->children) {
2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731 3006
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3008 if exists $child->{req_x};
3009
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3011 if exists $child->{req_y};
3012
3013 delete @$child{qw(req_x req_y)};
3014
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017
2734 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
2735 } 3019 }
2736} 3020}
2737 3021
2738sub _topleft { 3022sub coord2local {
2739 my ($self, $x, $y) = @_; 3023 my ($self, $x, $y) = @_;
2740 3024
2741 ($x, $y) 3025 ($x, $y)
2742} 3026}
2743 3027
3028sub coord2global {
3029 my ($self, $x, $y) = @_;
3030
3031 ($x, $y)
3032}
3033
2744sub update { 3034sub update {
2745 my ($self) = @_; 3035 my ($self) = @_;
2746 3036
2747 $self->check_size; 3037 $self->check_size;
2748 ::refresh (); 3038 $::WANT_REFRESH++;
2749} 3039}
2750 3040
2751sub add { 3041sub add {
2752 my ($self, $child) = @_; 3042 my ($self, @children) = @_;
2753 3043
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1;
3046
2754 # integerize window positions 3047 # integerise window positions
2755 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3050 }
2757 3051
2758 $self->SUPER::add ($child); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059}
3060
3061sub remove {
3062 my ($self, @children) = @_;
3063
3064 $self->SUPER::remove (@children);
3065
3066 while (@children) {
3067 my $w = pop @children;
3068 push @children, $w->children;
3069 $w->set_invisible;
3070 }
2759} 3071}
2760 3072
2761sub on_refresh { 3073sub on_refresh {
2762 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
2763 3075
2764 $self->{refresh_hook}{$id} = $cb; 3076 $self->{refresh_hook}{$id} = $cb;
2765} 3077}
2766 3078
3079sub on_post_alloc {
3080 my ($self, $id, $cb) = @_;
3081
3082 $self->{post_alloc_hook}{$id} = $cb;
3083}
3084
2767sub draw { 3085sub draw {
2768 my ($self) = @_; 3086 my ($self) = @_;
2769 3087
2770 while (my $rcb = delete $self->{refresh_hook}) { 3088 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 3089 $_->()
3090 for values %{delete $self->{refresh_hook}};
3091 }
3092
3093 if ($self->{check_size}) {
3094 my @queue;
3095
3096 for (;;) {
3097 if ($self->{check_size}) {
3098 #TODO use array-of-depth approach
3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}};
3102 }
3103
3104 my $widget = pop @queue || last;
3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115
3116 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h;
3118
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3120
3121 $widget->{parent}->check_size
3122 if $widget->{parent};
3123 }
3124 }
3125 }
3126
3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3130 values %{delete $self->{size_alloc}}
3131 ) {
3132 my ($widget, $w, $h) = @$_;
3133
3134 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0;
3136
3137 $widget->{w} = $w;
3138 $widget->{h} = $h;
3139 $widget->emit (size_allocate => $w, $h);
3140 }
3141 }
3142
3143 while ($self->{post_alloc_hook}) {
3144 $_->()
3145 for values %{delete $self->{post_alloc_hook}};
2772 } 3146 }
2773 3147
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3148 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3149 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 3150 glClear GL_COLOR_BUFFER_BIT;
2777 3151
2778 glMatrixMode GL_PROJECTION; 3152 glMatrixMode GL_PROJECTION;
2779 glLoadIdentity; 3153 glLoadIdentity;
2780 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3154 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781 glMatrixMode GL_MODELVIEW; 3155 glMatrixMode GL_MODELVIEW;
2782 glLoadIdentity; 3156 glLoadIdentity;
2783 3157
2784 $self->_draw; 3158 $self->_draw;
2785} 3159}
… …
2787############################################################################# 3161#############################################################################
2788 3162
2789package CFClient::UI; 3163package CFClient::UI;
2790 3164
2791$ROOT = new CFClient::UI::Root; 3165$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip; 3166$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793 3167
27941 31681
2795 3169

Diff Legend

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