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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 2006 UTC

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

Diff Legend

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