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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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