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

Diff Legend

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