ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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