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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

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

Diff Legend

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