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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines