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.273 by root, Sat Jun 3 02:32:35 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
… …
813package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
814 956
815our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
816 958
817sub new { 959sub new {
818 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
819 963
820 my $self; 964 my $self;
821 965
822 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
823 vertical => 1, 967 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 969 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 970 $self->{vp}->set_offset (0, $_[1]);
827 }, 971 },
828 ; 972 ;
829 973
830 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 976 slider => $slider,
833 @_, 977 %arg,
834 ); 978 );
835 979
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
839 982
840 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1000}
842 1001
843sub size_allocate { 1002sub size_allocate {
844 my ($self, $w, $h) = @_; 1003 my ($self, $w, $h) = @_;
845 1004
… …
898 1057
899our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
900 1059
901use CFClient::OpenGL; 1060use CFClient::OpenGL;
902 1061
903my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 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); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1069
907sub new { 1070sub new {
908 my $class = shift; 1071 my ($class, %arg) = @_;
909 1072
910 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
911 1074
912 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1078 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1079 can_events => 1,
918 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
919 ); 1083 );
920 1084
921 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
922 align => 0, 1086 align => 0,
923 valign => 1, 1087 valign => 1,
924 text => $self->{title}, 1088 text => $title,
925 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
926 1091
927 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1100}
929 1101
930sub border { 1102sub border {
931 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
932} 1104}
933 1105
934sub size_request { 1106sub size_request {
935 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
936 1111
937 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
938 1113
939 ( 1114 (
940 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
943} 1118}
944 1119
945sub size_allocate { 1120sub size_allocate {
946 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
947 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
948 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
950 1133
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); 1134 $self->child->configure ($border, $border, $w, $h);
955} 1135}
956 1136
957sub button_down { 1137sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
959 1139
… …
975 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
976 1156
977 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
979 1159
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size;
984 }; 1165 };
985 1166
986 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1171 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
992 1173
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
994 1175
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update;
997 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
998 } 1182 1
999} 1183}
1000 1184
1001sub button_up { 1185sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1003 1187
1004 delete $self->{motion}; 1188 !!delete $self->{motion}
1005} 1189}
1006 1190
1007sub mouse_motion { 1191sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1009 1193
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1011} 1197}
1012 1198
1013sub _draw { 1199sub _draw {
1014 my ($self) = @_; 1200 my ($self) = @_;
1015 1201
1202 my $child = $self->{children}[0];
1203
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1206
1019 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1209
1022 my $border = $self->border; 1210 my $border = $self->border;
1023 1211
1024 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1217
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1032 1220
1033 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1224 $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); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1226 }
1044 1227
1045 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1046 1229
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1050} 1236}
1051 1237
1052############################################################################# 1238#############################################################################
1053 1239
1054package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1062sub new { 1248sub new {
1063 my $class = shift; 1249 my $class = shift;
1064 1250
1065 $class->SUPER::new ( 1251 $class->SUPER::new (
1066 col_expand => [], 1252 col_expand => [],
1067 @_ 1253 @_,
1068 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1259}
1070 1260
1071sub add { 1261sub add {
1072 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1073 1263
1074 $child->set_parent ($self); 1264 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1076 1266
1077 $child->check_size; 1267 $self->realloc;
1078} 1268}
1079 1269
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1271sub clear {
1086 my ($self) = @_; 1272 my ($self) = @_;
1087 1273
1088 my @children = $self->children; 1274 my @children = $self->children;
1089 delete $self->{children}; 1275 delete $self->{children};
… …
1091 for (@children) { 1277 for (@children) {
1092 delete $_->{parent}; 1278 delete $_->{parent};
1093 $_->hide; 1279 $_->hide;
1094 } 1280 }
1095 1281
1096 $self->update; 1282 $self->realloc;
1097} 1283}
1098 1284
1099sub get_wh { 1285sub get_wh {
1100 my ($self) = @_; 1286 my ($self) = @_;
1101 1287
… …
1132sub size_allocate { 1318sub size_allocate {
1133 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1134 1320
1135 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1136 1322
1137 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1139 1325
1140 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1383 }
1198} 1384}
1199 1385
1200############################################################################# 1386#############################################################################
1201 1387
1202package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1389
1206our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1207 1391
1208sub size_request { 1392sub size_request {
1209 my ($self) = @_; 1393 my ($self) = @_;
1210 1394
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1212 1396 ? (
1213 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1399 )
1216 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1217} 1404}
1218 1405
1219sub size_allocate { 1406sub size_allocate {
1220 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1221 1408
1222 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1410 my $children = $self->{children};
1225 1411
1226 my @h = map $_->{req_w}, @$children; 1412 my @req;
1227 1413
1228 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1229 1415 @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 { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1429 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 } 1430 }
1244 } 1431 }
1245 1432
1246 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1247 1434
1248 my $y = 0; 1435 my $pos = 0;
1249 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1439
1254 $y += $h; 1440 $pos += $alloc;
1255 } 1441 }
1256 1442
1257 1 1443 1
1258} 1444}
1259 1445
1260############################################################################# 1446#############################################################################
1261 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1262package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1263 1464
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1267 1466
1268sub size_request { 1467sub new {
1269 my ($self) = @_; 1468 my $class = shift;
1270 1469
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1272 1471 vertical => 1,
1273 ( 1472 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1473 )
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} 1474}
1317 1475
1318############################################################################# 1476#############################################################################
1319 1477
1320package CFClient::UI::Label; 1478package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1495 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1339 fontsize => 1, 1497 fontsize => 1,
1340 align => -1, 1498 align => -1,
1341 valign => -1, 1499 valign => -1,
1342 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1343 can_events => 0, 1502 can_events => 0,
1344 %arg 1503 %arg
1345 ); 1504 );
1346 1505
1347 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1383 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1384 1543
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1387 1546
1547 $self->realloc;
1388 $self->update; 1548 $self->update;
1389 $self->check_size;
1390} 1549}
1391 1550
1392sub set_markup { 1551sub set_markup {
1393 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1394 1553
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1558
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1402 1561
1562 $self->realloc;
1403 $self->update; 1563 $self->update;
1404 $self->check_size;
1405} 1564}
1406 1565
1407sub size_request { 1566sub size_request {
1408 my ($self) = @_; 1567 my ($self) = @_;
1409 1568
… …
1423 1582
1424 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1426 } 1585 }
1427 1586
1428 ( 1587 ($w, $h)
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1588}
1433 1589
1434sub size_allocate { 1590sub size_allocate {
1435 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1436 1592
1593 delete $self->{ox};
1594
1437 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1597}
1439 1598
1440sub set_fontsize { 1599sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1442 1601
1443 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1603 delete $self->{texture};
1445 1604
1446 $self->update; 1605 $self->realloc;
1447 $self->check_size;
1448} 1606}
1449 1607
1450sub _draw { 1608sub _draw {
1451 my ($self) = @_; 1609 my ($self) = @_;
1452 1610
… …
1458 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1620
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1464 1623
1624 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1468 1628
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1632 };
1475 1633
1476 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1636
… …
1524 $self->{text} = $text; 1682 $self->{text} = $text;
1525 1683
1526 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1528 1686
1529 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1530} 1688}
1531 1689
1532sub set_text { 1690sub set_text {
1533 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1534 1692
1535 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1694 $self->_set_text ($text);
1537 $self->update; 1695
1538 $self->check_size; 1696 $self->realloc;
1539} 1697}
1540 1698
1541sub get_text { 1699sub get_text {
1542 $_[0]{text} 1700 $_[0]{text}
1543} 1701}
… …
1546 my ($self) = @_; 1704 my ($self) = @_;
1547 1705
1548 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1549 1707
1550 ($w + 1, $h) # add 1 for cursor 1708 ($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} 1709}
1558 1710
1559sub key_down { 1711sub key_down {
1560 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1561 1713
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1733 $self->_emit ('escape');
1582 } elsif ($uni) { 1734 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1584 } 1738 }
1585 1739
1586 $self->_set_text ($text); 1740 $self->_set_text ($text);
1587 $self->update; 1741
1588 $self->check_size; 1742 $self->realloc;
1743
1744 1
1589} 1745}
1590 1746
1591sub focus_in { 1747sub focus_in {
1592 my ($self) = @_; 1748 my ($self) = @_;
1593 1749
… …
1608 utf8::encode $text; 1764 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1610 1766
1611 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1612 $self->update; 1768 $self->update;
1769
1770 1
1613} 1771}
1614 1772
1615sub mouse_motion { 1773sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1618} 1778}
1619 1779
1620sub _draw { 1780sub _draw {
1621 my ($self) = @_; 1781 my ($self) = @_;
1622 1782
… …
1673 if ($sym == 13) { 1833 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1679 $self->update; 1839 $self->update;
1680 1840
1681 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1859 } else {
1700 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1701 } 1861 }
1702 1862
1703 } else { 1863 } else {
1704 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1705 } 1867 1
1706
1707} 1868}
1708 1869
1709############################################################################# 1870#############################################################################
1710 1871
1711package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1720 1881
1721sub new { 1882sub new {
1722 my $class = shift; 1883 my $class = shift;
1723 1884
1724 $class->SUPER::new ( 1885 $class->SUPER::new (
1725 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1726 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1728 can_hover => 1, 1890 can_hover => 1,
1729 align => 0, 1891 align => 0,
1730 valign => 0, 1892 valign => 0,
1731 can_events => 1, 1893 can_events => 1,
1732 @_ 1894 @_
1733 ) 1895 )
1734} 1896}
1735 1897
1898sub activate { }
1899
1736sub button_up { 1900sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1738 1902
1903 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1906
1742 } 1907 1
1743} 1908}
1744 1909
1745sub _draw { 1910sub _draw {
1746 my ($self) = @_; 1911 my ($self) = @_;
1747 1912
… …
1776 1941
1777sub new { 1942sub new {
1778 my $class = shift; 1943 my $class = shift;
1779 1944
1780 $class->SUPER::new ( 1945 $class->SUPER::new (
1781 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1782 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1952 state => 0,
… …
1790} 1956}
1791 1957
1792sub size_request { 1958sub size_request {
1793 my ($self) = @_; 1959 my ($self) = @_;
1794 1960
1795 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1796} 1962}
1797 1963
1798sub button_down { 1964sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1800 1966
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1805 } 1975 1
1806} 1976}
1807 1977
1808sub _draw { 1978sub _draw {
1809 my ($self) = @_; 1979 my ($self) = @_;
1810 1980
1811 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1812 1982
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 1984
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 1988
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 1990
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 1992
… …
2085 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2261 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2092 vertical => 0, 2264 vertical => 0,
2093 can_hover => 1, 2265 can_hover => 1,
2094 inner_pad => 0.02, 2266 inner_pad => 0.02,
2095 @_ 2267 @_
2096 ); 2268 );
… …
2099 $self->update; 2271 $self->update;
2100 2272
2101 $self 2273 $self
2102} 2274}
2103 2275
2276sub changed { }
2277
2104sub set_range { 2278sub set_range {
2105 my ($self, $range) = @_; 2279 my ($self, $range) = @_;
2106 2280
2107 $self->{range} = $range; 2281 ($range, $self->{range}) = ($self->{range}, $range);
2108 2282
2109 $self->update; 2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2110} 2285}
2111 2286
2112sub set_value { 2287sub set_value {
2113 my ($self, $value) = @_; 2288 my ($self, $value) = @_;
2114 2289
… …
2125 if $unit; 2300 if $unit;
2126 2301
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2303
2129 if ($value != $old_value) { 2304 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2305 $self->_emit (changed => $value);
2131 $self->update; 2306 $self->update;
2132 } 2307 }
2133} 2308}
2134 2309
2135sub size_request { 2310sub size_request {
2136 my ($self) = @_; 2311 my ($self) = @_;
2137 2312
2138 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2314}
2143 2315
2144sub button_down { 2316sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2146 2318
2147 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2148 2320
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2322
2151 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2152} 2324}
2153 2325
2154sub mouse_motion { 2326sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2156 2328
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2333
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2335
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2165 } 2341 1
2166} 2342}
2167 2343
2168sub update { 2344sub update {
2169 my ($self) = @_; 2345 my ($self) = @_;
2170 2346
… …
2497 2673
2498sub new { 2674sub new {
2499 my $class = shift; 2675 my $class = shift;
2500 2676
2501 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2502 state => 0, 2678 state => 0,
2503 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2504 @_ 2680 @_
2505 ); 2681 );
2506 2682
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2683 $self
2513} 2684}
2514 2685
2515sub toggle_flopper { 2686sub toggle_flopper {
2516 my ($self) = @_; 2687 my ($self) = @_;
2517 2688
2518 # TODO: use animation 2689 $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} 2690}
2530 2691
2531############################################################################# 2692#############################################################################
2532 2693
2533package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2546} 2707}
2547 2708
2548sub set_tooltip_from { 2709sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2550 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2551 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2724 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2726 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2738
2569sub size_allocate { 2739sub size_allocate {
2570 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2571 2741
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2573} 2761}
2574 2762
2575sub _draw { 2763sub _draw {
2576 my ($self) = @_; 2764 my ($self) = @_;
2577 2765
… …
2594 glVertex $w, $h; 2782 glVertex $w, $h;
2595 glVertex $w, 0; 2783 glVertex $w, 0;
2596 glEnd; 2784 glEnd;
2597 2785
2598 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2599 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2600} 2789}
2601 2790
2602############################################################################# 2791#############################################################################
2603 2792
… …
2609 2798
2610sub new { 2799sub new {
2611 my $class = shift; 2800 my $class = shift;
2612 2801
2613 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2614 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2615 @_, 2805 @_,
2616 ); 2806 );
2617 2807
2618 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2679} 2869}
2680 2870
2681############################################################################# 2871#############################################################################
2682 2872
2683package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2684 2874
2685our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2686 2876
2687sub _item_to_desc { 2877# 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 2878
2844############################################################################# 2879#############################################################################
2845 2880
2846package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2847 2882
… …
2881 2916
2882# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2883sub popup { 2918sub popup {
2884 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2885 2920
2886 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2887 2922
2888 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2924 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2891 2926
2892 $self->show; 2927 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2929}
2895 2930
2896sub mouse_motion { 2931sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2898 2933
2899 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2902} 2939}
2903 2940
2904sub button_up { 2941sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2906 2943
2907 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2945 undef $GRAB;
2909 $self->hide; 2946 $self->hide;
2910 2947
2911 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2913 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2914} 3063}
2915 3064
2916############################################################################# 3065#############################################################################
2917 3066
2918package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
2978sub add { 3127sub add {
2979 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
2980 3129
2981 $text =~ s/^\s+//; 3130 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
2983 3134
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 3136
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3138
… …
3021 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
3022} 3173}
3023 3174
3024############################################################################# 3175#############################################################################
3025 3176
3026package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
3027 3178
3028our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3180
3032sub new { 3181sub new {
3033 my $class = shift; 3182 my $class = shift;
3034 3183
3035 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3036 @_, 3426 @_,
3037 ) 3427 )
3038} 3428}
3039 3429
3040sub configure { 3430# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3049 3434
3050 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
3052} 3489}
3053 3490
3054sub size_request { 3491sub size_request {
3055 my ($self) = @_; 3492 my ($self) = @_;
3056 3493
3057 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3058} 3509}
3059 3510
3060sub size_allocate { 3511sub size_allocate {
3061 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
3062 3513
3063 for my $child ($self->children) { 3514 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3516
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3068 3519
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3521 $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 3522
3075 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
3076 } 3524 }
3077} 3525}
3078 3526
… …
3089} 3537}
3090 3538
3091sub update { 3539sub update {
3092 my ($self) = @_; 3540 my ($self) = @_;
3093 3541
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
3096} 3543}
3097 3544
3098sub add { 3545sub add {
3099 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
3100 3547
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; 3548 $_->{is_toplevel} = 1
3109 3549 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3550
3115 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3116} 3552}
3117 3553
3118sub remove { 3554sub remove {
3119 my ($self, @children) = @_; 3555 my ($self, @children) = @_;
3120 3556
3121 $self->SUPER::remove (@children); 3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3122 3561
3123 while (@children) { 3562 while (@children) {
3124 my $w = pop @children; 3563 my $w = pop @children;
3125 push @children, $w->children; 3564 push @children, $w->children;
3126 delete $w->{visible}; 3565 $w->set_invisible;
3127 } 3566 }
3128} 3567}
3129 3568
3130sub on_refresh { 3569sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
3146 $_->() 3585 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
3148 } 3587 }
3149 3588
3150 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
3151 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
3152 3593
3153 for (;;) { 3594 outer:
3154 if ($self->{check_size}) { 3595 while () {
3155 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3158 } 3604 }
3159 3605
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
3161 3608
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3610 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 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
3172 3629
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
3174 3631
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3177 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3178 } 3642 }
3179 } 3643 }
3180 3644
3181 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3653
3185 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3187 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3188 $widget->{w} = $w; 3664 $widget->{w} = $w;
3189 $widget->{h} = $h; 3665 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3666
3191 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3192 } 3669 }
3193 } 3670 }
3194 3671
3195 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3196 $_->() 3673 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3198 } 3675 }
3676
3199 3677
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3203 3681
… …
3205 glLoadIdentity; 3683 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3686 glLoadIdentity;
3209 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3210 $self->_draw; 3695 $self->_draw;
3211} 3696}
3212 3697
3213############################################################################# 3698#############################################################################
3214 3699

Diff Legend

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