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.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->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 # 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
542
519sub draw { 543sub draw {
520 my ($self) = @_; 544 my ($self) = @_;
521 545
522 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);
523 557
524 glPushMatrix; 558 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 560
529 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 563 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 565 glBegin GL_QUADS;
536 glVertex $x , $y; 566 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
540 glEnd; 570 glEnd;
541 glDisable GL_BLEND; 571 glDisable GL_BLEND;
542 } 572 }
543 573
544 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 575 glPushMatrix;
546 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 579 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
553 glEnd; 583 glEnd;
554 glPopMatrix; 584 glPopMatrix;
555 #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;
556 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
557} 590}
558 591
559sub _draw { 592sub _draw {
560 my ($self) = @_; 593 my ($self) = @_;
561 594
… …
599 632
600 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
602 635
603 glEnable GL_BLEND; 636 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 638 glColor_premultiply @$color;
606 639
607 glBegin GL_QUADS; 640 glBegin GL_QUADS;
608 glVertex 0 , 0; 641 glVertex 0 , 0;
609 glVertex 0 , $h; 642 glVertex 0 , $h;
610 glVertex $w, $h; 643 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
627} 660}
628 661
629sub size_request { 662sub size_request {
630 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
631} 666}
632 667
633sub draw { } 668sub draw { }
634 669
635############################################################################# 670#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
640 675
641sub new { 676sub new {
642 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
643 678
644 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
645 680
646 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
647 children => [], 682 children => [],
648 can_events => 0, 683 can_events => 0,
649 %arg, 684 %arg,
650 ); 685 );
686
651 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
652 689
653 $self 690 $self
654} 691}
655 692
656sub add { 693sub add {
… …
704 $x -= $self->{x}; 741 $x -= $self->{x};
705 $y -= $self->{y}; 742 $y -= $self->{y};
706 743
707 my $res; 744 my $res;
708 745
709 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
711 and return $res; 748 and return $res;
712 } 749 }
713 750
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756sub size_request { 793sub size_request {
757 $_[0]{children}[0]->size_request 794 $_[0]{children}[0]->size_request
758} 795}
759 796
760sub size_allocate { 797sub size_allocate {
761 my ($self, $w, $h, $changed) = @_; 798 my ($self, $w, $h) = @_;
762 799
763 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
764} 801}
765 802
766############################################################################# 803#############################################################################
804
805# back-buffered drawing area
767 806
768package CFClient::UI::Window; 807package CFClient::UI::Window;
769 808
770our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
771 810
… …
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 823 $self->SUPER::update;
785} 824}
786 825
787sub size_allocate { 826sub size_allocate {
788 my ($self, $w, $h, $changed) = @_; 827 my ($self, $w, $h) = @_;
789 828
790 $self->SUPER::size_allocate ($w, $h, $changed); 829 $self->SUPER::size_allocate ($w, $h);
791 $self->update 830 $self->update;
792 if $changed;
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, $changed) = @_; 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
… …
947 my $child = $self->{vp}->child; 1006 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1008}
950 1009
951sub size_allocate { 1010sub size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1011 my ($self, $w, $h) = @_;
953 1012
954 $self->SUPER::size_allocate ($w, $h, $changed); 1013 $self->SUPER::size_allocate ($w, $h);
955 1014
956 my $child = $self->{vp}->child; 1015 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1017}
959 1018
… …
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,
1047 $h + $self->border * 2, 1124 $h + $self->border * 2,
1048 ) 1125 )
1049} 1126}
1050 1127
1051sub size_allocate { 1128sub size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1129 my ($self, $w, $h) = @_;
1053 1130
1054 return unless $changed; 1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1055 1136
1137 my $border = $self->border;
1138
1056 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
1058 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
1063} 1143}
1064 1144
1065sub button_down { 1145sub button_down {
1066 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1067 1147
… …
1083 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1084 1164
1085 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1087 1167
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1172 $self->realloc;
1094 }; 1173 };
1095 1174
1096 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1179 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1102 1181
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1183
1105 $self->{user_x} = $bx + $x - $ox; 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1185 # HACK: the next line is required to enforce placement
1107 1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1111 } 1192 1
1112} 1193}
1113 1194
1114sub button_up { 1195sub button_up {
1115 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1116 1197
1117 delete $self->{motion}; 1198 !!delete $self->{motion}
1118} 1199}
1119 1200
1120sub mouse_motion { 1201sub mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1122 1203
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1124} 1207}
1125 1208
1126sub _draw { 1209sub _draw {
1127 my ($self) = @_; 1210 my ($self) = @_;
1128 1211
1212 my $child = $self->{children}[0];
1213
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1216
1132 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1219
1135 my $border = $self->border; 1220 my $border = $self->border;
1136 1221
1137 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1227
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1145 1230
1146 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1236 }
1157 1237
1158 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1159 1239
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1163} 1246}
1164 1247
1165############################################################################# 1248#############################################################################
1166 1249
1167package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1241 (sum @$hs), 1324 (sum @$hs),
1242 ) 1325 )
1243} 1326}
1244 1327
1245sub size_allocate { 1328sub size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1329 my ($self, $w, $h) = @_;
1247 1330
1248 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1249 1332
1250 my $req_w = (sum @$ws) || 1; 1333 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1334 my $req_h = (sum @$hs) || 1;
… …
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1413 )
1331} 1414}
1332 1415
1333sub size_allocate { 1416sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1417 my ($self, $w, $h) = @_;
1335 1418
1336 my $space = $self->{vertical} ? $h : $w; 1419 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1420 my $children = $self->{children};
1338 1421
1339 my @req; 1422 my @req;
… …
1422 ellipsise => 3, # end 1505 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1424 fontsize => 1, 1507 fontsize => 1,
1425 align => -1, 1508 align => -1,
1426 valign => -1, 1509 valign => -1,
1427 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1428 can_events => 0, 1512 can_events => 0,
1429 %arg 1513 %arg
1430 ); 1514 );
1431 1515
1432 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1459 1543
1460 delete $self->{texture}; 1544 delete $self->{texture};
1461 $self->SUPER::update; 1545 $self->SUPER::update;
1462} 1546}
1463 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1464sub set_text { 1555sub set_text {
1465 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1466 1557
1467 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1469 1560
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1472 1563
1564 delete $self->{req_h};
1473 $self->realloc; 1565 $self->realloc;
1566 $self->update;
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};
1487 $self->realloc; 1581 $self->realloc;
1582 $self->update;
1488} 1583}
1489 1584
1490sub size_request { 1585sub size_request {
1491 my ($self) = @_; 1586 my ($self) = @_;
1492 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1596
1499 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1500 1598
1501 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1602
1505 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1506 1604
1507 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1509 } 1607 }
1510 1608
1609 ($w, $h)
1511 ( 1610 }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1611}
1516 1612
1517sub size_allocate { 1613sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1614 my ($self, $w, $h) = @_;
1615
1616 delete $self->{ox};
1519 1617
1520 delete $self->{texture} 1618 delete $self->{texture}
1521 if $changed; 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
… …
1541 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1643
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1547 1646
1647 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1551 1651
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1655 };
1558 1656
1559 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1658
1562 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1565 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 } 1666 }
1568 1667
1569 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1570} 1669}
… …
1599 1698
1600 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1601 1700
1602 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1603 1702
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1704 $self->{text} = $text;
1608 1705
1609 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1611 1709
1612 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1613} 1714}
1614 1715
1615sub set_text { 1716sub set_text {
1616 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1617 1718
1618 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1720 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1721}
1623 1722
1624sub get_text { 1723sub get_text {
1625 $_[0]{text} 1724 $_[0]{text}
1626} 1725}
… …
1656 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1659 } elsif ($uni) { 1758 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1661 } 1762 }
1662 1763
1663 $self->_set_text ($text); 1764 $self->_set_text ($text);
1664 1765
1665 $self->realloc; 1766 $self->realloc;
1767
1768 1
1666} 1769}
1667 1770
1668sub focus_in { 1771sub focus_in {
1669 my ($self) = @_; 1772 my ($self) = @_;
1670 1773
… …
1685 utf8::encode $text; 1788 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1687 1790
1688 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1689 $self->update; 1792 $self->update;
1793
1794 1
1690} 1795}
1691 1796
1692sub mouse_motion { 1797sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1694# 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
1695} 1802}
1696 1803
1697sub _draw { 1804sub _draw {
1698 my ($self) = @_; 1805 my ($self) = @_;
1699 1806
1700 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1701 1808
1702 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1705 } else { 1812 } else {
1706 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1707 } 1814 }
1708 1815
1709 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1819 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1776 } else { 1883 } else {
1777 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1778 } 1885 }
1779 1886
1780 } else { 1887 } else {
1781 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1782 } 1891 1
1783
1784} 1892}
1785 1893
1786############################################################################# 1894#############################################################################
1787 1895
1788package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1797 1905
1798sub new { 1906sub new {
1799 my $class = shift; 1907 my $class = shift;
1800 1908
1801 $class->SUPER::new ( 1909 $class->SUPER::new (
1802 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1803 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1805 can_hover => 1, 1914 can_hover => 1,
1806 align => 0, 1915 align => 0,
1807 valign => 0, 1916 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1817 1926
1818 $self->emit ("activate") 1927 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1821} 1932}
1822 1933
1823sub _draw { 1934sub _draw {
1824 my ($self) = @_; 1935 my ($self) = @_;
1825 1936
1826 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1938
1832 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1835 1942
… …
1854 1961
1855sub new { 1962sub new {
1856 my $class = shift; 1963 my $class = shift;
1857 1964
1858 $class->SUPER::new ( 1965 $class->SUPER::new (
1859 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1860 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1972 state => 0,
… …
1868} 1976}
1869 1977
1870sub size_request { 1978sub size_request {
1871 my ($self) = @_; 1979 my ($self) = @_;
1872 1980
1873 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1874} 1982}
1875 1983
1876sub button_down { 1984sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1878 1986
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1883 } 1995 1
1884} 1996}
1885 1997
1886sub _draw { 1998sub _draw {
1887 my ($self) = @_; 1999 my ($self) = @_;
1888 2000
1889 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1890 2002
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2004
1893 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;
1894 2008
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2010
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2012
… …
2053 2167
2054 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2056 2170
2057 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2058 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;
2059 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2176
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2170 vertical => 0, 2285 vertical => 0,
2171 can_hover => 1, 2286 can_hover => 1,
2172 inner_pad => 0.02, 2287 inner_pad => 0.02,
2173 @_ 2288 @_
2174 ); 2289 );
… …
2214} 2329}
2215 2330
2216sub size_request { 2331sub size_request {
2217 my ($self) = @_; 2332 my ($self) = @_;
2218 2333
2219 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2335}
2224 2336
2225sub button_down { 2337sub button_down {
2226 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2227 2339
2228 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2229 2341
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2343
2232 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2233} 2345}
2234 2346
2235sub mouse_motion { 2347sub mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2237 2349
… …
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2354
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2356
2245 $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
2246 } 2362 1
2247} 2363}
2248 2364
2249sub update { 2365sub update {
2250 my ($self) = @_; 2366 my ($self) = @_;
2251 2367
2252 $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}) {
2253 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2254 2377
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2257 2380
… …
2263 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2265 2388
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2268 }); 2391 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2392
2276 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2277 2394
2278 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2279 2396
… …
2377 $self->{fontsize} = $fontsize; 2494 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2495 $self->reflow;
2379} 2496}
2380 2497
2381sub size_allocate { 2498sub size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2499 my ($self, $w, $h) = @_;
2383 2500
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2501 $self->SUPER::size_allocate ($w, $h);
2385
2386 return unless $changed;
2387 2502
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2503 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
2391 2506
… …
2475 2590
2476 delete $self->{texture}; 2591 delete $self->{texture};
2477 } 2592 }
2478 2593
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2482 2597
2483 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2484 2599
2485 my $y0 = $top; 2600 my $y0 = $top;
… …
2520sub _draw { 2635sub _draw {
2521 my ($self) = @_; 2636 my ($self) = @_;
2522 2637
2523 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2526 $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});
2527 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2528 2643
2529 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2530 2645
2531} 2646}
… …
2614} 2729}
2615 2730
2616sub set_tooltip_from { 2731sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2618 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
2619 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2746 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2748 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2757
2634 ($w + 4, $h + 4) 2758 ($w + 4, $h + 4)
2635} 2759}
2636 2760
2637sub size_allocate { 2761sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2762 my ($self, $w, $h) = @_;
2639 2763
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 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 });
2643} 2783}
2644 2784
2645sub _draw { 2785sub _draw {
2646 my ($self) = @_; 2786 my ($self) = @_;
2647 2787
… …
2664 glVertex $w, $h; 2804 glVertex $w, $h;
2665 glVertex $w, 0; 2805 glVertex $w, 0;
2666 glEnd; 2806 glEnd;
2667 2807
2668 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2669 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2670} 2811}
2671 2812
2672############################################################################# 2813#############################################################################
2673 2814
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2874
2734 if ($tex) { 2875 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2740 } 2881 }
2741} 2882}
2742 2883
… …
2749 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2750} 2891}
2751 2892
2752############################################################################# 2893#############################################################################
2753 2894
2754package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2755 2896
2756our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2757 2898
2758sub new { 2899# 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 2900
2794############################################################################# 2901#############################################################################
2795 2902
2796package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2797 2904
… …
2838 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 2946 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2841 2948
2842 $self->show; 2949 $self->show;
2843 $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);
2844} 2951}
2845 2952
2846sub mouse_motion { 2953sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2848 2955
2849 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2852} 2961}
2853 2962
2854sub button_up { 2963sub button_up {
2855 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2856 2965
… …
2858 undef $GRAB; 2967 undef $GRAB;
2859 $self->hide; 2968 $self->hide;
2860 2969
2861 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2863 } 2976 1
2864} 2977}
2865 2978
2866############################################################################# 2979#############################################################################
2867 2980
2868package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2869 2982
2870our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2871 2984
2872sub new { 2985sub new {
2873 my $class = shift; 2986 my $class = shift;
2874 2987
2875 $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 (
2876 fontsize => 0.8, 3097 fontsize => 0.8,
2877 @_, 3098 @_,
2878 ) 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
2879} 3106}
2880 3107
2881sub reorder { 3108sub reorder {
2882 my ($self) = @_; 3109 my ($self) = @_;
2883 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} };
2884 3116
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3119 }
2888 3120
… …
2891 my @items = sort { 3123 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2895 3127
3128 $self->{timer}->interval (1);
3129
2896 my $count = 10 + 1; 3130 my $count = 10 + 1;
2897 for my $item (@items) { 3131 for my $item (@items) {
2898 last unless --$count; 3132 last unless --$count;
2899 3133
2900 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3138 : $item->{text};
2905 3139
… …
2913 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3153 can_events => 1,
2920 can_hover => 1 3154 can_hover => 1
2921 }; 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;
2922 } 3168 }
2923 3169
2924 $self->clear; 3170 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2926} 3172}
… …
2931 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2933 3179
2934 return unless $text; 3180 return unless $text;
2935 3181
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3183
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3185
2940 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2971 3217
2972 $self->reorder; 3218 $self->reorder;
2973 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2974} 3220}
2975 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2976############################################################################# 3230#############################################################################
2977 3231
3232package CFClient::UI::Inventory;
3233
3234our @ISA = CFClient::UI::ScrolledWindow::;
3235
3236sub new {
3237 my $class = shift;
3238
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
2978package CFClient::UI::Root; 3527package CFClient::UI::Root;
2979 3528
2980our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
2981 3532
2982use CFClient::OpenGL; 3533use CFClient::OpenGL;
2983 3534
2984sub new { 3535sub new {
2985 my $class = shift; 3536 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3543 Scalar::Util::weaken ($self->{root} = $self);
2993 3544
2994 $self 3545 $self
2995} 3546}
2996 3547
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 { 3548sub size_request {
3014 my ($self) = @_; 3549 my ($self) = @_;
3015 3550
3016 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3017} 3552}
3018 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
3566}
3567
3019sub size_allocate { 3568sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3569 my ($self, $w, $h) = @_;
3021 3570
3022 for my $child ($self->children) { 3571 for my $child ($self->children) {
3023 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)};
3024 3573
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3027 3576
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3578 $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 3579
3036 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3037 } 3581 }
3038} 3582}
3039 3583
… …
3056} 3600}
3057 3601
3058sub add { 3602sub add {
3059 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3060 3604
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3063 3606 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3607
3069 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3070} 3609}
3071 3610
3072sub remove { 3611sub remove {
3073 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3074 3613
3075 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3076 3618
3077 while (@children) { 3619 while (@children) {
3078 my $w = pop @children; 3620 my $w = pop @children;
3079 push @children, $w->children; 3621 push @children, $w->children;
3080 $w->set_invisible; 3622 $w->set_invisible;
… …
3100 $_->() 3642 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3102 } 3644 }
3103 3645
3104 if ($self->{realloc}) { 3646 if ($self->{realloc}) {
3647 my %queue;
3105 my @queue; 3648 my @queue;
3649 my $widget;
3106 3650
3651 outer:
3107 while () { 3652 while () {
3108 if ($self->{realloc}) { 3653 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3654 for $widget (values %$realloc) {
3655 $widget->{visible} or next; # do not resize invisible widgets
3110 3656
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3657 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3113 } 3661 }
3114 3662
3663 while () {
3664 @queue or last outer;
3665
3666 $widget = pop @{ $queue[-1] || [] }
3667 and last;
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}) {
3687 $widget->{req_w} = $w;
3688 $widget->{req_h} = $h;
3689
3690 $self->{size_alloc}{$widget+0} = $widget;
3691
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 }
3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3702 }
3703 }
3704
3705 while (my $size_alloc = delete $self->{size_alloc}) {
3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3707 values %$size_alloc;
3708
3709 while () {
3115 my $widget = pop @queue || last; 3710 my $widget = pop @queue || last;
3116 3711
3117 $widget->{visible} or last; # do not resize invisible widgets 3712 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 3713
3142 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3144 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
3145 $widget->{w} = $w; 3724 $widget->{w} = $w;
3146 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3147 $widget->emit (size_allocate => $w, $h, 1); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3148 } 3729 }
3149 } 3730 }
3150 3731
3151 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3152 $_->() 3733 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3154 } 3735 }
3736
3155 3737
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3159 3741
… …
3161 glLoadIdentity; 3743 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3746 glLoadIdentity;
3165 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
3166 $self->_draw; 3755 $self->_draw;
3167} 3756}
3168 3757
3169############################################################################# 3758#############################################################################
3170 3759

Diff Legend

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