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.237 by root, Thu May 25 21:36:45 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
242} 306}
243 307
244sub hide { 308sub hide {
245 my ($self) = @_; 309 my ($self) = @_;
246 310
… …
248 312
249 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
250 if $self->{parent}; 314 if $self->{parent};
251} 315}
252 316
253sub move { 317sub move_abs {
254 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
255 319
256 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
259 323
260 $self->update; 324 $self->update;
261} 325}
262 326
263sub set_size { 327sub set_size {
264 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
265 329
266 $self->{user_w} = $w; 330 $self->{force_w} = $w;
267 $self->{user_h} = $h; 331 $self->{force_h} = $h;
268 332
269 $self->check_size; 333 $self->realloc;
270} 334}
271 335
272sub size_request { 336sub size_request {
273 require Carp; 337 require Carp;
274 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
276 340
277sub configure { 341sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
279 343
280 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
283 349
284 # use alignment to adjust x, y 350 # use alignment to adjust x, y
285 351
286 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 354 }
291 355
292 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 357 $self->{x} = $x;
294 $self->{y} = $y; 358 $self->{y} = $y;
295 $self->update; 359 $self->update;
296 } 360 }
297 361
298 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$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;
300 } 369 }
301} 370}
302 371
303sub size_allocate { 372sub size_allocate {
304 # nothing to be done 373 # nothing to be done
305} 374}
306 375
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
315} 382}
316 383
317sub set_max_size { 384sub set_max_size {
318 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
319 386
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
322} 391}
323 392
324sub set_tooltip { 393sub set_tooltip {
325 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
326 395
… …
331 400
332 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
333 402
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 406 }
338} 407}
339 408
340# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
341sub coord2local { 410sub coord2local {
… …
378 447
379 $::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
380 unless $FOCUS; 449 unless $FOCUS;
381} 450}
382 451
383sub mouse_motion { } 452sub mouse_motion { 0 }
384sub button_up { } 453sub button_up { 0 }
385sub key_down { } 454sub key_down { 0 }
386sub key_up { } 455sub key_up { 0 }
387 456
388sub button_down { 457sub button_down {
389 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
390 459
391 $self->focus_in; 460 $self->focus_in;
392}
393 461
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
398sub 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
399 538
400sub draw { 539sub draw {
401 my ($self) = @_; 540 my ($self) = @_;
402 541
403 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);
404 553
405 glPushMatrix; 554 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 556
410 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 559 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 561 glBegin GL_QUADS;
417 glVertex $x , $y; 562 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
421 glEnd; 566 glEnd;
422 glDisable GL_BLEND; 567 glDisable GL_BLEND;
423 } 568 }
424 569
425 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 571 glPushMatrix;
427 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 575 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
434 glEnd; 579 glEnd;
435 glPopMatrix; 580 glPopMatrix;
436 #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;
437 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
438} 586}
439 587
440sub _draw { 588sub _draw {
441 my ($self) = @_; 589 my ($self) = @_;
442 590
443 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
444} 592}
445 593
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 594sub DESTROY {
507 my ($self) = @_; 595 my ($self) = @_;
508 596
509 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
510 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
511} 601}
512 602
513############################################################################# 603#############################################################################
514 604
515package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
540 630
541 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
543 633
544 glEnable GL_BLEND; 634 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 636 glColor_premultiply @$color;
547 637
548 glBegin GL_QUADS; 638 glBegin GL_QUADS;
549 glVertex 0 , 0; 639 glVertex 0 , 0;
550 glVertex 0 , $h; 640 glVertex 0 , $h;
551 glVertex $w, $h; 641 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
568} 658}
569 659
570sub size_request { 660sub size_request {
571 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
572} 664}
573 665
574sub draw { } 666sub draw { }
575 667
576############################################################################# 668#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
581 673
582sub new { 674sub new {
583 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
584 676
585 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
586 678
587 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
588 children => [], 680 children => [],
589 can_events => 0, 681 can_events => 0,
590 %arg, 682 %arg,
591 ); 683 );
684
592 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
593 687
594 $self 688 $self
595} 689}
596 690
597sub add { 691sub add {
… …
605 $self->{children} = [ 699 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
608 ]; 702 ];
609 703
610 $self->check_size (1); 704 $self->realloc;
611 $self->update;
612} 705}
613 706
614sub children { 707sub children {
615 @{ $_[0]{children} } 708 @{ $_[0]{children} }
616} 709}
… …
621 delete $child->{parent}; 714 delete $child->{parent};
622 $child->hide; 715 $child->hide;
623 716
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 718
626 $self->check_size (1); 719 $self->realloc;
627 $self->update;
628} 720}
629 721
630sub clear { 722sub clear {
631 my ($self) = @_; 723 my ($self) = @_;
632 724
… …
636 for (@$children) { 728 for (@$children) {
637 delete $_->{parent}; 729 delete $_->{parent};
638 $_->hide; 730 $_->hide;
639 } 731 }
640 732
641 $self->check_size; 733 $self->realloc;
642 $self->update;
643} 734}
644 735
645sub find_widget { 736sub find_widget {
646 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
647 738
648 $x -= $self->{x}; 739 $x -= $self->{x};
649 $y -= $self->{y}; 740 $y -= $self->{y};
650 741
651 my $res; 742 my $res;
652 743
653 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
655 and return $res; 746 and return $res;
656 } 747 }
657 748
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
679} 770}
680 771
681sub add { 772sub add {
682 my ($self, $child) = @_; 773 my ($self, $child) = @_;
683 774
684 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
685
686 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
687} 777}
688 778
689sub remove { 779sub remove {
690 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
708} 798}
709 799
710############################################################################# 800#############################################################################
711 801
802# back-buffered drawing area
803
712package CFClient::UI::Window; 804package CFClient::UI::Window;
713 805
714our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
715 807
716use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 827 $self->update;
736} 828}
737 829
738sub _render { 830sub _render {
831 my ($self) = @_;
832
739 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
740} 834}
741 835
742sub render_child { 836sub render_child {
743 my ($self) = @_; 837 my ($self) = @_;
744 838
745 $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 {
746 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
748 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
749 $self->_render; 850 $self->_render;
750 }; 851 };
751} 852}
752 853
753sub _draw { 854sub _draw {
754 my ($self) = @_; 855 my ($self) = @_;
755 856
756 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
757 858
758 my $tex = $self->{texture} 859 my $tex = $self->{texture}
759 or return; 860 or return;
760 861
761 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
764 865
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 867
767 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
768} 869}
… …
784} 885}
785 886
786sub size_request { 887sub size_request {
787 my ($self) = @_; 888 my ($self) = @_;
788 889
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 891
791 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
792} 896}
793 897
794sub size_allocate { 898sub size_allocate {
795 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
796 900
901 my $child = $self->child;
902
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 905
800 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
801 $self->update; 907 $self->update;
802} 908}
803 909
… …
839} 945}
840 946
841sub _render { 947sub _render {
842 my ($self) = @_; 948 my ($self) = @_;
843 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
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 954
846 $self->SUPER::_render; 955 $self->SUPER::_render;
847} 956}
848 957
… …
851package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
852 961
853our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
854 963
855sub new { 964sub new {
856 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
857 968
858 my $self; 969 my $self;
859 970
860 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
861 vertical => 1, 972 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 974 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
865 }, 976 },
866 ; 977 ;
867 978
868 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 981 slider => $slider,
871 @_, 982 %arg,
872 ); 983 );
873 984
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
877 987
878 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 1005}
880 1006
881sub size_allocate { 1007sub size_allocate {
882 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
883 1009
… …
912 1038
913 if ($self->{bg}) { 1039 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
915 1041
916 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
918 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
919 1045
920 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
921 glVertex 0 , 0; 1047 glVertex 0 , 0;
922 glVertex 0 , $h; 1048 glVertex 0 , $h;
923 glVertex $w, $h; 1049 glVertex $w, $h;
… …
936 1062
937our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
938 1064
939use CFClient::OpenGL; 1065use CFClient::OpenGL;
940 1066
941my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 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);
944 1074
945sub new { 1075sub new {
946 my $class = shift; 1076 my ($class, %arg) = @_;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1077
950 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1081 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1082 can_events => 1,
956 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
957 ); 1086 );
958 1087
959 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
960 align => 0, 1089 align => 0,
961 valign => 1, 1090 valign => 1,
962 text => $self->{title}, 1091 text => $self->{title},
963 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
964 1094
965 $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};
966} 1103}
967 1104
968sub border { 1105sub border {
969 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
970} 1107}
971 1108
972sub size_request { 1109sub size_request {
973 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
974 1114
975 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
976 1116
977 ( 1117 (
978 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
981} 1121}
982 1122
983sub size_allocate { 1123sub size_allocate {
984 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
985 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
986 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
988 1136
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
993} 1138}
994 1139
995sub button_down { 1140sub button_down {
996 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
997 1142
… …
1013 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1014 1159
1015 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1017 1162
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1167 $self->realloc;
1022 }; 1168 };
1023 1169
1024 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1174 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1030 1176
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1178
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1036 } 1187 1
1037} 1188}
1038 1189
1039sub button_up { 1190sub button_up {
1040 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1041 1192
1042 delete $self->{motion}; 1193 !!delete $self->{motion}
1043} 1194}
1044 1195
1045sub mouse_motion { 1196sub mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1047 1198
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1049} 1202}
1050 1203
1051sub _draw { 1204sub _draw {
1052 my ($self) = @_; 1205 my ($self) = @_;
1053 1206
1207 my $child = $self->{children}[0];
1208
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1211
1057 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1214
1060 my $border = $self->border; 1215 my $border = $self->border;
1061 1216
1062 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1222
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1070 1225
1071 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1231 }
1082 1232
1083 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1084 1234
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1088} 1241}
1089 1242
1090############################################################################# 1243#############################################################################
1091 1244
1092package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1114 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1115 1268
1116 $child->set_parent ($self); 1269 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1118 1271
1119 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1120} 1279}
1121 1280
1122# 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?
1123sub clear { 1282sub clear {
1124 my ($self) = @_; 1283 my ($self) = @_;
… …
1129 for (@children) { 1288 for (@children) {
1130 delete $_->{parent}; 1289 delete $_->{parent};
1131 $_->hide; 1290 $_->hide;
1132 } 1291 }
1133 1292
1134 $self->check_size (1); 1293 $self->realloc;
1135 $self->update;
1136} 1294}
1137 1295
1138sub get_wh { 1296sub get_wh {
1139 my ($self) = @_; 1297 my ($self) = @_;
1140 1298
… …
1171sub size_allocate { 1329sub size_allocate {
1172 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1173 1331
1174 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1175 1333
1176 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1178 1336
1179 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1236 } 1394 }
1237} 1395}
1238 1396
1239############################################################################# 1397#############################################################################
1240 1398
1241package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1400
1245our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1246 1402
1247sub size_request { 1403sub size_request {
1248 my ($self) = @_; 1404 my ($self) = @_;
1249 1405
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1251 1407 ? (
1252 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1410 )
1255 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1256} 1415}
1257 1416
1258sub size_allocate { 1417sub size_allocate {
1259 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1260 1419
1261 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1421 my $children = $self->{children};
1264 1422
1265 my @h = map $_->{req_w}, @$children; 1423 my @req;
1266 1424
1267 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1268 1426 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1441 }
1283 } 1442 }
1284 1443
1285 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1286 1445
1287 my $y = 0; 1446 my $pos = 0;
1288 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1450
1293 $y += $h; 1451 $pos += $alloc;
1294 } 1452 }
1295 1453
1296 1 1454 1
1297} 1455}
1298 1456
1299############################################################################# 1457#############################################################################
1300 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1301package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1302 1475
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1306 1477
1307sub size_request { 1478sub new {
1308 my ($self) = @_; 1479 my $class = shift;
1309 1480
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1311 1482 vertical => 1,
1312 ( 1483 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1484 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1485}
1356 1486
1357############################################################################# 1487#############################################################################
1358 1488
1359package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1506 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1378 fontsize => 1, 1508 fontsize => 1,
1379 align => -1, 1509 align => -1,
1380 valign => -1, 1510 valign => -1,
1381 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1382 can_events => 0, 1513 can_events => 0,
1383 %arg 1514 %arg
1384 ); 1515 );
1385 1516
1386 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1413 1544
1414 delete $self->{texture}; 1545 delete $self->{texture};
1415 $self->SUPER::update; 1546 $self->SUPER::update;
1416} 1547}
1417 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1418sub set_text { 1556sub set_text {
1419 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1420 1558
1421 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1423 1561
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1426 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1427 $self->update; 1567 $self->update;
1428 $self->check_size;
1429} 1568}
1430 1569
1431sub set_markup { 1570sub set_markup {
1432 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1433 1572
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1577
1439 $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;
1440 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1441 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1442 $self->update; 1583 $self->update;
1443 $self->check_size;
1444} 1584}
1445 1585
1446sub size_request { 1586sub size_request {
1447 my ($self) = @_; 1587 my ($self) = @_;
1448 1588
1589 $self->{size_req} ||= do {
1449 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1454 1595
1455 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1456 1597
1457 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1460 1601
1461 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1462 1603
1463 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1465 } 1609 };
1466 1610
1467 ( 1611 @{ $self->{size_req} }
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1612}
1472 1613
1473sub size_allocate { 1614sub size_allocate {
1474 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1475 1616
1617 delete $self->{ox};
1618
1476 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477} 1621}
1478 1622
1479sub set_fontsize { 1623sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1481 1625
1482 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1627 delete $self->{texture};
1484 1628
1485 $self->update; 1629 $self->realloc;
1486 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1487} 1638}
1488 1639
1489sub _draw { 1640sub _draw {
1490 my ($self) = @_; 1641 my ($self) = @_;
1491 1642
… …
1497 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1652
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1503 1655
1656 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1507 1660
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1664 };
1514 1665
1515 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1516 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};
1517 1670
1518 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1519 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1521 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1523 } 1678 }
1524 1679
1525 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1526} 1681}
1527 1682
… …
1544 can_hover => 1, 1699 can_hover => 1,
1545 can_focus => 1, 1700 can_focus => 1,
1546 valign => 0, 1701 valign => 0,
1547 can_events => 1, 1702 can_events => 1,
1548 #text => ... 1703 #text => ...
1704 #hidden => "*",
1549 @_ 1705 @_
1550 ) 1706 )
1551} 1707}
1552 1708
1553sub _set_text { 1709sub _set_text {
… …
1555 1711
1556 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1557 1713
1558 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1559 1715
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 1717 $self->{text} = $text;
1564 1718
1565 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1567 1722
1568 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1569} 1727}
1570 1728
1571sub set_text { 1729sub set_text {
1572 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1573 1731
1574 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1733 $self->_set_text ($text);
1576 $self->update;
1577 $self->check_size;
1578} 1734}
1579 1735
1580sub get_text { 1736sub get_text {
1581 $_[0]{text} 1737 $_[0]{text}
1582} 1738}
… …
1612 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1615 } elsif ($uni) { 1771 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1617 } 1775 }
1618 1776
1619 $self->_set_text ($text); 1777 $self->_set_text ($text);
1620 $self->update; 1778
1621 $self->check_size; 1779 $self->realloc;
1780
1781 1
1622} 1782}
1623 1783
1624sub focus_in { 1784sub focus_in {
1625 my ($self) = @_; 1785 my ($self) = @_;
1626 1786
… …
1641 utf8::encode $text; 1801 utf8::encode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1643 1803
1644 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1645 $self->update; 1805 $self->update;
1806
1807 1
1646} 1808}
1647 1809
1648sub mouse_motion { 1810sub mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1650# 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
1651} 1815}
1652 1816
1653sub _draw { 1817sub _draw {
1654 my ($self) = @_; 1818 my ($self) = @_;
1655 1819
1656 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1657 1821
1658 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1661 } else { 1825 } else {
1662 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1663 } 1827 }
1664 1828
1665 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1668 glVertex 0 , 0; 1832 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1732 } else { 1896 } else {
1733 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1734 } 1898 }
1735 1899
1736 } else { 1900 } else {
1737 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1738 } 1904 1
1739
1740} 1905}
1741 1906
1742############################################################################# 1907#############################################################################
1743 1908
1744package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1753 1918
1754sub new { 1919sub new {
1755 my $class = shift; 1920 my $class = shift;
1756 1921
1757 $class->SUPER::new ( 1922 $class->SUPER::new (
1758 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1759 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1761 can_hover => 1, 1927 can_hover => 1,
1762 align => 0, 1928 align => 0,
1763 valign => 0, 1929 valign => 0,
… …
1772 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1773 1939
1774 $self->emit ("activate") 1940 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1777} 1945}
1778 1946
1779sub _draw { 1947sub _draw {
1780 my ($self) = @_; 1948 my ($self) = @_;
1781 1949
1782 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 1951
1788 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1791 1955
… …
1810 1974
1811sub new { 1975sub new {
1812 my $class = shift; 1976 my $class = shift;
1813 1977
1814 $class->SUPER::new ( 1978 $class->SUPER::new (
1815 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1816 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 1985 state => 0,
… …
1824} 1989}
1825 1990
1826sub size_request { 1991sub size_request {
1827 my ($self) = @_; 1992 my ($self) = @_;
1828 1993
1829 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1830} 1995}
1831 1996
1832sub button_down { 1997sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1834 1999
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1839 } 2008 1
1840} 2009}
1841 2010
1842sub _draw { 2011sub _draw {
1843 my ($self) = @_; 2012 my ($self) = @_;
1844 2013
1845 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1846 2015
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 2017
1849 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;
1850 2021
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 2023
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 2025
… …
2009 2180
2010 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2012 2183
2013 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2014 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;
2015 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2189
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2119 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2126 vertical => 0, 2298 vertical => 0,
2127 can_hover => 1, 2299 can_hover => 1,
2128 inner_pad => 0.02, 2300 inner_pad => 0.02,
2129 @_ 2301 @_
2130 ); 2302 );
… …
2133 $self->update; 2305 $self->update;
2134 2306
2135 $self 2307 $self
2136} 2308}
2137 2309
2310sub changed { }
2311
2138sub set_range { 2312sub set_range {
2139 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2140 2314
2141 $self->{range} = $range; 2315 ($range, $self->{range}) = ($self->{range}, $range);
2142 2316
2317 if ("@$range" ne "@{$self->{range}}") {
2143 $self->update; 2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2144} 2321}
2145 2322
2146sub set_value { 2323sub set_value {
2147 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2148 2325
… …
2167} 2344}
2168 2345
2169sub size_request { 2346sub size_request {
2170 my ($self) = @_; 2347 my ($self) = @_;
2171 2348
2172 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2350}
2177 2351
2178sub button_down { 2352sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2180 2354
2181 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2182 2356
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2358
2185 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2186} 2360}
2187 2361
2188sub mouse_motion { 2362sub mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2190 2364
… …
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2369
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2371
2198 $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
2199 } 2377 1
2200} 2378}
2201 2379
2202sub update { 2380sub update {
2203 my ($self) = @_; 2381 my ($self) = @_;
2204 2382
2205 $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}) {
2206 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2207 2392
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2210 2395
… …
2216 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2218 2403
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2221 }); 2406 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2407
2229 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2230 2409
2231 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2232 2411
… …
2293sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2295 2474
2296############################################################################# 2475#############################################################################
2297 2476
2298package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2299 2478
2300our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2301 2480
2302use CFClient::OpenGL; 2481use CFClient::OpenGL;
2303 2482
… …
2305 my $class = shift; 2484 my $class = shift;
2306 2485
2307 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2308 fontsize => 1, 2487 fontsize => 1,
2309 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2310 #font => default_font 2490 #font => default_font
2311 @_, 2491 @_,
2312 2492
2313 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2314 par => [], 2494 par => [],
… …
2337 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2338 2518
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $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});
2342 2523
2343 $self->reflow; 2524 $self->reflow;
2344} 2525}
2345 2526
2346sub text_size { 2527sub text_size {
… …
2348 2529
2349 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2350 2531
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $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});
2353 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2354 2536
2355 $layout->size 2537 $layout->size
2356} 2538}
2357 2539
… …
2396 2578
2397 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2398 2580
2399 delete $self->{texture}; 2581 delete $self->{texture};
2400 2582
2401 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403 2585
2404 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2405 my $height = 0; 2587 my $height = 0;
2406 2588
… …
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410 2592
2411 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2414 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h; 2600 $_->[1] = $h;
2418 } 2601 }
… …
2421 } 2604 }
2422 2605
2423 $self->{height} = $height; 2606 $self->{height} = $height;
2424 2607
2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2426 2609
2427 delete $self->{texture}; 2610 delete $self->{texture};
2428 } 2611 }
2429 2612
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2433 2616
2434 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2435 2618
2436 my $y0 = $top; 2619 my $y0 = $top;
… …
2450 my $h = $par->[1]; 2633 my $h = $par->[1];
2451 2634
2452 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2455 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2456 2640
2457 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2458 2642
2459 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2471sub _draw { 2655sub _draw {
2472 my ($self) = @_; 2656 my ($self) = @_;
2473 2657
2474 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2477 $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});
2478 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2479 2663
2480 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2481 2665
2482} 2666}
… …
2531 2715
2532sub new { 2716sub new {
2533 my $class = shift; 2717 my $class = shift;
2534 2718
2535 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2536 state => 0, 2720 state => 0,
2537 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2538 @_ 2722 @_
2539 ); 2723 );
2540 2724
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2725 $self
2547} 2726}
2548 2727
2549sub toggle_flopper { 2728sub toggle_flopper {
2550 my ($self) = @_; 2729 my ($self) = @_;
2551 2730
2552 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2732}
2564 2733
2565############################################################################# 2734#############################################################################
2566 2735
2567package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2580} 2749}
2581 2750
2582sub set_tooltip_from { 2751sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2584 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
2585 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2769 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2771 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2602 2783
2603sub size_allocate { 2784sub size_allocate {
2604 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2605 2786
2606 $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 });
2607} 2806}
2608 2807
2609sub _draw { 2808sub _draw {
2610 my ($self) = @_; 2809 my ($self) = @_;
2611 2810
… …
2628 glVertex $w, $h; 2827 glVertex $w, $h;
2629 glVertex $w, 0; 2828 glVertex $w, 0;
2630 glEnd; 2829 glEnd;
2631 2830
2632 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2633 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2634} 2834}
2635 2835
2636############################################################################# 2836#############################################################################
2637 2837
… …
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697 2897
2698 if ($tex) { 2898 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2704 } 2904 }
2705} 2905}
2706 2906
2707sub DESTROY { 2907sub destroy {
2708 my ($self) = @_; 2908 my ($self) = @_;
2709 2909
2710 $self->{timer}->cancel 2910 $self->{timer}->cancel
2711 if $self->{timer}; 2911 if $self->{timer};
2712 2912
2713 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2714} 2914}
2715 2915
2716############################################################################# 2916#############################################################################
2717 2917
2718package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2719 2919
2720our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2721 2921
2722sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764 2923
2765############################################################################# 2924#############################################################################
2766 2925
2767package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2768 2927
… …
2780 ); 2939 );
2781 2940
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783 2942
2784 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2786 2945
2787 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2788 if (!ref $widget) { 2947 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2790 can_hover => 1, 2949 can_hover => 1,
2791 can_events => 1, 2950 can_events => 1,
2792 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2793 } 2953 }
2794 2954
2795 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2796 2956
2797 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2809 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 2970 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2812 2972
2813 $self->show; 2973 $self->show;
2814 $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);
2815} 2975}
2816 2976
2817sub mouse_motion { 2977sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2819 2979
2820 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2823} 2985}
2824 2986
2825sub button_up { 2987sub button_up {
2826 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2827 2989
… …
2829 undef $GRAB; 2991 undef $GRAB;
2830 $self->hide; 2992 $self->hide;
2831 2993
2832 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2834 } 3000 1
2835} 3001}
2836 3002
2837############################################################################# 3003#############################################################################
2838 3004
2839package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2840 3006
2841our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2842 3008
2843sub new { 3009sub new {
2844 my $class = shift; 3010 my $class = shift;
2845 3011
2846 $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 (
2847 fontsize => 0.8, 3177 fontsize => 0.8,
2848 @_, 3178 @_,
2849 ) 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
2850} 3186}
2851 3187
2852sub reorder { 3188sub reorder {
2853 my ($self) = @_; 3189 my ($self) = @_;
2854 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} };
2855 3196
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3199 }
2859 3200
… …
2862 my @items = sort { 3203 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2866 3207
3208 $self->{timer}->interval (1);
3209
2867 my $count = 10 + 1; 3210 my $count = 10 + 1;
2868 for my $item (@items) { 3211 for my $item (@items) {
2869 last unless --$count; 3212 last unless --$count;
2870 3213
2871 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text}; 3218 : $item->{text};
2876 3219
… …
2884 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2890 can_events => 1, 3233 can_events => 1,
2891 can_hover => 1 3234 can_hover => 1
2892 }; 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;
2893 } 3248 }
2894 3249
2895 $self->clear; 3250 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2897} 3252}
… …
2902 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2904 3259
2905 return unless $text; 3260 return unless $text;
2906 3261
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3263
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3265
2911 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2913 $item->{count}++; 3268 $item->{count}++;
2914 } else { 3269 } else {
2915 $item->{count} = 1; 3270 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2917 } 3272 }
2918 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2919 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2920 delete $item->{label}; 3275 delete $item->{label};
2921 } else { 3276 } else {
2922 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2923 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2942 3297
2943 $self->reorder; 3298 $self->reorder;
2944 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2945} 3300}
2946 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2947############################################################################# 3310#############################################################################
2948 3311
2949package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2950 3313
2951our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953use CFClient::OpenGL;
2954 3315
2955sub new { 3316sub new {
2956 my $class = shift; 3317 my $class = shift;
2957 3318
2958 $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 => [],
2959 @_, 3561 @_,
2960 ) 3562 )
2961} 3563}
2962 3564
2963sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2964 my ($self, $x, $y, $w, $h) = @_;
2965 3566
2966 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2967 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2968} 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");
2969 3577
2970sub check_size { 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 {
2971 my ($self) = @_; 3651 my ($self, $spell) = @_;
2972 3652
2973 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
2974 if $self->{w}; 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 (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
2975} 3692}
2976 3693
2977sub size_request { 3694sub size_request {
2978 my ($self) = @_; 3695 my ($self) = @_;
2979 3696
2980 ($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
2981} 3712}
2982 3713
2983sub size_allocate { 3714sub size_allocate {
2984 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2985 3716
2986 for my $child ($self->children) { 3717 for my $child ($self->children) {
2987 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)};
2988 3719
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
2991 3722
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3725
2998 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
2999 } 3727 }
3000} 3728}
3001 3729
… …
3012} 3740}
3013 3741
3014sub update { 3742sub update {
3015 my ($self) = @_; 3743 my ($self) = @_;
3016 3744
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3019} 3746}
3020 3747
3021sub add { 3748sub add {
3022 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3023 3750
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3032 3752 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3753
3038 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3039} 3755}
3040 3756
3041sub remove { 3757sub remove {
3042 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3043 3759
3044 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3045 3764
3046 while (@children) { 3765 while (@children) {
3047 my $w = pop @children; 3766 my $w = pop @children;
3048 push @children, $w->children; 3767 push @children, $w->children;
3049 $w->set_invisible; 3768 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3069 $_->() 3788 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3071 } 3790 }
3072 3791
3073 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3074 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
3075 3796
3076 for (;;) { 3797 outer:
3077 if ($self->{check_size}) { 3798 while () {
3078 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3081 } 3807 }
3082 3808
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
3084 3811
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3813 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 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}) {
3093 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3095 3835
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3097 3837
3098 $widget->{parent}->check_size
3099 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 }
3100 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3101 } 3848 }
3102 } 3849 }
3103 3850
3104 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3859
3108 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3110 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
3111 $widget->{w} = $w; 3870 $widget->{w} = $w;
3112 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3113 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3114 } 3875 }
3115 } 3876 }
3116 3877
3117 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3118 $_->() 3879 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3120 } 3881 }
3882
3121 3883
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3125 3887
… …
3127 glLoadIdentity; 3889 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3892 glLoadIdentity;
3131 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
3132 $self->_draw; 3901 $self->_draw;
3133} 3902}
3134 3903
3135############################################################################# 3904#############################################################################
3136 3905

Diff Legend

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