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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 38 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 39 }
41 40
42 return; 41 return;
43 } 42 }
44 } 43 }
45 } 44 }
46 45
47 $TOOLTIP->hide; 46 $TOOLTIP->hide;
48 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;
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
64 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
65 87
88 warn "button down $ev->{button}\n";#d#
89
66 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
67 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
68 92
69 $GRAB = $widget; 93 $GRAB = $widget;
70 $GRAB->update if $GRAB; 94 $GRAB->update if $GRAB;
71 95
72 check_tooltip; 96 $TOOLTIP_WATCHER->cb->();
73 } 97 }
74 98
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 99 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 100
77 if ($GRAB) { 101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 102 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 103}
82 104
83sub feed_sdl_button_up_event { 105sub feed_sdl_button_up_event {
84 my ($ev) = @_; 106 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 107 my ($x, $y) = ($ev->{x}, $ev->{y});
86 108
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 109 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 110
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 112
91 if ($GRAB) { 113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 114 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 115
96 if (!$BUTTON_STATE) { 116 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 117 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 118 $grab->update if $grab;
99 $GRAB->update if $GRAB; 119 $GRAB->update if $GRAB;
100 120
101 check_tooltip; 121 $TOOLTIP_WATCHER->cb->();
102 } 122 }
103} 123}
104 124
105sub feed_sdl_motion_event { 125sub feed_sdl_motion_event {
106 my ($ev) = @_; 126 my ($ev) = @_;
… …
112 my $hover = $HOVER; $HOVER = $widget; 132 my $hover = $HOVER; $HOVER = $widget;
113 133
114 $hover->update if $hover && $hover->{can_hover}; 134 $hover->update if $hover && $hover->{can_hover};
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 135 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 136
117 check_tooltip; 137 $TOOLTIP_WATCHER->start;
118 } 138 }
119 139
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 141 if $HOVER;
124} 142}
125 143
126# convert position array to integers 144# convert position array to integers
127sub harmonize { 145sub harmonize {
128 my ($vals) = @_; 146 my ($vals) = @_;
… …
134 $rem += $_ - $i; 152 $rem += $_ - $i;
135 $_ = $i; 153 $_ = $i;
136 } 154 }
137} 155}
138 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
139############################################################################# 198#############################################################################
140 199
141package CFClient::UI::Base; 200package CFClient::UI::Base;
142 201
143use strict; 202use strict;
… …
146 205
147sub new { 206sub new {
148 my $class = shift; 207 my $class = shift;
149 208
150 my $self = bless { 209 my $self = bless {
151 x => 0, 210 x => "center",
152 y => 0, 211 y => "center",
153 z => 0, 212 z => 0,
213 w => undef,
214 h => undef,
154 can_events => 1, 215 can_events => 1,
155 @_ 216 @_
156 }, $class; 217 }, $class;
157 218
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
220
158 for (keys %$self) { 221 for (keys %$self) {
159 if (/^connect_(.*)$/) { 222 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 223 $self->connect ($1 => delete $self->{$_});
161 } 224 }
162 } 225 }
163 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
164 $self 239 $self
165} 240}
166 241
167sub destroy { 242sub destroy {
168 my ($self) = @_; 243 my ($self) = @_;
… …
177 return if $self->{parent}; 252 return if $self->{parent};
178 253
179 $CFClient::UI::ROOT->add ($self); 254 $CFClient::UI::ROOT->add ($self);
180} 255}
181 256
182sub hide { 257sub set_visible {
183 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};
184 281
185 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 314 $self->{parent}->remove ($self)
189 if $self->{parent}; 315 if $self->{parent};
190} 316}
191 317
192sub move { 318sub move_abs {
193 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
194 320
195 $self->{x} = int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
196 $self->{y} = int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
197 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
198 324
199 $self->update; 325 $self->update;
200} 326}
201 327
202sub set_size { 328sub set_size {
203 my ($self, $w, $h) = @_; 329 my ($self, $w, $h) = @_;
204 330
205 $self->{user_w} = $w; 331 $self->{force_w} = $w;
206 $self->{user_h} = $h; 332 $self->{force_h} = $h;
207 333
208 $self->check_size; 334 $self->realloc;
209} 335}
210 336
211sub size_request { 337sub size_request {
212 require Carp; 338 require Carp;
213 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
214} 340}
215 341
342sub baseline_shift {
343 0
344}
345
216sub configure { 346sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
218 348
219 if ($self->{aspect}) { 349 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h);
351
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 352 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 353 $h = List::Util::min $h, int $w / $self->{aspect};
222 354
223 # use alignment to adjust x, y 355 # use alignment to adjust x, y
224 356
225 $x += int +($w - $w2) * 0.5; 357 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 358 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 359 }
230 360
231 if ($self->{x} != $x || $self->{y} != $y) { 361 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 362 $self->{x} = $x;
233 $self->{y} = $y; 363 $self->{y} = $y;
234 $self->update; 364 $self->update;
235 } 365 }
236 366
237 if ($self->{w} != $w || $self->{h} != $h) { 367 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 368 return unless $self->{visible};
239 }
240}
241 369
242sub size_allocate { 370 $self->{alloc_w} = $w;
243 # nothing to be done 371 $self->{alloc_h} = $h;
372
373 $self->{root}{size_alloc}{$self+0} = $self;
374 }
244} 375}
245 376
246sub children { 377sub children {
378 # nop
247} 379}
248 380
249# call when resolution changes etc. 381sub visible_children {
250sub reconfigure { 382 $_[0]->children
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 383}
260 384
261sub set_max_size { 385sub set_max_size {
262 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
263 387
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
392}
393
394sub set_tooltip {
395 my ($self, $tooltip) = @_;
396
397 $tooltip =~ s/^\s+//;
398 $tooltip =~ s/\s+$//;
399
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 }
266} 408}
267 409
268# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
269sub coord2local { 411sub coord2local {
270 my ($self, $x, $y) = @_; 412 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
278 420
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 422}
281 423
282sub focus_in { 424sub invoke_focus_in {
283 my ($self) = @_; 425 my ($self) = @_;
284 426
285 return if $FOCUS == $self; 427 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
287 429
288 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
289 431
290 $self->emit (focus_in => $focus); 432 $self->update;
291 433
292 $focus->update if $focus; 434 0
293 $FOCUS->update;
294} 435}
295 436
296sub focus_out { 437sub invoke_focus_out {
297 my ($self) = @_; 438 my ($self) = @_;
298 439
299 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
300 441
301 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
302 443
303 $self->emit (focus_out => $focus); 444 $self->update;
304 445
305 $focus->update if $focus; #? 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
306} 447 unless $FOCUS;
307 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
308sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
309sub button_up { } 460sub invoke_button_up { 0 }
310sub key_down { } 461sub invoke_key_down { 0 }
311sub key_up { } 462sub invoke_key_up { 0 }
312 463
313sub button_down { 464sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
315 466
316 $self->focus_in; 467 $self->grab_focus;
317}
318 468
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
323sub 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
324 539
325sub draw { 540sub draw {
326 my ($self) = @_; 541 my ($self) = @_;
327 542
328 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);
329 552
330 glPushMatrix; 553 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 555
335 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 558 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 560 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 561 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 579 glPopMatrix;
361 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;
362 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
363} 585}
364 586
365sub _draw { 587sub _draw {
366 my ($self) = @_; 588 my ($self) = @_;
367 589
368 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
369} 591}
370 592
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 593sub DESTROY {
418 my ($self) = @_; 594 my ($self) = @_;
419 595
420 #$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/;
421} 602}
422 603
423############################################################################# 604#############################################################################
424 605
425package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
433 my $class = shift; 614 my $class = shift;
434 615
435 # range [value, low, high, page] 616 # range [value, low, high, page]
436 617
437 $class->SUPER::new ( 618 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 619 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 620 #active_bg => [1, 1, 1, 0.5],
440 @_ 621 @_
441 ) 622 )
442} 623}
443 624
444sub _draw { 625sub _draw {
445 my ($self) = @_; 626 my ($self) = @_;
446 627
628 my $color = $FOCUS == $self && $self->{active_bg}
629 ? $self->{active_bg}
630 : $self->{bg};
631
632 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
448 634
449 glEnable GL_BLEND; 635 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 637 glColor_premultiply @$color;
452 638
453 glBegin GL_QUADS; 639 glBegin GL_QUADS;
454 glVertex 0 , 0; 640 glVertex 0 , 0;
455 glVertex 0 , $h; 641 glVertex 0 , $h;
456 glVertex $w, $h; 642 glVertex $w, $h;
457 glVertex $w, 0; 643 glVertex $w, 0;
458 glEnd; 644 glEnd;
459 645
460 glDisable GL_BLEND; 646 glDisable GL_BLEND;
647 }
461} 648}
462 649
463############################################################################# 650#############################################################################
464 651
465package CFClient::UI::Empty; 652package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 657 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 658 $class->SUPER::new (can_events => 0, %arg);
472} 659}
473 660
474sub size_request { 661sub size_request {
475 (0, 0) 662 my ($self) = @_;
663
664 ($self->{w} + 0, $self->{h} + 0)
476} 665}
477 666
478sub draw { } 667sub draw { }
479 668
480############################################################################# 669#############################################################################
… …
484our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
485 674
486sub new { 675sub new {
487 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
488 677
489 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
490 679
491 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
492 children => [], 681 children => [],
493 can_events => 0, 682 can_events => 0,
494 %arg, 683 %arg,
495 ); 684 );
685
496 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
497 688
498 $self 689 $self
499} 690}
500 691
501sub add { 692sub add {
… …
509 $self->{children} = [ 700 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 701 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 702 @{$self->{children}}, @widgets
512 ]; 703 ];
513 704
514 $self->check_size; 705 $self->realloc;
515 $self->update;
516} 706}
517 707
518sub children { 708sub children {
519 @{ $_[0]{children} } 709 @{ $_[0]{children} }
520} 710}
… …
525 delete $child->{parent}; 715 delete $child->{parent};
526 $child->hide; 716 $child->hide;
527 717
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 718 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 719
530 $self->check_size; 720 $self->realloc;
531 $self->update;
532} 721}
533 722
534sub clear { 723sub clear {
535 my ($self) = @_; 724 my ($self) = @_;
536 725
… …
540 for (@$children) { 729 for (@$children) {
541 delete $_->{parent}; 730 delete $_->{parent};
542 $_->hide; 731 $_->hide;
543 } 732 }
544 733
545 $self->check_size; 734 $self->realloc;
546 $self->update;
547} 735}
548 736
549sub find_widget { 737sub find_widget {
550 my ($self, $x, $y) = @_; 738 my ($self, $x, $y) = @_;
551 739
552 $x -= $self->{x}; 740 $x -= $self->{x};
553 $y -= $self->{y}; 741 $y -= $self->{y};
554 742
555 my $res; 743 my $res;
556 744
557 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
558 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
559 and return $res; 747 and return $res;
560 } 748 }
561 749
562 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
583} 771}
584 772
585sub add { 773sub add {
586 my ($self, $child) = @_; 774 my ($self, $child) = @_;
587 775
588 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
589
590 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
591} 778}
592 779
593sub remove { 780sub remove {
594 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
603 790
604sub size_request { 791sub size_request {
605 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
606} 793}
607 794
608sub size_allocate { 795sub invoke_size_allocate {
609 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
610 797
611 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
612} 801}
613 802
614############################################################################# 803#############################################################################
804
805# back-buffered drawing area
615 806
616package CFClient::UI::Window; 807package CFClient::UI::Window;
617 808
618our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
619 810
… …
626} 817}
627 818
628sub update { 819sub update {
629 my ($self) = @_; 820 my ($self) = @_;
630 821
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 823 $self->SUPER::update;
633} 824}
634 825
635sub size_allocate { 826sub invoke_size_allocate {
636 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
637 828
638 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
640} 832}
641 833
642sub _render { 834sub _render {
835 my ($self) = @_;
836
643 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
644} 838}
645 839
646sub render_child { 840sub render_child {
647 my ($self) = @_; 841 my ($self) = @_;
648 842
649 $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 {
650 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
652 846
847 {
848 package CFClient::UI::Base;
849
850 ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h});
852 }
853
653 $self->_render; 854 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 855 };
662} 856}
663 857
664sub _draw { 858sub _draw {
665 my ($self) = @_; 859 my ($self) = @_;
666 860
667 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
668 862
669 my $tex = $self->{texture} 863 my $tex = $self->{texture}
670 or return; 864 or return;
671 865
672 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
… …
682 876
683package CFClient::UI::ViewPort; 877package CFClient::UI::ViewPort;
684 878
685our @ISA = CFClient::UI::Window::; 879our @ISA = CFClient::UI::Window::;
686 880
881sub new {
882 my $class = shift;
883
884 $class->SUPER::new (
885 scroll_x => 0,
886 scroll_y => 1,
887 @_,
888 )
889}
890
687sub size_request { 891sub size_request {
688 my ($self) = @_; 892 my ($self) = @_;
689 893
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 894 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 895
693 @$self{qw(child_w child_h)} 896 $w = 10 if $self->{scroll_x};
694} 897 $h = 10 if $self->{scroll_y};
695 898
899 ($w, $h)
900}
901
696sub size_allocate { 902sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
698 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);
699 $self->update; 911 $self->update;
912
913 1
700} 914}
701 915
702sub set_offset { 916sub set_offset {
703 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
704 918
… …
737} 951}
738 952
739sub _render { 953sub _render {
740 my ($self) = @_; 954 my ($self) = @_;
741 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
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743 960
744 $self->SUPER::_render; 961 $self->SUPER::_render;
745} 962}
746 963
747############################################################################# 964#############################################################################
748 965
749package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
750 967
751our @ISA = CFClient::UI::HBox::; 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
985 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1),
987 slider => $slider,
988 %arg,
989 );
990
991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
993
994 $self
995}
996
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 {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
1019sub update {
1020 my ($self) = @_;
1021
1022 $self->SUPER::update;
1023
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)
1033}
1034
1035#############################################################################
1036
1037package CFClient::UI::Frame;
1038
1039our @ISA = CFClient::UI::Bin::;
1040
1041use CFClient::OpenGL;
752 1042
753sub new { 1043sub new {
754 my $class = shift; 1044 my $class = shift;
755 1045
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new ( 1046 $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 1047 bg => undef,
768 slider => $slider,
769 @_, 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) = @_;
1093
1094 my $self = $class->SUPER::new (
1095 bg => [1, 1, 1, 1],
1096 border_bg => [1, 1, 1, 1],
1097 border => 0.6,
1098 can_events => 1,
1099 min_w => 64,
1100 min_h => 32,
1101 %arg,
770 ); 1102 );
771 1103
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
807
808 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812
813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
820
821
822 $self->child->draw;
823 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D;
825}
826
827#############################################################################
828
829package CFClient::UI::FancyFrame;
830
831our @ISA = CFClient::UI::Bin::;
832
833use CFClient::OpenGL;
834
835my @tex =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838
839sub new {
840 my $class = shift;
841
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1],
847 border => 0.6,
848 can_events => 1,
849 @_
850 );
851
852 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
853 align => 0, 1105 align => 0,
854 valign => 1, 1106 valign => 1,
855 text => $self->{title}, 1107 text => $self->{title},
856 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 }
857 1119
858 $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};
859} 1129}
860 1130
861sub border { 1131sub border {
862 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
863} 1133}
864 1134
865sub size_request { 1135sub size_request {
866 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};
867 1143
868 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
869 1145
870 ( 1146 (
871 $w + $self->border * 2, 1147 $w + $self->border * 2,
872 $h + $self->border * 2, 1148 $h + $self->border * 2,
873 ) 1149 )
874} 1150}
875 1151
876sub size_allocate { 1152sub invoke_size_allocate {
877 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
878 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
879 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
881 1165
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
885 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
886}
887 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
888sub button_down { 1182sub invoke_button_down {
889 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
890 1184
891 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
892 my $border = $self->border; 1186 my $border = $self->border;
893 1187
… …
906 my ($ev, $x, $y) = @_; 1200 my ($ev, $x, $y) = @_;
907 1201
908 my $dx = $ev->{x} - $ox; 1202 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
910 1204
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1207
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size; 1209 $self->realloc;
915 }; 1210 };
916 1211
917 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1216 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
923 1218
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
925 1220
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update; 1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
928 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
929 } 1229 1
930} 1230}
931 1231
932sub button_up { 1232sub invoke_button_up {
933 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
934 1234
935 delete $self->{motion}; 1235 ! ! delete $self->{motion}
936} 1236}
937 1237
938sub mouse_motion { 1238sub invoke_mouse_motion {
939 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
940 1240
941 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
942} 1244}
943 1245
944sub _draw { 1246sub _draw {
945 my ($self) = @_; 1247 my ($self) = @_;
946 1248
1249 my $child = $self->{children}[0];
1250
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
949 1253
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1256
955 my $border = $self->border; 1257 my $border = $self->border;
956 1258
957 glColor @{ $self->{border_bg} }; 1259 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1260 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1263 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1264
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1266 glColor @{ $self->{bg} };
965 1267
966 # TODO: repeat texture not scale 1268 # TODO: repeat texture not scale
1269 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1270 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1271 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1273 }
976 1274
977 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1276
981 $self->{title}->draw if $self->{title};
982
983 $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};
984} 1288}
985 1289
986############################################################################# 1290#############################################################################
987 1291
988package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
996sub new { 1300sub new {
997 my $class = shift; 1301 my $class = shift;
998 1302
999 $class->SUPER::new ( 1303 $class->SUPER::new (
1000 col_expand => [], 1304 col_expand => [],
1001 @_ 1305 @_,
1002 ) 1306 )
1307}
1308
1309sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1311}
1004 1312
1005sub add { 1313sub add {
1006 my ($self, $x, $y, $child) = @_; 1314 my ($self, $x, $y, $child) = @_;
1007 1315
1008 $child->set_parent ($self); 1316 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1010 1318
1011 $child->check_size; 1319 $self->realloc;
1012} 1320}
1013 1321
1014sub children { 1322sub remove {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1323 my ($self, $child) = @_;
1016}
1017 1324
1325 # TODO: not yet implemented
1326}
1327
1018# 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?
1019sub clear { 1329sub clear {
1020 my ($self) = @_; 1330 my ($self) = @_;
1021 1331
1022 my @children = $self->children; 1332 my @children = $self->children;
1023 delete $self->{children}; 1333 delete $self->{children};
… …
1025 for (@children) { 1335 for (@children) {
1026 delete $_->{parent}; 1336 delete $_->{parent};
1027 $_->hide; 1337 $_->hide;
1028 } 1338 }
1029 1339
1030 $self->update; 1340 $self->realloc;
1031} 1341}
1032 1342
1033sub get_wh { 1343sub get_wh {
1034 my ($self) = @_; 1344 my ($self) = @_;
1035 1345
… …
1061 (sum @$ws), 1371 (sum @$ws),
1062 (sum @$hs), 1372 (sum @$hs),
1063 ) 1373 )
1064} 1374}
1065 1375
1066sub size_allocate { 1376sub invoke_size_allocate {
1067 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1068 1378
1069 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1070 1380
1071 my $req_w = sum @$ws; 1381 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1382 my $req_h = (sum @$hs) || 1;
1073 1383
1074 # TODO: nicer code && do row_expand 1384 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1385 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1386 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1387 my $col_expand = (sum @col_expand) || 1;
… …
1103 } 1413 }
1104 1414
1105 $y += $row_h; 1415 $y += $row_h;
1106 } 1416 }
1107 1417
1418 1
1108} 1419}
1109 1420
1110sub find_widget { 1421sub find_widget {
1111 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1112 1423
… …
1131 } 1442 }
1132} 1443}
1133 1444
1134############################################################################# 1445#############################################################################
1135 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
1136package CFClient::UI::HBox; 1507package CFClient::UI::HBox;
1137 1508
1138# TODO: wrap into common Box base class
1139
1140our @ISA = CFClient::UI::Container::; 1509our @ISA = CFClient::UI::Box::;
1141 1510
1142sub size_request { 1511sub new {
1143 my ($self) = @_; 1512 my $class = shift;
1144 1513
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1514 $class->SUPER::new (
1146 1515 vertical => 0,
1147 ( 1516 @_,
1148 (List::Util::sum map $_->[0], @alloc),
1149 (List::Util::max map $_->[1], @alloc),
1150 ) 1517 )
1151} 1518}
1152 1519
1153sub size_allocate {
1154 my ($self, $w, $h) = @_;
1155
1156 ($h, $w) = ($w, $h);
1157
1158 my $children = $self->{children};
1159
1160 my @h = map $_->{req_w}, @$children;
1161
1162 my $req_h = List::Util::sum @h;
1163
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children;
1169 $exp ||= 1;
1170
1171 for (0 .. $#$children) {
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 }
1178 }
1179
1180 CFClient::UI::harmonize \@h;
1181
1182 my $y = 0;
1183 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_];
1186 $child->configure ($y, 0, $h, $w);
1187
1188 $y += $h;
1189 }
1190
1191 1
1192}
1193
1194############################################################################# 1520#############################################################################
1195 1521
1196package CFClient::UI::VBox; 1522package CFClient::UI::VBox;
1197 1523
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1524our @ISA = CFClient::UI::Box::;
1201 1525
1202sub size_request { 1526sub new {
1203 my ($self) = @_; 1527 my $class = shift;
1204 1528
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1529 $class->SUPER::new (
1206 1530 vertical => 1,
1207 ( 1531 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1532 )
1211} 1533}
1212 1534
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1535#############################################################################
1253 1536
1254package CFClient::UI::Label; 1537package CFClient::UI::Label;
1255 1538
1256our @ISA = CFClient::UI::Base::; 1539our @ISA = CFClient::UI::DrawBG::;
1257 1540
1258use CFClient::OpenGL; 1541use CFClient::OpenGL;
1259 1542
1260sub new { 1543sub new {
1261 my ($class, %arg) = @_; 1544 my ($class, %arg) = @_;
1262 1545
1263 my $self = $class->SUPER::new ( 1546 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1547 fg => [1, 1, 1],
1548 #bg => none
1549 #active_bg => none
1265 #font => default_font 1550 #font => default_font
1266 #text => initial text 1551 #text => initial text
1267 #markup => initial narkup 1552 #markup => initial narkup
1553 #max_w => maximum pixel width
1554 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1555 layout => (new CFClient::Layout),
1269 fontsize => 1, 1556 fontsize => 1,
1270 align => -1, 1557 align => -1,
1271 valign => -1, 1558 valign => -1,
1272 padding => 2, 1559 padding_x => 2,
1560 padding_y => 2,
1273 can_events => 0, 1561 can_events => 0,
1274 %arg 1562 %arg
1275 ); 1563 );
1276 1564
1277 if (exists $self->{template}) { 1565 if (exists $self->{template}) {
… …
1287 } 1575 }
1288 1576
1289 $self 1577 $self
1290} 1578}
1291 1579
1292sub escape { 1580sub escape($) {
1293 local $_ = $_[1]; 1581 local $_ = $_[0];
1294 1582
1295 s/&/&amp;/g; 1583 s/&/&amp;/g;
1296 s/>/&gt;/g; 1584 s/>/&gt;/g;
1297 s/</&lt;/g; 1585 s/</&lt;/g;
1298 1586
1299 $_[1] 1587 $_
1300} 1588}
1301 1589
1302sub update { 1590sub update {
1303 my ($self) = @_; 1591 my ($self) = @_;
1304 1592
1305 delete $self->{texture}; 1593 delete $self->{texture};
1306 $self->SUPER::update; 1594 $self->SUPER::update;
1307} 1595}
1308 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1309sub set_text { 1604sub set_text {
1310 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1311 1606
1312 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1314 1609
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1317 1611
1612 delete $self->{size_req};
1613 $self->realloc;
1318 $self->update; 1614 $self->update;
1319 $self->check_size;
1320} 1615}
1321 1616
1322sub set_markup { 1617sub set_markup {
1323 my ($self, $markup) = @_; 1618 my ($self, $markup) = @_;
1324 1619
1325 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1327 1622
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1624
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1332 1626
1627 delete $self->{size_req};
1628 $self->realloc;
1333 $self->update; 1629 $self->update;
1334 $self->check_size;
1335} 1630}
1336 1631
1337sub size_request { 1632sub size_request {
1338 my ($self) = @_; 1633 my ($self) = @_;
1339 1634
1635 $self->{size_req} ||= do {
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $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});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1641
1344 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1345 1643
1346 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1347 $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);
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1648
1350 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1351 1650
1352 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1354 } 1656 };
1355 1657
1356 ( 1658 @{ $self->{size_req} }
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1659}
1361 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1362sub size_allocate { 1665sub invoke_size_allocate {
1363 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1364 1667
1668 delete $self->{ox};
1669
1365 delete $self->{texture}; 1670 delete $self->{texture}
1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1366} 1674}
1367 1675
1368sub set_fontsize { 1676sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1370 1678
1371 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1372 delete $self->{texture}; 1681 delete $self->{texture};
1373 1682
1374 $self->update; 1683 $self->realloc;
1375 $self->check_size; 1684}
1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1376} 1693}
1377 1694
1378sub _draw { 1695sub _draw {
1379 my ($self) = @_; 1696 my ($self) = @_;
1380 1697
1698 $self->SUPER::_draw; # draw background, if applicable
1699
1381 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $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});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1707
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1398 }; 1709 };
1399 1710
1400 glEnable GL_TEXTURE_2D; 1711 unless (exists $self->{ox}) {
1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1714 : ($self->{w} - $size->[0]) * 0.5);
1402 1715
1403 if ($tex->{format} == GL_ALPHA) { 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1404 glColor @{$self->{fg}}; 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1718 : ($self->{h} - $size->[1]) * 0.5);
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 } 1719 };
1409 1720
1410 glDisable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723
1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1411} 1725}
1412 1726
1413############################################################################# 1727#############################################################################
1414 1728
1415package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1428 active_fg => [0, 0, 0], 1742 active_fg => [0, 0, 0],
1429 can_hover => 1, 1743 can_hover => 1,
1430 can_focus => 1, 1744 can_focus => 1,
1431 valign => 0, 1745 valign => 0,
1432 can_events => 1, 1746 can_events => 1,
1747 #text => ...
1748 #hidden => "*",
1433 @_ 1749 @_
1434 ) 1750 )
1435} 1751}
1436 1752
1437sub _set_text { 1753sub _set_text {
… …
1439 1755
1440 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1441 1757
1442 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1443 1759
1444 delete $self->{texture};
1445
1446 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1447 $self->{text} = $text; 1761 $self->{text} = $text;
1448 1762
1449 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1451 1766
1452 $self->emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1453} 1771}
1454 1772
1455sub set_text { 1773sub set_text {
1456 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1457 1775
1458 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1777 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462} 1778}
1463 1779
1464sub get_text { 1780sub get_text {
1465 $_[0]{text} 1781 $_[0]{text}
1466} 1782}
… …
1471 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1472 1788
1473 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1474} 1790}
1475 1791
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480}
1481
1482sub key_down { 1792sub invoke_key_down {
1483 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1484 1794
1485 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1486 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
1488 1798
1489 my $text = $self->get_text; 1799 my $text = $self->get_text;
1490 1800
1491 if ($sym == 8) { 1801 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1803 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1804 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1805 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1806 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1807 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1808 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1813 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1814 $self->emit ('escape');
1505 } elsif ($uni) { 1815 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1507 } 1819 }
1508 1820
1509 $self->_set_text ($text); 1821 $self->_set_text ($text);
1510 $self->update;
1511}
1512 1822
1823 $self->realloc;
1824
1825 1
1826}
1827
1513sub focus_in { 1828sub invoke_focus_in {
1514 my ($self) = @_; 1829 my ($self) = @_;
1515 1830
1516 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1517 1832
1518 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1519} 1834}
1520 1835
1521sub button_down { 1836sub invoke_button_down {
1522 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1523 1838
1524 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1525 1840
1526 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1527 1842
1528 # byte-index to char-index 1843 # byte-index to char-index
1529 my $text = $self->{text}; 1844 my $text = $self->{text};
1530 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1532 1847
1533 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1534 $self->update; 1849 $self->update;
1850
1851 1
1535} 1852}
1536 1853
1537sub mouse_motion { 1854sub invoke_mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1539# 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
1540} 1859}
1541 1860
1542sub _draw { 1861sub _draw {
1543 my ($self) = @_; 1862 my ($self) = @_;
1544 1863
1545 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1546 1865
1547 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1548 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1549 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1550 } else { 1869 } else {
1551 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1552 } 1871 }
1553 1872
1554 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1555 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1556 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1557 glVertex 0 , 0; 1876 glVertex 0 , 0;
1558 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1559 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1560 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1585 1904
1586our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1587 1906
1588use CFClient::OpenGL; 1907use CFClient::OpenGL;
1589 1908
1590sub key_down { 1909sub invoke_key_down {
1591 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1592 1911
1593 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1594 1913
1595 if ($sym == 13) { 1914 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1598 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1920 $self->emit (activate => $txt);
1601 $self->update; 1921 $self->update;
1602 1922
… …
1621 } else { 1941 } else {
1622 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1623 } 1943 }
1624 1944
1625 } else { 1945 } else {
1626 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1627 } 1949 1
1628
1629} 1950}
1630 1951
1631############################################################################# 1952#############################################################################
1632 1953
1633package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1642 1963
1643sub new { 1964sub new {
1644 my $class = shift; 1965 my $class = shift;
1645 1966
1646 $class->SUPER::new ( 1967 $class->SUPER::new (
1647 padding => 4, 1968 padding_x => 4,
1969 padding_y => 4,
1648 fg => [1, 1, 1], 1970 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1971 active_fg => [0, 0, 1],
1651 can_hover => 1, 1972 can_hover => 1,
1652 align => 0, 1973 align => 0,
1653 valign => 0, 1974 valign => 0,
1654 can_events => 1, 1975 can_events => 1,
1655 @_ 1976 @_
1656 ) 1977 )
1657} 1978}
1658 1979
1659sub button_up { 1980sub invoke_button_up {
1660 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1661 1982
1983 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1985 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 1986
1665 } 1987 1
1666} 1988}
1667 1989
1668sub _draw { 1990sub _draw {
1669 my ($self) = @_; 1991 my ($self) = @_;
1670 1992
1671 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1672 1994
1673 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg};
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1682 1998
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 2000
1685 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 2002
1688 $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
1689} 2040}
1690 2041
1691############################################################################# 2042#############################################################################
1692 2043
1693package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
… …
1702 2053
1703sub new { 2054sub new {
1704 my $class = shift; 2055 my $class = shift;
1705 2056
1706 $class->SUPER::new ( 2057 $class->SUPER::new (
1707 padding => 2, 2058 padding_x => 2,
2059 padding_y => 2,
1708 fg => [1, 1, 1], 2060 fg => [1, 1, 1],
1709 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],
1710 state => 0, 2064 state => 0,
1711 can_hover => 1, 2065 can_hover => 1,
1712 @_ 2066 @_
1713 ) 2067 )
1714} 2068}
1715 2069
1716sub size_request { 2070sub size_request {
1717 my ($self) = @_; 2071 my ($self) = @_;
1718 2072
1719 ($self->{padding} * 2 + 6) x 2 2073 (6) x 2
1720} 2074}
1721 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1722sub button_down { 2084sub invoke_button_down {
1723 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1724 2086
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1727 $self->{state} = !$self->{state}; 2089 $self->toggle;
1728 $self->emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1729 } 2094 1
1730} 2095}
1731 2096
1732sub _draw { 2097sub _draw {
1733 my ($self) = @_; 2098 my ($self) = @_;
1734 2099
1735 $self->SUPER::_draw; 2100 $self->SUPER::_draw;
1736 2101
1737 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1738 2103
1739 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;
1740 2107
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 2109
1743 glEnable GL_BLEND; 2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
1744 glEnable GL_TEXTURE_2D; 2112 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 2113 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 2115}
1754 2116
1755############################################################################# 2117#############################################################################
1756 2118
1757package CFClient::UI::Image; 2119package CFClient::UI::Image;
1758 2120
1759our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1760 2122
1761use CFClient::OpenGL; 2123use CFClient::OpenGL;
1762use Carp qw/confess/;
1763 2124
1764our %loaded_images; 2125our %texture_cache;
1765 2126
1766sub new { 2127sub new {
1767 my $class = shift; 2128 my $class = shift;
1768 2129
1769 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1770 2134
1771 $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";
1772 2137
1773 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1774 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;
1775 2140
1776 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1777 2142
1778 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1779
1780 $self->{aspect} = $tex->{w} / $tex->{h};
1781 2144
1782 $self 2145 $self
1783} 2146}
1784 2147
1785sub size_request { 2148sub size_request {
1786 my ($self) = @_; 2149 my ($self) = @_;
1787 2150
1788 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1789} 2152}
1790 2153
1791sub _draw { 2154sub _draw {
1792 my ($self) = @_; 2155 my ($self) = @_;
1793 2156
… …
1800 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, -$self->{w}, 0;
1801 2164
1802 ($w, $h) = ($h, $w); 2165 ($w, $h) = ($h, $w);
1803 } 2166 }
1804 2167
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 2168 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 2170
1810 $tex->draw_quad (0, 0, $w, $h); 2171 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 2172
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
1814} 2174}
1815 2175
1816############################################################################# 2176#############################################################################
1817 2177
… …
1905 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
1906 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
1907 2267
1908 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
1909 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);
1910 2273
1911 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
1912 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;
1913 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
1914 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1915 2279
1916 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
1917 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
1932 2296
1933 if ($t3) { 2297 if ($t3) {
1934 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
1935 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
1936 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1937 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1938 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1939 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1940 glEnd; 2304 glEnd;
1941 } 2305 }
1942 2306
1943 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2370 qw(s1_slider.png s1_slider_bg.png);
2007 2371
2008sub new { 2372sub new {
2009 my $class = shift; 2373 my $class = shift;
2010 2374
2011 # range [value, low, high, page] 2375 # range [value, low, high, page, unit]
2012 2376
2013 # TODO: 0-width page 2377 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2378 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2379 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2380 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2381 fg => [1, 1, 1],
2018 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],
2019 range => [0, 0, 100, 10], 2385 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2386 min_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2387 min_h => $::WIDTH / 80,
2022 vertical => 0, 2388 vertical => 0,
2023 can_hover => 1, 2389 can_hover => 1,
2024 inner_pad => 5, 2390 inner_pad => 0.02,
2025 @_ 2391 @_
2026 ); 2392 );
2027 2393
2394 $self->set_value ($self->{range}[0]);
2395 $self->update;
2396
2028 $self 2397 $self
2029} 2398}
2030 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
2031sub size_request { 2434sub size_request {
2032 my ($self) = @_; 2435 my ($self) = @_;
2033 2436
2034 my $w = $self->{req_w}; 2437 ($self->{req_w}, $self->{req_h})
2035 my $h = $self->{req_h};
2036
2037 $self->{vertical} ? ($h, $w) : ($w, $h)
2038} 2438}
2039 2439
2040sub button_down { 2440sub invoke_button_down {
2041 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2042 2442
2043 $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
2044 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2045} 2448}
2046 2449
2047sub mouse_motion { 2450sub invoke_mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2049 2452
2050 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
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2482 my $range = ($hi - $page - $lo) || 1e-100;
2052 2483
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2484 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2485
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2486 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2487 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2488
2058 $x -= $inner_pad_px; # substract the padding 2489 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2490 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2491
2064 $self->emit (changed => $x); 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2493 $self->{knob_w} = $knob_w;
2066 } 2494 }
2067}
2068
2069# the inner_* stuff is for generating a padding for the slider handle,
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075}
2076
2077sub _draw {
2078 my ($self) = @_;
2079 2495
2080 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2081 2497
2082 my ($w, $h) = @$self{qw(w h)}; 2498 glScale $self->{w}, $self->{h};
2083 2499
2084 if ($self->{vertical}) { 2500 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2501 # draw a vertical slider like a rotated horizontal slider
2086 2502
2503 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2504 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2505 }
2092 2506
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2507 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2508 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2509
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2510 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2512
2119 # draw background 2513 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2514 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2515
2122 # draw handle 2516 # draw handle
2123 $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);
2124 2518
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
2127} 2520}
2128 2521
2129############################################################################# 2522#############################################################################
2130 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
2131package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2132 2566
2133our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2134 2568
2135use CFClient::OpenGL; 2569use CFClient::OpenGL;
2136 2570
… …
2138 my $class = shift; 2572 my $class = shift;
2139 2573
2140 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2141 fontsize => 1, 2575 fontsize => 1,
2142 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2143 #font => default_font 2578 #font => default_font
2144 @_, 2579 @_,
2145 2580
2146 layout => (new CFClient::Layout), 2581 layout => (new CFClient::Layout),
2147 par => [], 2582 par => [],
… …
2162 2597
2163 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2599 $self->reflow;
2165} 2600}
2166 2601
2167sub 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 {
2168 my ($self, $text) = @_; 2629 my ($self, $para) = @_;
2169 2630
2170 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2171 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w}); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2174 $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}}
2175 2644 );
2176 ($layout->size)[1] 2645
2646 $layout
2177} 2647}
2178 2648
2179sub reflow { 2649sub reflow {
2180 my ($self) = @_; 2650 my ($self) = @_;
2181 2651
2182 $self->{need_reflow}++; 2652 $self->{need_reflow}++;
2183 $self->update; 2653 $self->update;
2184} 2654}
2185 2655
2186sub 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 {
2187 my ($self, $w, $h) = @_; 2664 my ($self) = @_;
2188 2665
2189 $self->SUPER::size_allocate ($w, $h); 2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2190 2668
2191 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2669 $self->{par} = [];
2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2670 $self->{height} = 0;
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2194
2195 $self->reflow;
2196} 2672}
2197 2673
2198sub add_paragraph { 2674sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2200 2676
2201 #TODO: intelligently "reformat" paragraph 2677 my ($text, @w) = ref $para ? @$para : $para;
2202 2678
2203 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 };
2204 2687
2205 $self->{height} += $height; 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2206 2690
2207 push @{$self->{par}}, [$height, $color, $text]; 2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2208 2694
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2695sub scroll_to_bottom {
2210 $self->{children}[1]->update; 2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2211} 2700}
2212 2701
2213sub update { 2702sub update {
2214 my ($self) = @_; 2703 my ($self) = @_;
2215 2704
… …
2217 2706
2218 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2219 2708
2220 delete $self->{texture}; 2709 delete $self->{texture};
2221 2710
2222 $ROOT->on_refresh ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713
2223 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2715 my $height = 0;
2225 2716
2226 $height += $_->[0] = $self->text_height ($_->[2])
2227 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 }
2228 2729
2229 $self->{height} = $height; 2730 $self->{height} = $height;
2230 2731
2231 $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]);
2232 2733
2233 delete $self->{texture}; 2734 delete $self->{texture};
2234 } 2735 }
2235 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2236 $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 {
2237 glClearColor 0, 0, 0, 0; 2742 glClearColor 0, 0, 0, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2239 2744
2240 glEnable GL_BLEND;
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2246 2746
2247 my $y0 = $top; 2747 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2748 my $y1 = $top + $H;
2249 2749
2250 my $y = 0; 2750 my $y = 0;
2251 2751
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255
2256 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2257 my $h = $par->[0]; 2753 my $h = $para->{h};
2258 2754
2259 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_text ($par->[2]);
2261 2756
2262 glColor @{ $par->[1] }; 2757 my $layout = $self->get_layout ($para);
2263 my ($W, $H) = $layout->size; 2758
2264 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 }
2265 } 2773 }
2266 2774
2267 $y += $h; 2775 $y += $h;
2268 } 2776 }
2269
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND;
2272 }; 2777 };
2273 }); 2778 });
2274} 2779}
2275 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2276sub _draw { 2790sub _draw {
2277 my ($self) = @_; 2791 my ($self) = @_;
2278 2792
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2284 $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});
2285 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2798
2288 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2289
2290} 2800}
2291 2801
2292############################################################################# 2802#############################################################################
2293 2803
2294package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2339 2849
2340sub new { 2850sub new {
2341 my $class = shift; 2851 my $class = shift;
2342 2852
2343 my $self = $class->SUPER::new ( 2853 my $self = $class->SUPER::new (
2344 state => 0, 2854 state => 0,
2345 connect_activate => \&toggle_flopper, 2855 on_activate => \&toggle_flopper,
2346 @_ 2856 @_
2347 ); 2857 );
2348 2858
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 2859 $self
2355} 2860}
2356 2861
2357sub toggle_flopper { 2862sub toggle_flopper {
2358 my ($self) = @_; 2863 my ($self) = @_;
2359 2864
2360 # TODO: use animation 2865 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 2866}
2372 2867
2373############################################################################# 2868#############################################################################
2374 2869
2375package CFClient::UI::Tooltip; 2870package CFClient::UI::Tooltip;
… …
2385 @_, 2880 @_,
2386 can_events => 0, 2881 can_events => 0,
2387 ) 2882 )
2388} 2883}
2389 2884
2390sub set_markup { 2885sub set_tooltip_from {
2391 my ($self, $text) = @_; 2886 my ($self, $widget) = @_;
2392 2887
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2888 my $tooltip = $widget->{tooltip};
2394 $self->{label}->set_markup ($text); 2889
2395 $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 );
2396} 2908}
2397 2909
2398sub size_request { 2910sub size_request {
2399 my ($self) = @_; 2911 my ($self) = @_;
2400 2912
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2914
2405 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2406} 2916}
2407 2917
2408sub size_allocate { 2918sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2410 2920
2411 $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 });
2412} 2940}
2413 2941
2414sub _draw { 2942sub _draw {
2415 my ($self) = @_; 2943 my ($self) = @_;
2416 2944
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2945 glTranslate 0.375, 0.375;
2419 2946
2420 my ($w, $h) = @$self{qw(w h)}; 2947 my ($w, $h) = @$self{qw(w h)};
2421 2948
2422 glColor 1, 0.8, 0.4; 2949 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2960 glVertex 0 , $h;
2434 glVertex $w, $h; 2961 glVertex $w, $h;
2435 glVertex $w, 0; 2962 glVertex $w, 0;
2436 glEnd; 2963 glEnd;
2437 2964
2438 glPopMatrix; 2965 glTranslate 2 - 0.375, 2 - 0.375;
2439 2966
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2967 $self->SUPER::_draw;
2442} 2968}
2443 2969
2444############################################################################# 2970#############################################################################
2445 2971
… …
2450use CFClient::OpenGL; 2976use CFClient::OpenGL;
2451 2977
2452sub new { 2978sub new {
2453 my $class = shift; 2979 my $class = shift;
2454 2980
2455 $class->SUPER::new ( 2981 my $self = $class->SUPER::new (
2456 aspect => 1, 2982 aspect => 1,
2983 can_events => 0,
2457 @_, 2984 @_,
2458 ) 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
2459} 3002}
2460 3003
2461sub size_request { 3004sub size_request {
2462 (32, 8) 3005 (32, 8)
2463} 3006}
2464 3007
3008sub update {
3009 my ($self) = @_;
3010
3011 return unless $self->{visible};
3012
3013 $self->SUPER::update;
3014}
3015
2465sub _draw { 3016sub _draw {
2466 my ($self) = @_; 3017 my ($self) = @_;
2467 3018
2468 return unless $::CONN;#d# manage and cache textures differently 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
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 3031
2471 # TODO animation
2472 if ($tex) { 3032 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 3038 }
3039}
3040
3041sub destroy {
3042 my ($self) = @_;
3043
3044 $self->{timer}->cancel
3045 if $self->{timer};
3046
3047 $self->SUPER::destroy;
2482} 3048}
2483 3049
2484############################################################################# 3050#############################################################################
2485 3051
2486package CFClient::UI::InventoryItem; 3052package CFClient::UI::Buttonbar;
2487 3053
2488our @ISA = CFClient::UI::HBox::; 3054our @ISA = CFClient::UI::HBox::;
2489 3055
2490sub new { 3056# TODO: should actualyl wrap buttons and other goodies.
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592 3057
2593############################################################################# 3058#############################################################################
2594 3059
2595package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2596 3061
… …
2608 ); 3073 );
2609 3074
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611 3076
2612 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2614 3079
2615 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2616 if (!ref $widget) { 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 {
2617 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2618 can_hover => 1, 3097 can_hover => 1,
2619 can_events => 1, 3098 can_events => 1,
2620 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2621 } 3102 }
2622 3103
2623 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2624 3105
2625 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2637 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 3119 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2640 3121
2641 $self->show; 3122 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643} 3124}
2644 3125
2645sub mouse_motion { 3126sub invoke_mouse_motion {
2646 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2647 3128
2648 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2651}
2652 3132
3133 0
3134}
3135
2653sub button_up { 3136sub invoke_button_up {
2654 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2655 3138
2656 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 3140 undef $GRAB;
2658 $self->hide; 3141 $self->hide;
2659 3142
2660 $self->emit ("popdown"); 3143 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2662 } 3149 1
2663} 3150}
2664 3151
2665############################################################################# 3152#############################################################################
2666 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
2667package CFClient::UI::Statusbox; 3332package CFClient::UI::Statusbox;
2668 3333
2669our @ISA = CFClient::UI::VBox::; 3334our @ISA = CFClient::UI::VBox::;
2670 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
2671sub reorder { 3351sub reorder {
2672 my ($self) = @_; 3352 my ($self) = @_;
2673 my $NOW = time; 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} };
2674 3359
2675 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 3362 }
2678 3363
2679 my @widgets; 3364 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 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
2681 my $count = 10 + 1; 3373 my $count = 10 + 1;
2682 for my $item (@items) { 3374 for my $item (@items) {
2683 last unless --$count; 3375 last unless --$count;
2684 3376
2685 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 3379 my $short = $item->{count} > 1
3380 ? "<b>$item->{count} ×</b> $item->{text}"
3381 : $item->{text};
3382
2688 for ($short) { 3383 for ($short) {
2689 s/^\s+//; 3384 s/^\s+//;
2690 s/\012.*//s; 3385 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 3386 }
2694 3387
2695 new CFClient::UI::Label 3388 new CFClient::UI::Label
2696 markup => $short, 3389 markup => $short,
2697 tooltip => delete $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 3391 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 3392 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize},
3394 max_w => $::WIDTH * 0.44,
3395 fg => [@{ $item->{fg} }],
2700 can_events => 1, 3396 can_events => 1,
2701 can_hover => 1, 3397 can_hover => 1
2702 }; 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;
2703 } 3411 }
2704 3412
2705 $self->clear; 3413 $self->clear;
2706 $self->SUPER::add (@widgets); 3414 $self->SUPER::add (reverse @widgets);
2707} 3415}
2708 3416
2709sub add { 3417sub add {
2710 my ($self, $text, %arg) = @_; 3418 my ($self, $text, %arg) = @_;
2711 3419
2712 my $item = { 3420 $text =~ s/^\s+//;
2713 time => time, 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},
2714 text => $text, 3442 text => $text,
2715 timeout => 60, 3443 timeout => $timeout,
2716 tooltip => $text, 3444 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 3445 fg => [0.8, 0.8, 0.8, 0.8],
3446 pri => 0,
3447 count => 1,
2719 %arg, 3448 %arg,
3449 };
3450 }
3451
3452 $ROOT->on_refresh (reorder => sub {
3453 $self->reorder;
2720 }; 3454 });
3455}
2721 3456
2722 $item->{timeout} += time; 3457sub reconfigure {
2723 $item->{group} ||= $item+0; 3458 my ($self) = @_;
2724 3459
2725 $item = $self->{item}{$item->{group}} ||= $item; 3460 delete $_->{label}
3461 for values %{ $self->{item} || {} };
2726 3462
2727 $self->reorder; 3463 $self->reorder;
3464 $self->SUPER::reconfigure;
3465}
3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
2728} 3473}
2729 3474
2730############################################################################# 3475#############################################################################
2731 3476
2732package CFClient::UI::Root; 3477package CFClient::UI::Inventory;
2733 3478
2734our @ISA = CFClient::UI::Container::; 3479our @ISA = CFClient::UI::Table::;
2735
2736use CFClient::OpenGL;
2737 3480
2738sub new { 3481sub new {
2739 my $class = shift; 3482 my $class = shift;
2740 3483
2741 $class->SUPER::new ( 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 => [],
2742 @_, 3529 @_,
2743 ) 3530 )
2744} 3531}
2745 3532
2746sub configure { 3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2747 my ($self, $x, $y, $w, $h) = @_;
2748 3534
2749 $self->{w} = $w; 3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2750 $self->{h} = $h; 3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2751} 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");
2752 3545
2753sub check_size { 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 {
2754 my ($self) = @_; 3619 my ($self, $spell) = @_;
2755 3620
2756 $self->size_allocate ($self->{w}, $self->{h}) 3621 $self->{spell}->{$spell->{name}} = $spell;
2757 if $self->{w}; 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
2758} 3660}
2759 3661
2760sub size_request { 3662sub size_request {
2761 my ($self) = @_; 3663 my ($self) = @_;
2762 3664
2763 ($self->{w}, $self->{h}) 3665 ($self->{w}, $self->{h})
2764} 3666}
2765 3667
3668sub _to_pixel {
3669 my ($coord, $size, $max) = @_;
3670
3671 $coord =
3672 $coord eq "center" ? ($max - $size) * 0.5
3673 : $coord eq "max" ? $max
3674 : $coord;
3675
3676 $coord = 0 if $coord < 0;
3677 $coord = $max - $size if $coord > $max - $size;
3678
3679 int $coord + 0.5
3680}
3681
2766sub size_allocate { 3682sub invoke_size_allocate {
2767 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784 3684
2785 for my $child ($self->children) { 3685 for my $child ($self->children) {
2786 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)};
2787 3687
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3688 $X = $child->{force_x} if exists $child->{force_x};
2789 $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
2790 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
2791 } 3695 }
2792 3696
2793 $self->{old_w} = $w; 3697 1
2794 $self->{old_h} = $h;
2795} 3698}
2796 3699
2797sub coord2local { 3700sub coord2local {
2798 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
2799 3702
… …
2807} 3710}
2808 3711
2809sub update { 3712sub update {
2810 my ($self) = @_; 3713 my ($self) = @_;
2811 3714
2812 $self->check_size;
2813 $::WANT_REFRESH++; 3715 $::WANT_REFRESH++;
2814} 3716}
2815 3717
2816sub add { 3718sub add {
2817 my ($self, $child) = @_; 3719 my ($self, @children) = @_;
2818 3720
2819 # integerise window positions 3721 $_->{is_toplevel} = 1
2820 $child->{x} = int $child->{x}; 3722 for @children;
2821 $child->{y} = int $child->{y};
2822 3723
2823 $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 }
2824} 3740}
2825 3741
2826sub on_refresh { 3742sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3743 my ($self, $id, $cb) = @_;
2828 3744
2829 $self->{refresh_hook}{$id} = $cb; 3745 $self->{refresh_hook}{$id} = $cb;
2830} 3746}
2831 3747
3748sub on_post_alloc {
3749 my ($self, $id, $cb) = @_;
3750
3751 $self->{post_alloc_hook}{$id} = $cb;
3752}
3753
2832sub draw { 3754sub draw {
2833 my ($self) = @_; 3755 my ($self) = @_;
2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878 3756
2879 while ($self->{refresh_hook}) { 3757 while ($self->{refresh_hook}) {
2880 $_->() 3758 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
2882 } 3760 }
2883 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
3859
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3860 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3862 glClear GL_COLOR_BUFFER_BIT;
2887 3863
2888 glMatrixMode GL_PROJECTION; 3864 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3865 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3868 glLoadIdentity;
2893 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
2894 $self->_draw; 3877 $self->_draw;
2895} 3878}
2896 3879
2897############################################################################# 3880#############################################################################
2898 3881
2899package CFClient::UI; 3882package CFClient::UI;
2900 3883
2901$ROOT = new CFClient::UI::Root; 3884$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3885$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3886
29041 38871
2905 3888

Diff Legend

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