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

Diff Legend

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