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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

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

Diff Legend

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