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.65 by root, Tue Apr 11 14:04:27 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
107} 136}
108 137
109# translate global koordinates to local coordinate system 138# translate global koordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
… …
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
118 147
148 return if $FOCUS == $self;
149
119 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 151 $focus->update if $focus;
121 $FOCUS->update; 152 $FOCUS->update;
122} 153}
123 154
… …
130 $focus->update if $focus; #? 161 $focus->update if $focus; #?
131} 162}
132 163
133sub mouse_motion { } 164sub mouse_motion { }
134sub button_up { } 165sub button_up { }
135sub button_down { }
136sub key_down { } 166sub key_down { }
137sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
138 174
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 180
145sub draw { 181sub draw {
146 my ($self) = @_; 182 my ($self) = @_;
147 183
184 return unless $self->{h} && $self->{w};
185
148 glPushMatrix; 186 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
151 if ($self == $HOVER) { 191 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 197 glBegin GL_QUADS;
155 glVertex 0 , 0; 198 glVertex $x , $y;
156 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
159 glEnd; 202 glEnd;
160 glDisable GL_BLEND; 203 glDisable GL_BLEND;
161 } 204 }
162 glPopMatrix;
163} 205}
164 206
165sub _draw { 207sub _draw {
166 my ($self) = @_; 208 my ($self) = @_;
167 209
168 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 211}
181 212
182sub find_widget { 213sub find_widget {
183 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
184 215
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 219
189 () 220 ()
190} 221}
191 222
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 223sub set_parent {
195 my ($self, $par) = @_; 224 my ($self, $par) = @_;
196 225
197 $self->{parent} = $par; 226 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
207 236
208 $self->{parent}->update 237 $self->{parent}->update
209 if $self->{parent}; 238 if $self->{parent};
210} 239}
211 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
212sub DESTROY { 254sub DESTROY {
213 my ($self) = @_; 255 my ($self) = @_;
214 256
215 #$self->deactivate; 257 #$self->deactivate;
216} 258}
217 259
218############################################################################# 260#############################################################################
219 261
262package CFClient::UI::DrawBG;
263
264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
268
269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
220package CFClient::Widget::Container; 314package CFClient::UI::Container;
221 315
222our @ISA = CFClient::Widget::; 316our @ISA = CFClient::UI::Base::;
223 317
224sub new { 318sub new {
225 my ($class, %arg) = @_; 319 my ($class, %arg) = @_;
226 320
227 my $children = delete $arg{children} || []; 321 my $children = delete $arg{children} || [];
… …
231 325
232 $self 326 $self
233} 327}
234 328
235sub add { 329sub add {
236 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
237 331
238 $chld->{expand} = $expand;
239 $chld->set_parent ($self); 332 $chld->set_parent ($self);
240 333
241 @{$self->{children}} = 334 $self->{children} = [
242 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
243 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
244 338
245 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
246 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
247} 341}
248 342
249sub remove { 343sub remove {
250 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
251 345
252 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
253 347
254 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
255} 349}
256 350
257sub find_widget { 351sub find_widget {
258 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
259 353
… …
276 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
277} 371}
278 372
279############################################################################# 373#############################################################################
280 374
281package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
282 376
283our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
284 403
285sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
286 405
287sub size_request { 406sub size_request {
288 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
289} 408}
290 409
291sub size_allocate { 410sub size_allocate {
292 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
293 412
294 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
295 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
296 if $self->{children}[0]
297} 416}
298 417
299############################################################################# 418#############################################################################
300 419
301package CFClient::Widget::Window; 420package CFClient::UI::Window;
302 421
303our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
304 423
305use SDL::OpenGL; 424use SDL::OpenGL;
306 425
307sub new { 426sub new {
308 my ($class, %arg) = @_; 427 my ($class, %arg) = @_;
… …
326 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
327 ); 446 );
328} 447}
329 448
330sub size_allocate { 449sub size_allocate {
331 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
332 451
333 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
334 $self->{h} = $h;
335 453
336 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
337 455
338 $self->render_chld; 456 $self->render_chld;
339} 457}
340 458
341sub _draw { 459sub _draw {
… …
345 463
346 my $tex = $self->{texture} 464 my $tex = $self->{texture}
347 or return; 465 or return;
348 466
349 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
350 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
352 471
353 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
354 473
… …
356 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
357} 476}
358 477
359############################################################################# 478#############################################################################
360 479
361package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
362 481
363our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
364 483
365use SDL::OpenGL; 484use SDL::OpenGL;
366 485
367sub size_request { 486sub size_request {
368 my ($self) = @_; 487 my ($self) = @_;
… …
373 492
374 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
375} 494}
376 495
377sub size_allocate { 496sub size_allocate {
378 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
379 498
380 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
381 $self->{h} = $h;
382 500
383 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
384 $self->child->move (2, 2);
385} 502}
386 503
387sub _draw { 504sub _draw {
388 my ($self) = @_; 505 my ($self) = @_;
389 506
… …
402 $chld->draw; 519 $chld->draw;
403} 520}
404 521
405############################################################################# 522#############################################################################
406 523
407package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
408 525
409our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
410 527
411use SDL::OpenGL; 528use SDL::OpenGL;
412 529
413my @tex = 530my @tex =
414 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
415 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
416 533
417sub size_request { 534sub size_request {
418 my ($self) = @_; 535 my ($self) = @_;
419 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
420 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
421 540
422 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
423 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
424 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
425 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
426 545
427 ($w, $h) 546 ($w, $h)
428} 547}
429 548
430sub size_allocate { 549sub size_allocate {
431 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
432 551
433 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
434 553
435 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
436 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
437 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
438 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
439 558
440 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
441 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
442 561
443 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
444 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
445} 613}
446 614
447sub _draw { 615sub _draw {
448 my ($self) = @_; 616 my ($self) = @_;
449 617
450 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
451 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
452 620
453 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 625
458 my $top = $tex[1]; 626 my $top = $tex[1];
459 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
460 628
461 my $left = $tex[3]; 629 my $left = $tex[3];
462 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
463 631
464 my $right = $tex[2]; 632 my $right = $tex[2];
465 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
466 634
467 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
468 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
469 637
470 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
471 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
473 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
474 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
475 644
476 my $rep_x = $cw / $bg->{width}; 645 my $rep_x = $cw / $bg->{w};
477 my $rep_y = $ch / $bg->{height}; 646 my $rep_y = $ch / $bg->{h};
478 647
479 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
480 649
650 glDisable GL_TEXTURE_2D;
481 glDisable GL_BLEND; 651 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D;
483 652
484 $self->child->draw; 653 $self->child->draw;
485 654
486} 655}
487 656
488############################################################################# 657#############################################################################
489 658
490package CFClient::Widget::Table; 659package CFClient::UI::Table;
491 660
492our @ISA = CFClient::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
493 664
494use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
495 675
496sub add { 676sub add {
497 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
498 my $old_chld = $self->{children}[$y][$x];
499 678
500 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
501 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
502 $self->update; 683 $self->update;
503} 684}
504 685
505sub max_row_height { 686sub get_wh {
506 my ($self, $row) = @_; 687 my ($self) = @_;
507 688
508 my $hs = 0; 689 my (@w, @h);
509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
510 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
511 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
512 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
513 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
514 } 702 }
515 } 703 }
516 return $hs;
517}
518 704
519sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
520 my ($self, $col) = @_; 709 my ($self) = @_;
521 710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 my $y;
739
740 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r]
742 or next;
743
522 my $ws = 0; 744 my $x = 0;
523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 745 my $row_h = $hs->[$r];
524 my $c = ($self->{children}->[$yi] || [])->[$col]; 746
525 if ($c) { 747 for my $c (0 .. $#$row) {
526 my ($w, $h) = $c->size_request; 748 my $widget = $row->[$c]
527 if ($ws < $w) { $ws = $w } 749 or next;
750
751 my $col_w = $ws->[$c];
752
753 $widget->size_allocate ($x, $y, $col_w, $row_h);
754
755 $x += $col_w;
528 } 756 }
757
758 $y += $row_h;
529 } 759 }
530 return $ws; 760
531} 761}
762
763sub find_widget {
764 my ($self, $x, $y) = @_;
765
766 $x -= $self->{x};
767 $y -= $self->{y};
768
769 my $res;
770
771 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
772 $res = $_->find_widget ($x, $y)
773 and return $res;
774 }
775
776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
777}
778
779sub _draw {
780 my ($self) = @_;
781
782 for (grep $_, @{$self->{children}}) {
783 $_->draw for grep $_, @$_;
784 }
785}
786
787#############################################################################
788
789package CFClient::UI::HBox;
790
791# TODO: wrap into common Box base class
792
793our @ISA = CFClient::UI::Container::;
532 794
533sub size_request { 795sub size_request {
534 my ($self) = @_; 796 my ($self) = @_;
535 797
798 my @alloc = map [$_->size_request], @{$self->{children}};
799
800 (
801 (List::Util::sum map $_->[0], @alloc),
802 (List::Util::max map $_->[1], @alloc),
803 )
804}
805
806sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_;
808
809 $self->_size_allocate ($x, $y, $w, $h) or return;
810
811 return unless $self->{w};
812
536 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
537 814
538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
539 $hs += $self->max_row_height ($yi);
540 }
541 816
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
543 my $wm = 0; 818
544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
545 $wm += $self->max_col_width ($xi) 820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
546 } 834 }
547 if ($ws < $wm) { $ws = $wm }
548 } 835 }
549
550 return ($ws, $hs);
551}
552
553sub _draw {
554 my ($self) = @_;
555 836
556 my $y = 0; 837 my $y = 0;
557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
839 my $child = $children->[$_];
558 my $x = 0; 840 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
559 842
560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $y += $h;
561
562 my $c = $self->{children}->[$yi]->[$xi];
563 if ($c) {
564 $c->move ($x, $y, 0); #TODO: Move to size_request
565 $c->draw if $c;
566 }
567
568 $x += $self->max_col_width ($xi);
569 }
570
571 $y += $self->max_row_height ($yi);
572 } 844 }
573} 845}
574 846
575############################################################################# 847#############################################################################
576 848
577package CFClient::Widget::VBox; 849package CFClient::UI::VBox;
578 850
851# TODO: wrap into common Box base class
852
579our @ISA = CFClient::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
580
581use SDL::OpenGL;
582 854
583sub size_request { 855sub size_request {
584 my ($self) = @_; 856 my ($self) = @_;
585 857
586 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
… …
590 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
591 ) 863 )
592} 864}
593 865
594sub size_allocate { 866sub size_allocate {
595 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
596 868
597 $self->w ($w); 869 $self->_size_allocate ($x, $y, $w, $h) or return;
598 $self->h ($h);
599 870
600 my $exp; 871 return unless $self->{h};
601 my @oth; 872
602 # find expand widget 873 my $children = $self->{children};
603 for (@{$self->{children}}) { 874
604 if ($_->{expand}) { 875 my @h = map +($_->size_request)[1], @$children;
876
877 my $req_h = List::Util::sum @h;
878
879 if ($req_h > $h) {
880 # ah well, not enough space
881 $_ *= $h / $req_h for @h;
882 } else {
883 my $exp = List::Util::sum map $_->{expand}, @$children;
605 $exp = $_; 884 $exp ||= 1;
606 last; 885
886 for (0 .. $#$children) {
887 my $child = $children->[$_];
888
889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
607 } 890 }
608 push @oth, $_;
609 }
610
611 my ($ow, $oh);
612
613 # get sizes of other widgets
614 for (@oth) {
615 my ($w, $h) = $_->size_request;
616 $oh += $h;
617 if ($ow < $w) { $ow = $w }
618 } 891 }
619 892
620 my $y = 0; 893 my $y = 0;
621 for (@{$self->{children}}) { 894 for (0 .. $#$children) {
622 $_->move (0, $y); 895 my $child = $children->[$_];
623 896 my $h = $h[$_];
624 if ($_ == $exp) {
625 $_->size_allocate ($w, $h - $oh);
626 $y += $h - $oh;
627 } else {
628 my ($cw, $h) = $_->size_request;
629 $_->size_allocate ($w, $h); 897 $child->size_allocate (0, $y, $w, $h);
898
630 $y += $h; 899 $y += $h;
631 }
632 } 900 }
633} 901}
634 902
635############################################################################# 903#############################################################################
636 904
637package CFClient::Widget::Label; 905package CFClient::UI::Label;
638 906
639our @ISA = CFClient::Widget::; 907our @ISA = CFClient::UI::Base::;
640 908
641use SDL::OpenGL; 909use SDL::OpenGL;
642 910
643sub new { 911sub new {
644 my ($class, %arg) = @_; 912 my ($class, %arg) = @_;
645 913
646 # TODO: color, and make height, xyz etc. optional
647 my $self = $class->SUPER::new ( 914 my $self = $class->SUPER::new (
648 color => [1, 1, 1], 915 fg => [1, 1, 1],
649 height => $::FONTSIZE, 916 height => $::FONTSIZE,
650 text => "", 917 text => "",
918 align => -1,
919 padding => 2,
651 layout => new CFClient::Layout, 920 layout => new CFClient::Layout,
652 %arg 921 %arg
653 ); 922 );
654 923
655 $self->set_text ($self->{text}); 924 $self->set_text ($self->{text});
656 925
657 $self 926 $self
658} 927}
659 928
929sub escape_text {
930 local $_ = $_[1];
931
932 s/&/&amp;/g;
933 s/>/&gt;/g;
934 s/</&lt;/g;
935
936 $_[1]
937}
938
660sub set_text { 939sub set_text {
661 my ($self, $text) = @_; 940 my ($self, $text) = @_;
662 941
663 $self->{text} = $text; 942 $self->{text} = $text;
664 $self->{layout}->set_markup ($text); 943 $self->{layout}->set_markup ($text);
665 944
666 delete $self->{texture}; 945 delete $self->{texture};
946 $self->update;
667} 947}
668 948
669sub get_text { 949sub get_text {
670 my ($self, $text) = @_; 950 my ($self, $text) = @_;
671 951
… …
675sub size_request { 955sub size_request {
676 my ($self) = @_; 956 my ($self) = @_;
677 957
678 $self->{layout}->set_width; 958 $self->{layout}->set_width;
679 $self->{layout}->set_height ($self->{height}); 959 $self->{layout}->set_height ($self->{height});
680 $self->{layout}->size 960 my ($w, $h) = $self->{layout}->size;
681# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 961
682# ( 962 (
683# $self->{texture}{width}, 963 $w + $self->{padding} * 2,
684# $self->{texture}{height}, 964 $h + $self->{padding} * 2,
685# ) 965 )
686# } else {
687# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
688#
689# ($w, $h)
690# }
691} 966}
692 967
693sub size_allocate { 968sub size_allocate {
694 my ($self, $w, $h) = @_; 969 my ($self, $x, $y, $w, $h) = @_;
695 970
696 $self->SUPER::size_allocate ($w, $h); 971 $self->_size_allocate ($x, $y, $w, $h) or return;
972
697 delete $self->{texture}; 973 delete $self->{texture};
974}
975
976sub update {
977 my ($self) = @_;
978
979 delete $self->{texture};
980 $self->SUPER::update;
698} 981}
699 982
700sub _draw { 983sub _draw {
701 my ($self) = @_; 984 my ($self) = @_;
702 985
703 my $tex = $self->{texture} ||= do { 986 my $tex = $self->{texture} ||= do {
704 $self->{layout}->set_width ($self->{w}); 987 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});
705 new_from_layout CFClient::Texture $self->{layout}; 989 new_from_layout CFClient::Texture $self->{layout}
706 }; 990 };
707 991
708 glEnable GL_BLEND; 992 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 994 glEnable GL_TEXTURE_2D;
710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 995 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
712 996
713 glColor @{$self->{color}}; 997 glColor @{$self->{fg}};
714 998
715 $tex->draw_quad (0, 0); 999 my $x =
1000 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5;
716 1003
1004 $tex->draw_quad ($x, $self->{padding});
1005
1006 glDisable GL_TEXTURE_2D;
717 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
718 glDisable GL_TEXTURE_2D;
719} 1008}
720 1009
721############################################################################# 1010#############################################################################
722 1011
723package CFClient::Widget::Entry; 1012package CFClient::UI::Entry;
724 1013
725our @ISA = CFClient::Widget::Label::; 1014our @ISA = CFClient::UI::Label::;
726 1015
727use SDL; 1016use SDL;
728use SDL::OpenGL; 1017use SDL::OpenGL;
729 1018
1019sub new {
1020 my $class = shift;
1021
1022 $class->SUPER::new (
1023 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0],
1027 @_
1028 )
1029}
1030
1031sub _set_text {
1032 my ($self, $text) = @_;
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038
1039 $text =~ s/./*/g if $self->{hidden};
1040
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042
1043 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text;
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047}
1048
1049sub size_request {
1050 my ($self) = @_;
1051
1052 my ($w, $h) = $self->SUPER::size_request;
1053
1054 ($w + 1, $h) # add 1 for cursor
1055}
1056
1057sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_;
1059
1060 $self->SUPER::size_allocate ($x, $y, $w, $h);
1061
1062 $self->_set_text ($self->{text});
1063}
1064
1065sub set_text {
1066 my ($self, $text) = @_;
1067
1068 $self->{cursor} = length $text;
1069 $self->_set_text ($text);
1070 $self->update;
1071}
1072
730sub key_down { 1073sub key_down {
731 my ($self, $ev) = @_; 1074 my ($self, $ev) = @_;
732 1075
733 my $mod = $ev->key_mod; 1076 my $mod = $ev->key_mod;
734 my $sym = $ev->key_sym; 1077 my $sym = $ev->key_sym;
… …
736 my $uni = $ev->key_unicode; 1079 my $uni = $ev->key_unicode;
737 1080
738 my $text = $self->get_text; 1081 my $text = $self->get_text;
739 1082
740 if ($sym == SDLK_BACKSPACE) { 1083 if ($sym == SDLK_BACKSPACE) {
741 substr $text, -1, 1, ''; 1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) {
1086 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text;
742 } elsif ($uni) { 1095 } elsif ($uni) {
743 $text .= chr $uni; 1096 substr $text, $self->{cursor}++, 0, chr $uni;
744 } 1097 }
745 1098
746 $self->set_text ($text); 1099 $self->_set_text ($text);
1100 $self->update;
1101}
1102
1103sub focus_in {
1104 my ($self) = @_;
1105
1106 $self->{last_activity} = $::NOW;
1107
1108 $self->SUPER::focus_in;
747} 1109}
748 1110
749sub button_down { 1111sub button_down {
750 my ($self, $ev) = @_; 1112 my ($self, $ev, $x, $y) = @_;
751 1113
752 $self->focus_in; 1114 $self->SUPER::button_down ($ev, $x, $y);
1115
1116 my $idx = $self->{layout}->xy_to_index ($x, $y);
1117
1118 # byte-index to char-index
1119 my $text = $self->{text};
1120 utf8::encode $text;
1121 $self->{cursor} = length substr $text, 0, $idx;
1122
1123 $self->_set_text ($self->{text});
1124 $self->update;
753} 1125}
754 1126
755sub mouse_motion { 1127sub mouse_motion {
756 my ($self, $ev, $x, $y) = @_; 1128 my ($self, $ev, $x, $y) = @_;
757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1129# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
758} 1130}
759 1131
760sub _draw { 1132sub _draw {
761 my ($self) = @_; 1133 my ($self) = @_;
762 1134
1135 local $self->{fg} = $self->{fg};
1136
763 if ($FOCUS == $self) { 1137 if ($FOCUS == $self) {
764 glColor 1, 1, 1; 1138 glColor @{$self->{active_bg}};
1139 $self->{fg} = $self->{active_fg};
765 } else { 1140 } else {
766 glColor 0.7, 0.7, 0.7; 1141 glColor @{$self->{bg}};
767 } 1142 }
768 1143
1144 glEnable GL_BLEND;
1145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
769 glBegin GL_QUADS; 1146 glBegin GL_QUADS;
770 glVertex 0 , 0; 1147 glVertex 0 , 0;
771 glVertex 0 , $self->{h} - 1; 1148 glVertex 0 , $self->{h};
772 glVertex $self->{w} - 1, $self->{h} - 1; 1149 glVertex $self->{w}, $self->{h};
773 glVertex $self->{w} - 1, 0; 1150 glVertex $self->{w}, 0;
774 glEnd; 1151 glEnd;
1152 glDisable GL_BLEND;
775 1153
776 $self->SUPER::_draw; 1154 $self->SUPER::_draw;
777}
778 1155
779############################################################################# 1156 #TODO: force update every cursor change :(
1157 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1158 glColor @{$self->{fg}};
1159 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd;
1163 }
1164}
780 1165
781package CFClient::Widget::MapWidget; 1166#############################################################################
782 1167
783use strict; 1168package CFClient::UI::Button;
784 1169
785use List::Util qw(min max); 1170our @ISA = CFClient::UI::Label::;
786 1171
787use SDL; 1172use SDL;
788use SDL::OpenGL; 1173use SDL::OpenGL;
789use SDL::OpenGL::Constants;
790 1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0],
1185 @_
1186 )
1187}
1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
1196}
1197
1198sub _draw {
1199 my ($self) = @_;
1200
1201 local $self->{fg} = $self->{fg};
1202
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 }
1222
1223 glBegin GL_QUADS;
1224 glVertex 2 , 2;
1225 glVertex 2 , $self->{h} - 2;
1226 glVertex $self->{w} - 2, $self->{h} - 2;
1227 glVertex $self->{w} - 2, 2;
1228 glEnd;
1229 glDisable GL_BLEND;
1230
1231 $self->SUPER::_draw;
1232}
1233
1234#############################################################################
1235
1236package CFClient::UI::Slider;
1237
1238use strict;
1239
1240use SDL::OpenGL;
1241
1242our @ISA = CFClient::UI::DrawBG::;
1243
1244sub new {
1245 my $class = shift;
1246
1247 # range [value, low, high, page]
1248
1249 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10],
1253 req_w => 40,
1254 req_h => 10,
1255 vertical => 0,
1256 @_
1257 );
1258
1259 $self
1260}
1261
1262sub size_request {
1263 my ($self) = @_;
1264
1265 my $w = $self->{req_w};
1266 my $h = $self->{req_h};
1267
1268 $self->{vertical} ? ($h, $w) : ($w, $h)
1269}
1270
1271sub button_down {
1272 my ($self, $ev, $x, $y) = @_;
1273
1274 $self->SUPER::button_down ($ev, $x, $y);
1275 $self->mouse_motion ($ev, $x, $y);
1276}
1277
1278sub mouse_motion {
1279 my ($self, $ev, $x, $y) = @_;
1280
1281 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285
1286 $x = $x * ($hi - $lo) / $w + $lo;
1287 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x;
1290
1291 $self->emit (changed => $x);
1292 $self->update;
1293 }
1294}
1295
1296sub _draw {
1297 my ($self) = @_;
1298
1299 $self->SUPER::_draw ();
1300
1301 my ($w, $h) = @$self{qw(w h)};
1302
1303 if ($self->{vertical}) {
1304 # draw a vertical slider like a rotated horizontal slider
1305
1306 glRotate 90, 0, 0, 1;
1307 glTranslate 0, -$self->{w}, 0;
1308
1309 ($w, $h) = ($h, $w);
1310 }
1311
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314
1315 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316
1317 $page = int $page * $w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo);
1319
1320 $w -= $page;
1321 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0;
1323 $page ||= 2;
1324
1325 glColor @$fg;
1326 glBegin GL_LINES;
1327 glVertex 0, 0; glVertex 0, $h;
1328 glVertex $w - 1, 0; glVertex $w - 1, $h;
1329 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330 glEnd;
1331
1332 my $knob_a = $value - $page * 0.5;
1333 my $knob_b = $value + $page * 0.5;
1334
1335 glBegin GL_QUADS;
1336 glColor @$fg;
1337 glVertex $knob_a, 0;
1338 glVertex $knob_a, $h;
1339 glVertex $knob_b, $h;
1340 glVertex $knob_b, 0;
1341
1342 if ($knob_a < $knob_b - 2) {
1343 glColor @$bg;
1344 glVertex $knob_a + 1, 1;
1345 glVertex $knob_a + 1, $h - 1;
1346 glVertex $knob_b - 1, $h - 1;
1347 glVertex $knob_b - 1, 1;
1348 }
1349 glEnd;
1350}
1351
1352#############################################################################
1353
1354package CFClient::UI::MapWidget;
1355
1356use strict;
1357
1358use List::Util qw(min max);
1359
1360use SDL;
1361use SDL::OpenGL;
1362
791our @ISA = CFClient::Widget::; 1363our @ISA = CFClient::UI::Base::;
792 1364
793sub new { 1365sub new {
794 my $class = shift; 1366 my $class = shift;
795 1367
796 $class->SUPER::new ( 1368 $class->SUPER::new (
… …
807sub key_up { 1379sub key_up {
808} 1380}
809 1381
810sub size_request { 1382sub size_request {
811 ( 1383 (
812 1 + int $::WIDTH / 32, 1384 1 + 32 * int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32, 1385 1 + 32 * int $::HEIGHT / 32,
814 ) 1386 )
815} 1387}
816 1388
817sub update { 1389sub update {
818 my ($self) = @_; 1390 my ($self) = @_;
819 1391
820 $self->{need_update} = 1; 1392 $self->{need_update} = 1;
1393 $self->SUPER::update;
821} 1394}
822 1395
823sub _draw { 1396sub draw {
824 my ($self) = @_; 1397 my ($self) = @_;
825 1398
826 if (delete $self->{need_update}) { 1399 if (delete $self->{need_update}) {
827 glNewList $self->{list}, GL_COMPILE; 1400 glNewList $self->{list}, GL_COMPILE;
828 1401
… …
848 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1421 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
849 } 1422 }
850 1423
851 glEnable GL_TEXTURE_2D; 1424 glEnable GL_TEXTURE_2D;
852 glEnable GL_BLEND; 1425 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
854 1428
855 my $sw4 = ($sw + 3) & ~3; 1429 my $sw4 = ($sw + 3) & ~3;
856 my $darkness = "\x00" x ($sw4 * $sh); 1430 my $darkness = "\x00" x ($sw4 * $sh);
857 1431
… …
870 } 1444 }
871 1445
872 for my $num (grep $_, @$cell[1,2,3]) { 1446 for my $num (grep $_, @$cell[1,2,3]) {
873 my $tex = $::CONN->{face}[$num]{texture} || next; 1447 my $tex = $::CONN->{face}[$num]{texture} || next;
874 1448
875 my $w = $tex->{width}; 1449 my ($w, $h) = @$tex{qw(w h)};
876 my $h = $tex->{height};
877 1450
878 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1451 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
879 } 1452 }
880 } 1453 }
881 } 1454 }
… …
888# 1461#
889# $lighting = $pb->get_pixels; 1462# $lighting = $pb->get_pixels;
890# $lighting =~ s/(.)../$1/gs; 1463# $lighting =~ s/(.)../$1/gs;
891# } 1464# }
892 1465
893 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
895 1467
896 $darkness = new CFClient::Texture 1468 $darkness = new CFClient::Texture
897 width => $sw4, 1469 w => $sw4,
898 height => $sh, 1470 h => $sh,
899 data => $darkness, 1471 data => $darkness,
900 internalformat => GL_ALPHA, 1472 internalformat => GL_ALPHA,
901 format => GL_ALPHA; 1473 format => GL_ALPHA;
902 1474
903 glColor 0.45, 0.45, 0.45, 1; 1475 glColor 0.45, 0.45, 0.45, 1;
… …
963 } 1535 }
964} 1536}
965 1537
966############################################################################# 1538#############################################################################
967 1539
968package CFClient::Widget::Animator; 1540package CFClient::UI::Animator;
969 1541
970use SDL::OpenGL; 1542use SDL::OpenGL;
971 1543
972our @ISA = CFClient::Widget::Bin::; 1544our @ISA = CFClient::UI::Bin::;
973 1545
974sub moveto { 1546sub moveto {
975 my ($self, $x, $y) = @_; 1547 my ($self, $x, $y) = @_;
976 1548
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1005 glPopMatrix; 1577 glPopMatrix;
1006} 1578}
1007 1579
1008############################################################################# 1580#############################################################################
1009 1581
1010package CFClient::Widget::Toplevel; 1582package CFClient::UI::Toplevel;
1011 1583
1012our @ISA = CFClient::Widget::Container::; 1584our @ISA = CFClient::UI::Container::;
1013 1585
1014sub size_request { 1586sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1587 ($::WIDTH, $::HEIGHT)
1016} 1588}
1017 1589
1018sub size_allocate { 1590sub size_allocate {
1019 my ($self, $w, $h) = @_; 1591 my ($self, $x, $y, $w, $h) = @_;
1020 1592
1021 $self->SUPER::size_allocate ($w, $h); 1593 $self->_size_allocate ($x, $y, $w, $h);
1022 1594
1023 $_->size_allocate ($_->size_request) 1595 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1024 for @{$self->{children}}; 1596 for @{$self->{children}};
1025} 1597}
1026 1598
1027sub translate { 1599sub translate {
1028 my ($self, $x, $y) = @_; 1600 my ($self, $x, $y) = @_;
… …
1031} 1603}
1032 1604
1033sub update { 1605sub update {
1034 my ($self) = @_; 1606 my ($self) = @_;
1035 1607
1036 $self->size_allocate ($self->size_request); 1608 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1037 ::refresh (); 1609 ::refresh ();
1038} 1610}
1039 1611
1040sub add { 1612sub add {
1041 my ($self, $widget) = @_; 1613 my ($self, $widget) = @_;
1042 1614
1043 $self->SUPER::add ($widget); 1615 $self->SUPER::add ($widget);
1044 1616
1045 $widget->size_allocate ($widget->size_request); 1617 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1046} 1618}
1047 1619
1048sub draw { 1620sub draw {
1049 my ($self) = @_; 1621 my ($self) = @_;
1050 1622
1051 $self->_draw; 1623 $self->_draw;
1052} 1624}
1053 1625
1054############################################################################# 1626#############################################################################
1055 1627
1056package CFClient::Widget; 1628package CFClient::UI;
1057 1629
1058$TOPLEVEL = new CFClient::Widget::Toplevel; 1630$TOPLEVEL = new CFClient::UI::Toplevel;
1059 1631
10601 16321
1061 1633

Diff Legend

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