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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
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 CFPlus;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
26 55
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 62 }
32 63
33 $layout 64 $layout
34} 65}
35 66
36sub set_layout { 67sub set_layout {
37 my ($layout) = @_; 68 my ($layout) = @_;
69
38 $LAYOUT = $layout; 70 $LAYOUT = $layout;
39}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66} 71}
67 72
68# class methods for events 73# class methods for events
69sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
70 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
74sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
75 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
76 if $FOCUS; 81 if $FOCUS;
77} 82}
78 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
79sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
80 my ($ev) = @_; 98 my ($ev) = @_;
81 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
82 100
83 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
84 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
85 105
86 $GRAB = $widget; 106 $GRAB = $widget;
87 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
88 108
89 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
90 } 110 }
91 111
92 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
93 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
95 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
96} 122}
97 123
98sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
99 my ($ev) = @_; 125 my ($ev) = @_;
100 my ($x, $y) = ($ev->{x}, $ev->{y});
101 126
102 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
103 128
104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
105 130
106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
107 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
108 133
109 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
110 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
111 $grab->update if $grab; 136 $grab->update if $grab;
112 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
113 138
114 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
115 } 141 }
116} 142}
117 143
118sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
119 my ($ev) = @_; 145 my ($ev) = @_;
120 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
121 147
122 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
123 149
124 if ($widget != $HOVER) { 150 check_hover $widget;
125 my $hover = $HOVER; $HOVER = $widget;
126 151
127 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
128 $HOVER->update if $HOVER && $HOVER->{can_hover};
129
130 check_tooltip;
131 }
132
133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER; 153 if $HOVER;
135} 154}
136 155
137# convert position array to integers 156# convert position array to integers
138sub harmonize { 157sub harmonize {
… …
167sub rescale_widgets { 186sub rescale_widgets {
168 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
169 188
170 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 193
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 200
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 203
185 } 204 }
186 } 205 }
187 206
188 reconfigure_widgets; 207 reconfigure_widgets;
189} 208}
190 209
191############################################################################# 210#############################################################################
192 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
193package CFClient::UI::Base; 220package CFPlus::UI::Base;
194 221
195use strict; 222use strict;
196 223
197use CFClient::OpenGL; 224use CFPlus::OpenGL;
198 225
199sub new { 226sub new {
200 my $class = shift; 227 my $class = shift;
201 228
202 my $self = bless { 229 my $self = bless {
… …
207 h => undef, 234 h => undef,
208 can_events => 1, 235 can_events => 1,
209 @_ 236 @_
210 }, $class; 237 }, $class;
211 238
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
223 240
224 for (keys %$self) { 241 for (keys %$self) {
225 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
227 } 244 }
228 } 245 }
229 246
247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
257 }
258
230 $self 259 $self
231} 260}
232 261
233sub destroy { 262sub destroy {
234 my ($self) = @_; 263 my ($self) = @_;
… …
240sub show { 269sub show {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 return if $self->{parent}; 272 return if $self->{parent};
244 273
245 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
246} 275}
247 276
248sub set_visible { 277sub set_visible {
249 my ($self) = @_; 278 my ($self) = @_;
250 279
… …
265 294
266 return unless $self->{visible}; 295 return unless $self->{visible};
267 296
268 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
269 298
299 delete $self->{visible};
270 delete $self->{root}; 300 delete $self->{root};
271 delete $self->{visible};
272 301
273 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
275 304
276 CFClient::UI::check_tooltip 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
277 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
278 307
279 $self->focus_out; 308 $self->emit ("focus_out");
280
281 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
282} 310}
283 311
284sub set_visibility { 312sub set_visibility {
285 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
308} 336}
309 337
310sub move_abs { 338sub move_abs {
311 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
312 340
313 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
316 344
317 $self->update; 345 $self->update;
318} 346}
319 347
… …
329sub size_request { 357sub size_request {
330 require Carp; 358 require Carp;
331 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
332} 360}
333 361
362sub baseline_shift {
363 0
364}
365
334sub configure { 366sub configure {
335 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
336 368
337 if ($self->{aspect}) { 369 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
339 371
340 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
341 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
342 374
343 # use alignment to adjust x, y 375 # use alignment to adjust x, y
344 376
345 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
346 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
350 $self->{x} = $x; 382 $self->{x} = $x;
351 $self->{y} = $y; 383 $self->{y} = $y;
352 $self->update; 384 $self->update;
353 } 385 }
354 386
355 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 388 return unless $self->{visible};
357 389
390 $self->{alloc_w} = $w;
391 $self->{alloc_h} = $h;
392
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 393 $self->{root}{size_alloc}{$self+0} = $self;
359 } 394 }
360}
361
362sub size_allocate {
363 # nothing to be done
364} 395}
365 396
366sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
367} 403}
368 404
369sub set_max_size { 405sub set_max_size {
370 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
371 407
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
374} 412}
375 413
376sub set_tooltip { 414sub set_tooltip {
377 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
378 416
… …
381 419
382 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
383 421
384 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
385 423
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
389 } 427 }
390} 428}
391 429
392# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
393sub coord2local { 431sub coord2local {
394 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
395 433
434 Carp::confess unless $self->{parent};#d#
435
396 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
397} 437}
398 438
399# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
400sub coord2global { 440sub coord2global {
401 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
402 442
443 Carp::confess unless $self->{parent};#d#
444
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 446}
405 447
406sub focus_in { 448sub invoke_focus_in {
407 my ($self) = @_; 449 my ($self) = @_;
408 450
409 return if $FOCUS == $self; 451 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
411 453
412 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
413 455
414 $self->_emit (focus_in => $focus); 456 $self->update;
415 457
416 $focus->update if $focus; 458 0
417 $FOCUS->update;
418} 459}
419 460
420sub focus_out { 461sub invoke_focus_out {
421 my ($self) = @_; 462 my ($self) = @_;
422 463
423 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
424 465
425 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
426 467
427 $self->_emit (focus_out => $focus); 468 $self->update;
428 469
429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 471 unless $FOCUS;
433}
434 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
435sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
436sub button_up { } 484sub invoke_button_up { 0 }
437sub key_down { } 485sub invoke_key_down { 0 }
438sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
439 488
440sub button_down { 489sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
442 491
443 $self->focus_in; 492 $self->grab_focus;
444}
445 493
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
531}
451 532
452sub find_widget { 533sub find_widget {
453 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
454 535
455 return () unless $self->{can_events}; 536 return () unless $self->{can_events};
… …
463 544
464sub set_parent { 545sub set_parent {
465 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
466 547
467 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
470} 550}
471 551
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc { 552sub realloc {
496 my ($self) = @_; 553 my ($self) = @_;
497 554
498 if ($self->{visible}) { 555 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 556 return if $self->{root}{realloc}{$self+0};
500 557
501 $self->{root}{realloc}{$self} = $self; 558 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 559 $self->{root}->update;
503 } else { 560 } else {
504 delete $self->{req_w}; 561 delete $self->{req_w};
562 delete $self->{req_h};
505 } 563 }
506} 564}
507 565
508sub update { 566sub update {
509 my ($self) = @_; 567 my ($self) = @_;
… …
517 575
518 $self->realloc; 576 $self->realloc;
519 $self->update; 577 $self->update;
520} 578}
521 579
580# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583
522sub draw { 584sub draw {
523 my ($self) = @_; 585 my ($self) = @_;
524 586
525 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 596
527 glPushMatrix; 597 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 599
532 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 602 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 604 glBegin GL_QUADS;
539 glVertex $x , $y; 605 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
543 glEnd; 609 glEnd;
544 glDisable GL_BLEND; 610 glDisable GL_BLEND;
545 } 611 }
546 612
547 if ($ENV{CFPLUS_DEBUG}) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 614 glPushMatrix;
549 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 618 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
556 glEnd; 622 glEnd;
557 glPopMatrix; 623 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
560} 629}
561 630
562sub _draw { 631sub _draw {
563 my ($self) = @_; 632 my ($self) = @_;
564 633
… …
566} 635}
567 636
568sub DESTROY { 637sub DESTROY {
569 my ($self) = @_; 638 my ($self) = @_;
570 639
640 return if CFPlus::in_destruct;
641
571 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
572 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 646}
574 647
575############################################################################# 648#############################################################################
576 649
577package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
578 651
579our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
580 653
581use strict; 654use strict;
582use CFClient::OpenGL; 655use CFPlus::OpenGL;
583 656
584sub new { 657sub new {
585 my $class = shift; 658 my $class = shift;
586 659
587 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
602 675
603 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
605 678
606 glEnable GL_BLEND; 679 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 681 glColor_premultiply @$color;
609 682
610 glBegin GL_QUADS; 683 glBegin GL_QUADS;
611 glVertex 0 , 0; 684 glVertex 0 , 0;
612 glVertex 0 , $h; 685 glVertex 0 , $h;
613 glVertex $w, $h; 686 glVertex $w, $h;
… …
618 } 691 }
619} 692}
620 693
621############################################################################# 694#############################################################################
622 695
623package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
624 697
625our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
626 699
627sub new { 700sub new {
628 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
629 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
630} 703}
… …
637 710
638sub draw { } 711sub draw { }
639 712
640############################################################################# 713#############################################################################
641 714
642package CFClient::UI::Container; 715package CFPlus::UI::Container;
643 716
644our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
645 718
646sub new { 719sub new {
647 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
648 721
649 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
650 723
651 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
652 children => [], 725 children => [],
653 can_events => 0, 726 can_events => 0,
654 %arg, 727 %arg,
655 ); 728 );
729
656 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
657 732
658 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
659} 742}
660 743
661sub add { 744sub add {
662 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
663 746
… …
709 $x -= $self->{x}; 792 $x -= $self->{x};
710 $y -= $self->{y}; 793 $y -= $self->{y};
711 794
712 my $res; 795 my $res;
713 796
714 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
716 and return $res; 799 and return $res;
717 } 800 }
718 801
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
725 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
726} 809}
727 810
728############################################################################# 811#############################################################################
729 812
730package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
731 814
732our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
733 816
734sub new { 817sub new {
735 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
736 819
737 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
738 821
739 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
740} 823}
741 824
742sub add { 825sub add {
743 my ($self, $child) = @_; 826 my ($self, $child) = @_;
744 827
745 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
748} 830}
749 831
750sub remove { 832sub remove {
751 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
752 834
753 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
754 836
755 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
756 unless @{$self->{children}}; 838 unless @{$self->{children}};
757} 839}
758 840
759sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
760 842
761sub size_request { 843sub size_request {
762 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
763} 845}
764 846
765sub size_allocate { 847sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 848 my ($self, $w, $h) = @_;
767 849
768 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
769} 853}
770 854
771############################################################################# 855#############################################################################
772 856
857# back-buffered drawing area
858
773package CFClient::UI::Window; 859package CFPlus::UI::Window;
774 860
775our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
776 862
777use CFClient::OpenGL; 863use CFPlus::OpenGL;
778 864
779sub new { 865sub new {
780 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
781 867
782 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
787 873
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 875 $self->SUPER::update;
790} 876}
791 877
792sub size_allocate { 878sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 879 my ($self, $w, $h) = @_;
794 880
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 881 $self->update;
797 if $changed; 882
883 $self->SUPER::invoke_size_allocate ($w, $h)
798} 884}
799 885
800sub _render { 886sub _render {
887 my ($self) = @_;
888
801 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
802} 890}
803 891
804sub render_child { 892sub render_child {
805 my ($self) = @_; 893 my ($self) = @_;
806 894
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
810 898
899 {
900 package CFPlus::UI::Base;
901
902 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h});
904 }
905
811 $self->_render; 906 $self->_render;
812 }; 907 };
813} 908}
814 909
815sub _draw { 910sub _draw {
816 my ($self) = @_; 911 my ($self) = @_;
817 912
818 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
819 914
820 my $tex = $self->{texture} 915 my $tex = $self->{texture}
821 or return; 916 or return;
822 917
823 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
826 921
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 923
829 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
830} 925}
831 926
832############################################################################# 927#############################################################################
833 928
834package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
835 930
836our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
837 932
838sub new { 933sub new {
839 my $class = shift; 934 my $class = shift;
840 935
841 $class->SUPER::new ( 936 $class->SUPER::new (
… …
846} 941}
847 942
848sub size_request { 943sub size_request {
849 my ($self) = @_; 944 my ($self) = @_;
850 945
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 947
853 $w = 10 if $self->{scroll_x}; 948 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
855 950
856 ($w, $h) 951 ($w, $h)
857} 952}
858 953
859sub size_allocate { 954sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 955 my ($self, $w, $h) = @_;
861 956
957 my $child = $self->child;
958
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 961
865 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
866 $self->update; 963 $self->update;
964
965 1
867} 966}
868 967
869sub set_offset { 968sub set_offset {
870 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
871 970
… …
897 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
898 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
899 ) { 998 ) {
900 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
901 } else { 1000 } else {
902 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
903 } 1002 }
904} 1003}
905 1004
906sub _render { 1005sub _render {
907 my ($self) = @_; 1006 my ($self) = @_;
908 1007
1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 1012
911 $self->SUPER::_render; 1013 $self->SUPER::_render;
912} 1014}
913 1015
914############################################################################# 1016#############################################################################
915 1017
916package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
917 1019
918our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
919 1021
920sub new { 1022sub new {
921 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
922 1026
923 my $self; 1027 my $self;
924 1028
925 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
926 vertical => 1, 1030 vertical => 1,
927 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
928 on_changed => sub { 1032 on_changed => sub {
929 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
930 }, 1034 },
931 ; 1035 ;
932 1036
933 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
935 slider => $slider, 1040 slider => $slider,
936 @_, 1041 %arg,
937 ); 1042 );
938 1043
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
942 1046
943 $self 1047 $self
944} 1048}
945 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
946sub update { 1074sub update {
947 my ($self) = @_; 1075 my ($self) = @_;
948 1076
949 $self->SUPER::update; 1077 $self->SUPER::update;
950 1078
951 # todo: overwrite size_allocate of child 1079 $self->update_slider;
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1080}
955 1081
956sub size_allocate { 1082sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1083 my ($self, $w, $h) = @_;
958 1084
1085 $self->update_slider;
1086
959 $self->SUPER::size_allocate ($w, $h, $changed); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1088}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967 1089
968############################################################################# 1090#############################################################################
969 1091
970package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
971 1093
972our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
973 1095
974use CFClient::OpenGL; 1096use CFPlus::OpenGL;
975 1097
976sub new { 1098sub new {
977 my $class = shift; 1099 my $class = shift;
978 1100
979 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
987 1109
988 if ($self->{bg}) { 1110 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
990 1112
991 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
994 1116
995 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
996 glVertex 0 , 0; 1118 glVertex 0 , 0;
997 glVertex 0 , $h; 1119 glVertex 0 , $h;
998 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1005 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1006} 1128}
1007 1129
1008############################################################################# 1130#############################################################################
1009 1131
1010package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1011 1133
1012our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1013 1135
1014use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1015 1137
1016my $bg = 1138my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1019 1141
1020my @border = 1142my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1145
1024sub new { 1146sub new {
1025 my $class = shift; 1147 my ($class, %arg) = @_;
1026 1148
1027 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1152 border => 0.6,
1031 is_toplevel => 1,
1032 can_events => 1, 1153 can_events => 1,
1033 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
1034 ); 1157 );
1035 1158
1036 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1037 align => 0, 1160 align => 0,
1038 valign => 1, 1161 valign => 1,
1039 text => $self->{title}, 1162 text => $self->{title},
1040 fontsize => $self->{border}; 1163 fontsize => $self->{border},
1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 }
1041 1174
1042 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1043} 1184}
1044 1185
1045sub border { 1186sub border {
1046 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1047} 1188}
1048 1189
1049sub size_request { 1190sub size_request {
1050 my ($self) = @_; 1191 my ($self) = @_;
1192
1193 $self->{title_widget}->size_request
1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1051 1198
1052 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1053 1200
1054 ( 1201 (
1055 $w + $self->border * 2, 1202 $w + $self->border * 2,
1056 $h + $self->border * 2, 1203 $h + $self->border * 2,
1057 ) 1204 )
1058} 1205}
1059 1206
1060sub size_allocate { 1207sub invoke_size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1208 my ($self, $w, $h) = @_;
1062 1209
1063 return unless $changed; 1210 if ($self->{title_widget}) {
1211 $self->{title_widget}{w} = $w;
1212 $self->{title_widget}{h} = $h;
1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1214 }
1064 1215
1216 my $border = $self->border;
1217
1065 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1067 1220
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1072}
1073 1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1234 1
1235}
1236
1074sub button_down { 1237sub invoke_button_down {
1075 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1076 1239
1077 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1078 my $border = $self->border; 1241 my $border = $self->border;
1079 1242
… …
1095 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1096 1259
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1264 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1265 };
1103 1266
1104 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1109 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1110 1273
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1275
1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1115 } 1284 1
1116} 1285}
1117 1286
1118sub button_up { 1287sub invoke_button_up {
1119 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1120 1289
1121 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1122} 1291}
1123 1292
1124sub mouse_motion { 1293sub invoke_mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1126 1295
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1128} 1307}
1129 1308
1130sub _draw { 1309sub _draw {
1131 my ($self) = @_; 1310 my ($self) = @_;
1132 1311
1312 my $child = $self->{children}[0];
1313
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1314 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1315 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1316
1136 glEnable GL_TEXTURE_2D; 1317 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1319
1139 my $border = $self->border; 1320 my $border = $self->border;
… …
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1335 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1336 }
1156 1337
1157 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1158 1339
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1340 $child->draw;
1341
1342 if ($self->{title_widget}) {
1343 glTranslate 0, $border - $self->{h};
1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1162} 1351}
1163 1352
1164############################################################################# 1353#############################################################################
1165 1354
1166package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1167 1356
1168our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1169 1358
1170use List::Util qw(max sum); 1359use List::Util qw(max sum);
1171 1360
1172use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1173 1362
1174sub new { 1363sub new {
1175 my $class = shift; 1364 my $class = shift;
1176 1365
1177 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1183sub children { 1372sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1185} 1374}
1186 1375
1187sub add { 1376sub add {
1188 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1189 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1190 $child->set_parent ($self); 1381 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1192 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1193 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1194} 1394}
1195 1395
1196# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1397sub clear {
1198 my ($self) = @_; 1398 my ($self) = @_;
… …
1239 (sum @$ws), 1439 (sum @$ws),
1240 (sum @$hs), 1440 (sum @$hs),
1241 ) 1441 )
1242} 1442}
1243 1443
1244sub size_allocate { 1444sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1445 my ($self, $w, $h) = @_;
1246 1446
1247 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1248 1448
1249 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1450 my $req_h = (sum @$hs) || 1;
… …
1256 1456
1257 # linearly scale sizes 1457 # linearly scale sizes
1258 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1259 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1260 1460
1261 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1262 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1263 1463
1264 my $y; 1464 my $y;
1265 1465
1266 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1267 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1281 } 1481 }
1282 1482
1283 $y += $row_h; 1483 $y += $row_h;
1284 } 1484 }
1285 1485
1486 1
1286} 1487}
1287 1488
1288sub find_widget { 1489sub find_widget {
1289 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1290 1491
… …
1309 } 1510 }
1310} 1511}
1311 1512
1312############################################################################# 1513#############################################################################
1313 1514
1314package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1315 1516
1316our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1317 1518
1318sub size_request { 1519sub size_request {
1319 my ($self) = @_; 1520 my ($self) = @_;
1320 1521
1321 $self->{vertical} 1522 $self->{vertical}
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1530 )
1330} 1531}
1331 1532
1332sub size_allocate { 1533sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1534 my ($self, $w, $h) = @_;
1334 1535
1335 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1337 1538
1338 my @req; 1539 my @req;
1339 1540
1340 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1342 } else { 1543 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1345 1546
1346 if ($req > $space) { 1547 if ($req > $space) {
1347 # ah well, not enough space 1548 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1349 } else { 1550 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1552
1352 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1353 1554
1354 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1556 for 0 .. $#children;
1356 } 1557 }
1357 } 1558 }
1358 1559
1359 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1360 1561
1361 my $pos = 0; 1562 my $pos = 0;
1362 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1566
1366 $pos += $alloc; 1567 $pos += $alloc;
1367 } 1568 }
1368 1569
1369 1 1570 1
1370} 1571}
1371 1572
1372############################################################################# 1573#############################################################################
1373 1574
1374package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1375 1576
1376our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1377 1578
1378sub new { 1579sub new {
1379 my $class = shift; 1580 my $class = shift;
1380 1581
1381 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1384 ) 1585 )
1385} 1586}
1386 1587
1387############################################################################# 1588#############################################################################
1388 1589
1389package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1390 1591
1391our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1392 1593
1393sub new { 1594sub new {
1394 my $class = shift; 1595 my $class = shift;
1395 1596
1396 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1399 ) 1600 )
1400} 1601}
1401 1602
1402############################################################################# 1603#############################################################################
1403 1604
1404package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1405 1606
1406our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1407 1608
1408use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1409 1610
1410sub new { 1611sub new {
1411 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1412 1613
1413 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1417 #font => default_font 1618 #font => default_font
1418 #text => initial text 1619 #text => initial text
1419 #markup => initial narkup 1620 #markup => initial narkup
1420 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1421 ellipsise => 3, # end 1622 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1423 fontsize => 1, 1624 fontsize => 1,
1424 align => -1, 1625 align => -1,
1425 valign => -1, 1626 valign => -1,
1426 padding => 2, 1627 padding_x => 2,
1628 padding_y => 2,
1427 can_events => 0, 1629 can_events => 0,
1428 %arg 1630 %arg
1429 ); 1631 );
1430 1632
1431 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1432 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1433 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1434 $self->{template} = $layout; 1636 $self->{template} = $layout;
1435 } 1637 }
1436 1638
1437 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1441 } 1643 }
1442 1644
1443 $self 1645 $self
1444} 1646}
1445 1647
1446sub escape($) {
1447 local $_ = $_[0];
1448
1449 s/&/&amp;/g;
1450 s/>/&gt;/g;
1451 s/</&lt;/g;
1452
1453 $_
1454}
1455
1456sub update { 1648sub update {
1457 my ($self) = @_; 1649 my ($self) = @_;
1458 1650
1459 delete $self->{texture}; 1651 delete $self->{texture};
1460 $self->SUPER::update; 1652 $self->SUPER::update;
1461} 1653}
1462 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1463sub set_text { 1662sub set_text {
1464 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1465 1664
1466 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1468 1667
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1471 1669
1670 delete $self->{size_req};
1472 $self->realloc; 1671 $self->realloc;
1473 $self->update; 1672 $self->update;
1474} 1673}
1475 1674
1476sub set_markup { 1675sub set_markup {
… …
1479 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1481 1680
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1682
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1486 1684
1685 delete $self->{size_req};
1487 $self->realloc; 1686 $self->realloc;
1488 $self->update; 1687 $self->update;
1489} 1688}
1490 1689
1491sub size_request { 1690sub size_request {
1492 my ($self) = @_; 1691 my ($self) = @_;
1493 1692
1693 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1699
1500 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1501 1701
1502 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1706
1506 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1507 1708
1508 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1510 } 1714 };
1511 1715
1512 ( 1716 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1717}
1517 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1518sub size_allocate { 1723sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1724 my ($self, $w, $h) = @_;
1725
1726 delete $self->{ox};
1520 1727
1521 delete $self->{texture} 1728 delete $self->{texture}
1522 if $changed; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1523} 1732}
1524 1733
1525sub set_fontsize { 1734sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1527 1736
1528 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1529 delete $self->{texture}; 1739 delete $self->{texture};
1530 1740
1531 $self->realloc; 1741 $self->realloc;
1532} 1742}
1533 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1534sub _draw { 1753sub _draw {
1535 my ($self) = @_; 1754 my ($self) = @_;
1536 1755
1537 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1538 1757
1539 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1541 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1542 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1765
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1766 [$self->{layout}->size]
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1767 };
1559 1768
1560 glEnable GL_TEXTURE_2D; 1769 unless (exists $self->{ox}) {
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1772 : ($self->{w} - $size->[0]) * 0.5);
1562 1773
1563 if ($tex->{format} == GL_ALPHA) { 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 glColor @{$self->{fg}}; 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1776 : ($self->{h} - $size->[1]) * 0.5);
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 } 1777 };
1569 1778
1570 glDisable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781
1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1571} 1783}
1572 1784
1573############################################################################# 1785#############################################################################
1574 1786
1575package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1576 1788
1577our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1578 1790
1579use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1580 1792
1581sub new { 1793sub new {
1582 my $class = shift; 1794 my $class = shift;
1583 1795
1584 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1589 can_hover => 1, 1801 can_hover => 1,
1590 can_focus => 1, 1802 can_focus => 1,
1591 valign => 0, 1803 valign => 0,
1592 can_events => 1, 1804 can_events => 1,
1593 #text => ... 1805 #text => ...
1806 #hidden => "*",
1594 @_ 1807 @_
1595 ) 1808 )
1596} 1809}
1597 1810
1598sub _set_text { 1811sub _set_text {
… …
1600 1813
1601 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1602 1815
1603 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1604 1817
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1819 $self->{text} = $text;
1609 1820
1610 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1612 1824
1613 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1614} 1829}
1615 1830
1616sub set_text { 1831sub set_text {
1617 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1618 1833
1619 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1835 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1836}
1624 1837
1625sub get_text { 1838sub get_text {
1626 $_[0]{text} 1839 $_[0]{text}
1627} 1840}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1633 1846
1634 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1635} 1848}
1636 1849
1637sub key_down { 1850sub invoke_key_down {
1638 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1639 1852
1640 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1645 1858
1646 if ($uni == 8) { 1859 if ($uni == 8) {
1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1648 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1649 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1650 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1651 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1652 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1653 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1655 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1657 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1872 $self->emit ('escape');
1660 } elsif ($uni) { 1873 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else {
1876 return 0;
1662 } 1877 }
1663 1878
1664 $self->_set_text ($text); 1879 $self->_set_text ($text);
1665 1880
1666 $self->realloc; 1881 $self->realloc;
1667}
1668 1882
1883 1
1884}
1885
1669sub focus_in { 1886sub invoke_focus_in {
1670 my ($self) = @_; 1887 my ($self) = @_;
1671 1888
1672 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1673 1890
1674 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1675} 1892}
1676 1893
1677sub button_down { 1894sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1679 1896
1680 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1898
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1900
1684 # byte-index to char-index 1901 # byte-index to char-index
1685 my $text = $self->{text}; 1902 my $text = $self->{text};
1686 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1688 1905
1689 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1690 $self->update; 1907 $self->update;
1908
1909 1
1691} 1910}
1692 1911
1693sub mouse_motion { 1912sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1915
1916 1
1696} 1917}
1697 1918
1698sub _draw { 1919sub _draw {
1699 my ($self) = @_; 1920 my ($self) = @_;
1700 1921
1701 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1702 1923
1703 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1706 } else { 1927 } else {
1707 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1708 } 1929 }
1709 1930
1710 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1934 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1735 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1736 glEnd; 1957 glEnd;
1737 } 1958 }
1738} 1959}
1739 1960
1740package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1741 1962
1742our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1743 1964
1744use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1745 1966
1746sub key_down { 1967sub invoke_key_down {
1747 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1748 1969
1749 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1750 1971
1751 if ($sym == 13) { 1972 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1754 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1757 $self->update; 1979 $self->update;
1758 1980
1759 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1762 } 1984 }
1763 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1764 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1766 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1767 } 1989 }
1768 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1769 } 1991 }
1770 1992
1771 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1772 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1773 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1774 1996
1775 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1776 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1777 } else { 1999 } else {
1778 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1779 } 2001 }
1780 2002
1781 } else { 2003 } else {
1782 $self->SUPER::key_down ($ev); 2004 return $self->SUPER::invoke_key_down ($ev)
2005 }
2006
1783 } 2007 1
1784
1785} 2008}
1786 2009
1787############################################################################# 2010#############################################################################
1788 2011
1789package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1790 2013
1791our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1792 2015
1793use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1794 2017
1795my @tex = 2018my @tex =
1796 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1797 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1798 2021
1799sub new { 2022sub new {
1800 my $class = shift; 2023 my $class = shift;
1801 2024
1802 $class->SUPER::new ( 2025 $class->SUPER::new (
1803 padding => 4, 2026 padding_x => 4,
2027 padding_y => 4,
1804 fg => [1, 1, 1], 2028 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 2029 active_fg => [0, 0, 1],
1806 can_hover => 1, 2030 can_hover => 1,
1807 align => 0, 2031 align => 0,
1808 valign => 0, 2032 valign => 0,
1809 can_events => 1, 2033 can_events => 1,
1810 @_ 2034 @_
1811 ) 2035 )
1812} 2036}
1813 2037
1814sub activate { }
1815
1816sub button_up { 2038sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1818 2040
1819 $self->emit ("activate") 2041 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
2044
2045 1
1822} 2046}
1823 2047
1824sub _draw { 2048sub _draw {
1825 my ($self) = @_; 2049 my ($self) = @_;
1826 2050
1827 local $self->{fg} = $self->{fg}; 2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 2052
1833 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 2055 glColor 0, 0, 0, 1;
1836 2056
… …
1841 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1842} 2062}
1843 2063
1844############################################################################# 2064#############################################################################
1845 2065
1846package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1847 2067
1848our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1849 2069
1850my @tex = 2070my @tex =
1851 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1852 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1853 2073
1854use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1855 2075
1856sub new { 2076sub new {
1857 my $class = shift; 2077 my $class = shift;
1858 2078
1859 $class->SUPER::new ( 2079 $class->SUPER::new (
1860 padding => 2, 2080 padding_x => 2,
2081 padding_y => 2,
1861 fg => [1, 1, 1], 2082 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2083 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2085 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2086 state => 0,
… …
1869} 2090}
1870 2091
1871sub size_request { 2092sub size_request {
1872 my ($self) = @_; 2093 my ($self) = @_;
1873 2094
1874 ($self->{padding} * 2 + 6) x 2 2095 (6) x 2
1875} 2096}
1876 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1877sub button_down { 2106sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1879 2108
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2111 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2112 } else {
2113 return 0
2114 }
2115
1884 } 2116 1
1885} 2117}
1886 2118
1887sub _draw { 2119sub _draw {
1888 my ($self) = @_; 2120 my ($self) = @_;
1889 2121
1890 $self->SUPER::_draw; 2122 $self->SUPER::_draw;
1891 2123
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2125
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2126 my ($w, $h) = @$self{qw(w h)};
2127
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2129
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2131
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2133
… …
1902 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
1903} 2137}
1904 2138
1905############################################################################# 2139#############################################################################
1906 2140
1907package CFClient::UI::Image; 2141package CFPlus::UI::Image;
1908 2142
1909our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
1910 2144
1911use CFClient::OpenGL; 2145use CFPlus::OpenGL;
1912use Carp qw/confess/;
1913 2146
1914our %loaded_images; 2147our %texture_cache;
1915 2148
1916sub new { 2149sub new {
1917 my $class = shift; 2150 my $class = shift;
1918 2151
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
1920 2156
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
1922 2159
1923 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1925 2162
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2164
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2166
1932 $self 2167 $self
1933} 2168}
1934 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
1935sub size_request { 2185sub size_request {
1936 my ($self) = @_; 2186 my ($self) = @_;
1937 2187
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
1939} 2189}
1940 2190
1941sub _draw { 2191sub _draw {
1942 my ($self) = @_; 2192 my ($self) = @_;
1943 2193
… …
1953 } 2203 }
1954 2204
1955 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1957 2207
1958 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
1959 2209
1960 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
1961} 2211}
1962 2212
1963############################################################################# 2213#############################################################################
1964 2214
2215package CFPlus::UI::ImageButton;
2216
2217our @ISA = CFPlus::UI::Image::;
2218
2219use CFPlus::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2247}
2248
2249#############################################################################
2250
1965package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
1966 2252
1967our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
1968 2254
1969use List::Util qw(min max); 2255use List::Util qw(min max);
1970 2256
1971use CFClient::OpenGL; 2257use CFPlus::OpenGL;
1972 2258
1973my %tex = ( 2259my %tex = (
1974 food => [ 2260 food => [
1975 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1976 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1977 ], 2263 ],
1978 grace => [ 2264 grace => [
1979 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1980 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1981 ], 2267 ],
1982 hp => [ 2268 hp => [
1983 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1984 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1985 ], 2271 ],
1986 mana => [ 2272 mana => [
1987 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1988 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1989 ], 2275 ],
1990); 2276);
1991 2277
1992# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2340
2055 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057 2346
2058 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2352
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2353 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2354 glBegin GL_QUADS;
… …
2079 2369
2080 if ($t3) { 2370 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2377 glEnd;
2088 } 2378 }
2089 2379
2090 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2091 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2092} 2382}
2093 2383
2094############################################################################# 2384#############################################################################
2095 2385
2096package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2097 2387
2098our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2099 2389
2100sub new { 2390sub new {
2101 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2102 2392
2103 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2105 can_hover => 1, 2395 can_hover => 1,
2106 can_events => 1, 2396 can_events => 1,
2107 %arg, 2397 %arg,
2108 ); 2398 );
2109 2399
2110 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2111 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2401 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2112 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2113 2403
2114 $self 2404 $self
2115} 2405}
2116 2406
2117sub set_fontsize { 2407sub set_fontsize {
… …
2138 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2139} 2429}
2140 2430
2141############################################################################# 2431#############################################################################
2142 2432
2143package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2144 2434
2145use strict; 2435use strict;
2146 2436
2147use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2148 2438
2149our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2150 2440
2151my @tex = 2441my @tex =
2152 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2153 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2154 2444
2155sub new { 2445sub new {
2156 my $class = shift; 2446 my $class = shift;
2157 2447
… …
2164 fg => [1, 1, 1], 2454 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2455 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2456 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2457 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2458 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2459 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2460 min_h => $::WIDTH / 80,
2171 vertical => 0, 2461 vertical => 0,
2172 can_hover => 1, 2462 can_hover => 1,
2173 inner_pad => 0.02, 2463 inner_pad => 0.02,
2174 @_ 2464 @_
2175 ); 2465 );
… …
2178 $self->update; 2468 $self->update;
2179 2469
2180 $self 2470 $self
2181} 2471}
2182 2472
2183sub changed { }
2184
2185sub set_range { 2473sub set_range {
2186 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2187 2475
2188 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2189 2477
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2192} 2482}
2193 2483
2194sub set_value { 2484sub set_value {
2195 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2196 2486
… …
2207 if $unit; 2497 if $unit;
2208 2498
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2500
2211 if ($value != $old_value) { 2501 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2213 $self->update; 2503 $self->update;
2214 } 2504 }
2215} 2505}
2216 2506
2217sub size_request { 2507sub size_request {
2218 my ($self) = @_; 2508 my ($self) = @_;
2219 2509
2220 my $w = $self->{req_w}; 2510 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2511}
2225 2512
2226sub button_down { 2513sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2228 2515
2229 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2517
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2519
2233 $self->mouse_motion ($ev, $x, $y); 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2521}
2235 2522
2236sub mouse_motion { 2523sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2238 2525
2239 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2528
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2529 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2530
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2531 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2532
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2533 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2534 } else {
2535 return 0;
2536 }
2537
2247 } 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2248} 2549}
2249 2550
2250sub update { 2551sub update {
2251 my ($self) = @_; 2552 my ($self) = @_;
2252 2553
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2554 delete $self->{knob_w};
2555 $self->SUPER::update;
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2562 $self->set_value ($self->{range}[0]);
2255 2563
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2564 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2565 my $range = ($hi - $page - $lo) || 1e-100;
2258 2566
… …
2264 $value = ($value - $lo) / $range; 2572 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2573 $value = $value * $self->{scale} + $self->{offset};
2266 2574
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2575 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2576 $self->{knob_w} = $knob_w;
2269 }); 2577 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2578
2277 $self->SUPER::_draw (); 2579 $self->SUPER::_draw ();
2278 2580
2279 glScale $self->{w}, $self->{h}; 2581 glScale $self->{w}, $self->{h};
2280 2582
… …
2300 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2301} 2603}
2302 2604
2303############################################################################# 2605#############################################################################
2304 2606
2305package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2306 2608
2307our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2308 2610
2309sub new { 2611sub new {
2310 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2311 2613
2312 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2313 2615
2314 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2315 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2316 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2317 to_value => sub { shift }, 2619 to_value => sub { shift },
2318 from_value => sub { shift }, 2620 from_value => sub { shift },
2319 %arg, 2621 %arg,
2320 ); 2622 );
2321 2623
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2343 2645
2344############################################################################# 2646#############################################################################
2345 2647
2346package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2347 2649
2348our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2349 2651
2350use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2351 2653
2352sub new { 2654sub new {
2353 my $class = shift; 2655 my $class = shift;
2354 2656
2355 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2356 fontsize => 1, 2658 fontsize => 1,
2357 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2358 #font => default_font 2661 #font => default_font
2359 @_, 2662 @_,
2360 2663
2361 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2362 par => [], 2665 par => [],
2363 height => 0, 2666 height => 0,
2364 children => [ 2667 children => [
2365 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2366 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2367 ], 2670 ],
2368 ); 2671 );
2369 2672
2370 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2371 2674
… …
2377 2680
2378 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2682 $self->reflow;
2380} 2683}
2381 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2382sub size_allocate { 2694sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2695 my ($self, $w, $h) = @_;
2384 2696
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2699
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2704
2393 $self->reflow; 2705 $self->reflow;
2394}
2395 2706
2396sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2397 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2398 2723
2399 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2400 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2404 2737 );
2738
2405 $layout->size 2739 $layout
2406} 2740}
2407 2741
2408sub reflow { 2742sub reflow {
2409 my ($self) = @_; 2743 my ($self) = @_;
2410 2744
… …
2419 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2420} 2754}
2421 2755
2422sub clear { 2756sub clear {
2423 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2424 2761
2425 $self->{par} = []; 2762 $self->{par} = [];
2426 $self->{height} = 0; 2763 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2765}
2429 2766
2430sub add_paragraph { 2767sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2432 2769
2433 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2434 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2435 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2437 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2438 2780
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2440} 2794}
2441 2795
2442sub update { 2796sub update {
2443 my ($self) = @_; 2797 my ($self) = @_;
2444 2798
… …
2446 2800
2447 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2448 2802
2449 delete $self->{texture}; 2803 delete $self->{texture};
2450 2804
2451 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2807
2454 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2809 my $height = 0;
2456 2810
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2815
2467 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2468 } 2819 }
2469 2820
2470 $height += $_->[1]; 2821 $height += $para->{h};
2471 } 2822 }
2472 2823
2473 $self->{height} = $height; 2824 $self->{height} = $height;
2474 2825
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2827
2477 delete $self->{texture}; 2828 delete $self->{texture};
2478 } 2829 }
2479 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2836 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2483 2838
2484 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2485 2840
2486 my $y0 = $top; 2841 my $y0 = $top;
2487 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2488 2843
2489 my $y = 0; 2844 my $y = 0;
2490 2845
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494
2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498
2499 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2847 my $h = $para->{h};
2501 2848
2502 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2505 $layout->set_markup ($par->[4]);
2506 2850
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2508 2852
2509 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2511 } 2867 }
2512 2868
2513 $y += $h; 2869 $y += $h;
2514 } 2870 }
2515
2516 glDisable GL_BLEND;
2517 }; 2871 };
2518 }); 2872 });
2519} 2873}
2520 2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2882}
2883
2521sub _draw { 2884sub _draw {
2522 my ($self) = @_; 2885 my ($self) = @_;
2523 2886
2524 glEnable GL_TEXTURE_2D; 2887 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2888 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2889 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2529 2892
2530 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2531
2532} 2894}
2533 2895
2534############################################################################# 2896#############################################################################
2535 2897
2536package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2537 2899
2538use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2539 2901
2540our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2541 2903
2542sub moveto { 2904sub moveto {
2543 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2544 2906
2545 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2573 glPopMatrix; 2935 glPopMatrix;
2574} 2936}
2575 2937
2576############################################################################# 2938#############################################################################
2577 2939
2578package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2579 2941
2580our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2581 2943
2582sub new { 2944sub new {
2583 my $class = shift; 2945 my $class = shift;
2584 2946
2585 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2597 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2598} 2960}
2599 2961
2600############################################################################# 2962#############################################################################
2601 2963
2602package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2603 2965
2604our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2605 2967
2606use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2607 2969
2608sub new { 2970sub new {
2609 my $class = shift; 2971 my $class = shift;
2610 2972
2611 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2615} 2977}
2616 2978
2617sub set_tooltip_from { 2979sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2980 my ($self, $widget) = @_;
2619 2981
2982 my $tooltip = $widget->{tooltip};
2983
2984 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2987 . "req $widget->{req_w} $widget->{req_h}\n"
2988 . "visible $widget->{visible}";
2989 }
2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2620 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2621 markup => $widget->{tooltip}, 2995 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2997 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2999 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 3000 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 3008
2635 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2636} 3010}
2637 3011
2638sub size_allocate { 3012sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 3013 my ($self, $w, $h) = @_;
2640 3014
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2644} 3016}
2645 3017
2646sub visibility_change { 3018sub invoke_visibility_change {
2647 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2648 3020
2649 return unless $visible; 3021 return unless $visible;
2650 3022
2651 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2653 or return; 3025 or return;
2654 3026
3027 if ($widget->{visible}) {
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656 3029
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2659 3032
2660 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2661 }); 3037 });
2662} 3038}
2663 3039
2664sub _draw { 3040sub _draw {
2665 my ($self) = @_; 3041 my ($self) = @_;
… …
2689 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2690} 3066}
2691 3067
2692############################################################################# 3068#############################################################################
2693 3069
2694package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2695 3071
2696our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2697 3073
2698use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2699 3075
2700sub new { 3076sub new {
2701 my $class = shift; 3077 my $class = shift;
2702 3078
2703 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2738sub _draw { 3114sub _draw {
2739 my ($self) = @_; 3115 my ($self) = @_;
2740 3116
2741 return unless $::CONN; 3117 return unless $::CONN;
2742 3118
3119 $self->SUPER::_draw;
3120
2743 my $face; 3121 my $face;
2744 3122
2745 if ($self->{frame}) { 3123 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2747 3125
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 3131
2754 if ($tex) { 3132 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 3133 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 3135 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2760 } 3138 }
2761} 3139}
2762 3140
2763sub DESTROY { 3141sub destroy {
2764 my ($self) = @_; 3142 my ($self) = @_;
2765 3143
2766 $self->{timer}->cancel 3144 $self->{timer}->cancel
2767 if $self->{timer}; 3145 if $self->{timer};
2768 3146
2769 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2770} 3148}
2771 3149
2772############################################################################# 3150#############################################################################
2773 3151
2774package CFClient::UI::Inventory; 3152package CFPlus::UI::Buttonbar;
2775 3153
2776our @ISA = CFClient::UI::ScrolledWindow::; 3154our @ISA = CFPlus::UI::HBox::;
2777 3155
2778sub new { 3156# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 3157
2814############################################################################# 3158#############################################################################
2815 3159
2816package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2817 3161
2818our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2819 3163
2820use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2821 3165
2822sub new { 3166sub new {
2823 my $class = shift; 3167 my $class = shift;
2824 3168
2825 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2826 items => [], 3170 items => [],
2827 z => 100, 3171 z => 100,
2828 @_, 3172 @_,
2829 ); 3173 );
2830 3174
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2832 3176
2833 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2835 3179
2836 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2837 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2838 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2839 can_hover => 1, 3186 can_hover => 1,
2840 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
2841 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2842 } 3202 }
2843 3203
2844 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2845 3205
2846 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2851 3211
2852# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2853sub popup { 3213sub popup {
2854 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2855 3215
2856 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2857 3217
2858 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3219 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2861 3221
2862 $self->show; 3222 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3224}
2865 3225
2866sub mouse_motion { 3226sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2868 3228
2869 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3232
3233 0
3234}
3235
2874sub button_up { 3236sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2876 3238
2877 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3240 undef $GRAB;
2879 $self->hide; 3241 $self->hide;
2880 3242
2881 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
3245 } else {
3246 return 0
3247 }
3248
2883 } 3249 1
2884} 3250}
2885 3251
2886############################################################################# 3252#############################################################################
2887 3253
2888package CFClient::UI::Statusbox; 3254package CFPlus::UI::Multiplexer;
2889 3255
2890our @ISA = CFClient::UI::VBox::; 3256our @ISA = CFPlus::UI::Container::;
2891 3257
2892sub new { 3258sub new {
2893 my $class = shift; 3259 my $class = shift;
2894 3260
2895 $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
3262 @_,
3263 );
3264
3265 $self->{current} = $self->{children}[0]
3266 if @{ $self->{children} };
3267
3268 $self
3269}
3270
3271sub add {
3272 my ($self, @widgets) = @_;
3273
3274 $self->SUPER::add (@widgets);
3275
3276 $self->{current} = $self->{children}[0]
3277 if @{ $self->{children} };
3278}
3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3286sub set_current_page {
3287 my ($self, $page_or_widget) = @_;
3288
3289 my $widget = ref $page_or_widget
3290 ? $page_or_widget
3291 : $self->{children}[$page_or_widget];
3292
3293 $self->{current} = $widget;
3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3295
3296 $self->emit (page_changed => $self->{current});
3297
3298 $self->realloc;
3299}
3300
3301sub visible_children {
3302 $_[0]{current}
3303}
3304
3305sub size_request {
3306 my ($self) = @_;
3307
3308 $self->{current}->size_request
3309}
3310
3311sub invoke_size_allocate {
3312 my ($self, $w, $h) = @_;
3313
3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3317}
3318
3319sub _draw {
3320 my ($self) = @_;
3321
3322 $self->{current}->draw;
3323}
3324
3325#############################################################################
3326
3327package CFPlus::UI::Notebook;
3328
3329our @ISA = CFPlus::UI::VBox::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self
3338 @_,
3339 );
3340
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343
3344 $self
3345}
3346
3347sub add {
3348 my ($self, $title, $widget, $tooltip) = @_;
3349
3350 Scalar::Util::weaken $self;
3351
3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title,
3354 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) },
3356 );
3357
3358 $self->{multiplexer}->add ($widget);
3359}
3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3367sub set_current_page {
3368 my ($self, $page) = @_;
3369
3370 $self->{multiplexer}->set_current_page ($page);
3371 $self->emit (page_changed => $self->{multiplexer}{current});
3372}
3373
3374#############################################################################
3375
3376package CFPlus::UI::Selector;
3377
3378use utf8;
3379
3380our @ISA = CFPlus::UI::Button::;
3381
3382sub new {
3383 my $class = shift;
3384
3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3432package CFPlus::UI::Statusbox;
3433
3434our @ISA = CFPlus::UI::VBox::;
3435
3436sub new {
3437 my $class = shift;
3438
3439 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3440 fontsize => 0.8,
2897 @_, 3441 @_,
2898 ) 3442 );
3443
3444 Scalar::Util::weaken (my $this = $self);
3445
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447
3448 $self
2899} 3449}
2900 3450
2901sub reorder { 3451sub reorder {
2902 my ($self) = @_; 3452 my ($self) = @_;
2903 my $NOW = time; 3453 my $NOW = Time::HiRes::time;
3454
3455 # freeze display when hovering over any label
3456 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} };
2904 3459
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3462 }
2908 3463
… …
2911 my @items = sort { 3466 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
2915 3470
3471 $self->{timer}->interval (1);
3472
2916 my $count = 10 + 1; 3473 my $count = 10 + 1;
2917 for my $item (@items) { 3474 for my $item (@items) {
2918 last unless --$count; 3475 last unless --$count;
2919 3476
2920 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3481 : $item->{text};
2925 3482
2926 for ($short) { 3483 for ($short) {
2927 s/^\s+//; 3484 s/^\s+//;
2928 s/\s+/ /g; 3485 s/\s+/ /g;
2929 } 3486 }
2930 3487
2931 new CFClient::UI::Label 3488 new CFPlus::UI::Label
2932 markup => $short, 3489 markup => $short,
2933 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3496 can_events => 1,
2940 can_hover => 1 3497 can_hover => 1
2941 }; 3498 };
3499
3500 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3501 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3502 $label->update;
3503 $label->set_max_size (undef, $label->{req_h} * $diff)
3504 if $diff < 1;
3505 $self->{timer}->interval (1/30);
3506 } else {
3507 $label->{fg}[3] = $item->{fg}[3] || 1;
3508 }
3509
3510 push @widgets, $label;
2942 } 3511 }
2943 3512
2944 $self->clear; 3513 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
2946} 3515}
… …
2951 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
2953 3522
2954 return unless $text; 3523 return unless $text;
2955 3524
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3526
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3528
2960 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
2962 $item->{count}++; 3531 $item->{count}++;
2963 } else { 3532 } else {
2964 $item->{count} = 1; 3533 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
2966 } 3535 }
2967 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3538 delete $item->{label};
2970 } else { 3539 } else {
2971 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
2978 count => 1, 3547 count => 1,
2979 %arg, 3548 %arg,
2980 }; 3549 };
2981 } 3550 }
2982 3551
3552 $ROOT->on_refresh (reorder => sub {
2983 $self->reorder; 3553 $self->reorder;
3554 });
2984} 3555}
2985 3556
2986sub reconfigure { 3557sub reconfigure {
2987 my ($self) = @_; 3558 my ($self) = @_;
2988 3559
… …
2991 3562
2992 $self->reorder; 3563 $self->reorder;
2993 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
2994} 3565}
2995 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
2996############################################################################# 3575#############################################################################
2997 3576
3577package CFPlus::UI::Inventory;
3578
3579our @ISA = CFPlus::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
2998package CFClient::UI::Root; 3761package CFPlus::UI::Root;
2999 3762
3000our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3001 3764
3765use List::Util qw(min max);
3766
3002use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3003 3768
3004sub new { 3769sub new {
3005 my $class = shift; 3770 my $class = shift;
3006 3771
3007 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3777 Scalar::Util::weaken ($self->{root} = $self);
3013 3778
3014 $self 3779 $self
3015} 3780}
3016 3781
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3782sub size_request {
3034 my ($self) = @_; 3783 my ($self) = @_;
3035 3784
3036 ($self->{w}, $self->{h}) 3785 ($self->{w}, $self->{h})
3037} 3786}
… …
3048 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3049 3798
3050 int $coord + 0.5 3799 int $coord + 0.5
3051} 3800}
3052 3801
3053sub size_allocate { 3802sub invoke_size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3803 my ($self, $w, $h) = @_;
3055 3804
3056 for my $child ($self->children) { 3805 for my $child ($self->children) {
3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058 3807
3059 $X = $child->{force_x} if exists $child->{force_x}; 3808 $X = $child->{force_x} if exists $child->{force_x};
… …
3062 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3064 3813
3065 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3066 } 3815 }
3816
3817 1
3067} 3818}
3068 3819
3069sub coord2local { 3820sub coord2local {
3070 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3071 3822
… …
3127 $_->() 3878 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3879 for values %{delete $self->{refresh_hook}};
3129 } 3880 }
3130 3881
3131 if ($self->{realloc}) { 3882 if ($self->{realloc}) {
3883 my %queue;
3132 my @queue; 3884 my @queue;
3885 my $widget;
3133 3886
3887 outer:
3134 while () { 3888 while () {
3135 if ($self->{realloc}) { 3889 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3890 for $widget (values %$realloc) {
3891 $widget->{visible} or next; # do not resize invisible widgets
3137 3892
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3893 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3894
3895 push @{ $queue[$widget->{visible}] }, $widget;
3896 }
3140 } 3897 }
3141 3898
3899 while () {
3900 @queue or last outer;
3901
3902 $widget = pop @{ $queue[-1] || [] }
3903 and last;
3904
3905 pop @queue;
3906 }
3907
3908 delete $queue{$widget+0};
3909
3910 my ($w, $h) = $widget->size_request;
3911
3912 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3913 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3914
3915 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3916 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3917
3918 $w = $widget->{force_w} if exists $widget->{force_w};
3919 $h = $widget->{force_h} if exists $widget->{force_h};
3920
3921 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3922 || delete $widget->{force_realloc}) {
3923 $widget->{req_w} = $w;
3924 $widget->{req_h} = $h;
3925
3926 $self->{size_alloc}{$widget+0} = $widget;
3927
3928 if (my $parent = $widget->{parent}) {
3929 $self->{realloc}{$parent+0} = $parent
3930 unless $queue{$parent+0};
3931
3932 $parent->{force_size_alloc} = 1;
3933 $self->{size_alloc}{$parent+0} = $parent;
3934 }
3935 }
3936
3937 delete $self->{realloc}{$widget+0};
3938 }
3939 }
3940
3941 while (my $size_alloc = delete $self->{size_alloc}) {
3942 my @queue = sort { $b->{visible} <=> $a->{visible} }
3943 values %$size_alloc;
3944
3945 while () {
3142 my $widget = pop @queue || last; 3946 my $widget = pop @queue || last;
3143 3947
3144 $widget->{visible} or last; # do not resize invisible widgets 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3949
3175 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3177 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3178 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3180 3964
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966 $widget->{old_w} = $widget->{w};
3967 $widget->{old_h} = $widget->{h};
3182 3968
3183 $widget->{w} = $w; 3969 $widget->{w} = $w;
3184 $widget->{h} = $h; 3970 $widget->{h} = $h;
3185 3971
3186 $widget->emit (size_allocate => $w, $h, $changed); 3972 $widget->emit (size_allocate => $w, $h);
3973 }
3187 } 3974 }
3188 } 3975 }
3189 3976
3190 while ($self->{post_alloc_hook}) { 3977 while ($self->{post_alloc_hook}) {
3191 $_->() 3978 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3979 for values %{delete $self->{post_alloc_hook}};
3193 } 3980 }
3981
3194 3982
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3983 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3985 glClear GL_COLOR_BUFFER_BIT;
3198 3986
… …
3200 glLoadIdentity; 3988 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 3991 glLoadIdentity;
3204 3992
3993 {
3994 package CFPlus::UI::Base;
3995
3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h});
3998 }
3999
3205 $self->_draw; 4000 $self->_draw;
3206} 4001}
3207 4002
3208############################################################################# 4003#############################################################################
3209 4004
3210package CFClient::UI; 4005package CFPlus::UI;
3211 4006
3212$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3213$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3214 4009
32151 40101
3216 4011

Diff Legend

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