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.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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