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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC

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

Diff Legend

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