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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.286 by root, Mon Jun 5 03:48:49 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->{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.]+$/;
181 $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};
182 $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};
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
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_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};
221 } 235 }
222 236
223 $self 237 $self
224} 238}
225 239
… …
236 return if $self->{parent}; 250 return if $self->{parent};
237 251
238 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
239} 253}
240 254
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 255sub set_visible {
254 my ($self) = @_; 256 my ($self) = @_;
255 257
256 return if $self->{visible}; 258 return if $self->{visible};
257 259
258 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
260 262
261 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
262} 268}
263 269
264sub set_invisible { 270sub set_invisible {
265 my ($self) = @_; 271 my ($self) = @_;
266 272
267 return unless $self->{visible}; 273 return unless $self->{visible};
268 274
269 # broken show/hide model 275 $_->set_invisible for $self->children;
270 276
271 delete $self->{root}; 277 delete $self->{root};
272 delete $self->{visible}; 278 delete $self->{visible};
273 279
274 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
276 282
277 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
279 285
280 $self->focus_out; 286 $self->focus_out;
281 287
282 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
283} 289}
… …
306 312
307 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
308 if $self->{parent}; 314 if $self->{parent};
309} 315}
310 316
311sub move { 317sub move_abs {
312 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
313 319
314 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
317 323
318 $self->update; 324 $self->update;
319} 325}
320 326
321sub set_size { 327sub set_size {
322 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
323 329
324 $self->{def_w} = $w; 330 $self->{force_w} = $w;
325 $self->{def_h} = $h; 331 $self->{force_h} = $h;
326 332
327 $self->check_size; 333 $self->realloc;
328} 334}
329 335
330sub size_request { 336sub size_request {
331 require Carp; 337 require Carp;
332 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
334 340
335sub configure { 341sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
337 343
338 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
341 349
342 # use alignment to adjust x, y 350 # use alignment to adjust x, y
343 351
344 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 354 }
349 355
350 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 357 $self->{x} = $x;
352 $self->{y} = $y; 358 $self->{y} = $y;
353 $self->update; 359 $self->update;
354 } 360 }
355 361
356 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$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;
358 } 369 }
359} 370}
360 371
361sub size_allocate { 372sub size_allocate {
362 # nothing to be done 373 # nothing to be done
363} 374}
364 375
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
373} 382}
374 383
375sub set_max_size { 384sub set_max_size {
376 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
377 386
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
380} 391}
381 392
382sub set_tooltip { 393sub set_tooltip {
383 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
384 395
… …
389 400
390 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
391 402
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
395 } 406 }
396} 407}
397 408
398# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
399sub coord2local { 410sub coord2local {
… …
436 447
437 $::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
438 unless $FOCUS; 449 unless $FOCUS;
439} 450}
440 451
441sub mouse_motion { } 452sub mouse_motion { 0 }
442sub button_up { } 453sub button_up { 0 }
443sub key_down { } 454sub key_down { 0 }
444sub key_up { } 455sub key_up { 0 }
445 456
446sub button_down { 457sub button_down {
447 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
448 459
449 $self->focus_in; 460 $self->focus_in;
450}
451 461
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
456sub 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
457 538
458sub draw { 539sub draw {
459 my ($self) = @_; 540 my ($self) = @_;
460 541
461 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);
462 553
463 glPushMatrix; 554 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 556
468 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 559 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 561 glBegin GL_QUADS;
475 glVertex $x , $y; 562 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
479 glEnd; 566 glEnd;
480 glDisable GL_BLEND; 567 glDisable GL_BLEND;
481 } 568 }
482 569
483 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 571 glPushMatrix;
485 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 575 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
492 glEnd; 579 glEnd;
493 glPopMatrix; 580 glPopMatrix;
494 #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;
495 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
496} 586}
497 587
498sub _draw { 588sub _draw {
499 my ($self) = @_; 589 my ($self) = @_;
500 590
501 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
502}
503
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561} 592}
562 593
563sub DESTROY { 594sub DESTROY {
564 my ($self) = @_; 595 my ($self) = @_;
565 596
… …
597 628
598 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
600 631
601 glEnable GL_BLEND; 632 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 634 glColor_premultiply @$color;
604 635
605 glBegin GL_QUADS; 636 glBegin GL_QUADS;
606 glVertex 0 , 0; 637 glVertex 0 , 0;
607 glVertex 0 , $h; 638 glVertex 0 , $h;
608 glVertex $w, $h; 639 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
625} 656}
626 657
627sub size_request { 658sub size_request {
628 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
629} 662}
630 663
631sub draw { } 664sub draw { }
632 665
633############################################################################# 666#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
638 671
639sub new { 672sub new {
640 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
641 674
642 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
643 676
644 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
645 children => [], 678 children => [],
646 can_events => 0, 679 can_events => 0,
647 %arg, 680 %arg,
648 ); 681 );
682
649 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
650 685
651 $self 686 $self
652} 687}
653 688
654sub add { 689sub add {
… …
662 $self->{children} = [ 697 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
665 ]; 700 ];
666 701
667 $self->check_size (1); 702 $self->realloc;
668 $self->update;
669} 703}
670 704
671sub children { 705sub children {
672 @{ $_[0]{children} } 706 @{ $_[0]{children} }
673} 707}
… …
678 delete $child->{parent}; 712 delete $child->{parent};
679 $child->hide; 713 $child->hide;
680 714
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 716
683 $self->check_size (1); 717 $self->realloc;
684 $self->update;
685} 718}
686 719
687sub clear { 720sub clear {
688 my ($self) = @_; 721 my ($self) = @_;
689 722
… …
693 for (@$children) { 726 for (@$children) {
694 delete $_->{parent}; 727 delete $_->{parent};
695 $_->hide; 728 $_->hide;
696 } 729 }
697 730
698 $self->check_size; 731 $self->realloc;
699 $self->update;
700} 732}
701 733
702sub find_widget { 734sub find_widget {
703 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
704 736
705 $x -= $self->{x}; 737 $x -= $self->{x};
706 $y -= $self->{y}; 738 $y -= $self->{y};
707 739
708 my $res; 740 my $res;
709 741
710 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
712 and return $res; 744 and return $res;
713 } 745 }
714 746
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
764 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
765} 797}
766 798
767############################################################################# 799#############################################################################
768 800
801# back-buffered drawing area
802
769package CFClient::UI::Window; 803package CFClient::UI::Window;
770 804
771our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
772 806
773use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
791 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 826 $self->update;
793} 827}
794 828
795sub _render { 829sub _render {
830 my ($self) = @_;
831
796 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
797} 833}
798 834
799sub render_child { 835sub render_child {
800 my ($self) = @_; 836 my ($self) = @_;
801 837
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
805 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
806 $self->_render; 849 $self->_render;
807 }; 850 };
808} 851}
809 852
810sub _draw { 853sub _draw {
811 my ($self) = @_; 854 my ($self) = @_;
812 855
813 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
814 857
815 my $tex = $self->{texture} 858 my $tex = $self->{texture}
816 or return; 859 or return;
817 860
818 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
821 864
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 866
824 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
825} 868}
… …
841} 884}
842 885
843sub size_request { 886sub size_request {
844 my ($self) = @_; 887 my ($self) = @_;
845 888
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 890
848 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
850 893
851 ($w, $h) 894 ($w, $h)
852} 895}
853 896
854sub size_allocate { 897sub size_allocate {
855 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
856 899
900 my $child = $self->child;
901
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 904
860 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
861 $self->update; 906 $self->update;
862} 907}
863 908
… …
899} 944}
900 945
901sub _render { 946sub _render {
902 my ($self) = @_; 947 my ($self) = @_;
903 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 953
906 $self->SUPER::_render; 954 $self->SUPER::_render;
907} 955}
908 956
… …
911package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
912 960
913our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
914 962
915sub new { 963sub new {
916 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
917 967
918 my $self; 968 my $self;
919 969
920 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
921 vertical => 1, 971 vertical => 1,
… …
926 ; 976 ;
927 977
928 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 980 slider => $slider,
931 @_, 981 %arg,
932 ); 982 );
933 983
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
937 986
938 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
939} 994}
940 995
941sub update { 996sub update {
942 my ($self) = @_; 997 my ($self) = @_;
943 998
… …
982 1037
983 if ($self->{bg}) { 1038 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
985 1040
986 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
989 1044
990 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
991 glVertex 0 , 0; 1046 glVertex 0 , 0;
992 glVertex 0 , $h; 1047 glVertex 0 , $h;
993 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1006 1061
1007our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1008 1063
1009use CFClient::OpenGL; 1064use CFClient::OpenGL;
1010 1065
1011my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1073
1015sub new { 1074sub new {
1016 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1017 1078
1018 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1082 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1083 can_events => 1,
1024 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1025 ); 1087 );
1026 1088
1027 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1090 align => 0,
1029 valign => 1, 1091 valign => 1,
1030 text => $self->{title}, 1092 text => $title,
1031 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1032 1095
1033 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1104}
1035 1105
1036sub border { 1106sub border {
1037 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1038} 1108}
1039 1109
1040sub size_request { 1110sub size_request {
1041 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1042 1115
1043 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1044 1117
1045 ( 1118 (
1046 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1049} 1122}
1050 1123
1051sub size_allocate { 1124sub size_allocate {
1052 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1053 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1054 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1056 1137
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1061} 1139}
1062 1140
1063sub button_down { 1141sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1065 1143
… …
1081 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1082 1160
1083 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1085 1163
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1166
1091 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1092 }; 1169 };
1093 1170
1094 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1175 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1100 1177
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1179
1103 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1105 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1109 } 1188 1
1110} 1189}
1111 1190
1112sub button_up { 1191sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1114 1193
1115 delete $self->{motion}; 1194 !!delete $self->{motion}
1116} 1195}
1117 1196
1118sub mouse_motion { 1197sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1120 1199
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1122} 1203}
1123 1204
1124sub _draw { 1205sub _draw {
1125 my ($self) = @_; 1206 my ($self) = @_;
1126 1207
1208 my $child = $self->{children}[0];
1209
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1212
1130 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
1134 1217
1135 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1223
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1143 1226
1144 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1232 }
1155 1233
1156 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1157 1235
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1161} 1242}
1162 1243
1163############################################################################# 1244#############################################################################
1164 1245
1165package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1187 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1188 1269
1189 $child->set_parent ($self); 1270 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1191 1272
1192 $self->check_size (1); 1273 $self->realloc;
1193} 1274}
1194 1275
1195# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1277sub clear {
1197 my ($self) = @_; 1278 my ($self) = @_;
… …
1202 for (@children) { 1283 for (@children) {
1203 delete $_->{parent}; 1284 delete $_->{parent};
1204 $_->hide; 1285 $_->hide;
1205 } 1286 }
1206 1287
1207 $self->check_size (1); 1288 $self->realloc;
1208 $self->update;
1209} 1289}
1210 1290
1211sub get_wh { 1291sub get_wh {
1212 my ($self) = @_; 1292 my ($self) = @_;
1213 1293
… …
1421 ellipsise => 3, # end 1501 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1423 fontsize => 1, 1503 fontsize => 1,
1424 align => -1, 1504 align => -1,
1425 valign => -1, 1505 valign => -1,
1426 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1427 can_events => 0, 1508 can_events => 0,
1428 %arg 1509 %arg
1429 ); 1510 );
1430 1511
1431 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1458 1539
1459 delete $self->{texture}; 1540 delete $self->{texture};
1460 $self->SUPER::update; 1541 $self->SUPER::update;
1461} 1542}
1462 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1463sub set_text { 1551sub set_text {
1464 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1465 1553
1466 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1468 1556
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1471 1560
1561 $self->realloc;
1472 $self->update; 1562 $self->update;
1473 $self->check_size;
1474} 1563}
1475 1564
1476sub set_markup { 1565sub set_markup {
1477 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1478 1567
… …
1481 1570
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1572
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1486 1576
1577 $self->realloc;
1487 $self->update; 1578 $self->update;
1488 $self->check_size;
1489} 1579}
1490 1580
1491sub size_request { 1581sub size_request {
1492 my ($self) = @_; 1582 my ($self) = @_;
1493 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1592
1500 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1501 1594
1502 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1598
1506 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1507 1600
1508 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1510 } 1603 }
1511 1604
1605 ($w, $h)
1512 ( 1606 }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1607}
1517 1608
1518sub size_allocate { 1609sub size_allocate {
1519 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1520 1611
1612 delete $self->{ox};
1613
1521 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1616}
1523 1617
1524sub set_fontsize { 1618sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1526 1620
1527 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1622 delete $self->{texture};
1529 1623
1530 $self->update; 1624 $self->realloc;
1531 $self->check_size;
1532} 1625}
1533 1626
1534sub _draw { 1627sub _draw {
1535 my ($self) = @_; 1628 my ($self) = @_;
1536 1629
… …
1542 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1639
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1548 1642
1643 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1552 1647
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1651 };
1559 1652
1560 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1655
… …
1600 1693
1601 delete $self->{cur_h}; 1694 delete $self->{cur_h};
1602 1695
1603 return if $self->{text} eq $text; 1696 return if $self->{text} eq $text;
1604 1697
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1698 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1699 $self->{text} = $text;
1609 1700
1610 $text =~ s/./*/g if $self->{hidden}; 1701 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1702 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h};
1612 1704
1613 $self->_emit (changed => $self->{text}); 1705 $self->_emit (changed => $self->{text});
1706
1707 $self->realloc;
1708 $self->update;
1614} 1709}
1615 1710
1616sub set_text { 1711sub set_text {
1617 my ($self, $text) = @_; 1712 my ($self, $text) = @_;
1618 1713
1619 $self->{cursor} = length $text; 1714 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1715 $self->_set_text ($text);
1621 $self->update;
1622 $self->check_size;
1623} 1716}
1624 1717
1625sub get_text { 1718sub get_text {
1626 $_[0]{text} 1719 $_[0]{text}
1627} 1720}
… …
1657 $self->{cursor} = length $text; 1750 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1751 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1752 $self->_emit ('escape');
1660 } elsif ($uni) { 1753 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1754 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else {
1756 return 0;
1662 } 1757 }
1663 1758
1664 $self->_set_text ($text); 1759 $self->_set_text ($text);
1665 $self->update; 1760
1666 $self->check_size; 1761 $self->realloc;
1762
1763 1
1667} 1764}
1668 1765
1669sub focus_in { 1766sub focus_in {
1670 my ($self) = @_; 1767 my ($self) = @_;
1671 1768
… …
1686 utf8::encode $text; 1783 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1784 $self->{cursor} = length substr $text, 0, $idx;
1688 1785
1689 $self->_set_text ($self->{text}); 1786 $self->_set_text ($self->{text});
1690 $self->update; 1787 $self->update;
1788
1789 1
1691} 1790}
1692 1791
1693sub mouse_motion { 1792sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1793 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795
1796 0
1696} 1797}
1697 1798
1698sub _draw { 1799sub _draw {
1699 my ($self) = @_; 1800 my ($self) = @_;
1700 1801
1701 local $self->{fg} = $self->{fg}; 1802 local $self->{fg} = $self->{fg};
1702 1803
1703 if ($FOCUS == $self) { 1804 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1805 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1806 $self->{fg} = $self->{active_fg};
1706 } else { 1807 } else {
1707 glColor @{$self->{bg}}; 1808 glColor_premultiply @{$self->{bg}};
1708 } 1809 }
1709 1810
1710 glEnable GL_BLEND; 1811 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1812 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1814 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1815 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1816 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1817 glVertex $self->{w}, 0;
… …
1777 } else { 1878 } else {
1778 $self->set_text ($self->{history_saveback}); 1879 $self->set_text ($self->{history_saveback});
1779 } 1880 }
1780 1881
1781 } else { 1882 } else {
1782 $self->SUPER::key_down ($ev); 1883 return $self->SUPER::key_down ($ev)
1884 }
1885
1783 } 1886 1
1784
1785} 1887}
1786 1888
1787############################################################################# 1889#############################################################################
1788 1890
1789package CFClient::UI::Button; 1891package CFClient::UI::Button;
… …
1798 1900
1799sub new { 1901sub new {
1800 my $class = shift; 1902 my $class = shift;
1801 1903
1802 $class->SUPER::new ( 1904 $class->SUPER::new (
1803 padding => 4, 1905 padding_x => 4,
1906 padding_y => 4,
1804 fg => [1, 1, 1], 1907 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1908 active_fg => [0, 0, 1],
1806 can_hover => 1, 1909 can_hover => 1,
1807 align => 0, 1910 align => 0,
1808 valign => 0, 1911 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1920 my ($self, $ev, $x, $y) = @_;
1818 1921
1819 $self->emit ("activate") 1922 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1923 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1924 && $y >= 0 && $y < $self->{h};
1925
1926 1
1822} 1927}
1823 1928
1824sub _draw { 1929sub _draw {
1825 my ($self) = @_; 1930 my ($self) = @_;
1826 1931
1827 local $self->{fg} = $self->{fg}; 1932 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1933
1833 glEnable GL_TEXTURE_2D; 1934 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1936 glColor 0, 0, 0, 1;
1836 1937
… …
1855 1956
1856sub new { 1957sub new {
1857 my $class = shift; 1958 my $class = shift;
1858 1959
1859 $class->SUPER::new ( 1960 $class->SUPER::new (
1860 padding => 2, 1961 padding_x => 2,
1962 padding_y => 2,
1861 fg => [1, 1, 1], 1963 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1964 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1965 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1966 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1967 state => 0,
… …
1869} 1971}
1870 1972
1871sub size_request { 1973sub size_request {
1872 my ($self) = @_; 1974 my ($self) = @_;
1873 1975
1874 ($self->{padding} * 2 + 6) x 2 1976 (6) x 2
1875} 1977}
1876 1978
1877sub button_down { 1979sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1980 my ($self, $ev, $x, $y) = @_;
1879 1981
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1984 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1985 $self->_emit (changed => $self->{state});
1986 } else {
1987 return 0
1988 }
1989
1884 } 1990 1
1885} 1991}
1886 1992
1887sub _draw { 1993sub _draw {
1888 my ($self) = @_; 1994 my ($self) = @_;
1889 1995
1890 $self->SUPER::_draw; 1996 $self->SUPER::_draw;
1891 1997
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1998 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1999
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2000 my ($w, $h) = @$self{qw(w h)};
2001
2002 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2003
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2004 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2005
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2006 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2007
… …
2054 2162
2055 my $h1 = $self->{h} * (1 - $ycut1); 2163 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2164 my $h2 = $self->{h} * (1 - $ycut2);
2057 2165
2058 glEnable GL_BLEND; 2166 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2171
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2172 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2173 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2273 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2274 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2275 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2276 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2277 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2278 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2279 min_h => $::WIDTH / 80,
2171 vertical => 0, 2280 vertical => 0,
2172 can_hover => 1, 2281 can_hover => 1,
2173 inner_pad => 0.02, 2282 inner_pad => 0.02,
2174 @_ 2283 @_
2175 ); 2284 );
… …
2178 $self->update; 2287 $self->update;
2179 2288
2180 $self 2289 $self
2181} 2290}
2182 2291
2292sub changed { }
2293
2183sub set_range { 2294sub set_range {
2184 my ($self, $range) = @_; 2295 my ($self, $range) = @_;
2185 2296
2186 ($range, $self->{range}) = ($self->{range}, $range); 2297 ($range, $self->{range}) = ($self->{range}, $range);
2187 2298
… …
2213} 2324}
2214 2325
2215sub size_request { 2326sub size_request {
2216 my ($self) = @_; 2327 my ($self) = @_;
2217 2328
2218 my $w = $self->{req_w}; 2329 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2330}
2223 2331
2224sub button_down { 2332sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2226 2334
2227 $self->SUPER::button_down ($ev, $x, $y); 2335 $self->SUPER::button_down ($ev, $x, $y);
2228 2336
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2338
2231 $self->mouse_motion ($ev, $x, $y); 2339 $self->mouse_motion ($ev, $x, $y)
2232} 2340}
2233 2341
2234sub mouse_motion { 2342sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2236 2344
… …
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2348 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2349
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2350 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2351
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2352 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2353 } else {
2354 return 0;
2355 }
2356
2245 } 2357 1
2246} 2358}
2247 2359
2248sub update { 2360sub update {
2249 my ($self) = @_; 2361 my ($self) = @_;
2250 2362
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2363 delete $self->{knob_w};
2364 $self->SUPER::update;
2365}
2366
2367sub _draw {
2368 my ($self) = @_;
2369
2370 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2371 $self->set_value ($self->{range}[0]);
2253 2372
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2373 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2374 my $range = ($hi - $page - $lo) || 1e-100;
2256 2375
… …
2262 $value = ($value - $lo) / $range; 2381 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2382 $value = $value * $self->{scale} + $self->{offset};
2264 2383
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2384 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2385 $self->{knob_w} = $knob_w;
2267 }); 2386 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2387
2275 $self->SUPER::_draw (); 2388 $self->SUPER::_draw ();
2276 2389
2277 glScale $self->{w}, $self->{h}; 2390 glScale $self->{w}, $self->{h};
2278 2391
… …
2472 2585
2473 delete $self->{texture}; 2586 delete $self->{texture};
2474 } 2587 }
2475 2588
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2590 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2591 glClear GL_COLOR_BUFFER_BIT;
2479 2592
2480 my $top = int $self->{children}[1]{range}[0]; 2593 my $top = int $self->{children}[1]{range}[0];
2481 2594
2482 my $y0 = $top; 2595 my $y0 = $top;
… …
2517sub _draw { 2630sub _draw {
2518 my ($self) = @_; 2631 my ($self) = @_;
2519 2632
2520 glEnable GL_TEXTURE_2D; 2633 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2634 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2635 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2525 2638
2526 $self->{children}[1]->draw; 2639 $self->{children}[1]->draw;
2527 2640
2528} 2641}
… …
2611} 2724}
2612 2725
2613sub set_tooltip_from { 2726sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2727 my ($self, $widget) = @_;
2615 2728
2729 my $tooltip = $widget->{tooltip};
2730
2731 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}";
2736 }
2737
2616 $self->add (new CFClient::UI::Label 2738 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2739 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2741 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2742 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2743 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2744 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2755
2634sub size_allocate { 2756sub size_allocate {
2635 my ($self, $w, $h) = @_; 2757 my ($self, $w, $h) = @_;
2636 2758
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2759 $self->SUPER::size_allocate ($w - 4, $h - 4);
2760}
2761
2762sub visibility_change {
2763 my ($self, $visible) = @_;
2764
2765 return unless $visible;
2766
2767 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner}
2769 or return;
2770
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH;
2775
2776 $self->move_abs ($x, $y);
2777 });
2638} 2778}
2639 2779
2640sub _draw { 2780sub _draw {
2641 my ($self) = @_; 2781 my ($self) = @_;
2642 2782
… …
2659 glVertex $w, $h; 2799 glVertex $w, $h;
2660 glVertex $w, 0; 2800 glVertex $w, 0;
2661 glEnd; 2801 glEnd;
2662 2802
2663 glTranslate 2 - 0.375, 2 - 0.375; 2803 glTranslate 2 - 0.375, 2 - 0.375;
2804
2664 $self->SUPER::_draw; 2805 $self->SUPER::_draw;
2665} 2806}
2666 2807
2667############################################################################# 2808#############################################################################
2668 2809
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 2869
2729 if ($tex) { 2870 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 2871 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 2873 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 2875 glDisable GL_TEXTURE_2D;
2735 } 2876 }
2736} 2877}
2737 2878
… …
2744 $self->SUPER::DESTROY; 2885 $self->SUPER::DESTROY;
2745} 2886}
2746 2887
2747############################################################################# 2888#############################################################################
2748 2889
2749package CFClient::UI::Inventory; 2890package CFClient::UI::Buttonbar;
2750 2891
2751our @ISA = CFClient::UI::ScrolledWindow::; 2892our @ISA = CFClient::UI::HBox::;
2752 2893
2753sub new { 2894# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2895
2789############################################################################# 2896#############################################################################
2790 2897
2791package CFClient::UI::Menu; 2898package CFClient::UI::Menu;
2792 2899
… …
2833 # maybe save $GRAB? must be careful about events... 2940 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2941 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2942 $self->{button} = $ev->{button};
2836 2943
2837 $self->show; 2944 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2946}
2840 2947
2841sub mouse_motion { 2948sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2843 2950
2844 # TODO: should use vbox->find_widget or so 2951 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2953 $self->{hover} = $self->{item}{$HOVER};
2954
2955 0
2847} 2956}
2848 2957
2849sub button_up { 2958sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2959 my ($self, $ev, $x, $y) = @_;
2851 2960
… …
2853 undef $GRAB; 2962 undef $GRAB;
2854 $self->hide; 2963 $self->hide;
2855 2964
2856 $self->_emit ("popdown"); 2965 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2966 $self->{hover}[1]->() if $self->{hover};
2967 } else {
2968 return 0
2969 }
2970
2858 } 2971 1
2859} 2972}
2860 2973
2861############################################################################# 2974#############################################################################
2862 2975
2863package CFClient::UI::Statusbox; 2976package CFClient::UI::Multiplexer;
2864 2977
2865our @ISA = CFClient::UI::VBox::; 2978our @ISA = CFClient::UI::Container::;
2866 2979
2867sub new { 2980sub new {
2868 my $class = shift; 2981 my $class = shift;
2869 2982
2870 $class->SUPER::new ( 2983 my $self = $class->SUPER::new (
2984 @_,
2985 );
2986
2987 $self->{current} = $self->{children}[0]
2988 if @{ $self->{children} };
2989
2990 $self
2991}
2992
2993sub add {
2994 my ($self, @widgets) = @_;
2995
2996 $self->SUPER::add (@widgets);
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000}
3001
3002sub set_current_page {
3003 my ($self, $page_or_widget) = @_;
3004
3005 my $widget = ref $page_or_widget
3006 ? $page_or_widget
3007 : $self->{children}[$page_or_widget];
3008
3009 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011
3012 $self->_emit (page_changed => $self->{current});
3013
3014 $self->realloc;
3015}
3016
3017sub visible_children {
3018 $_[0]{current}
3019}
3020
3021sub size_request {
3022 my ($self) = @_;
3023
3024 $self->{current}->size_request
3025}
3026
3027sub size_allocate {
3028 my ($self, $w, $h) = @_;
3029
3030 $self->{current}->configure (0, 0, $w, $h);
3031}
3032
3033sub _draw {
3034 my ($self) = @_;
3035
3036 $self->{current}->draw;
3037}
3038
3039#############################################################################
3040
3041package CFClient::UI::Notebook;
3042
3043our @ISA = CFClient::UI::VBox::;
3044
3045sub new {
3046 my $class = shift;
3047
3048 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self
3052 @_,
3053 );
3054
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3056 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3057
3058 $self
3059}
3060
3061sub add {
3062 my ($self, $title, $widget, $tooltip) = @_;
3063
3064 Scalar::Util::weaken $self;
3065
3066 $self->{buttonbar}->add (new CFClient::UI::Button
3067 markup => $title,
3068 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) },
3070 );
3071
3072 $self->{multiplexer}->add ($widget);
3073}
3074
3075sub set_current_page {
3076 my ($self, $page) = @_;
3077
3078 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current});
3080}
3081
3082#############################################################################
3083
3084package CFClient::UI::Statusbox;
3085
3086our @ISA = CFClient::UI::VBox::;
3087
3088sub new {
3089 my $class = shift;
3090
3091 my $self = $class->SUPER::new (
2871 fontsize => 0.8, 3092 fontsize => 0.8,
2872 @_, 3093 @_,
2873 ) 3094 );
3095
3096 Scalar::Util::weaken (my $this = $self);
3097
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099
3100 $self
2874} 3101}
2875 3102
2876sub reorder { 3103sub reorder {
2877 my ($self) = @_; 3104 my ($self) = @_;
2878 my $NOW = time; 3105 my $NOW = Time::HiRes::time;
3106
3107 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} };
2879 3111
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3112 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3113 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3114 }
2883 3115
… …
2886 my @items = sort { 3118 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3119 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3120 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3121 } values %{ $self->{item} };
2890 3122
3123 $self->{timer}->interval (1);
3124
2891 my $count = 10 + 1; 3125 my $count = 10 + 1;
2892 for my $item (@items) { 3126 for my $item (@items) {
2893 last unless --$count; 3127 last unless --$count;
2894 3128
2895 push @widgets, $item->{label} ||= do { 3129 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3130 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3131 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3132 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3133 : $item->{text};
2900 3134
… …
2908 tooltip => $item->{tooltip}, 3142 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3143 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3144 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3145 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3146 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3147 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3148 can_events => 1,
2915 can_hover => 1 3149 can_hover => 1
2916 }; 3150 };
3151
3152 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3153 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3154 $label->update;
3155 $label->set_max_size (undef, $label->{req_h} * $diff)
3156 if $diff < 1;
3157 $self->{timer}->interval (1/30);
3158 } else {
3159 $label->{fg}[3] = $item->{fg}[3] || 1;
3160 }
3161
3162 push @widgets, $label;
2917 } 3163 }
2918 3164
2919 $self->clear; 3165 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3166 $self->SUPER::add (reverse @widgets);
2921} 3167}
… …
2926 $text =~ s/^\s+//; 3172 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3173 $text =~ s/\s+$//;
2928 3174
2929 return unless $text; 3175 return unless $text;
2930 3176
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3177 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3178
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3179 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3180
2935 if (my $item = $self->{item}{$group}) { 3181 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3182 if ($item->{text} eq $text) {
… …
2966 3212
2967 $self->reorder; 3213 $self->reorder;
2968 $self->SUPER::reconfigure; 3214 $self->SUPER::reconfigure;
2969} 3215}
2970 3216
3217sub DESTROY {
3218 my ($self) = @_;
3219
3220 $self->{timer}->cancel;
3221
3222 $self->SUPER::DESTROY;
3223}
3224
2971############################################################################# 3225#############################################################################
2972 3226
2973package CFClient::UI::Root; 3227package CFClient::UI::Inventory;
2974 3228
2975our @ISA = CFClient::UI::Container::; 3229our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3230
2979sub new { 3231sub new {
2980 my $class = shift; 3232 my $class = shift;
2981 3233
2982 $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root;
3523
3524our @ISA = CFClient::UI::Container::;
3525
3526use List::Util qw(min max);
3527
3528use CFClient::OpenGL;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
2983 visible => 1, 3534 visible => 1,
2984 @_, 3535 @_,
2985 ) 3536 );
2986}
2987 3537
2988sub configure { 3538 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3539
2991 $self->{w} = $w; 3540 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3541}
3001 3542
3002sub size_request { 3543sub size_request {
3003 my ($self) = @_; 3544 my ($self) = @_;
3004 3545
3005 ($self->{w}, $self->{h}) 3546 ($self->{w}, $self->{h})
3547}
3548
3549sub _to_pixel {
3550 my ($coord, $size, $max) = @_;
3551
3552 $coord =
3553 $coord eq "center" ? ($max - $size) * 0.5
3554 : $coord eq "max" ? $max
3555 : $coord;
3556
3557 $coord = 0 if $coord < 0;
3558 $coord = $max - $size if $coord > $max - $size;
3559
3560 int $coord + 0.5
3006} 3561}
3007 3562
3008sub size_allocate { 3563sub size_allocate {
3009 my ($self, $w, $h) = @_; 3564 my ($self, $w, $h) = @_;
3010 3565
3011 for my $child ($self->children) { 3566 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3568
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3569 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3570 $Y = $child->{force_y} if exists $child->{force_y};
3016 3571
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3572 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3573 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3574
3025 $child->configure ($X, $Y, $W, $H); 3575 $child->configure ($X, $Y, $W, $H);
3026 } 3576 }
3027} 3577}
3028 3578
… …
3039} 3589}
3040 3590
3041sub update { 3591sub update {
3042 my ($self) = @_; 3592 my ($self) = @_;
3043 3593
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3594 $::WANT_REFRESH++;
3046} 3595}
3047 3596
3048sub add { 3597sub add {
3049 my ($self, @children) = @_; 3598 my ($self, @children) = @_;
3050 3599
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3600 $_->{is_toplevel} = 1
3053 3601 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3602
3059 $self->SUPER::add (@children); 3603 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3604}
3067 3605
3068sub remove { 3606sub remove {
3069 my ($self, @children) = @_; 3607 my ($self, @children) = @_;
3070 3608
3071 $self->SUPER::remove (@children); 3609 $self->SUPER::remove (@children);
3610
3611 delete $self->{is_toplevel}
3612 for @children;
3072 3613
3073 while (@children) { 3614 while (@children) {
3074 my $w = pop @children; 3615 my $w = pop @children;
3075 push @children, $w->children; 3616 push @children, $w->children;
3076 $w->set_invisible; 3617 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3636 while ($self->{refresh_hook}) {
3096 $_->() 3637 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3638 for values %{delete $self->{refresh_hook}};
3098 } 3639 }
3099 3640
3100 if ($self->{check_size}) { 3641 if ($self->{realloc}) {
3642 my %queue;
3101 my @queue; 3643 my @queue;
3644 my $widget;
3102 3645
3646 outer:
3103 while () { 3647 while () {
3104 if ($self->{check_size}) { 3648 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3649 for $widget (values %$realloc) {
3650 $widget->{visible} or next; # do not resize invisible widgets
3106 3651
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3652 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3653
3654 push @{ $queue[$widget->{visible}] }, $widget;
3655 }
3109 } 3656 }
3110 3657
3658 while () {
3659 @queue or last outer;
3660
3111 my $widget = pop @queue || last; 3661 $widget = pop @{ $queue[-1] || [] }
3112 3662 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3663
3664 pop @queue;
3665 }
3666
3667 delete $queue{$widget+0};
3668
3669 my ($w, $h) = $widget->size_request;
3670
3671 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3672 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3673
3674 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3675 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3676
3677 $w = $widget->{force_w} if exists $widget->{force_w};
3678 $h = $widget->{force_h} if exists $widget->{force_h};
3679
3680 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3681 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3682 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3683 $widget->{req_h} = $h;
3125 3684
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3685 $self->{size_alloc}{$widget+0} = $widget;
3127 3686
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3687 if (my $parent = $widget->{parent}) {
3688 $self->{realloc}{$parent+0} = $parent
3689 unless $queue{$parent+0};
3690
3691 $parent->{force_size_alloc} = 1;
3692 $self->{size_alloc}{$parent+0} = $parent;
3693 }
3130 } 3694 }
3695
3696 delete $self->{realloc}{$widget+0};
3131 } 3697 }
3132 } 3698 }
3133 3699
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3700 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3701 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3702 values %$size_alloc;
3137 3703
3138 while () { 3704 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3705 my $widget = pop @queue || last;
3706
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3708
3141 $w = 0 if $w < 0; 3709 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3710 $h = 0 if $h < 0;
3143 3711
3712 $w = int $w + 0.5;
3713 $h = int $h + 0.5;
3714
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w};
3717 $widget->{old_h} = $widget->{h};
3718
3144 $widget->{w} = $w; 3719 $widget->{w} = $w;
3145 $widget->{h} = $h; 3720 $widget->{h} = $h;
3721
3146 $widget->emit (size_allocate => $w, $h); 3722 $widget->emit (size_allocate => $w, $h);
3723 }
3147 } 3724 }
3148 } 3725 }
3149 3726
3150 while ($self->{post_alloc_hook}) { 3727 while ($self->{post_alloc_hook}) {
3151 $_->() 3728 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3729 for values %{delete $self->{post_alloc_hook}};
3153 } 3730 }
3731
3154 3732
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3733 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3734 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3735 glClear GL_COLOR_BUFFER_BIT;
3158 3736
… …
3160 glLoadIdentity; 3738 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3740 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3741 glLoadIdentity;
3164 3742
3743 {
3744 package CFClient::UI::Base;
3745
3746 ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h});
3748 }
3749
3165 $self->_draw; 3750 $self->_draw;
3166} 3751}
3167 3752
3168############################################################################# 3753#############################################################################
3169 3754

Diff Legend

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