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.165 by root, Mon Apr 24 08:22:22 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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