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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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