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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC

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

Diff Legend

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