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

Diff Legend

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