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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 return unless $self->{visible}; 273 return unless $self->{visible};
259 274
260 # broken show/hide model 275 $_->set_invisible for $self->children;
261 276
277 delete $self->{visible};
262 delete $self->{root}; 278 delete $self->{root};
263 delete $self->{visible};
264 279
265 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
267 282
268 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
270 285
271 $self->focus_out; 286 $self->focus_out;
272 287
273 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
274} 306}
275 307
276sub hide { 308sub hide {
277 my ($self) = @_; 309 my ($self) = @_;
278 310
… …
280 312
281 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
282 if $self->{parent}; 314 if $self->{parent};
283} 315}
284 316
285sub move { 317sub move_abs {
286 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
287 319
288 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
289 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
290 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
291 323
292 $self->update; 324 $self->update;
293} 325}
294 326
295sub set_size { 327sub set_size {
296 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
297 329
298 $self->{user_w} = $w; 330 $self->{force_w} = $w;
299 $self->{user_h} = $h; 331 $self->{force_h} = $h;
300 332
301 $self->check_size; 333 $self->realloc;
302} 334}
303 335
304sub size_request { 336sub size_request {
305 require Carp; 337 require Carp;
306 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
308 340
309sub configure { 341sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
311 343
312 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
315 349
316 # use alignment to adjust x, y 350 # use alignment to adjust x, y
317 351
318 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 354 }
323 355
324 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 357 $self->{x} = $x;
326 $self->{y} = $y; 358 $self->{y} = $y;
327 $self->update; 359 $self->update;
328 } 360 }
329 361
330 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
332 } 369 }
333} 370}
334 371
335sub size_allocate { 372sub size_allocate {
336 # nothing to be done 373 # nothing to be done
337} 374}
338 375
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
347} 382}
348 383
349sub set_max_size { 384sub set_max_size {
350 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
351 386
352 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
354} 391}
355 392
356sub set_tooltip { 393sub set_tooltip {
357 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
358 395
… …
363 400
364 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
365 402
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
369 } 406 }
370} 407}
371 408
372# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
373sub coord2local { 410sub coord2local {
… …
410 447
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS; 449 unless $FOCUS;
413} 450}
414 451
415sub mouse_motion { } 452sub mouse_motion { 0 }
416sub button_up { } 453sub button_up { 0 }
417sub key_down { } 454sub key_down { 0 }
418sub key_up { } 455sub key_up { 0 }
419 456
420sub button_down { 457sub button_down {
421 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
422 459
423 $self->focus_in; 460 $self->focus_in;
424}
425 461
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
430sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
431 538
432sub draw { 539sub draw {
433 my ($self) = @_; 540 my ($self) = @_;
434 541
435 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
436 553
437 glPushMatrix; 554 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 556
442 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 559 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 561 glBegin GL_QUADS;
449 glVertex $x , $y; 562 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
453 glEnd; 566 glEnd;
454 glDisable GL_BLEND; 567 glDisable GL_BLEND;
455 } 568 }
456 569
457 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 571 glPushMatrix;
459 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 575 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
466 glEnd; 579 glEnd;
467 glPopMatrix; 580 glPopMatrix;
468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
469 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
470} 586}
471 587
472sub _draw { 588sub _draw {
473 my ($self) = @_; 589 my ($self) = @_;
474 590
475 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
476} 592}
477 593
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545}
546
547sub DESTROY { 594sub DESTROY {
548 my ($self) = @_; 595 my ($self) = @_;
549 596
550 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
551 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
552} 601}
553 602
554############################################################################# 603#############################################################################
555 604
556package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
581 630
582 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
584 633
585 glEnable GL_BLEND; 634 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 636 glColor_premultiply @$color;
588 637
589 glBegin GL_QUADS; 638 glBegin GL_QUADS;
590 glVertex 0 , 0; 639 glVertex 0 , 0;
591 glVertex 0 , $h; 640 glVertex 0 , $h;
592 glVertex $w, $h; 641 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
609} 658}
610 659
611sub size_request { 660sub size_request {
612 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
613} 664}
614 665
615sub draw { } 666sub draw { }
616 667
617############################################################################# 668#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
622 673
623sub new { 674sub new {
624 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
625 676
626 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
627 678
628 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
629 children => [], 680 children => [],
630 can_events => 0, 681 can_events => 0,
631 %arg, 682 %arg,
632 ); 683 );
684
633 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
634 687
635 $self 688 $self
636} 689}
637 690
638sub add { 691sub add {
… …
646 $self->{children} = [ 699 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
649 ]; 702 ];
650 703
651 $self->check_size (1); 704 $self->realloc;
652 $self->update;
653} 705}
654 706
655sub children { 707sub children {
656 @{ $_[0]{children} } 708 @{ $_[0]{children} }
657} 709}
… …
662 delete $child->{parent}; 714 delete $child->{parent};
663 $child->hide; 715 $child->hide;
664 716
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 718
667 $self->check_size (1); 719 $self->realloc;
668 $self->update;
669} 720}
670 721
671sub clear { 722sub clear {
672 my ($self) = @_; 723 my ($self) = @_;
673 724
… …
677 for (@$children) { 728 for (@$children) {
678 delete $_->{parent}; 729 delete $_->{parent};
679 $_->hide; 730 $_->hide;
680 } 731 }
681 732
682 $self->check_size; 733 $self->realloc;
683 $self->update;
684} 734}
685 735
686sub find_widget { 736sub find_widget {
687 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
688 738
689 $x -= $self->{x}; 739 $x -= $self->{x};
690 $y -= $self->{y}; 740 $y -= $self->{y};
691 741
692 my $res; 742 my $res;
693 743
694 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
696 and return $res; 746 and return $res;
697 } 747 }
698 748
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
720} 770}
721 771
722sub add { 772sub add {
723 my ($self, $child) = @_; 773 my ($self, $child) = @_;
724 774
725 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
726
727 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
728} 777}
729 778
730sub remove { 779sub remove {
731 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
749} 798}
750 799
751############################################################################# 800#############################################################################
752 801
802# back-buffered drawing area
803
753package CFClient::UI::Window; 804package CFClient::UI::Window;
754 805
755our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
756 807
757use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 827 $self->update;
777} 828}
778 829
779sub _render { 830sub _render {
831 my ($self) = @_;
832
780 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
781} 834}
782 835
783sub render_child { 836sub render_child {
784 my ($self) = @_; 837 my ($self) = @_;
785 838
786 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
789 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
790 $self->_render; 850 $self->_render;
791 }; 851 };
792} 852}
793 853
794sub _draw { 854sub _draw {
795 my ($self) = @_; 855 my ($self) = @_;
796 856
797 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
798 858
799 my $tex = $self->{texture} 859 my $tex = $self->{texture}
800 or return; 860 or return;
801 861
802 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
805 865
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 867
808 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
809} 869}
… …
825} 885}
826 886
827sub size_request { 887sub size_request {
828 my ($self) = @_; 888 my ($self) = @_;
829 889
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 891
832 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
833} 896}
834 897
835sub size_allocate { 898sub size_allocate {
836 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
837 900
901 my $child = $self->child;
902
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 905
841 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
842 $self->update; 907 $self->update;
843} 908}
844 909
… …
880} 945}
881 946
882sub _render { 947sub _render {
883 my ($self) = @_; 948 my ($self) = @_;
884 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 954
887 $self->SUPER::_render; 955 $self->SUPER::_render;
888} 956}
889 957
… …
892package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
893 961
894our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
895 963
896sub new { 964sub new {
897 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
898 968
899 my $self; 969 my $self;
900 970
901 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
902 vertical => 1, 972 vertical => 1,
… …
907 ; 977 ;
908 978
909 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 981 slider => $slider,
912 @_, 982 %arg,
913 ); 983 );
914 984
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
918 987
919 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
920} 995}
921 996
922sub update { 997sub update {
923 my ($self) = @_; 998 my ($self) = @_;
924 999
… …
963 1038
964 if ($self->{bg}) { 1039 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
966 1041
967 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
970 1045
971 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
972 glVertex 0 , 0; 1047 glVertex 0 , 0;
973 glVertex 0 , $h; 1048 glVertex 0 , $h;
974 glVertex $w, $h; 1049 glVertex $w, $h;
… …
987 1062
988our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
989 1064
990use CFClient::OpenGL; 1065use CFClient::OpenGL;
991 1066
992my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995 1074
996sub new { 1075sub new {
997 my $class = shift; 1076 my ($class, %arg) = @_;
998
999 # TODO: user_x, user_y, overwrite moveto?
1000 1077
1001 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1081 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1082 can_events => 1,
1007 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1008 ); 1086 );
1009 1087
1010 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1011 align => 0, 1089 align => 0,
1012 valign => 1, 1090 valign => 1,
1013 text => $self->{title}, 1091 text => $self->{title},
1014 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1015 1094
1016 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1017} 1103}
1018 1104
1019sub border { 1105sub border {
1020 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1021} 1107}
1022 1108
1023sub size_request { 1109sub size_request {
1024 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1025 1114
1026 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1027 1116
1028 ( 1117 (
1029 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1032} 1121}
1033 1122
1034sub size_allocate { 1123sub size_allocate {
1035 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1036 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1037 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1039 1136
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1044} 1138}
1045 1139
1046sub button_down { 1140sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1048 1142
… …
1064 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1065 1159
1066 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1068 1162
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1165
1074 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1075 }; 1168 };
1076 1169
1077 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1174 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1083 1176
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1178
1086 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1091 } 1187 1
1092} 1188}
1093 1189
1094sub button_up { 1190sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1096 1192
1097 delete $self->{motion}; 1193 !!delete $self->{motion}
1098} 1194}
1099 1195
1100sub mouse_motion { 1196sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1102 1198
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1104} 1202}
1105 1203
1106sub _draw { 1204sub _draw {
1107 my ($self) = @_; 1205 my ($self) = @_;
1108 1206
1207 my $child = $self->{children}[0];
1208
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1211
1112 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1214
1115 my $border = $self->border; 1215 my $border = $self->border;
1116 1216
1117 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1222
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1125 1225
1126 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1231 }
1137 1232
1138 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1139 1234
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1143} 1241}
1144 1242
1145############################################################################# 1243#############################################################################
1146 1244
1147package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1170 1268
1171 $child->set_parent ($self); 1269 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1173 1271
1174 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1175} 1279}
1176 1280
1177# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1178sub clear { 1282sub clear {
1179 my ($self) = @_; 1283 my ($self) = @_;
… …
1184 for (@children) { 1288 for (@children) {
1185 delete $_->{parent}; 1289 delete $_->{parent};
1186 $_->hide; 1290 $_->hide;
1187 } 1291 }
1188 1292
1189 $self->check_size (1); 1293 $self->realloc;
1190 $self->update;
1191} 1294}
1192 1295
1193sub get_wh { 1296sub get_wh {
1194 my ($self) = @_; 1297 my ($self) = @_;
1195 1298
… …
1291 } 1394 }
1292} 1395}
1293 1396
1294############################################################################# 1397#############################################################################
1295 1398
1296package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1400
1300our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1301 1402
1302sub size_request { 1403sub size_request {
1303 my ($self) = @_; 1404 my ($self) = @_;
1304 1405
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1306 1407 ? (
1307 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1410 )
1310 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1311} 1415}
1312 1416
1313sub size_allocate { 1417sub size_allocate {
1314 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1315 1419
1316 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1421 my $children = $self->{children};
1319 1422
1320 my @h = map $_->{req_w}, @$children; 1423 my @req;
1321 1424
1322 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1323 1426 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1441 }
1338 } 1442 }
1339 1443
1340 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1341 1445
1342 my $y = 0; 1446 my $pos = 0;
1343 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1450
1348 $y += $h; 1451 $pos += $alloc;
1349 } 1452 }
1350 1453
1351 1 1454 1
1352} 1455}
1353 1456
1354############################################################################# 1457#############################################################################
1355 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1356package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1357 1475
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1361 1477
1362sub size_request { 1478sub new {
1363 my ($self) = @_; 1479 my $class = shift;
1364 1480
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1366 1482 vertical => 1,
1367 ( 1483 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1484 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1485}
1411 1486
1412############################################################################# 1487#############################################################################
1413 1488
1414package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1506 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1433 fontsize => 1, 1508 fontsize => 1,
1434 align => -1, 1509 align => -1,
1435 valign => -1, 1510 valign => -1,
1436 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1437 can_events => 0, 1513 can_events => 0,
1438 %arg 1514 %arg
1439 ); 1515 );
1440 1516
1441 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1468 1544
1469 delete $self->{texture}; 1545 delete $self->{texture};
1470 $self->SUPER::update; 1546 $self->SUPER::update;
1471} 1547}
1472 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1473sub set_text { 1556sub set_text {
1474 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1475 1558
1476 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1478 1561
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1481 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1482 $self->update; 1567 $self->update;
1483 $self->check_size;
1484} 1568}
1485 1569
1486sub set_markup { 1570sub set_markup {
1487 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1488 1572
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1577
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1496 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1497 $self->update; 1583 $self->update;
1498 $self->check_size;
1499} 1584}
1500 1585
1501sub size_request { 1586sub size_request {
1502 my ($self) = @_; 1587 my ($self) = @_;
1503 1588
1589 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1595
1510 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1511 1597
1512 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1601
1516 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1517 1603
1518 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1520 } 1609 };
1521 1610
1522 ( 1611 @{ $self->{size_req} }
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1612}
1527 1613
1528sub size_allocate { 1614sub size_allocate {
1529 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1530 1616
1617 delete $self->{ox};
1618
1531 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1621}
1533 1622
1534sub set_fontsize { 1623sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1536 1625
1537 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1627 delete $self->{texture};
1539 1628
1540 $self->update; 1629 $self->realloc;
1541 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1542} 1638}
1543 1639
1544sub _draw { 1640sub _draw {
1545 my ($self) = @_; 1641 my ($self) = @_;
1546 1642
… …
1552 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1652
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1558 1655
1656 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1562 1660
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1664 };
1569 1665
1570 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1572 1670
1573 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1574 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1576 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1578 } 1678 }
1579 1679
1580 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1581} 1681}
1582 1682
… …
1599 can_hover => 1, 1699 can_hover => 1,
1600 can_focus => 1, 1700 can_focus => 1,
1601 valign => 0, 1701 valign => 0,
1602 can_events => 1, 1702 can_events => 1,
1603 #text => ... 1703 #text => ...
1704 #hidden => "*",
1604 @_ 1705 @_
1605 ) 1706 )
1606} 1707}
1607 1708
1608sub _set_text { 1709sub _set_text {
… …
1610 1711
1611 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1612 1713
1613 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1614 1715
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1717 $self->{text} = $text;
1619 1718
1620 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1622 1722
1623 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1624} 1727}
1625 1728
1626sub set_text { 1729sub set_text {
1627 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1628 1731
1629 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1733 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633} 1734}
1634 1735
1635sub get_text { 1736sub get_text {
1636 $_[0]{text} 1737 $_[0]{text}
1637} 1738}
… …
1667 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1670 } elsif ($uni) { 1771 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1672 } 1775 }
1673 1776
1674 $self->_set_text ($text); 1777 $self->_set_text ($text);
1675 $self->update; 1778
1676 $self->check_size; 1779 $self->realloc;
1780
1781 1
1677} 1782}
1678 1783
1679sub focus_in { 1784sub focus_in {
1680 my ($self) = @_; 1785 my ($self) = @_;
1681 1786
… …
1696 utf8::encode $text; 1801 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1698 1803
1699 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1700 $self->update; 1805 $self->update;
1806
1807 1
1701} 1808}
1702 1809
1703sub mouse_motion { 1810sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1705# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1706} 1815}
1707 1816
1708sub _draw { 1817sub _draw {
1709 my ($self) = @_; 1818 my ($self) = @_;
1710 1819
1711 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1712 1821
1713 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1716 } else { 1825 } else {
1717 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1718 } 1827 }
1719 1828
1720 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1832 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1787 } else { 1896 } else {
1788 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1789 } 1898 }
1790 1899
1791 } else { 1900 } else {
1792 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1793 } 1904 1
1794
1795} 1905}
1796 1906
1797############################################################################# 1907#############################################################################
1798 1908
1799package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1808 1918
1809sub new { 1919sub new {
1810 my $class = shift; 1920 my $class = shift;
1811 1921
1812 $class->SUPER::new ( 1922 $class->SUPER::new (
1813 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1814 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1816 can_hover => 1, 1927 can_hover => 1,
1817 align => 0, 1928 align => 0,
1818 valign => 0, 1929 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1828 1939
1829 $self->emit ("activate") 1940 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1832} 1945}
1833 1946
1834sub _draw { 1947sub _draw {
1835 my ($self) = @_; 1948 my ($self) = @_;
1836 1949
1837 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1951
1843 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1846 1955
… …
1865 1974
1866sub new { 1975sub new {
1867 my $class = shift; 1976 my $class = shift;
1868 1977
1869 $class->SUPER::new ( 1978 $class->SUPER::new (
1870 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1871 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1985 state => 0,
… …
1879} 1989}
1880 1990
1881sub size_request { 1991sub size_request {
1882 my ($self) = @_; 1992 my ($self) = @_;
1883 1993
1884 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1885} 1995}
1886 1996
1887sub button_down { 1997sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1889 1999
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1894 } 2008 1
1895} 2009}
1896 2010
1897sub _draw { 2011sub _draw {
1898 my ($self) = @_; 2012 my ($self) = @_;
1899 2013
1900 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1901 2015
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 2017
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 2021
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 2023
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 2025
… …
2064 2180
2065 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2067 2183
2068 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2189
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2181 vertical => 0, 2298 vertical => 0,
2182 can_hover => 1, 2299 can_hover => 1,
2183 inner_pad => 0.02, 2300 inner_pad => 0.02,
2184 @_ 2301 @_
2185 ); 2302 );
… …
2188 $self->update; 2305 $self->update;
2189 2306
2190 $self 2307 $self
2191} 2308}
2192 2309
2310sub changed { }
2311
2193sub set_range { 2312sub set_range {
2194 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2195 2314
2196 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2197 2316
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2200} 2321}
2201 2322
2202sub set_value { 2323sub set_value {
2203 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2204 2325
… …
2223} 2344}
2224 2345
2225sub size_request { 2346sub size_request {
2226 my ($self) = @_; 2347 my ($self) = @_;
2227 2348
2228 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2350}
2233 2351
2234sub button_down { 2352sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2236 2354
2237 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2238 2356
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2358
2241 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2242} 2360}
2243 2361
2244sub mouse_motion { 2362sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2246 2364
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2369
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2371
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2255 } 2377 1
2256} 2378}
2257 2379
2258sub update { 2380sub update {
2259 my ($self) = @_; 2381 my ($self) = @_;
2260 2382
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2263 2392
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2266 2395
… …
2272 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2274 2403
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2277 }); 2406 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2407
2285 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2286 2409
2287 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2288 2411
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2351 2474
2352############################################################################# 2475#############################################################################
2353 2476
2354package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2355 2478
2356our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2357 2480
2358use CFClient::OpenGL; 2481use CFClient::OpenGL;
2359 2482
… …
2361 my $class = shift; 2484 my $class = shift;
2362 2485
2363 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2364 fontsize => 1, 2487 fontsize => 1,
2365 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2366 #font => default_font 2490 #font => default_font
2367 @_, 2491 @_,
2368 2492
2369 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2370 par => [], 2494 par => [],
… …
2393 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2394 2518
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 2523
2399 $self->reflow; 2524 $self->reflow;
2400} 2525}
2401 2526
2402sub text_size { 2527sub text_size {
… …
2404 2529
2405 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2406 2531
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2410 2536
2411 $layout->size 2537 $layout->size
2412} 2538}
2413 2539
… …
2452 2578
2453 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2454 2580
2455 delete $self->{texture}; 2581 delete $self->{texture};
2456 2582
2457 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2585
2460 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2587 my $height = 0;
2462 2588
… …
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2592
2467 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2600 $_->[1] = $h;
2474 } 2601 }
… …
2477 } 2604 }
2478 2605
2479 $self->{height} = $height; 2606 $self->{height} = $height;
2480 2607
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2482 2609
2483 delete $self->{texture}; 2610 delete $self->{texture};
2484 } 2611 }
2485 2612
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2489 2616
2490 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2491 2618
2492 my $y0 = $top; 2619 my $y0 = $top;
… …
2506 my $h = $par->[1]; 2633 my $h = $par->[1];
2507 2634
2508 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2512 2640
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2642
2515 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2527sub _draw { 2655sub _draw {
2528 my ($self) = @_; 2656 my ($self) = @_;
2529 2657
2530 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2535 2663
2536 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2537 2665
2538} 2666}
… …
2592 state => 0, 2720 state => 0,
2593 on_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2594 @_ 2722 @_
2595 ); 2723 );
2596 2724
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2725 $self
2603} 2726}
2604 2727
2605sub toggle_flopper { 2728sub toggle_flopper {
2606 my ($self) = @_; 2729 my ($self) = @_;
2607 2730
2608 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2732}
2620 2733
2621############################################################################# 2734#############################################################################
2622 2735
2623package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2636} 2749}
2637 2750
2638sub set_tooltip_from { 2751sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2640 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2641 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2769 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2771 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2783
2659sub size_allocate { 2784sub size_allocate {
2660 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2661 2786
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2663} 2806}
2664 2807
2665sub _draw { 2808sub _draw {
2666 my ($self) = @_; 2809 my ($self) = @_;
2667 2810
… …
2684 glVertex $w, $h; 2827 glVertex $w, $h;
2685 glVertex $w, 0; 2828 glVertex $w, 0;
2686 glEnd; 2829 glEnd;
2687 2830
2688 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2689 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2690} 2834}
2691 2835
2692############################################################################# 2836#############################################################################
2693 2837
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2897
2754 if ($tex) { 2898 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2760 } 2904 }
2761} 2905}
2762 2906
2763sub DESTROY { 2907sub destroy {
2764 my ($self) = @_; 2908 my ($self) = @_;
2765 2909
2766 $self->{timer}->cancel 2910 $self->{timer}->cancel
2767 if $self->{timer}; 2911 if $self->{timer};
2768 2912
2769 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2770} 2914}
2771 2915
2772############################################################################# 2916#############################################################################
2773 2917
2774package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2775 2919
2776our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2777 2921
2778sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2923
2819############################################################################# 2924#############################################################################
2820 2925
2821package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2822 2927
… …
2834 ); 2939 );
2835 2940
2836 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2837 2942
2838 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2839 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2840 2945
2841 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2842 if (!ref $widget) { 2947 if (!ref $widget) {
2843 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2844 can_hover => 1, 2949 can_hover => 1,
2845 can_events => 1, 2950 can_events => 1,
2846 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2847 } 2953 }
2848 2954
2849 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2850 2956
2851 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2863 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2970 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2866 2972
2867 $self->show; 2973 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 2975}
2870 2976
2871sub mouse_motion { 2977sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2873 2979
2874 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2877} 2985}
2878 2986
2879sub button_up { 2987sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2881 2989
… …
2883 undef $GRAB; 2991 undef $GRAB;
2884 $self->hide; 2992 $self->hide;
2885 2993
2886 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2888 } 3000 1
2889} 3001}
2890 3002
2891############################################################################# 3003#############################################################################
2892 3004
2893package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2894 3006
2895our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2896 3008
2897sub new { 3009sub new {
2898 my $class = shift; 3010 my $class = shift;
2899 3011
2900 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2901 fontsize => 0.8, 3177 fontsize => 0.8,
2902 @_, 3178 @_,
2903 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2904} 3186}
2905 3187
2906sub reorder { 3188sub reorder {
2907 my ($self) = @_; 3189 my ($self) = @_;
2908 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2909 3196
2910 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 } 3199 }
2913 3200
… …
2916 my @items = sort { 3203 my @items = sort {
2917 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2920 3207
3208 $self->{timer}->interval (1);
3209
2921 my $count = 10 + 1; 3210 my $count = 10 + 1;
2922 for my $item (@items) { 3211 for my $item (@items) {
2923 last unless --$count; 3212 last unless --$count;
2924 3213
2925 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text}; 3218 : $item->{text};
2930 3219
… …
2938 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2944 can_events => 1, 3233 can_events => 1,
2945 can_hover => 1 3234 can_hover => 1
2946 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2947 } 3248 }
2948 3249
2949 $self->clear; 3250 $self->clear;
2950 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2951} 3252}
… …
2956 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2958 3259
2959 return unless $text; 3260 return unless $text;
2960 3261
2961 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2962 3263
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964 3265
2965 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2967 $item->{count}++; 3268 $item->{count}++;
2968 } else { 3269 } else {
2969 $item->{count} = 1; 3270 $item->{count} = 1;
2970 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2971 } 3272 }
2972 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2973 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2974 delete $item->{label}; 3275 delete $item->{label};
2975 } else { 3276 } else {
2976 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2977 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2996 3297
2997 $self->reorder; 3298 $self->reorder;
2998 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2999} 3300}
3000 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3001############################################################################# 3310#############################################################################
3002 3311
3003package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
3004 3313
3005our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3315
3009sub new { 3316sub new {
3010 my $class = shift; 3317 my $class = shift;
3011 3318
3012 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
3013 visible => 1, 3685 visible => 1,
3014 @_, 3686 @_,
3015 ) 3687 );
3016}
3017 3688
3018sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3690
3021 $self->{w} = $w; 3691 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3692}
3031 3693
3032sub size_request { 3694sub size_request {
3033 my ($self) = @_; 3695 my ($self) = @_;
3034 3696
3035 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3036} 3712}
3037 3713
3038sub size_allocate { 3714sub size_allocate {
3039 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3040 3716
3041 for my $child ($self->children) { 3717 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3719
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3046 3722
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3725
3056 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3057 } 3727 }
3058} 3728}
3059 3729
… …
3070} 3740}
3071 3741
3072sub update { 3742sub update {
3073 my ($self) = @_; 3743 my ($self) = @_;
3074 3744
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3077} 3746}
3078 3747
3079sub add { 3748sub add {
3080 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3081 3750
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3090 3752 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3753
3096 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3097} 3755}
3098 3756
3099sub remove { 3757sub remove {
3100 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3101 3759
3102 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3103 3764
3104 while (@children) { 3765 while (@children) {
3105 my $w = pop @children; 3766 my $w = pop @children;
3106 push @children, $w->children; 3767 push @children, $w->children;
3107 $w->set_invisible; 3768 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3127 $_->() 3788 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3129 } 3790 }
3130 3791
3131 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3132 my @queue; 3794 my @queue;
3795 my $widget;
3133 3796
3134 for (;;) { 3797 outer:
3135 if ($self->{check_size}) { 3798 while () {
3136 #TODO use array-of-depth approach 3799 if (my $realloc = delete $self->{realloc}) {
3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3137 3802
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3140 } 3807 }
3141 3808
3809 while () {
3810 @queue or last outer;
3811
3142 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3143 3813 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3156 3835
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3158 3837
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3161 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3162 } 3848 }
3163 } 3849 }
3164 3850
3165 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3859
3169 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3171 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3172 $widget->{w} = $w; 3870 $widget->{w} = $w;
3173 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3174 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3175 } 3875 }
3176 } 3876 }
3177 3877
3178 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3179 $_->() 3879 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3181 } 3881 }
3882
3182 3883
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3186 3887
… …
3188 glLoadIdentity; 3889 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3892 glLoadIdentity;
3192 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3193 $self->_draw; 3901 $self->_draw;
3194} 3902}
3195 3903
3196############################################################################# 3904#############################################################################
3197 3905

Diff Legend

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