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

Diff Legend

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