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

Diff Legend

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