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

Diff Legend

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