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.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC

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

Diff Legend

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