ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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