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

Diff Legend

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