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

Diff Legend

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