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

Diff Legend

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