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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
242} 306}
243 307
244sub hide { 308sub hide {
245 my ($self) = @_; 309 my ($self) = @_;
246 310
… …
248 312
249 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
250 if $self->{parent}; 314 if $self->{parent};
251} 315}
252 316
253sub move { 317sub move_abs {
254 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
255 319
256 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
259 323
260 $self->update; 324 $self->update;
261} 325}
262 326
263sub set_size { 327sub set_size {
264 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
265 329
266 $self->{user_w} = $w; 330 $self->{force_w} = $w;
267 $self->{user_h} = $h; 331 $self->{force_h} = $h;
268 332
269 $self->check_size; 333 $self->realloc;
270} 334}
271 335
272sub size_request { 336sub size_request {
273 require Carp; 337 require Carp;
274 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
276 340
277sub configure { 341sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
279 343
280 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
283 349
284 # use alignment to adjust x, y 350 # use alignment to adjust x, y
285 351
286 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 354 }
291 355
292 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 357 $self->{x} = $x;
294 $self->{y} = $y; 358 $self->{y} = $y;
295 $self->update; 359 $self->update;
296 } 360 }
297 361
298 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
300 } 369 }
301} 370}
302 371
303sub size_allocate { 372sub size_allocate {
304 # nothing to be done 373 # nothing to be done
305} 374}
306 375
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
315} 382}
316 383
317sub set_max_size { 384sub set_max_size {
318 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
319 386
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
322} 391}
323 392
324sub set_tooltip { 393sub set_tooltip {
325 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
326 395
… …
331 400
332 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
333 402
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 406 }
338} 407}
339 408
340# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
341sub coord2local { 410sub coord2local {
… …
378 447
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 449 unless $FOCUS;
381} 450}
382 451
383sub mouse_motion { } 452sub mouse_motion { 0 }
384sub button_up { } 453sub button_up { 0 }
385sub key_down { } 454sub key_down { 0 }
386sub key_up { } 455sub key_up { 0 }
387 456
388sub button_down { 457sub button_down {
389 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
390 459
391 $self->focus_in; 460 $self->focus_in;
392}
393 461
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 538
400sub draw { 539sub draw {
401 my ($self) = @_; 540 my ($self) = @_;
402 541
403 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 553
405 glPushMatrix; 554 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 556
410 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 559 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 561 glBegin GL_QUADS;
417 glVertex $x , $y; 562 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
421 glEnd; 566 glEnd;
422 glDisable GL_BLEND; 567 glDisable GL_BLEND;
423 } 568 }
424 569
425 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 571 glPushMatrix;
427 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 575 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
434 glEnd; 579 glEnd;
435 glPopMatrix; 580 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
438} 586}
439 587
440sub _draw { 588sub _draw {
441 my ($self) = @_; 589 my ($self) = @_;
442 590
443 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
444} 592}
445 593
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
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 DESTROY { 594sub DESTROY {
504 my ($self) = @_; 595 my ($self) = @_;
505 596
506 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
507 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
508} 601}
509 602
510############################################################################# 603#############################################################################
511 604
512package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
537 630
538 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
540 633
541 glEnable GL_BLEND; 634 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 636 glColor_premultiply @$color;
544 637
545 glBegin GL_QUADS; 638 glBegin GL_QUADS;
546 glVertex 0 , 0; 639 glVertex 0 , 0;
547 glVertex 0 , $h; 640 glVertex 0 , $h;
548 glVertex $w, $h; 641 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
565} 658}
566 659
567sub size_request { 660sub size_request {
568 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
569} 664}
570 665
571sub draw { } 666sub draw { }
572 667
573############################################################################# 668#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
578 673
579sub new { 674sub new {
580 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
581 676
582 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
583 678
584 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
585 children => [], 680 children => [],
586 can_events => 0, 681 can_events => 0,
587 %arg, 682 %arg,
588 ); 683 );
684
589 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
590 687
591 $self 688 $self
592} 689}
593 690
594sub add { 691sub add {
… …
602 $self->{children} = [ 699 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
605 ]; 702 ];
606 703
607 $self->check_size (1); 704 $self->realloc;
608 $self->update;
609} 705}
610 706
611sub children { 707sub children {
612 @{ $_[0]{children} } 708 @{ $_[0]{children} }
613} 709}
… …
618 delete $child->{parent}; 714 delete $child->{parent};
619 $child->hide; 715 $child->hide;
620 716
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 718
623 $self->check_size; 719 $self->realloc;
624 $self->update;
625} 720}
626 721
627sub clear { 722sub clear {
628 my ($self) = @_; 723 my ($self) = @_;
629 724
… …
633 for (@$children) { 728 for (@$children) {
634 delete $_->{parent}; 729 delete $_->{parent};
635 $_->hide; 730 $_->hide;
636 } 731 }
637 732
638 $self->check_size; 733 $self->realloc;
639 $self->update;
640} 734}
641 735
642sub find_widget { 736sub find_widget {
643 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
644 738
645 $x -= $self->{x}; 739 $x -= $self->{x};
646 $y -= $self->{y}; 740 $y -= $self->{y};
647 741
648 my $res; 742 my $res;
649 743
650 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
652 and return $res; 746 and return $res;
653 } 747 }
654 748
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
676} 770}
677 771
678sub add { 772sub add {
679 my ($self, $child) = @_; 773 my ($self, $child) = @_;
680 774
681 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
684} 777}
685 778
686sub remove { 779sub remove {
687 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
704 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
705} 798}
706 799
707############################################################################# 800#############################################################################
708 801
802# back-buffered drawing area
803
709package CFClient::UI::Window; 804package CFClient::UI::Window;
710 805
711our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
712 807
713use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
731 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 827 $self->update;
733} 828}
734 829
735sub _render { 830sub _render {
831 my ($self) = @_;
832
736 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
737} 834}
738 835
739sub render_child { 836sub render_child {
740 my ($self) = @_; 837 my ($self) = @_;
741 838
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
745 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
746 $self->_render; 850 $self->_render;
747 }; 851 };
748} 852}
749 853
750sub _draw { 854sub _draw {
751 my ($self) = @_; 855 my ($self) = @_;
752 856
753 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
754 858
755 my $tex = $self->{texture} 859 my $tex = $self->{texture}
756 or return; 860 or return;
757 861
758 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
761 865
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 867
764 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
765} 869}
… …
781} 885}
782 886
783sub size_request { 887sub size_request {
784 my ($self) = @_; 888 my ($self) = @_;
785 889
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 891
788 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
789} 896}
790 897
791sub size_allocate { 898sub size_allocate {
792 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
793 900
901 my $child = $self->child;
902
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 905
797 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
798 $self->update; 907 $self->update;
799} 908}
800 909
… …
836} 945}
837 946
838sub _render { 947sub _render {
839 my ($self) = @_; 948 my ($self) = @_;
840 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 954
843 $self->SUPER::_render; 955 $self->SUPER::_render;
844} 956}
845 957
… …
848package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
849 961
850our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
851 963
852sub new { 964sub new {
853 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
854 968
855 my $self; 969 my $self;
856 970
857 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
858 vertical => 1, 972 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 974 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
862 }, 976 },
863 ; 977 ;
864 978
865 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 981 slider => $slider,
868 @_, 982 %arg,
869 ); 983 );
870 984
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
874 987
875 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 1005}
877 1006
878sub size_allocate { 1007sub size_allocate {
879 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
880 1009
… …
909 1038
910 if ($self->{bg}) { 1039 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
912 1041
913 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
916 1045
917 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
918 glVertex 0 , 0; 1047 glVertex 0 , 0;
919 glVertex 0 , $h; 1048 glVertex 0 , $h;
920 glVertex $w, $h; 1049 glVertex $w, $h;
… …
933 1062
934our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
935 1064
936use CFClient::OpenGL; 1065use CFClient::OpenGL;
937 1066
938my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1074
942sub new { 1075sub new {
943 my $class = shift; 1076 my ($class, %arg) = @_;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1077
947 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1081 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1082 can_events => 1,
953 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
954 ); 1086 );
955 1087
956 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
957 align => 0, 1089 align => 0,
958 valign => 1, 1090 valign => 1,
959 text => $self->{title}, 1091 text => $self->{title},
960 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
961 1103
962 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
963} 1113}
964 1114
965sub border { 1115sub border {
966 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
967} 1117}
968 1118
969sub size_request { 1119sub size_request {
970 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
971 1127
972 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
973 1129
974 ( 1130 (
975 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
978} 1134}
979 1135
980sub size_allocate { 1136sub size_allocate {
981 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
982 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
983 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
985 1149
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
990} 1154}
991 1155
992sub button_down { 1156sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
994 1158
… …
1010 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1011 1175
1012 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1014 1178
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1183 $self->realloc;
1019 }; 1184 };
1020 1185
1021 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1190 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1027 1192
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1194
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1033 } 1203 1
1034} 1204}
1035 1205
1036sub button_up { 1206sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1038 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1039 delete $self->{motion}; 1212 !!delete $self->{motion}
1040} 1213}
1041 1214
1042sub mouse_motion { 1215sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1044 1217
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1046} 1221}
1047 1222
1048sub _draw { 1223sub _draw {
1049 my ($self) = @_; 1224 my ($self) = @_;
1050 1225
1226 my $child = $self->{children}[0];
1227
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1230
1054 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1233
1057 my $border = $self->border; 1234 my $border = $self->border;
1058 1235
1059 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1241
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1067 1244
1068 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1250 }
1079 1251
1080 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1081 1253
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1085} 1265}
1086 1266
1087############################################################################# 1267#############################################################################
1088 1268
1089package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1101 col_expand => [], 1281 col_expand => [],
1102 @_, 1282 @_,
1103 ) 1283 )
1104} 1284}
1105 1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288}
1289
1106sub add { 1290sub add {
1107 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1108 1292
1109 $child->set_parent ($self); 1293 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1111 1295
1112 $child->check_size; 1296 $self->realloc;
1113} 1297}
1114 1298
1115sub children { 1299sub remove {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1117}
1118 1301
1302 # TODO: not yet implemented
1303}
1304
1119# TODO: move to container class maybe? send childs a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1306sub clear {
1121 my ($self) = @_; 1307 my ($self) = @_;
1122 1308
1123 my @children = $self->children; 1309 my @children = $self->children;
1124 delete $self->{children}; 1310 delete $self->{children};
… …
1126 for (@children) { 1312 for (@children) {
1127 delete $_->{parent}; 1313 delete $_->{parent};
1128 $_->hide; 1314 $_->hide;
1129 } 1315 }
1130 1316
1131 $self->update; 1317 $self->realloc;
1132} 1318}
1133 1319
1134sub get_wh { 1320sub get_wh {
1135 my ($self) = @_; 1321 my ($self) = @_;
1136 1322
… …
1167sub size_allocate { 1353sub size_allocate {
1168 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1169 1355
1170 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1171 1357
1172 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1174 1360
1175 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1418 }
1233} 1419}
1234 1420
1235############################################################################# 1421#############################################################################
1236 1422
1237package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1424
1241our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1242 1426
1243sub size_request { 1427sub size_request {
1244 my ($self) = @_; 1428 my ($self) = @_;
1245 1429
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1247 1431 ? (
1248 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1434 )
1251 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1252} 1439}
1253 1440
1254sub size_allocate { 1441sub size_allocate {
1255 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1256 1443
1257 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1445 my $children = $self->{children};
1260 1446
1261 my @h = map $_->{req_w}, @$children; 1447 my @req;
1262 1448
1263 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1264 1450 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1465 }
1279 } 1466 }
1280 1467
1281 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1282 1469
1283 my $y = 0; 1470 my $pos = 0;
1284 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1474
1289 $y += $h; 1475 $pos += $alloc;
1290 } 1476 }
1291 1477
1292 1 1478 1
1293} 1479}
1294 1480
1295############################################################################# 1481#############################################################################
1296 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1297package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1298 1499
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1302 1501
1303sub size_request { 1502sub new {
1304 my ($self) = @_; 1503 my $class = shift;
1305 1504
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1307 1506 vertical => 1,
1308 ( 1507 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1508 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1509}
1352 1510
1353############################################################################# 1511#############################################################################
1354 1512
1355package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1530 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1374 fontsize => 1, 1532 fontsize => 1,
1375 align => -1, 1533 align => -1,
1376 valign => -1, 1534 valign => -1,
1377 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1378 can_events => 0, 1537 can_events => 0,
1379 %arg 1538 %arg
1380 ); 1539 );
1381 1540
1382 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1409 1568
1410 delete $self->{texture}; 1569 delete $self->{texture};
1411 $self->SUPER::update; 1570 $self->SUPER::update;
1412} 1571}
1413 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1414sub set_text { 1580sub set_text {
1415 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1416 1582
1417 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1419 1585
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1422 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1423 $self->update; 1591 $self->update;
1424 $self->check_size;
1425} 1592}
1426 1593
1427sub set_markup { 1594sub set_markup {
1428 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1429 1596
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1601
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1437 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1438 $self->update; 1607 $self->update;
1439 $self->check_size;
1440} 1608}
1441 1609
1442sub size_request { 1610sub size_request {
1443 my ($self) = @_; 1611 my ($self) = @_;
1444 1612
1613 $self->{size_req} ||= do {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1619
1451 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1452 1621
1453 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1454 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 1625
1457 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1458 1627
1459 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1461 } 1633 };
1462 1634
1463 ( 1635 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1636}
1468 1637
1469sub size_allocate { 1638sub size_allocate {
1470 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1471 1640
1641 delete $self->{ox};
1642
1472 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473} 1645}
1474 1646
1475sub set_fontsize { 1647sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1477 1649
1478 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1651 delete $self->{texture};
1480 1652
1481 $self->update; 1653 $self->realloc;
1482 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1483} 1662}
1484 1663
1485sub _draw { 1664sub _draw {
1486 my ($self) = @_; 1665 my ($self) = @_;
1487 1666
… …
1493 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1676
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1499 1679
1680 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1503 1684
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1688 };
1510 1689
1511 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1513 1694
1514 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1515 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1517 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1519 } 1702 }
1520 1703
1521 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1522} 1705}
1523 1706
… …
1540 can_hover => 1, 1723 can_hover => 1,
1541 can_focus => 1, 1724 can_focus => 1,
1542 valign => 0, 1725 valign => 0,
1543 can_events => 1, 1726 can_events => 1,
1544 #text => ... 1727 #text => ...
1728 #hidden => "*",
1545 @_ 1729 @_
1546 ) 1730 )
1547} 1731}
1548 1732
1549sub _set_text { 1733sub _set_text {
… …
1551 1735
1552 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1553 1737
1554 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1555 1739
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1741 $self->{text} = $text;
1560 1742
1561 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1563 1746
1564 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1565} 1751}
1566 1752
1567sub set_text { 1753sub set_text {
1568 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1569 1755
1570 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1757 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 1758}
1575 1759
1576sub get_text { 1760sub get_text {
1577 $_[0]{text} 1761 $_[0]{text}
1578} 1762}
… …
1608 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1611 } elsif ($uni) { 1795 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1613 } 1799 }
1614 1800
1615 $self->_set_text ($text); 1801 $self->_set_text ($text);
1616 $self->update; 1802
1617 $self->check_size; 1803 $self->realloc;
1804
1805 1
1618} 1806}
1619 1807
1620sub focus_in { 1808sub focus_in {
1621 my ($self) = @_; 1809 my ($self) = @_;
1622 1810
… …
1637 utf8::encode $text; 1825 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1639 1827
1640 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1641 $self->update; 1829 $self->update;
1830
1831 1
1642} 1832}
1643 1833
1644sub mouse_motion { 1834sub mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1647} 1839}
1648 1840
1649sub _draw { 1841sub _draw {
1650 my ($self) = @_; 1842 my ($self) = @_;
1651 1843
1652 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1653 1845
1654 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1657 } else { 1849 } else {
1658 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1659 } 1851 }
1660 1852
1661 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1856 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1728 } else { 1920 } else {
1729 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1730 } 1922 }
1731 1923
1732 } else { 1924 } else {
1733 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1734 } 1928 1
1735
1736} 1929}
1737 1930
1738############################################################################# 1931#############################################################################
1739 1932
1740package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1749 1942
1750sub new { 1943sub new {
1751 my $class = shift; 1944 my $class = shift;
1752 1945
1753 $class->SUPER::new ( 1946 $class->SUPER::new (
1754 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1755 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1757 can_hover => 1, 1951 can_hover => 1,
1758 align => 0, 1952 align => 0,
1759 valign => 0, 1953 valign => 0,
… …
1768 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1769 1963
1770 $self->emit ("activate") 1964 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1773} 1969}
1774 1970
1775sub _draw { 1971sub _draw {
1776 my ($self) = @_; 1972 my ($self) = @_;
1777 1973
1778 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1975
1784 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1787 1979
… …
1792 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1793} 1985}
1794 1986
1795############################################################################# 1987#############################################################################
1796 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1797package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1798 2028
1799our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1800 2030
1801my @tex = 2031my @tex =
… …
1806 2036
1807sub new { 2037sub new {
1808 my $class = shift; 2038 my $class = shift;
1809 2039
1810 $class->SUPER::new ( 2040 $class->SUPER::new (
1811 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1812 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2047 state => 0,
… …
1820} 2051}
1821 2052
1822sub size_request { 2053sub size_request {
1823 my ($self) = @_; 2054 my ($self) = @_;
1824 2055
1825 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1826} 2057}
1827 2058
1828sub button_down { 2059sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1830 2061
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1835 } 2070 1
1836} 2071}
1837 2072
1838sub _draw { 2073sub _draw {
1839 my ($self) = @_; 2074 my ($self) = @_;
1840 2075
1841 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1842 2077
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2079
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 2083
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2085
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2087
… …
2005 2242
2006 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2008 2245
2009 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2251
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2115 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2122 vertical => 0, 2360 vertical => 0,
2123 can_hover => 1, 2361 can_hover => 1,
2124 inner_pad => 0.02, 2362 inner_pad => 0.02,
2125 @_ 2363 @_
2126 ); 2364 );
… …
2129 $self->update; 2367 $self->update;
2130 2368
2131 $self 2369 $self
2132} 2370}
2133 2371
2372sub changed { }
2373
2134sub set_range { 2374sub set_range {
2135 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2136 2376
2137 $self->{range} = $range; 2377 ($range, $self->{range}) = ($self->{range}, $range);
2138 2378
2379 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2140} 2383}
2141 2384
2142sub set_value { 2385sub set_value {
2143 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2144 2387
… …
2163} 2406}
2164 2407
2165sub size_request { 2408sub size_request {
2166 my ($self) = @_; 2409 my ($self) = @_;
2167 2410
2168 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2412}
2173 2413
2174sub button_down { 2414sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2176 2416
2177 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2178 2418
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2420
2181 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2182} 2422}
2183 2423
2184sub mouse_motion { 2424sub mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2186 2426
… …
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2431
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2433
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2195 } 2439 1
2196} 2440}
2197 2441
2198sub update { 2442sub update {
2199 my ($self) = @_; 2443 my ($self) = @_;
2200 2444
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2203 2454
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2206 2457
… …
2212 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2214 2465
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2217 }); 2468 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2469
2225 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2226 2471
2227 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2228 2473
… …
2289sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2291 2536
2292############################################################################# 2537#############################################################################
2293 2538
2294package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2295 2540
2296our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2297 2542
2298use CFClient::OpenGL; 2543use CFClient::OpenGL;
2299 2544
… …
2301 my $class = shift; 2546 my $class = shift;
2302 2547
2303 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2304 fontsize => 1, 2549 fontsize => 1,
2305 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2306 #font => default_font 2552 #font => default_font
2307 @_, 2553 @_,
2308 2554
2309 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2310 par => [], 2556 par => [],
… …
2333 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2334 2580
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2338 2585
2339 $self->reflow; 2586 $self->reflow;
2340} 2587}
2341 2588
2342sub text_size { 2589sub text_size {
… …
2344 2591
2345 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2346 2593
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2349 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2350 2598
2351 $layout->size 2599 $layout->size
2352} 2600}
2353 2601
… …
2392 2640
2393 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2394 2642
2395 delete $self->{texture}; 2643 delete $self->{texture};
2396 2644
2397 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 2647
2400 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2401 my $height = 0; 2649 my $height = 0;
2402 2650
… …
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 2654
2407 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2410 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h; 2662 $_->[1] = $h;
2414 } 2663 }
… …
2417 } 2666 }
2418 2667
2419 $self->{height} = $height; 2668 $self->{height} = $height;
2420 2669
2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2422 2671
2423 delete $self->{texture}; 2672 delete $self->{texture};
2424 } 2673 }
2425 2674
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2429 2678
2430 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2431 2680
2432 my $y0 = $top; 2681 my $y0 = $top;
… …
2446 my $h = $par->[1]; 2695 my $h = $par->[1];
2447 2696
2448 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2451 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2452 2702
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2454 2704
2455 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2467sub _draw { 2717sub _draw {
2468 my ($self) = @_; 2718 my ($self) = @_;
2469 2719
2470 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2475 2725
2476 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2477 2727
2478} 2728}
… …
2527 2777
2528sub new { 2778sub new {
2529 my $class = shift; 2779 my $class = shift;
2530 2780
2531 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2532 state => 0, 2782 state => 0,
2533 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2534 @_ 2784 @_
2535 ); 2785 );
2536 2786
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2787 $self
2543} 2788}
2544 2789
2545sub toggle_flopper { 2790sub toggle_flopper {
2546 my ($self) = @_; 2791 my ($self) = @_;
2547 2792
2548 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2794}
2560 2795
2561############################################################################# 2796#############################################################################
2562 2797
2563package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2576} 2811}
2577 2812
2578sub set_tooltip_from { 2813sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2580 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2581 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2831 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2833 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2845
2599sub size_allocate { 2846sub size_allocate {
2600 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2601 2848
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2603} 2868}
2604 2869
2605sub _draw { 2870sub _draw {
2606 my ($self) = @_; 2871 my ($self) = @_;
2607 2872
… …
2624 glVertex $w, $h; 2889 glVertex $w, $h;
2625 glVertex $w, 0; 2890 glVertex $w, 0;
2626 glEnd; 2891 glEnd;
2627 2892
2628 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2629 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2630} 2896}
2631 2897
2632############################################################################# 2898#############################################################################
2633 2899
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 2959
2694 if ($tex) { 2960 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2700 } 2966 }
2701} 2967}
2702 2968
2703sub DESTROY { 2969sub destroy {
2704 my ($self) = @_; 2970 my ($self) = @_;
2705 2971
2706 $self->{timer}->cancel 2972 $self->{timer}->cancel
2707 if $self->{timer}; 2973 if $self->{timer};
2708 2974
2709 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2710} 2976}
2711 2977
2712############################################################################# 2978#############################################################################
2713 2979
2714package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2715 2981
2716our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2717 2983
2718sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846 2985
2847############################################################################# 2986#############################################################################
2848 2987
2849package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2850 2989
… …
2862 ); 3001 );
2863 3002
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2865 3004
2866 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2868 3007
2869 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2870 if (!ref $widget) { 3009 if (!ref $widget) {
2871 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2872 can_hover => 1, 3011 can_hover => 1,
2873 can_events => 1, 3012 can_events => 1,
2874 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2875 } 3015 }
2876 3016
2877 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2878 3018
2879 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2891 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 3032 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2894 3034
2895 $self->show; 3035 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897} 3037}
2898 3038
2899sub mouse_motion { 3039sub mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2901 3041
2902 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2905} 3047}
2906 3048
2907sub button_up { 3049sub button_up {
2908 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2909 3051
… …
2911 undef $GRAB; 3053 undef $GRAB;
2912 $self->hide; 3054 $self->hide;
2913 3055
2914 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2916 } 3062 1
2917} 3063}
2918 3064
2919############################################################################# 3065#############################################################################
2920 3066
2921package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2922 3068
2923our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2924 3070
2925sub new { 3071sub new {
2926 my $class = shift; 3072 my $class = shift;
2927 3073
2928 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2929 fontsize => 0.8, 3239 fontsize => 0.8,
2930 @_, 3240 @_,
2931 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2932} 3248}
2933 3249
2934sub reorder { 3250sub reorder {
2935 my ($self) = @_; 3251 my ($self) = @_;
2936 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2937 3258
2938 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 } 3261 }
2941 3262
… …
2944 my @items = sort { 3265 my @items = sort {
2945 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2948 3269
3270 $self->{timer}->interval (1);
3271
2949 my $count = 10 + 1; 3272 my $count = 10 + 1;
2950 for my $item (@items) { 3273 for my $item (@items) {
2951 last unless --$count; 3274 last unless --$count;
2952 3275
2953 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text}; 3280 : $item->{text};
2958 3281
… …
2966 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2972 can_events => 1, 3295 can_events => 1,
2973 can_hover => 1 3296 can_hover => 1
2974 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2975 } 3310 }
2976 3311
2977 $self->clear; 3312 $self->clear;
2978 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2979} 3314}
… …
2984 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2986 3321
2987 return unless $text; 3322 return unless $text;
2988 3323
2989 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990 3325
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992 3327
2993 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2995 $item->{count}++; 3330 $item->{count}++;
2996 } else { 3331 } else {
2997 $item->{count} = 1; 3332 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2999 } 3334 }
3000 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3001 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3002 delete $item->{label}; 3337 delete $item->{label};
3003 } else { 3338 } else {
3004 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3005 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3024 3359
3025 $self->reorder; 3360 $self->reorder;
3026 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3027} 3362}
3028 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
3029############################################################################# 3372#############################################################################
3030 3373
3031package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
3032 3375
3033our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035use CFClient::OpenGL;
3036 3377
3037sub new { 3378sub new {
3038 my $class = shift; 3379 my $class = shift;
3039 3380
3040 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3041 @_, 3623 @_,
3042 ) 3624 )
3043} 3625}
3044 3626
3045sub configure { 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3046 my ($self, $x, $y, $w, $h) = @_;
3047 3628
3048 $self->{w} = $w; 3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3049 $self->{h} = $h; 3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3050} 3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3051 3639
3052sub check_size { 3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3053 my ($self) = @_; 3713 my ($self, $spell) = @_;
3054 3714
3055 $self->size_allocate ($self->{w}, $self->{h}) 3715 $self->{spell}->{$spell->{name}} = $spell;
3056 if $self->{w}; 3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3747 visible => 1,
3748 @_,
3749 );
3750
3751 Scalar::Util::weaken ($self->{root} = $self);
3752
3753 $self
3057} 3754}
3058 3755
3059sub size_request { 3756sub size_request {
3060 my ($self) = @_; 3757 my ($self) = @_;
3061 3758
3062 ($self->{w}, $self->{h}) 3759 ($self->{w}, $self->{h})
3760}
3761
3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
3764
3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
3769
3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
3772
3773 int $coord + 0.5
3063} 3774}
3064 3775
3065sub size_allocate { 3776sub size_allocate {
3066 my ($self, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
3067 3778
3068 for my $child ($self->children) { 3779 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3781
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3782 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 3783 $Y = $child->{force_y} if exists $child->{force_y};
3073 3784
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3785 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 3786 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3787
3080 $child->configure ($X, $Y, $W, $H); 3788 $child->configure ($X, $Y, $W, $H);
3081 } 3789 }
3082} 3790}
3083 3791
… …
3094} 3802}
3095 3803
3096sub update { 3804sub update {
3097 my ($self) = @_; 3805 my ($self) = @_;
3098 3806
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
3101} 3808}
3102 3809
3103sub add { 3810sub add {
3104 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
3105 3812
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3813 $_->{is_toplevel} = 1
3114 3814 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 3815
3120 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3121} 3817}
3122 3818
3123sub remove { 3819sub remove {
3124 my ($self, @children) = @_; 3820 my ($self, @children) = @_;
3125 3821
3126 $self->SUPER::remove (@children); 3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3127 3826
3128 while (@children) { 3827 while (@children) {
3129 my $w = pop @children; 3828 my $w = pop @children;
3130 push @children, $w->children; 3829 push @children, $w->children;
3131 $w->set_invisible; 3830 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3151 $_->() 3850 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3153 } 3852 }
3154 3853
3155 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3156 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
3157 3858
3158 for (;;) { 3859 outer:
3159 if ($self->{check_size}) { 3860 while () {
3160 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
3162 for values %{delete $self->{check_size}} 3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3163 } 3869 }
3164 3870
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
3166 3873
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 3875 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3175 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3177 3897
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3179 3899
3180 $widget->{parent}->check_size
3181 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3182 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3183 } 3910 }
3184 } 3911 }
3185 3912
3186 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3188 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3189 3921
3190 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3192 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3193 $widget->{w} = $w; 3932 $widget->{w} = $w;
3194 $widget->{h} = $h; 3933 $widget->{h} = $h;
3934
3195 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3196 } 3937 }
3197 } 3938 }
3198 3939
3199 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3200 $_->() 3941 $_->()
3201 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3202 } 3943 }
3944
3203 3945
3204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3207 3949
… …
3209 glLoadIdentity; 3951 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 3954 glLoadIdentity;
3213 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3214 $self->_draw; 3963 $self->_draw;
3215} 3964}
3216 3965
3217############################################################################# 3966#############################################################################
3218 3967

Diff Legend

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