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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.313 by root, Sat Jun 24 00:24:09 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 my $focus = $FOCUS; $FOCUS = $self;
278 429
279 $self->emit (focus_in => $focus);
280
281 $focus->update if $focus; 430 $focus->update if $focus;
282 $FOCUS->update; 431 $FOCUS->update;
283}
284 432
433 0
434}
435
285sub focus_out { 436sub invoke_focus_out {
286 my ($self) = @_; 437 my ($self) = @_;
287 438
288 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
289 440
290 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
291 442
292 $self->emit (focus_out => $focus);
293
294 $focus->update if $focus; #? 443 $focus->update if $focus; #?
295}
296 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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 ( 674 my $self = $class->SUPER::new (
498 children => [], 675 children => [],
499 can_events => 0, 676 can_events => 0,
500 %arg, 677 %arg,
501 ); 678 );
679
502 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
503 682
504 $self 683 $self
505} 684}
506 685
507sub add { 686sub add {
508 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
509 688
510 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
511 691
512 use sort 'stable'; 692 use sort 'stable';
513 693
514 $self->{children} = [ 694 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
517 ]; 697 ];
518 698
519 $child->check_size; 699 $self->realloc;
700}
701
702sub children {
703 @{ $_[0]{children} }
520} 704}
521 705
522sub remove { 706sub remove {
523 my ($self, $child) = @_; 707 my ($self, $child) = @_;
524 708
525 delete $child->{parent}; 709 delete $child->{parent};
526 $child->hide; 710 $child->hide;
527 711
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 713
530 $self->check_size; 714 $self->realloc;
531 $self->update;
532} 715}
533 716
534sub clear { 717sub clear {
535 my ($self) = @_; 718 my ($self) = @_;
536 719
… …
539 722
540 for (@$children) { 723 for (@$children) {
541 delete $_->{parent}; 724 delete $_->{parent};
542 $_->hide; 725 $_->hide;
543 } 726 }
727
728 $self->realloc;
544} 729}
545 730
546sub find_widget { 731sub find_widget {
547 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
548 733
549 $x -= $self->{x}; 734 $x -= $self->{x};
550 $y -= $self->{y}; 735 $y -= $self->{y};
551 736
552 my $res; 737 my $res;
553 738
554 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
555 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
556 and return $res; 741 and return $res;
557 } 742 }
558 743
559 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
580} 765}
581 766
582sub add { 767sub add {
583 my ($self, $child) = @_; 768 my ($self, $child) = @_;
584 769
585 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
586
587 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
588} 772}
589 773
590sub remove { 774sub remove {
591 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
600 784
601sub size_request { 785sub size_request {
602 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
603} 787}
604 788
605sub size_allocate { 789sub invoke_size_allocate {
606 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
607 791
608 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
609} 795}
610 796
611############################################################################# 797#############################################################################
798
799# back-buffered drawing area
612 800
613package CFClient::UI::Window; 801package CFClient::UI::Window;
614 802
615our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
616 804
… …
623} 811}
624 812
625sub update { 813sub update {
626 my ($self) = @_; 814 my ($self) = @_;
627 815
628 # we want to do this delayed... 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 817 $self->SUPER::update;
631} 818}
632 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
633sub render_chld { 834sub render_child {
634 my ($self) = @_; 835 my ($self) = @_;
635 836
636 $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 {
637 glClearColor 0, 0, 0, 1; 838 glClearColor 0, 0, 0, 0;
638 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
639 $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;
640 }; 849 };
641} 850}
642 851
643sub size_allocate {
644 my ($self, $w, $h) = @_;
645
646 $self->child->configure (0, 0, $w, $h);
647
648 $self->render_chld;
649}
650
651sub _draw { 852sub _draw {
652 my ($self) = @_; 853 my ($self) = @_;
653 854
654 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
655 856
656 my $tex = $self->{texture} 857 my $tex = $self->{texture}
657 or return; 858 or return;
658 859
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
662 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;
663 863
664 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 865
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
668} 867}
669 868
670############################################################################# 869#############################################################################
671 870
672package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
673 872
674our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 874
702sub new { 875sub new {
703 my $class = shift; 876 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 980 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 981 slider => $slider,
708 border => 0.8, 982 %arg,
709 @_
710 ); 983 );
711 984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
712 $self 988 $self
713} 989}
714 990
715sub _draw { 991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub invoke_size_allocate {
716 my ($self) = @_; 1008 my ($self, $w, $h) = @_;
717 1009
718 my ($w, $h) = ($self->{w}, $self->{h}); 1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
719 1012
720 glEnable GL_BLEND; 1013 $self->SUPER::invoke_size_allocate ($w, $h)
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737} 1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
738 1018
739############################################################################# 1019#############################################################################
740 1020
741package CFClient::UI::FancyFrame; 1021package CFClient::UI::Frame;
742 1022
743our @ISA = CFClient::UI::Bin::; 1023our @ISA = CFClient::UI::Bin::;
744 1024
745use CFClient::OpenGL; 1025use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750 1026
751sub new { 1027sub new {
752 my $class = shift; 1028 my $class = shift;
753 1029
754 # TODO: user_x, user_y, overwrite moveto? 1030 $class->SUPER::new (
1031 bg => undef,
1032 @_,
1033 )
1034}
1035
1036sub _draw {
1037 my ($self) = @_;
1038
1039 if ($self->{bg}) {
1040 my ($w, $h) = @$self{qw(w h)};
1041
1042 glEnable GL_BLEND;
1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044 glColor_premultiply @{ $self->{bg} };
1045
1046 glBegin GL_QUADS;
1047 glVertex 0 , 0;
1048 glVertex 0 , $h;
1049 glVertex $w, $h;
1050 glVertex $w, 0;
1051 glEnd;
1052
1053 glDisable GL_BLEND;
1054 }
1055
1056 $self->SUPER::_draw;
1057}
1058
1059#############################################################################
1060
1061package CFClient::UI::FancyFrame;
1062
1063our @ISA = CFClient::UI::Bin::;
1064
1065use CFClient::OpenGL;
1066
1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074
1075sub new {
1076 my ($class, %arg) = @_;
755 1077
756 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1081 border => 0.6,
760 can_events => 1, 1082 can_events => 1,
761 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
762 ); 1086 );
763 1087
764 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
765 align => 0, 1089 align => 0,
766 valign => 1, 1090 valign => 1,
767 text => $self->{title}, 1091 text => $self->{title},
768 fontsize => 1; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
769 1103
770 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
771} 1113}
772 1114
773sub border { 1115sub border {
774 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
775} 1117}
776 1118
777sub size_request { 1119sub size_request {
778 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
779 1127
780 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
781 1129
782 ( 1130 (
783 $w + $self->border * 2, 1131 $w + $self->border * 2,
784 $h + $self->border * 2, 1132 $h + $self->border * 2,
785 ) 1133 )
786} 1134}
787 1135
788sub size_allocate { 1136sub invoke_size_allocate {
789 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
790 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
791 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
793 1149
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
798}
799 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
800sub button_down { 1158sub invoke_button_down {
801 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
802 1160
1161 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1162 my $border = $self->border;
804 1163
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1164 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1165 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1166
1167 if ($lr & $td) {
1168 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1170 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1171
1172 my $mx = $x < $border;
1173 my $my = $y < $border;
1174
811 $self->{motion} = sub { 1175 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
813 1177
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 my $dx = $ev->{x} - $ox;
1179 my $dy = $ev->{y} - $oy;
815 1180
816 $self->{user_w} = $bw + $x - $ox; 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818 $self->check_size; 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1185 $self->realloc;
819 }; 1186 };
820 1187
821 } elsif ($x >= 0 && $x < $self->{w} 1188 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
826 1191
827 $self->{motion} = sub { 1192 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
829 1194
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
831 1196
832 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
834 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
835 } 1205 1
836} 1206}
837 1207
838sub button_up { 1208sub invoke_button_up {
839 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
840 1210
841 delete $self->{motion}; 1211 ! ! delete $self->{motion}
842} 1212}
843 1213
844sub mouse_motion { 1214sub invoke_mouse_motion {
845 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
846 1216
847 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
848} 1220}
849 1221
850sub _draw { 1222sub _draw {
851 my ($self) = @_; 1223 my ($self) = @_;
852 1224
1225 my $child = $self->{children}[0];
1226
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
855 1229
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1232
861 my $border = $self->border; 1233 my $border = $self->border;
862 1234
863 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1240
869 my $bg = $tex[0]; 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} };
870 1243
871 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1245 # solve this better(?)
873 my $rep_y = $ch / $bg->{h}; 1246 $bg->{s} = $cw / $bg->{w};
874 1247 $bg->{t} = $ch / $bg->{h};
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1249 }
881 1250
882 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1252
885 $self->{title}->draw if $self->{title};
886 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
887} 1264}
888 1265
889############################################################################# 1266#############################################################################
890 1267
891package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
899sub new { 1276sub new {
900 my $class = shift; 1277 my $class = shift;
901 1278
902 $class->SUPER::new ( 1279 $class->SUPER::new (
903 col_expand => [], 1280 col_expand => [],
904 @_ 1281 @_,
905 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1287}
907 1288
908sub add { 1289sub add {
909 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
910 1291
911 $child->set_parent ($self); 1292 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
913 1294
914 $child->check_size; 1295 $self->realloc;
915} 1296}
916 1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1302}
1303
917# TODO: move to container class maybe? send childs a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
918sub clear { 1305sub clear {
919 my ($self) = @_; 1306 my ($self) = @_;
920 1307
921 my $children = delete $self->{children}; 1308 my @children = $self->children;
1309 delete $self->{children};
922 1310
923 for (grep $_, map @$_, grep $_, @$children) { 1311 for (@children) {
924 delete $_->{parent}; 1312 delete $_->{parent};
925 $_->hide; 1313 $_->hide;
926 } 1314 }
927 1315
928 $self->update; 1316 $self->realloc;
929} 1317}
930 1318
931sub get_wh { 1319sub get_wh {
932 my ($self) = @_; 1320 my ($self) = @_;
933 1321
… …
959 (sum @$ws), 1347 (sum @$ws),
960 (sum @$hs), 1348 (sum @$hs),
961 ) 1349 )
962} 1350}
963 1351
964sub size_allocate { 1352sub invoke_size_allocate {
965 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
966 1354
967 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
968 1356
969 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
971 1359
972 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1001 } 1389 }
1002 1390
1003 $y += $row_h; 1391 $y += $row_h;
1004 } 1392 }
1005 1393
1394 1
1006} 1395}
1007 1396
1008sub find_widget { 1397sub find_widget {
1009 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1010 1399
… …
1029 } 1418 }
1030} 1419}
1031 1420
1032############################################################################# 1421#############################################################################
1033 1422
1423package CFClient::UI::Box;
1424
1425our @ISA = CFClient::UI::Container::;
1426
1427sub size_request {
1428 my ($self) = @_;
1429
1430 $self->{vertical}
1431 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1434 )
1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1439}
1440
1441sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_;
1443
1444 my $space = $self->{vertical} ? $h : $w;
1445 my @children = $self->visible_children;
1446
1447 my @req;
1448
1449 if ($self->{homogeneous}) {
1450 @req = ($space / (@children || 1)) x @children;
1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children;
1465 }
1466 }
1467
1468 CFClient::UI::harmonize \@req;
1469
1470 my $pos = 0;
1471 for (0 .. $#children) {
1472 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474
1475 $pos += $alloc;
1476 }
1477
1478 1
1479}
1480
1481#############################################################################
1482
1034package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1035 1484
1036# TODO: wrap into common Box base class
1037
1038our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1039 1486
1040sub size_request { 1487sub new {
1041 my ($self) = @_; 1488 my $class = shift;
1042 1489
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1044 1491 vertical => 0,
1045 ( 1492 @_,
1046 (List::Util::sum map $_->[0], @alloc),
1047 (List::Util::max map $_->[1], @alloc),
1048 ) 1493 )
1049} 1494}
1050 1495
1051sub size_allocate {
1052 my ($self, $w, $h) = @_;
1053
1054 ($h, $w) = ($w, $h);
1055
1056 my $children = $self->{children};
1057
1058 my @h = map $_->{req_w}, @$children;
1059
1060 my $req_h = List::Util::sum @h;
1061
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } else {
1066 my $exp = List::Util::sum map $_->{expand}, @$children;
1067 $exp ||= 1;
1068
1069 for (0 .. $#$children) {
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
1075 }
1076 }
1077
1078 CFClient::UI::harmonize \@h;
1079
1080 my $y = 0;
1081 for (0 .. $#$children) {
1082 my $child = $children->[$_];
1083 my $h = $h[$_];
1084 $child->configure ($y, 0, $h, $w);
1085
1086 $y += $h;
1087 }
1088
1089 1
1090}
1091
1092############################################################################# 1496#############################################################################
1093 1497
1094package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1095 1499
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1099 1501
1100sub size_request { 1502sub new {
1101 my ($self) = @_; 1503 my $class = shift;
1102 1504
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1104 1506 vertical => 1,
1105 ( 1507 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1508 )
1109} 1509}
1110 1510
1111sub size_allocate {
1112 my ($self, $w, $h) = @_;
1113
1114 my $children = $self->{children};
1115
1116 my @h = map $_->{req_h}, @$children;
1117
1118 my $req_h = List::Util::sum @h;
1119
1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
1125 $exp ||= 1;
1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131 }
1132 }
1133
1134 CFClient::UI::harmonize \@h;
1135
1136 my $y = 0;
1137 for (0 .. $#$children) {
1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
1141
1142 $y += $h;
1143 }
1144
1145 1
1146}
1147
1148############################################################################# 1511#############################################################################
1149 1512
1150package CFClient::UI::Label; 1513package CFClient::UI::Label;
1151 1514
1152our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1153 1516
1154use CFClient::OpenGL; 1517use CFClient::OpenGL;
1155 1518
1156sub new { 1519sub new {
1157 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1158 1521
1159 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1161 #font => default_font 1526 #font => default_font
1527 #text => initial text
1528 #markup => initial narkup
1529 #max_w => maximum pixel width
1530 ellipsise => 3, # end
1531 layout => (new CFClient::Layout),
1162 fontsize => 1, 1532 fontsize => 1,
1163 text => "",
1164 align => -1, 1533 align => -1,
1165 valign => -1, 1534 valign => -1,
1166 padding => 2, 1535 padding_x => 2,
1167 layout => new CFClient::Layout, 1536 padding_y => 2,
1168 can_events => 0, 1537 can_events => 0,
1169 %arg 1538 %arg
1170 ); 1539 );
1171 1540
1172 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1542 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1543 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1544 $self->{template} = $layout;
1176 } 1545 }
1177 1546
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1547 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1548 $self->set_markup (delete $self->{markup});
1549 } else {
1550 $self->set_text (delete $self->{text});
1551 }
1180 1552
1181 $self 1553 $self
1182} 1554}
1183 1555
1184sub escape { 1556sub escape($) {
1185 local $_ = $_[1]; 1557 local $_ = $_[0];
1186 1558
1187 s/&/&amp;/g; 1559 s/&/&amp;/g;
1188 s/>/&gt;/g; 1560 s/>/&gt;/g;
1189 s/</&lt;/g; 1561 s/</&lt;/g;
1190 1562
1191 $_[1] 1563 $_
1564}
1565
1566sub update {
1567 my ($self) = @_;
1568
1569 delete $self->{texture};
1570 $self->SUPER::update;
1571}
1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1192} 1578}
1193 1579
1194sub set_text { 1580sub set_text {
1195 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1196 1582
1583 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text";
1585
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1198 1588
1199 delete $self->{texture}; 1589 delete $self->{size_req};
1200 $self->check_size; 1590 $self->realloc;
1201 $self->update; 1591 $self->update;
1202} 1592}
1203 1593
1204sub set_markup { 1594sub set_markup {
1205 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1206 1596
1597 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup";
1599
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1208 1604
1209 delete $self->{texture}; 1605 delete $self->{size_req};
1210 $self->check_size; 1606 $self->realloc;
1211 $self->update; 1607 $self->update;
1212} 1608}
1213 1609
1214sub size_request { 1610sub size_request {
1215 my ($self) = @_; 1611 my ($self) = @_;
1216 1612
1613 $self->{size_req} ||= do {
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1619
1221 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1222 1621
1223 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226 1625
1227 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1228 1627
1229 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1231 } 1633 };
1232 1634
1233 ( 1635 @{ $self->{size_req} }
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237} 1636}
1238 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1239sub size_allocate { 1642sub invoke_size_allocate {
1240 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1241 1644
1645 delete $self->{ox};
1646
1242 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1243} 1651}
1244 1652
1245sub set_fontsize { 1653sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1247 1655
1248 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1657 delete $self->{texture};
1250 $self->check_size; 1658
1251 $self->update; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1252} 1668}
1253 1669
1254sub _draw { 1670sub _draw {
1255 my ($self) = @_; 1671 my ($self) = @_;
1256 1672
1673 $self->SUPER::_draw; # draw background, if applicable
1674
1257 my $tex = $self->{texture} ||= do { 1675 my $tex = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1677 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682
1261 new_from_layout CFClient::Texture $self->{layout} 1683 new_from_layout CFClient::Texture $self->{layout}
1262 }; 1684 };
1263 1685
1264 glEnable GL_BLEND; 1686 unless (exists $self->{ox}) {
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5);
1690
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5);
1694 };
1695
1266 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1700
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1269 glColor @{$self->{fg}}; 1708 }
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy});
1284 1709
1285 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1711}
1288 1712
1289############################################################################# 1713#############################################################################
1290 1714
1291package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1728 active_fg => [0, 0, 0],
1305 can_hover => 1, 1729 can_hover => 1,
1306 can_focus => 1, 1730 can_focus => 1,
1307 valign => 0, 1731 valign => 0,
1308 can_events => 1, 1732 can_events => 1,
1733 #text => ...
1734 #hidden => "*",
1309 @_ 1735 @_
1310 ) 1736 )
1311} 1737}
1312 1738
1313sub _set_text { 1739sub _set_text {
… …
1315 1741
1316 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1317 1743
1318 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1319 1745
1320 delete $self->{texture};
1321
1322 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1323 $self->{text} = $text; 1747 $self->{text} = $text;
1324 1748
1325 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1327 1752
1328 $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);
1329} 1764}
1330 1765
1331sub get_text { 1766sub get_text {
1332 $_[0]{text} 1767 $_[0]{text}
1333} 1768}
… …
1338 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1339 1774
1340 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1341} 1776}
1342 1777
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355}
1356
1357sub key_down { 1778sub invoke_key_down {
1358 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1359 1780
1360 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1361 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
1363 1784
1364 my $text = $self->get_text; 1785 my $text = $self->get_text;
1365 1786
1366 if ($sym == 8) { 1787 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1789 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1790 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1791 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1792 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1793 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1794 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1799 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1800 $self->emit ('escape');
1380 } elsif ($uni) { 1801 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1382 } 1805 }
1383 1806
1384 $self->_set_text ($text); 1807 $self->_set_text ($text);
1385 $self->update;
1386}
1387 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1388sub focus_in { 1814sub invoke_focus_in {
1389 my ($self) = @_; 1815 my ($self) = @_;
1390 1816
1391 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1392 1818
1393 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1394} 1820}
1395 1821
1396sub button_down { 1822sub invoke_button_down {
1397 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1398 1824
1399 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1400 1826
1401 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1402 1828
1403 # byte-index to char-index 1829 # byte-index to char-index
1404 my $text = $self->{text}; 1830 my $text = $self->{text};
1405 utf8::encode $text; 1831 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1407 1833
1408 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1409 $self->update; 1835 $self->update;
1836
1837 1
1410} 1838}
1411 1839
1412sub mouse_motion { 1840sub invoke_mouse_motion {
1413 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1414# 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
1415} 1845}
1416 1846
1417sub _draw { 1847sub _draw {
1418 my ($self) = @_; 1848 my ($self) = @_;
1419 1849
1420 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1421 1851
1422 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1423 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1424 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1425 } else { 1855 } else {
1426 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1427 } 1857 }
1428 1858
1429 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1431 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1432 glVertex 0 , 0; 1862 glVertex 0 , 0;
1433 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1434 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1435 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1460 1890
1461our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1462 1892
1463use CFClient::OpenGL; 1893use CFClient::OpenGL;
1464 1894
1465sub key_down { 1895sub invoke_key_down {
1466 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1467 1897
1468 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1469 1899
1470 if ($sym == 13) { 1900 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1473 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1475 $self->update; 1907 $self->update;
1476 1908
1477 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
1480 } 1912 }
1913 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1914 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1915 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1916 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1919 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1920
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1921 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1922 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1924
… …
1493 } else { 1927 } else {
1494 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1495 } 1929 }
1496 1930
1497 } else { 1931 } else {
1498 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1499 } 1935 1
1500
1501} 1936}
1502 1937
1503############################################################################# 1938#############################################################################
1504 1939
1505package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1514 1949
1515sub new { 1950sub new {
1516 my $class = shift; 1951 my $class = shift;
1517 1952
1518 $class->SUPER::new ( 1953 $class->SUPER::new (
1519 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1520 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1523 can_hover => 1, 1958 can_hover => 1,
1524 align => 0, 1959 align => 0,
1525 valign => 0, 1960 valign => 0,
1526 can_events => 1, 1961 can_events => 1,
1527 @_ 1962 @_
1528 ) 1963 )
1529} 1964}
1530 1965
1531sub button_up { 1966sub invoke_button_up {
1532 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1533 1968
1969 $self->emit ("activate")
1534 if ($x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1535 && $y >= 0 && $y < $self->{h}) { 1971 && $y >= 0 && $y < $self->{h};
1536 $self->emit ("activate"); 1972
1537 } 1973 1
1538} 1974}
1539 1975
1540sub _draw { 1976sub _draw {
1541 my ($self) = @_; 1977 my ($self) = @_;
1542 1978
1543 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1544 1980
1545 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg};
1547 }
1548
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1554 1984
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1986
1557 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1988
1560 $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
1561} 2026}
1562 2027
1563############################################################################# 2028#############################################################################
1564 2029
1565package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1574 2039
1575sub new { 2040sub new {
1576 my $class = shift; 2041 my $class = shift;
1577 2042
1578 $class->SUPER::new ( 2043 $class->SUPER::new (
1579 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1580 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1581 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],
1582 state => 0, 2050 state => 0,
1583 can_hover => 1, 2051 can_hover => 1,
1584 @_ 2052 @_
1585 ) 2053 )
1586} 2054}
1587 2055
1588sub size_request { 2056sub size_request {
1589 my ($self) = @_; 2057 my ($self) = @_;
1590 2058
1591 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1592} 2060}
1593 2061
1594sub button_down { 2062sub invoke_button_down {
1595 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1596 2064
1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1599 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1600 $self->emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1601 } 2073 1
1602} 2074}
1603 2075
1604sub _draw { 2076sub _draw {
1605 my ($self) = @_; 2077 my ($self) = @_;
1606 2078
1607 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1608 2080
1609 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1610 2082
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1612 2086
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 2088
1615 glEnable GL_BLEND; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
1616 glEnable GL_TEXTURE_2D; 2091 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 2092 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 2093 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 2094}
1626 2095
1627############################################################################# 2096#############################################################################
1628 2097
1629package CFClient::UI::Image; 2098package CFClient::UI::Image;
1630 2099
1631our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1632 2101
1633use CFClient::OpenGL; 2102use CFClient::OpenGL;
1634use Carp qw/confess/;
1635 2103
1636our %loaded_images; 2104our %texture_cache;
1637 2105
1638sub new { 2106sub new {
1639 my $class = shift; 2107 my $class = shift;
1640 2108
1641 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1642 2113
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1644 2116
1645 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1647 2119
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1649 2121
1650 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1653 2123
1654 $self 2124 $self
1655} 2125}
1656 2126
1657sub size_request { 2127sub size_request {
1658 my ($self) = @_; 2128 my ($self) = @_;
1659 2129
1660 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1661} 2131}
1662 2132
1663sub _draw { 2133sub _draw {
1664 my ($self) = @_; 2134 my ($self) = @_;
1665 2135
… …
1672 glTranslate 0, -$self->{w}, 0; 2142 glTranslate 0, -$self->{w}, 0;
1673 2143
1674 ($w, $h) = ($h, $w); 2144 ($w, $h) = ($h, $w);
1675 } 2145 }
1676 2146
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 2147 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 2149
1682 $tex->draw_quad (0, 0, $w, $h); 2150 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 2151
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 2152 glDisable GL_TEXTURE_2D;
1686} 2153}
1687 2154
1688############################################################################# 2155#############################################################################
1689 2156
… …
1737} 2204}
1738 2205
1739sub set_max { 2206sub set_max {
1740 my ($self, $max) = @_; 2207 my ($self, $max) = @_;
1741 2208
2209 return if $self->{max_val} == $max;
2210
1742 $self->{max_val} = $max; 2211 $self->{max_val} = $max;
2212 $self->update;
1743} 2213}
1744 2214
1745sub set_value { 2215sub set_value {
1746 my ($self, $val, $max) = @_; 2216 my ($self, $val, $max) = @_;
1747 2217
1748 $self->set_max ($max) 2218 $self->set_max ($max)
1749 if defined $max; 2219 if defined $max;
1750 2220
1751 $max = $self->{max_val}; 2221 return if $self->{val} == $val;
2222
1752 $self->{val} = $val; 2223 $self->{val} = $val;
1753
1754 $self->update; 2224 $self->update;
1755} 2225}
1756 2226
1757sub _draw { 2227sub _draw {
1758 my ($self) = @_; 2228 my ($self) = @_;
… …
1776 2246
1777 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1779 2249
1780 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784 2255
1785 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1786 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
1821 2292
1822sub new { 2293sub new {
1823 my ($class, %arg) = @_; 2294 my ($class, %arg) = @_;
1824 2295
1825 my $self = $class->SUPER::new ( 2296 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 2297 tooltip => $arg{type},
1827 can_hover => 1, 2298 can_hover => 1,
2299 can_events => 1,
1828 %arg, 2300 %arg,
1829 ); 2301 );
1830 2302
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 2312
1841 $self->{value}->set_fontsize ($fsize); 2313 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2314 $self->{max} ->set_fontsize ($fsize);
1843} 2315}
1844 2316
2317sub set_max {
2318 my ($self, $max) = @_;
2319
2320 $self->{gauge}->set_max ($max);
2321 $self->{max}->set_text ($max);
2322}
2323
1845sub set_value { 2324sub set_value {
1846 my ($self, $val, $max) = @_; 2325 my ($self, $val, $max) = @_;
1847 2326
1848 $self->set_max ($max) 2327 $self->set_max ($max)
1849 if defined $max; 2328 if defined $max;
1850 2329
1851 $self->{gauge}->set_value ($val, $max); 2330 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2331 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2332}
1861 2333
1862############################################################################# 2334#############################################################################
1863 2335
1864package CFClient::UI::Slider; 2336package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2346 qw(s1_slider.png s1_slider_bg.png);
1875 2347
1876sub new { 2348sub new {
1877 my $class = shift; 2349 my $class = shift;
1878 2350
1879 # range [value, low, high, page] 2351 # range [value, low, high, page, unit]
1880 2352
1881 # TODO: 0-width page 2353 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2354 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2355 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2359 bg => [0, 0, 0, 0.2],
2360 active_bg => [1, 1, 1, 0.5],
1887 range => [0, 0, 100, 10], 2361 range => [0, 0, 100, 10, 0],
1888 req_w => 20, 2362 min_w => $::WIDTH / 80,
1889 req_h => 20, 2363 min_h => $::WIDTH / 80,
1890 vertical => 0, 2364 vertical => 0,
1891 can_hover => 1, 2365 can_hover => 1,
1892 inner_pad => 5, 2366 inner_pad => 0.02,
1893 @_ 2367 @_
1894 ); 2368 );
1895 2369
2370 $self->set_value ($self->{range}[0]);
2371 $self->update;
2372
1896 $self 2373 $self
1897} 2374}
1898 2375
2376sub set_range {
2377 my ($self, $range) = @_;
2378
2379 ($range, $self->{range}) = ($self->{range}, $range);
2380
2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2385}
2386
2387sub set_value {
2388 my ($self, $value) = @_;
2389
2390 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2391
2392 $hi = $lo + 1 if $hi <= $lo;
2393
2394 $page = $hi - $lo if $page > $hi - $lo;
2395
2396 $value = $lo if $value < $lo;
2397 $value = $hi - $page if $value > $hi - $page;
2398
2399 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2400 if $unit;
2401
2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2403
2404 if ($value != $old_value) {
2405 $self->emit (changed => $value);
2406 $self->update;
2407 }
2408}
2409
1899sub size_request { 2410sub size_request {
1900 my ($self) = @_; 2411 my ($self) = @_;
1901 2412
1902 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
1903 my $h = $self->{req_h};
1904
1905 $self->{vertical} ? ($h, $w) : ($w, $h)
1906} 2414}
1907 2415
1908sub button_down { 2416sub invoke_button_down {
1909 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
1910 2418
1911 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2420
2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422
1912 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
1913} 2424}
1914 2425
1915sub mouse_motion { 2426sub invoke_mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
1917 2428
1918 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2431
2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2433
2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2435
2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2441 1
2442}
2443
2444sub update {
2445 my ($self) = @_;
2446
2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2455 $self->set_value ($self->{range}[0]);
2456
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2458 my $range = ($hi - $page - $lo) || 1e-100;
1920 2459
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2460 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922 2461
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2462 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2463 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925 2464
1926 $x -= $inner_pad_px; # substract the padding 2465 $value = ($value - $lo) / $range;
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2466 $value = $value * $self->{scale} + $self->{offset};
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2467
1932 $self->emit (changed => $x); 2468 $self->{knob_x} = $value - $knob_w * 0.5;
1933 $self->update; 2469 $self->{knob_w} = $knob_w;
1934 } 2470 }
1935}
1936
1937# the inner_* stuff is for generating a padding for the slider handle,
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943}
1944
1945sub _draw {
1946 my ($self) = @_;
1947 2471
1948 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
1949 2473
1950 my ($w, $h) = @$self{qw(w h)}; 2474 glScale $self->{w}, $self->{h};
1951 2475
1952 if ($self->{vertical}) { 2476 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2477 # draw a vertical slider like a rotated horizontal slider
1954 2478
2479 glTranslate 1, 0, 0;
1955 glRotate 90, 0, 0, 1; 2480 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2481 }
1960 2482
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2483 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2484 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2485
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2486 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2488
1987 # draw background 2489 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2490 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2491
1990 # draw handle 2492 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2493 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992 2494
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2495 glDisable GL_TEXTURE_2D;
1995} 2496}
1996 2497
1997############################################################################# 2498#############################################################################
1998 2499
2500package CFClient::UI::ValSlider;
2501
2502our @ISA = CFClient::UI::HBox::;
2503
2504sub new {
2505 my ($class, %arg) = @_;
2506
2507 my $range = delete $arg{range};
2508
2509 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift },
2513 from_value => sub { shift },
2514 %arg,
2515 );
2516
2517 $self->{slider}->connect (changed => sub {
2518 my ($self, $value) = @_;
2519 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2520 $self->{parent}->emit (changed => $value);
2521 });
2522
2523# $self->{entry}->connect (changed => sub {
2524# my ($self, $value) = @_;
2525# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2526# $self->{parent}->emit (changed => $value);
2527# });
2528
2529 $self->add ($self->{slider}, $self->{entry});
2530
2531 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2532
2533 $self
2534}
2535
2536sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) }
2538
2539#############################################################################
2540
1999package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2000 2542
2001our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2002 2544
2003use CFClient::OpenGL; 2545use CFClient::OpenGL;
2004 2546
… …
2006 my $class = shift; 2548 my $class = shift;
2007 2549
2008 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2009 fontsize => 1, 2551 fontsize => 1,
2010 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2011 #font => default_font 2554 #font => default_font
2012 @_, 2555 @_,
2013 2556
2014 layout => (new CFClient::Layout), 2557 layout => (new CFClient::Layout 1),
2015 par => [], 2558 par => [],
2016 height => 0, 2559 height => 0,
2017 children => [ 2560 children => [
2018 (new CFClient::UI::Empty expand => 1), 2561 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2562 (new CFClient::UI::Slider vertical => 1),
2020 ], 2563 ],
2021 ); 2564 );
2022 2565
2023 $self->{children}[1]->connect (changed => sub { 2566 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2567
2027 $self 2568 $self
2028} 2569}
2029 2570
2030sub set_fontsize { 2571sub set_fontsize {
… …
2032 2573
2033 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2034 $self->reflow; 2575 $self->reflow;
2035} 2576}
2036 2577
2037sub text_height { 2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2587sub invoke_size_allocate {
2588 my ($self, $w, $h) = @_;
2589
2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2592
2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597
2598 $self->reflow;
2599
2600 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2038 my ($self, $text) = @_; 2605 my ($self, $para) = @_;
2039 2606
2040 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2041 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2044 $layout->set_text ($text); 2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2045 2620 );
2046 ($layout->size)[1] 2621
2622 $layout
2047} 2623}
2048 2624
2049sub reflow { 2625sub reflow {
2050 my ($self) = @_; 2626 my ($self) = @_;
2051 2627
2052 $self->{need_reflow}++; 2628 $self->{need_reflow}++;
2053 $self->update; 2629 $self->update;
2054} 2630}
2055 2631
2056sub size_allocate { 2632sub set_offset {
2633 my ($self, $offset) = @_;
2634
2635 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset);
2637}
2638
2639sub clear {
2057 my ($self, $w, $h) = @_; 2640 my ($self) = @_;
2058 2641
2059 $self->SUPER::size_allocate ($w, $h); 2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2060 2644
2061 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2645 $self->{par} = [];
2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $self->{height} = 0;
2063 $self->{layout}->set_width ($self->{children}[0]{w}); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2064
2065 $self->reflow;
2066} 2648}
2067 2649
2068sub add_paragraph { 2650sub add_paragraph {
2069 my ($self, $color, $text) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2070 2652
2071 #TODO: intelligently "reformat" paragraph 2653 my ($text, @w) = ref $para ? @$para : $para;
2072 2654
2073 my $height = $self->text_height ($text); 2655 $para = {
2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 };
2074 2663
2075 $self->{height} += $height; 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2076 2666
2077 push @{$self->{par}}, [$height, $color, $text]; 2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2078 2670
2079 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2671sub scroll_to_bottom {
2080 $self->{children}[1]->update; 2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2081} 2676}
2082 2677
2083sub update { 2678sub update {
2084 my ($self) = @_; 2679 my ($self) = @_;
2085 2680
… …
2087 2682
2088 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2089 2684
2090 delete $self->{texture}; 2685 delete $self->{texture};
2091 2686
2092 $ROOT->on_refresh ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689
2093 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2691 my $height = 0;
2095 2692
2096 $height += $_->[0] = $self->text_height ($_->[2])
2097 for @{$self->{par}}; 2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2098 2705
2099 $self->{height} = $height; 2706 $self->{height} = $height;
2100 2707
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2102 2709
2103 delete $self->{texture}; 2710 delete $self->{texture};
2104 } 2711 }
2105 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2107 glClearColor 0, 0, 0, 1; 2718 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2109 2720
2721 my $top = int $self->{children}[1]{range}[0];
2722
2723 my $y0 = $top;
2724 my $y1 = $top + $H;
2725
2726 my $y = 0;
2727
2110 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114 2731
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125
2126 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2127 my $h = $par->[0]; 2733 my $h = $para->{h};
2128 2734
2129 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2130 $layout->set_text ($par->[2]);
2131 2736
2132 glColor @{ $par->[1] }; 2737 my $layout = $self->get_layout ($para);
2133 my ($W, $H) = $layout->size; 2738
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0;
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 glDisable GL_BLEND;
2748 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, ();
2750
2751 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0;
2753
2754 $_->draw;
2755 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 }
2135 } 2759 }
2136 2760
2137 $y += $h; 2761 $y += $h;
2138 } 2762 }
2139 2763
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2142 }; 2765 };
2143 }); 2766 });
2144} 2767}
2145 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2146sub _draw { 2778sub _draw {
2147 my ($self) = @_; 2779 my ($self) = @_;
2148 2780
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2783 glColor 0, 0, 0, 1;
2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2154 }
2155 2786
2156 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2157
2158} 2788}
2159 2789
2160############################################################################# 2790#############################################################################
2161 2791
2162package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2207 2837
2208sub new { 2838sub new {
2209 my $class = shift; 2839 my $class = shift;
2210 2840
2211 my $self = $class->SUPER::new ( 2841 my $self = $class->SUPER::new (
2212 state => 0, 2842 state => 0,
2213 connect_activate => \&toggle_flopper, 2843 on_activate => \&toggle_flopper,
2214 @_ 2844 @_
2215 ); 2845 );
2216 2846
2217 if ($self->{state}) {
2218 $self->{state} = 0;
2219 $self->toggle_flopper;
2220 }
2221
2222 $self 2847 $self
2223} 2848}
2224 2849
2225sub toggle_flopper { 2850sub toggle_flopper {
2226 my ($self) = @_; 2851 my ($self) = @_;
2227 2852
2228 # TODO: use animation 2853 $self->{other}->toggle_visibility;
2229 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open");
2233 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239} 2854}
2240 2855
2241############################################################################# 2856#############################################################################
2242 2857
2243package CFClient::UI::Tooltip; 2858package CFClient::UI::Tooltip;
… …
2253 @_, 2868 @_,
2254 can_events => 0, 2869 can_events => 0,
2255 ) 2870 )
2256} 2871}
2257 2872
2258sub set_markup { 2873sub set_tooltip_from {
2259 my ($self, $text) = @_; 2874 my ($self, $widget) = @_;
2260 2875
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2876 my $tooltip = $widget->{tooltip};
2262 $self->{label}->set_markup ($text); 2877
2263 $self->add ($self->{label}); 2878 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2881 . "req $widget->{req_w} $widget->{req_h}\n"
2882 . "visible $widget->{visible}";
2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2887
2888 $self->add (new CFClient::UI::Label
2889 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8,
2892 fg => [0, 0, 0, 1],
2893 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 );
2264} 2896}
2265 2897
2266sub size_request { 2898sub size_request {
2267 my ($self) = @_; 2899 my ($self) = @_;
2268 2900
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2902
2273 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2274} 2904}
2275 2905
2276sub size_allocate { 2906sub invoke_size_allocate {
2277 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2278 2908
2279 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2910}
2911
2912sub invoke_visibility_change {
2913 my ($self, $visible) = @_;
2914
2915 return unless $visible;
2916
2917 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner}
2919 or return;
2920
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w};
2925
2926 $self->move_abs ($x, $y);
2927 });
2280} 2928}
2281 2929
2282sub _draw { 2930sub _draw {
2283 my ($self) = @_; 2931 my ($self) = @_;
2284 2932
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2933 glTranslate 0.375, 0.375;
2287 2934
2288 my ($w, $h) = @$self{qw(w h)}; 2935 my ($w, $h) = @$self{qw(w h)};
2289 2936
2290 glColor 1, 0.8, 0.4; 2937 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2948 glVertex 0 , $h;
2302 glVertex $w, $h; 2949 glVertex $w, $h;
2303 glVertex $w, 0; 2950 glVertex $w, 0;
2304 glEnd; 2951 glEnd;
2305 2952
2306 glPopMatrix; 2953 glTranslate 2 - 0.375, 2 - 0.375;
2307 2954
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2955 $self->SUPER::_draw;
2310} 2956}
2311 2957
2312############################################################################# 2958#############################################################################
2313 2959
… …
2318use CFClient::OpenGL; 2964use CFClient::OpenGL;
2319 2965
2320sub new { 2966sub new {
2321 my $class = shift; 2967 my $class = shift;
2322 2968
2323 $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2324 aspect => 1, 2970 aspect => 1,
2971 can_events => 0,
2972 @_,
2973 );
2974
2975 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self);
2977
2978 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1,
2981 interval => $self->{animspeed},
2982 cb => sub {
2983 ++$widget->{frame};
2984 $widget->update;
2985 },
2986 );
2987 }
2988
2989 $self
2990}
2991
2992sub size_request {
2993 (32, 8)
2994}
2995
2996sub update {
2997 my ($self) = @_;
2998
2999 return unless $self->{visible};
3000
3001 $self->SUPER::update;
3002}
3003
3004sub _draw {
3005 my ($self) = @_;
3006
3007 return unless $::CONN;
3008
3009 my $face;
3010
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}];
3013
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3019
3020 if ($tex) {
3021 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1;
3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3025 glDisable GL_TEXTURE_2D;
3026 }
3027}
3028
3029sub destroy {
3030 my ($self) = @_;
3031
3032 $self->{timer}->cancel
3033 if $self->{timer};
3034
3035 $self->SUPER::destroy;
3036}
3037
3038#############################################################################
3039
3040package CFClient::UI::Buttonbar;
3041
3042our @ISA = CFClient::UI::HBox::;
3043
3044# TODO: should actualyl wrap buttons and other goodies.
3045
3046#############################################################################
3047
3048package CFClient::UI::Menu;
3049
3050our @ISA = CFClient::UI::FancyFrame::;
3051
3052use CFClient::OpenGL;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 items => [],
3059 z => 100,
3060 @_,
3061 );
3062
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
3064
3065 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item;
3067
3068 # handle various types of items, only text for now
3069 if (!ref $widget) {
3070 $widget = new CFClient::UI::Label
3071 can_hover => 1,
3072 can_events => 1,
3073 markup => $widget,
3074 tooltip => $tooltip
3075 }
3076
3077 $self->{item}{$widget} = $item;
3078
3079 $self->{vbox}->add ($widget);
3080 }
3081
3082 $self
3083}
3084
3085# popup given the event (must be a mouse button down event currently)
3086sub popup {
3087 my ($self, $ev) = @_;
3088
3089 $self->emit ("popdown");
3090
3091 # maybe save $GRAB? must be careful about events...
3092 $GRAB = $self;
3093 $self->{button} = $ev->{button};
3094
3095 $self->show;
3096 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3097}
3098
3099sub invoke_mouse_motion {
3100 my ($self, $ev, $x, $y) = @_;
3101
3102 # TODO: should use vbox->find_widget or so
3103 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3104 $self->{hover} = $self->{item}{$HOVER};
3105
3106 0
3107}
3108
3109sub invoke_button_up {
3110 my ($self, $ev, $x, $y) = @_;
3111
3112 if ($ev->{button} == $self->{button}) {
3113 undef $GRAB;
3114 $self->hide;
3115
3116 $self->emit ("popdown");
3117 $self->{hover}[1]->() if $self->{hover};
3118 } else {
3119 return 0
3120 }
3121
3122 1
3123}
3124
3125#############################################################################
3126
3127package CFClient::UI::Multiplexer;
3128
3129our @ISA = CFClient::UI::Container::;
3130
3131sub new {
3132 my $class = shift;
3133
3134 my $self = $class->SUPER::new (
3135 @_,
3136 );
3137
3138 $self->{current} = $self->{children}[0]
3139 if @{ $self->{children} };
3140
3141 $self
3142}
3143
3144sub add {
3145 my ($self, @widgets) = @_;
3146
3147 $self->SUPER::add (@widgets);
3148
3149 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} };
3151}
3152
3153sub set_current_page {
3154 my ($self, $page_or_widget) = @_;
3155
3156 my $widget = ref $page_or_widget
3157 ? $page_or_widget
3158 : $self->{children}[$page_or_widget];
3159
3160 $self->{current} = $widget;
3161 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3162
3163 $self->emit (page_changed => $self->{current});
3164
3165 $self->realloc;
3166}
3167
3168sub visible_children {
3169 $_[0]{current}
3170}
3171
3172sub size_request {
3173 my ($self) = @_;
3174
3175 $self->{current}->size_request
3176}
3177
3178sub invoke_size_allocate {
3179 my ($self, $w, $h) = @_;
3180
3181 $self->{current}->configure (0, 0, $w, $h);
3182
3183 1
3184}
3185
3186sub _draw {
3187 my ($self) = @_;
3188
3189 $self->{current}->draw;
3190}
3191
3192#############################################################################
3193
3194package CFClient::UI::Notebook;
3195
3196our @ISA = CFClient::UI::VBox::;
3197
3198sub new {
3199 my $class = shift;
3200
3201 my $self = $class->SUPER::new (
3202 buttonbar => (new CFClient::UI::Buttonbar),
3203 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3204 # filter => # will be put between multiplexer and $self
3205 @_,
3206 );
3207
3208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3209 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3210
3211 $self
3212}
3213
3214sub add {
3215 my ($self, $title, $widget, $tooltip) = @_;
3216
3217 Scalar::Util::weaken $self;
3218
3219 $self->{buttonbar}->add (new CFClient::UI::Button
3220 markup => $title,
3221 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) },
3223 );
3224
3225 $self->{multiplexer}->add ($widget);
3226}
3227
3228sub set_current_page {
3229 my ($self, $page) = @_;
3230
3231 $self->{multiplexer}->set_current_page ($page);
3232 $self->emit (page_changed => $self->{multiplexer}{current});
3233}
3234
3235#############################################################################
3236
3237package CFClient::UI::Combobox;
3238
3239use utf8;
3240
3241our @ISA = CFClient::UI::Button::;
3242
3243sub new {
3244 my $class = shift;
3245
3246 my $self = $class->SUPER::new (
3247 options => [], # [value, title, longdesc], ...
3248 value => undef,
3249 @_,
3250 );
3251
3252 $self->_set_value ($self->{value});
3253
3254 $self
3255}
3256
3257sub invoke_button_down {
3258 my ($self, $ev) = @_;
3259
3260 my @menu_items;
3261
3262 for (@{ $self->{options} }) {
3263 my ($value, $title, $tooltip) = @$_;
3264
3265 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266 }
3267
3268 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269}
3270
3271sub _set_value {
3272 my ($self, $value) = @_;
3273
3274 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3275 or return;
3276
3277 $self->{value} = $item->[0];
3278 $self->set_markup ("$item->[1] ⇓");
3279 $self->set_tooltip ($item->[2]);
3280}
3281
3282sub set_value {
3283 my ($self, $value) = @_;
3284
3285 return unless $self->{value} ne $value;
3286
3287 $self->_set_value ($value);
3288 $self->emit (changed => $value);
3289}
3290
3291#############################################################################
3292
3293package CFClient::UI::Statusbox;
3294
3295our @ISA = CFClient::UI::VBox::;
3296
3297sub new {
3298 my $class = shift;
3299
3300 my $self = $class->SUPER::new (
3301 fontsize => 0.8,
3302 @_,
3303 );
3304
3305 Scalar::Util::weaken (my $this = $self);
3306
3307 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308
3309 $self
3310}
3311
3312sub reorder {
3313 my ($self) = @_;
3314 my $NOW = Time::HiRes::time;
3315
3316 # freeze display when hovering over any label
3317 return if $CFClient::UI::TOOLTIP->{owner}
3318 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3319 values %{ $self->{item} };
3320
3321 while (my ($k, $v) = each %{ $self->{item} }) {
3322 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323 }
3324
3325 my @widgets;
3326
3327 my @items = sort {
3328 $a->{pri} <=> $b->{pri}
3329 or $b->{id} <=> $a->{id}
3330 } values %{ $self->{item} };
3331
3332 $self->{timer}->interval (1);
3333
3334 my $count = 10 + 1;
3335 for my $item (@items) {
3336 last unless --$count;
3337
3338 my $label = $item->{label} ||= do {
3339 # TODO: doesn't handle markup well (read as: at all)
3340 my $short = $item->{count} > 1
3341 ? "<b>$item->{count} ×</b> $item->{text}"
3342 : $item->{text};
3343
3344 for ($short) {
3345 s/^\s+//;
3346 s/\s+/ /g;
3347 }
3348
3349 new CFClient::UI::Label
3350 markup => $short,
3351 tooltip => $item->{tooltip},
3352 tooltip_font => $::FONT_PROP,
3353 tooltip_width => 0.67,
3354 fontsize => $item->{fontsize} || $self->{fontsize},
3355 max_w => $::WIDTH * 0.44,
3356 fg => [@{ $item->{fg} }],
3357 can_events => 1,
3358 can_hover => 1
3359 };
3360
3361 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3362 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3363 $label->update;
3364 $label->set_max_size (undef, $label->{req_h} * $diff)
3365 if $diff < 1;
3366 $self->{timer}->interval (1/30);
3367 } else {
3368 $label->{fg}[3] = $item->{fg}[3] || 1;
3369 }
3370
3371 push @widgets, $label;
3372 }
3373
3374 $self->clear;
3375 $self->SUPER::add (reverse @widgets);
3376}
3377
3378sub add {
3379 my ($self, $text, %arg) = @_;
3380
3381 $text =~ s/^\s+//;
3382 $text =~ s/\s+$//;
3383
3384 return unless $text;
3385
3386 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3387
3388 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3389
3390 if (my $item = $self->{item}{$group}) {
3391 if ($item->{text} eq $text) {
3392 $item->{count}++;
3393 } else {
3394 $item->{count} = 1;
3395 $item->{text} = $item->{tooltip} = $text;
3396 }
3397 $item->{id} += 0.2;#d#
3398 $item->{timeout} = $timeout;
3399 delete $item->{label};
3400 } else {
3401 $self->{item}{$group} = {
3402 id => ++$self->{id},
3403 text => $text,
3404 timeout => $timeout,
3405 tooltip => $text,
3406 fg => [0.8, 0.8, 0.8, 0.8],
3407 pri => 0,
3408 count => 1,
3409 %arg,
3410 };
3411 }
3412
3413 $self->reorder;
3414}
3415
3416sub reconfigure {
3417 my ($self) = @_;
3418
3419 delete $_->{label}
3420 for values %{ $self->{item} || {} };
3421
3422 $self->reorder;
3423 $self->SUPER::reconfigure;
3424}
3425
3426sub destroy {
3427 my ($self) = @_;
3428
3429 $self->{timer}->cancel;
3430
3431 $self->SUPER::destroy;
3432}
3433
3434#############################################################################
3435
3436package CFClient::UI::Inventory;
3437
3438our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445 @_,
3446 );
3447
3448 $self
3449}
3450
3451sub set_items {
3452 my ($self, $items) = @_;
3453
3454 $self->{child}->clear;
3455 return unless $items;
3456
3457 my @items = sort {
3458 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name})
3460 } @$items;
3461
3462 $self->{real_items} = \@items;
3463
3464 my $row = 0;
3465 for my $item (@items) {
3466 CFClient::Item::update_widgets $item;
3467
3468 $self->{child}->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget});
3471
3472 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 }
3682}
3683
3684#############################################################################
3685
3686package CFClient::UI::SpellList;
3687
3688our @ISA = CFClient::UI::Table::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 binding => [],
3695 commands => [],
2325 @_, 3696 @_,
2326 ) 3697 )
2327} 3698}
2328 3699
3700my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713sub rebuild_spell_list {
3714 my ($self) = @_;
3715
3716 $CFClient::UI::ROOT->on_refresh ($self => sub {
3717 $self->clear;
3718
3719 return unless $::CONN;
3720
3721 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727 my $row = 0;
3728
3729 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730 my $spell = $self->{spell}{$_};
3731
3732 $row++;
3733
3734 my $spell_cb = sub {
3735 my ($widget, $ev) = @_;
3736
3737 if ($ev->{button} == 1) {
3738 $::CONN->user_send ("cast $spell->{name}");
3739 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu
3743 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ],
3747 )->popup ($ev);
3748 } else {
3749 return 0;
3750 }
3751
3752 1
3753 };
3754
3755 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757 #TODO: add path info to tooltip
3758 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760 $self->add (0, $row, new CFClient::UI::Face
3761 face => $spell->{face},
3762 can_hover => 1,
3763 can_events => 1,
3764 tooltip => $tooltip,
3765 on_button_down => $spell_cb,
3766 );
3767
3768 $self->add (1, $row, new CFClient::UI::Label
3769 expand => 1,
3770 text => $spell->{name},
3771 can_hover => 1,
3772 can_events => 1,
3773 tooltip => $tooltip,
3774 on_button_down => $spell_cb,
3775 );
3776
3777 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781 }
3782 });
3783}
3784
3785sub add_spell {
3786 my ($self, $spell) = @_;
3787
3788 $self->{spell}->{$spell->{name}} = $spell;
3789 $self->rebuild_spell_list;
3790}
3791
3792sub remove_spell {
3793 my ($self, $spell) = @_;
3794
3795 delete $self->{spell}->{$spell->{name}};
3796 $self->rebuild_spell_list;
3797}
3798
3799sub clear_spells {
3800 my ($self) = @_;
3801
3802 $self->{spell} = {};
3803 $self->rebuild_spell_list;
3804}
3805
3806#############################################################################
3807
3808package CFClient::UI::Root;
3809
3810our @ISA = CFClient::UI::Container::;
3811
3812use List::Util qw(min max);
3813
3814use CFClient::OpenGL;
3815
3816sub new {
3817 my $class = shift;
3818
3819 my $self = $class->SUPER::new (
3820 visible => 1,
3821 @_,
3822 );
3823
3824 Scalar::Util::weaken ($self->{root} = $self);
3825
3826 $self
3827}
3828
2329sub size_request { 3829sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_; 3830 my ($self) = @_;
2335 3831
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3832 ($self->{w}, $self->{h})
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348} 3833}
2349 3834
2350############################################################################# 3835sub _to_pixel {
3836 my ($coord, $size, $max) = @_;
2351 3837
2352package CFClient::UI::Root; 3838 $coord =
3839 $coord eq "center" ? ($max - $size) * 0.5
3840 : $coord eq "max" ? $max
3841 : $coord;
2353 3842
2354our @ISA = CFClient::UI::Container::; 3843 $coord = 0 if $coord < 0;
3844 $coord = $max - $size if $coord > $max - $size;
2355 3845
2356use CFClient::OpenGL; 3846 int $coord + 0.5
2357
2358sub check_size {
2359 my ($self) = @_;
2360
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2362} 3847}
2363 3848
2364sub size_request { 3849sub invoke_size_allocate {
2365 ($::WIDTH, $::HEIGHT)
2366}
2367
2368sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 3850 my ($self, $w, $h) = @_;
2370 3851
2371 $self->SUPER::configure ($x, $y, $w, $h);
2372
2373 for my $child (@{$self->{children}}) { 3852 for my $child ($self->children) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3853 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375 3854
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3855 $X = $child->{force_x} if exists $child->{force_x};
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3856 $Y = $child->{force_y} if exists $child->{force_y};
3857
3858 $X = _to_pixel $X, $W, $self->{w};
3859 $Y = _to_pixel $Y, $H, $self->{h};
3860
2378 $child->configure ($X, $Y, $W,$H); 3861 $child->configure ($X, $Y, $W, $H);
3862 }
3863
2379 } 3864 1
2380} 3865}
2381 3866
2382sub _topleft { 3867sub coord2local {
2383 my ($self, $x, $y) = @_; 3868 my ($self, $x, $y) = @_;
2384 3869
2385 ($x, $y) 3870 ($x, $y)
2386} 3871}
2387 3872
3873sub coord2global {
3874 my ($self, $x, $y) = @_;
3875
3876 ($x, $y)
3877}
3878
2388sub update { 3879sub update {
2389 my ($self) = @_; 3880 my ($self) = @_;
2390 3881
2391 $self->check_size; 3882 $::WANT_REFRESH++;
2392 ::refresh ();
2393} 3883}
2394 3884
2395sub add { 3885sub add {
2396 my ($self, $child) = @_; 3886 my ($self, @children) = @_;
2397 3887
2398 # integerize window positions 3888 $_->{is_toplevel} = 1
2399 $child->{x} = int $child->{x}; 3889 for @children;
2400 $child->{y} = int $child->{y};
2401 3890
2402 $self->SUPER::add ($child); 3891 $self->SUPER::add (@children);
3892}
3893
3894sub remove {
3895 my ($self, @children) = @_;
3896
3897 $self->SUPER::remove (@children);
3898
3899 delete $self->{is_toplevel}
3900 for @children;
3901
3902 while (@children) {
3903 my $w = pop @children;
3904 push @children, $w->children;
3905 $w->set_invisible;
3906 }
2403} 3907}
2404 3908
2405sub on_refresh { 3909sub on_refresh {
2406 my ($self, $id, $cb) = @_; 3910 my ($self, $id, $cb) = @_;
2407 3911
2408 $self->{refresh_hook}{$id} = $cb; 3912 $self->{refresh_hook}{$id} = $cb;
2409} 3913}
2410 3914
3915sub on_post_alloc {
3916 my ($self, $id, $cb) = @_;
3917
3918 $self->{post_alloc_hook}{$id} = $cb;
3919}
3920
2411sub draw { 3921sub draw {
2412 my ($self) = @_; 3922 my ($self) = @_;
2413 3923
2414 while (my $rcb = delete $self->{refresh_hook}) { 3924 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 3925 $_->()
3926 for values %{delete $self->{refresh_hook}};
2416 } 3927 }
3928
3929 if ($self->{realloc}) {
3930 my %queue;
3931 my @queue;
3932 my $widget;
3933
3934 outer:
3935 while () {
3936 if (my $realloc = delete $self->{realloc}) {
3937 for $widget (values %$realloc) {
3938 $widget->{visible} or next; # do not resize invisible widgets
3939
3940 $queue{$widget+0}++ and next; # duplicates are common
3941
3942 push @{ $queue[$widget->{visible}] }, $widget;
3943 }
3944 }
3945
3946 while () {
3947 @queue or last outer;
3948
3949 $widget = pop @{ $queue[-1] || [] }
3950 and last;
3951
3952 pop @queue;
3953 }
3954
3955 delete $queue{$widget+0};
3956
3957 my ($w, $h) = $widget->size_request;
3958
3959 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3960 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3961
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964
3965 $w = $widget->{force_w} if exists $widget->{force_w};
3966 $h = $widget->{force_h} if exists $widget->{force_h};
3967
3968 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3969 || delete $widget->{force_realloc}) {
3970 $widget->{req_w} = $w;
3971 $widget->{req_h} = $h;
3972
3973 $self->{size_alloc}{$widget+0} = $widget;
3974
3975 if (my $parent = $widget->{parent}) {
3976 $self->{realloc}{$parent+0} = $parent
3977 unless $queue{$parent+0};
3978
3979 $parent->{force_size_alloc} = 1;
3980 $self->{size_alloc}{$parent+0} = $parent;
3981 }
3982 }
3983
3984 delete $self->{realloc}{$widget+0};
3985 }
3986 }
3987
3988 while (my $size_alloc = delete $self->{size_alloc}) {
3989 my @queue = sort { $b->{visible} <=> $a->{visible} }
3990 values %$size_alloc;
3991
3992 while () {
3993 my $widget = pop @queue || last;
3994
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996
3997 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0;
3999
4000 $w = int $w + 0.5;
4001 $h = int $h + 0.5;
4002
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w};
4005 $widget->{old_h} = $widget->{h};
4006
4007 $widget->{w} = $w;
4008 $widget->{h} = $h;
4009
4010 $widget->emit (size_allocate => $w, $h);
4011 }
4012 }
4013 }
4014
4015 while ($self->{post_alloc_hook}) {
4016 $_->()
4017 for values %{delete $self->{post_alloc_hook}};
4018 }
4019
2417 4020
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 4023 glClear GL_COLOR_BUFFER_BIT;
2421 4024
2422 glMatrixMode GL_PROJECTION; 4025 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity; 4026 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425 glMatrixMode GL_MODELVIEW; 4028 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity; 4029 glLoadIdentity;
2427 4030
4031 {
4032 package CFClient::UI::Base;
4033
4034 ($draw_x, $draw_y, $draw_w, $draw_h) =
4035 (0, 0, $self->{w}, $self->{h});
4036 }
4037
2428 $self->_draw; 4038 $self->_draw;
2429} 4039}
2430 4040
2431############################################################################# 4041#############################################################################
2432 4042
2433package CFClient::UI; 4043package CFClient::UI;
2434 4044
2435$ROOT = new CFClient::UI::Root; 4045$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip; 4046$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437 4047
24381 40481
2439 4049

Diff Legend

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