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.38 by root, Sun Apr 9 21:34:49 2006 UTC vs.
Revision 1.64 by root, Tue Apr 11 13:38:22 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless { @_ }, $class
… …
37 Carp::confess "size_request is abtract"; 94 Carp::confess "size_request is abtract";
38} 95}
39 96
40sub size_allocate { 97sub size_allocate {
41 my ($self, $w, $h) = @_; 98 my ($self, $w, $h) = @_;
99
42 $self->w ($w); 100 $self->{w} = $w;
43 $self->h ($h); 101 $self->{h} = $h;
102}
103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 109}
45 110
46sub focus_in { 111sub focus_in {
47 my ($widget) = @_; 112 my ($self) = @_;
48 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
49} 117}
50 118
51sub focus_out { 119sub focus_out {
52 my ($widget) = @_; 120 my ($self) = @_;
53}
54 121
55sub key_down { 122 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 123
59sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
61} 126}
62 127
128sub mouse_motion { }
129sub button_up { }
63sub button_down { 130sub button_down { }
64 my ($widget, $sdlev) = @_; 131sub key_down { }
65} 132sub key_up { }
66 133
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 139
77sub draw { 140sub draw {
78 my ($self) = @_; 141 my ($self) = @_;
79 142
80 glPushMatrix; 143 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
83 glPopMatrix; 157 glPopMatrix;
84} 158}
85 159
86sub _draw { 160sub _draw {
87 my ($self) = @_; 161 my ($self) = @_;
… …
134 my ($self) = @_; 208 my ($self) = @_;
135 209
136 #$self->deactivate; 210 #$self->deactivate;
137} 211}
138 212
213#############################################################################
214
139package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
140 216
141our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
142 218
143sub new { 219sub new {
144 my ($class, @widgets) = @_; 220 my ($class, %arg) = @_;
221
222 my $children = delete $arg{children} || [];
145 223
146 my $self = $class->SUPER::new (children => []); 224 my $self = $class->SUPER::new (children => []);
147 $self->add ($_) for @widgets; 225 $self->add ($_) for @$children;
148 226
149 $self 227 $self
150} 228}
151 229
152sub add { 230sub add {
… …
157 235
158 @{$self->{children}} = 236 @{$self->{children}} =
159 sort { $a->{z} <=> $b->{z} } 237 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld; 238 @{$self->{children}}, $chld;
161 239
162 $self->size_allocate ($self->{w}, $self->{h}); 240 $self->size_allocate ($self->{w}, $self->{h})
241 if $self->{w}; #TODO: check for "realised state"
163} 242}
164 243
165sub remove { 244sub remove {
166 my ($self, $widget) = @_; 245 my ($self, $widget) = @_;
167 246
… …
171} 250}
172 251
173sub find_widget { 252sub find_widget {
174 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
175 254
255 $x -= $self->{x};
256 $y -= $self->{y};
257
176 my $res; 258 my $res;
177 259
178 for (@{ $self->{children} }) { 260 for (reverse @{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y) 261 $res = $_->find_widget ($x, $y)
180 and return $res; 262 and return $res;
181 } 263 }
182 264
183 () 265 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
184}
185
186sub size_request {
187 my ($self) = @_;
188
189 my ($hs, $ws) = (0, 0);
190 for (@{$self->{children} || []}) {
191 my ($w, $h) = $_->size_request;
192 $hs += $h;
193 if ($ws < $w) { $ws = $w }
194 }
195
196 return ($ws, $hs);
197} 266}
198 267
199sub _draw { 268sub _draw {
200 my ($self) = @_; 269 my ($self) = @_;
201 270
202 $_->draw for @{$self->{children}}; 271 $_->draw for @{$self->{children}};
203} 272}
204 273
274#############################################################################
275
205package Crossfire::Client::Widget::Bin; 276package CFClient::Widget::Bin;
206 277
207our @ISA = Crossfire::Client::Widget::Container::; 278our @ISA = CFClient::Widget::Container::;
208 279
209sub get { $_[0]->{children}[0] } 280sub child { $_[0]->{children}[0] }
210 281
211sub size_request { 282sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 283 $_[0]{children}[0]->size_request if $_[0]{children}[0];
213} 284}
214 285
215sub size_allocate { 286sub size_allocate {
216 my ($self, $w, $h) = @_; 287 my ($self, $w, $h) = @_;
288
217 $self->SUPER::size_allocate ($w, $h); 289 $self->SUPER::size_allocate ($w, $h);
218 $self->{children}[0]->size_allocate ($w, $h) 290 $self->{children}[0]->size_allocate ($w, $h)
219 if $self->{children}[0] 291 if $self->{children}[0]
220} 292}
221 293
222package Crossfire::Client::Widget::Toplevel; 294#############################################################################
223 295
296package CFClient::Widget::Window;
297
224our @ISA = Crossfire::Client::Widget::Container::; 298our @ISA = CFClient::Widget::Bin::;
299
300use SDL::OpenGL;
301
302sub new {
303 my ($class, %arg) = @_;
304
305 my $self = $class->SUPER::new (%arg);
306}
225 307
226sub update { 308sub update {
227 my ($self) = @_; 309 my ($self) = @_;
228 310
229 ::refresh (); 311 # we want to do this delayed...
230}
231
232package Crossfire::Client::Widget::Window;
233
234our @ISA = Crossfire::Client::Widget::Bin::;
235
236use SDL::OpenGL;
237
238sub add {
239 my ($self, $chld) = @_;
240 warn "ADD $chld\n";
241 $self->SUPER::add ($chld);
242 $chld->set_parent ($self);
243}
244
245sub remove {
246 my ($self) = @_;
247 # TODO FIXME: removing a child from a window will crash, see render_chld
248 # $self->update;
249}
250
251sub update {
252 my ($self) = @_;
253 $self->render_chld; 312 $self->render_chld;
313 $self->SUPER::update;
254} 314}
255 315
256sub render_chld { 316sub render_chld {
257 my ($self) = @_; 317 my ($self) = @_;
258 my $chld = $self->get;
259 my ($w, $h) = $self->size_request;
260 318
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
264 $self->{texture} = 319 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 320 CFClient::Texture->new_from_opengl (
266 $w, $h, sub { $chld->draw } 321 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 322 );
268 $self->{texture}->upload;
269}
270
271sub size_request {
272 my ($self) = @_;
273 ($self->w, $self->h)
274} 323}
275 324
276sub size_allocate { 325sub size_allocate {
277 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
278 327
279 $self->w ($w); 328 $self->{w} = $w;
280 $self->h ($h); 329 $self->{h} = $h;
330
281 $self->get->size_allocate ($w, $h); 331 $self->child->size_allocate ($w, $h);
282 332
283 $self->update; #TODO: Move this to the size_request event propably? 333 $self->render_chld;
284} 334}
285 335
286sub _draw { 336sub _draw {
287 my ($self) = @_; 337 my ($self) = @_;
288 338
… …
292 or return; 342 or return;
293 343
294 glEnable GL_BLEND; 344 glEnable GL_BLEND;
295 glEnable GL_TEXTURE_2D; 345 glEnable GL_TEXTURE_2D;
296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
297 glBindTexture GL_TEXTURE_2D, $tex->{name};
298 347
299 glBegin GL_QUADS; 348 $tex->draw_quad (0, 0, $w, $h);
300 glTexCoord 0, 0; glVertex 0, 0;
301 glTexCoord 0, 1; glVertex 0, $h;
302 glTexCoord 1, 1; glVertex $w, $h;
303 glTexCoord 1, 0; glVertex $w, 0;
304 glEnd;
305 349
306 glDisable GL_BLEND; 350 glDisable GL_BLEND;
307 glDisable GL_TEXTURE_2D; 351 glDisable GL_TEXTURE_2D;
308} 352}
309 353
354#############################################################################
355
310package Crossfire::Client::Widget::Frame; 356package CFClient::Widget::Frame;
311 357
312our @ISA = Crossfire::Client::Widget::Bin::; 358our @ISA = CFClient::Widget::Bin::;
313 359
314use SDL::OpenGL; 360use SDL::OpenGL;
315 361
316sub size_request { 362sub size_request {
317 my ($self) = @_; 363 my ($self) = @_;
318 my $chld = $self->get 364 my $chld = $self->child
319 or return (0, 0); 365 or return (0, 0);
320 366
321 $chld->move (2, 2); 367 $chld->move (2, 2);
322 368
323 map { $_ + 4 } $chld->size_request; 369 map { $_ + 4 } $chld->size_request;
324} 370}
325 371
326sub size_allocate { 372sub size_allocate {
327 my ($self, $w, $h) = @_; 373 my ($self, $w, $h) = @_;
328 374
329 $self->w ($w); 375 $self->{w} = $w;
330 $self->h ($h); 376 $self->{h} = $h;
331 377
332 $self->get->size_allocate ($w - 4, $h - 4); 378 $self->child->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2); 379 $self->child->move (2, 2);
334} 380}
335 381
336sub _draw { 382sub _draw {
337 my ($self) = @_; 383 my ($self) = @_;
338 384
339 my $chld = $self->get; 385 my $chld = $self->child;
340 386
341 my ($w, $h) = $chld->size_request; 387 my ($w, $h) = $chld->size_request;
342 388
343 glBegin GL_QUADS; 389 glBegin GL_QUADS;
344 glColor 0, 0, 0; 390 glColor 0, 0, 0;
345 glTexCoord 0, 0; glVertex 0 , 0; 391 glVertex 0 , 0;
346 glTexCoord 0, 1; glVertex 0 , $h + 4; 392 glVertex 0 , $h + 4;
347 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 393 glVertex $w + 4 , $h + 4;
348 glTexCoord 1, 0; glVertex $w + 4 , 0; 394 glVertex $w + 4 , 0;
349 glEnd; 395 glEnd;
350 396
351 $chld->draw; 397 $chld->draw;
352} 398}
353 399
400#############################################################################
401
354package Crossfire::Client::Widget::FancyFrame; 402package CFClient::Widget::FancyFrame;
355 403
356our @ISA = Crossfire::Client::Widget::Frame::; 404our @ISA = CFClient::Widget::Bin::;
357 405
358use SDL::OpenGL; 406use SDL::OpenGL;
359 407
360sub new { 408my @tex =
361 my ($self, $theme) = @_;
362 $self = $self->SUPER::new;
363
364 $self->{txts} = [
365 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
366 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
367 ];
368 $self
369}
370 411
371sub size_request { 412sub size_request {
372 my ($self) = @_; 413 my ($self) = @_;
414
373 my ($w, $h) = $self->get->size_request; 415 my ($w, $h) = $self->SUPER::size_request;
374 416
375 $h += $self->{txts}->[1]->{height}; 417 $h += $tex[1]->{height};
376 $h += $self->{txts}->[4]->{height}; 418 $h += $tex[4]->{height};
377 $w += $self->{txts}->[2]->{width}; 419 $w += $tex[2]->{width};
378 $w += $self->{txts}->[3]->{width}; 420 $w += $tex[3]->{width};
379 421
380 ($w, $h) 422 ($w, $h)
381} 423}
382 424
383sub size_allocate { 425sub size_allocate {
384 my ($self, $w, $h) = @_; 426 my ($self, $w, $h) = @_;
385 427
386 $self->w ($w); 428 $self->SUPER::size_allocate ($w, $h);
387 $self->h ($h); 429
388 $h -= $self->{txts}->[1]->{height}; 430 $h -= $tex[1]->{height};
389 $h -= $self->{txts}->[4]->{height}; 431 $h -= $tex[4]->{height};
390 $w -= $self->{txts}->[2]->{width}; 432 $w -= $tex[2]->{width};
391 $w -= $self->{txts}->[3]->{width}; 433 $w -= $tex[3]->{width};
392 434
393 $h = $h < 0 ? 0 : $h; 435 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w; 436 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n"; 437
396 $self->get->size_allocate ($w, $h); 438 $self->child->size_allocate ($w, $h);
397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 439 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
398} 440}
399 441
400sub _draw { 442sub _draw {
401 my ($self) = @_; 443 my ($self) = @_;
402 444
403 my ($w, $h) = ($self->w, $self->h); 445 my ($w, $h) = ($self->{w}, $self->{h});
404 my ($cw, $ch) = ($self->get->w, $self->get->h); 446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
405 447
406 glEnable GL_BLEND; 448 glEnable GL_BLEND;
407 glEnable GL_TEXTURE_2D; 449 glEnable GL_TEXTURE_2D;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
410 452
411 my $top = $self->{txts}->[1]; 453 my $top = $tex[1];
412 glBindTexture GL_TEXTURE_2D, $top->{name}; 454 $top->draw_quad (0, 0, $w, $top->{height});
413 455
414 glBegin GL_QUADS;
415 glTexCoord 0, 0; glVertex 0 , 0;
416 glTexCoord 0, 1; glVertex 0 , $top->{height};
417 glTexCoord 1, 1; glVertex $w , $top->{height};
418 glTexCoord 1, 0; glVertex $w , 0;
419 glEnd;
420
421 my $left = $self->{txts}->[3]; 456 my $left = $tex[3];
422 glBindTexture GL_TEXTURE_2D, $left->{name}; 457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
423 458
424 glBegin GL_QUADS;
425 glTexCoord 0, 0; glVertex 0 , $top->{height};
426 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
427 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
428 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
429 glEnd;
430
431 my $right = $self->{txts}->[2]; 459 my $right = $tex[2];
432 glBindTexture GL_TEXTURE_2D, $right->{name}; 460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
433 461
434 glBegin GL_QUADS;
435 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
436 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
437 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
438 glTexCoord 1, 0; glVertex $w , $top->{height};
439 glEnd;
440
441 my $bottom = $self->{txts}->[4]; 462 my $bottom = $tex[4];
442 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
443 464
444 glBegin GL_QUADS; 465 my $bg = $tex[0];
445 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
446 glTexCoord 0, 1; glVertex 0 , $h;
447 glTexCoord 1, 1; glVertex $w , $h;
448 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
449 glEnd;
450
451 my $bg = $self->{txts}->[0];
452 glBindTexture GL_TEXTURE_2D, $bg->{name}; 466 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
456 470
457 my $rep_x = $cw / $bg->{width}; 471 my $rep_x = $cw / $bg->{width};
458 my $rep_y = $ch / $bg->{height}; 472 my $rep_y = $ch / $bg->{height};
459 473
460 glBegin GL_QUADS; 474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
461 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
462 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
463 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
464 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
465 glEnd;
466 475
467 glDisable GL_BLEND; 476 glDisable GL_BLEND;
468 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
469 478
470 $self->get->draw; 479 $self->child->draw;
471 480
472} 481}
473 482
483#############################################################################
484
474package Crossfire::Client::Widget::Table; 485package CFClient::Widget::Table;
475 486
476our @ISA = Crossfire::Client::Widget::Bin::; 487our @ISA = CFClient::Widget::Bin::;
477 488
478use SDL::OpenGL; 489use SDL::OpenGL;
479 490
480sub add { 491sub add {
481 my ($self, $x, $y, $chld) = @_; 492 my ($self, $x, $y, $chld) = @_;
… …
554 565
555 $y += $self->max_row_height ($yi); 566 $y += $self->max_row_height ($yi);
556 } 567 }
557} 568}
558 569
570#############################################################################
571
559package Crossfire::Client::Widget::VBox; 572package CFClient::Widget::VBox;
560 573
561our @ISA = Crossfire::Client::Widget::Container::; 574our @ISA = CFClient::Widget::Container::;
562 575
563use SDL::OpenGL; 576use SDL::OpenGL;
577
578sub size_request {
579 my ($self) = @_;
580
581 my @alloc = map [$_->size_request], @{$self->{children}};
582
583 (
584 (List::Util::max map $_->[0], @alloc),
585 (List::Util::sum map $_->[1], @alloc),
586 )
587}
564 588
565sub size_allocate { 589sub size_allocate {
566 my ($self, $w, $h) = @_; 590 my ($self, $w, $h) = @_;
567 591
568 $self->w ($w); 592 $self->w ($w);
… …
601 $y += $h; 625 $y += $h;
602 } 626 }
603 } 627 }
604} 628}
605 629
606sub _draw { 630#############################################################################
607 my ($self) = @_;
608 631
609 my ($x, $y);
610 for (@{$self->{children} || []}) {
611 $_->draw;
612 $y += $_->h;
613 }
614}
615
616package Crossfire::Client::Widget::Label; 632package CFClient::Widget::Label;
617 633
618our @ISA = Crossfire::Client::Widget::; 634our @ISA = CFClient::Widget::;
619 635
620use SDL::OpenGL; 636use SDL::OpenGL;
621 637
622sub new { 638sub new {
623 my ($class, $x, $y, $z, $height, $text) = @_; 639 my ($class, %arg) = @_;
624 640
625 # TODO: color, and make height, xyz etc. optional 641 # TODO: color, and make height, xyz etc. optional
626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 642 my $self = $class->SUPER::new (
643 color => [1, 1, 1],
644 height => $::FONTSIZE,
645 text => "",
646 layout => new CFClient::Layout,
647 %arg
648 );
627 649
628 $self->set_text ($text); 650 $self->set_text ($self->{text});
629 651
630 $self 652 $self
631} 653}
632 654
633sub set_text { 655sub set_text {
634 my ($self, $text) = @_; 656 my ($self, $text) = @_;
635 657
636 $self->{text} = $text; 658 $self->{text} = $text;
637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 659 $self->{layout}->set_markup ($text);
638 660
639 $self->update; 661 delete $self->{texture};
640} 662}
641 663
642sub get_text { 664sub get_text {
643 my ($self, $text) = @_; 665 my ($self, $text) = @_;
644 666
… …
646} 668}
647 669
648sub size_request { 670sub size_request {
649 my ($self) = @_; 671 my ($self) = @_;
650 672
651 ( 673 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
677# (
652 $self->{texture}{width}, 678# $self->{texture}{width},
653 $self->{texture}{height}, 679# $self->{texture}{height},
654 ) 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
655} 693}
656 694
657sub _draw { 695sub _draw {
658 my ($self) = @_; 696 my ($self) = @_;
659 697
660 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
661 702
662 glEnable GL_BLEND; 703 glEnable GL_BLEND;
663 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666 glBindTexture GL_TEXTURE_2D, $tex->{name};
667 707
668 glColor 1, 0, 0, 1; # TODO color 708 glColor @{$self->{color}};
669 709
670 glBegin GL_QUADS; 710 $tex->draw_quad (0, 0);
671 glTexCoord 0, 0; glVertex 0 , 0;
672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
674 glTexCoord 1, 0; glVertex $tex->{width}, 0;
675 glEnd;
676 711
677 glDisable GL_BLEND; 712 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
679} 714}
680 715
716#############################################################################
717
681package Crossfire::Client::Widget::TextEntry; 718package CFClient::Widget::Entry;
682 719
683our @ISA = Crossfire::Client::Widget::Label::; 720our @ISA = CFClient::Widget::Label::;
684 721
685use SDL; 722use SDL;
686use SDL::OpenGL; 723use SDL::OpenGL;
687 724
688sub key_down { 725sub key_down {
689 my ($self, $ev) = @_; 726 my ($self, $ev) = @_;
690 727
691 my $mod = $ev->key_mod; 728 my $mod = $ev->key_mod;
692 my $sym = $ev->key_sym; 729 my $sym = $ev->key_sym;
693 730
694 $ev->set_unicode (1);
695 my $uni = $ev->key_unicode; 731 my $uni = $ev->key_unicode;
696 732
697 my $text = $self->get_text; 733 my $text = $self->get_text;
698 734
699 if ($sym == SDLK_BACKSPACE) { 735 if ($sym == SDLK_BACKSPACE) {
700 substr $text, -1, 1, ''; 736 substr $text, -1, 1, '';
701
702 } elsif ($uni) { 737 } elsif ($uni) {
703 $text .= chr $uni; 738 $text .= chr $uni;
704 } 739 }
740
705 $self->set_text ($text); 741 $self->set_text ($text);
706} 742}
707 743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
708package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
709 777
710use strict; 778use strict;
711 779
712use List::Util qw(min max); 780use List::Util qw(min max);
713 781
714use SDL; 782use SDL;
715use SDL::OpenGL; 783use SDL::OpenGL;
716use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
717 785
718our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
787
788sub new {
789 my $class = shift;
790
791 $class->SUPER::new (z => -1, @_)
792}
719 793
720sub key_down { 794sub key_down {
721 print "MAPKEYDOWN\n"; 795 print "MAPKEYDOWN\n";
722} 796}
723 797
724sub key_up { 798sub key_up {
725} 799}
726 800
727sub size_request { 801sub size_request {
728 802 (
729} 803 1 + int $::WIDTH / 32,
730 804 1 + int $::HEIGHT / 32,
731sub size_allocate { 805 )
732} 806}
733 807
734sub _draw { 808sub _draw {
735 my ($self) = @_; 809 my ($self) = @_;
736 810
… …
759 glEnable GL_TEXTURE_2D; 833 glEnable GL_TEXTURE_2D;
760 glEnable GL_BLEND; 834 glEnable GL_BLEND;
761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762 836
763 my $sw4 = ($sw + 3) & ~3; 837 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh); 838 my $darkness = "\x00" x ($sw4 * $sh);
765 839
766 for my $x (0 .. $sw - 1) { 840 for my $x (0 .. $sw - 1) {
841 my $row = $map->[$x + $xofs];
767 for my $y (0 .. $sh - 1) { 842 for my $y (0 .. $sh - 1) {
768 843
769 my $cell = $map->[$x + $xofs][$y + $yofs] 844 my $cell = $row->[$y + $yofs]
770 or next; 845 or next;
771 846
772 my $darkness = $cell->[0] * (1 / 255); 847 my $dark = $cell->[0];
773 if ($darkness < 0) { 848 if ($dark < 0) {
774 $darkness = 0.15; 849 substr $darkness, $y * $sw4 + $x, 1, chr 224;
850 } else {
851 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
775 } 852 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
777 853
778 for my $num (grep $_, @$cell[1,2,3]) { 854 for my $num (grep $_, @$cell[1,2,3]) {
779 my $tex = $::CONN->{face}[$num]{texture} || next; 855 my $tex = $::CONN->{face}[$num]{texture} || next;
780 856
781 glBindTexture GL_TEXTURE_2D, $tex->{name};
782
783 my $w = $tex->{width}; 857 my $w = $tex->{width};
784 my $h = $tex->{height}; 858 my $h = $tex->{height};
785 859
786 my $px = ($x + 1) * 32 - $w; 860 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
787 my $py = ($y + 1) * 32 - $h;
788
789 glBegin GL_QUADS;
790 glTexCoord 0, 0; glVertex $px , $py;
791 glTexCoord 0, 1; glVertex $px , $py + $h;
792 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
793 glTexCoord 1, 0; glVertex $px + $w, $py;
794 glEnd;
795 } 861 }
796 } 862 }
797 } 863 }
798 864
799# if (1) { # higher quality darkness 865# if (1) { # higher quality darkness
… …
804# 870#
805# $lighting = $pb->get_pixels; 871# $lighting = $pb->get_pixels;
806# $lighting =~ s/(.)../$1/gs; 872# $lighting =~ s/(.)../$1/gs;
807# } 873# }
808 874
809 $lighting = new Crossfire::Client::Texture 875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
877
878 $darkness = new CFClient::Texture
810 width => $sw4, 879 width => $sw4,
811 height => $sh, 880 height => $sh,
812 data => $lighting, 881 data => $darkness,
813 internalformat => GL_ALPHA4, 882 internalformat => GL_ALPHA,
814 format => GL_ALPHA; 883 format => GL_ALPHA;
815 884
816 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 885 glColor 0.45, 0.45, 0.45, 1;
817 glColor 0, 0, 0, 0.75; 886 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
819 glBindTexture GL_TEXTURE_2D, $lighting->{name};
820 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
821 glBegin GL_QUADS;
822 glTexCoord 0, 0; glVertex 0 , 0;
823 glTexCoord 0, 1; glVertex 0 , $sh * 32;
824 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
825 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
826 glEnd;
827 887
828 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
829 glDisable GL_BLEND; 889 glDisable GL_BLEND;
830} 890}
831 891
… …
878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 938 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
879 $::CONN->send ("command run_stop"); 939 $::CONN->send ("command run_stop");
880 } 940 }
881} 941}
882 942
943#############################################################################
944
883package Crossfire::Client::Widget::Animator; 945package CFClient::Widget::Animator;
884 946
885use SDL::OpenGL; 947use SDL::OpenGL;
886 948
887our @ISA = Crossfire::Client::Widget::Bin::; 949our @ISA = CFClient::Widget::Bin::;
888 950
889sub moveto { 951sub moveto {
890 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
891 953
892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
893 $self->{speed} = 0.2; 955 $self->{speed} = 0.001;
894 $self->{time} = 1; 956 $self->{time} = 1;
895 957
896 ::animation_start $self; 958 ::animation_start $self;
897} 959}
898 960
… …
913 975
914sub _draw { 976sub _draw {
915 my ($self) = @_; 977 my ($self) = @_;
916 978
917 glPushMatrix; 979 glPushMatrix;
918 glRotate $self->{time} * 10000, 0, 1, 0; 980 glRotate $self->{time} * 1000, 0, 1, 0;
919 $self->{children}[0]->draw; 981 $self->{children}[0]->draw;
920 glPopMatrix; 982 glPopMatrix;
921} 983}
922 984
9231; 985#############################################################################
924 986
987package CFClient::Widget::Toplevel;
988
989our @ISA = CFClient::Widget::Container::;
990
991sub size_request {
992 ($::WIDTH, $::HEIGHT)
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 $_->size_allocate ($_->size_request)
1001 for @{$self->{children}};
1002}
1003
1004sub translate {
1005 my ($self, $x, $y) = @_;
1006
1007 ($x, $y)
1008}
1009
1010sub update {
1011 my ($self) = @_;
1012
1013 $self->size_allocate ($self->size_request);
1014 ::refresh ();
1015}
1016
1017sub add {
1018 my ($self, $widget) = @_;
1019
1020 $self->SUPER::add ($widget);
1021
1022 $widget->size_allocate ($widget->size_request);
1023}
1024
1025sub draw {
1026 my ($self) = @_;
1027
1028 $self->_draw;
1029}
1030
1031#############################################################################
1032
1033package CFClient::Widget;
1034
1035$TOPLEVEL = new CFClient::Widget::Toplevel;
1036
10371
1038

Diff Legend

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