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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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