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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 2006 UTC

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

Diff Legend

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