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

Diff Legend

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