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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
232 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
233 delete $self->{visible}; 278 delete $self->{visible};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
242} 306}
243 307
244sub hide { 308sub hide {
245 my ($self) = @_; 309 my ($self) = @_;
246 310
… …
248 312
249 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
250 if $self->{parent}; 314 if $self->{parent};
251} 315}
252 316
253sub move { 317sub move_abs {
254 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
255 319
256 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
259 323
260 $self->update; 324 $self->update;
261} 325}
262 326
263sub set_size { 327sub set_size {
264 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
265 329
266 $self->{user_w} = $w; 330 $self->{force_w} = $w;
267 $self->{user_h} = $h; 331 $self->{force_h} = $h;
268 332
269 $self->check_size; 333 $self->realloc;
270} 334}
271 335
272sub size_request { 336sub size_request {
273 require Carp; 337 require Carp;
274 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
276 340
277sub configure { 341sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
279 343
280 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
283 349
284 # use alignment to adjust x, y 350 # use alignment to adjust x, y
285 351
286 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 354 }
291 355
292 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 357 $self->{x} = $x;
294 $self->{y} = $y; 358 $self->{y} = $y;
295 $self->update; 359 $self->update;
296 } 360 }
297 361
298 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
300 } 369 }
301} 370}
302 371
303sub size_allocate { 372sub size_allocate {
304 # nothing to be done 373 # nothing to be done
305} 374}
306 375
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
315} 382}
316 383
317sub set_max_size { 384sub set_max_size {
318 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
319 386
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
322} 391}
323 392
324sub set_tooltip { 393sub set_tooltip {
325 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
326 395
… …
331 400
332 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
333 402
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 406 }
338} 407}
339 408
340# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
341sub coord2local { 410sub coord2local {
… …
378 447
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 449 unless $FOCUS;
381} 450}
382 451
383sub mouse_motion { } 452sub mouse_motion { 0 }
384sub button_up { } 453sub button_up { 0 }
385sub key_down { } 454sub key_down { 0 }
386sub key_up { } 455sub key_up { 0 }
387 456
388sub button_down { 457sub button_down {
389 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
390 459
391 $self->focus_in; 460 $self->focus_in;
392}
393 461
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 538
400sub draw { 539sub draw {
401 my ($self) = @_; 540 my ($self) = @_;
402 541
403 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 553
405 glPushMatrix; 554 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 556
410 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 559 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 561 glBegin GL_QUADS;
417 glVertex $x , $y; 562 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
421 glEnd; 566 glEnd;
422 glDisable GL_BLEND; 567 glDisable GL_BLEND;
423 } 568 }
424 569
425 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 571 glPushMatrix;
427 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 575 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
434 glEnd; 579 glEnd;
435 glPopMatrix; 580 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
438} 586}
439 587
440sub _draw { 588sub _draw {
441 my ($self) = @_; 589 my ($self) = @_;
442 590
443 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504} 592}
505 593
506sub DESTROY { 594sub DESTROY {
507 my ($self) = @_; 595 my ($self) = @_;
508 596
… …
540 628
541 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
543 631
544 glEnable GL_BLEND; 632 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 634 glColor_premultiply @$color;
547 635
548 glBegin GL_QUADS; 636 glBegin GL_QUADS;
549 glVertex 0 , 0; 637 glVertex 0 , 0;
550 glVertex 0 , $h; 638 glVertex 0 , $h;
551 glVertex $w, $h; 639 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
568} 656}
569 657
570sub size_request { 658sub size_request {
571 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
572} 662}
573 663
574sub draw { } 664sub draw { }
575 665
576############################################################################# 666#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
581 671
582sub new { 672sub new {
583 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
584 674
585 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
586 676
587 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
588 children => [], 678 children => [],
589 can_events => 0, 679 can_events => 0,
590 %arg, 680 %arg,
591 ); 681 );
682
592 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
593 685
594 $self 686 $self
595} 687}
596 688
597sub add { 689sub add {
… …
605 $self->{children} = [ 697 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
608 ]; 700 ];
609 701
610 $self->check_size (1); 702 $self->realloc;
611 $self->update;
612} 703}
613 704
614sub children { 705sub children {
615 @{ $_[0]{children} } 706 @{ $_[0]{children} }
616} 707}
… …
621 delete $child->{parent}; 712 delete $child->{parent};
622 $child->hide; 713 $child->hide;
623 714
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 716
626 $self->check_size (1); 717 $self->realloc;
627 $self->update;
628} 718}
629 719
630sub clear { 720sub clear {
631 my ($self) = @_; 721 my ($self) = @_;
632 722
… …
636 for (@$children) { 726 for (@$children) {
637 delete $_->{parent}; 727 delete $_->{parent};
638 $_->hide; 728 $_->hide;
639 } 729 }
640 730
641 $self->check_size; 731 $self->realloc;
642 $self->update;
643} 732}
644 733
645sub find_widget { 734sub find_widget {
646 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
647 736
648 $x -= $self->{x}; 737 $x -= $self->{x};
649 $y -= $self->{y}; 738 $y -= $self->{y};
650 739
651 my $res; 740 my $res;
652 741
653 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
655 and return $res; 744 and return $res;
656 } 745 }
657 746
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
708} 797}
709 798
710############################################################################# 799#############################################################################
711 800
801# back-buffered drawing area
802
712package CFClient::UI::Window; 803package CFClient::UI::Window;
713 804
714our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
715 806
716use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 826 $self->update;
736} 827}
737 828
738sub _render { 829sub _render {
830 my ($self) = @_;
831
739 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
740} 833}
741 834
742sub render_child { 835sub render_child {
743 my ($self) = @_; 836 my ($self) = @_;
744 837
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
748 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
749 $self->_render; 849 $self->_render;
750 }; 850 };
751} 851}
752 852
753sub _draw { 853sub _draw {
754 my ($self) = @_; 854 my ($self) = @_;
755 855
756 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
757 857
758 my $tex = $self->{texture} 858 my $tex = $self->{texture}
759 or return; 859 or return;
760 860
761 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
764 864
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 866
767 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
768} 868}
… …
784} 884}
785 885
786sub size_request { 886sub size_request {
787 my ($self) = @_; 887 my ($self) = @_;
788 888
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 890
791 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
792} 895}
793 896
794sub size_allocate { 897sub size_allocate {
795 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
796 899
900 my $child = $self->child;
901
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 904
800 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
801 $self->update; 906 $self->update;
802} 907}
803 908
… …
839} 944}
840 945
841sub _render { 946sub _render {
842 my ($self) = @_; 947 my ($self) = @_;
843 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 953
846 $self->SUPER::_render; 954 $self->SUPER::_render;
847} 955}
848 956
… …
851package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
852 960
853our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
854 962
855sub new { 963sub new {
856 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
857 967
858 my $self; 968 my $self;
859 969
860 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
861 vertical => 1, 971 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 973 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
865 }, 975 },
866 ; 976 ;
867 977
868 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 980 slider => $slider,
871 @_, 981 %arg,
872 ); 982 );
873 983
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
877 986
878 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 1004}
880 1005
881sub size_allocate { 1006sub size_allocate {
882 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
883 1008
… …
912 1037
913 if ($self->{bg}) { 1038 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
915 1040
916 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
918 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
919 1044
920 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
921 glVertex 0 , 0; 1046 glVertex 0 , 0;
922 glVertex 0 , $h; 1047 glVertex 0 , $h;
923 glVertex $w, $h; 1048 glVertex $w, $h;
… …
936 1061
937our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
938 1063
939use CFClient::OpenGL; 1064use CFClient::OpenGL;
940 1065
941my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1073
945sub new { 1074sub new {
946 my $class = shift; 1075 my ($class, %arg) = @_;
947 1076
948 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
949 1078
950 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1082 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1083 can_events => 1,
956 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
957 ); 1087 );
958 1088
959 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
960 align => 0, 1090 align => 0,
961 valign => 1, 1091 valign => 1,
962 text => $self->{title}, 1092 text => $title,
963 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
964 1095
965 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
966} 1104}
967 1105
968sub border { 1106sub border {
969 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
970} 1108}
971 1109
972sub size_request { 1110sub size_request {
973 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
974 1115
975 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
976 1117
977 ( 1118 (
978 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
981} 1122}
982 1123
983sub size_allocate { 1124sub size_allocate {
984 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
985 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
986 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
988 1137
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
993} 1139}
994 1140
995sub button_down { 1141sub button_down {
996 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
997 1143
… …
1013 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1014 1160
1015 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1017 1163
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1168 $self->realloc;
1022 }; 1169 };
1023 1170
1024 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1175 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1030 1177
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1179
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1036 } 1188 1
1037} 1189}
1038 1190
1039sub button_up { 1191sub button_up {
1040 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1041 1193
1042 delete $self->{motion}; 1194 !!delete $self->{motion}
1043} 1195}
1044 1196
1045sub mouse_motion { 1197sub mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1047 1199
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1049} 1203}
1050 1204
1051sub _draw { 1205sub _draw {
1052 my ($self) = @_; 1206 my ($self) = @_;
1053 1207
1208 my $child = $self->{children}[0];
1209
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1212
1057 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1215
1060 my $border = $self->border; 1216 my $border = $self->border;
1061 1217
1062 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1223
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1070 1226
1071 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1232 }
1082 1233
1083 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1084 1235
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1088} 1242}
1089 1243
1090############################################################################# 1244#############################################################################
1091 1245
1092package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1114 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1115 1269
1116 $child->set_parent ($self); 1270 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1118 1272
1119 $self->check_size (1); 1273 $self->realloc;
1120} 1274}
1121 1275
1122# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1123sub clear { 1277sub clear {
1124 my ($self) = @_; 1278 my ($self) = @_;
… …
1129 for (@children) { 1283 for (@children) {
1130 delete $_->{parent}; 1284 delete $_->{parent};
1131 $_->hide; 1285 $_->hide;
1132 } 1286 }
1133 1287
1134 $self->check_size (1); 1288 $self->realloc;
1135 $self->update;
1136} 1289}
1137 1290
1138sub get_wh { 1291sub get_wh {
1139 my ($self) = @_; 1292 my ($self) = @_;
1140 1293
… …
1171sub size_allocate { 1324sub size_allocate {
1172 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1173 1326
1174 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1175 1328
1176 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1178 1331
1179 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1236 } 1389 }
1237} 1390}
1238 1391
1239############################################################################# 1392#############################################################################
1240 1393
1241package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1395
1245our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1246 1397
1247sub size_request { 1398sub size_request {
1248 my ($self) = @_; 1399 my ($self) = @_;
1249 1400
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1251 1402 ? (
1252 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1405 )
1255 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1256} 1410}
1257 1411
1258sub size_allocate { 1412sub size_allocate {
1259 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1260 1414
1261 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1416 my $children = $self->{children};
1264 1417
1265 my @h = map $_->{req_w}, @$children; 1418 my @req;
1266 1419
1267 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1268 1421 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1436 }
1283 } 1437 }
1284 1438
1285 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1286 1440
1287 my $y = 0; 1441 my $pos = 0;
1288 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1445
1293 $y += $h; 1446 $pos += $alloc;
1294 } 1447 }
1295 1448
1296 1 1449 1
1297} 1450}
1298 1451
1299############################################################################# 1452#############################################################################
1300 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1301package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1302 1470
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1306 1472
1307sub size_request { 1473sub new {
1308 my ($self) = @_; 1474 my $class = shift;
1309 1475
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1311 1477 vertical => 1,
1312 ( 1478 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1479 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1480}
1356 1481
1357############################################################################# 1482#############################################################################
1358 1483
1359package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1501 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1378 fontsize => 1, 1503 fontsize => 1,
1379 align => -1, 1504 align => -1,
1380 valign => -1, 1505 valign => -1,
1381 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1382 can_events => 0, 1508 can_events => 0,
1383 %arg 1509 %arg
1384 ); 1510 );
1385 1511
1386 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1413 1539
1414 delete $self->{texture}; 1540 delete $self->{texture};
1415 $self->SUPER::update; 1541 $self->SUPER::update;
1416} 1542}
1417 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1418sub set_text { 1551sub set_text {
1419 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1420 1553
1421 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1423 1556
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1426 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1427 $self->update; 1562 $self->update;
1428 $self->check_size;
1429} 1563}
1430 1564
1431sub set_markup { 1565sub set_markup {
1432 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1433 1567
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1572
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1441 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1442 $self->update; 1578 $self->update;
1443 $self->check_size;
1444} 1579}
1445 1580
1446sub size_request { 1581sub size_request {
1447 my ($self) = @_; 1582 my ($self) = @_;
1448 1583
1584 $self->{size_req} ||= do {
1449 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1454 1590
1455 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1456 1592
1457 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1460 1596
1461 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1462 1598
1463 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1465 } 1604 };
1466 1605
1467 ( 1606 @{ $self->{size_req} }
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1607}
1472 1608
1473sub size_allocate { 1609sub size_allocate {
1474 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1475 1611
1612 delete $self->{ox};
1613
1476 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477} 1616}
1478 1617
1479sub set_fontsize { 1618sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1481 1620
1482 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1483 delete $self->{texture}; 1622 delete $self->{texture};
1484 1623
1485 $self->update; 1624 $self->realloc;
1486 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1487} 1633}
1488 1634
1489sub _draw { 1635sub _draw {
1490 my ($self) = @_; 1636 my ($self) = @_;
1491 1637
… …
1497 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1647
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1503 1650
1651 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1507 1655
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1659 };
1514 1660
1515 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517 1662
1518 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1519 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1521 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 } 1670 }
1524 1671
1525 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1526} 1673}
… …
1555 1702
1556 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1557 1704
1558 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1559 1706
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 1708 $self->{text} = $text;
1564 1709
1565 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1567 1713
1568 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1569} 1718}
1570 1719
1571sub set_text { 1720sub set_text {
1572 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1573 1722
1574 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1724 $self->_set_text ($text);
1576 $self->update;
1577 $self->check_size;
1578} 1725}
1579 1726
1580sub get_text { 1727sub get_text {
1581 $_[0]{text} 1728 $_[0]{text}
1582} 1729}
… …
1612 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1615 } elsif ($uni) { 1762 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1617 } 1766 }
1618 1767
1619 $self->_set_text ($text); 1768 $self->_set_text ($text);
1620 $self->update; 1769
1621 $self->check_size; 1770 $self->realloc;
1771
1772 1
1622} 1773}
1623 1774
1624sub focus_in { 1775sub focus_in {
1625 my ($self) = @_; 1776 my ($self) = @_;
1626 1777
… …
1641 utf8::encode $text; 1792 utf8::encode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1643 1794
1644 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1645 $self->update; 1796 $self->update;
1797
1798 1
1646} 1799}
1647 1800
1648sub mouse_motion { 1801sub mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1650# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1651} 1806}
1652 1807
1653sub _draw { 1808sub _draw {
1654 my ($self) = @_; 1809 my ($self) = @_;
1655 1810
1656 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1657 1812
1658 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1661 } else { 1816 } else {
1662 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1663 } 1818 }
1664 1819
1665 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1668 glVertex 0 , 0; 1823 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1732 } else { 1887 } else {
1733 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1734 } 1889 }
1735 1890
1736 } else { 1891 } else {
1737 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1738 } 1895 1
1739
1740} 1896}
1741 1897
1742############################################################################# 1898#############################################################################
1743 1899
1744package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1753 1909
1754sub new { 1910sub new {
1755 my $class = shift; 1911 my $class = shift;
1756 1912
1757 $class->SUPER::new ( 1913 $class->SUPER::new (
1758 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1759 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1761 can_hover => 1, 1918 can_hover => 1,
1762 align => 0, 1919 align => 0,
1763 valign => 0, 1920 valign => 0,
… …
1772 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1773 1930
1774 $self->emit ("activate") 1931 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1777} 1936}
1778 1937
1779sub _draw { 1938sub _draw {
1780 my ($self) = @_; 1939 my ($self) = @_;
1781 1940
1782 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 1942
1788 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1791 1946
… …
1810 1965
1811sub new { 1966sub new {
1812 my $class = shift; 1967 my $class = shift;
1813 1968
1814 $class->SUPER::new ( 1969 $class->SUPER::new (
1815 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1816 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 1974 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 1975 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 1976 state => 0,
… …
1824} 1980}
1825 1981
1826sub size_request { 1982sub size_request {
1827 my ($self) = @_; 1983 my ($self) = @_;
1828 1984
1829 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1830} 1986}
1831 1987
1832sub button_down { 1988sub button_down {
1833 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1834 1990
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1838 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1839 } 1999 1
1840} 2000}
1841 2001
1842sub _draw { 2002sub _draw {
1843 my ($self) = @_; 2003 my ($self) = @_;
1844 2004
1845 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1846 2006
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 2008
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 2012
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 2014
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 2016
… …
2009 2171
2010 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2012 2174
2013 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2015 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2180
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2119 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2284 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2285 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2286 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2287 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2288 min_h => $::WIDTH / 80,
2126 vertical => 0, 2289 vertical => 0,
2127 can_hover => 1, 2290 can_hover => 1,
2128 inner_pad => 0.02, 2291 inner_pad => 0.02,
2129 @_ 2292 @_
2130 ); 2293 );
… …
2133 $self->update; 2296 $self->update;
2134 2297
2135 $self 2298 $self
2136} 2299}
2137 2300
2301sub changed { }
2302
2138sub set_range { 2303sub set_range {
2139 my ($self, $range) = @_; 2304 my ($self, $range) = @_;
2140 2305
2141 $self->{range} = $range; 2306 ($range, $self->{range}) = ($self->{range}, $range);
2142 2307
2143 $self->update; 2308 $self->update
2309 if "@$range" ne "@{$self->{range}}";
2144} 2310}
2145 2311
2146sub set_value { 2312sub set_value {
2147 my ($self, $value) = @_; 2313 my ($self, $value) = @_;
2148 2314
… …
2167} 2333}
2168 2334
2169sub size_request { 2335sub size_request {
2170 my ($self) = @_; 2336 my ($self) = @_;
2171 2337
2172 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2339}
2177 2340
2178sub button_down { 2341sub button_down {
2179 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
2180 2343
2181 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2182 2345
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2347
2185 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2186} 2349}
2187 2350
2188sub mouse_motion { 2351sub mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2190 2353
… …
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2358
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2360
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2199 } 2366 1
2200} 2367}
2201 2368
2202sub update { 2369sub update {
2203 my ($self) = @_; 2370 my ($self) = @_;
2204 2371
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2206 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2207 2381
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2210 2384
… …
2216 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2218 2392
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2221 }); 2395 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2396
2229 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2230 2398
2231 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2232 2400
… …
2426 2594
2427 delete $self->{texture}; 2595 delete $self->{texture};
2428 } 2596 }
2429 2597
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2433 2601
2434 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2435 2603
2436 my $y0 = $top; 2604 my $y0 = $top;
… …
2471sub _draw { 2639sub _draw {
2472 my ($self) = @_; 2640 my ($self) = @_;
2473 2641
2474 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2478 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2479 2647
2480 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2481 2649
2482} 2650}
… …
2531 2699
2532sub new { 2700sub new {
2533 my $class = shift; 2701 my $class = shift;
2534 2702
2535 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2536 state => 0, 2704 state => 0,
2537 connect_activate => \&toggle_flopper, 2705 on_activate => \&toggle_flopper,
2538 @_ 2706 @_
2539 ); 2707 );
2540 2708
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2709 $self
2547} 2710}
2548 2711
2549sub toggle_flopper { 2712sub toggle_flopper {
2550 my ($self) = @_; 2713 my ($self) = @_;
2551 2714
2552 # TODO: use animation 2715 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2716}
2564 2717
2565############################################################################# 2718#############################################################################
2566 2719
2567package CFClient::UI::Tooltip; 2720package CFClient::UI::Tooltip;
… …
2580} 2733}
2581 2734
2582sub set_tooltip_from { 2735sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2736 my ($self, $widget) = @_;
2584 2737
2738 my $tooltip = $widget->{tooltip};
2739
2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2585 $self->add (new CFClient::UI::Label 2747 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2748 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2750 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2751 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2752 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2602 2764
2603sub size_allocate { 2765sub size_allocate {
2604 my ($self, $w, $h) = @_; 2766 my ($self, $w, $h) = @_;
2605 2767
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2607} 2787}
2608 2788
2609sub _draw { 2789sub _draw {
2610 my ($self) = @_; 2790 my ($self) = @_;
2611 2791
… …
2628 glVertex $w, $h; 2808 glVertex $w, $h;
2629 glVertex $w, 0; 2809 glVertex $w, 0;
2630 glEnd; 2810 glEnd;
2631 2811
2632 glTranslate 2 - 0.375, 2 - 0.375; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2813
2633 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2634} 2815}
2635 2816
2636############################################################################# 2817#############################################################################
2637 2818
… …
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697 2878
2698 if ($tex) { 2879 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2704 } 2885 }
2705} 2886}
2706 2887
… …
2713 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2714} 2895}
2715 2896
2716############################################################################# 2897#############################################################################
2717 2898
2718package CFClient::UI::Inventory; 2899package CFClient::UI::Buttonbar;
2719 2900
2720our @ISA = CFClient::UI::ScrolledWindow::; 2901our @ISA = CFClient::UI::HBox::;
2721 2902
2722sub new { 2903# TODO: should actualyl wrap buttons and other goodies.
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764 2904
2765############################################################################# 2905#############################################################################
2766 2906
2767package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2768 2908
… …
2809 # maybe save $GRAB? must be careful about events... 2949 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 2950 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 2951 $self->{button} = $ev->{button};
2812 2952
2813 $self->show; 2953 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 2955}
2816 2956
2817sub mouse_motion { 2957sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2819 2959
2820 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2823} 2965}
2824 2966
2825sub button_up { 2967sub button_up {
2826 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2827 2969
… …
2829 undef $GRAB; 2971 undef $GRAB;
2830 $self->hide; 2972 $self->hide;
2831 2973
2832 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2834 } 2980 1
2835} 2981}
2836 2982
2837############################################################################# 2983#############################################################################
2838 2984
2839package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2840 2986
2841our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2842 2988
2843sub new { 2989sub new {
2844 my $class = shift; 2990 my $class = shift;
2845 2991
2846 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2847 fontsize => 0.8, 3101 fontsize => 0.8,
2848 @_, 3102 @_,
2849 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2850} 3110}
2851 3111
2852sub reorder { 3112sub reorder {
2853 my ($self) = @_; 3113 my ($self) = @_;
2854 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2855 3120
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3123 }
2859 3124
… …
2862 my @items = sort { 3127 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2866 3131
3132 $self->{timer}->interval (1);
3133
2867 my $count = 10 + 1; 3134 my $count = 10 + 1;
2868 for my $item (@items) { 3135 for my $item (@items) {
2869 last unless --$count; 3136 last unless --$count;
2870 3137
2871 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text}; 3142 : $item->{text};
2876 3143
… …
2884 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2890 can_events => 1, 3157 can_events => 1,
2891 can_hover => 1 3158 can_hover => 1
2892 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2893 } 3172 }
2894 3173
2895 $self->clear; 3174 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2897} 3176}
… …
2902 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2904 3183
2905 return unless $text; 3184 return unless $text;
2906 3185
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3187
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3189
2911 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2942 3221
2943 $self->reorder; 3222 $self->reorder;
2944 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2945} 3224}
2946 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2947############################################################################# 3234#############################################################################
2948 3235
2949package CFClient::UI::Root; 3236package CFClient::UI::Inventory;
2950 3237
2951our @ISA = CFClient::UI::Container::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953use CFClient::OpenGL;
2954 3239
2955sub new { 3240sub new {
2956 my $class = shift; 3241 my $class = shift;
2957 3242
2958 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
2959 @_, 3485 @_,
2960 ) 3486 )
2961} 3487}
2962 3488
2963sub configure { 3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2964 my ($self, $x, $y, $w, $h) = @_; 3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
2965 3495
2966 $self->{w} = $w; 3496sub rebuild_spell_list {
2967 $self->{h} = $h; 3497 my ($self) = @_;
2968}
2969 3498
2970sub check_size { 3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
2971 my ($self) = @_; 3544 my ($self, $spell) = @_;
2972 3545
2973 $self->size_allocate ($self->{w}, $self->{h}) 3546 $self->{spell}->{$spell->{name}} = $spell;
2974 if $self->{w}; 3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
3559package CFClient::UI::Root;
3560
3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3564
3565use CFClient::OpenGL;
3566
3567sub new {
3568 my $class = shift;
3569
3570 my $self = $class->SUPER::new (
3571 visible => 1,
3572 @_,
3573 );
3574
3575 Scalar::Util::weaken ($self->{root} = $self);
3576
3577 $self
2975} 3578}
2976 3579
2977sub size_request { 3580sub size_request {
2978 my ($self) = @_; 3581 my ($self) = @_;
2979 3582
2980 ($self->{w}, $self->{h}) 3583 ($self->{w}, $self->{h})
3584}
3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
2981} 3598}
2982 3599
2983sub size_allocate { 3600sub size_allocate {
2984 my ($self, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
2985 3602
2986 for my $child ($self->children) { 3603 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3605
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3606 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3607 $Y = $child->{force_y} if exists $child->{force_y};
2991 3608
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3609 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3610 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3611
2998 $child->configure ($X, $Y, $W, $H); 3612 $child->configure ($X, $Y, $W, $H);
2999 } 3613 }
3000} 3614}
3001 3615
… …
3012} 3626}
3013 3627
3014sub update { 3628sub update {
3015 my ($self) = @_; 3629 my ($self) = @_;
3016 3630
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3631 $::WANT_REFRESH++;
3019} 3632}
3020 3633
3021sub add { 3634sub add {
3022 my ($self, @children) = @_; 3635 my ($self, @children) = @_;
3023 3636
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3637 $_->{is_toplevel} = 1
3032 3638 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3639
3038 $self->SUPER::add (@children); 3640 $self->SUPER::add (@children);
3039} 3641}
3040 3642
3041sub remove { 3643sub remove {
3042 my ($self, @children) = @_; 3644 my ($self, @children) = @_;
3043 3645
3044 $self->SUPER::remove (@children); 3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3045 3650
3046 while (@children) { 3651 while (@children) {
3047 my $w = pop @children; 3652 my $w = pop @children;
3048 push @children, $w->children; 3653 push @children, $w->children;
3049 $w->set_invisible; 3654 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
3069 $_->() 3674 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3675 for values %{delete $self->{refresh_hook}};
3071 } 3676 }
3072 3677
3073 if ($self->{check_size}) { 3678 if ($self->{realloc}) {
3074 my @queue = ([], []); 3679 my %queue;
3680 my @queue;
3681 my $widget;
3075 3682
3076 for (;;) { 3683 outer:
3077 if ($self->{check_size}) { 3684 while () {
3078 # heuristic: check containers last 3685 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3686 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3687 $widget->{visible} or next; # do not resize invisible widgets
3688
3689 $queue{$widget+0}++ and next; # duplicates are common
3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3081 } 3693 }
3082 3694
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3695 while () {
3696 @queue or last outer;
3084 3697
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3698 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3699 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 3719 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3720 $widget->{req_h} = $h;
3095 3721
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3722 $self->{size_alloc}{$widget+0} = $widget;
3097 3723
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3100 } 3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3101 } 3734 }
3102 } 3735 }
3103 3736
3104 while ($self->{size_alloc}) { 3737 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3745
3108 $w = 0 if $w < 0; 3746 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3747 $h = 0 if $h < 0;
3110 3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3111 $widget->{w} = $w; 3756 $widget->{w} = $w;
3112 $widget->{h} = $h; 3757 $widget->{h} = $h;
3758
3113 $widget->emit (size_allocate => $w, $h); 3759 $widget->emit (size_allocate => $w, $h);
3760 }
3114 } 3761 }
3115 } 3762 }
3116 3763
3117 while ($self->{post_alloc_hook}) { 3764 while ($self->{post_alloc_hook}) {
3118 $_->() 3765 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3766 for values %{delete $self->{post_alloc_hook}};
3120 } 3767 }
3768
3121 3769
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
3125 3773
… …
3127 glLoadIdentity; 3775 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3778 glLoadIdentity;
3131 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
3132 $self->_draw; 3787 $self->_draw;
3133} 3788}
3134 3789
3135############################################################################# 3790#############################################################################
3136 3791

Diff Legend

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