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

Diff Legend

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