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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 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;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 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 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 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
176 $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.]+$/;
177 $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};
178 $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};
179 $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.]+$/;
180 $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};
181 $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
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $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};
219 $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};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
275 delete $self->{visible}; 278 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->focus_out;
284 287
285 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
309 312
310 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
311 if $self->{parent}; 314 if $self->{parent};
312} 315}
313 316
314sub move { 317sub move_abs {
315 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
316 319
317 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
318 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
319 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
320 323
321 $self->update; 324 $self->update;
322} 325}
323 326
324sub set_size { 327sub set_size {
325 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
326 329
327 $self->{def_w} = $w; 330 $self->{force_w} = $w;
328 $self->{def_h} = $h; 331 $self->{force_h} = $h;
329 332
330 $self->realloc; 333 $self->realloc;
331} 334}
332 335
333sub size_request { 336sub size_request {
… …
337 340
338sub configure { 341sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
340 343
341 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
344 349
345 # use alignment to adjust x, y 350 # use alignment to adjust x, y
346 351
347 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 354 }
352 355
353 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 357 $self->{x} = $x;
355 $self->{y} = $y; 358 $self->{y} = $y;
356 $self->update; 359 $self->update;
357 } 360 }
358 361
359 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 363 return unless $self->{visible};
361 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
363 } 369 }
364} 370}
365 371
366sub size_allocate { 372sub size_allocate {
367 # nothing to be done 373 # nothing to be done
368} 374}
369 375
370sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
371} 382}
372 383
373sub set_max_size { 384sub set_max_size {
374 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
375 386
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
378} 391}
379 392
380sub set_tooltip { 393sub set_tooltip {
381 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
382 395
… …
387 400
388 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
389 402
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 406 }
394} 407}
395 408
396# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
397sub coord2local { 410sub coord2local {
… …
434 447
435 $::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
436 unless $FOCUS; 449 unless $FOCUS;
437} 450}
438 451
439sub mouse_motion { } 452sub mouse_motion { 0 }
440sub button_up { } 453sub button_up { 0 }
441sub key_down { } 454sub key_down { 0 }
442sub key_up { } 455sub key_up { 0 }
443 456
444sub button_down { 457sub button_down {
445 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
446 459
447 $self->focus_in; 460 $self->focus_in;
448}
449 461
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455 464
456sub find_widget { 465sub find_widget {
457 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
458 467
459 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
467 476
468sub set_parent { 477sub set_parent {
469 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
470 479
471 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476} 482}
477 483
478sub connect { 484sub connect {
479 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
480 486
… …
499} 505}
500 506
501sub realloc { 507sub realloc {
502 my ($self) = @_; 508 my ($self) = @_;
503 509
504 return unless $self->{visible}; 510 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
507 512
508 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
510} 519}
511 520
512sub update { 521sub update {
513 my ($self) = @_; 522 my ($self) = @_;
514 523
515 $self->{parent}->update 524 $self->{parent}->update
516 if $self->{parent}; 525 if $self->{parent};
517} 526}
518 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
538
519sub draw { 539sub draw {
520 my ($self) = @_; 540 my ($self) = @_;
521 541
522 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);
523 553
524 glPushMatrix; 554 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 556
529 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 559 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 561 glBegin GL_QUADS;
536 glVertex $x , $y; 562 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
540 glEnd; 566 glEnd;
541 glDisable GL_BLEND; 567 glDisable GL_BLEND;
542 } 568 }
543 569
544 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 571 glPushMatrix;
546 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 575 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
553 glEnd; 579 glEnd;
554 glPopMatrix; 580 glPopMatrix;
555 #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;
556 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
557} 586}
558 587
559sub _draw { 588sub _draw {
560 my ($self) = @_; 589 my ($self) = @_;
561 590
… …
599 628
600 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
602 631
603 glEnable GL_BLEND; 632 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 634 glColor_premultiply @$color;
606 635
607 glBegin GL_QUADS; 636 glBegin GL_QUADS;
608 glVertex 0 , 0; 637 glVertex 0 , 0;
609 glVertex 0 , $h; 638 glVertex 0 , $h;
610 glVertex $w, $h; 639 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
627} 656}
628 657
629sub size_request { 658sub size_request {
630 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
631} 662}
632 663
633sub draw { } 664sub draw { }
634 665
635############################################################################# 666#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
640 671
641sub new { 672sub new {
642 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
643 674
644 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
645 676
646 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
647 children => [], 678 children => [],
648 can_events => 0, 679 can_events => 0,
649 %arg, 680 %arg,
650 ); 681 );
682
651 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
652 685
653 $self 686 $self
654} 687}
655 688
656sub add { 689sub add {
… …
704 $x -= $self->{x}; 737 $x -= $self->{x};
705 $y -= $self->{y}; 738 $y -= $self->{y};
706 739
707 my $res; 740 my $res;
708 741
709 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
711 and return $res; 744 and return $res;
712 } 745 }
713 746
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756sub size_request { 789sub size_request {
757 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
758} 791}
759 792
760sub size_allocate { 793sub size_allocate {
761 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
762 795
763 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
764} 797}
765 798
766############################################################################# 799#############################################################################
800
801# back-buffered drawing area
767 802
768package CFClient::UI::Window; 803package CFClient::UI::Window;
769 804
770our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
771 806
… …
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 819 $self->SUPER::update;
785} 820}
786 821
787sub size_allocate { 822sub size_allocate {
788 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
789 824
790 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
791 $self->update 826 $self->update;
792 if $changed;
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, $changed) = @_; 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
… …
947 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1004}
950 1005
951sub size_allocate { 1006sub size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
953 1008
954 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
955 1010
956 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1013}
959 1014
… …
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,
1047 $h + $self->border * 2, 1120 $h + $self->border * 2,
1048 ) 1121 )
1049} 1122}
1050 1123
1051sub size_allocate { 1124sub size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1053 1126
1054 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1055 1132
1133 my $border = $self->border;
1134
1056 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1058 1137
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1063} 1139}
1064 1140
1065sub button_down { 1141sub button_down {
1066 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1067 1143
… …
1083 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1084 1160
1085 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1087 1163
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1168 $self->realloc;
1094 }; 1169 };
1095 1170
1096 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1175 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1102 1177
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1179
1105 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1107 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1111 } 1188 1
1112} 1189}
1113 1190
1114sub button_up { 1191sub button_up {
1115 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1116 1193
1117 delete $self->{motion}; 1194 !!delete $self->{motion}
1118} 1195}
1119 1196
1120sub mouse_motion { 1197sub mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1122 1199
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1124} 1203}
1125 1204
1126sub _draw { 1205sub _draw {
1127 my ($self) = @_; 1206 my ($self) = @_;
1128 1207
1208 my $child = $self->{children}[0];
1209
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1212
1132 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1215
1135 my $border = $self->border; 1216 my $border = $self->border;
1136 1217
1137 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1223
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1145 1226
1146 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1232 }
1157 1233
1158 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1159 1235
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1163} 1242}
1164 1243
1165############################################################################# 1244#############################################################################
1166 1245
1167package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1241 (sum @$hs), 1320 (sum @$hs),
1242 ) 1321 )
1243} 1322}
1244 1323
1245sub size_allocate { 1324sub size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1247 1326
1248 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1249 1328
1250 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1409 )
1331} 1410}
1332 1411
1333sub size_allocate { 1412sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1335 1414
1336 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1416 my $children = $self->{children};
1338 1417
1339 my @req; 1418 my @req;
… …
1422 ellipsise => 3, # end 1501 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1424 fontsize => 1, 1503 fontsize => 1,
1425 align => -1, 1504 align => -1,
1426 valign => -1, 1505 valign => -1,
1427 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1428 can_events => 0, 1508 can_events => 0,
1429 %arg 1509 %arg
1430 ); 1510 );
1431 1511
1432 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1459 1539
1460 delete $self->{texture}; 1540 delete $self->{texture};
1461 $self->SUPER::update; 1541 $self->SUPER::update;
1462} 1542}
1463 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1464sub set_text { 1551sub set_text {
1465 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1466 1553
1467 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1469 1556
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1472 1559
1560 delete $self->{size_req};
1473 $self->realloc; 1561 $self->realloc;
1562 $self->update;
1474} 1563}
1475 1564
1476sub set_markup { 1565sub set_markup {
1477 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1478 1567
… …
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);
1486 1575
1576 delete $self->{size_req};
1487 $self->realloc; 1577 $self->realloc;
1578 $self->update;
1488} 1579}
1489 1580
1490sub size_request { 1581sub size_request {
1491 my ($self) = @_; 1582 my ($self) = @_;
1492 1583
1584 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1590
1499 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1500 1592
1501 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1596
1505 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1506 1598
1507 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1509 } 1604 };
1510 1605
1511 ( 1606 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1607}
1516 1608
1517sub size_allocate { 1609sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1519 1613
1520 delete $self->{texture} 1614 delete $self->{texture}
1521 if $changed; 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->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1531} 1633}
1532 1634
1533sub _draw { 1635sub _draw {
1534 my ($self) = @_; 1636 my ($self) = @_;
1535 1637
… …
1541 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1647
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1547 1650
1651 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1551 1655
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1659 };
1558 1660
1559 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1662
1562 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1565 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 } 1670 }
1568 1671
1569 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1570} 1673}
… …
1599 1702
1600 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1601 1704
1602 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1603 1706
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1708 $self->{text} = $text;
1608 1709
1609 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1611 1713
1612 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1613} 1718}
1614 1719
1615sub set_text { 1720sub set_text {
1616 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1617 1722
1618 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1724 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1725}
1623 1726
1624sub get_text { 1727sub get_text {
1625 $_[0]{text} 1728 $_[0]{text}
1626} 1729}
… …
1656 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1659 } elsif ($uni) { 1762 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1661 } 1766 }
1662 1767
1663 $self->_set_text ($text); 1768 $self->_set_text ($text);
1664 1769
1665 $self->realloc; 1770 $self->realloc;
1771
1772 1
1666} 1773}
1667 1774
1668sub focus_in { 1775sub focus_in {
1669 my ($self) = @_; 1776 my ($self) = @_;
1670 1777
… …
1685 utf8::encode $text; 1792 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1687 1794
1688 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1689 $self->update; 1796 $self->update;
1797
1798 1
1690} 1799}
1691 1800
1692sub mouse_motion { 1801sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1695} 1806}
1696 1807
1697sub _draw { 1808sub _draw {
1698 my ($self) = @_; 1809 my ($self) = @_;
1699 1810
1700 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1701 1812
1702 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1705 } else { 1816 } else {
1706 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1707 } 1818 }
1708 1819
1709 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1823 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1776 } else { 1887 } else {
1777 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1778 } 1889 }
1779 1890
1780 } else { 1891 } else {
1781 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1782 } 1895 1
1783
1784} 1896}
1785 1897
1786############################################################################# 1898#############################################################################
1787 1899
1788package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1797 1909
1798sub new { 1910sub new {
1799 my $class = shift; 1911 my $class = shift;
1800 1912
1801 $class->SUPER::new ( 1913 $class->SUPER::new (
1802 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1803 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1805 can_hover => 1, 1918 can_hover => 1,
1806 align => 0, 1919 align => 0,
1807 valign => 0, 1920 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1817 1930
1818 $self->emit ("activate") 1931 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1821} 1936}
1822 1937
1823sub _draw { 1938sub _draw {
1824 my ($self) = @_; 1939 my ($self) = @_;
1825 1940
1826 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1942
1832 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1835 1946
… …
1854 1965
1855sub new { 1966sub new {
1856 my $class = shift; 1967 my $class = shift;
1857 1968
1858 $class->SUPER::new ( 1969 $class->SUPER::new (
1859 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1860 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1974 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1975 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1976 state => 0,
… …
1868} 1980}
1869 1981
1870sub size_request { 1982sub size_request {
1871 my ($self) = @_; 1983 my ($self) = @_;
1872 1984
1873 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1874} 1986}
1875 1987
1876sub button_down { 1988sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1878 1990
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1883 } 1999 1
1884} 2000}
1885 2001
1886sub _draw { 2002sub _draw {
1887 my ($self) = @_; 2003 my ($self) = @_;
1888 2004
1889 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1890 2006
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2008
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2012
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2014
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2016
… …
2053 2171
2054 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2056 2174
2057 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2180
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2284 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2285 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2286 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2287 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2288 min_h => $::WIDTH / 80,
2170 vertical => 0, 2289 vertical => 0,
2171 can_hover => 1, 2290 can_hover => 1,
2172 inner_pad => 0.02, 2291 inner_pad => 0.02,
2173 @_ 2292 @_
2174 ); 2293 );
… …
2214} 2333}
2215 2334
2216sub size_request { 2335sub size_request {
2217 my ($self) = @_; 2336 my ($self) = @_;
2218 2337
2219 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2339}
2224 2340
2225sub button_down { 2341sub button_down {
2226 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
2227 2343
2228 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2229 2345
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2347
2232 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2233} 2349}
2234 2350
2235sub mouse_motion { 2351sub mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2237 2353
… …
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2358
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2360
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2246 } 2366 1
2247} 2367}
2248 2368
2249sub update { 2369sub update {
2250 my ($self) = @_; 2370 my ($self) = @_;
2251 2371
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2254 2381
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2257 2384
… …
2263 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2265 2392
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2268 }); 2395 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2396
2276 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2277 2398
2278 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2279 2400
… …
2377 $self->{fontsize} = $fontsize; 2498 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2499 $self->reflow;
2379} 2500}
2380 2501
2381sub size_allocate { 2502sub size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2503 my ($self, $w, $h) = @_;
2383 2504
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2505 $self->SUPER::size_allocate ($w, $h);
2385
2386 return unless $changed;
2387 2506
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2507 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2509 $self->{layout}->set_width ($self->{children}[0]{w});
2391 2510
… …
2475 2594
2476 delete $self->{texture}; 2595 delete $self->{texture};
2477 } 2596 }
2478 2597
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2482 2601
2483 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2484 2603
2485 my $y0 = $top; 2604 my $y0 = $top;
… …
2520sub _draw { 2639sub _draw {
2521 my ($self) = @_; 2640 my ($self) = @_;
2522 2641
2523 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2528 2647
2529 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2530 2649
2531} 2650}
… …
2614} 2733}
2615 2734
2616sub set_tooltip_from { 2735sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2736 my ($self, $widget) = @_;
2618 2737
2738 my $tooltip = $widget->{tooltip};
2739
2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2619 $self->add (new CFClient::UI::Label 2747 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2748 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2750 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2751 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2752 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2761
2634 ($w + 4, $h + 4) 2762 ($w + 4, $h + 4)
2635} 2763}
2636 2764
2637sub size_allocate { 2765sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2766 my ($self, $w, $h) = @_;
2639 2767
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2643} 2787}
2644 2788
2645sub _draw { 2789sub _draw {
2646 my ($self) = @_; 2790 my ($self) = @_;
2647 2791
… …
2664 glVertex $w, $h; 2808 glVertex $w, $h;
2665 glVertex $w, 0; 2809 glVertex $w, 0;
2666 glEnd; 2810 glEnd;
2667 2811
2668 glTranslate 2 - 0.375, 2 - 0.375; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2813
2669 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2670} 2815}
2671 2816
2672############################################################################# 2817#############################################################################
2673 2818
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2878
2734 if ($tex) { 2879 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2740 } 2885 }
2741} 2886}
2742 2887
… …
2749 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2750} 2895}
2751 2896
2752############################################################################# 2897#############################################################################
2753 2898
2754package CFClient::UI::Inventory; 2899package CFClient::UI::Buttonbar;
2755 2900
2756our @ISA = CFClient::UI::ScrolledWindow::; 2901our @ISA = CFClient::UI::HBox::;
2757 2902
2758sub new { 2903# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 2904
2794############################################################################# 2905#############################################################################
2795 2906
2796package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2797 2908
… …
2838 # maybe save $GRAB? must be careful about events... 2949 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 2950 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 2951 $self->{button} = $ev->{button};
2841 2952
2842 $self->show; 2953 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 2955}
2845 2956
2846sub mouse_motion { 2957sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2848 2959
2849 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2852} 2965}
2853 2966
2854sub button_up { 2967sub button_up {
2855 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2856 2969
… …
2858 undef $GRAB; 2971 undef $GRAB;
2859 $self->hide; 2972 $self->hide;
2860 2973
2861 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2863 } 2980 1
2864} 2981}
2865 2982
2866############################################################################# 2983#############################################################################
2867 2984
2868package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2869 2986
2870our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2871 2988
2872sub new { 2989sub new {
2873 my $class = shift; 2990 my $class = shift;
2874 2991
2875 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3101 fontsize => 0.8,
2877 @_, 3102 @_,
2878 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2879} 3110}
2880 3111
2881sub reorder { 3112sub reorder {
2882 my ($self) = @_; 3113 my ($self) = @_;
2883 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2884 3120
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3123 }
2888 3124
… …
2891 my @items = sort { 3127 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2895 3131
3132 $self->{timer}->interval (1);
3133
2896 my $count = 10 + 1; 3134 my $count = 10 + 1;
2897 for my $item (@items) { 3135 for my $item (@items) {
2898 last unless --$count; 3136 last unless --$count;
2899 3137
2900 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3142 : $item->{text};
2905 3143
… …
2913 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3157 can_events => 1,
2920 can_hover => 1 3158 can_hover => 1
2921 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2922 } 3172 }
2923 3173
2924 $self->clear; 3174 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2926} 3176}
… …
2931 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2933 3183
2934 return unless $text; 3184 return unless $text;
2935 3185
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3187
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3189
2940 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2971 3221
2972 $self->reorder; 3222 $self->reorder;
2973 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2974} 3224}
2975 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2976############################################################################# 3234#############################################################################
2977 3235
3236package CFClient::UI::Inventory;
3237
3238our @ISA = CFClient::UI::ScrolledWindow::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
3485 @_,
3486 )
3487}
3488
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3544 my ($self, $spell) = @_;
3545
3546 $self->{spell}->{$spell->{name}} = $spell;
3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
2978package CFClient::UI::Root; 3559package CFClient::UI::Root;
2979 3560
2980our @ISA = CFClient::UI::Container::; 3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
2981 3564
2982use CFClient::OpenGL; 3565use CFClient::OpenGL;
2983 3566
2984sub new { 3567sub new {
2985 my $class = shift; 3568 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3575 Scalar::Util::weaken ($self->{root} = $self);
2993 3576
2994 $self 3577 $self
2995} 3578}
2996 3579
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3580sub size_request {
3014 my ($self) = @_; 3581 my ($self) = @_;
3015 3582
3016 ($self->{w}, $self->{h}) 3583 ($self->{w}, $self->{h})
3017} 3584}
3018 3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
3598}
3599
3019sub size_allocate { 3600sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3601 my ($self, $w, $h) = @_;
3021 3602
3022 for my $child ($self->children) { 3603 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3605
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3606 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3607 $Y = $child->{force_y} if exists $child->{force_y};
3027 3608
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3609 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3610 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3611
3036 $child->configure ($X, $Y, $W, $H); 3612 $child->configure ($X, $Y, $W, $H);
3037 } 3613 }
3038} 3614}
3039 3615
… …
3056} 3632}
3057 3633
3058sub add { 3634sub add {
3059 my ($self, @children) = @_; 3635 my ($self, @children) = @_;
3060 3636
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3637 $_->{is_toplevel} = 1
3063 3638 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3639
3069 $self->SUPER::add (@children); 3640 $self->SUPER::add (@children);
3070} 3641}
3071 3642
3072sub remove { 3643sub remove {
3073 my ($self, @children) = @_; 3644 my ($self, @children) = @_;
3074 3645
3075 $self->SUPER::remove (@children); 3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3076 3650
3077 while (@children) { 3651 while (@children) {
3078 my $w = pop @children; 3652 my $w = pop @children;
3079 push @children, $w->children; 3653 push @children, $w->children;
3080 $w->set_invisible; 3654 $w->set_invisible;
… …
3100 $_->() 3674 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3675 for values %{delete $self->{refresh_hook}};
3102 } 3676 }
3103 3677
3104 if ($self->{realloc}) { 3678 if ($self->{realloc}) {
3679 my %queue;
3105 my @queue; 3680 my @queue;
3681 my $widget;
3106 3682
3683 outer:
3107 while () { 3684 while () {
3108 if ($self->{realloc}) { 3685 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3686 for $widget (values %$realloc) {
3687 $widget->{visible} or next; # do not resize invisible widgets
3110 3688
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3689 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3113 } 3693 }
3114 3694
3695 while () {
3696 @queue or last outer;
3697
3698 $widget = pop @{ $queue[-1] || [] }
3699 and last;
3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3719 $widget->{req_w} = $w;
3720 $widget->{req_h} = $h;
3721
3722 $self->{size_alloc}{$widget+0} = $widget;
3723
3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3734 }
3735 }
3736
3737 while (my $size_alloc = delete $self->{size_alloc}) {
3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3739 values %$size_alloc;
3740
3741 while () {
3115 my $widget = pop @queue || last; 3742 my $widget = pop @queue || last;
3116 3743
3117 $widget->{visible} or last; # do not resize invisible widgets 3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3745
3142 $w = 0 if $w < 0; 3746 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3747 $h = 0 if $h < 0;
3144 3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3145 $widget->{w} = $w; 3756 $widget->{w} = $w;
3146 $widget->{h} = $h; 3757 $widget->{h} = $h;
3758
3147 $widget->emit (size_allocate => $w, $h, 1); 3759 $widget->emit (size_allocate => $w, $h);
3760 }
3148 } 3761 }
3149 } 3762 }
3150 3763
3151 while ($self->{post_alloc_hook}) { 3764 while ($self->{post_alloc_hook}) {
3152 $_->() 3765 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3766 for values %{delete $self->{post_alloc_hook}};
3154 } 3767 }
3768
3155 3769
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
3159 3773
… …
3161 glLoadIdentity; 3775 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3778 glLoadIdentity;
3165 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
3166 $self->_draw; 3787 $self->_draw;
3167} 3788}
3168 3789
3169############################################################################# 3790#############################################################################
3170 3791

Diff Legend

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