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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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