ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224} 238}
225 239
… …
236 return if $self->{parent}; 250 return if $self->{parent};
237 251
238 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
239} 253}
240 254
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 255sub set_visible {
254 my ($self) = @_; 256 my ($self) = @_;
255 257
256 return if $self->{visible}; 258 return if $self->{visible};
257 259
258 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
260 262
261 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
262} 268}
263 269
264sub set_invisible { 270sub set_invisible {
265 my ($self) = @_; 271 my ($self) = @_;
266 272
267 return unless $self->{visible}; 273 return unless $self->{visible};
268 274
269 # broken show/hide model 275 $_->set_invisible for $self->children;
270 276
277 delete $self->{visible};
271 delete $self->{root}; 278 delete $self->{root};
272 delete $self->{visible};
273 279
274 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
276 282
277 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
279 285
280 $self->focus_out; 286 $self->focus_out;
281 287
282 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
283} 289}
… …
306 312
307 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
308 if $self->{parent}; 314 if $self->{parent};
309} 315}
310 316
311sub move { 317sub move_abs {
312 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
313 319
314 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
315 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
316 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
317 323
318 $self->update; 324 $self->update;
319} 325}
320 326
321sub set_size { 327sub set_size {
322 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
323 329
324 $self->{def_w} = $w; 330 $self->{force_w} = $w;
325 $self->{def_h} = $h; 331 $self->{force_h} = $h;
326 332
327 $self->check_size; 333 $self->realloc;
328} 334}
329 335
330sub size_request { 336sub size_request {
331 require Carp; 337 require Carp;
332 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
334 340
335sub configure { 341sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
337 343
338 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
341 349
342 # use alignment to adjust x, y 350 # use alignment to adjust x, y
343 351
344 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 354 }
349 355
350 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 357 $self->{x} = $x;
352 $self->{y} = $y; 358 $self->{y} = $y;
353 $self->update; 359 $self->update;
354 } 360 }
355 361
356 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
358 } 369 }
359} 370}
360 371
361sub size_allocate { 372sub size_allocate {
362 # nothing to be done 373 # nothing to be done
363} 374}
364 375
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
373} 382}
374 383
375sub set_max_size { 384sub set_max_size {
376 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
377 386
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
380} 391}
381 392
382sub set_tooltip { 393sub set_tooltip {
383 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
384 395
… …
389 400
390 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
391 402
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
395 } 406 }
396} 407}
397 408
398# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
399sub coord2local { 410sub coord2local {
… …
436 447
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS; 449 unless $FOCUS;
439} 450}
440 451
441sub mouse_motion { } 452sub mouse_motion { 0 }
442sub button_up { } 453sub button_up { 0 }
443sub key_down { } 454sub key_down { 0 }
444sub key_up { } 455sub key_up { 0 }
445 456
446sub button_down { 457sub button_down {
447 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
448 459
449 $self->focus_in; 460 $self->focus_in;
450}
451 461
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457 538
458sub draw { 539sub draw {
459 my ($self) = @_; 540 my ($self) = @_;
460 541
461 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462 553
463 glPushMatrix; 554 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 556
468 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 559 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 561 glBegin GL_QUADS;
475 glVertex $x , $y; 562 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
479 glEnd; 566 glEnd;
480 glDisable GL_BLEND; 567 glDisable GL_BLEND;
481 } 568 }
482 569
483 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 571 glPushMatrix;
485 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 575 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
492 glEnd; 579 glEnd;
493 glPopMatrix; 580 glPopMatrix;
494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
495 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
496} 586}
497 587
498sub _draw { 588sub _draw {
499 my ($self) = @_; 589 my ($self) = @_;
500 590
501 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
502} 592}
503 593
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 594sub DESTROY {
564 my ($self) = @_; 595 my ($self) = @_;
565 596
566 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
567 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
568} 601}
569 602
570############################################################################# 603#############################################################################
571 604
572package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
597 630
598 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
600 633
601 glEnable GL_BLEND; 634 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 636 glColor_premultiply @$color;
604 637
605 glBegin GL_QUADS; 638 glBegin GL_QUADS;
606 glVertex 0 , 0; 639 glVertex 0 , 0;
607 glVertex 0 , $h; 640 glVertex 0 , $h;
608 glVertex $w, $h; 641 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
625} 658}
626 659
627sub size_request { 660sub size_request {
628 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
629} 664}
630 665
631sub draw { } 666sub draw { }
632 667
633############################################################################# 668#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
638 673
639sub new { 674sub new {
640 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
641 676
642 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
643 678
644 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
645 children => [], 680 children => [],
646 can_events => 0, 681 can_events => 0,
647 %arg, 682 %arg,
648 ); 683 );
684
649 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
650 687
651 $self 688 $self
652} 689}
653 690
654sub add { 691sub add {
… …
662 $self->{children} = [ 699 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
665 ]; 702 ];
666 703
667 $self->check_size (1); 704 $self->realloc;
668 $self->update;
669} 705}
670 706
671sub children { 707sub children {
672 @{ $_[0]{children} } 708 @{ $_[0]{children} }
673} 709}
… …
678 delete $child->{parent}; 714 delete $child->{parent};
679 $child->hide; 715 $child->hide;
680 716
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 718
683 $self->check_size (1); 719 $self->realloc;
684 $self->update;
685} 720}
686 721
687sub clear { 722sub clear {
688 my ($self) = @_; 723 my ($self) = @_;
689 724
… …
693 for (@$children) { 728 for (@$children) {
694 delete $_->{parent}; 729 delete $_->{parent};
695 $_->hide; 730 $_->hide;
696 } 731 }
697 732
698 $self->check_size; 733 $self->realloc;
699 $self->update;
700} 734}
701 735
702sub find_widget { 736sub find_widget {
703 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
704 738
705 $x -= $self->{x}; 739 $x -= $self->{x};
706 $y -= $self->{y}; 740 $y -= $self->{y};
707 741
708 my $res; 742 my $res;
709 743
710 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
712 and return $res; 746 and return $res;
713 } 747 }
714 748
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
736} 770}
737 771
738sub add { 772sub add {
739 my ($self, $child) = @_; 773 my ($self, $child) = @_;
740 774
741 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
742
743 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
744} 777}
745 778
746sub remove { 779sub remove {
747 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
764 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
765} 798}
766 799
767############################################################################# 800#############################################################################
768 801
802# back-buffered drawing area
803
769package CFClient::UI::Window; 804package CFClient::UI::Window;
770 805
771our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
772 807
773use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
791 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 827 $self->update;
793} 828}
794 829
795sub _render { 830sub _render {
831 my ($self) = @_;
832
796 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
797} 834}
798 835
799sub render_child { 836sub render_child {
800 my ($self) = @_; 837 my ($self) = @_;
801 838
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
805 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
806 $self->_render; 850 $self->_render;
807 }; 851 };
808} 852}
809 853
810sub _draw { 854sub _draw {
811 my ($self) = @_; 855 my ($self) = @_;
812 856
813 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
814 858
815 my $tex = $self->{texture} 859 my $tex = $self->{texture}
816 or return; 860 or return;
817 861
818 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
821 865
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 867
824 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
825} 869}
… …
841} 885}
842 886
843sub size_request { 887sub size_request {
844 my ($self) = @_; 888 my ($self) = @_;
845 889
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 891
848 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
850 894
851 ($w, $h) 895 ($w, $h)
852} 896}
853 897
854sub size_allocate { 898sub size_allocate {
855 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
856 900
901 my $child = $self->child;
902
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 905
860 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
861 $self->update; 907 $self->update;
862} 908}
863 909
… …
899} 945}
900 946
901sub _render { 947sub _render {
902 my ($self) = @_; 948 my ($self) = @_;
903 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 954
906 $self->SUPER::_render; 955 $self->SUPER::_render;
907} 956}
908 957
… …
911package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
912 961
913our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
914 963
915sub new { 964sub new {
916 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
917 968
918 my $self; 969 my $self;
919 970
920 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
921 vertical => 1, 972 vertical => 1,
… …
926 ; 977 ;
927 978
928 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 981 slider => $slider,
931 @_, 982 %arg,
932 ); 983 );
933 984
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
937 987
938 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
939} 995}
940 996
941sub update { 997sub update {
942 my ($self) = @_; 998 my ($self) = @_;
943 999
… …
982 1038
983 if ($self->{bg}) { 1039 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
985 1041
986 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
989 1045
990 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
991 glVertex 0 , 0; 1047 glVertex 0 , 0;
992 glVertex 0 , $h; 1048 glVertex 0 , $h;
993 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1006 1062
1007our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1008 1064
1009use CFClient::OpenGL; 1065use CFClient::OpenGL;
1010 1066
1011my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1074
1015sub new { 1075sub new {
1016 my $class = shift; 1076 my ($class, %arg) = @_;
1017 1077
1018 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1081 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1082 can_events => 1,
1024 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1025 ); 1086 );
1026 1087
1027 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1089 align => 0,
1029 valign => 1, 1090 valign => 1,
1030 text => $self->{title}, 1091 text => $self->{title},
1031 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1032 1094
1033 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1103}
1035 1104
1036sub border { 1105sub border {
1037 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1038} 1107}
1039 1108
1040sub size_request { 1109sub size_request {
1041 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1042 1114
1043 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1044 1116
1045 ( 1117 (
1046 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1049} 1121}
1050 1122
1051sub size_allocate { 1123sub size_allocate {
1052 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1053 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1054 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1056 1136
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1061} 1138}
1062 1139
1063sub button_down { 1140sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1065 1142
… …
1081 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1082 1159
1083 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1085 1162
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1165
1091 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1092 }; 1168 };
1093 1169
1094 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1174 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1100 1176
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1178
1103 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1105 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1109 } 1187 1
1110} 1188}
1111 1189
1112sub button_up { 1190sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1114 1192
1115 delete $self->{motion}; 1193 !!delete $self->{motion}
1116} 1194}
1117 1195
1118sub mouse_motion { 1196sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1120 1198
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1122} 1202}
1123 1203
1124sub _draw { 1204sub _draw {
1125 my ($self) = @_; 1205 my ($self) = @_;
1126 1206
1207 my $child = $self->{children}[0];
1208
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1211
1130 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1214
1133 my $border = $self->border; 1215 my $border = $self->border;
1134 1216
1135 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1222
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1143 1225
1144 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1231 }
1155 1232
1156 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1157 1234
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1161} 1241}
1162 1242
1163############################################################################# 1243#############################################################################
1164 1244
1165package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1187 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1188 1268
1189 $child->set_parent ($self); 1269 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1191 1271
1192 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1193} 1279}
1194 1280
1195# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1282sub clear {
1197 my ($self) = @_; 1283 my ($self) = @_;
… …
1202 for (@children) { 1288 for (@children) {
1203 delete $_->{parent}; 1289 delete $_->{parent};
1204 $_->hide; 1290 $_->hide;
1205 } 1291 }
1206 1292
1207 $self->check_size (1); 1293 $self->realloc;
1208 $self->update;
1209} 1294}
1210 1295
1211sub get_wh { 1296sub get_wh {
1212 my ($self) = @_; 1297 my ($self) = @_;
1213 1298
… …
1421 ellipsise => 3, # end 1506 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1423 fontsize => 1, 1508 fontsize => 1,
1424 align => -1, 1509 align => -1,
1425 valign => -1, 1510 valign => -1,
1426 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1427 can_events => 0, 1513 can_events => 0,
1428 %arg 1514 %arg
1429 ); 1515 );
1430 1516
1431 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1458 1544
1459 delete $self->{texture}; 1545 delete $self->{texture};
1460 $self->SUPER::update; 1546 $self->SUPER::update;
1461} 1547}
1462 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1463sub set_text { 1556sub set_text {
1464 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1465 1558
1466 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1468 1561
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1471 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1472 $self->update; 1567 $self->update;
1473 $self->check_size;
1474} 1568}
1475 1569
1476sub set_markup { 1570sub set_markup {
1477 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1478 1572
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1577
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1486 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1487 $self->update; 1583 $self->update;
1488 $self->check_size;
1489} 1584}
1490 1585
1491sub size_request { 1586sub size_request {
1492 my ($self) = @_; 1587 my ($self) = @_;
1493 1588
1589 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1595
1500 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1501 1597
1502 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1601
1506 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1507 1603
1508 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1510 } 1609 };
1511 1610
1512 ( 1611 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1612}
1517 1613
1518sub size_allocate { 1614sub size_allocate {
1519 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1520 1616
1617 delete $self->{ox};
1618
1521 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1621}
1523 1622
1524sub set_fontsize { 1623sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1526 1625
1527 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1627 delete $self->{texture};
1529 1628
1530 $self->update; 1629 $self->realloc;
1531 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1532} 1638}
1533 1639
1534sub _draw { 1640sub _draw {
1535 my ($self) = @_; 1641 my ($self) = @_;
1536 1642
… …
1542 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1652
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1548 1655
1656 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1552 1660
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1664 };
1559 1665
1560 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1670
1563 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1678 }
1569 1679
1570 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1571} 1681}
1572 1682
… …
1589 can_hover => 1, 1699 can_hover => 1,
1590 can_focus => 1, 1700 can_focus => 1,
1591 valign => 0, 1701 valign => 0,
1592 can_events => 1, 1702 can_events => 1,
1593 #text => ... 1703 #text => ...
1704 #hidden => "*",
1594 @_ 1705 @_
1595 ) 1706 )
1596} 1707}
1597 1708
1598sub _set_text { 1709sub _set_text {
… …
1600 1711
1601 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1602 1713
1603 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1604 1715
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1717 $self->{text} = $text;
1609 1718
1610 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1612 1722
1613 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1614} 1727}
1615 1728
1616sub set_text { 1729sub set_text {
1617 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1618 1731
1619 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1733 $self->_set_text ($text);
1621 $self->update;
1622 $self->check_size;
1623} 1734}
1624 1735
1625sub get_text { 1736sub get_text {
1626 $_[0]{text} 1737 $_[0]{text}
1627} 1738}
… …
1657 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1660 } elsif ($uni) { 1771 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1662 } 1775 }
1663 1776
1664 $self->_set_text ($text); 1777 $self->_set_text ($text);
1665 $self->update; 1778
1666 $self->check_size; 1779 $self->realloc;
1780
1781 1
1667} 1782}
1668 1783
1669sub focus_in { 1784sub focus_in {
1670 my ($self) = @_; 1785 my ($self) = @_;
1671 1786
… …
1686 utf8::encode $text; 1801 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1688 1803
1689 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1690 $self->update; 1805 $self->update;
1806
1807 1
1691} 1808}
1692 1809
1693sub mouse_motion { 1810sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1696} 1815}
1697 1816
1698sub _draw { 1817sub _draw {
1699 my ($self) = @_; 1818 my ($self) = @_;
1700 1819
1701 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1702 1821
1703 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1706 } else { 1825 } else {
1707 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1708 } 1827 }
1709 1828
1710 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1832 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1777 } else { 1896 } else {
1778 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1779 } 1898 }
1780 1899
1781 } else { 1900 } else {
1782 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1783 } 1904 1
1784
1785} 1905}
1786 1906
1787############################################################################# 1907#############################################################################
1788 1908
1789package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1798 1918
1799sub new { 1919sub new {
1800 my $class = shift; 1920 my $class = shift;
1801 1921
1802 $class->SUPER::new ( 1922 $class->SUPER::new (
1803 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1804 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1806 can_hover => 1, 1927 can_hover => 1,
1807 align => 0, 1928 align => 0,
1808 valign => 0, 1929 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1818 1939
1819 $self->emit ("activate") 1940 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1822} 1945}
1823 1946
1824sub _draw { 1947sub _draw {
1825 my ($self) = @_; 1948 my ($self) = @_;
1826 1949
1827 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1951
1833 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1836 1955
… …
1855 1974
1856sub new { 1975sub new {
1857 my $class = shift; 1976 my $class = shift;
1858 1977
1859 $class->SUPER::new ( 1978 $class->SUPER::new (
1860 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1861 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1985 state => 0,
… …
1869} 1989}
1870 1990
1871sub size_request { 1991sub size_request {
1872 my ($self) = @_; 1992 my ($self) = @_;
1873 1993
1874 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1875} 1995}
1876 1996
1877sub button_down { 1997sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1879 1999
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1884 } 2008 1
1885} 2009}
1886 2010
1887sub _draw { 2011sub _draw {
1888 my ($self) = @_; 2012 my ($self) = @_;
1889 2013
1890 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1891 2015
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2017
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2021
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2023
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2025
… …
2054 2180
2055 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2057 2183
2058 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2189
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2171 vertical => 0, 2298 vertical => 0,
2172 can_hover => 1, 2299 can_hover => 1,
2173 inner_pad => 0.02, 2300 inner_pad => 0.02,
2174 @_ 2301 @_
2175 ); 2302 );
… …
2178 $self->update; 2305 $self->update;
2179 2306
2180 $self 2307 $self
2181} 2308}
2182 2309
2310sub changed { }
2311
2183sub set_range { 2312sub set_range {
2184 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2185 2314
2186 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2187 2316
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2190} 2321}
2191 2322
2192sub set_value { 2323sub set_value {
2193 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2194 2325
… …
2213} 2344}
2214 2345
2215sub size_request { 2346sub size_request {
2216 my ($self) = @_; 2347 my ($self) = @_;
2217 2348
2218 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2350}
2223 2351
2224sub button_down { 2352sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2226 2354
2227 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2228 2356
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2358
2231 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2232} 2360}
2233 2361
2234sub mouse_motion { 2362sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2236 2364
… …
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2369
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2371
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2245 } 2377 1
2246} 2378}
2247 2379
2248sub update { 2380sub update {
2249 my ($self) = @_; 2381 my ($self) = @_;
2250 2382
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2253 2392
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2256 2395
… …
2262 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2264 2403
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2267 }); 2406 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2407
2275 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2276 2409
2277 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2278 2411
… …
2339sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2341 2474
2342############################################################################# 2475#############################################################################
2343 2476
2344package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2345 2478
2346our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2347 2480
2348use CFClient::OpenGL; 2481use CFClient::OpenGL;
2349 2482
… …
2351 my $class = shift; 2484 my $class = shift;
2352 2485
2353 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2354 fontsize => 1, 2487 fontsize => 1,
2355 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2356 #font => default_font 2490 #font => default_font
2357 @_, 2491 @_,
2358 2492
2359 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2360 par => [], 2494 par => [],
… …
2383 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2384 2518
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2523
2389 $self->reflow; 2524 $self->reflow;
2390} 2525}
2391 2526
2392sub text_size { 2527sub text_size {
… …
2394 2529
2395 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2396 2531
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2400 2536
2401 $layout->size 2537 $layout->size
2402} 2538}
2403 2539
… …
2442 2578
2443 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2444 2580
2445 delete $self->{texture}; 2581 delete $self->{texture};
2446 2582
2447 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2585
2450 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2587 my $height = 0;
2452 2588
… …
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456 2592
2457 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2460 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h; 2600 $_->[1] = $h;
2464 } 2601 }
… …
2467 } 2604 }
2468 2605
2469 $self->{height} = $height; 2606 $self->{height} = $height;
2470 2607
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2472 2609
2473 delete $self->{texture}; 2610 delete $self->{texture};
2474 } 2611 }
2475 2612
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2479 2616
2480 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2481 2618
2482 my $y0 = $top; 2619 my $y0 = $top;
… …
2496 my $h = $par->[1]; 2633 my $h = $par->[1];
2497 2634
2498 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2502 2640
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2504 2642
2505 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2517sub _draw { 2655sub _draw {
2518 my ($self) = @_; 2656 my ($self) = @_;
2519 2657
2520 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2525 2663
2526 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2527 2665
2528} 2666}
… …
2611} 2749}
2612 2750
2613sub set_tooltip_from { 2751sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2615 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2616 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2769 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2771 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2783
2634sub size_allocate { 2784sub size_allocate {
2635 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2636 2786
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2638} 2806}
2639 2807
2640sub _draw { 2808sub _draw {
2641 my ($self) = @_; 2809 my ($self) = @_;
2642 2810
… …
2659 glVertex $w, $h; 2827 glVertex $w, $h;
2660 glVertex $w, 0; 2828 glVertex $w, 0;
2661 glEnd; 2829 glEnd;
2662 2830
2663 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2664 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2665} 2834}
2666 2835
2667############################################################################# 2836#############################################################################
2668 2837
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 2897
2729 if ($tex) { 2898 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2735 } 2904 }
2736} 2905}
2737 2906
2738sub DESTROY { 2907sub destroy {
2739 my ($self) = @_; 2908 my ($self) = @_;
2740 2909
2741 $self->{timer}->cancel 2910 $self->{timer}->cancel
2742 if $self->{timer}; 2911 if $self->{timer};
2743 2912
2744 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2745} 2914}
2746 2915
2747############################################################################# 2916#############################################################################
2748 2917
2749package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2750 2919
2751our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2752 2921
2753sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2923
2789############################################################################# 2924#############################################################################
2790 2925
2791package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2792 2927
… …
2804 ); 2939 );
2805 2940
2806 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2807 2942
2808 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2809 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2810 2945
2811 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2812 if (!ref $widget) { 2947 if (!ref $widget) {
2813 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2814 can_hover => 1, 2949 can_hover => 1,
2815 can_events => 1, 2950 can_events => 1,
2816 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2817 } 2953 }
2818 2954
2819 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2820 2956
2821 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2833 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2970 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2836 2972
2837 $self->show; 2973 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2975}
2840 2976
2841sub mouse_motion { 2977sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2843 2979
2844 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2847} 2985}
2848 2986
2849sub button_up { 2987sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2851 2989
… …
2853 undef $GRAB; 2991 undef $GRAB;
2854 $self->hide; 2992 $self->hide;
2855 2993
2856 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2858 } 3000 1
2859} 3001}
2860 3002
2861############################################################################# 3003#############################################################################
2862 3004
2863package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2864 3006
2865our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2866 3008
2867sub new { 3009sub new {
2868 my $class = shift; 3010 my $class = shift;
2869 3011
2870 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2871 fontsize => 0.8, 3177 fontsize => 0.8,
2872 @_, 3178 @_,
2873 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2874} 3186}
2875 3187
2876sub reorder { 3188sub reorder {
2877 my ($self) = @_; 3189 my ($self) = @_;
2878 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2879 3196
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3199 }
2883 3200
… …
2886 my @items = sort { 3203 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2890 3207
3208 $self->{timer}->interval (1);
3209
2891 my $count = 10 + 1; 3210 my $count = 10 + 1;
2892 for my $item (@items) { 3211 for my $item (@items) {
2893 last unless --$count; 3212 last unless --$count;
2894 3213
2895 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3218 : $item->{text};
2900 3219
… …
2908 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3233 can_events => 1,
2915 can_hover => 1 3234 can_hover => 1
2916 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2917 } 3248 }
2918 3249
2919 $self->clear; 3250 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2921} 3252}
… …
2926 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2928 3259
2929 return unless $text; 3260 return unless $text;
2930 3261
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3263
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3265
2935 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2937 $item->{count}++; 3268 $item->{count}++;
2938 } else { 3269 } else {
2939 $item->{count} = 1; 3270 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2941 } 3272 }
2942 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2943 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2944 delete $item->{label}; 3275 delete $item->{label};
2945 } else { 3276 } else {
2946 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2947 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2966 3297
2967 $self->reorder; 3298 $self->reorder;
2968 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2969} 3300}
2970 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2971############################################################################# 3310#############################################################################
2972 3311
2973package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2974 3313
2975our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3315
2979sub new { 3316sub new {
2980 my $class = shift; 3317 my $class = shift;
2981 3318
2982 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
2983 visible => 1, 3685 visible => 1,
2984 @_, 3686 @_,
2985 ) 3687 );
2986}
2987 3688
2988sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3690
2991 $self->{w} = $w; 3691 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3692}
3001 3693
3002sub size_request { 3694sub size_request {
3003 my ($self) = @_; 3695 my ($self) = @_;
3004 3696
3005 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3006} 3712}
3007 3713
3008sub size_allocate { 3714sub size_allocate {
3009 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3010 3716
3011 for my $child ($self->children) { 3717 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3719
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3016 3722
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3725
3025 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3026 } 3727 }
3027} 3728}
3028 3729
… …
3039} 3740}
3040 3741
3041sub update { 3742sub update {
3042 my ($self) = @_; 3743 my ($self) = @_;
3043 3744
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3046} 3746}
3047 3747
3048sub add { 3748sub add {
3049 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3050 3750
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3053 3752 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3753
3059 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3755}
3067 3756
3068sub remove { 3757sub remove {
3069 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3070 3759
3071 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3072 3764
3073 while (@children) { 3765 while (@children) {
3074 my $w = pop @children; 3766 my $w = pop @children;
3075 push @children, $w->children; 3767 push @children, $w->children;
3076 $w->set_invisible; 3768 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3096 $_->() 3788 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3098 } 3790 }
3099 3791
3100 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3101 my @queue; 3794 my @queue;
3795 my $widget;
3102 3796
3797 outer:
3103 while () { 3798 while () {
3104 if ($self->{check_size}) { 3799 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3106 3802
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3109 } 3807 }
3110 3808
3809 while () {
3810 @queue or last outer;
3811
3111 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3112 3813 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3125 3835
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3127 3837
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3130 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3131 } 3848 }
3132 } 3849 }
3133 3850
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3853 values %$size_alloc;
3137 3854
3138 while () { 3855 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3859
3141 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3143 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3144 $widget->{w} = $w; 3870 $widget->{w} = $w;
3145 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3146 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3147 } 3875 }
3148 } 3876 }
3149 3877
3150 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3151 $_->() 3879 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3153 } 3881 }
3882
3154 3883
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3158 3887
… …
3160 glLoadIdentity; 3889 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3892 glLoadIdentity;
3164 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3165 $self->_draw; 3901 $self->_draw;
3166} 3902}
3167 3903
3168############################################################################# 3904#############################################################################
3169 3905

Diff Legend

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