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

Diff Legend

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