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.190 by root, Mon May 8 22:17:38 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
30 $TOOLTIP->show; 38 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 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;
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
66 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
67 90
68 $GRAB = $widget; 91 $GRAB = $widget;
69 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
70 93
71 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
136} 153}
137 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
138############################################################################# 196#############################################################################
139 197
140package CFClient::UI::Base; 198package CFClient::UI::Base;
141 199
142use strict; 200use strict;
… …
145 203
146sub new { 204sub new {
147 my $class = shift; 205 my $class = shift;
148 206
149 my $self = bless { 207 my $self = bless {
150 x => 0, 208 x => "center",
151 y => 0, 209 y => "center",
152 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
153 can_events => 1, 213 can_events => 1,
154 @_ 214 @_
155 }, $class; 215 }, $class;
156 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
157 for (keys %$self) { 219 for (keys %$self) {
158 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
160 } 222 }
161 } 223 }
162 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
163 $self 237 $self
164} 238}
165 239
166sub destroy { 240sub destroy {
167 my ($self) = @_; 241 my ($self) = @_;
… …
176 return if $self->{parent}; 250 return if $self->{parent};
177 251
178 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
179} 253}
180 254
181sub hide { 255sub set_visible {
182 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};
183 279
184 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
186 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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
213} 338}
214 339
340sub baseline_shift {
341 0
342}
343
215sub configure { 344sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
217 346
218 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
221 352
222 # use alignment to adjust x, y 353 # use alignment to adjust x, y
223 354
224 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 357 }
229 358
230 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 360 $self->{x} = $x;
232 $self->{y} = $y; 361 $self->{y} = $y;
233 $self->update; 362 $self->update;
234 } 363 }
235 364
236 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
366 return unless $self->{visible};
367
237 $self->{w} = $w; 368 $self->{alloc_w} = $w;
238 $self->{h} = $h; 369 $self->{alloc_h} = $h;
239 370
240 $self->size_allocate ($w, $h); 371 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 372 }
244}
245
246sub size_allocate {
247 # nothing to be done
248} 373}
249 374
250sub children { 375sub children {
376 # nop
251} 377}
252 378
253# call when resolution changes etc. 379sub visible_children {
254sub reconfigure { 380 $_[0]->children
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 381}
264 382
265sub set_max_size { 383sub set_max_size {
266 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
267 385
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
270}
271 388
272# return top left coordinates 389 $self->realloc;
273sub _topleft { 390}
391
392sub set_tooltip {
274 my ($self, $x, $y) = @_; 393 my ($self, $tooltip) = @_;
275 394
276 $self->{parent} 395 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 396 $tooltip =~ s/\s+$//;
278 397
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 398 return if $self->{tooltip} eq $tooltip;
399
400 $self->{tooltip} = $tooltip;
401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 }
280} 406}
281 407
282# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
283sub coord2local { 409sub coord2local {
284 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
285 411
286 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 413}
289 414
290# translate local coordinates to global coordinate system 415# translate local coordinates to global coordinate system
291sub coord2global { 416sub coord2global {
292 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
293 418
294 my ($X, $Y) = $self->_topleft; 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 420}
297 421
298sub focus_in { 422sub invoke_focus_in {
299 my ($self) = @_; 423 my ($self) = @_;
300 424
301 return if $FOCUS == $self; 425 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
303 427
304 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
305 429
306 $self->emit (focus_in => $focus);
307
308 $focus->update if $focus; 430 $focus->update if $focus;
309 $FOCUS->update; 431 $FOCUS->update;
310}
311 432
433 0
434}
435
312sub focus_out { 436sub invoke_focus_out {
313 my ($self) = @_; 437 my ($self) = @_;
314 438
315 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
316 440
317 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
318 442
319 $self->emit (focus_out => $focus);
320
321 $focus->update if $focus; #? 443 $focus->update if $focus; #?
322}
323 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
324sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
325sub button_up { } 458sub invoke_button_up { 1 }
326sub key_down { } 459sub invoke_key_down { 1 }
327sub key_up { } 460sub invoke_key_up { 1 }
328 461
329sub button_down { 462sub invoke_button_down {
330 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
331 464
332 $self->focus_in; 465 $self->grab_focus;
333}
334 466
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
339sub 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
340 535
341sub draw { 536sub draw {
342 my ($self) = @_; 537 my ($self) = @_;
343 538
344 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);
345 548
346 glPushMatrix; 549 glPushMatrix;
347 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
348 $self->_draw;
349 glPopMatrix;
350 551
351 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
352 my ($x, $y) = @$self{qw(x y)};
353
354 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
355 glEnable GL_BLEND; 554 glEnable GL_BLEND;
356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
357 glBegin GL_QUADS; 556 glBegin GL_QUADS;
358 glVertex $x , $y;
359 glVertex $x + $self->{w}, $y;
360 glVertex $x + $self->{w}, $y + $self->{h};
361 glVertex $x , $y + $self->{h};
362 glEnd;
363 glDisable GL_BLEND;
364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 557 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
375 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;
376 glPopMatrix; 575 glPopMatrix;
377 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;
378 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
379} 581}
380 582
381sub _draw { 583sub _draw {
382 my ($self) = @_; 584 my ($self) = @_;
383 585
384 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
385} 587}
386 588
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450}
451
452sub update {
453 my ($self) = @_;
454
455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub DESTROY { 589sub DESTROY {
483 my ($self) = @_; 590 my ($self) = @_;
484 591
485 #$self->deactivate; 592 delete $WIDGET{$self+0};
593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
486} 596}
487 597
488############################################################################# 598#############################################################################
489 599
490package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
498 my $class = shift; 608 my $class = shift;
499 609
500 # range [value, low, high, page] 610 # range [value, low, high, page]
501 611
502 $class->SUPER::new ( 612 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
505 @_ 615 @_
506 ) 616 )
507} 617}
508 618
509sub _draw { 619sub _draw {
510 my ($self) = @_; 620 my ($self) = @_;
511 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
513 628
514 glEnable GL_BLEND; 629 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
517 632
518 glBegin GL_QUADS; 633 glBegin GL_QUADS;
519 glVertex 0 , 0; 634 glVertex 0 , 0;
520 glVertex 0 , $h; 635 glVertex 0 , $h;
521 glVertex $w, $h; 636 glVertex $w, $h;
522 glVertex $w, 0; 637 glVertex $w, 0;
523 glEnd; 638 glEnd;
524 639
525 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
526} 642}
527 643
528############################################################################# 644#############################################################################
529 645
530package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
535 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
536 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
537} 653}
538 654
539sub size_request { 655sub size_request {
540 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
541} 659}
542 660
543sub draw { } 661sub draw { }
544 662
545############################################################################# 663#############################################################################
… …
549our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
550 668
551sub new { 669sub new {
552 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
553 671
554 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
555 673
556 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
557 children => [], 675 children => [],
558 can_events => 0, 676 can_events => 0,
559 %arg, 677 %arg,
560 ); 678 );
679
561 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
562 682
563 $self 683 $self
564} 684}
565 685
566sub add { 686sub add {
… …
574 $self->{children} = [ 694 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
577 ]; 697 ];
578 698
579 $_->check_size 699 $self->realloc;
580 for @widgets;
581
582 $self->update;
583} 700}
584 701
585sub children { 702sub children {
586 @{ $_[0]{children} } 703 @{ $_[0]{children} }
587} 704}
… …
592 delete $child->{parent}; 709 delete $child->{parent};
593 $child->hide; 710 $child->hide;
594 711
595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
596 713
597 $self->check_size; 714 $self->realloc;
598 $self->update;
599} 715}
600 716
601sub clear { 717sub clear {
602 my ($self) = @_; 718 my ($self) = @_;
603 719
… …
607 for (@$children) { 723 for (@$children) {
608 delete $_->{parent}; 724 delete $_->{parent};
609 $_->hide; 725 $_->hide;
610 } 726 }
611 727
612 $self->check_size; 728 $self->realloc;
613 $self->update;
614} 729}
615 730
616sub find_widget { 731sub find_widget {
617 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
618 733
619 $x -= $self->{x}; 734 $x -= $self->{x};
620 $y -= $self->{y}; 735 $y -= $self->{y};
621 736
622 my $res; 737 my $res;
623 738
624 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
625 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
626 and return $res; 741 and return $res;
627 } 742 }
628 743
629 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
650} 765}
651 766
652sub add { 767sub add {
653 my ($self, $child) = @_; 768 my ($self, $child) = @_;
654 769
655 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
656
657 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
658} 772}
659 773
660sub remove { 774sub remove {
661 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
670 784
671sub size_request { 785sub size_request {
672 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
673} 787}
674 788
675sub size_allocate { 789sub invoke_size_allocate {
676 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
677 791
678 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
679} 795}
680 796
681############################################################################# 797#############################################################################
798
799# back-buffered drawing area
682 800
683package CFClient::UI::Window; 801package CFClient::UI::Window;
684 802
685our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
686 804
… …
693} 811}
694 812
695sub update { 813sub update {
696 my ($self) = @_; 814 my ($self) = @_;
697 815
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 817 $self->SUPER::update;
700} 818}
701 819
702sub size_allocate { 820sub invoke_size_allocate {
703 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
704 822
705 $self->SUPER::size_allocate ($w, $h);
706 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
707} 826}
708 827
709sub _render { 828sub _render {
829 my ($self) = @_;
830
710 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
711} 832}
712 833
713sub render_child { 834sub render_child {
714 my ($self) = @_; 835 my ($self) = @_;
715 836
716 $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 {
717 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
719 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
720 $self->_render; 848 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 849 };
729} 850}
730 851
731sub _draw { 852sub _draw {
732 my ($self) = @_; 853 my ($self) = @_;
733 854
734 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
735 856
736 my $tex = $self->{texture} 857 my $tex = $self->{texture}
737 or return; 858 or return;
738 859
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 862 glColor 0, 0, 0, 1;
744 863
745 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 865
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
749} 867}
750 868
751############################################################################# 869#############################################################################
752 870
753package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
754 872
755our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
756 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
757sub size_request { 885sub size_request {
758 my ($self) = @_; 886 my ($self) = @_;
759 887
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 889
763 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
764} 891 $h = 10 if $self->{scroll_y};
765 892
893 ($w, $h)
894}
895
766sub size_allocate { 896sub invoke_size_allocate {
767 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
768 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);
769 $self->update; 905 $self->update;
906
907 1
770} 908}
771 909
772sub set_offset { 910sub set_offset {
773 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
774 912
… …
776 $self->{view_y} = int $y; 914 $self->{view_y} = int $y;
777 915
778 $self->update; 916 $self->update;
779} 917}
780 918
781# hmm, this does not work for topleft of $self... but we should not aks for that 919# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 920sub coord2local {
783 my ($self, $x, $y) = @_; 921 my ($self, $x, $y) = @_;
784 922
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
786} 933}
787 934
788sub find_widget { 935sub find_widget {
789 my ($self, $x, $y) = @_; 936 my ($self, $x, $y) = @_;
790 937
… …
798} 945}
799 946
800sub _render { 947sub _render {
801 my ($self) = @_; 948 my ($self) = @_;
802 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
803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
804 954
805 $self->SUPER::_render; 955 $self->SUPER::_render;
806} 956}
807 957
808############################################################################# 958#############################################################################
809 959
810package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
811 961
812our @ISA = CFClient::UI::HBox::; 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
979 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1),
981 slider => $slider,
982 %arg,
983 );
984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
988 $self
989}
990
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 {
1008 my ($self, $w, $h) = @_;
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019#############################################################################
1020
1021package CFClient::UI::Frame;
1022
1023our @ISA = CFClient::UI::Bin::;
1024
1025use CFClient::OpenGL;
813 1026
814sub new { 1027sub new {
815 my $class = shift; 1028 my $class = shift;
816 1029
817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new ( 1030 $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 1031 bg => undef,
829 slider => $slider,
830 @_, 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) = @_;
1077
1078 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1],
1081 border => 0.6,
1082 can_events => 1,
1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
831 ); 1086 );
832 1087
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
842
843#############################################################################
844
845package CFClient::UI::Frame;
846
847our @ISA = CFClient::UI::Bin::;
848
849use CFClient::OpenGL;
850
851sub new {
852 my $class = shift;
853
854 my $self = $class->SUPER::new (
855 bg => [1, 1, 1, 1],
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_
859 );
860
861 $self
862}
863
864sub _draw {
865 my ($self) = @_;
866
867 my ($w, $h) = ($self->{w}, $self->{h});
868
869 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D;
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873
874# glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0;
877# glVertex 0 , $h;
878# glVertex $w, $h;
879# glVertex $w, 0;
880# glEnd;
881
882
883 $self->child->draw;
884 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D;
886}
887
888#############################################################################
889
890package CFClient::UI::FancyFrame;
891
892our @ISA = CFClient::UI::Bin::;
893
894use CFClient::OpenGL;
895
896my @tex =
897 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
898 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
899
900sub new {
901 my $class = shift;
902
903 # TODO: user_x, user_y, overwrite moveto?
904
905 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1],
908 border => 0.6,
909 can_events => 1,
910 @_
911 );
912
913 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
914 align => 0, 1089 align => 0,
915 valign => 1, 1090 valign => 1,
916 text => $self->{title}, 1091 text => $self->{title},
917 fontsize => $self->{border}; 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 }
918 1103
919 $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};
920} 1113}
921 1114
922sub border { 1115sub border {
923 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
924} 1117}
925 1118
926sub size_request { 1119sub size_request {
927 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};
928 1127
929 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
930 1129
931 ( 1130 (
932 $w + $self->border * 2, 1131 $w + $self->border * 2,
933 $h + $self->border * 2, 1132 $h + $self->border * 2,
934 ) 1133 )
935} 1134}
936 1135
937sub size_allocate { 1136sub invoke_size_allocate {
938 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
939 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
940 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
942 1149
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
944 if $self->{title};
945
946 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
947}
948 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
949sub button_down { 1158sub invoke_button_down {
950 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
951 1160
952 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
953 my $border = $self->border; 1162 my $border = $self->border;
954 1163
… …
967 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
968 1177
969 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
971 1180
972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1183
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
975 $self->check_size; 1185 $self->realloc;
976 }; 1186 };
977 1187
978 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
979 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
980 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
982 $self->{motion} = sub { 1192 $self->{motion} = sub {
983 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
984 1194
985 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
986 1196
987 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
988 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
989 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
990 } 1205 1
991} 1206}
992 1207
993sub button_up { 1208sub invoke_button_up {
994 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
995 1210
996 delete $self->{motion}; 1211 ! ! delete $self->{motion}
997} 1212}
998 1213
999sub mouse_motion { 1214sub invoke_mouse_motion {
1000 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1001 1216
1002 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1003} 1220}
1004 1221
1005sub _draw { 1222sub _draw {
1006 my ($self) = @_; 1223 my ($self) = @_;
1007 1224
1225 my $child = $self->{children}[0];
1226
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1010 1229
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1232
1016 my $border = $self->border; 1233 my $border = $self->border;
1017 1234
1018 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1240
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
1026 1243
1027 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
1028 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
1029 my $rep_y = $ch / $bg->{h}; 1247 $bg->{t} = $ch / $bg->{h};
1030
1031 glColor @{ $self->{bg} };
1032
1033 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1249 }
1037 1250
1038 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1252
1042 $self->{title}->draw if $self->{title};
1043
1044 $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};
1045} 1264}
1046 1265
1047############################################################################# 1266#############################################################################
1048 1267
1049package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1057sub new { 1276sub new {
1058 my $class = shift; 1277 my $class = shift;
1059 1278
1060 $class->SUPER::new ( 1279 $class->SUPER::new (
1061 col_expand => [], 1280 col_expand => [],
1062 @_ 1281 @_,
1063 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1287}
1065 1288
1066sub add { 1289sub add {
1067 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1068 1291
1069 $child->set_parent ($self); 1292 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1071 1294
1072 $child->check_size; 1295 $self->realloc;
1073} 1296}
1074 1297
1075sub children { 1298sub remove {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1299 my ($self, $child) = @_;
1077}
1078 1300
1301 # TODO: not yet implemented
1302}
1303
1079# 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?
1080sub clear { 1305sub clear {
1081 my ($self) = @_; 1306 my ($self) = @_;
1082 1307
1083 my @children = $self->children; 1308 my @children = $self->children;
1084 delete $self->{children}; 1309 delete $self->{children};
… …
1086 for (@children) { 1311 for (@children) {
1087 delete $_->{parent}; 1312 delete $_->{parent};
1088 $_->hide; 1313 $_->hide;
1089 } 1314 }
1090 1315
1091 $self->update; 1316 $self->realloc;
1092} 1317}
1093 1318
1094sub get_wh { 1319sub get_wh {
1095 my ($self) = @_; 1320 my ($self) = @_;
1096 1321
… …
1122 (sum @$ws), 1347 (sum @$ws),
1123 (sum @$hs), 1348 (sum @$hs),
1124 ) 1349 )
1125} 1350}
1126 1351
1127sub size_allocate { 1352sub invoke_size_allocate {
1128 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1129 1354
1130 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1131 1356
1132 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
1134 1359
1135 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1164 } 1389 }
1165 1390
1166 $y += $row_h; 1391 $y += $row_h;
1167 } 1392 }
1168 1393
1394 1
1169} 1395}
1170 1396
1171sub find_widget { 1397sub find_widget {
1172 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1173 1399
… …
1192 } 1418 }
1193} 1419}
1194 1420
1195############################################################################# 1421#############################################################################
1196 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
1197package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1198 1484
1199# TODO: wrap into common Box base class
1200
1201our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1202 1486
1203sub size_request { 1487sub new {
1204 my ($self) = @_; 1488 my $class = shift;
1205 1489
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1207 1491 vertical => 0,
1208 ( 1492 @_,
1209 (List::Util::sum map $_->[0], @alloc),
1210 (List::Util::max map $_->[1], @alloc),
1211 ) 1493 )
1212} 1494}
1213 1495
1214sub size_allocate {
1215 my ($self, $w, $h) = @_;
1216
1217 ($h, $w) = ($w, $h);
1218
1219 my $children = $self->{children};
1220
1221 my @h = map $_->{req_w}, @$children;
1222
1223 my $req_h = List::Util::sum @h;
1224
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } else {
1229 my $exp = List::Util::sum map $_->{expand}, @$children;
1230 $exp ||= 1;
1231
1232 for (0 .. $#$children) {
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure ($y, 0, $h, $w);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1496#############################################################################
1256 1497
1257package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1258 1499
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1262 1501
1263sub size_request { 1502sub new {
1264 my ($self) = @_; 1503 my $class = shift;
1265 1504
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1267 1506 vertical => 1,
1268 ( 1507 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1508 )
1272} 1509}
1273 1510
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 my $children = $self->{children};
1278
1279 my @h = map $_->{req_h}, @$children;
1280
1281 my $req_h = List::Util::sum @h;
1282
1283 if ($req_h > $h) {
1284 # ah well, not enough space
1285 $_ *= $h / $req_h for @h;
1286 } else {
1287 my $exp = List::Util::sum map $_->{expand}, @$children;
1288 $exp ||= 1;
1289
1290 for (0 .. $#$children) {
1291 my $child = $children->[$_];
1292
1293 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1294 }
1295 }
1296
1297 CFClient::UI::harmonize \@h;
1298
1299 my $y = 0;
1300 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_];
1303 $child->configure (0, $y, $w, $h);
1304
1305 $y += $h;
1306 }
1307
1308 1
1309}
1310
1311############################################################################# 1511#############################################################################
1312 1512
1313package CFClient::UI::Label; 1513package CFClient::UI::Label;
1314 1514
1315our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1316 1516
1317use CFClient::OpenGL; 1517use CFClient::OpenGL;
1318 1518
1319sub new { 1519sub new {
1320 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1321 1521
1322 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1324 #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),
1325 fontsize => 1, 1532 fontsize => 1,
1326 text => "",
1327 align => -1, 1533 align => -1,
1328 valign => -1, 1534 valign => -1,
1329 padding => 2, 1535 padding_x => 2,
1330 layout => new CFClient::Layout, 1536 padding_y => 2,
1331 can_events => 0, 1537 can_events => 0,
1332 %arg 1538 %arg
1333 ); 1539 );
1334 1540
1335 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1542 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1543 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1544 $self->{template} = $layout;
1339 } 1545 }
1340 1546
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1547 if (exists $self->{markup}) {
1342 $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 }
1343 1552
1344 $self 1553 $self
1345} 1554}
1346 1555
1347sub escape { 1556sub escape($) {
1348 local $_ = $_[1]; 1557 local $_ = $_[0];
1349 1558
1350 s/&/&amp;/g; 1559 s/&/&amp;/g;
1351 s/>/&gt;/g; 1560 s/>/&gt;/g;
1352 s/</&lt;/g; 1561 s/</&lt;/g;
1353 1562
1354 $_[1] 1563 $_
1355} 1564}
1356 1565
1357sub update { 1566sub update {
1358 my ($self) = @_; 1567 my ($self) = @_;
1359 1568
1360 delete $self->{texture}; 1569 delete $self->{texture};
1361 $self->SUPER::update; 1570 $self->SUPER::update;
1362} 1571}
1363 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1364sub set_text { 1580sub set_text {
1365 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1366 1582
1367 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1369 1585
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1371 1588
1372 delete $self->{texture}; 1589 delete $self->{size_req};
1590 $self->realloc;
1373 $self->update; 1591 $self->update;
1374 $self->check_size;
1375} 1592}
1376 1593
1377sub set_markup { 1594sub set_markup {
1378 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1379 1596
1380 return if $self->{text} eq "M$markup"; 1597 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1598 $self->{text} = "M$markup";
1382 1599
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1384 1604
1385 delete $self->{texture}; 1605 delete $self->{size_req};
1606 $self->realloc;
1386 $self->update; 1607 $self->update;
1387 $self->check_size;
1388} 1608}
1389 1609
1390sub size_request { 1610sub size_request {
1391 my ($self) = @_; 1611 my ($self) = @_;
1392 1612
1613 $self->{size_req} ||= do {
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $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});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1619
1397 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1398 1621
1399 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1400 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1401 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1625
1403 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1404 1627
1405 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1406 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1407 } 1633 };
1408 1634
1409 ( 1635 @{ $self->{size_req} }
1410 $w + $self->{padding} * 2,
1411 $h + $self->{padding} * 2,
1412 )
1413} 1636}
1414 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1415sub size_allocate { 1642sub invoke_size_allocate {
1416 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1417 1644
1645 delete $self->{ox};
1646
1418 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1419} 1651}
1420 1652
1421sub set_fontsize { 1653sub set_fontsize {
1422 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1423 1655
1424 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1425 delete $self->{texture}; 1657 delete $self->{texture};
1426 1658
1427 $self->update; 1659 $self->realloc;
1428 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1429} 1668}
1430 1669
1431sub _draw { 1670sub _draw {
1432 my ($self) = @_; 1671 my ($self) = @_;
1433 1672
1673 $self->SUPER::_draw; # draw background, if applicable
1674
1434 my $tex = $self->{texture} ||= do { 1675 my $tex = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1677 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $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});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682
1438 new_from_layout CFClient::Texture $self->{layout} 1683 new_from_layout CFClient::Texture $self->{layout}
1439 }; 1684 };
1440 1685
1441 glEnable GL_BLEND; 1686 unless (exists $self->{ox}) {
1442 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
1443 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 {
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1446 glColor @{$self->{fg}}; 1708 }
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy});
1461 1709
1462 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1711}
1465 1712
1466############################################################################# 1713#############################################################################
1467 1714
1468package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1728 active_fg => [0, 0, 0],
1482 can_hover => 1, 1729 can_hover => 1,
1483 can_focus => 1, 1730 can_focus => 1,
1484 valign => 0, 1731 valign => 0,
1485 can_events => 1, 1732 can_events => 1,
1733 #text => ...
1734 #hidden => "*",
1486 @_ 1735 @_
1487 ) 1736 )
1488} 1737}
1489 1738
1490sub _set_text { 1739sub _set_text {
… …
1492 1741
1493 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1494 1743
1495 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1496 1745
1497 delete $self->{texture};
1498
1499 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1500 $self->{text} = $text; 1747 $self->{text} = $text;
1501 1748
1502 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1504 1752
1505 $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);
1506} 1764}
1507 1765
1508sub get_text { 1766sub get_text {
1509 $_[0]{text} 1767 $_[0]{text}
1510} 1768}
… …
1515 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1516 1774
1517 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1518} 1776}
1519 1777
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524}
1525
1526sub set_text {
1527 my ($self, $text) = @_;
1528
1529 $self->{cursor} = length $text;
1530 $self->_set_text ($text);
1531 $self->update;
1532}
1533
1534sub key_down { 1778sub invoke_key_down {
1535 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1536 1780
1537 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1538 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
1540 1784
1541 my $text = $self->get_text; 1785 my $text = $self->get_text;
1542 1786
1543 if ($sym == 8) { 1787 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1789 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1790 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1791 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1792 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1793 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1794 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1799 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1800 $self->emit ('escape');
1557 } elsif ($uni) { 1801 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1559 } 1805 }
1560 1806
1561 $self->_set_text ($text); 1807 $self->_set_text ($text);
1562 $self->update;
1563}
1564 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1565sub focus_in { 1814sub invoke_focus_in {
1566 my ($self) = @_; 1815 my ($self) = @_;
1567 1816
1568 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1569 1818
1570 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1571} 1820}
1572 1821
1573sub button_down { 1822sub invoke_button_down {
1574 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1575 1824
1576 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1577 1826
1578 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1579 1828
1580 # byte-index to char-index 1829 # byte-index to char-index
1581 my $text = $self->{text}; 1830 my $text = $self->{text};
1582 utf8::encode $text; 1831 utf8::encode $text;
1583 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1584 1833
1585 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1586 $self->update; 1835 $self->update;
1836
1837 1
1587} 1838}
1588 1839
1589sub mouse_motion { 1840sub invoke_mouse_motion {
1590 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1591# 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
1592} 1845}
1593 1846
1594sub _draw { 1847sub _draw {
1595 my ($self) = @_; 1848 my ($self) = @_;
1596 1849
1597 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1598 1851
1599 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1600 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1601 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1602 } else { 1855 } else {
1603 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1604 } 1857 }
1605 1858
1606 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1608 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1609 glVertex 0 , 0; 1862 glVertex 0 , 0;
1610 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1611 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1612 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1637 1890
1638our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1639 1892
1640use CFClient::OpenGL; 1893use CFClient::OpenGL;
1641 1894
1642sub key_down { 1895sub invoke_key_down {
1643 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1644 1897
1645 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1646 1899
1647 if ($sym == 13) { 1900 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1650 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1653 $self->update; 1907 $self->update;
1654 1908
… …
1673 } else { 1927 } else {
1674 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1675 } 1929 }
1676 1930
1677 } else { 1931 } else {
1678 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1679 } 1935 1
1680
1681} 1936}
1682 1937
1683############################################################################# 1938#############################################################################
1684 1939
1685package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1694 1949
1695sub new { 1950sub new {
1696 my $class = shift; 1951 my $class = shift;
1697 1952
1698 $class->SUPER::new ( 1953 $class->SUPER::new (
1699 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1700 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1703 can_hover => 1, 1958 can_hover => 1,
1704 align => 0, 1959 align => 0,
1705 valign => 0, 1960 valign => 0,
1706 can_events => 1, 1961 can_events => 1,
1707 @_ 1962 @_
1708 ) 1963 )
1709} 1964}
1710 1965
1711sub button_up { 1966sub invoke_button_up {
1712 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1713 1968
1969 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1971 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate"); 1972
1717 } 1973 1
1718} 1974}
1719 1975
1720sub _draw { 1976sub _draw {
1721 my ($self) = @_; 1977 my ($self) = @_;
1722 1978
1723 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1724 1980
1725 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg};
1727 }
1728
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1734 1984
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1986
1737 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1988
1740 $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
1741} 2026}
1742 2027
1743############################################################################# 2028#############################################################################
1744 2029
1745package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1754 2039
1755sub new { 2040sub new {
1756 my $class = shift; 2041 my $class = shift;
1757 2042
1758 $class->SUPER::new ( 2043 $class->SUPER::new (
1759 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1760 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1761 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],
1762 state => 0, 2050 state => 0,
1763 can_hover => 1, 2051 can_hover => 1,
1764 @_ 2052 @_
1765 ) 2053 )
1766} 2054}
1767 2055
1768sub size_request { 2056sub size_request {
1769 my ($self) = @_; 2057 my ($self) = @_;
1770 2058
1771 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1772} 2060}
1773 2061
1774sub button_down { 2062sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1776 2064
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1779 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1781 } 2073 1
1782} 2074}
1783 2075
1784sub _draw { 2076sub _draw {
1785 my ($self) = @_; 2077 my ($self) = @_;
1786 2078
1787 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1788 2080
1789 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1790 2082
1791 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;
1792 2086
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 2088
1795 glEnable GL_BLEND; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
1796 glEnable GL_TEXTURE_2D; 2091 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 2092 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 2093 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 2094}
1806 2095
1807############################################################################# 2096#############################################################################
1808 2097
1809package CFClient::UI::Image; 2098package CFClient::UI::Image;
1810 2099
1811our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1812 2101
1813use CFClient::OpenGL; 2102use CFClient::OpenGL;
1814use Carp qw/confess/;
1815 2103
1816our %loaded_images; 2104our %texture_cache;
1817 2105
1818sub new { 2106sub new {
1819 my $class = shift; 2107 my $class = shift;
1820 2108
1821 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1822 2113
1823 $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";
1824 2116
1825 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1826 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;
1827 2119
1828 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1829 2121
1830 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1831
1832 $self->{aspect} = $tex->{w} / $tex->{h};
1833 2123
1834 $self 2124 $self
1835} 2125}
1836 2126
1837sub size_request { 2127sub size_request {
1838 my ($self) = @_; 2128 my ($self) = @_;
1839 2129
1840 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1841} 2131}
1842 2132
1843sub _draw { 2133sub _draw {
1844 my ($self) = @_; 2134 my ($self) = @_;
1845 2135
… …
1852 glTranslate 0, -$self->{w}, 0; 2142 glTranslate 0, -$self->{w}, 0;
1853 2143
1854 ($w, $h) = ($h, $w); 2144 ($w, $h) = ($h, $w);
1855 } 2145 }
1856 2146
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 2147 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 2149
1862 $tex->draw_quad (0, 0, $w, $h); 2150 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 2151
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 2152 glDisable GL_TEXTURE_2D;
1866} 2153}
1867 2154
1868############################################################################# 2155#############################################################################
1869 2156
… …
1959 2246
1960 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1961 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1962 2249
1963 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1964 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;
1965 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967 2255
1968 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1969 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2346 qw(s1_slider.png s1_slider_bg.png);
2059 2347
2060sub new { 2348sub new {
2061 my $class = shift; 2349 my $class = shift;
2062 2350
2063 # range [value, low, high, page] 2351 # range [value, low, high, page, unit]
2064 2352
2065 # TODO: 0-width page 2353 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2354 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2355 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2070 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],
2071 range => [0, 0, 100, 10], 2361 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2074 vertical => 0, 2364 vertical => 0,
2075 can_hover => 1, 2365 can_hover => 1,
2076 inner_pad => 5, 2366 inner_pad => 0.02,
2077 @_ 2367 @_
2078 ); 2368 );
2079 2369
2370 $self->set_value ($self->{range}[0]);
2371 $self->update;
2372
2080 $self 2373 $self
2081} 2374}
2082 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
2083sub size_request { 2410sub size_request {
2084 my ($self) = @_; 2411 my ($self) = @_;
2085 2412
2086 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2087 my $h = $self->{req_h};
2088
2089 $self->{vertical} ? ($h, $w) : ($w, $h)
2090} 2414}
2091 2415
2092sub button_down { 2416sub invoke_button_down {
2093 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2094 2418
2095 $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
2096 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2097} 2424}
2098 2425
2099sub mouse_motion { 2426sub invoke_mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2101 2428
2102 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
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2458 my $range = ($hi - $page - $lo) || 1e-100;
2104 2459
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2460 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2461
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2462 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2463 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2464
2110 $x -= $inner_pad_px; # substract the padding 2465 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2466 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2467
2116 $self->emit (changed => $x); 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2469 $self->{knob_w} = $knob_w;
2118 } 2470 }
2119}
2120
2121# the inner_* stuff is for generating a padding for the slider handle,
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131 2471
2132 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2133 2473
2134 my ($w, $h) = @$self{qw(w h)}; 2474 glScale $self->{w}, $self->{h};
2135 2475
2136 if ($self->{vertical}) { 2476 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2477 # draw a vertical slider like a rotated horizontal slider
2138 2478
2479 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2480 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2481 }
2144 2482
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2483 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2484 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2485
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2486 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2488
2171 # draw background 2489 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2490 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2491
2174 # draw handle 2492 # draw handle
2175 $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);
2176 2494
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2495 glDisable GL_TEXTURE_2D;
2179} 2496}
2180 2497
2181############################################################################# 2498#############################################################################
2182 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
2183package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2184 2542
2185our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2186 2544
2187use CFClient::OpenGL; 2545use CFClient::OpenGL;
2188 2546
… …
2190 my $class = shift; 2548 my $class = shift;
2191 2549
2192 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2193 fontsize => 1, 2551 fontsize => 1,
2194 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2195 #font => default_font 2554 #font => default_font
2196 @_, 2555 @_,
2197 2556
2198 layout => (new CFClient::Layout), 2557 layout => (new CFClient::Layout 1),
2199 par => [], 2558 par => [],
2200 height => 0, 2559 height => 0,
2201 children => [ 2560 children => [
2202 (new CFClient::UI::Empty expand => 1), 2561 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2562 (new CFClient::UI::Slider vertical => 1),
… …
2214 2573
2215 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2575 $self->reflow;
2217} 2576}
2218 2577
2219sub 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 {
2220 my ($self, $text) = @_; 2605 my ($self, $para) = @_;
2221 2606
2222 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2223 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w}); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2226 $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}}
2227 2620 );
2228 ($layout->size)[1] 2621
2622 $layout
2229} 2623}
2230 2624
2231sub reflow { 2625sub reflow {
2232 my ($self) = @_; 2626 my ($self) = @_;
2233 2627
2234 $self->{need_reflow}++; 2628 $self->{need_reflow}++;
2235 $self->update; 2629 $self->update;
2236} 2630}
2237 2631
2238sub 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 {
2239 my ($self, $w, $h) = @_; 2640 my ($self) = @_;
2240 2641
2241 $self->SUPER::size_allocate ($w, $h); 2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2242 2644
2243 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2645 $self->{par} = [];
2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $self->{height} = 0;
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2246
2247 $self->reflow;
2248} 2648}
2249 2649
2250sub add_paragraph { 2650sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2252 2652
2253 #TODO: intelligently "reformat" paragraph 2653 my ($text, @w) = ref $para ? @$para : $para;
2254 2654
2255 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 };
2256 2663
2257 $self->{height} += $height; 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2258 2666
2259 push @{$self->{par}}, [$height, $color, $text]; 2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2260 2670
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2671sub scroll_to_bottom {
2262 $self->{children}[1]->update; 2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2263} 2676}
2264 2677
2265sub update { 2678sub update {
2266 my ($self) = @_; 2679 my ($self) = @_;
2267 2680
… …
2269 2682
2270 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2271 2684
2272 delete $self->{texture}; 2685 delete $self->{texture};
2273 2686
2274 $ROOT->on_refresh ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689
2275 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2691 my $height = 0;
2277 2692
2278 $height += $_->[0] = $self->text_height ($_->[2])
2279 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 }
2280 2705
2281 $self->{height} = $height; 2706 $self->{height} = $height;
2282 2707
2283 $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]);
2284 2709
2285 delete $self->{texture}; 2710 delete $self->{texture};
2286 } 2711 }
2287 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2291 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
2292 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 2731
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307
2308 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2309 my $h = $par->[0]; 2733 my $h = $para->{h};
2310 2734
2311 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_text ($par->[2]);
2313 2736
2314 glColor @{ $par->[1] }; 2737 my $layout = $self->get_layout ($para);
2315 my ($W, $H) = $layout->size; 2738
2316 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 }
2317 } 2759 }
2318 2760
2319 $y += $h; 2761 $y += $h;
2320 } 2762 }
2321 2763
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2324 }; 2765 };
2325 }); 2766 });
2326} 2767}
2327 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2328sub _draw { 2778sub _draw {
2329 my ($self) = @_; 2779 my ($self) = @_;
2330 2780
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2786
2340 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2341
2342} 2788}
2343 2789
2344############################################################################# 2790#############################################################################
2345 2791
2346package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2391 2837
2392sub new { 2838sub new {
2393 my $class = shift; 2839 my $class = shift;
2394 2840
2395 my $self = $class->SUPER::new ( 2841 my $self = $class->SUPER::new (
2396 state => 0, 2842 state => 0,
2397 connect_activate => \&toggle_flopper, 2843 on_activate => \&toggle_flopper,
2398 @_ 2844 @_
2399 ); 2845 );
2400 2846
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2847 $self
2407} 2848}
2408 2849
2409sub toggle_flopper { 2850sub toggle_flopper {
2410 my ($self) = @_; 2851 my ($self) = @_;
2411 2852
2412 # TODO: use animation 2853 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2854}
2424 2855
2425############################################################################# 2856#############################################################################
2426 2857
2427package CFClient::UI::Tooltip; 2858package CFClient::UI::Tooltip;
… …
2437 @_, 2868 @_,
2438 can_events => 0, 2869 can_events => 0,
2439 ) 2870 )
2440} 2871}
2441 2872
2442sub set_markup { 2873sub set_tooltip_from {
2443 my ($self, $text) = @_; 2874 my ($self, $widget) = @_;
2444 2875
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2876 my $tooltip = $widget->{tooltip};
2446 $self->{label}->set_markup ($text); 2877
2447 $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 );
2448} 2896}
2449 2897
2450sub size_request { 2898sub size_request {
2451 my ($self) = @_; 2899 my ($self) = @_;
2452 2900
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2902
2457 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2458} 2904}
2459 2905
2460sub size_allocate { 2906sub invoke_size_allocate {
2461 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2462 2908
2463 $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 });
2464} 2928}
2465 2929
2466sub _draw { 2930sub _draw {
2467 my ($self) = @_; 2931 my ($self) = @_;
2468 2932
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2933 glTranslate 0.375, 0.375;
2471 2934
2472 my ($w, $h) = @$self{qw(w h)}; 2935 my ($w, $h) = @$self{qw(w h)};
2473 2936
2474 glColor 1, 0.8, 0.4; 2937 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2948 glVertex 0 , $h;
2486 glVertex $w, $h; 2949 glVertex $w, $h;
2487 glVertex $w, 0; 2950 glVertex $w, 0;
2488 glEnd; 2951 glEnd;
2489 2952
2490 glPopMatrix; 2953 glTranslate 2 - 0.375, 2 - 0.375;
2491 2954
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2955 $self->SUPER::_draw;
2494} 2956}
2495 2957
2496############################################################################# 2958#############################################################################
2497 2959
… …
2502use CFClient::OpenGL; 2964use CFClient::OpenGL;
2503 2965
2504sub new { 2966sub new {
2505 my $class = shift; 2967 my $class = shift;
2506 2968
2507 $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2508 aspect => 1, 2970 aspect => 1,
2971 can_events => 0,
2509 @_, 2972 @_,
2510 ) 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
2511} 2990}
2512 2991
2513sub size_request { 2992sub size_request {
2514 (32, 8) 2993 (32, 8)
2515} 2994}
2516 2995
2996sub update {
2997 my ($self) = @_;
2998
2999 return unless $self->{visible};
3000
3001 $self->SUPER::update;
3002}
3003
2517sub _draw { 3004sub _draw {
2518 my ($self) = @_; 3005 my ($self) = @_;
2519 3006
2520 return unless $::CONN;#d# manage and cache textures differently 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
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 3019
2523 # TODO animation
2524 if ($tex) { 3020 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 3026 }
3027}
3028
3029sub destroy {
3030 my ($self) = @_;
3031
3032 $self->{timer}->cancel
3033 if $self->{timer};
3034
3035 $self->SUPER::destroy;
2534} 3036}
2535 3037
2536############################################################################# 3038#############################################################################
2537 3039
2538package CFClient::UI::InventoryItem; 3040package CFClient::UI::Buttonbar;
2539 3041
2540our @ISA = CFClient::UI::HBox::; 3042our @ISA = CFClient::UI::HBox::;
2541 3043
2542sub new { 3044# TODO: should actualyl wrap buttons and other goodies.
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640 3045
2641############################################################################# 3046#############################################################################
2642 3047
2643package CFClient::UI::Menu; 3048package CFClient::UI::Menu;
2644 3049
… …
2656 ); 3061 );
2657 3062
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2659 3064
2660 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2662 3067
2663 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2664 if (!ref $widget) { 3069 if (!ref $widget) {
2665 $widget = new CFClient::UI::Label 3070 $widget = new CFClient::UI::Label
2666 can_hover => 1, 3071 can_hover => 1,
2667 can_events => 1, 3072 can_events => 1,
2668 text => $widget; 3073 markup => $widget,
3074 tooltip => $tooltip
2669 } 3075 }
2670 3076
2671 $self->{item}{$widget} = $item; 3077 $self->{item}{$widget} = $item;
2672 3078
2673 $self->{vbox}->add ($widget); 3079 $self->{vbox}->add ($widget);
… …
2685 # maybe save $GRAB? must be careful about events... 3091 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 3092 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 3093 $self->{button} = $ev->{button};
2688 3094
2689 $self->show; 3095 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3096 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691} 3097}
2692 3098
2693sub mouse_motion { 3099sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3100 my ($self, $ev, $x, $y) = @_;
2695 3101
2696 # TODO: should use vbox->find_widget or so 3102 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3103 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER}; 3104 $self->{hover} = $self->{item}{$HOVER};
2699}
2700 3105
3106 0
3107}
3108
2701sub button_up { 3109sub invoke_button_up {
2702 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2703 3111
2704 if ($ev->{button} == $self->{button}) { 3112 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 3113 undef $GRAB;
2706 $self->hide; 3114 $self->hide;
2707 3115
2708 $self->emit ("popdown"); 3116 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 3117 $self->{hover}[1]->() if $self->{hover};
3118 } else {
3119 return 0
3120 }
3121
2710 } 3122 1
2711} 3123}
2712 3124
2713############################################################################# 3125#############################################################################
2714 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 => [],
3696 @_,
3697 )
3698}
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
2715package CFClient::UI::Root; 3808package CFClient::UI::Root;
2716 3809
2717our @ISA = CFClient::UI::Container::; 3810our @ISA = CFClient::UI::Container::;
2718 3811
3812use List::Util qw(min max);
3813
2719use CFClient::OpenGL; 3814use CFClient::OpenGL;
2720 3815
2721sub check_size { 3816sub new {
2722 my ($self) = @_; 3817 my $class = shift;
2723 3818
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3819 my $self = $class->SUPER::new (
3820 visible => 1,
3821 @_,
3822 );
3823
3824 Scalar::Util::weaken ($self->{root} = $self);
3825
3826 $self
2725} 3827}
2726 3828
2727sub size_request { 3829sub size_request {
2728 my ($self) = @_; 3830 my ($self) = @_;
2729 3831
2730 ($self->{w}, $self->{h}) 3832 ($self->{w}, $self->{h})
2731} 3833}
2732 3834
3835sub _to_pixel {
3836 my ($coord, $size, $max) = @_;
3837
3838 $coord =
3839 $coord eq "center" ? ($max - $size) * 0.5
3840 : $coord eq "max" ? $max
3841 : $coord;
3842
3843 $coord = 0 if $coord < 0;
3844 $coord = $max - $size if $coord > $max - $size;
3845
3846 int $coord + 0.5
3847}
3848
2733sub size_allocate { 3849sub invoke_size_allocate {
2734 my ($self, $w, $h) = @_; 3850 my ($self, $w, $h) = @_;
2735
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760 3851
2761 for my $child ($self->children) { 3852 for my $child ($self->children) {
2762 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)};
2763 3854
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3855 $X = $child->{force_x} if exists $child->{force_x};
2765 $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
2766 $child->configure ($X, $Y, $W, $H); 3861 $child->configure ($X, $Y, $W, $H);
2767 } 3862 }
2768}
2769 3863
2770sub _topleft { 3864 1
3865}
3866
3867sub coord2local {
2771 my ($self, $x, $y) = @_; 3868 my ($self, $x, $y) = @_;
2772 3869
2773 ($x, $y) 3870 ($x, $y)
2774} 3871}
2775 3872
3873sub coord2global {
3874 my ($self, $x, $y) = @_;
3875
3876 ($x, $y)
3877}
3878
2776sub update { 3879sub update {
2777 my ($self) = @_; 3880 my ($self) = @_;
2778 3881
2779 $self->check_size; 3882 $::WANT_REFRESH++;
2780 ::refresh ();
2781} 3883}
2782 3884
2783sub add { 3885sub add {
2784 my ($self, $child) = @_; 3886 my ($self, @children) = @_;
2785 3887
2786 # integerize window positions 3888 $_->{is_toplevel} = 1
2787 $child->{x} = int $child->{x}; 3889 for @children;
2788 $child->{y} = int $child->{y};
2789 3890
2790 $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 }
2791} 3907}
2792 3908
2793sub on_refresh { 3909sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3910 my ($self, $id, $cb) = @_;
2795 3911
2796 $self->{refresh_hook}{$id} = $cb; 3912 $self->{refresh_hook}{$id} = $cb;
2797} 3913}
2798 3914
3915sub on_post_alloc {
3916 my ($self, $id, $cb) = @_;
3917
3918 $self->{post_alloc_hook}{$id} = $cb;
3919}
3920
2799sub draw { 3921sub draw {
2800 my ($self) = @_; 3922 my ($self) = @_;
2801 3923
2802 while (my $rcb = delete $self->{refresh_hook}) { 3924 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3925 $_->()
3926 for values %{delete $self->{refresh_hook}};
2804 } 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
2805 4020
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 4023 glClear GL_COLOR_BUFFER_BIT;
2809 4024
2810 glMatrixMode GL_PROJECTION; 4025 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 4026 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 4028 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 4029 glLoadIdentity;
2815 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
2816 $self->_draw; 4038 $self->_draw;
2817} 4039}
2818 4040
2819############################################################################# 4041#############################################################################
2820 4042
2821package CFClient::UI; 4043package CFClient::UI;
2822 4044
2823$ROOT = new CFClient::UI::Root; 4045$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 4046$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 4047
28261 40481
2827 4049

Diff Legend

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