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.164 by root, Mon Apr 24 06:57:39 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 (length $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_markup ($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->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 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
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 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
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 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};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 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
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
241sub set_max_size { 383sub set_max_size {
242 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
243 385
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 388}
247 389
248# return top left coordinates 390sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
251 392
252 $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 }
253} 404}
254 405
255# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
256sub coord2local { 407sub coord2local {
257 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
258 409
259 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 411}
262 412
263# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
264sub coord2global { 414sub coord2global {
265 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
266 416
267 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 418}
270 419
271sub focus_in { 420sub focus_in {
272 my ($self) = @_; 421 my ($self) = @_;
273 422
274 return if $FOCUS == $self; 423 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
276 425
277 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
278 427
279 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
280 429
281 $focus->update if $focus; 430 $focus->update if $focus;
282 $FOCUS->update; 431 $FOCUS->update;
283} 432}
284 433
… …
287 436
288 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
289 438
290 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
291 440
292 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
293 442
294 $focus->update if $focus; #? 443 $focus->update if $focus; #?
295}
296 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
297sub mouse_motion { } 449sub mouse_motion { 0 }
298sub button_up { } 450sub button_up { 0 }
299sub key_down { } 451sub key_down { 0 }
300sub key_up { } 452sub key_up { 0 }
301 453
302sub button_down { 454sub button_down {
303 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
304 456
305 $self->focus_in; 457 $self->focus_in;
306}
307 458
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
312sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
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 {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
313 535
314sub draw { 536sub draw {
315 my ($self) = @_; 537 my ($self) = @_;
316 538
317 return unless $self->{h} && $self->{w}; 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);
318 550
319 glPushMatrix; 551 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw;
322 glPopMatrix;
323 553
324 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
325 my ($x, $y) = @$self{qw(x y)};
326
327 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
328 glEnable GL_BLEND; 556 glEnable GL_BLEND;
329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
330 glBegin GL_QUADS; 558 glBegin GL_QUADS;
331 glVertex $x , $y;
332 glVertex $x + $self->{w}, $y;
333 glVertex $x + $self->{w}, $y + $self->{h};
334 glVertex $x , $y + $self->{h};
335 glEnd;
336 glDisable GL_BLEND;
337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 559 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
348 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
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;
349 glPopMatrix; 577 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
352} 583}
353 584
354sub _draw { 585sub _draw {
355 my ($self) = @_; 586 my ($self) = @_;
356 587
357 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
358} 589}
359 590
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 591sub DESTROY {
424 my ($self) = @_; 592 my ($self) = @_;
425 593
594 delete $WIDGET{$self+0};
426 #$self->deactivate; 595 #$self->deactivate;
427} 596}
428 597
429############################################################################# 598#############################################################################
430 599
… …
439 my $class = shift; 608 my $class = shift;
440 609
441 # range [value, low, high, page] 610 # range [value, low, high, page]
442 611
443 $class->SUPER::new ( 612 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
446 @_ 615 @_
447 ) 616 )
448} 617}
449 618
450sub _draw { 619sub _draw {
451 my ($self) = @_; 620 my ($self) = @_;
452 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
454 628
455 glEnable GL_BLEND; 629 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
458 632
459 glBegin GL_QUADS; 633 glBegin GL_QUADS;
460 glVertex 0 , 0; 634 glVertex 0 , 0;
461 glVertex 0 , $h; 635 glVertex 0 , $h;
462 glVertex $w, $h; 636 glVertex $w, $h;
463 glVertex $w, 0; 637 glVertex $w, 0;
464 glEnd; 638 glEnd;
465 639
466 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
467} 642}
468 643
469############################################################################# 644#############################################################################
470 645
471package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
478} 653}
479 654
480sub size_request { 655sub size_request {
481 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
482} 659}
483 660
484sub draw { } 661sub draw { }
485 662
486############################################################################# 663#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
491 668
492sub new { 669sub new {
493 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
494 671
495 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
496 673
497 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
498 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
499 682
500 $self 683 $self
501} 684}
502 685
503sub add { 686sub add {
504 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
505 688
506 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
507 691
508 use sort 'stable'; 692 use sort 'stable';
509 693
510 $self->{children} = [ 694 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
513 ]; 697 ];
514 698
515 $child->check_size; 699 $self->realloc;
700}
701
702sub children {
703 @{ $_[0]{children} }
516} 704}
517 705
518sub remove { 706sub remove {
519 my ($self, $child) = @_; 707 my ($self, $child) = @_;
520 708
521 delete $child->{parent}; 709 delete $child->{parent};
522 $child->hide; 710 $child->hide;
523 711
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 713
526 $self->check_size; 714 $self->realloc;
527 $self->update;
528} 715}
529 716
530sub clear { 717sub clear {
531 my ($self) = @_; 718 my ($self) = @_;
532 719
… …
535 722
536 for (@$children) { 723 for (@$children) {
537 delete $_->{parent}; 724 delete $_->{parent};
538 $_->hide; 725 $_->hide;
539 } 726 }
727
728 $self->realloc;
540} 729}
541 730
542sub find_widget { 731sub find_widget {
543 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
544 733
545 $x -= $self->{x}; 734 $x -= $self->{x};
546 $y -= $self->{y}; 735 $y -= $self->{y};
547 736
548 my $res; 737 my $res;
549 738
550 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
552 and return $res; 741 and return $res;
553 } 742 }
554 743
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
604 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
605} 794}
606 795
607############################################################################# 796#############################################################################
608 797
798# back-buffered drawing area
799
609package CFClient::UI::Window; 800package CFClient::UI::Window;
610 801
611our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
612 803
613use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
619} 810}
620 811
621sub update { 812sub update {
622 my ($self) = @_; 813 my ($self) = @_;
623 814
624 # we want to do this delayed... 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 816 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 817}
638 818
639sub size_allocate { 819sub size_allocate {
640 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
641 821
642 $self->child->configure (0, 0, $w, $h); 822 $self->SUPER::size_allocate ($w, $h);
823 $self->update;
824}
643 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
644 $self->render_chld; 846 $self->_render;
847 };
645} 848}
646 849
647sub _draw { 850sub _draw {
648 my ($self) = @_; 851 my ($self) = @_;
649 852
650 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
651 854
652 my $tex = $self->{texture} 855 my $tex = $self->{texture}
653 or return; 856 or return;
654 857
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
658 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;
659 861
660 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 863
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
664} 865}
665 866
666############################################################################# 867#############################################################################
667 868
668package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
669 870
670our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 872
698sub new { 873sub new {
699 my $class = shift; 874 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 976 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 977 slider => $slider,
704 border => 0.8, 978 %arg,
705 @_
706 ); 979 );
707 980
981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
983
708 $self 984 $self
709} 985}
710 986
711sub _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 {
712 my ($self) = @_; 1004 my ($self, $w, $h) = @_;
713 1005
714 my ($w, $h) = ($self->{w}, $self->{h}); 1006 $self->SUPER::size_allocate ($w, $h);
715 1007
716 glEnable GL_BLEND; 1008 my $child = $self->{vp}->child;
717 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]);
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 1010}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
734 1014
735############################################################################# 1015#############################################################################
736 1016
737package CFClient::UI::FancyFrame; 1017package CFClient::UI::Frame;
738 1018
739our @ISA = CFClient::UI::Bin::; 1019our @ISA = CFClient::UI::Bin::;
740 1020
741use CFClient::OpenGL; 1021use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1022
747sub new { 1023sub new {
748 my $class = shift; 1024 my $class = shift;
749 1025
750 # 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};
751 1075
752 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1079 border => 0.6,
756 can_events => 0, 1080 can_events => 1,
757 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
758 ); 1084 );
759 1085
760 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
761 align => 0, 1087 align => 0,
762 valign => 1, 1088 valign => 1,
763 text => $self->{title}, 1089 text => $title,
764 fontsize => 1; 1090 fontsize => $self->{border}
1091 if defined $title;
765 1092
766 $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};
767} 1101}
768 1102
769sub border { 1103sub border {
770 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
771} 1105}
772 1106
773sub size_request { 1107sub size_request {
774 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
775 1112
776 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
777 1114
778 ( 1115 (
779 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
782} 1119}
783 1120
784sub size_allocate { 1121sub size_allocate {
785 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
786 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
787 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
789 1134
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
793 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
794} 1136}
795 1137
796sub button_down { 1138sub button_down {
797 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
798 1140
1141 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 1142 my $border = $self->border;
800 1143
801 if ($x < $self->{w} && $x >= $self->{w} - $border 1144 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 1145 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 1146
1147 if ($lr & $td) {
1148 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1149 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 1150 my ($bw, $bh) = ($self->{w}, $self->{h});
806 1151
1152 my $mx = $x < $border;
1153 my $my = $y < $border;
1154
807 $self->{motion} = sub { 1155 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
809 1157
810 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 my $dx = $ev->{x} - $ox;
1159 my $dy = $ev->{y} - $oy;
811 1160
812 $self->{user_w} = $bw + $x - $ox; 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
814 $self->check_size; 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
815 }; 1166 };
816 1167
817 } elsif ($x >= 0 && $x < $self->{w} 1168 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
822 1171
823 $self->{motion} = sub { 1172 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
825 1174
826 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
827 1176
828 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
829 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
830 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
831 } 1185 1
832} 1186}
833 1187
834sub button_up { 1188sub button_up {
835 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
836 1190
837 delete $self->{motion}; 1191 !!delete $self->{motion}
838} 1192}
839 1193
840sub mouse_motion { 1194sub mouse_motion {
841 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
842 1196
843 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
844} 1200}
845 1201
846sub _draw { 1202sub _draw {
847 my ($self) = @_; 1203 my ($self) = @_;
848 1204
1205 my $child = $self->{children}[0];
1206
849 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
851 1209
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 1212
857 my $border = $self->border; 1213 my $border = $self->border;
858 1214
859 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
864 1220
865 my $bg = $tex[0]; 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} };
866 1223
867 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1225 # solve this better(?)
869 my $rep_y = $ch / $bg->{h}; 1226 $bg->{s} = $cw / $bg->{w};
870 1227 $bg->{t} = $ch / $bg->{h};
871 glColor @{ $self->{bg} };
872
873 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
877 1230
878 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1232
881 $self->{title}->draw if $self->{title};
882 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
883} 1239}
884 1240
885############################################################################# 1241#############################################################################
886 1242
887package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
895sub new { 1251sub new {
896 my $class = shift; 1252 my $class = shift;
897 1253
898 $class->SUPER::new ( 1254 $class->SUPER::new (
899 col_expand => [], 1255 col_expand => [],
900 @_ 1256 @_,
901 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
902} 1262}
903 1263
904sub add { 1264sub add {
905 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
906 1266
907 $child->set_parent ($self); 1267 $child->set_parent ($self);
908 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
909 1269
910 $child->check_size; 1270 $self->realloc;
911} 1271}
912 1272
913# 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?
914sub clear { 1274sub clear {
915 my ($self) = @_; 1275 my ($self) = @_;
916 1276
917 my $children = delete $self->{children}; 1277 my @children = $self->children;
1278 delete $self->{children};
918 1279
919 for (grep $_, map @$_, grep $_, @$children) { 1280 for (@children) {
920 delete $_->{parent}; 1281 delete $_->{parent};
921 $_->hide; 1282 $_->hide;
922 } 1283 }
923 1284
924 $self->update; 1285 $self->realloc;
925} 1286}
926 1287
927sub get_wh { 1288sub get_wh {
928 my ($self) = @_; 1289 my ($self) = @_;
929 1290
… …
960sub size_allocate { 1321sub size_allocate {
961 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
962 1323
963 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
964 1325
965 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
966 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
967 1328
968 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
969 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
970 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
971 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1025 } 1386 }
1026} 1387}
1027 1388
1028############################################################################# 1389#############################################################################
1029 1390
1030package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1031
1032# TODO: wrap into common Box base class
1033 1392
1034our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1035 1394
1036sub size_request { 1395sub size_request {
1037 my ($self) = @_; 1396 my ($self) = @_;
1038 1397
1039 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1040 1399 ? (
1041 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1042 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1043 (List::Util::max map $_->[1], @alloc), 1402 )
1044 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1045} 1407}
1046 1408
1047sub size_allocate { 1409sub size_allocate {
1048 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1049 1411
1050 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1051
1052 my $children = $self->{children}; 1413 my $children = $self->{children};
1053 1414
1054 my @h = map $_->{req_w}, @$children; 1415 my @req;
1055 1416
1056 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1057 1418 @req = ($space / (@$children || 1)) x @$children;
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } 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 {
1062 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1063 $exp ||= 1;
1064 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1065 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1066 my $child = $children->[$_];
1067
1068 my $alloc_h = $h[$_];
1069 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1070 $h[$_] = $alloc_h;
1071 } 1433 }
1072 } 1434 }
1073 1435
1074 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1075 1437
1076 my $y = 0; 1438 my $pos = 0;
1077 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1078 my $child = $children->[$_];
1079 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1080 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1081 1442
1082 $y += $h; 1443 $pos += $alloc;
1083 } 1444 }
1084 1445
1085 1 1446 1
1086} 1447}
1087 1448
1088############################################################################# 1449#############################################################################
1089 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
1090package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1091 1467
1092# TODO: wrap into common Box base class
1093
1094our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1095 1469
1096sub size_request { 1470sub new {
1097 my ($self) = @_; 1471 my $class = shift;
1098 1472
1099 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1100 1474 vertical => 1,
1101 ( 1475 @_,
1102 (List::Util::max map $_->[0], @alloc),
1103 (List::Util::sum map $_->[1], @alloc),
1104 ) 1476 )
1105} 1477}
1106 1478
1107sub size_allocate {
1108 my ($self, $w, $h) = @_;
1109
1110 my $children = $self->{children};
1111
1112 my @h = map $_->{req_h}, @$children;
1113
1114 my $req_h = List::Util::sum @h;
1115
1116 if ($req_h > $h) {
1117 # ah well, not enough space
1118 $_ *= $h / $req_h for @h;
1119 } else {
1120 my $exp = List::Util::sum map $_->{expand}, @$children;
1121 $exp ||= 1;
1122
1123 for (0 .. $#$children) {
1124 my $child = $children->[$_];
1125
1126 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1127 }
1128 }
1129
1130 CFClient::UI::harmonize \@h;
1131
1132 my $y = 0;
1133 for (0 .. $#$children) {
1134 my $child = $children->[$_];
1135 my $h = $h[$_];
1136 $child->configure (0, $y, $w, $h);
1137
1138 $y += $h;
1139 }
1140
1141 1
1142}
1143
1144############################################################################# 1479#############################################################################
1145 1480
1146package CFClient::UI::Label; 1481package CFClient::UI::Label;
1147 1482
1148our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1149 1484
1150use CFClient::OpenGL; 1485use CFClient::OpenGL;
1151 1486
1152sub new { 1487sub new {
1153 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1154 1489
1155 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1491 fg => [1, 1, 1],
1492 #bg => none
1493 #active_bg => none
1157 #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),
1158 fontsize => 1, 1500 fontsize => 1,
1159 text => "",
1160 align => -1, 1501 align => -1,
1161 valign => -1, 1502 valign => -1,
1162 padding => 2, 1503 padding_x => 2,
1163 layout => new CFClient::Layout, 1504 padding_y => 2,
1164 can_events => 0, 1505 can_events => 0,
1165 %arg 1506 %arg
1166 ); 1507 );
1167 1508
1168 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1510 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1511 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1512 $self->{template} = $layout;
1172 } 1513 }
1173 1514
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1175 $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 }
1176 1520
1177 $self 1521 $self
1178} 1522}
1179 1523
1180sub escape { 1524sub escape($) {
1181 local $_ = $_[1]; 1525 local $_ = $_[0];
1182 1526
1183 s/&/&amp;/g; 1527 s/&/&amp;/g;
1184 s/>/&gt;/g; 1528 s/>/&gt;/g;
1185 s/</&lt;/g; 1529 s/</&lt;/g;
1186 1530
1187 $_[1] 1531 $_
1532}
1533
1534sub update {
1535 my ($self) = @_;
1536
1537 delete $self->{texture};
1538 $self->SUPER::update;
1188} 1539}
1189 1540
1190sub set_text { 1541sub set_text {
1191 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1192 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;
1193 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1194 1549
1195 delete $self->{texture}; 1550 $self->realloc;
1196 $self->check_size;
1197 $self->update; 1551 $self->update;
1198} 1552}
1199 1553
1200sub set_markup { 1554sub set_markup {
1201 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1202 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;
1203 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1204 1564
1205 delete $self->{texture}; 1565 $self->realloc;
1206 $self->check_size;
1207 $self->update; 1566 $self->update;
1208} 1567}
1209 1568
1210sub size_request { 1569sub size_request {
1211 my ($self) = @_; 1570 my ($self) = @_;
1212 1571
1213 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $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});
1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216 1577
1217 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1218 1579
1219 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
… …
1224 1585
1225 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1226 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1227 } 1588 }
1228 1589
1229 ( 1590 ($w, $h)
1230 $w + $self->{padding} * 2,
1231 $h + $self->{padding} * 2,
1232 )
1233} 1591}
1234 1592
1235sub size_allocate { 1593sub size_allocate {
1236 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1237 1595
1596 delete $self->{ox};
1597
1238 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1239} 1600}
1240 1601
1241sub set_fontsize { 1602sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1243 1604
1244 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1606 delete $self->{texture};
1246 $self->check_size; 1607
1247 $self->update; 1608 $self->realloc;
1248} 1609}
1249 1610
1250sub _draw { 1611sub _draw {
1251 my ($self) = @_; 1612 my ($self) = @_;
1252 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1253 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $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});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1257 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1258 }; 1625 };
1259 1626
1260 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1261 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
1262 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1639
1265 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1266 1642
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1280 1644
1281 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1646}
1284 1647
1285############################################################################# 1648#############################################################################
1286 1649
1287package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1300 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1301 can_hover => 1, 1664 can_hover => 1,
1302 can_focus => 1, 1665 can_focus => 1,
1303 valign => 0, 1666 valign => 0,
1304 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1305 @_ 1669 @_
1306 ) 1670 )
1307} 1671}
1308 1672
1309sub _set_text { 1673sub _set_text {
… …
1311 1675
1312 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1313 1677
1314 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1315 1679
1316 delete $self->{texture};
1317
1318 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1319 $self->{text} = $text; 1681 $self->{text} = $text;
1320 1682
1321 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1323 1685
1324 $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;
1325} 1697}
1326 1698
1327sub get_text { 1699sub get_text {
1328 $_[0]{text} 1700 $_[0]{text}
1329} 1701}
… …
1332 my ($self) = @_; 1704 my ($self) = @_;
1333 1705
1334 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1335 1707
1336 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1709}
1352 1710
1353sub key_down { 1711sub key_down {
1354 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1355 1713
… …
1357 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1359 1717
1360 my $text = $self->get_text; 1718 my $text = $self->get_text;
1361 1719
1362 if ($sym == 8) { 1720 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1733 $self->_emit ('escape');
1376 } elsif ($uni) { 1734 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1378 } 1738 }
1379 1739
1380 $self->_set_text ($text); 1740 $self->_set_text ($text);
1381 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1382} 1745}
1383 1746
1384sub focus_in { 1747sub focus_in {
1385 my ($self) = @_; 1748 my ($self) = @_;
1386 1749
… …
1401 utf8::encode $text; 1764 utf8::encode $text;
1402 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1403 1766
1404 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1405 $self->update; 1768 $self->update;
1769
1770 1
1406} 1771}
1407 1772
1408sub mouse_motion { 1773sub mouse_motion {
1409 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1410# 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
1411} 1778}
1412 1779
1413sub _draw { 1780sub _draw {
1414 my ($self) = @_; 1781 my ($self) = @_;
1415 1782
1416 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1417 1784
1418 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1419 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1420 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1421 } else { 1788 } else {
1422 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1423 } 1790 }
1424 1791
1425 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1427 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1428 glVertex 0 , 0; 1795 glVertex 0 , 0;
1429 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1430 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1431 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1462 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1463 1830
1464 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1465 1832
1466 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} = '';
1467 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1468 $self->update; 1839 $self->update;
1469 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
1470 } else { 1863 } else {
1471 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1472 } 1867 1
1473
1474} 1868}
1475 1869
1476############################################################################# 1870#############################################################################
1477 1871
1478package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1487 1881
1488sub new { 1882sub new {
1489 my $class = shift; 1883 my $class = shift;
1490 1884
1491 $class->SUPER::new ( 1885 $class->SUPER::new (
1492 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1493 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1496 can_hover => 1, 1890 can_hover => 1,
1497 align => 0, 1891 align => 0,
1498 valign => 0, 1892 valign => 0,
1499 can_events => 1, 1893 can_events => 1,
1500 @_ 1894 @_
1501 ) 1895 )
1502} 1896}
1503 1897
1898sub activate { }
1899
1504sub button_up { 1900sub button_up {
1505 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1506 1902
1903 $self->emit ("activate")
1507 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1508 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1509 $self->emit ("activate"); 1906
1510 } 1907 1
1511} 1908}
1512 1909
1513sub _draw { 1910sub _draw {
1514 my ($self) = @_; 1911 my ($self) = @_;
1515 1912
1516 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1517 1914
1518 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg};
1520 }
1521
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1527 1918
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1920
1530 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1922
1533 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1534} 1924}
1535 1925
1536############################################################################# 1926#############################################################################
… …
1547 1937
1548sub new { 1938sub new {
1549 my $class = shift; 1939 my $class = shift;
1550 1940
1551 $class->SUPER::new ( 1941 $class->SUPER::new (
1552 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1553 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1554 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],
1555 state => 0, 1948 state => 0,
1556 can_hover => 1, 1949 can_hover => 1,
1557 @_ 1950 @_
1558 ) 1951 )
1559} 1952}
1560 1953
1561sub size_request { 1954sub size_request {
1562 my ($self) = @_; 1955 my ($self) = @_;
1563 1956
1564 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1565} 1958}
1566 1959
1567sub button_down { 1960sub button_down {
1568 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1569 1962
1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1572 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1573 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1574 } 1971 1
1575} 1972}
1576 1973
1577sub _draw { 1974sub _draw {
1578 my ($self) = @_; 1975 my ($self) = @_;
1579 1976
1580 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1581 1978
1582 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1583 1980
1584 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;
1585 1984
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1986
1588 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1589 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1992}
1599 1993
1600############################################################################# 1994#############################################################################
1601 1995
1602package CFClient::UI::Image; 1996package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 2039 glTranslate 0, -$self->{w}, 0;
1646 2040
1647 ($w, $h) = ($h, $w); 2041 ($w, $h) = ($h, $w);
1648 } 2042 }
1649 2043
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 2044 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 2046
1655 $tex->draw_quad (0, 0, $w, $h); 2047 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 2048
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 2049 glDisable GL_TEXTURE_2D;
1659} 2050}
1660 2051
1661############################################################################# 2052#############################################################################
1662 2053
… …
1710} 2101}
1711 2102
1712sub set_max { 2103sub set_max {
1713 my ($self, $max) = @_; 2104 my ($self, $max) = @_;
1714 2105
2106 return if $self->{max_val} == $max;
2107
1715 $self->{max_val} = $max; 2108 $self->{max_val} = $max;
2109 $self->update;
1716} 2110}
1717 2111
1718sub set_value { 2112sub set_value {
1719 my ($self, $val, $max) = @_; 2113 my ($self, $val, $max) = @_;
1720 2114
1721 $self->set_max ($max) 2115 $self->set_max ($max)
1722 if defined $max; 2116 if defined $max;
1723 2117
1724 $max = $self->{max_val}; 2118 return if $self->{val} == $val;
2119
1725 $self->{val} = $val; 2120 $self->{val} = $val;
1726
1727 $self->update; 2121 $self->update;
1728} 2122}
1729 2123
1730sub _draw { 2124sub _draw {
1731 my ($self) = @_; 2125 my ($self) = @_;
… …
1749 2143
1750 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1752 2146
1753 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1754 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;
1755 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1757 2152
1758 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1759 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
1794 2189
1795sub new { 2190sub new {
1796 my ($class, %arg) = @_; 2191 my ($class, %arg) = @_;
1797 2192
1798 my $self = $class->SUPER::new ( 2193 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 2194 tooltip => $arg{type},
1800 can_hover => 1, 2195 can_hover => 1,
2196 can_events => 1,
1801 %arg, 2197 %arg,
1802 ); 2198 );
1803 2199
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2200 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2201 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 2209
1814 $self->{value}->set_fontsize ($fsize); 2210 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 2211 $self->{max} ->set_fontsize ($fsize);
1816} 2212}
1817 2213
2214sub set_max {
2215 my ($self, $max) = @_;
2216
2217 $self->{gauge}->set_max ($max);
2218 $self->{max}->set_text ($max);
2219}
2220
1818sub set_value { 2221sub set_value {
1819 my ($self, $val, $max) = @_; 2222 my ($self, $val, $max) = @_;
1820 2223
1821 $self->set_max ($max) 2224 $self->set_max ($max)
1822 if defined $max; 2225 if defined $max;
1823 2226
1824 $self->{gauge}->set_value ($val, $max); 2227 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 2228 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 2229}
1834 2230
1835############################################################################# 2231#############################################################################
1836 2232
1837package CFClient::UI::Slider; 2233package CFClient::UI::Slider;
… …
1847 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
1848 2244
1849sub new { 2245sub new {
1850 my $class = shift; 2246 my $class = shift;
1851 2247
1852 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
1853 2249
1854 # TODO: 0-width page 2250 # TODO: 0-width page
1855 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
1856 # TODO: calculations are off 2252 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
1859 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],
1860 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
1861 req_w => 20, 2259 min_w => $::WIDTH / 80,
1862 req_h => 20, 2260 min_h => $::WIDTH / 80,
1863 vertical => 0, 2261 vertical => 0,
1864 can_hover => 1, 2262 can_hover => 1,
1865 inner_pad => 5, 2263 inner_pad => 0.02,
1866 @_ 2264 @_
1867 ); 2265 );
1868 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
1869 $self 2270 $self
1870} 2271}
1871 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
1872sub size_request { 2307sub size_request {
1873 my ($self) = @_; 2308 my ($self) = @_;
1874 2309
1875 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
1876 my $h = $self->{req_h};
1877
1878 $self->{vertical} ? ($h, $w) : ($w, $h)
1879} 2311}
1880 2312
1881sub button_down { 2313sub button_down {
1882 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
1883 2315
1884 $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
1885 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
1886} 2321}
1887 2322
1888sub mouse_motion { 2323sub mouse_motion {
1889 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
1890 2325
1891 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
1892 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
1893 2356
1894 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1895 2358
1896 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1897 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1898 2361
1899 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
1900 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
1901 $x = $lo if $x < $lo;
1902 $x = $hi - $page if $x > $hi - $page;
1903 $self->{range}[0] = $x;
1904 2364
1905 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
1906 $self->update; 2366 $self->{knob_w} = $knob_w;
1907 } 2367 }
1908}
1909
1910# the inner_* stuff is for generating a padding for the slider handle,
1911# so that the handle doesn't leave the texture. This calculation isn't 100%
1912# correct propably, but it does the job for now
1913sub _calc_inner_pad_px {
1914 my ($self, $w) = @_;
1915 ($w / 100) * $self->{inner_pad} # % to pixels
1916}
1917
1918sub _draw {
1919 my ($self) = @_;
1920 2368
1921 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
1922 2370
1923 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
1924 2372
1925 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
1926 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
1927 2375
2376 glTranslate 1, 0, 0;
1928 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
1929 glTranslate 0, -$self->{w}, 0;
1930
1931 ($w, $h) = ($h, $w);
1932 } 2378 }
1933 2379
1934 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1935 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1936 2382
1937 my ($value, $lo, $hi, $page) = @{$self->{range}};
1938
1939 $hi = $value + 1 if $lo == $hi;
1940
1941 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1942 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1943
1944 $page = int $page * $inner_w / ($hi - $lo);
1945 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1946
1947 $w -= $page;
1948 $page &= ~1;
1949 glTranslate $page * 0.5, 0, 0;
1950 $page ||= 2;
1951
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2385
1960 # draw background 2386 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1962 2388
1963 # draw handle 2389 # draw handle
1964 $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);
1965 2391
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
1968} 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 (@_) }
1969 2435
1970############################################################################# 2436#############################################################################
1971 2437
1972package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
1973 2439
… …
1982 fontsize => 1, 2448 fontsize => 1,
1983 can_events => 0, 2449 can_events => 0,
1984 #font => default_font 2450 #font => default_font
1985 @_, 2451 @_,
1986 2452
1987 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
1988 par => [], 2454 par => [],
1989 height => 0, 2455 height => 0,
1990 children => [ 2456 children => [
1991 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
1993 ], 2459 ],
1994 ); 2460 );
1995 2461
1996 $self->{children}[1]->connect (changed => sub { 2462 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2463
2000 $self 2464 $self
2001} 2465}
2002 2466
2003sub set_fontsize { 2467sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2468 my ($self, $fontsize) = @_;
2005 2469
2006 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2471 $self->reflow;
2008}
2009
2010sub text_height {
2011 my ($self, $text) = @_;
2012
2013 my $layout = $self->{layout};
2014
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w});
2017 $layout->set_text ($text);
2018
2019 ($layout->size)[1]
2020}
2021
2022sub reflow {
2023 my ($self) = @_;
2024
2025 $self->{need_reflow}++;
2026 $self->update;
2027} 2472}
2028 2473
2029sub size_allocate { 2474sub size_allocate {
2030 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2031 2476
… …
2036 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2037 2482
2038 $self->reflow; 2483 $self->reflow;
2039} 2484}
2040 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
2041sub add_paragraph { 2520sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2043 2522
2044 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2045 2524 my ($w, $h) = $self->text_size ($line);
2046 my $height = $self->text_height ($text);
2047
2048 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2049 2528
2050 push @{$self->{par}}, [$height, $color, $text];
2051
2052 $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]);
2053 $self->{children}[1]->update;
2054} 2530}
2055 2531
2056sub update { 2532sub update {
2057 my ($self) = @_; 2533 my ($self) = @_;
2058 2534
… …
2060 2536
2061 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2062 2538
2063 delete $self->{texture}; 2539 delete $self->{texture};
2064 2540
2065 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2066 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2545 my $height = 0;
2068 2546
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2070 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 }
2071 2562
2072 $self->{height} = $height; 2563 $self->{height} = $height;
2073 2564
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2075 2566
2076 delete $self->{texture}; 2567 delete $self->{texture};
2077 } 2568 }
2078 2569
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2080 glClearColor 0, 0, 0, 1; 2571 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2082 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
2083 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087
2088 my $top = int $self->{children}[1]{range}[0];
2089
2090 my $y0 = $top;
2091 my $y1 = $top + $self->{h};
2092
2093 my $y = 0;
2094
2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
2098 2588
2099 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2590 my $h = $par->[1];
2101 2591
2102 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]);
2103 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2104 2596
2105 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2598
2107 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;
2108 } 2601 }
2109 2602
2110 $y += $h; 2603 $y += $h;
2111 } 2604 }
2112 2605
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
2115 }; 2607 };
2116 }); 2608 });
2117} 2609}
2118 2610
2119sub _draw { 2611sub _draw {
2120 my ($self) = @_; 2612 my ($self) = @_;
2121 2613
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125 $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});
2126 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2127 }
2128 2619
2129 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2130 2621
2131} 2622}
2132 2623
… …
2180 2671
2181sub new { 2672sub new {
2182 my $class = shift; 2673 my $class = shift;
2183 2674
2184 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2185 state => 0, 2676 state => 0,
2186 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2187 @_ 2678 @_
2188 ); 2679 );
2189 2680
2190 if ($self->{state}) {
2191 $self->{state} = 0;
2192 $self->toggle_flopper;
2193 }
2194
2195 $self 2681 $self
2196} 2682}
2197 2683
2198sub toggle_flopper { 2684sub toggle_flopper {
2199 my ($self) = @_; 2685 my ($self) = @_;
2200 2686
2201 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2202 if ($self->{state} = !$self->{state}) {
2203 $CFClient::UI::ROOT->add ($self->{other});
2204 $self->{other}->move ($self->coord2global (0, $self->{h}));
2205 $self->emit ("open");
2206 } else {
2207 $CFClient::UI::ROOT->remove ($self->{other});
2208 $self->emit ("close");
2209 }
2210
2211 $self->emit (changed => $self->{state});
2212} 2688}
2213 2689
2214############################################################################# 2690#############################################################################
2215 2691
2216package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2226 @_, 2702 @_,
2227 can_events => 0, 2703 can_events => 0,
2228 ) 2704 )
2229} 2705}
2230 2706
2231sub set_markup { 2707sub set_tooltip_from {
2232 my ($self, $text) = @_; 2708 my ($self, $widget) = @_;
2233 2709
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2710 my $tooltip = $widget->{tooltip};
2235 $self->{label}->set_markup ($text); 2711
2236 $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 );
2237} 2727}
2238 2728
2239sub size_request { 2729sub size_request {
2240 my ($self) = @_; 2730 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2731
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2733
2246 ($w + 4, $h + 4) 2734 ($w + 4, $h + 4)
2247} 2735}
… …
2250 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2251 2739
2252 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2253} 2741}
2254 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
2255sub _draw { 2761sub _draw {
2256 my ($self) = @_; 2762 my ($self) = @_;
2257 2763
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2764 glTranslate 0.375, 0.375;
2260 2765
2261 my ($w, $h) = @$self{qw(w h)}; 2766 my ($w, $h) = @$self{qw(w h)};
2262 2767
2263 glColor 1, 0.8, 0.4; 2768 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2779 glVertex 0 , $h;
2275 glVertex $w, $h; 2780 glVertex $w, $h;
2276 glVertex $w, 0; 2781 glVertex $w, 0;
2277 glEnd; 2782 glEnd;
2278 2783
2279 glPopMatrix; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2280 2785
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2283} 2787}
2284 2788
2285############################################################################# 2789#############################################################################
2286 2790
… …
2291use CFClient::OpenGL; 2795use CFClient::OpenGL;
2292 2796
2293sub new { 2797sub new {
2294 my $class = shift; 2798 my $class = shift;
2295 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
2296 $class->SUPER::new ( 3072 $class->SUPER::new (
2297 aspect => 1, 3073 fontsize => 0.8,
2298 @_, 3074 @_,
2299 ) 3075 )
2300} 3076}
2301 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
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
3487}
3488
2302sub size_request { 3489sub size_request {
2303 (32, 8)
2304}
2305
2306sub draw {
2307 my ($self) = @_; 3490 my ($self) = @_;
2308 3491
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3492 ($self->{w}, $self->{h})
2310
2311 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 }
2321} 3493}
2322 3494
2323############################################################################# 3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
2324 3497
2325package CFClient::UI::Root; 3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
2326 3502
2327our @ISA = CFClient::UI::Container::; 3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
2328 3505
2329use CFClient::OpenGL; 3506 int $coord + 0.5
2330
2331sub check_size {
2332 my ($self) = @_;
2333
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2335} 3507}
2336 3508
2337sub size_request { 3509sub size_allocate {
2338 ($::WIDTH, $::HEIGHT)
2339}
2340
2341sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2343 3511
2344 $self->SUPER::configure ($x, $y, $w, $h);
2345
2346 for my $child (@{$self->{children}}) { 3512 for my $child ($self->children) {
2347 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)};
2348 3514
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3515 $X = $child->{force_x} if exists $child->{force_x};
2350 $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
2351 $child->configure ($X, $Y, $W,$H); 3521 $child->configure ($X, $Y, $W, $H);
2352 } 3522 }
2353} 3523}
2354 3524
2355sub _topleft { 3525sub coord2local {
2356 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
2357 3527
2358 ($x, $y) 3528 ($x, $y)
2359} 3529}
2360 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
2361sub update { 3537sub update {
2362 my ($self) = @_; 3538 my ($self) = @_;
2363 3539
2364 $self->check_size; 3540 $::WANT_REFRESH++;
2365 ::refresh ();
2366} 3541}
2367 3542
2368sub add { 3543sub add {
2369 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
2370 3545
2371 # integerize window positions 3546 $_->{is_toplevel} = 1
2372 $child->{x} = int $child->{x}; 3547 for @children;
2373 $child->{y} = int $child->{y};
2374 3548
2375 $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 }
2376} 3565}
2377 3566
2378sub on_refresh { 3567sub on_refresh {
2379 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2380 3569
2381 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
2382} 3571}
2383 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
2384sub draw { 3579sub draw {
2385 my ($self) = @_; 3580 my ($self) = @_;
2386 3581
2387 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
2389 } 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
2390 3675
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2394 3679
2395 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2396 glLoadIdentity; 3681 glLoadIdentity;
2397 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2398 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2399 glLoadIdentity; 3684 glLoadIdentity;
2400 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
2401 $self->_draw; 3693 $self->_draw;
2402} 3694}
2403 3695
2404############################################################################# 3696#############################################################################
2405 3697
2406package CFClient::UI; 3698package CFClient::UI;
2407 3699
2408$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip; 3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2410 3702
24111 37031
2412 3704

Diff Legend

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