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

Diff Legend

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