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

Diff Legend

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