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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
158sub rescale_widgets { 171sub rescale_widgets {
159 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
160 173
161 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
171 } 189 }
172 } 190 }
173 191
174 reconfigure_widgets; 192 reconfigure_widgets;
175} 193}
… …
184 202
185sub new { 203sub new {
186 my $class = shift; 204 my $class = shift;
187 205
188 my $self = bless { 206 my $self = bless {
189 x => 0, 207 x => "center",
190 y => 0, 208 y => "center",
191 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
192 can_events => 1, 212 can_events => 1,
193 @_ 213 @_
194 }, $class; 214 }, $class;
195 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
196 for (keys %$self) { 218 for (keys %$self) {
197 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
199 } 221 }
200 } 222 }
201 223
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
203 235
204 $self 236 $self
205} 237}
206 238
207sub destroy { 239sub destroy {
… …
211 %$self = (); 243 %$self = ();
212} 244}
213 245
214sub show { 246sub show {
215 my ($self) = @_; 247 my ($self) = @_;
248
216 return if $self->{parent}; 249 return if $self->{parent};
217 250
218 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
219} 252}
220 253
221sub show_centered { 254sub set_visible {
222 my ($self) = @_; 255 my ($self) = @_;
256
223 return if $self->{parent}; 257 return if $self->{visible};
224 258
225 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
226 261
227 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 263
234sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
235 my ($self) = @_; 270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
267 339
268sub configure { 340sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
270 342
271 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
274 348
275 # use alignment to adjust x, y 349 # use alignment to adjust x, y
276 350
277 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 353 }
282 354
283 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 356 $self->{x} = $x;
285 $self->{y} = $y; 357 $self->{y} = $y;
286 $self->update; 358 $self->update;
287 } 359 }
288 360
289 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
291 } 368 }
292} 369}
293 370
294sub size_allocate { 371sub size_allocate {
295 # nothing to be done 372 # nothing to be done
296} 373}
297 374
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
… …
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
313} 388}
314 389
315sub set_tooltip { 390sub set_tooltip {
316 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
317 397
318 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
319 399
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
343 return if $FOCUS == $self; 423 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
345 425
346 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
347 427
348 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
349 429
350 $focus->update if $focus; 430 $focus->update if $focus;
351 $FOCUS->update; 431 $FOCUS->update;
352} 432}
353 433
… …
356 436
357 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
358 438
359 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
360 440
361 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
362 442
363 $focus->update if $focus; #? 443 $focus->update if $focus; #?
364}
365 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
366sub mouse_motion { } 449sub mouse_motion { 0 }
367sub button_up { } 450sub button_up { 0 }
368sub key_down { } 451sub key_down { 0 }
369sub key_up { } 452sub key_up { 0 }
370 453
371sub button_down { 454sub button_down {
372 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
373 456
374 $self->focus_in; 457 $self->focus_in;
375}
376 458
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 535
383sub draw { 536sub draw {
384 my ($self) = @_; 537 my ($self) = @_;
385 538
386 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 550
388 glPushMatrix; 551 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw; 553 $self->_draw;
391 glPopMatrix; 554 glPopMatrix;
… …
403 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
404 glEnd; 567 glEnd;
405 glDisable GL_BLEND; 568 glDisable GL_BLEND;
406 } 569 }
407 570
408 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
409 glPushMatrix; 572 glPushMatrix;
410 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 576 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
417 glEnd; 580 glEnd;
418 glPopMatrix; 581 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 583 }
421} 584}
422 585
423sub _draw { 586sub _draw {
424 my ($self) = @_; 587 my ($self) = @_;
425 588
426 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
427}
428
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477} 590}
478 591
479sub DESTROY { 592sub DESTROY {
480 my ($self) = @_; 593 my ($self) = @_;
481 594
… …
539 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
541} 654}
542 655
543sub size_request { 656sub size_request {
544 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
545} 660}
546 661
547sub draw { } 662sub draw { }
548 663
549############################################################################# 664#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
554 669
555sub new { 670sub new {
556 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
557 672
558 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
559 674
560 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
561 children => [], 676 children => [],
562 can_events => 0, 677 can_events => 0,
563 %arg, 678 %arg,
564 ); 679 );
680
565 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
566 683
567 $self 684 $self
568} 685}
569 686
570sub add { 687sub add {
… …
578 $self->{children} = [ 695 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
581 ]; 698 ];
582 699
583 $self->check_size (1); 700 $self->realloc;
584 $self->update;
585} 701}
586 702
587sub children { 703sub children {
588 @{ $_[0]{children} } 704 @{ $_[0]{children} }
589} 705}
… …
594 delete $child->{parent}; 710 delete $child->{parent};
595 $child->hide; 711 $child->hide;
596 712
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 714
599 $self->check_size; 715 $self->realloc;
600 $self->update;
601} 716}
602 717
603sub clear { 718sub clear {
604 my ($self) = @_; 719 my ($self) = @_;
605 720
… …
609 for (@$children) { 724 for (@$children) {
610 delete $_->{parent}; 725 delete $_->{parent};
611 $_->hide; 726 $_->hide;
612 } 727 }
613 728
614 $self->check_size; 729 $self->realloc;
615 $self->update;
616} 730}
617 731
618sub find_widget { 732sub find_widget {
619 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
620 734
621 $x -= $self->{x}; 735 $x -= $self->{x};
622 $y -= $self->{y}; 736 $y -= $self->{y};
623 737
624 my $res; 738 my $res;
625 739
626 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
628 and return $res; 742 and return $res;
629 } 743 }
630 744
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 822 $self->update;
709} 823}
710 824
711sub _render { 825sub _render {
826 my ($self) = @_;
827
712 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
713} 829}
714 830
715sub render_child { 831sub render_child {
716 my ($self) = @_; 832 my ($self) = @_;
717 833
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
721 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
722 $self->_render; 845 $self->_render;
723 }; 846 };
724} 847}
725 848
726sub _draw { 849sub _draw {
727 my ($self) = @_; 850 my ($self) = @_;
728 851
729 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
730 853
731 my $tex = $self->{texture} 854 my $tex = $self->{texture}
732 or return; 855 or return;
733 856
734 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
744 867
745package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
746 869
747our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
748 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
749sub size_request { 882sub size_request {
750 my ($self) = @_; 883 my ($self) = @_;
751 884
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 886
754 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
755} 891}
756 892
757sub size_allocate { 893sub size_allocate {
758 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
759 895
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 896 my $child = $self->child;
761# $w = $self->{w}; 897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
762 $self->child->configure (0, 0, $cw, $ch); 901 $self->child->configure (0, 0, $w, $h);
763 $self->update; 902 $self->update;
764} 903}
765 904
766sub set_offset { 905sub set_offset {
767 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
801} 940}
802 941
803sub _render { 942sub _render {
804 my ($self) = @_; 943 my ($self) = @_;
805 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 949
808 $self->SUPER::_render; 950 $self->SUPER::_render;
809} 951}
810 952
… …
818 my $class = shift; 960 my $class = shift;
819 961
820 my $self; 962 my $self;
821 963
822 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
823 vertical => 1, 965 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 967 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 968 $self->{vp}->set_offset (0, $_[1]);
827 }, 969 },
828 ; 970 ;
829 971
830 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
… …
836 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
839 981
840 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 993}
842 994
843sub size_allocate { 995sub size_allocate {
844 my ($self, $w, $h) = @_; 996 my ($self, $w, $h) = @_;
845 997
… …
898 1050
899our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
900 1052
901use CFClient::OpenGL; 1053use CFClient::OpenGL;
902 1054
903my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1062
907sub new { 1063sub new {
908 my $class = shift; 1064 my ($class, %arg) = @_;
909 1065
910 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
911 1067
912 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1071 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1072 can_events => 1,
918 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
919 ); 1076 );
920 1077
921 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
922 align => 0, 1079 align => 0,
923 valign => 1, 1080 valign => 1,
924 text => $self->{title}, 1081 text => $title,
925 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
926 1084
927 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1093}
929 1094
930sub border { 1095sub border {
931 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
932} 1097}
933 1098
934sub size_request { 1099sub size_request {
935 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
936 1104
937 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
938 1106
939 ( 1107 (
940 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
943} 1111}
944 1112
945sub size_allocate { 1113sub size_allocate {
946 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
947 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
948 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
950 1126
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
955} 1128}
956 1129
957sub button_down { 1130sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
959 1132
… …
975 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
976 1149
977 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
979 1152
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size;
984 }; 1158 };
985 1159
986 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1164 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
992 1166
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
994 1168
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update;
997 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
998 } 1175 1
999} 1176}
1000 1177
1001sub button_up { 1178sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
1003 1180
1004 delete $self->{motion}; 1181 !!delete $self->{motion}
1005} 1182}
1006 1183
1007sub mouse_motion { 1184sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1009 1186
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
1011} 1190}
1012 1191
1013sub _draw { 1192sub _draw {
1014 my ($self) = @_; 1193 my ($self) = @_;
1015 1194
1195 my $child = $self->{children}[0];
1196
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1199
1019 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1202
1022 my $border = $self->border; 1203 my $border = $self->border;
1023 1204
1024 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1210
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1032 1213
1033 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1219 }
1044 1220
1045 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1046 1222
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1050} 1229}
1051 1230
1052############################################################################# 1231#############################################################################
1053 1232
1054package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1062sub new { 1241sub new {
1063 my $class = shift; 1242 my $class = shift;
1064 1243
1065 $class->SUPER::new ( 1244 $class->SUPER::new (
1066 col_expand => [], 1245 col_expand => [],
1067 @_ 1246 @_,
1068 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1252}
1070 1253
1071sub add { 1254sub add {
1072 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1073 1256
1074 $child->set_parent ($self); 1257 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1076 1259
1077 $child->check_size; 1260 $self->realloc;
1078} 1261}
1079 1262
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1264sub clear {
1086 my ($self) = @_; 1265 my ($self) = @_;
1087 1266
1088 my @children = $self->children; 1267 my @children = $self->children;
1089 delete $self->{children}; 1268 delete $self->{children};
… …
1091 for (@children) { 1270 for (@children) {
1092 delete $_->{parent}; 1271 delete $_->{parent};
1093 $_->hide; 1272 $_->hide;
1094 } 1273 }
1095 1274
1096 $self->update; 1275 $self->realloc;
1097} 1276}
1098 1277
1099sub get_wh { 1278sub get_wh {
1100 my ($self) = @_; 1279 my ($self) = @_;
1101 1280
… …
1132sub size_allocate { 1311sub size_allocate {
1133 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1134 1313
1135 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1136 1315
1137 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1139 1318
1140 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1376 }
1198} 1377}
1199 1378
1200############################################################################# 1379#############################################################################
1201 1380
1202package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1382
1206our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1207 1384
1208sub size_request { 1385sub size_request {
1209 my ($self) = @_; 1386 my ($self) = @_;
1210 1387
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1212 1389 ? (
1213 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1392 )
1216 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1217} 1397}
1218 1398
1219sub size_allocate { 1399sub size_allocate {
1220 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1221 1401
1222 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1403 my $children = $self->{children};
1225 1404
1226 my @h = map $_->{req_w}, @$children; 1405 my @req;
1227 1406
1228 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1229 1408 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1423 }
1244 } 1424 }
1245 1425
1246 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1247 1427
1248 my $y = 0; 1428 my $pos = 0;
1249 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1432
1254 $y += $h; 1433 $pos += $alloc;
1255 } 1434 }
1256 1435
1257 1 1436 1
1258} 1437}
1259 1438
1260############################################################################# 1439#############################################################################
1261 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1262package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1263 1457
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1267 1459
1268sub size_request { 1460sub new {
1269 my ($self) = @_; 1461 my $class = shift;
1270 1462
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1272 1464 vertical => 1,
1273 ( 1465 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1466 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1467}
1317 1468
1318############################################################################# 1469#############################################################################
1319 1470
1320package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1488 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1339 fontsize => 1, 1490 fontsize => 1,
1340 align => -1, 1491 align => -1,
1341 valign => -1, 1492 valign => -1,
1342 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1343 can_events => 0, 1495 can_events => 0,
1344 %arg 1496 %arg
1345 ); 1497 );
1346 1498
1347 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1383 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1384 1536
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1387 1539
1540 $self->realloc;
1388 $self->update; 1541 $self->update;
1389 $self->check_size;
1390} 1542}
1391 1543
1392sub set_markup { 1544sub set_markup {
1393 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1394 1546
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1551
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1402 1554
1555 $self->realloc;
1403 $self->update; 1556 $self->update;
1404 $self->check_size;
1405} 1557}
1406 1558
1407sub size_request { 1559sub size_request {
1408 my ($self) = @_; 1560 my ($self) = @_;
1409 1561
… …
1423 1575
1424 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1426 } 1578 }
1427 1579
1428 ( 1580 ($w, $h)
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1581}
1433 1582
1434sub size_allocate { 1583sub size_allocate {
1435 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1436 1585
1586 delete $self->{ox};
1587
1437 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1590}
1439 1591
1440sub set_fontsize { 1592sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1442 1594
1443 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1596 delete $self->{texture};
1445 1597
1446 $self->update; 1598 $self->realloc;
1447 $self->check_size;
1448} 1599}
1449 1600
1450sub _draw { 1601sub _draw {
1451 my ($self) = @_; 1602 my ($self) = @_;
1452 1603
… …
1458 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1613
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1464 1616
1617 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1468 1621
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1625 };
1475 1626
1476 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1629
… …
1524 $self->{text} = $text; 1675 $self->{text} = $text;
1525 1676
1526 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1528 1679
1529 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1530} 1681}
1531 1682
1532sub set_text { 1683sub set_text {
1533 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1534 1685
1535 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1687 $self->_set_text ($text);
1537 $self->update; 1688
1538 $self->check_size; 1689 $self->realloc;
1539} 1690}
1540 1691
1541sub get_text { 1692sub get_text {
1542 $_[0]{text} 1693 $_[0]{text}
1543} 1694}
… …
1546 my ($self) = @_; 1697 my ($self) = @_;
1547 1698
1548 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1549 1700
1550 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1702}
1558 1703
1559sub key_down { 1704sub key_down {
1560 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1561 1706
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1726 $self->_emit ('escape');
1582 } elsif ($uni) { 1727 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1584 } 1731 }
1585 1732
1586 $self->_set_text ($text); 1733 $self->_set_text ($text);
1587 $self->update; 1734
1588 $self->check_size; 1735 $self->realloc;
1736
1737 1
1589} 1738}
1590 1739
1591sub focus_in { 1740sub focus_in {
1592 my ($self) = @_; 1741 my ($self) = @_;
1593 1742
… …
1608 utf8::encode $text; 1757 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1610 1759
1611 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1612 $self->update; 1761 $self->update;
1762
1763 1
1613} 1764}
1614 1765
1615sub mouse_motion { 1766sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1618} 1771}
1619 1772
1620sub _draw { 1773sub _draw {
1621 my ($self) = @_; 1774 my ($self) = @_;
1622 1775
… …
1673 if ($sym == 13) { 1826 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1679 $self->update; 1832 $self->update;
1680 1833
1681 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1852 } else {
1700 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1701 } 1854 }
1702 1855
1703 } else { 1856 } else {
1704 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1705 } 1860 1
1706
1707} 1861}
1708 1862
1709############################################################################# 1863#############################################################################
1710 1864
1711package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1720 1874
1721sub new { 1875sub new {
1722 my $class = shift; 1876 my $class = shift;
1723 1877
1724 $class->SUPER::new ( 1878 $class->SUPER::new (
1725 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1726 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1728 can_hover => 1, 1883 can_hover => 1,
1729 align => 0, 1884 align => 0,
1730 valign => 0, 1885 valign => 0,
1731 can_events => 1, 1886 can_events => 1,
1732 @_ 1887 @_
1733 ) 1888 )
1734} 1889}
1735 1890
1891sub activate { }
1892
1736sub button_up { 1893sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1738 1895
1896 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1899
1742 } 1900 1
1743} 1901}
1744 1902
1745sub _draw { 1903sub _draw {
1746 my ($self) = @_; 1904 my ($self) = @_;
1747 1905
… …
1776 1934
1777sub new { 1935sub new {
1778 my $class = shift; 1936 my $class = shift;
1779 1937
1780 $class->SUPER::new ( 1938 $class->SUPER::new (
1781 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1782 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1945 state => 0,
… …
1790} 1949}
1791 1950
1792sub size_request { 1951sub size_request {
1793 my ($self) = @_; 1952 my ($self) = @_;
1794 1953
1795 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1796} 1955}
1797 1956
1798sub button_down { 1957sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1800 1959
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1805 } 1968 1
1806} 1969}
1807 1970
1808sub _draw { 1971sub _draw {
1809 my ($self) = @_; 1972 my ($self) = @_;
1810 1973
1811 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1812 1975
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 1977
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 1981
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 1983
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 1985
… …
2085 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2254 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2092 vertical => 0, 2257 vertical => 0,
2093 can_hover => 1, 2258 can_hover => 1,
2094 inner_pad => 0.02, 2259 inner_pad => 0.02,
2095 @_ 2260 @_
2096 ); 2261 );
… …
2099 $self->update; 2264 $self->update;
2100 2265
2101 $self 2266 $self
2102} 2267}
2103 2268
2269sub changed { }
2270
2104sub set_range { 2271sub set_range {
2105 my ($self, $range) = @_; 2272 my ($self, $range) = @_;
2106 2273
2107 $self->{range} = $range; 2274 ($range, $self->{range}) = ($self->{range}, $range);
2108 2275
2109 $self->update; 2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2110} 2278}
2111 2279
2112sub set_value { 2280sub set_value {
2113 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2114 2282
… …
2125 if $unit; 2293 if $unit;
2126 2294
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2296
2129 if ($value != $old_value) { 2297 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2131 $self->update; 2299 $self->update;
2132 } 2300 }
2133} 2301}
2134 2302
2135sub size_request { 2303sub size_request {
2136 my ($self) = @_; 2304 my ($self) = @_;
2137 2305
2138 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2307}
2143 2308
2144sub button_down { 2309sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2146 2311
2147 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2148 2313
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2315
2151 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2152} 2317}
2153 2318
2154sub mouse_motion { 2319sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2156 2321
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2326
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2328
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2165 } 2334 1
2166} 2335}
2167 2336
2168sub update { 2337sub update {
2169 my ($self) = @_; 2338 my ($self) = @_;
2170 2339
… …
2497 2666
2498sub new { 2667sub new {
2499 my $class = shift; 2668 my $class = shift;
2500 2669
2501 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2502 state => 0, 2671 state => 0,
2503 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2504 @_ 2673 @_
2505 ); 2674 );
2506 2675
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2676 $self
2513} 2677}
2514 2678
2515sub toggle_flopper { 2679sub toggle_flopper {
2516 my ($self) = @_; 2680 my ($self) = @_;
2517 2681
2518 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2683}
2530 2684
2531############################################################################# 2685#############################################################################
2532 2686
2533package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2546} 2700}
2547 2701
2548sub set_tooltip_from { 2702sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2550 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2551 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2717 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2719 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2731
2569sub size_allocate { 2732sub size_allocate {
2570 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2571 2734
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2573} 2754}
2574 2755
2575sub _draw { 2756sub _draw {
2576 my ($self) = @_; 2757 my ($self) = @_;
2577 2758
… …
2594 glVertex $w, $h; 2775 glVertex $w, $h;
2595 glVertex $w, 0; 2776 glVertex $w, 0;
2596 glEnd; 2777 glEnd;
2597 2778
2598 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2599 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2600} 2782}
2601 2783
2602############################################################################# 2784#############################################################################
2603 2785
… …
2609 2791
2610sub new { 2792sub new {
2611 my $class = shift; 2793 my $class = shift;
2612 2794
2613 my $self = $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2614 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2615 @_, 2798 @_,
2616 ); 2799 );
2617 2800
2618 if ($self->{anim} && $self->{animspeed}) { 2801 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2802 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2679} 2862}
2680 2863
2681############################################################################# 2864#############################################################################
2682 2865
2683package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2684 2867
2685our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2686 2869
2687sub _item_to_desc { 2870# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2871
2844############################################################################# 2872#############################################################################
2845 2873
2846package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2847 2875
… …
2881 2909
2882# popup given the event (must be a mouse button down event currently) 2910# popup given the event (must be a mouse button down event currently)
2883sub popup { 2911sub popup {
2884 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2885 2913
2886 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2887 2915
2888 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2917 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2891 2919
2892 $self->show; 2920 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2922}
2895 2923
2896sub mouse_motion { 2924sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2898 2926
2899 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2902} 2932}
2903 2933
2904sub button_up { 2934sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2906 2936
2907 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2938 undef $GRAB;
2909 $self->hide; 2939 $self->hide;
2910 2940
2911 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2913 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2914} 3054}
2915 3055
2916############################################################################# 3056#############################################################################
2917 3057
2918package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2978sub add { 3118sub add {
2979 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2980 3120
2981 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2983 3125
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 3127
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3129
… …
3021 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
3022} 3164}
3023 3165
3024############################################################################# 3166#############################################################################
3025 3167
3026package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
3027 3169
3028our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3171
3032sub new { 3172sub new {
3033 my $class = shift; 3173 my $class = shift;
3034 3174
3035 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3036 @_, 3418 @_,
3037 ) 3419 )
3038} 3420}
3039 3421
3040sub configure { 3422# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3049 3426
3050 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
3052} 3481}
3053 3482
3054sub size_request { 3483sub size_request {
3055 my ($self) = @_; 3484 my ($self) = @_;
3056 3485
3057 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
3058} 3501}
3059 3502
3060sub size_allocate { 3503sub size_allocate {
3061 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3062 3505
3063 for my $child ($self->children) { 3506 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3508
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
3068 3511
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3514
3075 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
3076 } 3516 }
3077} 3517}
3078 3518
… …
3089} 3529}
3090 3530
3091sub update { 3531sub update {
3092 my ($self) = @_; 3532 my ($self) = @_;
3093 3533
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
3096} 3535}
3097 3536
3098sub add { 3537sub add {
3099 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
3100 3539
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3540 $_->{is_toplevel} = 1
3109 3541 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3542
3115 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3116} 3544}
3117 3545
3118sub remove { 3546sub remove {
3119 my ($self, @children) = @_; 3547 my ($self, @children) = @_;
3120 3548
3121 $self->SUPER::remove (@children); 3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3122 3553
3123 while (@children) { 3554 while (@children) {
3124 my $w = pop @children; 3555 my $w = pop @children;
3125 push @children, $w->children; 3556 push @children, $w->children;
3126 delete $w->{visible}; 3557 $w->set_invisible;
3127 } 3558 }
3128} 3559}
3129 3560
3130sub on_refresh { 3561sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3146 $_->() 3577 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3148 } 3579 }
3149 3580
3150 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3151 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
3152 3585
3153 for (;;) { 3586 outer:
3154 if ($self->{check_size}) { 3587 while () {
3155 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3158 } 3596 }
3159 3597
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
3161 3600
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3602 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3172 3621
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3174 3623
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3177 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3178 } 3634 }
3179 } 3635 }
3180 3636
3181 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3645
3185 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3187 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3188 $widget->{w} = $w; 3656 $widget->{w} = $w;
3189 $widget->{h} = $h; 3657 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3658
3191 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3192 } 3661 }
3193 } 3662 }
3194 3663
3195 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3196 $_->() 3665 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3198 } 3667 }
3668
3199 3669
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3203 3673
… …
3205 glLoadIdentity; 3675 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3678 glLoadIdentity;
3209 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3210 $self->_draw; 3687 $self->_draw;
3211} 3688}
3212 3689
3213############################################################################# 3690#############################################################################
3214 3691

Diff Legend

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