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.344 by root, Sun Aug 13 16:29:36 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);
813
814 my $tex = $self->{texture} 914 my $tex = $self->{texture}
815 or return; 915 or return;
816 916
817 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819 glColor 1, 1, 1, 1; 919 glColor 0, 0, 0, 1;
820 920
821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
822 922
823 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
824} 924}
825 925
826############################################################################# 926#############################################################################
827 927
828package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
829 929
830our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
831 931
832sub new { 932sub new {
833 my $class = shift; 933 my $class = shift;
834 934
835 $class->SUPER::new ( 935 $class->SUPER::new (
… …
840} 940}
841 941
842sub size_request { 942sub size_request {
843 my ($self) = @_; 943 my ($self) = @_;
844 944
845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
846 946
847 $w = 10 if $self->{scroll_x}; 947 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
849 949
850 ($w, $h) 950 ($w, $h)
851} 951}
852 952
853sub size_allocate { 953sub invoke_size_allocate {
854 my ($self, $w, $h, $changed) = @_; 954 my ($self, $w, $h) = @_;
855 955
956 my $child = $self->child;
957
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 960
859 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
860 $self->update; 962 $self->update;
963
964 1
861} 965}
862 966
863sub set_offset { 967sub set_offset {
864 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
865 969
… …
891 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
892 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
893 ) { 997 ) {
894 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
895 } else { 999 } else {
896 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
897 } 1001 }
898} 1002}
899 1003
900sub _render { 1004sub _render {
901 my ($self) = @_; 1005 my ($self) = @_;
902 1006
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1009
903 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904 1011
905 $self->SUPER::_render; 1012 $self->SUPER::_render;
906} 1013}
907 1014
908############################################################################# 1015#############################################################################
909 1016
910package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
911 1018
912our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
913 1020
914sub new { 1021sub new {
915 my $class = shift; 1022 my ($class, %arg) = @_;
1023
1024 my $child = delete $arg{child};
916 1025
917 my $self; 1026 my $self;
918 1027
919 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
920 vertical => 1, 1029 vertical => 1,
921 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
922 on_changed => sub { 1031 on_changed => sub {
923 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
924 }, 1033 },
925 ; 1034 ;
926 1035
927 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
928 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
929 slider => $slider, 1039 slider => $slider,
930 @_, 1040 %arg,
931 ); 1041 );
932 1042
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
1044 $self->add ($child) if $child;
936 1045
937 $self 1046 $self
938} 1047}
939 1048
1049#TODO# update range on size_allocate depending on child
1050
1051sub add {
1052 my ($self, $widget) = @_;
1053
1054 $self->{vp}->add ($self->{child} = $widget);
1055}
1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
940sub update { 1073sub update {
941 my ($self) = @_; 1074 my ($self) = @_;
942 1075
943 $self->SUPER::update; 1076 $self->SUPER::update;
944 1077
945 # todo: overwrite size_allocate of child 1078 $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} 1079}
949 1080
950sub size_allocate { 1081sub invoke_size_allocate {
951 my ($self, $w, $h, $changed) = @_; 1082 my ($self, $w, $h) = @_;
952 1083
1084 $self->update_slider;
1085
953 $self->SUPER::size_allocate ($w, $h, $changed); 1086 $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} 1087}
958
959#TODO# update range on size_allocate depending on child
960# update viewport offset on scroll
961 1088
962############################################################################# 1089#############################################################################
963 1090
964package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
965 1092
966our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
967 1094
968use CFClient::OpenGL; 1095use CFPlus::OpenGL;
969 1096
970sub new { 1097sub new {
971 my $class = shift; 1098 my $class = shift;
972 1099
973 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
981 1108
982 if ($self->{bg}) { 1109 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)}; 1110 my ($w, $h) = @$self{qw(w h)};
984 1111
985 glEnable GL_BLEND; 1112 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} }; 1114 glColor_premultiply @{ $self->{bg} };
988 1115
989 glBegin GL_QUADS; 1116 glBegin GL_QUADS;
990 glVertex 0 , 0; 1117 glVertex 0 , 0;
991 glVertex 0 , $h; 1118 glVertex 0 , $h;
992 glVertex $w, $h; 1119 glVertex $w, $h;
… …
999 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1000} 1127}
1001 1128
1002############################################################################# 1129#############################################################################
1003 1130
1004package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1005 1132
1006our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1007 1134
1008use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1009 1136
1010my @tex = 1137my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1;
1140
1141my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1142 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); 1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013 1144
1014sub new { 1145sub new {
1015 my $class = shift; 1146 my ($class, %arg) = @_;
1016 1147
1017 my $self = $class->SUPER::new ( 1148 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1149 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1150 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1151 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1152 can_events => 1,
1023 @_ 1153 min_w => 64,
1154 min_h => 32,
1155 %arg,
1024 ); 1156 );
1025 1157
1026 $self->{title} &&= new CFClient::UI::Label 1158 $self->{title_widget} = new CFPlus::UI::Label
1027 align => 0, 1159 align => 0,
1028 valign => 1, 1160 valign => 1,
1029 text => $self->{title}, 1161 text => $self->{title},
1030 fontsize => $self->{border}; 1162 fontsize => $self->{border},
1163 if exists $self->{title};
1164
1165 if ($self->{has_close_button}) {
1166 $self->{close_button} =
1167 new CFPlus::UI::ImageButton
1168 path => 'x1_close.png',
1169 on_activate => sub { $self->emit ("delete") };
1170
1171 $self->CFPlus::UI::Container::add ($self->{close_button});
1172 }
1031 1173
1032 $self 1174 $self
1175}
1176
1177sub add {
1178 my ($self, @widgets) = @_;
1179
1180 $self->SUPER::add (@widgets);
1181 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1182 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1033} 1183}
1034 1184
1035sub border { 1185sub border {
1036 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
1037} 1187}
1038 1188
1039sub size_request { 1189sub size_request {
1040 my ($self) = @_; 1190 my ($self) = @_;
1191
1192 $self->{title_widget}->size_request
1193 if $self->{title_widget};
1194
1195 $self->{close_button}->size_request
1196 if $self->{close_button};
1041 1197
1042 my ($w, $h) = $self->SUPER::size_request; 1198 my ($w, $h) = $self->SUPER::size_request;
1043 1199
1044 ( 1200 (
1045 $w + $self->border * 2, 1201 $w + $self->border * 2,
1046 $h + $self->border * 2, 1202 $h + $self->border * 2,
1047 ) 1203 )
1048} 1204}
1049 1205
1050sub size_allocate { 1206sub invoke_size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1207 my ($self, $w, $h) = @_;
1052 1208
1053 return unless $changed; 1209 if ($self->{title_widget}) {
1210 $self->{title_widget}{w} = $w;
1211 $self->{title_widget}{h} = $h;
1212 $self->{title_widget}->invoke_size_allocate ($w, $h);
1213 }
1054 1214
1215 my $border = $self->border;
1216
1055 $h -= List::Util::max 0, $self->border * 2; 1217 $h -= List::Util::max 0, $border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1218 $w -= List::Util::max 0, $border * 2;
1057 1219
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); 1220 $self->child->configure ($border, $border, $w, $h);
1062}
1063 1221
1222 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1223 if $self->{close_button};
1224
1225 1
1226}
1227
1228sub invoke_delete {
1229 my ($self) = @_;
1230
1231 $self->hide;
1232
1233 1
1234}
1235
1064sub button_down { 1236sub invoke_button_down {
1065 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1066 1238
1067 my ($w, $h) = @$self{qw(w h)}; 1239 my ($w, $h) = @$self{qw(w h)};
1068 my $border = $self->border; 1240 my $border = $self->border;
1069 1241
… …
1082 my ($ev, $x, $y) = @_; 1254 my ($ev, $x, $y) = @_;
1083 1255
1084 my $dx = $ev->{x} - $ox; 1256 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1257 my $dy = $ev->{y} - $oy;
1086 1258
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1259 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1260 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1261
1262 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 $self->realloc; 1263 $self->realloc;
1093 }; 1264 };
1094 1265
1095 } elsif ($lr ^ $td) { 1266 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1267 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1099 $self->{motion} = sub { 1270 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1271 my ($ev, $x, $y) = @_;
1101 1272
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1273 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1274
1104 $self->{user_x} = $bx + $x - $ox; 1275 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy; 1276 # HACK: the next line is required to enforce placement
1106 1277 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1278 };
1279 } else {
1280 return 0;
1281 }
1282
1110 } 1283 1
1111} 1284}
1112 1285
1113sub button_up { 1286sub invoke_button_up {
1114 my ($self, $ev, $x, $y) = @_; 1287 my ($self, $ev, $x, $y) = @_;
1115 1288
1116 delete $self->{motion}; 1289 ! ! delete $self->{motion}
1117} 1290}
1118 1291
1119sub mouse_motion { 1292sub invoke_mouse_motion {
1120 my ($self, $ev, $x, $y) = @_; 1293 my ($self, $ev, $x, $y) = @_;
1121 1294
1122 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1295 $self->{motion}->($ev, $x, $y) if $self->{motion};
1296
1297 ! ! $self->{motion}
1298}
1299
1300sub invoke_visibility_change {
1301 my ($self, $visible) = @_;
1302
1303 delete $self->{motion} unless $visible;
1304
1305 0
1123} 1306}
1124 1307
1125sub _draw { 1308sub _draw {
1126 my ($self) = @_; 1309 my ($self) = @_;
1127 1310
1311 my $child = $self->{children}[0];
1312
1128 my ($w, $h ) = ($self->{w}, $self->{h}); 1313 my ($w, $h ) = ($self->{w}, $self->{h});
1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1314 my ($cw, $ch) = ($child->{w}, $child->{h});
1130 1315
1131 glEnable GL_TEXTURE_2D; 1316 glEnable GL_TEXTURE_2D;
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1318
1134 my $border = $self->border; 1319 my $border = $self->border;
1135 1320
1136 glColor @{ $self->{border_bg} }; 1321 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1322 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1326
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1328 glColor @{ $self->{bg} };
1144 1329
1145 # TODO: repeat texture not scale 1330 # TODO: repeat texture not scale
1331 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1332 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1333 $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); 1334 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1335 }
1156 1336
1157 glDisable GL_TEXTURE_2D; 1337 glDisable GL_TEXTURE_2D;
1158 1338
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1339 $child->draw;
1340
1341 if ($self->{title_widget}) {
1342 glTranslate 0, $border - $self->{h};
1343 $self->{title_widget}->_draw;
1344
1345 glTranslate 0, - ($border - $self->{h});
1346 }
1347
1348 $self->{close_button}->draw
1349 if $self->{close_button};
1162} 1350}
1163 1351
1164############################################################################# 1352#############################################################################
1165 1353
1166package CFClient::UI::Table; 1354package CFPlus::UI::Table;
1167 1355
1168our @ISA = CFClient::UI::Base::; 1356our @ISA = CFPlus::UI::Base::;
1169 1357
1170use List::Util qw(max sum); 1358use List::Util qw(max sum);
1171 1359
1172use CFClient::OpenGL; 1360use CFPlus::OpenGL;
1173 1361
1174sub new { 1362sub new {
1175 my $class = shift; 1363 my $class = shift;
1176 1364
1177 $class->SUPER::new ( 1365 $class->SUPER::new (
… …
1183sub children { 1371sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1185} 1373}
1186 1374
1187sub add { 1375sub add {
1188 my ($self, $x, $y, $child) = @_; 1376 my ($self) = shift;
1189 1377
1378 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, ();
1190 $child->set_parent ($self); 1380 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1381 $self->{children}[$y][$x] = $child;
1382 }
1192 1383
1384 $self->{force_realloc} = 1;
1385 $self->{force_size_alloc} = 1;
1193 $self->realloc; 1386 $self->realloc;
1387}
1388
1389sub remove {
1390 my ($self, $child) = @_;
1391
1392 # TODO: not yet implemented
1194} 1393}
1195 1394
1196# TODO: move to container class maybe? send children a signal on removal? 1395# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1396sub clear {
1198 my ($self) = @_; 1397 my ($self) = @_;
… …
1239 (sum @$ws), 1438 (sum @$ws),
1240 (sum @$hs), 1439 (sum @$hs),
1241 ) 1440 )
1242} 1441}
1243 1442
1244sub size_allocate { 1443sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1246 1445
1247 my ($ws, $hs) = $self->get_wh; 1446 my ($ws, $hs) = $self->get_wh;
1248 1447
1249 my $req_w = (sum @$ws) || 1; 1448 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1449 my $req_h = (sum @$hs) || 1;
… …
1256 1455
1257 # linearly scale sizes 1456 # linearly scale sizes
1258 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1259 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1260 1459
1261 CFClient::UI::harmonize $ws; 1460 CFPlus::UI::harmonize $ws;
1262 CFClient::UI::harmonize $hs; 1461 CFPlus::UI::harmonize $hs;
1263 1462
1264 my $y; 1463 my $y;
1265 1464
1266 for my $r (0 .. $#{$self->{children}}) { 1465 for my $r (0 .. $#{$self->{children}}) {
1267 my $row = $self->{children}[$r] 1466 my $row = $self->{children}[$r]
… …
1281 } 1480 }
1282 1481
1283 $y += $row_h; 1482 $y += $row_h;
1284 } 1483 }
1285 1484
1485 1
1286} 1486}
1287 1487
1288sub find_widget { 1488sub find_widget {
1289 my ($self, $x, $y) = @_; 1489 my ($self, $x, $y) = @_;
1290 1490
… …
1309 } 1509 }
1310} 1510}
1311 1511
1312############################################################################# 1512#############################################################################
1313 1513
1314package CFClient::UI::Box; 1514package CFPlus::UI::Box;
1315 1515
1316our @ISA = CFClient::UI::Container::; 1516our @ISA = CFPlus::UI::Container::;
1317 1517
1318sub size_request { 1518sub size_request {
1319 my ($self) = @_; 1519 my ($self) = @_;
1320 1520
1321 $self->{vertical} 1521 $self->{vertical}
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1528 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1529 )
1330} 1530}
1331 1531
1332sub size_allocate { 1532sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1533 my ($self, $w, $h) = @_;
1334 1534
1335 my $space = $self->{vertical} ? $h : $w; 1535 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1536 my @children = $self->visible_children;
1337 1537
1338 my @req; 1538 my @req;
1339 1539
1340 if ($self->{homogeneous}) { 1540 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1541 @req = ($space / (@children || 1)) x @children;
1342 } else { 1542 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1543 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1544 my $req = List::Util::sum @req;
1345 1545
1346 if ($req > $space) { 1546 if ($req > $space) {
1347 # ah well, not enough space 1547 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1548 $_ *= $space / $req for @req;
1349 } else { 1549 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1550 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1551
1352 $space = ($space - $req) / $expand; # remaining space to give away 1552 $space = ($space - $req) / $expand; # remaining space to give away
1353 1553
1354 $req[$_] += $space * $children->[$_]{expand} 1554 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1555 for 0 .. $#children;
1356 } 1556 }
1357 } 1557 }
1358 1558
1359 CFClient::UI::harmonize \@req; 1559 CFPlus::UI::harmonize \@req;
1360 1560
1361 my $pos = 0; 1561 my $pos = 0;
1362 for (0 .. $#$children) { 1562 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1563 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1564 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1565
1366 $pos += $alloc; 1566 $pos += $alloc;
1367 } 1567 }
1368 1568
1369 1 1569 1
1370} 1570}
1371 1571
1372############################################################################# 1572#############################################################################
1373 1573
1374package CFClient::UI::HBox; 1574package CFPlus::UI::HBox;
1375 1575
1376our @ISA = CFClient::UI::Box::; 1576our @ISA = CFPlus::UI::Box::;
1377 1577
1378sub new { 1578sub new {
1379 my $class = shift; 1579 my $class = shift;
1380 1580
1381 $class->SUPER::new ( 1581 $class->SUPER::new (
… …
1384 ) 1584 )
1385} 1585}
1386 1586
1387############################################################################# 1587#############################################################################
1388 1588
1389package CFClient::UI::VBox; 1589package CFPlus::UI::VBox;
1390 1590
1391our @ISA = CFClient::UI::Box::; 1591our @ISA = CFPlus::UI::Box::;
1392 1592
1393sub new { 1593sub new {
1394 my $class = shift; 1594 my $class = shift;
1395 1595
1396 $class->SUPER::new ( 1596 $class->SUPER::new (
… …
1399 ) 1599 )
1400} 1600}
1401 1601
1402############################################################################# 1602#############################################################################
1403 1603
1404package CFClient::UI::Label; 1604package CFPlus::UI::Label;
1405 1605
1406our @ISA = CFClient::UI::DrawBG::; 1606our @ISA = CFPlus::UI::DrawBG::;
1407 1607
1408use CFClient::OpenGL; 1608use CFPlus::OpenGL;
1409 1609
1410sub new { 1610sub new {
1411 my ($class, %arg) = @_; 1611 my ($class, %arg) = @_;
1412 1612
1413 my $self = $class->SUPER::new ( 1613 my $self = $class->SUPER::new (
… …
1416 #active_bg => none 1616 #active_bg => none
1417 #font => default_font 1617 #font => default_font
1418 #text => initial text 1618 #text => initial text
1419 #markup => initial narkup 1619 #markup => initial narkup
1420 #max_w => maximum pixel width 1620 #max_w => maximum pixel width
1621 #style => 0, # render flags
1421 ellipsise => 3, # end 1622 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1423 fontsize => 1, 1624 fontsize => 1,
1424 align => -1, 1625 align => -1,
1425 valign => -1, 1626 valign => -1,
1426 padding => 2, 1627 padding_x => 2,
1628 padding_y => 2,
1427 can_events => 0, 1629 can_events => 0,
1428 %arg 1630 %arg
1429 ); 1631 );
1430 1632
1431 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1432 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1433 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1434 $self->{template} = $layout; 1636 $self->{template} = $layout;
1435 } 1637 }
1436 1638
1437 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1441 } 1643 }
1442 1644
1443 $self 1645 $self
1444} 1646}
1445 1647
1446sub escape($) {
1447 local $_ = $_[0];
1448
1449 s/&/&amp;/g;
1450 s/>/&gt;/g;
1451 s/</&lt;/g;
1452
1453 $_
1454}
1455
1456sub update { 1648sub update {
1457 my ($self) = @_; 1649 my ($self) = @_;
1458 1650
1459 delete $self->{texture}; 1651 delete $self->{texture};
1460 $self->SUPER::update; 1652 $self->SUPER::update;
1461} 1653}
1462 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1463sub set_text { 1662sub set_text {
1464 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1465 1664
1466 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1468 1667
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1471 1669
1670 delete $self->{size_req};
1472 $self->realloc; 1671 $self->realloc;
1473 $self->update; 1672 $self->update;
1474} 1673}
1475 1674
1476sub set_markup { 1675sub set_markup {
… …
1479 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1481 1680
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1682
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1486 1684
1685 delete $self->{size_req};
1487 $self->realloc; 1686 $self->realloc;
1488 $self->update; 1687 $self->update;
1489} 1688}
1490 1689
1491sub size_request { 1690sub size_request {
1492 my ($self) = @_; 1691 my ($self) = @_;
1493 1692
1693 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1699
1500 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1501 1701
1502 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1706
1506 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1507 1708
1508 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1510 } 1714 };
1511 1715
1512 ( 1716 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1717}
1517 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1518sub size_allocate { 1723sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1724 my ($self, $w, $h) = @_;
1725
1726 delete $self->{ox};
1520 1727
1521 delete $self->{texture} 1728 delete $self->{texture}
1522 if $changed; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1523} 1732}
1524 1733
1525sub set_fontsize { 1734sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1527 1736
1528 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1529 delete $self->{texture}; 1739 delete $self->{texture};
1530 1740
1531 $self->realloc; 1741 $self->realloc;
1532} 1742}
1533 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1534sub _draw { 1753sub _draw {
1535 my ($self) = @_; 1754 my ($self) = @_;
1536 1755
1537 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1538 1757
1539 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1541 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1542 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1765
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1766 [$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 }; 1767 };
1559 1768
1560 glEnable GL_TEXTURE_2D; 1769 unless (exists $self->{ox}) {
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1772 : ($self->{w} - $size->[0]) * 0.5);
1562 1773
1563 if ($tex->{format} == GL_ALPHA) { 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 glColor @{$self->{fg}}; 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1776 : ($self->{h} - $size->[1]) * 0.5);
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 } 1777 };
1569 1778
1570 glDisable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781
1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1571} 1783}
1572 1784
1573############################################################################# 1785#############################################################################
1574 1786
1575package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1576 1788
1577our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1578 1790
1579use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1580 1792
1581sub new { 1793sub new {
1582 my $class = shift; 1794 my $class = shift;
1583 1795
1584 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1589 can_hover => 1, 1801 can_hover => 1,
1590 can_focus => 1, 1802 can_focus => 1,
1591 valign => 0, 1803 valign => 0,
1592 can_events => 1, 1804 can_events => 1,
1593 #text => ... 1805 #text => ...
1806 #hidden => "*",
1594 @_ 1807 @_
1595 ) 1808 )
1596} 1809}
1597 1810
1598sub _set_text { 1811sub _set_text {
… …
1600 1813
1601 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1602 1815
1603 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1604 1817
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1819 $self->{text} = $text;
1609 1820
1610 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1612 1824
1613 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1614} 1829}
1615 1830
1616sub set_text { 1831sub set_text {
1617 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1618 1833
1619 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1835 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1836}
1624 1837
1625sub get_text { 1838sub get_text {
1626 $_[0]{text} 1839 $_[0]{text}
1627} 1840}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1633 1846
1634 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1635} 1848}
1636 1849
1637sub key_down { 1850sub invoke_key_down {
1638 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1639 1852
1640 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1645 1858
1646 if ($uni == 8) { 1859 if ($uni == 8) {
1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1648 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1649 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1650 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1651 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1652 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1653 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1655 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1657 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1872 $self->emit ('escape');
1660 } elsif ($uni) { 1873 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else {
1876 return 0;
1662 } 1877 }
1663 1878
1664 $self->_set_text ($text); 1879 $self->_set_text ($text);
1665 1880
1666 $self->realloc; 1881 $self->realloc;
1667}
1668 1882
1883 1
1884}
1885
1669sub focus_in { 1886sub invoke_focus_in {
1670 my ($self) = @_; 1887 my ($self) = @_;
1671 1888
1672 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1673 1890
1674 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1675} 1892}
1676 1893
1677sub button_down { 1894sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1679 1896
1680 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1898
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1900
1684 # byte-index to char-index 1901 # byte-index to char-index
1685 my $text = $self->{text}; 1902 my $text = $self->{text};
1686 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1688 1905
1689 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1690 $self->update; 1907 $self->update;
1908
1909 1
1691} 1910}
1692 1911
1693sub mouse_motion { 1912sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1915
1916 1
1696} 1917}
1697 1918
1698sub _draw { 1919sub _draw {
1699 my ($self) = @_; 1920 my ($self) = @_;
1700 1921
1701 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1702 1923
1703 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1706 } else { 1927 } else {
1707 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1708 } 1929 }
1709 1930
1710 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1934 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1727 utf8::encode $text; 1948 utf8::encode $text;
1728 1949
1729 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1730 } 1951 }
1731 1952
1732 glColor @{$self->{fg}};
1733 glBegin GL_LINES; 1953 glBegin GL_LINES;
1734 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1735 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1736 glEnd; 1956 glEnd;
1737 } 1957 }
1738} 1958}
1739 1959
1740package CFClient::UI::Entry; 1960package CFPlus::UI::Entry;
1741 1961
1742our @ISA = CFClient::UI::EntryBase::; 1962our @ISA = CFPlus::UI::EntryBase::;
1743 1963
1744use CFClient::OpenGL; 1964use CFPlus::OpenGL;
1745 1965
1746sub key_down { 1966sub invoke_key_down {
1747 my ($self, $ev) = @_; 1967 my ($self, $ev) = @_;
1748 1968
1749 my $sym = $ev->{sym}; 1969 my $sym = $ev->{sym};
1750 1970
1751 if ($sym == 13) { 1971 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1972 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1973 my $txt = $self->get_text;
1974
1754 $self->{history_pointer} = -1; 1975 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1976 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1977 $self->emit (activate => $txt);
1757 $self->update; 1978 $self->update;
1758 1979
1759 } elsif ($sym == CFClient::SDLK_UP) { 1980 } elsif ($sym == CFPlus::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1981 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1982 $self->{history_saveback} = $self->get_text;
1762 } 1983 }
1763 if (@{$self->{history} || []} > 0) { 1984 if (@{$self->{history} || []} > 0) {
1764 $self->{history_pointer}++; 1985 $self->{history_pointer}++;
… …
1766 $self->{history_pointer} = @{$self->{history} || []} - 1; 1987 $self->{history_pointer} = @{$self->{history} || []} - 1;
1767 } 1988 }
1768 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1989 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1769 } 1990 }
1770 1991
1771 } elsif ($sym == CFClient::SDLK_DOWN) { 1992 } elsif ($sym == CFPlus::SDLK_DOWN) {
1772 $self->{history_pointer}--; 1993 $self->{history_pointer}--;
1773 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1994 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1774 1995
1775 if ($self->{history_pointer} >= 0) { 1996 if ($self->{history_pointer} >= 0) {
1776 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1997 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1777 } else { 1998 } else {
1778 $self->set_text ($self->{history_saveback}); 1999 $self->set_text ($self->{history_saveback});
1779 } 2000 }
1780 2001
1781 } else { 2002 } else {
1782 $self->SUPER::key_down ($ev); 2003 return $self->SUPER::invoke_key_down ($ev)
2004 }
2005
1783 } 2006 1
1784
1785} 2007}
1786 2008
1787############################################################################# 2009#############################################################################
1788 2010
1789package CFClient::UI::Button; 2011package CFPlus::UI::Button;
1790 2012
1791our @ISA = CFClient::UI::Label::; 2013our @ISA = CFPlus::UI::Label::;
1792 2014
1793use CFClient::OpenGL; 2015use CFPlus::OpenGL;
1794 2016
1795my @tex = 2017my @tex =
1796 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1797 qw(b1_button_active.png); 2019 qw(b1_button_active.png);
1798 2020
1799sub new { 2021sub new {
1800 my $class = shift; 2022 my $class = shift;
1801 2023
1802 $class->SUPER::new ( 2024 $class->SUPER::new (
1803 padding => 4, 2025 padding_x => 4,
2026 padding_y => 4,
1804 fg => [1, 1, 1], 2027 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 2028 active_fg => [0, 0, 1],
1806 can_hover => 1, 2029 can_hover => 1,
1807 align => 0, 2030 align => 0,
1808 valign => 0, 2031 valign => 0,
1809 can_events => 1, 2032 can_events => 1,
1810 @_ 2033 @_
1811 ) 2034 )
1812} 2035}
1813 2036
1814sub activate { }
1815
1816sub button_up { 2037sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 2038 my ($self, $ev, $x, $y) = @_;
1818 2039
1819 $self->emit ("activate") 2040 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 2041 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 2042 && $y >= 0 && $y < $self->{h};
2043
2044 1
1822} 2045}
1823 2046
1824sub _draw { 2047sub _draw {
1825 my ($self) = @_; 2048 my ($self) = @_;
1826 2049
1827 local $self->{fg} = $self->{fg}; 2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 2051
1833 glEnable GL_TEXTURE_2D; 2052 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 2054 glColor 0, 0, 0, 1;
1836 2055
… …
1841 $self->SUPER::_draw; 2060 $self->SUPER::_draw;
1842} 2061}
1843 2062
1844############################################################################# 2063#############################################################################
1845 2064
1846package CFClient::UI::CheckBox; 2065package CFPlus::UI::CheckBox;
1847 2066
1848our @ISA = CFClient::UI::DrawBG::; 2067our @ISA = CFPlus::UI::DrawBG::;
1849 2068
1850my @tex = 2069my @tex =
1851 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2070 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1852 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2071 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1853 2072
1854use CFClient::OpenGL; 2073use CFPlus::OpenGL;
1855 2074
1856sub new { 2075sub new {
1857 my $class = shift; 2076 my $class = shift;
1858 2077
1859 $class->SUPER::new ( 2078 $class->SUPER::new (
1860 padding => 2, 2079 padding_x => 2,
2080 padding_y => 2,
1861 fg => [1, 1, 1], 2081 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2082 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2083 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2084 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2085 state => 0,
… …
1869} 2089}
1870 2090
1871sub size_request { 2091sub size_request {
1872 my ($self) = @_; 2092 my ($self) = @_;
1873 2093
1874 ($self->{padding} * 2 + 6) x 2 2094 (6) x 2
1875} 2095}
1876 2096
2097sub toggle {
2098 my ($self) = @_;
2099
2100 $self->{state} = !$self->{state};
2101 $self->emit (changed => $self->{state});
2102 $self->update;
2103}
2104
1877sub button_down { 2105sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2106 my ($self, $ev, $x, $y) = @_;
1879 2107
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2108 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2109 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2110 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2111 } else {
2112 return 0
2113 }
2114
1884 } 2115 1
1885} 2116}
1886 2117
1887sub _draw { 2118sub _draw {
1888 my ($self) = @_; 2119 my ($self) = @_;
1889 2120
1890 $self->SUPER::_draw; 2121 $self->SUPER::_draw;
1891 2122
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2123 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2124
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2125 my ($w, $h) = @$self{qw(w h)};
2126
2127 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2128
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2129 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2130
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2131 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2132
… …
1902 glDisable GL_TEXTURE_2D; 2135 glDisable GL_TEXTURE_2D;
1903} 2136}
1904 2137
1905############################################################################# 2138#############################################################################
1906 2139
1907package CFClient::UI::Image; 2140package CFPlus::UI::Image;
1908 2141
1909our @ISA = CFClient::UI::Base::; 2142our @ISA = CFPlus::UI::Base::;
1910 2143
1911use CFClient::OpenGL; 2144use CFPlus::OpenGL;
1912use Carp qw/confess/;
1913 2145
1914our %loaded_images; 2146our %texture_cache;
1915 2147
1916sub new { 2148sub new {
1917 my $class = shift; 2149 my $class = shift;
1918 2150
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2151 my $self = $class->SUPER::new (
2152 can_events => 0,
2153 @_,
2154 );
1920 2155
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2156 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required";
1922 2158
1923 $loaded_images{$self->{image}} ||= 2159 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1925 2161
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2162 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2163
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2165
1932 $self 2166 $self
1933} 2167}
1934 2168
2169sub STORABLE_freeze {
2170 my ($self, $cloning) = @_;
2171
2172 $self->{path}
2173 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2174
2175 $self->{path}
2176}
2177
2178sub STORABLE_attach {
2179 my ($self, $cloning, $path) = @_;
2180
2181 $self->new (path => $path)
2182}
2183
1935sub size_request { 2184sub size_request {
1936 my ($self) = @_; 2185 my ($self) = @_;
1937 2186
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2187 ($self->{tex}{w}, $self->{tex}{h})
1939} 2188}
1940 2189
1941sub _draw { 2190sub _draw {
1942 my ($self) = @_; 2191 my ($self) = @_;
1943 2192
… …
1953 } 2202 }
1954 2203
1955 glEnable GL_TEXTURE_2D; 2204 glEnable GL_TEXTURE_2D;
1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1957 2206
1958 $tex->draw_quad_alpha (0, 0, $w, $h); 2207 $tex->draw_quad (0, 0, $w, $h);
1959 2208
1960 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
1961} 2210}
1962 2211
1963############################################################################# 2212#############################################################################
1964 2213
2214package CFPlus::UI::ImageButton;
2215
2216our @ISA = CFPlus::UI::Image::;
2217
2218use CFPlus::OpenGL;
2219
2220my %textures;
2221
2222sub new {
2223 my $class = shift;
2224
2225 my $self = $class->SUPER::new (
2226 padding_x => 4,
2227 padding_y => 4,
2228 fg => [1, 1, 1],
2229 active_fg => [0, 0, 1],
2230 can_hover => 1,
2231 align => 0,
2232 valign => 0,
2233 can_events => 1,
2234 @_
2235 );
2236}
2237
2238sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_;
2240
2241 $self->emit ("activate")
2242 if $x >= 0 && $x < $self->{w}
2243 && $y >= 0 && $y < $self->{h};
2244
2245 1
2246}
2247
2248#############################################################################
2249
1965package CFClient::UI::VGauge; 2250package CFPlus::UI::VGauge;
1966 2251
1967our @ISA = CFClient::UI::Base::; 2252our @ISA = CFPlus::UI::Base::;
1968 2253
1969use List::Util qw(min max); 2254use List::Util qw(min max);
1970 2255
1971use CFClient::OpenGL; 2256use CFPlus::OpenGL;
1972 2257
1973my %tex = ( 2258my %tex = (
1974 food => [ 2259 food => [
1975 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2260 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1976 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2261 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1977 ], 2262 ],
1978 grace => [ 2263 grace => [
1979 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2264 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/ 2265 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1981 ], 2266 ],
1982 hp => [ 2267 hp => [
1983 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2268 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1984 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2269 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1985 ], 2270 ],
1986 mana => [ 2271 mana => [
1987 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2272 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/ 2273 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1989 ], 2274 ],
1990); 2275);
1991 2276
1992# eg. VGauge->new (gauge => 'food'), default gauge: food 2277# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2337 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2338 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2339
2055 my $h1 = $self->{h} * (1 - $ycut1); 2340 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2341 my $h2 = $self->{h} * (1 - $ycut2);
2342 my $h3 = $self->{h};
2343
2344 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057 2345
2058 glEnable GL_BLEND; 2346 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2347 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2348 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2349 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2351
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2352 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2353 glBegin GL_QUADS;
… …
2079 2368
2080 if ($t3) { 2369 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2370 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2371 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2372 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2373 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2374 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2375 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2376 glEnd;
2088 } 2377 }
2089 2378
2090 glDisable GL_BLEND; 2379 glDisable GL_BLEND;
2091 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2092} 2381}
2093 2382
2094############################################################################# 2383#############################################################################
2095 2384
2096package CFClient::UI::Gauge; 2385package CFPlus::UI::Gauge;
2097 2386
2098our @ISA = CFClient::UI::VBox::; 2387our @ISA = CFPlus::UI::VBox::;
2099 2388
2100sub new { 2389sub new {
2101 my ($class, %arg) = @_; 2390 my ($class, %arg) = @_;
2102 2391
2103 my $self = $class->SUPER::new ( 2392 my $self = $class->SUPER::new (
… …
2105 can_hover => 1, 2394 can_hover => 1,
2106 can_events => 1, 2395 can_events => 1,
2107 %arg, 2396 %arg,
2108 ); 2397 );
2109 2398
2110 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2399 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2111 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2400 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2112 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2401 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2113 2402
2114 $self 2403 $self
2115} 2404}
2116 2405
2117sub set_fontsize { 2406sub set_fontsize {
… …
2138 $self->{value}->set_text ($val); 2427 $self->{value}->set_text ($val);
2139} 2428}
2140 2429
2141############################################################################# 2430#############################################################################
2142 2431
2143package CFClient::UI::Slider; 2432package CFPlus::UI::Slider;
2144 2433
2145use strict; 2434use strict;
2146 2435
2147use CFClient::OpenGL; 2436use CFPlus::OpenGL;
2148 2437
2149our @ISA = CFClient::UI::DrawBG::; 2438our @ISA = CFPlus::UI::DrawBG::;
2150 2439
2151my @tex = 2440my @tex =
2152 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2153 qw(s1_slider.png s1_slider_bg.png); 2442 qw(s1_slider.png s1_slider_bg.png);
2154 2443
2155sub new { 2444sub new {
2156 my $class = shift; 2445 my $class = shift;
2157 2446
… …
2164 fg => [1, 1, 1], 2453 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2454 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2455 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2456 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2457 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2458 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2459 min_h => $::WIDTH / 80,
2171 vertical => 0, 2460 vertical => 0,
2172 can_hover => 1, 2461 can_hover => 1,
2173 inner_pad => 0.02, 2462 inner_pad => 0.02,
2174 @_ 2463 @_
2175 ); 2464 );
… …
2178 $self->update; 2467 $self->update;
2179 2468
2180 $self 2469 $self
2181} 2470}
2182 2471
2183sub changed { }
2184
2185sub set_range { 2472sub set_range {
2186 my ($self, $range) = @_; 2473 my ($self, $range) = @_;
2187 2474
2188 ($range, $self->{range}) = ($self->{range}, $range); 2475 ($range, $self->{range}) = ($self->{range}, $range);
2189 2476
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2477 if ("@$range" ne "@{$self->{range}}") {
2478 $self->update;
2479 $self->set_value ($self->{range}[0]);
2480 }
2192} 2481}
2193 2482
2194sub set_value { 2483sub set_value {
2195 my ($self, $value) = @_; 2484 my ($self, $value) = @_;
2196 2485
… …
2207 if $unit; 2496 if $unit;
2208 2497
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2498 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2499
2211 if ($value != $old_value) { 2500 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2501 $self->emit (changed => $value);
2213 $self->update; 2502 $self->update;
2214 } 2503 }
2215} 2504}
2216 2505
2217sub size_request { 2506sub size_request {
2218 my ($self) = @_; 2507 my ($self) = @_;
2219 2508
2220 my $w = $self->{req_w}; 2509 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2510}
2225 2511
2226sub button_down { 2512sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2513 my ($self, $ev, $x, $y) = @_;
2228 2514
2229 $self->SUPER::button_down ($ev, $x, $y); 2515 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2516
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2518
2233 $self->mouse_motion ($ev, $x, $y); 2519 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2520}
2235 2521
2236sub mouse_motion { 2522sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2523 my ($self, $ev, $x, $y) = @_;
2238 2524
2239 if ($GRAB == $self) { 2525 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2526 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2527
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2528 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2529
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2530 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2531
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2532 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2533 } else {
2534 return 0;
2535 }
2536
2247 } 2537 1
2538}
2539
2540sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_;
2542
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2546
2547 ! ! $delta
2248} 2548}
2249 2549
2250sub update { 2550sub update {
2251 my ($self) = @_; 2551 my ($self) = @_;
2252 2552
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2553 delete $self->{knob_w};
2554 $self->SUPER::update;
2555}
2556
2557sub _draw {
2558 my ($self) = @_;
2559
2560 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2561 $self->set_value ($self->{range}[0]);
2255 2562
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2563 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2564 my $range = ($hi - $page - $lo) || 1e-100;
2258 2565
… …
2264 $value = ($value - $lo) / $range; 2571 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2572 $value = $value * $self->{scale} + $self->{offset};
2266 2573
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2574 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2575 $self->{knob_w} = $knob_w;
2269 }); 2576 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2577
2277 $self->SUPER::_draw (); 2578 $self->SUPER::_draw ();
2278 2579
2279 glScale $self->{w}, $self->{h}; 2580 glScale $self->{w}, $self->{h};
2280 2581
… …
2300 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2301} 2602}
2302 2603
2303############################################################################# 2604#############################################################################
2304 2605
2305package CFClient::UI::ValSlider; 2606package CFPlus::UI::ValSlider;
2306 2607
2307our @ISA = CFClient::UI::HBox::; 2608our @ISA = CFPlus::UI::HBox::;
2308 2609
2309sub new { 2610sub new {
2310 my ($class, %arg) = @_; 2611 my ($class, %arg) = @_;
2311 2612
2312 my $range = delete $arg{range}; 2613 my $range = delete $arg{range};
2313 2614
2314 my $self = $class->SUPER::new ( 2615 my $self = $class->SUPER::new (
2315 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2616 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2316 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2617 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2317 to_value => sub { shift }, 2618 to_value => sub { shift },
2318 from_value => sub { shift }, 2619 from_value => sub { shift },
2319 %arg, 2620 %arg,
2320 ); 2621 );
2321 2622
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2642sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2643sub set_value { shift->{slider}->set_value (@_) }
2343 2644
2344############################################################################# 2645#############################################################################
2345 2646
2346package CFClient::UI::TextView; 2647package CFPlus::UI::TextScroller;
2347 2648
2348our @ISA = CFClient::UI::HBox::; 2649our @ISA = CFPlus::UI::HBox::;
2349 2650
2350use CFClient::OpenGL; 2651use CFPlus::OpenGL;
2351 2652
2352sub new { 2653sub new {
2353 my $class = shift; 2654 my $class = shift;
2354 2655
2355 my $self = $class->SUPER::new ( 2656 my $self = $class->SUPER::new (
2356 fontsize => 1, 2657 fontsize => 1,
2357 can_events => 0, 2658 can_events => 1,
2659 indent => 0,
2358 #font => default_font 2660 #font => default_font
2359 @_, 2661 @_,
2360 2662
2361 layout => (new CFClient::Layout 1), 2663 layout => (new CFPlus::Layout),
2362 par => [], 2664 par => [],
2363 height => 0, 2665 height => 0,
2364 children => [ 2666 children => [
2365 (new CFClient::UI::Empty expand => 1), 2667 (new CFPlus::UI::Empty expand => 1),
2366 (new CFClient::UI::Slider vertical => 1), 2668 (new CFPlus::UI::Slider vertical => 1),
2367 ], 2669 ],
2368 ); 2670 );
2369 2671
2370 $self->{children}[1]->connect (changed => sub { $self->update }); 2672 $self->{children}[1]->connect (changed => sub { $self->update });
2371 2673
… …
2377 2679
2378 $self->{fontsize} = $fontsize; 2680 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2681 $self->reflow;
2380} 2682}
2381 2683
2684sub size_request {
2685 my ($self) = @_;
2686
2687 my ($empty, $slider) = @{ $self->{children} };
2688
2689 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request
2691}
2692
2382sub size_allocate { 2693sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2694 my ($self, $w, $h) = @_;
2384 2695
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2696 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2697 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2698
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2699 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2701 $self->{layout}->set_width ($empty->{w});
2702 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2703
2393 $self->reflow; 2704 $self->reflow;
2394}
2395 2705
2396sub text_size { 2706 local $self->{children} = [$empty, $slider];
2707 $self->SUPER::invoke_size_allocate ($w, $h)
2708}
2709
2710sub invoke_mouse_wheel {
2397 my ($self, $text, $indent) = @_; 2711 my ($self, $ev) = @_;
2712
2713 return 0 unless $ev->{dy}; # only vertical movements
2714
2715 $self->{children}[1]->emit (mouse_wheel => $ev);
2716
2717 1
2718}
2719
2720sub get_layout {
2721 my ($self, $para) = @_;
2398 2722
2399 my $layout = $self->{layout}; 2723 my $layout = $self->{layout};
2400 2724
2725 $layout->set_font ($self->{font}) if $self->{font};
2726 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2727 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2728 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2729 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2730 $layout->set_markup ($para->{markup});
2731
2732 $layout->set_shapes (
2733 map
2734 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2735 @{$para->{widget}}
2404 2736 );
2737
2405 $layout->size 2738 $layout
2406} 2739}
2407 2740
2408sub reflow { 2741sub reflow {
2409 my ($self) = @_; 2742 my ($self) = @_;
2410 2743
… …
2419 $self->{children}[1]->set_value ($offset); 2752 $self->{children}[1]->set_value ($offset);
2420} 2753}
2421 2754
2422sub clear { 2755sub clear {
2423 my ($self) = @_; 2756 my ($self) = @_;
2757
2758 my (undef, undef, @other) = @{ $self->{children} };
2759 $self->remove ($_) for @other;
2424 2760
2425 $self->{par} = []; 2761 $self->{par} = [];
2426 $self->{height} = 0; 2762 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2763 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2764}
2429 2765
2430sub add_paragraph { 2766sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2767 my $self = shift;
2432 2768
2433 for my $line (split /\n/, $text) { 2769 for my $para (@_) {
2434 my ($w, $h) = $self->text_size ($line); 2770 $para = {
2435 $self->{height} += $h; 2771 fg => [1, 1, 1, 1],
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2772 indent => 0,
2437 } 2773 markup => "",
2774 widget => [],
2775 ref $para ? %$para : (markup => $para),
2776 w => 1e10,
2777 wrapped => 1,
2778 };
2438 2779
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para;
2782 }
2783
2784 $self->{need_reflow}++;
2785 $self->update;
2786}
2787
2788sub scroll_to_bottom {
2789 my ($self) = @_;
2790
2791 $self->{scroll_to_bottom} = 1;
2792 $self->update;
2440} 2793}
2441 2794
2442sub update { 2795sub update {
2443 my ($self) = @_; 2796 my ($self) = @_;
2444 2797
… …
2446 2799
2447 return unless $self->{h} > 0; 2800 return unless $self->{h} > 0;
2448 2801
2449 delete $self->{texture}; 2802 delete $self->{texture};
2450 2803
2451 $ROOT->on_post_alloc ($self, sub { 2804 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2806
2454 if (delete $self->{need_reflow}) { 2807 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2808 my $height = 0;
2456 2809
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2812 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2813 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2814
2467 $_->[1] = $h; 2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2468 } 2818 }
2469 2819
2470 $height += $_->[1]; 2820 $height += $para->{h};
2471 } 2821 }
2472 2822
2473 $self->{height} = $height; 2823 $self->{height} = $height;
2474 2824
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2826
2477 delete $self->{texture}; 2827 delete $self->{texture};
2478 } 2828 }
2479 2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2835 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2836 glClear GL_COLOR_BUFFER_BIT;
2483 2837
2484 my $top = int $self->{children}[1]{range}[0]; 2838 my $top = int $self->{children}[1]{range}[0];
2485 2839
2486 my $y0 = $top; 2840 my $y0 = $top;
2487 my $y1 = $top + $H; 2841 my $y1 = $top + $H;
2488 2842
2489 my $y = 0; 2843 my $y = 0;
2490 2844
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}}) { 2845 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2846 my $h = $para->{h};
2501 2847
2502 if ($y0 < $y + $h && $y < $y1) { 2848 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 2849
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2850 my $layout = $self->get_layout ($para);
2508 2851
2509 glRasterPos $par->[3], $y - $y0; 2852 $layout->render ($para->{indent}, $y - $y0);
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2853
2854 if (my @w = @{ $para->{widget} }) {
2855 my @s = $layout->get_shapes;
2856
2857 for (@w) {
2858 my ($dx, $dy) = splice @s, 0, 2, ();
2859
2860 $_->{x} = $dx + $para->{indent};
2861 $_->{y} = $dy + $y - $y0;
2862
2863 $_->draw;
2864 }
2865 }
2511 } 2866 }
2512 2867
2513 $y += $h; 2868 $y += $h;
2514 } 2869 }
2515
2516 glDisable GL_BLEND;
2517 }; 2870 };
2518 }); 2871 });
2519} 2872}
2520 2873
2874sub reconfigure {
2875 my ($self) = @_;
2876
2877 $self->SUPER::reconfigure;
2878
2879 $_->{w} = 1e10 for @{ $self->{par} };
2880 $self->reflow;
2881}
2882
2521sub _draw { 2883sub _draw {
2522 my ($self) = @_; 2884 my ($self) = @_;
2523 2885
2524 glEnable GL_TEXTURE_2D; 2886 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2888 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2889 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2890 glDisable GL_TEXTURE_2D;
2529 2891
2530 $self->{children}[1]->draw; 2892 $self->{children}[1]->draw;
2531
2532} 2893}
2533 2894
2534############################################################################# 2895#############################################################################
2535 2896
2536package CFClient::UI::Animator; 2897package CFPlus::UI::Animator;
2537 2898
2538use CFClient::OpenGL; 2899use CFPlus::OpenGL;
2539 2900
2540our @ISA = CFClient::UI::Bin::; 2901our @ISA = CFPlus::UI::Bin::;
2541 2902
2542sub moveto { 2903sub moveto {
2543 my ($self, $x, $y) = @_; 2904 my ($self, $x, $y) = @_;
2544 2905
2545 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2906 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2573 glPopMatrix; 2934 glPopMatrix;
2574} 2935}
2575 2936
2576############################################################################# 2937#############################################################################
2577 2938
2578package CFClient::UI::Flopper; 2939package CFPlus::UI::Flopper;
2579 2940
2580our @ISA = CFClient::UI::Button::; 2941our @ISA = CFPlus::UI::Button::;
2581 2942
2582sub new { 2943sub new {
2583 my $class = shift; 2944 my $class = shift;
2584 2945
2585 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2597 $self->{other}->toggle_visibility; 2958 $self->{other}->toggle_visibility;
2598} 2959}
2599 2960
2600############################################################################# 2961#############################################################################
2601 2962
2602package CFClient::UI::Tooltip; 2963package CFPlus::UI::Tooltip;
2603 2964
2604our @ISA = CFClient::UI::Bin::; 2965our @ISA = CFPlus::UI::Bin::;
2605 2966
2606use CFClient::OpenGL; 2967use CFPlus::OpenGL;
2607 2968
2608sub new { 2969sub new {
2609 my $class = shift; 2970 my $class = shift;
2610 2971
2611 $class->SUPER::new ( 2972 $class->SUPER::new (
… …
2615} 2976}
2616 2977
2617sub set_tooltip_from { 2978sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2979 my ($self, $widget) = @_;
2619 2980
2981 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2982 if $widget->{tooltip} =~ /^#(.*)$/;
2983
2984 my $tooltip = $widget->{tooltip};
2985
2986 if ($ENV{CFPLUS_DEBUG} & 2) {
2987 $tooltip .= "\n\n" . (ref $widget) . "\n"
2988 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2989 . "req $widget->{req_w} $widget->{req_h}\n"
2990 . "visible $widget->{visible}";
2991 }
2992
2993 $tooltip =~ s/^\n+//;
2994 $tooltip =~ s/\n+$//;
2995
2620 $self->add (new CFClient::UI::Label 2996 $self->add (new CFPlus::UI::Label
2621 markup => $widget->{tooltip}, 2997 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2998 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2999 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 3000 style => 1, # FLAG_INVERSE
2625 ellipsise => 0, 3001 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 3002 font => ($widget->{tooltip_font} || $::FONT_PROP),
2627 ); 3003 );
2628} 3004}
2629 3005
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3009 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 3010
2635 ($w + 4, $h + 4) 3011 ($w + 4, $h + 4)
2636} 3012}
2637 3013
2638sub size_allocate { 3014sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 3015 my ($self, $w, $h) = @_;
2640 3016
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3017 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3018}
3019
3020sub invoke_visibility_change {
3021 my ($self, $visible) = @_;
3022
3023 return unless $visible;
3024
3025 $self->{root}->on_post_alloc ("move_$self" => sub {
3026 my $widget = $self->{owner}
3027 or return;
3028
3029 if ($widget->{visible}) {
3030 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3031
3032 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3033 if $x + $self->{w} > $self->{root}{w};
3034
3035 $self->move_abs ($x, $y);
3036 } else {
3037 $self->hide;
3038 }
3039 });
2644} 3040}
2645 3041
2646sub _draw { 3042sub _draw {
2647 my ($self) = @_; 3043 my ($self) = @_;
2648 3044
… …
2671 $self->SUPER::_draw; 3067 $self->SUPER::_draw;
2672} 3068}
2673 3069
2674############################################################################# 3070#############################################################################
2675 3071
2676package CFClient::UI::Face; 3072package CFPlus::UI::Face;
2677 3073
2678our @ISA = CFClient::UI::Base::; 3074our @ISA = CFPlus::UI::DrawBG::;
2679 3075
2680use CFClient::OpenGL; 3076use CFPlus::OpenGL;
2681 3077
2682sub new { 3078sub new {
2683 my $class = shift; 3079 my $class = shift;
2684 3080
2685 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2720sub _draw { 3116sub _draw {
2721 my ($self) = @_; 3117 my ($self) = @_;
2722 3118
2723 return unless $::CONN; 3119 return unless $::CONN;
2724 3120
3121 $self->SUPER::_draw;
3122
2725 my $face; 3123 my $face;
2726 3124
2727 if ($self->{frame}) { 3125 if ($self->{frame}) {
2728 my $anim = $::CONN->{anim}[$self->{anim}]; 3126 my $anim = $::CONN->{anim}[$self->{anim}];
2729 3127
… …
2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735 3133
2736 if ($tex) { 3134 if ($tex) {
2737 glEnable GL_TEXTURE_2D; 3135 glEnable GL_TEXTURE_2D;
2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739 glColor 1, 1, 1, 1; 3137 glColor 0, 0, 0, 1;
2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741 glDisable GL_TEXTURE_2D; 3139 glDisable GL_TEXTURE_2D;
2742 } 3140 }
2743} 3141}
2744 3142
2745sub DESTROY { 3143sub destroy {
2746 my ($self) = @_; 3144 my ($self) = @_;
2747 3145
2748 $self->{timer}->cancel 3146 $self->{timer}->cancel
2749 if $self->{timer}; 3147 if $self->{timer};
2750 3148
2751 $self->SUPER::DESTROY; 3149 $self->SUPER::destroy;
2752} 3150}
2753 3151
2754############################################################################# 3152#############################################################################
2755 3153
2756package CFClient::UI::Inventory; 3154package CFPlus::UI::Buttonbar;
2757 3155
2758our @ISA = CFClient::UI::ScrolledWindow::; 3156our @ISA = CFPlus::UI::HBox::;
2759 3157
2760sub new { 3158# 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 3159
2796############################################################################# 3160#############################################################################
2797 3161
2798package CFClient::UI::Menu; 3162package CFPlus::UI::Menu;
2799 3163
2800our @ISA = CFClient::UI::FancyFrame::; 3164our @ISA = CFPlus::UI::FancyFrame::;
2801 3165
2802use CFClient::OpenGL; 3166use CFPlus::OpenGL;
2803 3167
2804sub new { 3168sub new {
2805 my $class = shift; 3169 my $class = shift;
2806 3170
2807 my $self = $class->SUPER::new ( 3171 my $self = $class->SUPER::new (
2808 items => [], 3172 items => [],
2809 z => 100, 3173 z => 100,
2810 @_, 3174 @_,
2811 ); 3175 );
2812 3176
2813 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3177 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2814 3178
2815 for my $item (@{ $self->{items} }) { 3179 for my $item (@{ $self->{items} }) {
2816 my ($widget, $cb) = @$item; 3180 my ($widget, $cb, $tooltip) = @$item;
2817 3181
2818 # handle various types of items, only text for now 3182 # handle various types of items, only text for now
2819 if (!ref $widget) { 3183 if (!ref $widget) {
3184 if ($widget =~ /\t/) {
3185 my ($left, $right) = split /\t/, $widget, 2;
3186
2820 $widget = new CFClient::UI::Label 3187 $widget = new CFPlus::UI::HBox
2821 can_hover => 1, 3188 can_hover => 1,
2822 can_events => 1, 3189 can_events => 1,
3190 tooltip => $tooltip,
3191 children => [
3192 (new CFPlus::UI::Label markup => $left, expand => 1),
3193 (new CFPlus::UI::Label markup => $right, align => +1),
3194 ],
3195 ;
3196
3197 } else {
3198 $widget = new CFPlus::UI::Label
3199 can_hover => 1,
3200 can_events => 1,
2823 text => $widget; 3201 markup => $widget,
3202 tooltip => $tooltip;
3203 }
2824 } 3204 }
2825 3205
2826 $self->{item}{$widget} = $item; 3206 $self->{item}{$widget} = $item;
2827 3207
2828 $self->{vbox}->add ($widget); 3208 $self->{vbox}->add ($widget);
… …
2833 3213
2834# popup given the event (must be a mouse button down event currently) 3214# popup given the event (must be a mouse button down event currently)
2835sub popup { 3215sub popup {
2836 my ($self, $ev) = @_; 3216 my ($self, $ev) = @_;
2837 3217
2838 $self->_emit ("popdown"); 3218 $self->emit ("popdown");
2839 3219
2840 # maybe save $GRAB? must be careful about events... 3220 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 3221 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 3222 $self->{button} = $ev->{button};
2843 3223
2844 $self->show; 3224 $self->show;
2845 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3225 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2846} 3226}
2847 3227
2848sub mouse_motion { 3228sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2850 3230
2851 # TODO: should use vbox->find_widget or so 3231 # TODO: should use vbox->find_widget or so
2852 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3232 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853 $self->{hover} = $self->{item}{$HOVER}; 3233 $self->{hover} = $self->{item}{$HOVER};
2854}
2855 3234
3235 0
3236}
3237
2856sub button_up { 3238sub invoke_button_up {
2857 my ($self, $ev, $x, $y) = @_; 3239 my ($self, $ev, $x, $y) = @_;
2858 3240
2859 if ($ev->{button} == $self->{button}) { 3241 if ($ev->{button} == $self->{button}) {
2860 undef $GRAB; 3242 undef $GRAB;
2861 $self->hide; 3243 $self->hide;
2862 3244
2863 $self->_emit ("popdown"); 3245 $self->emit ("popdown");
2864 $self->{hover}[1]->() if $self->{hover}; 3246 $self->{hover}[1]->() if $self->{hover};
3247 } else {
3248 return 0
3249 }
3250
2865 } 3251 1
2866} 3252}
2867 3253
2868############################################################################# 3254#############################################################################
2869 3255
2870package CFClient::UI::Statusbox; 3256package CFPlus::UI::Multiplexer;
2871 3257
2872our @ISA = CFClient::UI::VBox::; 3258our @ISA = CFPlus::UI::Container::;
2873 3259
2874sub new { 3260sub new {
2875 my $class = shift; 3261 my $class = shift;
2876 3262
2877 $class->SUPER::new ( 3263 my $self = $class->SUPER::new (
3264 @_,
3265 );
3266
3267 $self->{current} = $self->{children}[0]
3268 if @{ $self->{children} };
3269
3270 $self
3271}
3272
3273sub add {
3274 my ($self, @widgets) = @_;
3275
3276 $self->SUPER::add (@widgets);
3277
3278 $self->{current} = $self->{children}[0]
3279 if @{ $self->{children} };
3280}
3281
3282sub get_current_page {
3283 my ($self) = @_;
3284
3285 $self->{current}
3286}
3287
3288sub set_current_page {
3289 my ($self, $page_or_widget) = @_;
3290
3291 my $widget = ref $page_or_widget
3292 ? $page_or_widget
3293 : $self->{children}[$page_or_widget];
3294
3295 $self->{current} = $widget;
3296 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3297
3298 $self->emit (page_changed => $self->{current});
3299
3300 $self->realloc;
3301}
3302
3303sub visible_children {
3304 $_[0]{current}
3305}
3306
3307sub size_request {
3308 my ($self) = @_;
3309
3310 $self->{current}->size_request
3311}
3312
3313sub invoke_size_allocate {
3314 my ($self, $w, $h) = @_;
3315
3316 $self->{current}->configure (0, 0, $w, $h);
3317
3318 1
3319}
3320
3321sub _draw {
3322 my ($self) = @_;
3323
3324 $self->{current}->draw;
3325}
3326
3327#############################################################################
3328
3329package CFPlus::UI::Notebook;
3330
3331our @ISA = CFPlus::UI::VBox::;
3332
3333sub new {
3334 my $class = shift;
3335
3336 my $self = $class->SUPER::new (
3337 buttonbar => (new CFPlus::UI::Buttonbar),
3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3339 # filter => # will be put between multiplexer and $self
3340 @_,
3341 );
3342
3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3344 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3345
3346 $self
3347}
3348
3349sub add {
3350 my ($self, $title, $widget, $tooltip) = @_;
3351
3352 Scalar::Util::weaken $self;
3353
3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title,
3356 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) },
3358 );
3359
3360 $self->{multiplexer}->add ($widget);
3361}
3362
3363sub get_current_page {
3364 my ($self) = @_;
3365
3366 $self->{multiplexer}->get_current_page
3367}
3368
3369sub set_current_page {
3370 my ($self, $page) = @_;
3371
3372 $self->{multiplexer}->set_current_page ($page);
3373 $self->emit (page_changed => $self->{multiplexer}{current});
3374}
3375
3376#############################################################################
3377
3378package CFPlus::UI::Selector;
3379
3380use utf8;
3381
3382our @ISA = CFPlus::UI::Button::;
3383
3384sub new {
3385 my $class = shift;
3386
3387 my $self = $class->SUPER::new (
3388 options => [], # [value, title, longdesc], ...
3389 value => undef,
3390 @_,
3391 );
3392
3393 $self->_set_value ($self->{value});
3394
3395 $self
3396}
3397
3398sub invoke_button_down {
3399 my ($self, $ev) = @_;
3400
3401 my @menu_items;
3402
3403 for (@{ $self->{options} }) {
3404 my ($value, $title, $tooltip) = @$_;
3405
3406 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3407 }
3408
3409 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3410}
3411
3412sub _set_value {
3413 my ($self, $value) = @_;
3414
3415 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3416 or return;
3417
3418 $self->{value} = $item->[0];
3419 $self->set_markup ("$item->[1] ⇓");
3420 $self->set_tooltip ($item->[2]);
3421}
3422
3423sub set_value {
3424 my ($self, $value) = @_;
3425
3426 return unless $self->{value} ne $value;
3427
3428 $self->_set_value ($value);
3429 $self->emit (changed => $value);
3430}
3431
3432#############################################################################
3433
3434package CFPlus::UI::Statusbox;
3435
3436our @ISA = CFPlus::UI::VBox::;
3437
3438sub new {
3439 my $class = shift;
3440
3441 my $self = $class->SUPER::new (
2878 fontsize => 0.8, 3442 fontsize => 0.8,
2879 @_, 3443 @_,
2880 ) 3444 );
3445
3446 Scalar::Util::weaken (my $this = $self);
3447
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449
3450 $self
2881} 3451}
2882 3452
2883sub reorder { 3453sub reorder {
2884 my ($self) = @_; 3454 my ($self) = @_;
2885 my $NOW = time; 3455 my $NOW = Time::HiRes::time;
3456
3457 # freeze display when hovering over any label
3458 return if $CFPlus::UI::TOOLTIP->{owner}
3459 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3460 values %{ $self->{item} };
2886 3461
2887 while (my ($k, $v) = each %{ $self->{item} }) { 3462 while (my ($k, $v) = each %{ $self->{item} }) {
2888 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3463 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889 } 3464 }
2890 3465
… …
2893 my @items = sort { 3468 my @items = sort {
2894 $a->{pri} <=> $b->{pri} 3469 $a->{pri} <=> $b->{pri}
2895 or $b->{id} <=> $a->{id} 3470 or $b->{id} <=> $a->{id}
2896 } values %{ $self->{item} }; 3471 } values %{ $self->{item} };
2897 3472
3473 $self->{timer}->interval (1);
3474
2898 my $count = 10 + 1; 3475 my $count = 10 + 1;
2899 for my $item (@items) { 3476 for my $item (@items) {
2900 last unless --$count; 3477 last unless --$count;
2901 3478
2902 push @widgets, $item->{label} ||= do { 3479 my $label = $item->{label} ||= do {
2903 # TODO: doesn't handle markup well (read as: at all) 3480 # TODO: doesn't handle markup well (read as: at all)
2904 my $short = $item->{count} > 1 3481 my $short = $item->{count} > 1
2905 ? "<b>$item->{count} ×</b> $item->{text}" 3482 ? "<b>$item->{count} ×</b> $item->{text}"
2906 : $item->{text}; 3483 : $item->{text};
2907 3484
2908 for ($short) { 3485 for ($short) {
2909 s/^\s+//; 3486 s/^\s+//;
2910 s/\s+/ /g; 3487 s/\s+/ /g;
2911 } 3488 }
2912 3489
2913 new CFClient::UI::Label 3490 new CFPlus::UI::Label
2914 markup => $short, 3491 markup => $short,
2915 tooltip => $item->{tooltip}, 3492 tooltip => $item->{tooltip},
2916 tooltip_font => $::FONT_PROP, 3493 tooltip_font => $::FONT_PROP,
2917 tooltip_width => 0.67, 3494 tooltip_width => 0.67,
2918 fontsize => $item->{fontsize} || $self->{fontsize}, 3495 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44, 3496 max_w => $::WIDTH * 0.44,
2920 fg => $item->{fg}, 3497 fg => [@{ $item->{fg} }],
2921 can_events => 1, 3498 can_events => 1,
2922 can_hover => 1 3499 can_hover => 1
2923 }; 3500 };
3501
3502 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3503 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3504 $label->update;
3505 $label->set_max_size (undef, $label->{req_h} * $diff)
3506 if $diff < 1;
3507 $self->{timer}->interval (1/30);
3508 } else {
3509 $label->{fg}[3] = $item->{fg}[3] || 1;
3510 }
3511
3512 push @widgets, $label;
2924 } 3513 }
2925 3514
2926 $self->clear; 3515 $self->clear;
2927 $self->SUPER::add (reverse @widgets); 3516 $self->SUPER::add (reverse @widgets);
2928} 3517}
… …
2933 $text =~ s/^\s+//; 3522 $text =~ s/^\s+//;
2934 $text =~ s/\s+$//; 3523 $text =~ s/\s+$//;
2935 3524
2936 return unless $text; 3525 return unless $text;
2937 3526
2938 my $timeout = time + ((delete $arg{timeout}) || 60); 3527 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939 3528
2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3529 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941 3530
2942 if (my $item = $self->{item}{$group}) { 3531 if (my $item = $self->{item}{$group}) {
2943 if ($item->{text} eq $text) { 3532 if ($item->{text} eq $text) {
2944 $item->{count}++; 3533 $item->{count}++;
2945 } else { 3534 } else {
2946 $item->{count} = 1; 3535 $item->{count} = 1;
2947 $item->{text} = $item->{tooltip} = $text; 3536 $item->{text} = $item->{tooltip} = $text;
2948 } 3537 }
2949 $item->{id} = ++$self->{id}; 3538 $item->{id} += 0.2;#d#
2950 $item->{timeout} = $timeout; 3539 $item->{timeout} = $timeout;
2951 delete $item->{label}; 3540 delete $item->{label};
2952 } else { 3541 } else {
2953 $self->{item}{$group} = { 3542 $self->{item}{$group} = {
2954 id => ++$self->{id}, 3543 id => ++$self->{id},
… …
2960 count => 1, 3549 count => 1,
2961 %arg, 3550 %arg,
2962 }; 3551 };
2963 } 3552 }
2964 3553
3554 $ROOT->on_refresh (reorder => sub {
2965 $self->reorder; 3555 $self->reorder;
3556 });
2966} 3557}
2967 3558
2968sub reconfigure { 3559sub reconfigure {
2969 my ($self) = @_; 3560 my ($self) = @_;
2970 3561
… …
2973 3564
2974 $self->reorder; 3565 $self->reorder;
2975 $self->SUPER::reconfigure; 3566 $self->SUPER::reconfigure;
2976} 3567}
2977 3568
3569sub destroy {
3570 my ($self) = @_;
3571
3572 $self->{timer}->cancel;
3573
3574 $self->SUPER::destroy;
3575}
3576
2978############################################################################# 3577#############################################################################
2979 3578
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
2980package CFClient::UI::Root; 3763package CFPlus::UI::Root;
2981 3764
2982our @ISA = CFClient::UI::Container::; 3765our @ISA = CFPlus::UI::Container::;
2983 3766
3767use List::Util qw(min max);
3768
2984use CFClient::OpenGL; 3769use CFPlus::OpenGL;
2985 3770
2986sub new { 3771sub new {
2987 my $class = shift; 3772 my $class = shift;
2988 3773
2989 my $self = $class->SUPER::new ( 3774 my $self = $class->SUPER::new (
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3779 Scalar::Util::weaken ($self->{root} = $self);
2995 3780
2996 $self 3781 $self
2997} 3782}
2998 3783
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 { 3784sub size_request {
3016 my ($self) = @_; 3785 my ($self) = @_;
3017 3786
3018 ($self->{w}, $self->{h}) 3787 ($self->{w}, $self->{h})
3019} 3788}
3020 3789
3790sub _to_pixel {
3791 my ($coord, $size, $max) = @_;
3792
3793 $coord =
3794 $coord eq "center" ? ($max - $size) * 0.5
3795 : $coord eq "max" ? $max
3796 : $coord;
3797
3798 $coord = 0 if $coord < 0;
3799 $coord = $max - $size if $coord > $max - $size;
3800
3801 int $coord + 0.5
3802}
3803
3021sub size_allocate { 3804sub invoke_size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3805 my ($self, $w, $h) = @_;
3023 3806
3024 for my $child ($self->children) { 3807 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3808 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3809
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3810 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3811 $Y = $child->{force_y} if exists $child->{force_y};
3029 3812
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3813 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3814 $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 3815
3038 $child->configure ($X, $Y, $W, $H); 3816 $child->configure ($X, $Y, $W, $H);
3039 } 3817 }
3818
3819 1
3040} 3820}
3041 3821
3042sub coord2local { 3822sub coord2local {
3043 my ($self, $x, $y) = @_; 3823 my ($self, $x, $y) = @_;
3044 3824
… …
3058} 3838}
3059 3839
3060sub add { 3840sub add {
3061 my ($self, @children) = @_; 3841 my ($self, @children) = @_;
3062 3842
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3843 $_->{is_toplevel} = 1
3065 3844 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3845
3071 $self->SUPER::add (@children); 3846 $self->SUPER::add (@children);
3072} 3847}
3073 3848
3074sub remove { 3849sub remove {
3075 my ($self, @children) = @_; 3850 my ($self, @children) = @_;
3076 3851
3077 $self->SUPER::remove (@children); 3852 $self->SUPER::remove (@children);
3853
3854 delete $self->{is_toplevel}
3855 for @children;
3078 3856
3079 while (@children) { 3857 while (@children) {
3080 my $w = pop @children; 3858 my $w = pop @children;
3081 push @children, $w->children; 3859 push @children, $w->children;
3082 $w->set_invisible; 3860 $w->set_invisible;
… …
3102 $_->() 3880 $_->()
3103 for values %{delete $self->{refresh_hook}}; 3881 for values %{delete $self->{refresh_hook}};
3104 } 3882 }
3105 3883
3106 if ($self->{realloc}) { 3884 if ($self->{realloc}) {
3885 my %queue;
3107 my @queue; 3886 my @queue;
3887 my $widget;
3108 3888
3889 outer:
3109 while () { 3890 while () {
3110 if ($self->{realloc}) { 3891 if (my $realloc = delete $self->{realloc}) {
3111 #TODO use array-of-depth approach 3892 for $widget (values %$realloc) {
3893 $widget->{visible} or next; # do not resize invisible widgets
3112 3894
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3895 $queue{$widget+0}++ and next; # duplicates are common
3114 @queue, values %{delete $self->{realloc}}; 3896
3897 push @{ $queue[$widget->{visible}] }, $widget;
3898 }
3115 } 3899 }
3116 3900
3901 while () {
3902 @queue or last outer;
3903
3904 $widget = pop @{ $queue[-1] || [] }
3905 and last;
3906
3907 pop @queue;
3908 }
3909
3910 delete $queue{$widget+0};
3911
3912 my ($w, $h) = $widget->size_request;
3913
3914 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3915 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3916
3917 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3918 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3919
3920 $w = $widget->{force_w} if exists $widget->{force_w};
3921 $h = $widget->{force_h} if exists $widget->{force_h};
3922
3923 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3924 || delete $widget->{force_realloc}) {
3925 $widget->{req_w} = $w;
3926 $widget->{req_h} = $h;
3927
3928 $self->{size_alloc}{$widget+0} = $widget;
3929
3930 if (my $parent = $widget->{parent}) {
3931 $self->{realloc}{$parent+0} = $parent
3932 unless $queue{$parent+0};
3933
3934 $parent->{force_size_alloc} = 1;
3935 $self->{size_alloc}{$parent+0} = $parent;
3936 }
3937 }
3938
3939 delete $self->{realloc}{$widget+0};
3940 }
3941 }
3942
3943 while (my $size_alloc = delete $self->{size_alloc}) {
3944 my @queue = sort { $b->{visible} <=> $a->{visible} }
3945 values %$size_alloc;
3946
3947 while () {
3117 my $widget = pop @queue || last; 3948 my $widget = pop @queue || last;
3118 3949
3119 $widget->{visible} or last; # do not resize invisible widgets 3950 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 3951
3144 $w = 0 if $w < 0; 3952 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3953 $h = 0 if $h < 0;
3146 3954
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3955 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h;
3148 3957
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3963
3964 $w = int $w + 0.5;
3965 $h = int $h + 0.5;
3966
3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3968 $widget->{old_w} = $widget->{w};
3969 $widget->{old_h} = $widget->{h};
3970
3149 $widget->{w} = $w; 3971 $widget->{w} = $w;
3150 $widget->{h} = $h; 3972 $widget->{h} = $h;
3151 3973
3152 $widget->emit (size_allocate => $w, $h, $changed); 3974 $widget->emit (size_allocate => $w, $h);
3975 }
3153 } 3976 }
3154 } 3977 }
3155 3978
3156 while ($self->{post_alloc_hook}) { 3979 while ($self->{post_alloc_hook}) {
3157 $_->() 3980 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3981 for values %{delete $self->{post_alloc_hook}};
3159 } 3982 }
3983
3160 3984
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3985 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 3987 glClear GL_COLOR_BUFFER_BIT;
3164 3988
… …
3166 glLoadIdentity; 3990 glLoadIdentity;
3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3991 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168 glMatrixMode GL_MODELVIEW; 3992 glMatrixMode GL_MODELVIEW;
3169 glLoadIdentity; 3993 glLoadIdentity;
3170 3994
3995 {
3996 package CFPlus::UI::Base;
3997
3998 ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h});
4000 }
4001
3171 $self->_draw; 4002 $self->_draw;
3172} 4003}
3173 4004
3174############################################################################# 4005#############################################################################
3175 4006
3176package CFClient::UI; 4007package CFPlus::UI;
3177 4008
3178$ROOT = new CFClient::UI::Root; 4009$ROOT = new CFPlus::UI::Root;
3179$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4010$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3180 4011
31811 40121
3182 4013

Diff Legend

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