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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 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;
16 18
17our %WIDGET; # all widgets, weak-referenced 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}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
23 43
24 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
25 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
26 48
27 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
28 50
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 52
31 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 54 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 55 }
44 56
45 return; 57 return;
46 } 58 }
47 } 59 }
… …
51 delete $TOOLTIP->{owner}; 63 delete $TOOLTIP->{owner};
52} 64}
53 65
54# class methods for events 66# class methods for events
55sub feed_sdl_key_down_event { 67sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 68 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 69 if $FOCUS;
58} 70}
59 71
60sub feed_sdl_key_up_event { 72sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 73 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 74 if $FOCUS;
63} 75}
64 76
65sub feed_sdl_button_down_event { 77sub feed_sdl_button_down_event {
66 my ($ev) = @_; 78 my ($ev) = @_;
… …
75 check_tooltip; 87 check_tooltip;
76 } 88 }
77 89
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 90 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 91
80 if ($GRAB) { 92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 94}
85 95
86sub feed_sdl_button_up_event { 96sub feed_sdl_button_up_event {
87 my ($ev) = @_; 97 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
89 99
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 101
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 102 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 103
94 if ($GRAB) { 104 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 105 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 106
99 if (!$BUTTON_STATE) { 107 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 108 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 109 $grab->update if $grab;
102 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 126 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 127
120 check_tooltip; 128 check_tooltip;
121 } 129 }
122 130
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 132 if $HOVER;
127} 133}
128 134
129# convert position array to integers 135# convert position array to integers
130sub harmonize { 136sub harmonize {
131 my ($vals) = @_; 137 my ($vals) = @_;
… …
137 $rem += $_ - $i; 143 $rem += $_ - $i;
138 $_ = $i; 144 $_ = $i;
139 } 145 }
140} 146}
141 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
142# call when resolution changes etc. 164# call when resolution changes etc.
143sub rescale_widgets { 165sub rescale_widgets {
144 my ($sx, $sy) = @_; 166 my ($sx, $sy) = @_;
145 167
146 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 169 if ($widget->{is_toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 } 176 }
157
158 $widget->reconfigure;
159 } 177 }
178
179 reconfigure_widgets;
160} 180}
161 181
162############################################################################# 182#############################################################################
163 183
164package CFClient::UI::Base; 184package CFClient::UI::Base;
… …
177 can_events => 1, 197 can_events => 1,
178 @_ 198 @_
179 }, $class; 199 }, $class;
180 200
181 for (keys %$self) { 201 for (keys %$self) {
182 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
184 } 204 }
185 } 205 }
186 206
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188 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
189 $self 216 $self
190} 217}
191 218
192sub destroy { 219sub destroy {
193 my ($self) = @_; 220 my ($self) = @_;
… …
199sub show { 226sub show {
200 my ($self) = @_; 227 my ($self) = @_;
201 228
202 return if $self->{parent}; 229 return if $self->{parent};
203 230
204 $self->{toplevel} = 1;
205 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
206} 232}
207 233
208sub hide { 234sub center {
209 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};
210 270
211 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
212 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;
213 303
214 $self->{parent}->remove ($self) 304 $self->{parent}->remove ($self)
215 if $self->{parent}; 305 if $self->{parent};
216} 306}
217 307
… …
226} 316}
227 317
228sub set_size { 318sub set_size {
229 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
230 320
231 $self->{user_w} = $w; 321 $self->{def_w} = $w;
232 $self->{user_h} = $h; 322 $self->{def_h} = $h;
233 323
234 $self->check_size; 324 $self->realloc;
235} 325}
236 326
237sub size_request { 327sub size_request {
238 require Carp; 328 require Carp;
239 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
259 $self->{y} = $y; 349 $self->{y} = $y;
260 $self->update; 350 $self->update;
261 } 351 }
262 352
263 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
264 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
265 } 357 }
266} 358}
267 359
268sub size_allocate { 360sub size_allocate {
269 # nothing to be done 361 # nothing to be done
270} 362}
271 363
272sub reconfigure {
273 my ($self) = @_;
274
275 $self->check_size (1);
276 $self->update;
277}
278
279sub children { 364sub children {
280} 365}
281 366
282sub set_max_size { 367sub set_max_size {
283 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
284 369
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
286 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 }
287} 388}
288 389
289# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
290sub coord2local { 391sub coord2local {
291 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
… …
306 return if $FOCUS == $self; 407 return if $FOCUS == $self;
307 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
308 409
309 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
310 411
311 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
312 413
313 $focus->update if $focus; 414 $focus->update if $focus;
314 $FOCUS->update; 415 $FOCUS->update;
315} 416}
316 417
… …
319 420
320 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
321 422
322 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
323 424
324 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
325 426
326 $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;
327} 431}
328 432
329sub mouse_motion { } 433sub mouse_motion { }
330sub button_up { } 434sub button_up { }
331sub key_down { } 435sub key_down { }
332sub key_up { } 436sub key_up { }
333 437
334sub button_down { 438sub button_down {
335 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
336 440
337 $self->focus_in; 441 $self->focus_in;
… …
340sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
341sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
342sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
343sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
344sub 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}
345 512
346sub draw { 513sub draw {
347 my ($self) = @_; 514 my ($self) = @_;
348 515
349 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
371 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
372 glPushMatrix; 539 glPushMatrix;
373 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
374 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
375 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
376 glVertex 0 , 0; 543 glVertex 0 , 0;
377 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
378 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
379 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
380 glEnd; 547 glEnd;
381 glPopMatrix; 548 glPopMatrix;
382 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;
383 } 550 }
384} 551}
385 552
386sub _draw { 553sub _draw {
387 my ($self) = @_; 554 my ($self) = @_;
388 555
389 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
390}
391
392sub find_widget {
393 my ($self, $x, $y) = @_;
394
395 return () unless $self->{can_events};
396
397 return $self
398 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
399 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
400
401 ()
402}
403
404sub set_parent {
405 my ($self, $parent) = @_;
406
407 Scalar::Util::weaken ($self->{parent} = $parent);
408
409 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size
411 unless exists $self->{req_w};
412}
413
414sub check_size {
415 my ($self, $forced) = @_;
416
417 $self->{force_alloc} = 1 if $forced;
418 $CFClient::UI::ROOT->{check_size}{$self} = $self;
419}
420
421sub update {
422 my ($self) = @_;
423
424 $self->{parent}->update
425 if $self->{parent};
426}
427
428sub connect {
429 my ($self, $signal, $cb) = @_;
430
431 push @{ $self->{signal_cb}{$signal} }, $cb;
432}
433
434sub emit {
435 my ($self, $signal, @args) = @_;
436
437 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
438} 557}
439 558
440sub DESTROY { 559sub DESTROY {
441 my ($self) = @_; 560 my ($self) = @_;
442 561
… …
457 my $class = shift; 576 my $class = shift;
458 577
459 # range [value, low, high, page] 578 # range [value, low, high, page]
460 579
461 $class->SUPER::new ( 580 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 581 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 582 #active_bg => [1, 1, 1, 0.5],
464 @_ 583 @_
465 ) 584 )
466} 585}
467 586
468sub _draw { 587sub _draw {
469 my ($self) = @_; 588 my ($self) = @_;
470 589
590 my $color = $FOCUS == $self && $self->{active_bg}
591 ? $self->{active_bg}
592 : $self->{bg};
593
594 if ($color && (@$color < 4 || $color->[3])) {
471 my ($w, $h) = @$self{qw(w h)}; 595 my ($w, $h) = @$self{qw(w h)};
472 596
473 glEnable GL_BLEND; 597 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 599 glColor @$color;
476 600
477 glBegin GL_QUADS; 601 glBegin GL_QUADS;
478 glVertex 0 , 0; 602 glVertex 0 , 0;
479 glVertex 0 , $h; 603 glVertex 0 , $h;
480 glVertex $w, $h; 604 glVertex $w, $h;
481 glVertex $w, 0; 605 glVertex $w, 0;
482 glEnd; 606 glEnd;
483 607
484 glDisable GL_BLEND; 608 glDisable GL_BLEND;
609 }
485} 610}
486 611
487############################################################################# 612#############################################################################
488 613
489package CFClient::UI::Empty; 614package CFClient::UI::Empty;
… …
533 $self->{children} = [ 658 $self->{children} = [
534 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
535 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
536 ]; 661 ];
537 662
538 $self->check_size (1); 663 $self->realloc;
539 $self->update;
540} 664}
541 665
542sub children { 666sub children {
543 @{ $_[0]{children} } 667 @{ $_[0]{children} }
544} 668}
… …
549 delete $child->{parent}; 673 delete $child->{parent};
550 $child->hide; 674 $child->hide;
551 675
552 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
553 677
554 $self->check_size; 678 $self->realloc;
555 $self->update;
556} 679}
557 680
558sub clear { 681sub clear {
559 my ($self) = @_; 682 my ($self) = @_;
560 683
… …
564 for (@$children) { 687 for (@$children) {
565 delete $_->{parent}; 688 delete $_->{parent};
566 $_->hide; 689 $_->hide;
567 } 690 }
568 691
569 $self->check_size; 692 $self->realloc;
570 $self->update;
571} 693}
572 694
573sub find_widget { 695sub find_widget {
574 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
575 697
… …
628sub size_request { 750sub size_request {
629 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
630} 752}
631 753
632sub size_allocate { 754sub size_allocate {
633 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
634 756
635 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
636} 758}
637 759
638############################################################################# 760#############################################################################
… …
655 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
656 $self->SUPER::update; 778 $self->SUPER::update;
657} 779}
658 780
659sub size_allocate { 781sub size_allocate {
660 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
661 783
662 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
663 $self->update; 785 $self->update
786 if $changed;
664} 787}
665 788
666sub _render { 789sub _render {
667 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
668} 791}
… …
673 $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 {
674 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
675 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
676 799
677 $self->_render; 800 $self->_render;
678# glColorMask 1, 1, 1, 0;
679# glEnable GL_BLEND;
680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681# glRasterPos 0, 0;
682# glCopyPixels 0, 0, $self->{w}, $self->{h};
683# glDisable GL_BLEND;
684# glColorMask 1, 1, 1, 1;
685 }; 801 };
686} 802}
687 803
688sub _draw { 804sub _draw {
689 my ($self) = @_; 805 my ($self) = @_;
… …
693 my $tex = $self->{texture} 809 my $tex = $self->{texture}
694 or return; 810 or return;
695 811
696 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
699 815
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701 817
702 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
703} 819}
… …
706 822
707package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
708 824
709our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
710 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
711sub size_request { 837sub size_request {
712 my ($self) = @_; 838 my ($self) = @_;
713 839
714 @$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)};
715 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
716 841
717 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
718} 846}
719 847
720sub size_allocate { 848sub size_allocate {
721 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
722 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);
723 $self->update; 855 $self->update;
724} 856}
725 857
726sub set_offset { 858sub set_offset {
727 my ($self, $x, $y) = @_; 859 my ($self, $x, $y) = @_;
… …
778 my $class = shift; 910 my $class = shift;
779 911
780 my $self; 912 my $self;
781 913
782 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
783 vertical => 1, 915 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 917 on_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 918 $self->{vp}->set_offset (0, $_[1]);
787 }, 919 },
788 ; 920 ;
789 921
790 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 923 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 924 slider => $slider,
793 @_, 925 @_,
794 ); 926 );
795 927
796 $self->{vp}->add ($self->{scrolled}); 928 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp}); 929 $self->add ($self->{vp});
798 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
799 931
800 $self 932 $self
933}
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]);
801} 952}
802 953
803#TODO# update range on size_allocate depending on child 954#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 955# update viewport offset on scroll
805 956
… …
856 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
857 1008
858sub new { 1009sub new {
859 my $class = shift; 1010 my $class = shift;
860 1011
861 # TODO: user_x, user_y, overwrite moveto?
862
863 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
864 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
865 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
866 border => 0.6, 1015 border => 0.6,
867 toplevel => 1, 1016 is_toplevel => 1,
868 can_events => 1, 1017 can_events => 1,
869 @_ 1018 @_
870 ); 1019 );
871 1020
872 $self->{title} &&= new CFClient::UI::Label 1021 $self->{title} &&= new CFClient::UI::Label
873 align => 0, 1022 align => 0,
… …
892 $h + $self->border * 2, 1041 $h + $self->border * 2,
893 ) 1042 )
894} 1043}
895 1044
896sub size_allocate { 1045sub size_allocate {
897 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
898 1049
899 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
901 1052
902 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
903 if $self->{title}; 1054 if $self->{title};
904 1055
905 $self->child->configure ($self->border, $self->border, $w, $h); 1056 $self->child->configure ($self->border, $self->border, $w, $h);
906} 1057}
907 1058
… …
926 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
927 1078
928 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
929 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
930 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
931 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
932 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
933 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
934 $self->check_size; 1087 $self->realloc;
935 }; 1088 };
936 1089
937 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
938 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
939 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
941 $self->{motion} = sub { 1094 $self->{motion} = sub {
942 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
943 1096
944 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
945 1098
946 $self->move ($bx + $x - $ox, $by + $y - $oy); 1099 $self->{user_x} = $bx + $x - $ox;
1100 $self->{user_y} = $by + $y - $oy;
1101
1102 $self->move ($self->{user_x}, $self->{user_y});
947 $self->update; 1103 $self->realloc;
948 }; 1104 };
949 } 1105 }
950} 1106}
951 1107
952sub button_up { 1108sub button_up {
… …
1013sub new { 1169sub new {
1014 my $class = shift; 1170 my $class = shift;
1015 1171
1016 $class->SUPER::new ( 1172 $class->SUPER::new (
1017 col_expand => [], 1173 col_expand => [],
1018 @_ 1174 @_,
1019 ) 1175 )
1176}
1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1020} 1180}
1021 1181
1022sub add { 1182sub add {
1023 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1024 1184
1025 $child->set_parent ($self); 1185 $child->set_parent ($self);
1026 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1027 1187
1028 $child->check_size; 1188 $self->realloc;
1029} 1189}
1030 1190
1031sub children {
1032 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1033}
1034
1035# TODO: move to container class maybe? send childs a signal on removal? 1191# TODO: move to container class maybe? send children a signal on removal?
1036sub clear { 1192sub clear {
1037 my ($self) = @_; 1193 my ($self) = @_;
1038 1194
1039 my @children = $self->children; 1195 my @children = $self->children;
1040 delete $self->{children}; 1196 delete $self->{children};
… …
1042 for (@children) { 1198 for (@children) {
1043 delete $_->{parent}; 1199 delete $_->{parent};
1044 $_->hide; 1200 $_->hide;
1045 } 1201 }
1046 1202
1047 $self->update; 1203 $self->realloc;
1048} 1204}
1049 1205
1050sub get_wh { 1206sub get_wh {
1051 my ($self) = @_; 1207 my ($self) = @_;
1052 1208
… …
1079 (sum @$hs), 1235 (sum @$hs),
1080 ) 1236 )
1081} 1237}
1082 1238
1083sub size_allocate { 1239sub size_allocate {
1084 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1085 1241
1086 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1087 1243
1088 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1089 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1090 1246
1091 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1092 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1093 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1094 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1148 } 1304 }
1149} 1305}
1150 1306
1151############################################################################# 1307#############################################################################
1152 1308
1309package CFClient::UI::Box;
1310
1311our @ISA = CFClient::UI::Container::;
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 $self->{vertical}
1317 ? (
1318 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1320 )
1321 : (
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 )
1325}
1326
1327sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_;
1329
1330 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children};
1332
1333 my @req;
1334
1335 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children;
1337 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1339 my $req = List::Util::sum @req;
1340
1341 if ($req > $space) {
1342 # ah well, not enough space
1343 $_ *= $space / $req for @req;
1344 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1346
1347 $space = ($space - $req) / $expand; # remaining space to give away
1348
1349 $req[$_] += $space * $children->[$_]{expand}
1350 for 0 .. $#$children;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@req;
1355
1356 my $pos = 0;
1357 for (0 .. $#$children) {
1358 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360
1361 $pos += $alloc;
1362 }
1363
1364 1
1365}
1366
1367#############################################################################
1368
1153package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1154 1370
1155# TODO: wrap into common Box base class
1156
1157our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1158 1372
1159sub size_request { 1373sub new {
1160 my ($self) = @_; 1374 my $class = shift;
1161 1375
1162 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1163 1377 vertical => 0,
1164 ( 1378 @_,
1165 (List::Util::sum map $_->[0], @alloc),
1166 (List::Util::max map $_->[1], @alloc),
1167 ) 1379 )
1168} 1380}
1169 1381
1170sub size_allocate {
1171 my ($self, $w, $h) = @_;
1172
1173 ($h, $w) = ($w, $h);
1174
1175 my $children = $self->{children};
1176
1177 my @h = map $_->{req_w}, @$children;
1178
1179 my $req_h = List::Util::sum @h;
1180
1181 if ($req_h > $h) {
1182 # ah well, not enough space
1183 $_ *= $h / $req_h for @h;
1184 } else {
1185 my $exp = List::Util::sum map $_->{expand}, @$children;
1186 $exp ||= 1;
1187
1188 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190
1191 my $alloc_h = $h[$_];
1192 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1193 $h[$_] = $alloc_h;
1194 }
1195 }
1196
1197 CFClient::UI::harmonize \@h;
1198
1199 my $y = 0;
1200 for (0 .. $#$children) {
1201 my $child = $children->[$_];
1202 my $h = $h[$_];
1203 $child->configure ($y, 0, $h, $w);
1204
1205 $y += $h;
1206 }
1207
1208 1
1209}
1210
1211############################################################################# 1382#############################################################################
1212 1383
1213package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1214 1385
1215# TODO: wrap into common Box base class
1216
1217our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1218 1387
1219sub size_request { 1388sub new {
1220 my ($self) = @_; 1389 my $class = shift;
1221 1390
1222 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1223 1392 vertical => 1,
1224 ( 1393 @_,
1225 (List::Util::max map $_->[0], @alloc),
1226 (List::Util::sum map $_->[1], @alloc),
1227 ) 1394 )
1228} 1395}
1229 1396
1230sub size_allocate {
1231 my ($self, $w, $h) = @_;
1232
1233 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1235 my $children = $self->{children};
1236
1237 my @h = map $_->{req_h}, @$children;
1238
1239 my $req_h = List::Util::sum @h;
1240
1241 if ($req_h > $h) {
1242 # ah well, not enough space
1243 $_ *= $h / $req_h for @h;
1244 } else {
1245 my $exp = List::Util::sum map $_->{expand}, @$children;
1246 $exp ||= 1;
1247
1248 for (0 .. $#$children) {
1249 my $child = $children->[$_];
1250
1251 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1252 }
1253 }
1254
1255 CFClient::UI::harmonize \@h;
1256
1257 my $y = 0;
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260 my $h = $h[$_];
1261 $child->configure (0, $y, $w, $h);
1262
1263 $y += $h;
1264 }
1265
1266 1
1267}
1268
1269############################################################################# 1397#############################################################################
1270 1398
1271package CFClient::UI::Label; 1399package CFClient::UI::Label;
1272 1400
1273our @ISA = CFClient::UI::Base::; 1401our @ISA = CFClient::UI::DrawBG::;
1274 1402
1275use CFClient::OpenGL; 1403use CFClient::OpenGL;
1276 1404
1277sub new { 1405sub new {
1278 my ($class, %arg) = @_; 1406 my ($class, %arg) = @_;
1279 1407
1280 my $self = $class->SUPER::new ( 1408 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1409 fg => [1, 1, 1],
1410 #bg => none
1411 #active_bg => none
1282 #font => default_font 1412 #font => default_font
1283 #text => initial text 1413 #text => initial text
1284 #markup => initial narkup 1414 #markup => initial narkup
1415 #max_w => maximum pixel width
1416 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1417 layout => (new CFClient::Layout),
1286 fontsize => 1, 1418 fontsize => 1,
1287 align => -1, 1419 align => -1,
1288 valign => -1, 1420 valign => -1,
1289 padding => 2, 1421 padding => 2,
… …
1304 } 1436 }
1305 1437
1306 $self 1438 $self
1307} 1439}
1308 1440
1309sub escape { 1441sub escape($) {
1310 local $_ = $_[1]; 1442 local $_ = $_[0];
1311 1443
1312 s/&/&amp;/g; 1444 s/&/&amp;/g;
1313 s/>/&gt;/g; 1445 s/>/&gt;/g;
1314 s/</&lt;/g; 1446 s/</&lt;/g;
1315 1447
1316 $_[1] 1448 $_
1317} 1449}
1318 1450
1319sub update { 1451sub update {
1320 my ($self) = @_; 1452 my ($self) = @_;
1321 1453
… …
1330 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1331 1463
1332 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1333 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1334 1466
1467 $self->realloc;
1335 $self->update; 1468 $self->update;
1336 $self->check_size;
1337} 1469}
1338 1470
1339sub set_markup { 1471sub set_markup {
1340 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1341 1473
… …
1345 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1346 1478
1347 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1349 1481
1482 $self->realloc;
1350 $self->update; 1483 $self->update;
1351 $self->check_size;
1352} 1484}
1353 1485
1354sub size_request { 1486sub size_request {
1355 my ($self) = @_; 1487 my ($self) = @_;
1356 1488
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1489 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $self->{layout}->set_width ($self->{max_w} || -1); 1490 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1494
1361 my ($w, $h) = $self->{layout}->size; 1495 my ($w, $h) = $self->{layout}->size;
1362 1496
1363 if (exists $self->{template}) { 1497 if (exists $self->{template}) {
… …
1375 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1376 ) 1510 )
1377} 1511}
1378 1512
1379sub size_allocate { 1513sub size_allocate {
1380 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1381 1515
1382 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1383} 1518}
1384 1519
1385sub set_fontsize { 1520sub set_fontsize {
1386 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1387 1522
1388 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1389 delete $self->{texture}; 1524 delete $self->{texture};
1390 1525
1391 $self->update; 1526 $self->realloc;
1392 $self->check_size;
1393} 1527}
1394 1528
1395sub _draw { 1529sub _draw {
1396 my ($self) = @_; 1530 my ($self) = @_;
1531
1532 $self->SUPER::_draw; # draw background, if applicable
1397 1533
1398 my $tex = $self->{texture} ||= do { 1534 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1535 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1536 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1537 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1541
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1542 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1543
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1546 : ($self->{w} - $tex->{w}) * 0.5);
1409 1547
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1550 : ($self->{h} - $tex->{h}) * 0.5);
1413 1551
1414 $tex 1552 $tex
1415 }; 1553 };
1416 1554
1417 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
… …
1445 active_fg => [0, 0, 0], 1583 active_fg => [0, 0, 0],
1446 can_hover => 1, 1584 can_hover => 1,
1447 can_focus => 1, 1585 can_focus => 1,
1448 valign => 0, 1586 valign => 0,
1449 can_events => 1, 1587 can_events => 1,
1588 #text => ...
1450 @_ 1589 @_
1451 ) 1590 )
1452} 1591}
1453 1592
1454sub _set_text { 1593sub _set_text {
… …
1464 $self->{text} = $text; 1603 $self->{text} = $text;
1465 1604
1466 $text =~ s/./*/g if $self->{hidden}; 1605 $text =~ s/./*/g if $self->{hidden};
1467 $self->{layout}->set_text ("$text "); 1606 $self->{layout}->set_text ("$text ");
1468 1607
1469 $self->emit (changed => $self->{text}); 1608 $self->_emit (changed => $self->{text});
1470} 1609}
1471 1610
1472sub set_text { 1611sub set_text {
1473 my ($self, $text) = @_; 1612 my ($self, $text) = @_;
1474 1613
1475 $self->{cursor} = length $text; 1614 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1615 $self->_set_text ($text);
1477 $self->check_size; 1616
1478 $self->update; 1617 $self->realloc;
1479} 1618}
1480 1619
1481sub get_text { 1620sub get_text {
1482 $_[0]{text} 1621 $_[0]{text}
1483} 1622}
… …
1486 my ($self) = @_; 1625 my ($self) = @_;
1487 1626
1488 my ($w, $h) = $self->SUPER::size_request; 1627 my ($w, $h) = $self->SUPER::size_request;
1489 1628
1490 ($w + 1, $h) # add 1 for cursor 1629 ($w + 1, $h) # add 1 for cursor
1491}
1492
1493sub size_allocate {
1494 my ($self, $w, $h) = @_;
1495
1496 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497} 1630}
1498 1631
1499sub key_down { 1632sub key_down {
1500 my ($self, $ev) = @_; 1633 my ($self, $ev) = @_;
1501 1634
… …
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1649 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1650 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1651 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1652 $self->{cursor} = length $text;
1520 } elsif ($uni == 27) { 1653 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1654 $self->_emit ('escape');
1522 } elsif ($uni) { 1655 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1657 }
1525 1658
1526 $self->_set_text ($text); 1659 $self->_set_text ($text);
1527 $self->update; 1660
1661 $self->realloc;
1528} 1662}
1529 1663
1530sub focus_in { 1664sub focus_in {
1531 my ($self) = @_; 1665 my ($self) = @_;
1532 1666
… …
1612 if ($sym == 13) { 1746 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1747 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1748 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1749 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1750 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1751 $self->_emit (activate => $txt);
1618 $self->update; 1752 $self->update;
1619 1753
1620 } elsif ($sym == CFClient::SDLK_UP) { 1754 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1755 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1756 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1795 my $class = shift;
1662 1796
1663 $class->SUPER::new ( 1797 $class->SUPER::new (
1664 padding => 4, 1798 padding => 4,
1665 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1800 active_fg => [0, 0, 1],
1668 can_hover => 1, 1801 can_hover => 1,
1669 align => 0, 1802 align => 0,
1670 valign => 0, 1803 valign => 0,
1671 can_events => 1, 1804 can_events => 1,
1672 @_ 1805 @_
1673 ) 1806 )
1674} 1807}
1675 1808
1809sub activate { }
1810
1676sub button_up { 1811sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1812 my ($self, $ev, $x, $y) = @_;
1678 1813
1814 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1815 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1816 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1817}
1684 1818
1685sub _draw { 1819sub _draw {
1686 my ($self) = @_; 1820 my ($self) = @_;
1687 1821
… …
1719 1853
1720 $class->SUPER::new ( 1854 $class->SUPER::new (
1721 padding => 2, 1855 padding => 2,
1722 fg => [1, 1, 1], 1856 fg => [1, 1, 1],
1723 active_fg => [1, 1, 0], 1857 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5],
1724 state => 0, 1860 state => 0,
1725 can_hover => 1, 1861 can_hover => 1,
1726 @_ 1862 @_
1727 ) 1863 )
1728} 1864}
… …
1737 my ($self, $ev, $x, $y) = @_; 1873 my ($self, $ev, $x, $y) = @_;
1738 1874
1739 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1740 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1741 $self->{state} = !$self->{state}; 1877 $self->{state} = !$self->{state};
1742 $self->emit (changed => $self->{state}); 1878 $self->_emit (changed => $self->{state});
1743 } 1879 }
1744} 1880}
1745 1881
1746sub _draw { 1882sub _draw {
1747 my ($self) = @_; 1883 my ($self) = @_;
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2148 qw(s1_slider.png s1_slider_bg.png);
2013 2149
2014sub new { 2150sub new {
2015 my $class = shift; 2151 my $class = shift;
2016 2152
2017 # range [value, low, high, page] 2153 # range [value, low, high, page, unit]
2018 2154
2019 # TODO: 0-width page 2155 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2156 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2157 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2158 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2159 fg => [1, 1, 1],
2024 active_fg => [0, 0, 0], 2160 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5],
2025 range => [0, 0, 100, 10], 2163 range => [0, 0, 100, 10, 0],
2026 req_w => $::WIDTH / 80, 2164 req_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2165 req_h => $::WIDTH / 80,
2028 vertical => 0, 2166 vertical => 0,
2029 can_hover => 1, 2167 can_hover => 1,
2030 inner_pad => 5, 2168 inner_pad => 0.02,
2031 @_ 2169 @_
2032 ); 2170 );
2033 2171
2172 $self->set_value ($self->{range}[0]);
2173 $self->update;
2174
2034 $self 2175 $self
2176}
2177
2178sub changed { }
2179
2180sub set_range {
2181 my ($self, $range) = @_;
2182
2183 ($range, $self->{range}) = ($self->{range}, $range);
2184
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2187}
2188
2189sub set_value {
2190 my ($self, $value) = @_;
2191
2192 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2193
2194 $hi = $lo + 1 if $hi <= $lo;
2195
2196 $page = $hi - $lo if $page > $hi - $lo;
2197
2198 $value = $lo if $value < $lo;
2199 $value = $hi - $page if $value > $hi - $page;
2200
2201 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2202 if $unit;
2203
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205
2206 if ($value != $old_value) {
2207 $self->_emit (changed => $value);
2208 $self->update;
2209 }
2035} 2210}
2036 2211
2037sub size_request { 2212sub size_request {
2038 my ($self) = @_; 2213 my ($self) = @_;
2039 2214
… …
2045 2220
2046sub button_down { 2221sub button_down {
2047 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
2048 2223
2049 $self->SUPER::button_down ($ev, $x, $y); 2224 $self->SUPER::button_down ($ev, $x, $y);
2225
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227
2050 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
2051} 2229}
2052 2230
2053sub mouse_motion { 2231sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
2055 2233
2056 if ($GRAB == $self) { 2234 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236
2237 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2242 }
2243}
2244
2245sub update {
2246 my ($self) = @_;
2247
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2249 $self->set_value ($self->{range}[0]);
2250
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
2058 2253
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060 2255
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063 2258
2064 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2261
2070 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
2071 $self->update; 2263 $self->{knob_w} = $knob_w;
2072 } 2264 });
2073}
2074 2265
2075# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
2076# so that the handle doesn't leave the texture. This calculation isn't 100%
2077# correct propably, but it does the job for now
2078sub _calc_inner_pad_px {
2079 my ($self, $w) = @_;
2080 ($w / 100) * $self->{inner_pad} # % to pixels
2081} 2267}
2082 2268
2083sub _draw { 2269sub _draw {
2084 my ($self) = @_; 2270 my ($self) = @_;
2085 2271
2086 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
2087 2273
2088 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
2089 2275
2090 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
2092 2278
2279 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2281 }
2098 2282
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2285
2102 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104 $hi = $value + 1 if $lo == $hi;
2105
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109 $page = int $page * $inner_w / ($hi - $lo);
2110 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112 $w -= $page;
2113 $page &= ~1;
2114 glTranslate $page * 0.5, 0, 0;
2115 $page ||= 2;
2116
2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2288
2123 # draw background 2289 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2291
2126 # draw handle 2292 # draw handle
2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128 2294
2129 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
2130} 2296}
2297
2298#############################################################################
2299
2300package CFClient::UI::ValSlider;
2301
2302our @ISA = CFClient::UI::HBox::;
2303
2304sub new {
2305 my ($class, %arg) = @_;
2306
2307 my $range = delete $arg{range};
2308
2309 my $self = $class->SUPER::new (
2310 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2311 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2312 to_value => sub { shift },
2313 from_value => sub { shift },
2314 %arg,
2315 );
2316
2317 $self->{slider}->connect (changed => sub {
2318 my ($self, $value) = @_;
2319 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2320 $self->{parent}->emit (changed => $value);
2321 });
2322
2323# $self->{entry}->connect (changed => sub {
2324# my ($self, $value) = @_;
2325# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2326# $self->{parent}->emit (changed => $value);
2327# });
2328
2329 $self->add ($self->{slider}, $self->{entry});
2330
2331 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2332
2333 $self
2334}
2335
2336sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) }
2131 2338
2132############################################################################# 2339#############################################################################
2133 2340
2134package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
2135 2342
… …
2165 2372
2166 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2167 $self->reflow; 2374 $self->reflow;
2168} 2375}
2169 2376
2170sub text_height {
2171 my ($self, $text) = @_;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w});
2177 $layout->set_markup ($text);
2178
2179 ($layout->size)[1]
2180}
2181
2182sub reflow {
2183 my ($self) = @_;
2184
2185 $self->{need_reflow}++;
2186 $self->update;
2187}
2188
2189sub size_allocate { 2377sub size_allocate {
2190 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2191 2379
2192 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2193 2383
2194 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2195 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2196 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2197 2387
2198 $self->reflow; 2388 $self->reflow;
2199} 2389}
2200 2390
2391sub text_size {
2392 my ($self, $text, $indent) = @_;
2393
2394 my $layout = $self->{layout};
2395
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent);
2398 $layout->set_markup ($text);
2399
2400 $layout->size
2401}
2402
2403sub reflow {
2404 my ($self) = @_;
2405
2406 $self->{need_reflow}++;
2407 $self->update;
2408}
2409
2410sub set_offset {
2411 my ($self, $offset) = @_;
2412
2413 # todo: base offset on lines or so, not on pixels
2414 $self->{children}[1]->set_value ($offset);
2415}
2416
2417sub clear {
2418 my ($self) = @_;
2419
2420 $self->{par} = [];
2421 $self->{height} = 0;
2422 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2423}
2424
2201sub add_paragraph { 2425sub add_paragraph {
2202 my ($self, $color, $text) = @_; 2426 my ($self, $color, $text, $indent) = @_;
2203 2427
2204 #TODO: intelligently "reformat" paragraph 2428 for my $line (split /\n/, $text) {
2205 2429 my ($w, $h) = $self->text_size ($line);
2206 my $height = $self->text_height ($text);
2207
2208 $self->{height} += $height; 2430 $self->{height} += $h;
2431 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2432 }
2209 2433
2210 push @{$self->{par}}, [$height, $color, $text];
2211
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2434 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2213 $self->{children}[1]->update;
2214} 2435}
2215 2436
2216sub update { 2437sub update {
2217 my ($self) = @_; 2438 my ($self) = @_;
2218 2439
… …
2221 return unless $self->{h} > 0; 2442 return unless $self->{h} > 0;
2222 2443
2223 delete $self->{texture}; 2444 delete $self->{texture};
2224 2445
2225 $ROOT->on_post_alloc ($self, sub { 2446 $ROOT->on_post_alloc ($self, sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448
2226 if (delete $self->{need_reflow}) { 2449 if (delete $self->{need_reflow}) {
2227 my $height = 0; 2450 my $height = 0;
2228 2451
2229 $height += $_->[0] = $self->text_height ($_->[2]) 2452 my $layout = $self->{layout};
2453
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2230 for @{$self->{par}}; 2456 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]);
2459 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h;
2463 }
2464
2465 $height += $_->[1];
2466 }
2231 2467
2232 $self->{height} = $height; 2468 $self->{height} = $height;
2233 2469
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2235 2471
2236 delete $self->{texture}; 2472 delete $self->{texture};
2237 } 2473 }
2238 2474
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2240 glClearColor 0, 0, 0, 0; 2476 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2477 glClear GL_COLOR_BUFFER_BIT;
2242 2478
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0]; 2479 my $top = int $self->{children}[1]{range}[0];
2247 2480
2248 my $y0 = $top; 2481 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 2482 my $y1 = $top + $H;
2250 2483
2251 my $y = 0; 2484 my $y = 0;
2252 2485
2253 my $layout = $self->{layout}; 2486 my $layout = $self->{layout};
2254 2487
2255 $layout->set_font ($self->{font}) if $self->{font}; 2488 $layout->set_font ($self->{font}) if $self->{font};
2256 2489
2490 glEnable GL_BLEND;
2491 #TODO# not correct in windows where rgba is forced off
2492 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2493
2257 for my $par (@{$self->{par}}) { 2494 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2495 my $h = $par->[1];
2259 2496
2260 if ($y0 < $y + $h && $y < $y1) { 2497 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 2498 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]);
2262 $layout->set_markup ($par->[2]); 2500 $layout->set_markup ($par->[4]);
2263 2501
2264 my ($W, $H) = $layout->size; 2502 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2503
2504 glRasterPos $par->[3], $y - $y0;
2505 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2506 }
2267 2507
2268 $y += $h; 2508 $y += $h;
2269 } 2509 }
2270 2510
2271 glDisable GL_TEXTURE_2D; 2511 glDisable GL_BLEND;
2272 }; 2512 };
2273 }); 2513 });
2274} 2514}
2275 2515
2276sub _draw { 2516sub _draw {
2277 my ($self) = @_; 2517 my ($self) = @_;
2278 2518
2279 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2284 2524
2285 $self->{children}[1]->draw; 2525 $self->{children}[1]->draw;
2286 2526
2287} 2527}
… …
2336 2576
2337sub new { 2577sub new {
2338 my $class = shift; 2578 my $class = shift;
2339 2579
2340 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2341 state => 0, 2581 state => 0,
2342 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2343 @_ 2583 @_
2344 ); 2584 );
2345 2585
2346 if ($self->{state}) {
2347 $self->{state} = 0;
2348 $self->toggle_flopper;
2349 }
2350
2351 $self 2586 $self
2352} 2587}
2353 2588
2354sub toggle_flopper { 2589sub toggle_flopper {
2355 my ($self) = @_; 2590 my ($self) = @_;
2356 2591
2357 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2358 if ($self->{state} = !$self->{state}) {
2359 $CFClient::UI::ROOT->add ($self->{other});
2360 $self->{other}->move ($self->coord2global (0, $self->{h}));
2361 $self->emit ("open");
2362 } else {
2363 $CFClient::UI::ROOT->remove ($self->{other});
2364 $self->emit ("close");
2365 }
2366
2367 $self->emit (changed => $self->{state});
2368} 2593}
2369 2594
2370############################################################################# 2595#############################################################################
2371 2596
2372package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2386 2611
2387sub set_tooltip_from { 2612sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2613 my ($self, $widget) = @_;
2389 2614
2390 $self->add (new CFClient::UI::Label 2615 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2616 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2618 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2619 fg => [0, 0, 0, 1],
2620 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2621 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2622 );
2397} 2623}
2398 2624
2399sub size_request { 2625sub size_request {
2400 my ($self) = @_; 2626 my ($self) = @_;
… …
2403 2629
2404 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2405} 2631}
2406 2632
2407sub size_allocate { 2633sub size_allocate {
2408 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2409 2635
2636 return unless $changed;
2637
2410 $self->SUPER::size_allocate ($w - 4, $h - 4); 2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2639}
2640
2641sub visibility_change {
2642 my ($self, $visible) = @_;
2643
2644 return unless $visible;
2645
2646 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}
2648 or return;
2649
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH;
2654
2655 $self->move ($x, $y);
2656 });
2411} 2657}
2412 2658
2413sub _draw { 2659sub _draw {
2414 my ($self) = @_; 2660 my ($self) = @_;
2415 2661
… …
2432 glVertex $w, $h; 2678 glVertex $w, $h;
2433 glVertex $w, 0; 2679 glVertex $w, 0;
2434 glEnd; 2680 glEnd;
2435 2681
2436 glTranslate 2 - 0.375, 2 - 0.375; 2682 glTranslate 2 - 0.375, 2 - 0.375;
2683
2437 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2438} 2685}
2439 2686
2440############################################################################# 2687#############################################################################
2441 2688
… …
2446use CFClient::OpenGL; 2693use CFClient::OpenGL;
2447 2694
2448sub new { 2695sub new {
2449 my $class = shift; 2696 my $class = shift;
2450 2697
2451 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2452 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2453 @_, 2701 @_,
2454 ) 2702 );
2703
2704 if ($self->{anim} && $self->{animspeed}) {
2705 Scalar::Util::weaken (my $widget = $self);
2706
2707 $self->{timer} = Event->timer (
2708 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2709 hard => 1,
2710 interval => $self->{animspeed},
2711 cb => sub {
2712 ++$widget->{frame};
2713 $widget->update;
2714 },
2715 );
2716 }
2717
2718 $self
2455} 2719}
2456 2720
2457sub size_request { 2721sub size_request {
2458 (32, 8) 2722 (32, 8)
2459} 2723}
2460 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2461sub _draw { 2733sub _draw {
2462 my ($self) = @_; 2734 my ($self) = @_;
2463 2735
2464 return unless $::CONN;#d# manage and cache textures differently 2736 return unless $::CONN;
2737
2738 my $face;
2739
2740 if ($self->{frame}) {
2741 my $anim = $::CONN->{anim}[$self->{anim}];
2742
2743 $face = $anim->[ $self->{frame} % @$anim ]
2744 if $anim && @$anim;
2745 }
2746
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466 2748
2467 # TODO animation
2468 if ($tex) { 2749 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2474 } 2755 }
2475} 2756}
2476 2757
2477############################################################################# 2758sub DESTROY {
2759 my ($self) = @_;
2478 2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2765}
2766
2767#############################################################################
2768
2479package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2480 2770
2481our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2482 2772
2483sub new { 2773sub new {
2484 my $class = shift; 2774 my $class = shift;
2485 2775
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 ( 2776 my $self = $class->SUPER::new (
2496 can_hover => 1, 2777 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 @_, 2778 @_,
2555 ); 2779 );
2556 2780
2557 $self 2781 $self
2558} 2782}
… …
2568 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2569 } @$items; 2793 } @$items;
2570 2794
2571 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2572 2796
2797 my $row = 0;
2573 for my $item (@items) { 2798 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2 2799 CFClient::Item::update_widgets $item;
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577 2800
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2579 } 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2580 2804
2581 $self->{scrolled}->add (@items); 2805 $row++;
2582 2806 }
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584}
2585
2586sub size_request {
2587 my ($self) = @_;
2588 ($self->{req_w}, $self->{req_h});
2589} 2807}
2590 2808
2591############################################################################# 2809#############################################################################
2592 2810
2593package CFClient::UI::Menu; 2811package CFClient::UI::Menu;
… …
2628 2846
2629# popup given the event (must be a mouse button down event currently) 2847# popup given the event (must be a mouse button down event currently)
2630sub popup { 2848sub popup {
2631 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2632 2850
2633 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2634 2852
2635 # maybe save $GRAB? must be careful about events... 2853 # maybe save $GRAB? must be careful about events...
2636 $GRAB = $self; 2854 $GRAB = $self;
2637 $self->{button} = $ev->{button}; 2855 $self->{button} = $ev->{button};
2638 2856
… …
2653 2871
2654 if ($ev->{button} == $self->{button}) { 2872 if ($ev->{button} == $self->{button}) {
2655 undef $GRAB; 2873 undef $GRAB;
2656 $self->hide; 2874 $self->hide;
2657 2875
2658 $self->emit ("popdown"); 2876 $self->_emit ("popdown");
2659 $self->{hover}[1]->() if $self->{hover}; 2877 $self->{hover}[1]->() if $self->{hover};
2660 } 2878 }
2661} 2879}
2662 2880
2663############################################################################# 2881#############################################################################
2664 2882
2665package CFClient::UI::Statusbox; 2883package CFClient::UI::Statusbox;
2666 2884
2667our @ISA = CFClient::UI::VBox::; 2885our @ISA = CFClient::UI::VBox::;
2886
2887sub new {
2888 my $class = shift;
2889
2890 $class->SUPER::new (
2891 fontsize => 0.8,
2892 @_,
2893 )
2894}
2668 2895
2669sub reorder { 2896sub reorder {
2670 my ($self) = @_; 2897 my ($self) = @_;
2671 my $NOW = time; 2898 my $NOW = time;
2672 2899
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2918 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2919 : $item->{text};
2693 2920
2694 for ($short) { 2921 for ($short) {
2695 s/^\s+//; 2922 s/^\s+//;
2696 s/\012.*/…/s; 2923 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2924 }
2700 2925
2701 new CFClient::UI::Label 2926 new CFClient::UI::Label
2702 markup => $short, 2927 markup => $short,
2703 tooltip => $item->{tooltip}, 2928 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2929 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2930 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2931 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2933 fg => $item->{fg},
2708 can_events => 1, 2934 can_events => 1,
2709 can_hover => 1 2935 can_hover => 1
2710 }; 2936 };
2711 } 2937 }
2712 2938
… …
2717sub add { 2943sub add {
2718 my ($self, $text, %arg) = @_; 2944 my ($self, $text, %arg) = @_;
2719 2945
2720 $text =~ s/^\s+//; 2946 $text =~ s/^\s+//;
2721 $text =~ s/\s+$//; 2947 $text =~ s/\s+$//;
2948
2949 return unless $text;
2722 2950
2723 my $timeout = time + ((delete $arg{timeout}) || 60); 2951 my $timeout = time + ((delete $arg{timeout}) || 60);
2724 2952
2725 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726 2954
… …
2738 $self->{item}{$group} = { 2966 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2967 id => ++$self->{id},
2740 text => $text, 2968 text => $text,
2741 timeout => $timeout, 2969 timeout => $timeout,
2742 tooltip => $text, 2970 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2971 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2972 pri => 0,
2746 count => 1, 2973 count => 1,
2747 %arg, 2974 %arg,
2748 }; 2975 };
2749 } 2976 }
2750 2977
2751 $self->reorder; 2978 $self->reorder;
2752} 2979}
2753 2980
2981sub reconfigure {
2982 my ($self) = @_;
2983
2984 delete $_->{label}
2985 for values %{ $self->{item} || {} };
2986
2987 $self->reorder;
2988 $self->SUPER::reconfigure;
2989}
2990
2754############################################################################# 2991#############################################################################
2755 2992
2756package CFClient::UI::Root; 2993package CFClient::UI::Root;
2757 2994
2758our @ISA = CFClient::UI::Container::; 2995our @ISA = CFClient::UI::Container::;
… …
2760use CFClient::OpenGL; 2997use CFClient::OpenGL;
2761 2998
2762sub new { 2999sub new {
2763 my $class = shift; 3000 my $class = shift;
2764 3001
2765 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 visible => 1,
2766 @_, 3004 @_,
2767 ) 3005 );
3006
3007 Scalar::Util::weaken ($self->{root} = $self);
3008
3009 $self
2768} 3010}
2769 3011
2770sub configure { 3012sub configure {
2771 my ($self, $x, $y, $w, $h) = @_; 3013 my ($self, $x, $y, $w, $h) = @_;
2772 3014
2773 $self->{w} = $w; 3015 $self->{w} = $w;
2774 $self->{h} = $h; 3016 $self->{h} = $h;
2775} 3017}
2776 3018
2777sub check_size { 3019sub reconfigure {
2778 my ($self) = @_; 3020 my ($self) = @_;
2779 3021
3022 $self->SUPER::reconfigure;
3023
2780 $self->size_allocate ($self->{w}, $self->{h}) 3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
2781 if $self->{w}; 3025 if $self->{w};
2782} 3026}
2783 3027
2784sub size_request { 3028sub size_request {
2785 my ($self) = @_; 3029 my ($self) = @_;
2786 3030
2787 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
2788} 3032}
2789 3033
2790sub size_allocate { 3034sub size_allocate {
2791 my ($self, $w, $h) = @_; 3035 my ($self, $w, $h, $changed) = @_;
2792
2793 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 3036
2799 for my $child ($self->children) { 3037 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 3039
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3041 if exists $child->{req_x};
3042
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3044 if exists $child->{req_y};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050
2804 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2805 } 3052 }
2806} 3053}
2807 3054
2808sub coord2local { 3055sub coord2local {
… …
2818} 3065}
2819 3066
2820sub update { 3067sub update {
2821 my ($self) = @_; 3068 my ($self) = @_;
2822 3069
2823 $self->check_size;
2824 $::WANT_REFRESH++; 3070 $::WANT_REFRESH++;
2825} 3071}
2826 3072
2827sub add { 3073sub add {
2828 my ($self, $child) = @_; 3074 my ($self, @children) = @_;
2829 3075
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1;
3078
2830 # integerise window positions 3079 # integerise window positions
2831 $child->{x} = int $child->{x}; 3080 $child->{x} = int $child->{x};
2832 $child->{y} = int $child->{y}; 3081 $child->{y} = int $child->{y};
3082 }
2833 3083
2834 $self->SUPER::add ($child); 3084 $self->SUPER::add (@children);
3085}
3086
3087sub remove {
3088 my ($self, @children) = @_;
3089
3090 $self->SUPER::remove (@children);
3091
3092 while (@children) {
3093 my $w = pop @children;
3094 push @children, $w->children;
3095 $w->set_invisible;
3096 }
2835} 3097}
2836 3098
2837sub on_refresh { 3099sub on_refresh {
2838 my ($self, $id, $cb) = @_; 3100 my ($self, $id, $cb) = @_;
2839 3101
… …
2852 while ($self->{refresh_hook}) { 3114 while ($self->{refresh_hook}) {
2853 $_->() 3115 $_->()
2854 for values %{delete $self->{refresh_hook}}; 3116 for values %{delete $self->{refresh_hook}};
2855 } 3117 }
2856 3118
2857 if ($self->{check_size}) { 3119 if ($self->{realloc}) {
2858 my @queue = ([], []); 3120 my @queue;
2859 3121
2860 for (;;) { 3122 while () {
2861 if ($self->{check_size}) { 3123 if ($self->{realloc}) {
2862 # heuristic: check containers last 3124 #TODO use array-of-depth approach
2863 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3125
2864 for values %{delete $self->{check_size}} 3126 @queue = sort { $a->{visible} <=> $b->{visible} }
3127 @queue, values %{delete $self->{realloc}};
2865 } 3128 }
2866 3129
2867 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3130 my $widget = pop @queue || last;
2868 3131
3132 $widget->{visible} or last; # do not resize invisible widgets
3133
2869 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2870 ? @$widget{qw(user_w user_h)} 3135 ? @$widget{qw(def_w def_h)}
2871 : $widget->size_request; 3136 : $widget->size_request;
2872 3137
2873 if (delete $widget->{force_alloc}
2874 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2875 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2876 3139
2877 $widget->{req_w} = $w; 3140 $widget->{req_w} = $w;
2878 $widget->{req_h} = $h; 3141 $widget->{req_h} = $h;
2879 3142
2880 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2881 3144
2882 $widget->{parent}->check_size 3145 push @queue, $widget->{parent}
2883 if $widget->{parent}; 3146 if $widget->{parent};
2884 }
2885 } 3147 }
2886 } 3148 }
2887 3149
2888 while ($self->{size_alloc}) { 3150 while (my $size_alloc = delete $self->{size_alloc}) {
2889 for (values %{delete $self->{size_alloc}}) { 3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2890 my ($widget, $w, $h) = @$_; 3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
2891 3156
2892 $w = 0 if $w < 0; 3157 $w = 0 if $w < 0;
2893 $h = 0 if $h < 0; 3158 $h = 0 if $h < 0;
2894 3159
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3161
2895 $widget->{w} = $w; 3162 $widget->{w} = $w;
2896 $widget->{h} = $h; 3163 $widget->{h} = $h;
2897 $widget->size_allocate ($w, $h); 3164
2898 $widget->emit (size_allocate => $w, $h); 3165 $widget->emit (size_allocate => $w, $h, $changed);
2899 } 3166 }
2900 } 3167 }
2901 3168
2902 while ($self->{post_alloc_hook}) { 3169 while ($self->{post_alloc_hook}) {
2903 $_->() 3170 $_->()
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 3176 glClear GL_COLOR_BUFFER_BIT;
2910 3177
2911 glMatrixMode GL_PROJECTION; 3178 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 3179 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 3181 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 3182 glLoadIdentity;
2916 3183
2917 $self->_draw; 3184 $self->_draw;
2918} 3185}
… …
2920############################################################################# 3187#############################################################################
2921 3188
2922package CFClient::UI; 3189package CFClient::UI;
2923 3190
2924$ROOT = new CFClient::UI::Root; 3191$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3192$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3193
29271 31941
2928 3195

Diff Legend

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