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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 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 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
233 276
234 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
235 279
236 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
238 282
239 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
241 285
242 $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;
243} 306}
244 307
245sub hide { 308sub hide {
246 my ($self) = @_; 309 my ($self) = @_;
247 310
… …
249 312
250 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
251 if $self->{parent}; 314 if $self->{parent};
252} 315}
253 316
254sub move { 317sub move_abs {
255 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
256 319
257 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
258 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
259 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
260 323
261 $self->update; 324 $self->update;
262} 325}
263 326
264sub set_size { 327sub set_size {
265 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
266 329
267 $self->{user_w} = $w; 330 $self->{force_w} = $w;
268 $self->{user_h} = $h; 331 $self->{force_h} = $h;
269 332
270 $self->check_size; 333 $self->realloc;
271} 334}
272 335
273sub size_request { 336sub size_request {
274 require Carp; 337 require Carp;
275 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
277 340
278sub configure { 341sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
280 343
281 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
284 349
285 # use alignment to adjust x, y 350 # use alignment to adjust x, y
286 351
287 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 354 }
292 355
293 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 357 $self->{x} = $x;
295 $self->{y} = $y; 358 $self->{y} = $y;
296 $self->update; 359 $self->update;
297 } 360 }
298 361
299 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $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;
301 } 369 }
302} 370}
303 371
304sub size_allocate { 372sub size_allocate {
305 # nothing to be done 373 # nothing to be done
306} 374}
307 375
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
316} 382}
317 383
318sub set_max_size { 384sub set_max_size {
319 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
320 386
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
323} 391}
324 392
325sub set_tooltip { 393sub set_tooltip {
326 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
327 395
… …
332 400
333 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
334 402
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
338 } 406 }
339} 407}
340 408
341# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
342sub coord2local { 410sub coord2local {
… …
379 447
380 $::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
381 unless $FOCUS; 449 unless $FOCUS;
382} 450}
383 451
384sub mouse_motion { } 452sub mouse_motion { 0 }
385sub button_up { } 453sub button_up { 0 }
386sub key_down { } 454sub key_down { 0 }
387sub key_up { } 455sub key_up { 0 }
388 456
389sub button_down { 457sub button_down {
390 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
391 459
392 $self->focus_in; 460 $self->focus_in;
393}
394 461
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
399sub 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
400 538
401sub draw { 539sub draw {
402 my ($self) = @_; 540 my ($self) = @_;
403 541
404 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);
405 553
406 glPushMatrix; 554 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 556
411 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 559 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 561 glBegin GL_QUADS;
418 glVertex $x , $y; 562 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
422 glEnd; 566 glEnd;
423 glDisable GL_BLEND; 567 glDisable GL_BLEND;
424 } 568 }
425 569
426 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 571 glPushMatrix;
428 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 575 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
435 glEnd; 579 glEnd;
436 glPopMatrix; 580 glPopMatrix;
437 #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;
438 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
439} 586}
440 587
441sub _draw { 588sub _draw {
442 my ($self) = @_; 589 my ($self) = @_;
443 590
444 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
445} 592}
446 593
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 594sub DESTROY {
508 my ($self) = @_; 595 my ($self) = @_;
509 596
510 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
511 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
512} 601}
513 602
514############################################################################# 603#############################################################################
515 604
516package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
541 630
542 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
544 633
545 glEnable GL_BLEND; 634 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 636 glColor_premultiply @$color;
548 637
549 glBegin GL_QUADS; 638 glBegin GL_QUADS;
550 glVertex 0 , 0; 639 glVertex 0 , 0;
551 glVertex 0 , $h; 640 glVertex 0 , $h;
552 glVertex $w, $h; 641 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
569} 658}
570 659
571sub size_request { 660sub size_request {
572 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
573} 664}
574 665
575sub draw { } 666sub draw { }
576 667
577############################################################################# 668#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
582 673
583sub new { 674sub new {
584 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
585 676
586 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
587 678
588 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
589 children => [], 680 children => [],
590 can_events => 0, 681 can_events => 0,
591 %arg, 682 %arg,
592 ); 683 );
684
593 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
594 687
595 $self 688 $self
596} 689}
597 690
598sub add { 691sub add {
… …
606 $self->{children} = [ 699 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
609 ]; 702 ];
610 703
611 $self->check_size (1); 704 $self->realloc;
612 $self->update;
613} 705}
614 706
615sub children { 707sub children {
616 @{ $_[0]{children} } 708 @{ $_[0]{children} }
617} 709}
… …
622 delete $child->{parent}; 714 delete $child->{parent};
623 $child->hide; 715 $child->hide;
624 716
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 718
627 $self->check_size (1); 719 $self->realloc;
628 $self->update;
629} 720}
630 721
631sub clear { 722sub clear {
632 my ($self) = @_; 723 my ($self) = @_;
633 724
… …
637 for (@$children) { 728 for (@$children) {
638 delete $_->{parent}; 729 delete $_->{parent};
639 $_->hide; 730 $_->hide;
640 } 731 }
641 732
642 $self->check_size; 733 $self->realloc;
643 $self->update;
644} 734}
645 735
646sub find_widget { 736sub find_widget {
647 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
648 738
649 $x -= $self->{x}; 739 $x -= $self->{x};
650 $y -= $self->{y}; 740 $y -= $self->{y};
651 741
652 my $res; 742 my $res;
653 743
654 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
656 and return $res; 746 and return $res;
657 } 747 }
658 748
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680} 770}
681 771
682sub add { 772sub add {
683 my ($self, $child) = @_; 773 my ($self, $child) = @_;
684 774
685 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
686
687 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
688} 777}
689 778
690sub remove { 779sub remove {
691 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
708 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
709} 798}
710 799
711############################################################################# 800#############################################################################
712 801
802# back-buffered drawing area
803
713package CFClient::UI::Window; 804package CFClient::UI::Window;
714 805
715our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
716 807
717use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
735 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 827 $self->update;
737} 828}
738 829
739sub _render { 830sub _render {
831 my ($self) = @_;
832
740 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
741} 834}
742 835
743sub render_child { 836sub render_child {
744 my ($self) = @_; 837 my ($self) = @_;
745 838
746 $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 {
747 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
749 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
750 $self->_render; 850 $self->_render;
751 }; 851 };
752} 852}
753 853
754sub _draw { 854sub _draw {
755 my ($self) = @_; 855 my ($self) = @_;
756 856
757 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
758 858
759 my $tex = $self->{texture} 859 my $tex = $self->{texture}
760 or return; 860 or return;
761 861
762 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
765 865
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 867
768 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
769} 869}
… …
785} 885}
786 886
787sub size_request { 887sub size_request {
788 my ($self) = @_; 888 my ($self) = @_;
789 889
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 891
792 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
793} 896}
794 897
795sub size_allocate { 898sub size_allocate {
796 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
797 900
901 my $child = $self->child;
902
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 905
801 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
802 $self->update; 907 $self->update;
803} 908}
804 909
… …
840} 945}
841 946
842sub _render { 947sub _render {
843 my ($self) = @_; 948 my ($self) = @_;
844 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
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 954
847 $self->SUPER::_render; 955 $self->SUPER::_render;
848} 956}
849 957
… …
852package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
853 961
854our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
855 963
856sub new { 964sub new {
857 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
858 968
859 my $self; 969 my $self;
860 970
861 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
862 vertical => 1, 972 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 974 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
866 }, 976 },
867 ; 977 ;
868 978
869 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 981 slider => $slider,
872 @_, 982 %arg,
873 ); 983 );
874 984
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
878 987
879 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
880} 995}
881 996
882sub update { 997sub update {
883 my ($self) = @_; 998 my ($self) = @_;
884 999
… …
923 1038
924 if ($self->{bg}) { 1039 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
926 1041
927 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
930 1045
931 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
932 glVertex 0 , 0; 1047 glVertex 0 , 0;
933 glVertex 0 , $h; 1048 glVertex 0 , $h;
934 glVertex $w, $h; 1049 glVertex $w, $h;
… …
947 1062
948our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
949 1064
950use CFClient::OpenGL; 1065use CFClient::OpenGL;
951 1066
952my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 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);
955 1074
956sub new { 1075sub new {
957 my $class = shift; 1076 my ($class, %arg) = @_;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1077
961 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1081 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1082 can_events => 1,
967 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
968 ); 1086 );
969 1087
970 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
971 align => 0, 1089 align => 0,
972 valign => 1, 1090 valign => 1,
973 text => $self->{title}, 1091 text => $self->{title},
974 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 }
975 1103
976 $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};
977} 1113}
978 1114
979sub border { 1115sub border {
980 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
981} 1117}
982 1118
983sub size_request { 1119sub size_request {
984 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};
985 1127
986 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
987 1129
988 ( 1130 (
989 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
992} 1134}
993 1135
994sub size_allocate { 1136sub size_allocate {
995 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
996 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
997 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
999 1149
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $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};
1004} 1154}
1005 1155
1006sub button_down { 1156sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1008 1158
… …
1024 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1025 1175
1026 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1028 1178
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1183 $self->realloc;
1033 }; 1184 };
1034 1185
1035 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1190 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1041 1192
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1194
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1047 } 1203 1
1048} 1204}
1049 1205
1050sub button_up { 1206sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1052 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1053 delete $self->{motion}; 1212 !!delete $self->{motion}
1054} 1213}
1055 1214
1056sub mouse_motion { 1215sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1058 1217
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1060} 1221}
1061 1222
1062sub _draw { 1223sub _draw {
1063 my ($self) = @_; 1224 my ($self) = @_;
1064 1225
1226 my $child = $self->{children}[0];
1227
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1230
1068 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1233
1071 my $border = $self->border; 1234 my $border = $self->border;
1072 1235
1073 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1241
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1081 1244
1082 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1250 }
1093 1251
1094 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1095 1253
1096 $self->{title}->draw if $self->{title};
1097
1098 $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};
1099} 1265}
1100 1266
1101############################################################################# 1267#############################################################################
1102 1268
1103package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1126 1292
1127 $child->set_parent ($self); 1293 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1129 1295
1130 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1131} 1303}
1132 1304
1133# 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?
1134sub clear { 1306sub clear {
1135 my ($self) = @_; 1307 my ($self) = @_;
… …
1140 for (@children) { 1312 for (@children) {
1141 delete $_->{parent}; 1313 delete $_->{parent};
1142 $_->hide; 1314 $_->hide;
1143 } 1315 }
1144 1316
1145 $self->check_size (1); 1317 $self->realloc;
1146 $self->update;
1147} 1318}
1148 1319
1149sub get_wh { 1320sub get_wh {
1150 my ($self) = @_; 1321 my ($self) = @_;
1151 1322
… …
1247 } 1418 }
1248} 1419}
1249 1420
1250############################################################################# 1421#############################################################################
1251 1422
1252package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1424
1256our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1257 1426
1258sub size_request { 1427sub size_request {
1259 my ($self) = @_; 1428 my ($self) = @_;
1260 1429
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1262 1431 ? (
1263 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1434 )
1266 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1267} 1439}
1268 1440
1269sub size_allocate { 1441sub size_allocate {
1270 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1271 1443
1272 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1445 my $children = $self->{children};
1275 1446
1276 my @h = map $_->{req_w}, @$children; 1447 my @req;
1277 1448
1278 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1279 1450 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } 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 {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1465 }
1294 } 1466 }
1295 1467
1296 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1297 1469
1298 my $y = 0; 1470 my $pos = 0;
1299 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1474
1304 $y += $h; 1475 $pos += $alloc;
1305 } 1476 }
1306 1477
1307 1 1478 1
1308} 1479}
1309 1480
1310############################################################################# 1481#############################################################################
1311 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
1312package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1313 1499
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1317 1501
1318sub size_request { 1502sub new {
1319 my ($self) = @_; 1503 my $class = shift;
1320 1504
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1322 1506 vertical => 1,
1323 ( 1507 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1508 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1509}
1367 1510
1368############################################################################# 1511#############################################################################
1369 1512
1370package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1530 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1389 fontsize => 1, 1532 fontsize => 1,
1390 align => -1, 1533 align => -1,
1391 valign => -1, 1534 valign => -1,
1392 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1393 can_events => 0, 1537 can_events => 0,
1394 %arg 1538 %arg
1395 ); 1539 );
1396 1540
1397 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1424 1568
1425 delete $self->{texture}; 1569 delete $self->{texture};
1426 $self->SUPER::update; 1570 $self->SUPER::update;
1427} 1571}
1428 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1429sub set_text { 1580sub set_text {
1430 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1431 1582
1432 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1434 1585
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1437 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1438 $self->update; 1591 $self->update;
1439 $self->check_size;
1440} 1592}
1441 1593
1442sub set_markup { 1594sub set_markup {
1443 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1444 1596
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1601
1450 $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;
1451 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1452 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1453 $self->update; 1607 $self->update;
1454 $self->check_size;
1455} 1608}
1456 1609
1457sub size_request { 1610sub size_request {
1458 my ($self) = @_; 1611 my ($self) = @_;
1459 1612
1613 $self->{size_req} ||= do {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1619
1466 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1467 1621
1468 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1625
1472 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1473 1627
1474 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1476 } 1633 };
1477 1634
1478 ( 1635 @{ $self->{size_req} }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1636}
1483 1637
1484sub size_allocate { 1638sub size_allocate {
1485 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1486 1640
1641 delete $self->{ox};
1642
1487 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1645}
1489 1646
1490sub set_fontsize { 1647sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1492 1649
1493 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1651 delete $self->{texture};
1495 1652
1496 $self->update; 1653 $self->realloc;
1497 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1498} 1662}
1499 1663
1500sub _draw { 1664sub _draw {
1501 my ($self) = @_; 1665 my ($self) = @_;
1502 1666
… …
1508 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1676
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1514 1679
1680 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1518 1684
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1688 };
1525 1689
1526 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1527 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};
1528 1694
1529 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1530 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1532 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1534 } 1702 }
1535 1703
1536 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1537} 1705}
1538 1706
… …
1555 can_hover => 1, 1723 can_hover => 1,
1556 can_focus => 1, 1724 can_focus => 1,
1557 valign => 0, 1725 valign => 0,
1558 can_events => 1, 1726 can_events => 1,
1559 #text => ... 1727 #text => ...
1728 #hidden => "*",
1560 @_ 1729 @_
1561 ) 1730 )
1562} 1731}
1563 1732
1564sub _set_text { 1733sub _set_text {
… …
1566 1735
1567 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1568 1737
1569 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1570 1739
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1741 $self->{text} = $text;
1575 1742
1576 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1578 1746
1579 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1580} 1751}
1581 1752
1582sub set_text { 1753sub set_text {
1583 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1584 1755
1585 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1757 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1758}
1590 1759
1591sub get_text { 1760sub get_text {
1592 $_[0]{text} 1761 $_[0]{text}
1593} 1762}
… …
1623 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1626 } elsif ($uni) { 1795 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1628 } 1799 }
1629 1800
1630 $self->_set_text ($text); 1801 $self->_set_text ($text);
1631 $self->update; 1802
1632 $self->check_size; 1803 $self->realloc;
1804
1805 1
1633} 1806}
1634 1807
1635sub focus_in { 1808sub focus_in {
1636 my ($self) = @_; 1809 my ($self) = @_;
1637 1810
… …
1652 utf8::encode $text; 1825 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1654 1827
1655 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1656 $self->update; 1829 $self->update;
1830
1831 1
1657} 1832}
1658 1833
1659sub mouse_motion { 1834sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1661# 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
1662} 1839}
1663 1840
1664sub _draw { 1841sub _draw {
1665 my ($self) = @_; 1842 my ($self) = @_;
1666 1843
1667 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1668 1845
1669 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1672 } else { 1849 } else {
1673 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1674 } 1851 }
1675 1852
1676 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1856 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1743 } else { 1920 } else {
1744 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1745 } 1922 }
1746 1923
1747 } else { 1924 } else {
1748 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1749 } 1928 1
1750
1751} 1929}
1752 1930
1753############################################################################# 1931#############################################################################
1754 1932
1755package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1764 1942
1765sub new { 1943sub new {
1766 my $class = shift; 1944 my $class = shift;
1767 1945
1768 $class->SUPER::new ( 1946 $class->SUPER::new (
1769 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1770 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1772 can_hover => 1, 1951 can_hover => 1,
1773 align => 0, 1952 align => 0,
1774 valign => 0, 1953 valign => 0,
… …
1783 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1784 1963
1785 $self->emit ("activate") 1964 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1788} 1969}
1789 1970
1790sub _draw { 1971sub _draw {
1791 my ($self) = @_; 1972 my ($self) = @_;
1792 1973
1793 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1975
1799 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1802 1979
… …
1807 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1808} 1985}
1809 1986
1810############################################################################# 1987#############################################################################
1811 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
1812package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1813 2028
1814our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1815 2030
1816my @tex = 2031my @tex =
… …
1821 2036
1822sub new { 2037sub new {
1823 my $class = shift; 2038 my $class = shift;
1824 2039
1825 $class->SUPER::new ( 2040 $class->SUPER::new (
1826 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1827 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 2047 state => 0,
… …
1835} 2051}
1836 2052
1837sub size_request { 2053sub size_request {
1838 my ($self) = @_; 2054 my ($self) = @_;
1839 2055
1840 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1841} 2057}
1842 2058
1843sub button_down { 2059sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1845 2061
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1850 } 2070 1
1851} 2071}
1852 2072
1853sub _draw { 2073sub _draw {
1854 my ($self) = @_; 2074 my ($self) = @_;
1855 2075
1856 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1857 2077
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2079
1860 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;
1861 2083
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2085
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2087
… …
2020 2242
2021 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2023 2245
2024 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2025 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;
2026 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2251
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2130 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2137 vertical => 0, 2360 vertical => 0,
2138 can_hover => 1, 2361 can_hover => 1,
2139 inner_pad => 0.02, 2362 inner_pad => 0.02,
2140 @_ 2363 @_
2141 ); 2364 );
… …
2144 $self->update; 2367 $self->update;
2145 2368
2146 $self 2369 $self
2147} 2370}
2148 2371
2372sub changed { }
2373
2149sub set_range { 2374sub set_range {
2150 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2151 2376
2152 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2153 2378
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2156} 2383}
2157 2384
2158sub set_value { 2385sub set_value {
2159 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2160 2387
… …
2179} 2406}
2180 2407
2181sub size_request { 2408sub size_request {
2182 my ($self) = @_; 2409 my ($self) = @_;
2183 2410
2184 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2412}
2189 2413
2190sub button_down { 2414sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2192 2416
2193 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2194 2418
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2420
2197 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2198} 2422}
2199 2423
2200sub mouse_motion { 2424sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2202 2426
… …
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2431
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2433
2210 $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
2211 } 2439 1
2212} 2440}
2213 2441
2214sub update { 2442sub update {
2215 my ($self) = @_; 2443 my ($self) = @_;
2216 2444
2217 $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}) {
2218 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2219 2454
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2222 2457
… …
2228 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2230 2465
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2233 }); 2468 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2469
2241 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2242 2471
2243 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2244 2473
… …
2305sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2307 2536
2308############################################################################# 2537#############################################################################
2309 2538
2310package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2311 2540
2312our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2313 2542
2314use CFClient::OpenGL; 2543use CFClient::OpenGL;
2315 2544
… …
2317 my $class = shift; 2546 my $class = shift;
2318 2547
2319 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2320 fontsize => 1, 2549 fontsize => 1,
2321 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2322 #font => default_font 2552 #font => default_font
2323 @_, 2553 @_,
2324 2554
2325 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2326 par => [], 2556 par => [],
… …
2349 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2350 2580
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $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});
2354 2585
2355 $self->reflow; 2586 $self->reflow;
2356} 2587}
2357 2588
2358sub text_size { 2589sub text_size {
… …
2360 2591
2361 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2362 2593
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $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});
2365 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2366 2598
2367 $layout->size 2599 $layout->size
2368} 2600}
2369 2601
… …
2408 2640
2409 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2410 2642
2411 delete $self->{texture}; 2643 delete $self->{texture};
2412 2644
2413 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415 2647
2416 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2417 my $height = 0; 2649 my $height = 0;
2418 2650
… …
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422 2654
2423 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2426 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h; 2662 $_->[1] = $h;
2430 } 2663 }
… …
2433 } 2666 }
2434 2667
2435 $self->{height} = $height; 2668 $self->{height} = $height;
2436 2669
2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2438 2671
2439 delete $self->{texture}; 2672 delete $self->{texture};
2440 } 2673 }
2441 2674
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2445 2678
2446 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2447 2680
2448 my $y0 = $top; 2681 my $y0 = $top;
… …
2462 my $h = $par->[1]; 2695 my $h = $par->[1];
2463 2696
2464 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2467 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2468 2702
2469 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2470 2704
2471 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2483sub _draw { 2717sub _draw {
2484 my ($self) = @_; 2718 my ($self) = @_;
2485 2719
2486 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2489 $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});
2490 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2491 2725
2492 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2493 2727
2494} 2728}
… …
2543 2777
2544sub new { 2778sub new {
2545 my $class = shift; 2779 my $class = shift;
2546 2780
2547 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2548 state => 0, 2782 state => 0,
2549 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2550 @_ 2784 @_
2551 ); 2785 );
2552 2786
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2787 $self
2559} 2788}
2560 2789
2561sub toggle_flopper { 2790sub toggle_flopper {
2562 my ($self) = @_; 2791 my ($self) = @_;
2563 2792
2564 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2794}
2576 2795
2577############################################################################# 2796#############################################################################
2578 2797
2579package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2592} 2811}
2593 2812
2594sub set_tooltip_from { 2813sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2596 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
2597 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2831 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2833 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2845
2615sub size_allocate { 2846sub size_allocate {
2616 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2617 2848
2618 $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 });
2619} 2868}
2620 2869
2621sub _draw { 2870sub _draw {
2622 my ($self) = @_; 2871 my ($self) = @_;
2623 2872
… …
2640 glVertex $w, $h; 2889 glVertex $w, $h;
2641 glVertex $w, 0; 2890 glVertex $w, 0;
2642 glEnd; 2891 glEnd;
2643 2892
2644 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2645 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2646} 2896}
2647 2897
2648############################################################################# 2898#############################################################################
2649 2899
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 2959
2710 if ($tex) { 2960 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2716 } 2966 }
2717} 2967}
2718 2968
2719sub DESTROY { 2969sub destroy {
2720 my ($self) = @_; 2970 my ($self) = @_;
2721 2971
2722 $self->{timer}->cancel 2972 $self->{timer}->cancel
2723 if $self->{timer}; 2973 if $self->{timer};
2724 2974
2725 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2726} 2976}
2727 2977
2728############################################################################# 2978#############################################################################
2729 2979
2730package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2731 2981
2732our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2733 2983
2734sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 2985
2775############################################################################# 2986#############################################################################
2776 2987
2777package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2778 2989
… …
2790 ); 3001 );
2791 3002
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2793 3004
2794 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2796 3007
2797 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2798 if (!ref $widget) { 3009 if (!ref $widget) {
2799 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2800 can_hover => 1, 3011 can_hover => 1,
2801 can_events => 1, 3012 can_events => 1,
2802 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2803 } 3015 }
2804 3016
2805 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2806 3018
2807 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2819 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 3032 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2822 3034
2823 $self->show; 3035 $self->show;
2824 $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);
2825} 3037}
2826 3038
2827sub mouse_motion { 3039sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2829 3041
2830 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2833} 3047}
2834 3048
2835sub button_up { 3049sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2837 3051
… …
2839 undef $GRAB; 3053 undef $GRAB;
2840 $self->hide; 3054 $self->hide;
2841 3055
2842 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2844 } 3062 1
2845} 3063}
2846 3064
2847############################################################################# 3065#############################################################################
2848 3066
2849package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2850 3068
2851our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2852 3070
2853sub new { 3071sub new {
2854 my $class = shift; 3072 my $class = shift;
2855 3073
2856 $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 (
2857 fontsize => 0.8, 3239 fontsize => 0.8,
2858 @_, 3240 @_,
2859 ) 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
2860} 3248}
2861 3249
2862sub reorder { 3250sub reorder {
2863 my ($self) = @_; 3251 my ($self) = @_;
2864 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} };
2865 3258
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3261 }
2869 3262
… …
2872 my @items = sort { 3265 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2876 3269
3270 $self->{timer}->interval (1);
3271
2877 my $count = 10 + 1; 3272 my $count = 10 + 1;
2878 for my $item (@items) { 3273 for my $item (@items) {
2879 last unless --$count; 3274 last unless --$count;
2880 3275
2881 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3280 : $item->{text};
2886 3281
… …
2894 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3295 can_events => 1,
2901 can_hover => 1 3296 can_hover => 1
2902 }; 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;
2903 } 3310 }
2904 3311
2905 $self->clear; 3312 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2907} 3314}
… …
2912 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2914 3321
2915 return unless $text; 3322 return unless $text;
2916 3323
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3325
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3327
2921 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2923 $item->{count}++; 3330 $item->{count}++;
2924 } else { 3331 } else {
2925 $item->{count} = 1; 3332 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2927 } 3334 }
2928 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2929 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2930 delete $item->{label}; 3337 delete $item->{label};
2931 } else { 3338 } else {
2932 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2933 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2952 3359
2953 $self->reorder; 3360 $self->reorder;
2954 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2955} 3362}
2956 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2957############################################################################# 3372#############################################################################
2958 3373
2959package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2960 3375
2961our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3377
2965sub new { 3378sub new {
2966 my $class = shift; 3379 my $class = shift;
2967 3380
2968 $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) = @_;
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 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
2969 @_, 3623 @_,
2970 ) 3624 )
2971} 3625}
2972 3626
2973sub configure { 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2974 my ($self, $x, $y, $w, $h) = @_;
2975 3628
2976 $self->{w} = $w; 3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2977 $self->{h} = $h; 3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2978} 3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2979 3639
2980sub check_size { 3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
2981 my ($self) = @_; 3713 my ($self, $spell) = @_;
2982 3714
2983 $self->size_allocate ($self->{w}, $self->{h}) 3715 $self->{spell}->{$spell->{name}} = $spell;
2984 if $self->{w}; 3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3747 visible => 1,
3748 @_,
3749 );
3750
3751 Scalar::Util::weaken ($self->{root} = $self);
3752
3753 $self
2985} 3754}
2986 3755
2987sub size_request { 3756sub size_request {
2988 my ($self) = @_; 3757 my ($self) = @_;
2989 3758
2990 ($self->{w}, $self->{h}) 3759 ($self->{w}, $self->{h})
3760}
3761
3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
3764
3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
3769
3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
3772
3773 int $coord + 0.5
2991} 3774}
2992 3775
2993sub size_allocate { 3776sub size_allocate {
2994 my ($self, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
2995 3778
2996 for my $child ($self->children) { 3779 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3781
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3782 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3783 $Y = $child->{force_y} if exists $child->{force_y};
3001 3784
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3785 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3786 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3787
3008 $child->configure ($X, $Y, $W, $H); 3788 $child->configure ($X, $Y, $W, $H);
3009 } 3789 }
3010} 3790}
3011 3791
… …
3022} 3802}
3023 3803
3024sub update { 3804sub update {
3025 my ($self) = @_; 3805 my ($self) = @_;
3026 3806
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
3029} 3808}
3030 3809
3031sub add { 3810sub add {
3032 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
3033 3812
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3813 $_->{is_toplevel} = 1
3042 3814 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3815
3048 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3049} 3817}
3050 3818
3051sub remove { 3819sub remove {
3052 my ($self, @children) = @_; 3820 my ($self, @children) = @_;
3053 3821
3054 $self->SUPER::remove (@children); 3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3055 3826
3056 while (@children) { 3827 while (@children) {
3057 my $w = pop @children; 3828 my $w = pop @children;
3058 push @children, $w->children; 3829 push @children, $w->children;
3059 $w->set_invisible; 3830 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3079 $_->() 3850 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3081 } 3852 }
3082 3853
3083 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3084 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
3085 3858
3086 for (;;) { 3859 outer:
3087 if ($self->{check_size}) { 3860 while () {
3088 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3091 } 3869 }
3092 3870
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
3094 3873
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3875 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3105 3897
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3107 3899
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3110 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3111 } 3910 }
3112 } 3911 }
3113 3912
3114 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3921
3118 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3120 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3121 $widget->{w} = $w; 3932 $widget->{w} = $w;
3122 $widget->{h} = $h; 3933 $widget->{h} = $h;
3934
3123 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3124 } 3937 }
3125 } 3938 }
3126 3939
3127 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3128 $_->() 3941 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3130 } 3943 }
3944
3131 3945
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3135 3949
… …
3137 glLoadIdentity; 3951 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3954 glLoadIdentity;
3141 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3142 $self->_draw; 3963 $self->_draw;
3143} 3964}
3144 3965
3145############################################################################# 3966#############################################################################
3146 3967

Diff Legend

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