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

Diff Legend

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