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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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