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.243 by root, Sat May 27 20:46:54 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 # broken show/hide model 273 return unless $self->{visible};
259 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
260 delete $self->{root}; 278 delete $self->{root};
261 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $self->focus_out; 286 $self->focus_out;
287
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;
270} 306}
271 307
272sub hide { 308sub hide {
273 my ($self) = @_; 309 my ($self) = @_;
274 310
… …
276 312
277 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
278 if $self->{parent}; 314 if $self->{parent};
279} 315}
280 316
281sub move { 317sub move_abs {
282 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
283 319
284 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
285 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
286 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
287 323
288 $self->update; 324 $self->update;
289} 325}
290 326
291sub set_size { 327sub set_size {
292 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
293 329
294 $self->{user_w} = $w; 330 $self->{force_w} = $w;
295 $self->{user_h} = $h; 331 $self->{force_h} = $h;
296 332
297 $self->check_size; 333 $self->realloc;
298} 334}
299 335
300sub size_request { 336sub size_request {
301 require Carp; 337 require Carp;
302 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
304 340
305sub configure { 341sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
307 343
308 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
311 349
312 # use alignment to adjust x, y 350 # use alignment to adjust x, y
313 351
314 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 354 }
319 355
320 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 357 $self->{x} = $x;
322 $self->{y} = $y; 358 $self->{y} = $y;
323 $self->update; 359 $self->update;
324 } 360 }
325 361
326 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 369 }
329} 370}
330 371
331sub size_allocate { 372sub size_allocate {
332 # nothing to be done 373 # nothing to be done
333} 374}
334 375
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
343} 382}
344 383
345sub set_max_size { 384sub set_max_size {
346 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
347 386
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
350} 391}
351 392
352sub set_tooltip { 393sub set_tooltip {
353 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
354 395
… …
359 400
360 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
361 402
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 406 }
366} 407}
367 408
368# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
369sub coord2local { 410sub coord2local {
… …
406 447
407 $::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
408 unless $FOCUS; 449 unless $FOCUS;
409} 450}
410 451
411sub mouse_motion { } 452sub mouse_motion { 0 }
412sub button_up { } 453sub button_up { 0 }
413sub key_down { } 454sub key_down { 0 }
414sub key_up { } 455sub key_up { 0 }
415 456
416sub button_down { 457sub button_down {
417 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
418 459
419 $self->focus_in; 460 $self->focus_in;
420}
421 461
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
426sub 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
427 538
428sub draw { 539sub draw {
429 my ($self) = @_; 540 my ($self) = @_;
430 541
431 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);
432 553
433 glPushMatrix; 554 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 556
438 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 559 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 561 glBegin GL_QUADS;
445 glVertex $x , $y; 562 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
449 glEnd; 566 glEnd;
450 glDisable GL_BLEND; 567 glDisable GL_BLEND;
451 } 568 }
452 569
453 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 571 glPushMatrix;
455 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 575 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
462 glEnd; 579 glEnd;
463 glPopMatrix; 580 glPopMatrix;
464 #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;
465 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
466} 586}
467 587
468sub _draw { 588sub _draw {
469 my ($self) = @_; 589 my ($self) = @_;
470 590
471 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
472} 592}
473 593
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 594sub DESTROY {
535 my ($self) = @_; 595 my ($self) = @_;
536 596
537 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
538 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
539} 601}
540 602
541############################################################################# 603#############################################################################
542 604
543package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
568 630
569 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
571 633
572 glEnable GL_BLEND; 634 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 636 glColor_premultiply @$color;
575 637
576 glBegin GL_QUADS; 638 glBegin GL_QUADS;
577 glVertex 0 , 0; 639 glVertex 0 , 0;
578 glVertex 0 , $h; 640 glVertex 0 , $h;
579 glVertex $w, $h; 641 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
596} 658}
597 659
598sub size_request { 660sub size_request {
599 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
600} 664}
601 665
602sub draw { } 666sub draw { }
603 667
604############################################################################# 668#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
609 673
610sub new { 674sub new {
611 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
612 676
613 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
614 678
615 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
616 children => [], 680 children => [],
617 can_events => 0, 681 can_events => 0,
618 %arg, 682 %arg,
619 ); 683 );
684
620 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
621 687
622 $self 688 $self
623} 689}
624 690
625sub add { 691sub add {
… …
633 $self->{children} = [ 699 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
636 ]; 702 ];
637 703
638 $self->check_size (1); 704 $self->realloc;
639 $self->update;
640} 705}
641 706
642sub children { 707sub children {
643 @{ $_[0]{children} } 708 @{ $_[0]{children} }
644} 709}
… …
649 delete $child->{parent}; 714 delete $child->{parent};
650 $child->hide; 715 $child->hide;
651 716
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 718
654 $self->check_size (1); 719 $self->realloc;
655 $self->update;
656} 720}
657 721
658sub clear { 722sub clear {
659 my ($self) = @_; 723 my ($self) = @_;
660 724
… …
664 for (@$children) { 728 for (@$children) {
665 delete $_->{parent}; 729 delete $_->{parent};
666 $_->hide; 730 $_->hide;
667 } 731 }
668 732
669 $self->check_size; 733 $self->realloc;
670 $self->update;
671} 734}
672 735
673sub find_widget { 736sub find_widget {
674 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
675 738
676 $x -= $self->{x}; 739 $x -= $self->{x};
677 $y -= $self->{y}; 740 $y -= $self->{y};
678 741
679 my $res; 742 my $res;
680 743
681 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
683 and return $res; 746 and return $res;
684 } 747 }
685 748
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707} 770}
708 771
709sub add { 772sub add {
710 my ($self, $child) = @_; 773 my ($self, $child) = @_;
711 774
712 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
713
714 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
715} 777}
716 778
717sub remove { 779sub remove {
718 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
736} 798}
737 799
738############################################################################# 800#############################################################################
739 801
802# back-buffered drawing area
803
740package CFClient::UI::Window; 804package CFClient::UI::Window;
741 805
742our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
743 807
744use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 827 $self->update;
764} 828}
765 829
766sub _render { 830sub _render {
831 my ($self) = @_;
832
767 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
768} 834}
769 835
770sub render_child { 836sub render_child {
771 my ($self) = @_; 837 my ($self) = @_;
772 838
773 $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 {
774 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 850 $self->_render;
778 }; 851 };
779} 852}
780 853
781sub _draw { 854sub _draw {
782 my ($self) = @_; 855 my ($self) = @_;
783 856
784 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
785 858
786 my $tex = $self->{texture} 859 my $tex = $self->{texture}
787 or return; 860 or return;
788 861
789 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
792 865
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 867
795 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
796} 869}
… …
812} 885}
813 886
814sub size_request { 887sub size_request {
815 my ($self) = @_; 888 my ($self) = @_;
816 889
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 891
819 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
820} 896}
821 897
822sub size_allocate { 898sub size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
901 my $child = $self->child;
902
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 905
828 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
829 $self->update; 907 $self->update;
830} 908}
831 909
… …
867} 945}
868 946
869sub _render { 947sub _render {
870 my ($self) = @_; 948 my ($self) = @_;
871 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
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 954
874 $self->SUPER::_render; 955 $self->SUPER::_render;
875} 956}
876 957
… …
879package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
880 961
881our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
882 963
883sub new { 964sub new {
884 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
885 968
886 my $self; 969 my $self;
887 970
888 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
889 vertical => 1, 972 vertical => 1,
… …
894 ; 977 ;
895 978
896 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 981 slider => $slider,
899 @_, 982 %arg,
900 ); 983 );
901 984
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
905 987
906 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
907} 995}
908 996
909sub update { 997sub update {
910 my ($self) = @_; 998 my ($self) = @_;
911 999
… …
950 1038
951 if ($self->{bg}) { 1039 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
953 1041
954 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
957 1045
958 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
959 glVertex 0 , 0; 1047 glVertex 0 , 0;
960 glVertex 0 , $h; 1048 glVertex 0 , $h;
961 glVertex $w, $h; 1049 glVertex $w, $h;
… …
974 1062
975our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
976 1064
977use CFClient::OpenGL; 1065use CFClient::OpenGL;
978 1066
979my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1074
983sub new { 1075sub new {
984 my $class = shift; 1076 my ($class, %arg) = @_;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1077
988 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1081 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1082 can_events => 1,
994 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
995 ); 1086 );
996 1087
997 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
998 align => 0, 1089 align => 0,
999 valign => 1, 1090 valign => 1,
1000 text => $self->{title}, 1091 text => $self->{title},
1001 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1002 1094
1003 $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};
1004} 1103}
1005 1104
1006sub border { 1105sub border {
1007 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1008} 1107}
1009 1108
1010sub size_request { 1109sub size_request {
1011 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1012 1114
1013 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1014 1116
1015 ( 1117 (
1016 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1019} 1121}
1020 1122
1021sub size_allocate { 1123sub size_allocate {
1022 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1023 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
1024 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1026 1136
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1031} 1138}
1032 1139
1033sub button_down { 1140sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1035 1142
… …
1051 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1052 1159
1053 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1055 1162
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1165
1061 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1062 }; 1168 };
1063 1169
1064 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1174 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1070 1176
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1178
1073 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1078 } 1187 1
1079} 1188}
1080 1189
1081sub button_up { 1190sub button_up {
1082 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1083 1192
1084 delete $self->{motion}; 1193 !!delete $self->{motion}
1085} 1194}
1086 1195
1087sub mouse_motion { 1196sub mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1089 1198
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1091} 1202}
1092 1203
1093sub _draw { 1204sub _draw {
1094 my ($self) = @_; 1205 my ($self) = @_;
1095 1206
1207 my $child = $self->{children}[0];
1208
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1211
1099 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1214
1102 my $border = $self->border; 1215 my $border = $self->border;
1103 1216
1104 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1222
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1112 1225
1113 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1231 }
1124 1232
1125 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1126 1234
1127 $self->{title}->draw if $self->{title};
1128
1129 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1130} 1241}
1131 1242
1132############################################################################# 1243#############################################################################
1133 1244
1134package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1157 1268
1158 $child->set_parent ($self); 1269 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1160 1271
1161 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1162} 1279}
1163 1280
1164# 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?
1165sub clear { 1282sub clear {
1166 my ($self) = @_; 1283 my ($self) = @_;
… …
1171 for (@children) { 1288 for (@children) {
1172 delete $_->{parent}; 1289 delete $_->{parent};
1173 $_->hide; 1290 $_->hide;
1174 } 1291 }
1175 1292
1176 $self->check_size (1); 1293 $self->realloc;
1177 $self->update;
1178} 1294}
1179 1295
1180sub get_wh { 1296sub get_wh {
1181 my ($self) = @_; 1297 my ($self) = @_;
1182 1298
… …
1278 } 1394 }
1279} 1395}
1280 1396
1281############################################################################# 1397#############################################################################
1282 1398
1283package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1400
1287our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1288 1402
1289sub size_request { 1403sub size_request {
1290 my ($self) = @_; 1404 my ($self) = @_;
1291 1405
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1293 1407 ? (
1294 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1410 )
1297 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1298} 1415}
1299 1416
1300sub size_allocate { 1417sub size_allocate {
1301 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1302 1419
1303 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1421 my $children = $self->{children};
1306 1422
1307 my @h = map $_->{req_w}, @$children; 1423 my @req;
1308 1424
1309 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1310 1426 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } 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 {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1441 }
1325 } 1442 }
1326 1443
1327 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1328 1445
1329 my $y = 0; 1446 my $pos = 0;
1330 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1450
1335 $y += $h; 1451 $pos += $alloc;
1336 } 1452 }
1337 1453
1338 1 1454 1
1339} 1455}
1340 1456
1341############################################################################# 1457#############################################################################
1342 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
1343package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1344 1475
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1348 1477
1349sub size_request { 1478sub new {
1350 my ($self) = @_; 1479 my $class = shift;
1351 1480
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1353 1482 vertical => 1,
1354 ( 1483 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1484 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1485}
1398 1486
1399############################################################################# 1487#############################################################################
1400 1488
1401package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1506 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1420 fontsize => 1, 1508 fontsize => 1,
1421 align => -1, 1509 align => -1,
1422 valign => -1, 1510 valign => -1,
1423 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1424 can_events => 0, 1513 can_events => 0,
1425 %arg 1514 %arg
1426 ); 1515 );
1427 1516
1428 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1455 1544
1456 delete $self->{texture}; 1545 delete $self->{texture};
1457 $self->SUPER::update; 1546 $self->SUPER::update;
1458} 1547}
1459 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1460sub set_text { 1556sub set_text {
1461 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1462 1558
1463 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1465 1561
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1468 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1469 $self->update; 1567 $self->update;
1470 $self->check_size;
1471} 1568}
1472 1569
1473sub set_markup { 1570sub set_markup {
1474 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1475 1572
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1577
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1483 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1484 $self->update; 1583 $self->update;
1485 $self->check_size;
1486} 1584}
1487 1585
1488sub size_request { 1586sub size_request {
1489 my ($self) = @_; 1587 my ($self) = @_;
1490 1588
1589 $self->{size_req} ||= do {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1595
1497 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1498 1597
1499 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1601
1503 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1504 1603
1505 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1507 } 1609 };
1508 1610
1509 ( 1611 @{ $self->{size_req} }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1612}
1514 1613
1515sub size_allocate { 1614sub size_allocate {
1516 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1517 1616
1617 delete $self->{ox};
1618
1518 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519} 1621}
1520 1622
1521sub set_fontsize { 1623sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1523 1625
1524 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1627 delete $self->{texture};
1526 1628
1527 $self->update; 1629 $self->realloc;
1528 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1529} 1638}
1530 1639
1531sub _draw { 1640sub _draw {
1532 my ($self) = @_; 1641 my ($self) = @_;
1533 1642
… …
1539 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1652
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1545 1655
1656 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1549 1660
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1664 };
1556 1665
1557 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1558 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};
1559 1670
1560 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1563 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1565 } 1678 }
1566 1679
1567 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1568} 1681}
1569 1682
… …
1586 can_hover => 1, 1699 can_hover => 1,
1587 can_focus => 1, 1700 can_focus => 1,
1588 valign => 0, 1701 valign => 0,
1589 can_events => 1, 1702 can_events => 1,
1590 #text => ... 1703 #text => ...
1704 #hidden => "*",
1591 @_ 1705 @_
1592 ) 1706 )
1593} 1707}
1594 1708
1595sub _set_text { 1709sub _set_text {
… …
1597 1711
1598 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1599 1713
1600 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1601 1715
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1717 $self->{text} = $text;
1606 1718
1607 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1609 1722
1610 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1611} 1727}
1612 1728
1613sub set_text { 1729sub set_text {
1614 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1615 1731
1616 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1733 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1734}
1621 1735
1622sub get_text { 1736sub get_text {
1623 $_[0]{text} 1737 $_[0]{text}
1624} 1738}
… …
1654 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1657 } elsif ($uni) { 1771 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1659 } 1775 }
1660 1776
1661 $self->_set_text ($text); 1777 $self->_set_text ($text);
1662 $self->update; 1778
1663 $self->check_size; 1779 $self->realloc;
1780
1781 1
1664} 1782}
1665 1783
1666sub focus_in { 1784sub focus_in {
1667 my ($self) = @_; 1785 my ($self) = @_;
1668 1786
… …
1683 utf8::encode $text; 1801 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1685 1803
1686 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1687 $self->update; 1805 $self->update;
1806
1807 1
1688} 1808}
1689 1809
1690sub mouse_motion { 1810sub mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1692# 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
1693} 1815}
1694 1816
1695sub _draw { 1817sub _draw {
1696 my ($self) = @_; 1818 my ($self) = @_;
1697 1819
1698 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1699 1821
1700 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1703 } else { 1825 } else {
1704 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1705 } 1827 }
1706 1828
1707 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1832 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1774 } else { 1896 } else {
1775 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1776 } 1898 }
1777 1899
1778 } else { 1900 } else {
1779 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1780 } 1904 1
1781
1782} 1905}
1783 1906
1784############################################################################# 1907#############################################################################
1785 1908
1786package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1795 1918
1796sub new { 1919sub new {
1797 my $class = shift; 1920 my $class = shift;
1798 1921
1799 $class->SUPER::new ( 1922 $class->SUPER::new (
1800 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1801 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1803 can_hover => 1, 1927 can_hover => 1,
1804 align => 0, 1928 align => 0,
1805 valign => 0, 1929 valign => 0,
… …
1814 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1815 1939
1816 $self->emit ("activate") 1940 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1819} 1945}
1820 1946
1821sub _draw { 1947sub _draw {
1822 my ($self) = @_; 1948 my ($self) = @_;
1823 1949
1824 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1951
1830 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1833 1955
… …
1852 1974
1853sub new { 1975sub new {
1854 my $class = shift; 1976 my $class = shift;
1855 1977
1856 $class->SUPER::new ( 1978 $class->SUPER::new (
1857 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1858 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1985 state => 0,
… …
1866} 1989}
1867 1990
1868sub size_request { 1991sub size_request {
1869 my ($self) = @_; 1992 my ($self) = @_;
1870 1993
1871 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1872} 1995}
1873 1996
1874sub button_down { 1997sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1876 1999
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1881 } 2008 1
1882} 2009}
1883 2010
1884sub _draw { 2011sub _draw {
1885 my ($self) = @_; 2012 my ($self) = @_;
1886 2013
1887 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1888 2015
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2017
1891 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;
1892 2021
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2023
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2025
… …
2051 2180
2052 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2054 2183
2055 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2056 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;
2057 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2189
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2168 vertical => 0, 2298 vertical => 0,
2169 can_hover => 1, 2299 can_hover => 1,
2170 inner_pad => 0.02, 2300 inner_pad => 0.02,
2171 @_ 2301 @_
2172 ); 2302 );
… …
2175 $self->update; 2305 $self->update;
2176 2306
2177 $self 2307 $self
2178} 2308}
2179 2309
2310sub changed { }
2311
2180sub set_range { 2312sub set_range {
2181 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2182 2314
2183 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2184 2316
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2187} 2321}
2188 2322
2189sub set_value { 2323sub set_value {
2190 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2191 2325
… …
2210} 2344}
2211 2345
2212sub size_request { 2346sub size_request {
2213 my ($self) = @_; 2347 my ($self) = @_;
2214 2348
2215 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2350}
2220 2351
2221sub button_down { 2352sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2223 2354
2224 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2225 2356
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2358
2228 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2229} 2360}
2230 2361
2231sub mouse_motion { 2362sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2233 2364
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2369
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2371
2241 $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
2242 } 2377 1
2243} 2378}
2244 2379
2245sub update { 2380sub update {
2246 my ($self) = @_; 2381 my ($self) = @_;
2247 2382
2248 $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}) {
2249 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2250 2392
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2253 2395
… …
2259 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2261 2403
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2264 }); 2406 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2407
2272 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2273 2409
2274 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2275 2411
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2338 2474
2339############################################################################# 2475#############################################################################
2340 2476
2341package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2342 2478
2343our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2344 2480
2345use CFClient::OpenGL; 2481use CFClient::OpenGL;
2346 2482
… …
2348 my $class = shift; 2484 my $class = shift;
2349 2485
2350 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2351 fontsize => 1, 2487 fontsize => 1,
2352 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2353 #font => default_font 2490 #font => default_font
2354 @_, 2491 @_,
2355 2492
2356 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2357 par => [], 2494 par => [],
… …
2380 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2381 2518
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $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});
2385 2523
2386 $self->reflow; 2524 $self->reflow;
2387} 2525}
2388 2526
2389sub text_size { 2527sub text_size {
… …
2391 2529
2392 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2393 2531
2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $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});
2396 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2397 2536
2398 $layout->size 2537 $layout->size
2399} 2538}
2400 2539
… …
2439 2578
2440 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2441 2580
2442 delete $self->{texture}; 2581 delete $self->{texture};
2443 2582
2444 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446 2585
2447 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2448 my $height = 0; 2587 my $height = 0;
2449 2588
… …
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 2592
2454 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2457 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h; 2600 $_->[1] = $h;
2461 } 2601 }
… …
2464 } 2604 }
2465 2605
2466 $self->{height} = $height; 2606 $self->{height} = $height;
2467 2607
2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2469 2609
2470 delete $self->{texture}; 2610 delete $self->{texture};
2471 } 2611 }
2472 2612
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2476 2616
2477 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2478 2618
2479 my $y0 = $top; 2619 my $y0 = $top;
… …
2493 my $h = $par->[1]; 2633 my $h = $par->[1];
2494 2634
2495 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2499 2640
2500 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2501 2642
2502 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2514sub _draw { 2655sub _draw {
2515 my ($self) = @_; 2656 my ($self) = @_;
2516 2657
2517 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2520 $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});
2521 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2522 2663
2523 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2524 2665
2525} 2666}
… …
2579 state => 0, 2720 state => 0,
2580 on_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2581 @_ 2722 @_
2582 ); 2723 );
2583 2724
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2725 $self
2590} 2726}
2591 2727
2592sub toggle_flopper { 2728sub toggle_flopper {
2593 my ($self) = @_; 2729 my ($self) = @_;
2594 2730
2595 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2732}
2607 2733
2608############################################################################# 2734#############################################################################
2609 2735
2610package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2623} 2749}
2624 2750
2625sub set_tooltip_from { 2751sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2627 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
2628 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2769 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2771 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2783
2646sub size_allocate { 2784sub size_allocate {
2647 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2648 2786
2649 $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 });
2650} 2806}
2651 2807
2652sub _draw { 2808sub _draw {
2653 my ($self) = @_; 2809 my ($self) = @_;
2654 2810
… …
2671 glVertex $w, $h; 2827 glVertex $w, $h;
2672 glVertex $w, 0; 2828 glVertex $w, 0;
2673 glEnd; 2829 glEnd;
2674 2830
2675 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2676 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2677} 2834}
2678 2835
2679############################################################################# 2836#############################################################################
2680 2837
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 2897
2741 if ($tex) { 2898 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2747 } 2904 }
2748} 2905}
2749 2906
2750sub DESTROY { 2907sub destroy {
2751 my ($self) = @_; 2908 my ($self) = @_;
2752 2909
2753 $self->{timer}->cancel 2910 $self->{timer}->cancel
2754 if $self->{timer}; 2911 if $self->{timer};
2755 2912
2756 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2757} 2914}
2758 2915
2759############################################################################# 2916#############################################################################
2760 2917
2761package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2762 2919
2763our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2764 2921
2765sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 2923
2806############################################################################# 2924#############################################################################
2807 2925
2808package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2809 2927
… …
2821 ); 2939 );
2822 2940
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824 2942
2825 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2827 2945
2828 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2829 if (!ref $widget) { 2947 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2831 can_hover => 1, 2949 can_hover => 1,
2832 can_events => 1, 2950 can_events => 1,
2833 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2834 } 2953 }
2835 2954
2836 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2837 2956
2838 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2850 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2970 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2853 2972
2854 $self->show; 2973 $self->show;
2855 $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);
2856} 2975}
2857 2976
2858sub mouse_motion { 2977sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2860 2979
2861 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2864} 2985}
2865 2986
2866sub button_up { 2987sub button_up {
2867 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2868 2989
… …
2870 undef $GRAB; 2991 undef $GRAB;
2871 $self->hide; 2992 $self->hide;
2872 2993
2873 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2875 } 3000 1
2876} 3001}
2877 3002
2878############################################################################# 3003#############################################################################
2879 3004
2880package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2881 3006
2882our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2883 3008
2884sub new { 3009sub new {
2885 my $class = shift; 3010 my $class = shift;
2886 3011
2887 $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 (
2888 fontsize => 0.8, 3177 fontsize => 0.8,
2889 @_, 3178 @_,
2890 ) 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
2891} 3186}
2892 3187
2893sub reorder { 3188sub reorder {
2894 my ($self) = @_; 3189 my ($self) = @_;
2895 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} };
2896 3196
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3199 }
2900 3200
… …
2903 my @items = sort { 3203 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2907 3207
3208 $self->{timer}->interval (1);
3209
2908 my $count = 10 + 1; 3210 my $count = 10 + 1;
2909 for my $item (@items) { 3211 for my $item (@items) {
2910 last unless --$count; 3212 last unless --$count;
2911 3213
2912 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3218 : $item->{text};
2917 3219
… …
2925 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3233 can_events => 1,
2932 can_hover => 1 3234 can_hover => 1
2933 }; 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;
2934 } 3248 }
2935 3249
2936 $self->clear; 3250 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2938} 3252}
… …
2943 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2945 3259
2946 return unless $text; 3260 return unless $text;
2947 3261
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3263
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3265
2952 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2954 $item->{count}++; 3268 $item->{count}++;
2955 } else { 3269 } else {
2956 $item->{count} = 1; 3270 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2958 } 3272 }
2959 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2960 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2961 delete $item->{label}; 3275 delete $item->{label};
2962 } else { 3276 } else {
2963 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2964 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2983 3297
2984 $self->reorder; 3298 $self->reorder;
2985 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2986} 3300}
2987 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2988############################################################################# 3310#############################################################################
2989 3311
2990package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2991 3313
2992our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3315
2996sub new { 3316sub new {
2997 my $class = shift; 3317 my $class = shift;
2998 3318
2999 $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 (
3000 visible => 1, 3685 visible => 1,
3001 @_, 3686 @_,
3002 ) 3687 );
3003}
3004 3688
3005sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3690
3008 $self->{w} = $w; 3691 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3692}
3018 3693
3019sub size_request { 3694sub size_request {
3020 my ($self) = @_; 3695 my ($self) = @_;
3021 3696
3022 ($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
3023} 3712}
3024 3713
3025sub size_allocate { 3714sub size_allocate {
3026 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3027 3716
3028 for my $child ($self->children) { 3717 for my $child ($self->children) {
3029 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)};
3030 3719
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3033 3722
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3725
3040 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3041 } 3727 }
3042} 3728}
3043 3729
… …
3054} 3740}
3055 3741
3056sub update { 3742sub update {
3057 my ($self) = @_; 3743 my ($self) = @_;
3058 3744
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3061} 3746}
3062 3747
3063sub add { 3748sub add {
3064 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3065 3750
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3074 3752 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3753
3080 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3081} 3755}
3082 3756
3083sub remove { 3757sub remove {
3084 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3085 3759
3086 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3087 3764
3088 while (@children) { 3765 while (@children) {
3089 my $w = pop @children; 3766 my $w = pop @children;
3090 push @children, $w->children; 3767 push @children, $w->children;
3091 $w->set_invisible; 3768 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3111 $_->() 3788 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3113 } 3790 }
3114 3791
3115 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3116 my @queue; 3794 my @queue;
3795 my $widget;
3117 3796
3118 for (;;) { 3797 outer:
3119 if ($self->{check_size}) { 3798 while () {
3120 #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
3121 3802
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3124 } 3807 }
3125 3808
3809 while () {
3810 @queue or last outer;
3811
3126 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3127 3813 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 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}) {
3138 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3140 3835
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3142 3837
3143 $widget->{parent}->check_size
3144 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 }
3145 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3146 } 3848 }
3147 } 3849 }
3148 3850
3149 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 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)};
3152 3859
3153 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3155 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
3156 $widget->{w} = $w; 3870 $widget->{w} = $w;
3157 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3158 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3159 } 3875 }
3160 } 3876 }
3161 3877
3162 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3163 $_->() 3879 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3165 } 3881 }
3882
3166 3883
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3170 3887
… …
3172 glLoadIdentity; 3889 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3892 glLoadIdentity;
3176 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
3177 $self->_draw; 3901 $self->_draw;
3178} 3902}
3179 3903
3180############################################################################# 3904#############################################################################
3181 3905

Diff Legend

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