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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 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};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
964 1103
965 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
966} 1113}
967 1114
968sub border { 1115sub border {
969 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
970} 1117}
971 1118
972sub size_request { 1119sub size_request {
973 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
974 1127
975 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
976 1129
977 ( 1130 (
978 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
981} 1134}
982 1135
983sub size_allocate { 1136sub size_allocate {
984 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
985 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
986 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
988 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
993} 1154}
994 1155
995sub button_down { 1156sub button_down {
996 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
997 1158
… …
1013 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1014 1175
1015 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1017 1178
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1183 $self->realloc;
1022 }; 1184 };
1023 1185
1024 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1190 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1030 1192
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1194
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1036 } 1203 1
1037} 1204}
1038 1205
1039sub button_up { 1206sub button_up {
1040 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1041 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1042 delete $self->{motion}; 1212 !!delete $self->{motion}
1043} 1213}
1044 1214
1045sub mouse_motion { 1215sub mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1047 1217
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1049} 1221}
1050 1222
1051sub _draw { 1223sub _draw {
1052 my ($self) = @_; 1224 my ($self) = @_;
1053 1225
1226 my $child = $self->{children}[0];
1227
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1230
1057 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1233
1060 my $border = $self->border; 1234 my $border = $self->border;
1061 1235
1062 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1241
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1070 1244
1071 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1248 $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); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1250 }
1082 1251
1083 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1084 1253
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1088} 1265}
1089 1266
1090############################################################################# 1267#############################################################################
1091 1268
1092package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1114 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1115 1292
1116 $child->set_parent ($self); 1293 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1118 1295
1119 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1120} 1303}
1121 1304
1122# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1123sub clear { 1306sub clear {
1124 my ($self) = @_; 1307 my ($self) = @_;
… …
1129 for (@children) { 1312 for (@children) {
1130 delete $_->{parent}; 1313 delete $_->{parent};
1131 $_->hide; 1314 $_->hide;
1132 } 1315 }
1133 1316
1134 $self->check_size (1); 1317 $self->realloc;
1135 $self->update;
1136} 1318}
1137 1319
1138sub get_wh { 1320sub get_wh {
1139 my ($self) = @_; 1321 my ($self) = @_;
1140 1322
… …
1236 } 1418 }
1237} 1419}
1238 1420
1239############################################################################# 1421#############################################################################
1240 1422
1241package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1424
1245our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1246 1426
1247sub size_request { 1427sub size_request {
1248 my ($self) = @_; 1428 my ($self) = @_;
1249 1429
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1251 1431 ? (
1252 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1434 )
1255 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1256} 1439}
1257 1440
1258sub size_allocate { 1441sub size_allocate {
1259 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1260 1443
1261 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1445 my $children = $self->{children};
1264 1446
1265 my @h = map $_->{req_w}, @$children; 1447 my @req;
1266 1448
1267 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1268 1450 @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 { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1464 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 } 1465 }
1283 } 1466 }
1284 1467
1285 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1286 1469
1287 my $y = 0; 1470 my $pos = 0;
1288 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1474
1293 $y += $h; 1475 $pos += $alloc;
1294 } 1476 }
1295 1477
1296 1 1478 1
1297} 1479}
1298 1480
1299############################################################################# 1481#############################################################################
1300 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1301package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1302 1499
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1306 1501
1307sub size_request { 1502sub new {
1308 my ($self) = @_; 1503 my $class = shift;
1309 1504
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1311 1506 vertical => 1,
1312 ( 1507 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1508 )
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} 1509}
1356 1510
1357############################################################################# 1511#############################################################################
1358 1512
1359package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1530 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1378 fontsize => 1, 1532 fontsize => 1,
1379 align => -1, 1533 align => -1,
1380 valign => -1, 1534 valign => -1,
1381 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1382 can_events => 0, 1537 can_events => 0,
1383 %arg 1538 %arg
1384 ); 1539 );
1385 1540
1386 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1413 1568
1414 delete $self->{texture}; 1569 delete $self->{texture};
1415 $self->SUPER::update; 1570 $self->SUPER::update;
1416} 1571}
1417 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1418sub set_text { 1580sub set_text {
1419 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1420 1582
1421 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1423 1585
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1426 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1427 $self->update; 1591 $self->update;
1428 $self->check_size;
1429} 1592}
1430 1593
1431sub set_markup { 1594sub set_markup {
1432 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1433 1596
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1601
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1441 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1442 $self->update; 1607 $self->update;
1443 $self->check_size;
1444} 1608}
1445 1609
1446sub size_request { 1610sub size_request {
1447 my ($self) = @_; 1611 my ($self) = @_;
1448 1612
1613 $self->{size_req} ||= do {
1449 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1454 1619
1455 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1456 1621
1457 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1460 1625
1461 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1462 1627
1463 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1465 } 1633 };
1466 1634
1467 ( 1635 @{ $self->{size_req} }
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1636}
1472 1637
1473sub size_allocate { 1638sub size_allocate {
1474 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1475 1640
1641 delete $self->{ox};
1642
1476 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477} 1645}
1478 1646
1479sub set_fontsize { 1647sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1481 1649
1482 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1651 delete $self->{texture};
1484 1652
1485 $self->update; 1653 $self->realloc;
1486 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1487} 1662}
1488 1663
1489sub _draw { 1664sub _draw {
1490 my ($self) = @_; 1665 my ($self) = @_;
1491 1666
… …
1497 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1676
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1503 1679
1680 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1507 1684
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1688 };
1514 1689
1515 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1517 1694
1518 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1519 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1521 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1523 } 1702 }
1524 1703
1525 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1526} 1705}
1527 1706
… …
1544 can_hover => 1, 1723 can_hover => 1,
1545 can_focus => 1, 1724 can_focus => 1,
1546 valign => 0, 1725 valign => 0,
1547 can_events => 1, 1726 can_events => 1,
1548 #text => ... 1727 #text => ...
1728 #hidden => "*",
1549 @_ 1729 @_
1550 ) 1730 )
1551} 1731}
1552 1732
1553sub _set_text { 1733sub _set_text {
… …
1555 1735
1556 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1557 1737
1558 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1559 1739
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 1741 $self->{text} = $text;
1564 1742
1565 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1567 1746
1568 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1569} 1751}
1570 1752
1571sub set_text { 1753sub set_text {
1572 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1573 1755
1574 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1757 $self->_set_text ($text);
1576 $self->update;
1577 $self->check_size;
1578} 1758}
1579 1759
1580sub get_text { 1760sub get_text {
1581 $_[0]{text} 1761 $_[0]{text}
1582} 1762}
… …
1612 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1615 } elsif ($uni) { 1795 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1617 } 1799 }
1618 1800
1619 $self->_set_text ($text); 1801 $self->_set_text ($text);
1620 $self->update; 1802
1621 $self->check_size; 1803 $self->realloc;
1804
1805 1
1622} 1806}
1623 1807
1624sub focus_in { 1808sub focus_in {
1625 my ($self) = @_; 1809 my ($self) = @_;
1626 1810
… …
1641 utf8::encode $text; 1825 utf8::encode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1643 1827
1644 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1645 $self->update; 1829 $self->update;
1830
1831 1
1646} 1832}
1647 1833
1648sub mouse_motion { 1834sub mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1650# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1651} 1839}
1652 1840
1653sub _draw { 1841sub _draw {
1654 my ($self) = @_; 1842 my ($self) = @_;
1655 1843
1656 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1657 1845
1658 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1661 } else { 1849 } else {
1662 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1663 } 1851 }
1664 1852
1665 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1668 glVertex 0 , 0; 1856 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1732 } else { 1920 } else {
1733 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1734 } 1922 }
1735 1923
1736 } else { 1924 } else {
1737 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1738 } 1928 1
1739
1740} 1929}
1741 1930
1742############################################################################# 1931#############################################################################
1743 1932
1744package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1753 1942
1754sub new { 1943sub new {
1755 my $class = shift; 1944 my $class = shift;
1756 1945
1757 $class->SUPER::new ( 1946 $class->SUPER::new (
1758 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1759 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1761 can_hover => 1, 1951 can_hover => 1,
1762 align => 0, 1952 align => 0,
1763 valign => 0, 1953 valign => 0,
… …
1772 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1773 1963
1774 $self->emit ("activate") 1964 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1777} 1969}
1778 1970
1779sub _draw { 1971sub _draw {
1780 my ($self) = @_; 1972 my ($self) = @_;
1781 1973
1782 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 1975
1788 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1791 1979
… …
1796 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1797} 1985}
1798 1986
1799############################################################################# 1987#############################################################################
1800 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1801package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1802 2028
1803our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1804 2030
1805my @tex = 2031my @tex =
… …
1810 2036
1811sub new { 2037sub new {
1812 my $class = shift; 2038 my $class = shift;
1813 2039
1814 $class->SUPER::new ( 2040 $class->SUPER::new (
1815 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1816 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 2047 state => 0,
… …
1824} 2051}
1825 2052
1826sub size_request { 2053sub size_request {
1827 my ($self) = @_; 2054 my ($self) = @_;
1828 2055
1829 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1830} 2057}
1831 2058
1832sub button_down { 2059sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1834 2061
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1839 } 2070 1
1840} 2071}
1841 2072
1842sub _draw { 2073sub _draw {
1843 my ($self) = @_; 2074 my ($self) = @_;
1844 2075
1845 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1846 2077
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 2079
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 2083
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 2085
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 2087
… …
2009 2242
2010 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2012 2245
2013 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2015 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2251
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2119 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2126 vertical => 0, 2360 vertical => 0,
2127 can_hover => 1, 2361 can_hover => 1,
2128 inner_pad => 0.02, 2362 inner_pad => 0.02,
2129 @_ 2363 @_
2130 ); 2364 );
… …
2133 $self->update; 2367 $self->update;
2134 2368
2135 $self 2369 $self
2136} 2370}
2137 2371
2372sub changed { }
2373
2138sub set_range { 2374sub set_range {
2139 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2140 2376
2141 $self->{range} = $range; 2377 ($range, $self->{range}) = ($self->{range}, $range);
2142 2378
2379 if ("@$range" ne "@{$self->{range}}") {
2143 $self->update; 2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2144} 2383}
2145 2384
2146sub set_value { 2385sub set_value {
2147 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2148 2387
… …
2167} 2406}
2168 2407
2169sub size_request { 2408sub size_request {
2170 my ($self) = @_; 2409 my ($self) = @_;
2171 2410
2172 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2412}
2177 2413
2178sub button_down { 2414sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2180 2416
2181 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2182 2418
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2420
2185 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2186} 2422}
2187 2423
2188sub mouse_motion { 2424sub mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2190 2426
… …
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2431
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2433
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2199 } 2439 1
2200} 2440}
2201 2441
2202sub update { 2442sub update {
2203 my ($self) = @_; 2443 my ($self) = @_;
2204 2444
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2206 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2207 2454
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2210 2457
… …
2216 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2218 2465
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2221 }); 2468 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2469
2229 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2230 2471
2231 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2232 2473
… …
2293sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2295 2536
2296############################################################################# 2537#############################################################################
2297 2538
2298package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2299 2540
2300our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2301 2542
2302use CFClient::OpenGL; 2543use CFClient::OpenGL;
2303 2544
… …
2305 my $class = shift; 2546 my $class = shift;
2306 2547
2307 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2308 fontsize => 1, 2549 fontsize => 1,
2309 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2310 #font => default_font 2552 #font => default_font
2311 @_, 2553 @_,
2312 2554
2313 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2314 par => [], 2556 par => [],
… …
2337 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2338 2580
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2342 2585
2343 $self->reflow; 2586 $self->reflow;
2344} 2587}
2345 2588
2346sub text_size { 2589sub text_size {
… …
2348 2591
2349 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2350 2593
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2353 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2354 2598
2355 $layout->size 2599 $layout->size
2356} 2600}
2357 2601
… …
2396 2640
2397 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2398 2642
2399 delete $self->{texture}; 2643 delete $self->{texture};
2400 2644
2401 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403 2647
2404 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2405 my $height = 0; 2649 my $height = 0;
2406 2650
… …
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410 2654
2411 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2414 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h; 2662 $_->[1] = $h;
2418 } 2663 }
… …
2421 } 2666 }
2422 2667
2423 $self->{height} = $height; 2668 $self->{height} = $height;
2424 2669
2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2426 2671
2427 delete $self->{texture}; 2672 delete $self->{texture};
2428 } 2673 }
2429 2674
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2433 2678
2434 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2435 2680
2436 my $y0 = $top; 2681 my $y0 = $top;
… …
2450 my $h = $par->[1]; 2695 my $h = $par->[1];
2451 2696
2452 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2455 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2456 2702
2457 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2458 2704
2459 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2471sub _draw { 2717sub _draw {
2472 my ($self) = @_; 2718 my ($self) = @_;
2473 2719
2474 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2478 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2479 2725
2480 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2481 2727
2482} 2728}
… …
2531 2777
2532sub new { 2778sub new {
2533 my $class = shift; 2779 my $class = shift;
2534 2780
2535 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2536 state => 0, 2782 state => 0,
2537 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2538 @_ 2784 @_
2539 ); 2785 );
2540 2786
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2787 $self
2547} 2788}
2548 2789
2549sub toggle_flopper { 2790sub toggle_flopper {
2550 my ($self) = @_; 2791 my ($self) = @_;
2551 2792
2552 # TODO: use animation 2793 $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} 2794}
2564 2795
2565############################################################################# 2796#############################################################################
2566 2797
2567package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2580} 2811}
2581 2812
2582sub set_tooltip_from { 2813sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2584 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2585 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2831 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2833 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2602 2845
2603sub size_allocate { 2846sub size_allocate {
2604 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2605 2848
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2607} 2868}
2608 2869
2609sub _draw { 2870sub _draw {
2610 my ($self) = @_; 2871 my ($self) = @_;
2611 2872
… …
2628 glVertex $w, $h; 2889 glVertex $w, $h;
2629 glVertex $w, 0; 2890 glVertex $w, 0;
2630 glEnd; 2891 glEnd;
2631 2892
2632 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2633 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2634} 2896}
2635 2897
2636############################################################################# 2898#############################################################################
2637 2899
… …
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697 2959
2698 if ($tex) { 2960 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2704 } 2966 }
2705} 2967}
2706 2968
2707sub DESTROY { 2969sub destroy {
2708 my ($self) = @_; 2970 my ($self) = @_;
2709 2971
2710 $self->{timer}->cancel 2972 $self->{timer}->cancel
2711 if $self->{timer}; 2973 if $self->{timer};
2712 2974
2713 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2714} 2976}
2715 2977
2716############################################################################# 2978#############################################################################
2717 2979
2718package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2719 2981
2720our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2721 2983
2722sub new { 2984# 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 2985
2765############################################################################# 2986#############################################################################
2766 2987
2767package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2768 2989
… …
2780 ); 3001 );
2781 3002
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783 3004
2784 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2786 3007
2787 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2788 if (!ref $widget) { 3009 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2790 can_hover => 1, 3011 can_hover => 1,
2791 can_events => 1, 3012 can_events => 1,
2792 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2793 } 3015 }
2794 3016
2795 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2796 3018
2797 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2809 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 3032 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2812 3034
2813 $self->show; 3035 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 3037}
2816 3038
2817sub mouse_motion { 3039sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2819 3041
2820 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2823} 3047}
2824 3048
2825sub button_up { 3049sub button_up {
2826 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2827 3051
… …
2829 undef $GRAB; 3053 undef $GRAB;
2830 $self->hide; 3054 $self->hide;
2831 3055
2832 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2834 } 3062 1
2835} 3063}
2836 3064
2837############################################################################# 3065#############################################################################
2838 3066
2839package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2840 3068
2841our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2842 3070
2843sub new { 3071sub new {
2844 my $class = shift; 3072 my $class = shift;
2845 3073
2846 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2847 fontsize => 0.8, 3239 fontsize => 0.8,
2848 @_, 3240 @_,
2849 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2850} 3248}
2851 3249
2852sub reorder { 3250sub reorder {
2853 my ($self) = @_; 3251 my ($self) = @_;
2854 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2855 3258
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3261 }
2859 3262
… …
2862 my @items = sort { 3265 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2866 3269
3270 $self->{timer}->interval (1);
3271
2867 my $count = 10 + 1; 3272 my $count = 10 + 1;
2868 for my $item (@items) { 3273 for my $item (@items) {
2869 last unless --$count; 3274 last unless --$count;
2870 3275
2871 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text}; 3280 : $item->{text};
2876 3281
… …
2884 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2890 can_events => 1, 3295 can_events => 1,
2891 can_hover => 1 3296 can_hover => 1
2892 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2893 } 3310 }
2894 3311
2895 $self->clear; 3312 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2897} 3314}
… …
2902 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2904 3321
2905 return unless $text; 3322 return unless $text;
2906 3323
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3325
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3327
2911 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2913 $item->{count}++; 3330 $item->{count}++;
2914 } else { 3331 } else {
2915 $item->{count} = 1; 3332 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2917 } 3334 }
2918 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2919 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2920 delete $item->{label}; 3337 delete $item->{label};
2921 } else { 3338 } else {
2922 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2923 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2942 3359
2943 $self->reorder; 3360 $self->reorder;
2944 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2945} 3362}
2946 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2947############################################################################# 3372#############################################################################
2948 3373
2949package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2950 3375
2951our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953use CFClient::OpenGL;
2954 3377
2955sub new { 3378sub new {
2956 my $class = shift; 3379 my $class = shift;
2957 3380
2958 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
2959 @_, 3624 @_,
2960 ) 3625 )
2961} 3626}
2962 3627
2963sub configure { 3628my $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 3629
2966 $self->{w} = $w; 3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2967 $self->{h} = $h; 3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2968} 3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2969 3640
2970sub check_size { 3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
2971 my ($self) = @_; 3714 my ($self, $spell) = @_;
2972 3715
2973 $self->size_allocate ($self->{w}, $self->{h}) 3716 $self->{spell}->{$spell->{name}} = $spell;
2974 if $self->{w}; 3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
3748 visible => 1,
3749 @_,
3750 );
3751
3752 Scalar::Util::weaken ($self->{root} = $self);
3753
3754 $self
2975} 3755}
2976 3756
2977sub size_request { 3757sub size_request {
2978 my ($self) = @_; 3758 my ($self) = @_;
2979 3759
2980 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2981} 3775}
2982 3776
2983sub size_allocate { 3777sub size_allocate {
2984 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2985 3779
2986 for my $child ($self->children) { 3780 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3782
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
2991 3785
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3787 $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 3788
2998 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
2999 } 3790 }
3000} 3791}
3001 3792
… …
3012} 3803}
3013 3804
3014sub update { 3805sub update {
3015 my ($self) = @_; 3806 my ($self) = @_;
3016 3807
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3019} 3809}
3020 3810
3021sub add { 3811sub add {
3022 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3023 3813
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; 3814 $_->{is_toplevel} = 1
3032 3815 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3816
3038 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3039} 3818}
3040 3819
3041sub remove { 3820sub remove {
3042 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3043 3822
3044 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3045 3827
3046 while (@children) { 3828 while (@children) {
3047 my $w = pop @children; 3829 my $w = pop @children;
3048 push @children, $w->children; 3830 push @children, $w->children;
3049 $w->set_invisible; 3831 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3069 $_->() 3851 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3071 } 3853 }
3072 3854
3073 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3074 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
3075 3859
3076 for (;;) { 3860 outer:
3077 if ($self->{check_size}) { 3861 while () {
3078 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3864 $widget->{visible} or next; # do not resize invisible widgets
3865
3866 $queue{$widget+0}++ and next; # duplicates are common
3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3081 } 3870 }
3082 3871
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
3084 3874
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3876 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 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3095 3898
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3097 3900
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3100 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3101 } 3911 }
3102 } 3912 }
3103 3913
3104 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3922
3108 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3110 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3111 $widget->{w} = $w; 3933 $widget->{w} = $w;
3112 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3113 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3114 } 3938 }
3115 } 3939 }
3116 3940
3117 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3118 $_->() 3942 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3120 } 3944 }
3945
3121 3946
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3125 3950
… …
3127 glLoadIdentity; 3952 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3955 glLoadIdentity;
3131 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3132 $self->_draw; 3964 $self->_draw;
3133} 3965}
3134 3966
3135############################################################################# 3967#############################################################################
3136 3968

Diff Legend

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